lokrez/__init__.py

@@ -123,7 +123,10 @@ def get_infos_from_file(
 
     log.info("Loading data from '{}'".format(str(lkrz_file_path)))
 
-    if s in lkrz:
+    top_players = {}
+    tournament = None
+
+    for s in lkrz:
         section = lkrz[s]
         if s == "Tournament":
             tournament = smashgg.Tournament(

lokrez/games/ssbu.py

@@ -1004,7 +1004,7 @@ EVERYONE = [
                     },
                 ),
         Character(
-                smashggid = None,
+                smashggid = 1846,
                 name = "kazuya",
                 codenames = [ "demon", ],
                 res_urls = {
@@ -1014,5 +1014,16 @@ EVERYONE = [
                         ],
                     },
                 ),
+        Character(
+                smashggid = 1897,
+                name = "sora",
+                codenames = [ "trail", ],
+                res_urls = {
+                    "spriters": [
+                        "https://www.spriters-resource.com/download/163416/",
+                        "https://www.spriters-resource.com/download/111395/",
+                        ],
+                    },
+                ),
         ]
 

lokrez/templates/_covid/covid.j2

@@ -365,6 +365,7 @@
         "04": "joker",
         "05": "joker",
     },
+    "kazuya": {},
     "ken": {
         "00": "ken",
         "01": "ken",
@@ -884,6 +885,7 @@
         "09": "sonic",
         "10": "sonic",
     },
+    "sora": {},
     "squirtle": {
         "00": "squirtle",
         "01": "squirtle",

lokrez/templates/confismash/characters_corrections.j2

@@ -117,6 +117,15 @@
     "simon": { "default": (-60, -1) },
     "snake": { "default": (-48, 0) },
     "sonic": { "default": (-20, 4) },
+    "sora": {
+        "default": (20, -20),
+        "01": (-10, -40),
+        "02": (-50, -60),
+        "03": (30, -20),
+        "05": (-50, -60),
+        "06": (30, -20),
+        "07": (30, -20),
+    },
     "squirtle": { "default": (-7, 8) },
     "steve": { "default": (0, 0) },
     "terry": { "default": (-60, -7, 0.65) },

lokrez/templates/meltdownlyon2020/characters_corrections.j2

@@ -18,7 +18,7 @@
     "captain falcon": { "default": (-20, 0) },
     "charizard": { "default": (23, -22) },
     "chrom": { "default": (2, -12) },
-	"cloud": {
+    "cloud": {
         "default": (-20, -10),
         "01": (-57, -10),
         "03": (-57, -10),
@@ -33,7 +33,7 @@
     "donkey kong": { "default": (19, -6) },
     "dr mario": { "default": (40, -6) },
     "duck hunt": { "default": (30, -38) },
-    "falco": { "default": (28, -7) },
+    "falco": { "default": (28, -20) },
     "fox": { "default": (30, -10) },
     "ganondorf": { "default": (-30, -6) },
     "greninja": { "default": (26, -20) },
@@ -51,12 +51,25 @@
     "isabelle": { "default": (40, -20) },
     "ivysaur": { "default": (20, -33) },
     "jigglypuff": { "default": (30, -15) },
-    "joker": { "default": (20, -18) },
+    "joker": {
+        "default": (0, -15),
+        "00": (10, -15),
+        "02": (10, -15),
+        "04": (10, -15),
+        "06": (10, -15),
+            },
+    "kazuya": {
+        "default": (0, -8),
+        "00": (20, -15),
+        "02": (20, -15),
+        "04": (20, -15),
+        "06": (20, -15),
+    },
     "ken": { "default": (20, -10) },
     "king dedede": { "default": (20, -10) },
     "king k rool": { "default": (20, -7) },
     "kirby": { "default": (30, -17) },
-    "link": { "default": (-10, -20) },
+    "link": { "default": (0, -30) },
     "little mac": { "default": (20, -5) },
     "lucario": { "default": (30, -13) },
     "lucas": { "default": (26, -15) },
@@ -68,7 +81,7 @@
     "meta knight": { "default": (10, -38) },
     "mewtwo": { "default": (10, -16) },
     "mii fighter": { "default": (0, 0) },
-    "mii gunner": { "default": (0, 0) },
+    "mii gunner": { "default": (37, -10) },
     "mii swordsman": { "default": (0, 0) },
     "min min": { "default": (10, -23) },
     "mr game and watch": { "default": (26, -13) },
@@ -84,7 +97,7 @@
     "pokemon trainer": { "default": (25, -5) },
     "richter": { "default": (20, -20) },
     "ridley": { "default": (15, -37) },
-    "rob": { "default": (15, -4) },
+    "rob": { "default": (25, -4) },
     "robin": {
         "default": (-32, -8),
         "01": (-70, -17),
@@ -106,6 +119,15 @@
     "simon": { "default": (-20, -11) },
     "snake": { "default": (-8, -10) },
     "sonic": { "default": (20, -6) },
+    "sora": {
+        "default": (20, -20),
+        "01": (-10, -40),
+        "02": (-50, -60),
+        "03": (30, -20),
+        "05": (-50, -60),
+        "06": (30, -20),
+        "07": (30, -20),
+    },
     "squirtle": { "default": (33, -2) },
     "steve": { "default": (0, 0) },
     "terry": { "default": (-20, -20, 0.65) },
@@ -119,7 +141,7 @@
     "zelda": { "default": (-20,-7) },
     "zero suit samus": { "default": (-13, -11) },
     "pyra" : { "default": (-90, 0) },
-    "pyra & mythra" : { "default": (-140, 0) },
+    "pyra & mythra" : { "default": (-55, -18) },
     "mythra" : { "default": (-30, 0) },
     "mythra & pyra" : { "default": (-80, 0) },
 } %}

lokrez/templates/meltdownlyon2020/template.svg.j2

@@ -4641,7 +4641,7 @@
              style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:condensed;font-size:16.5882px;font-family:Arial;-inkscape-font-specification:'Arial Bold Italic Condensed';fill:{{ ["#edc708", "#b2b2b2", "#c0552f", "#ffffff", "#ffffff", "#ffffff", "#ffffff", "#ffffff"][loop.index0] }};fill-opacity:1;stroke-width:0.259192px">{{loop.index if loop.index not in [6,8] else loop.index0}}</tspan></text>
       </g>
       <text
-         style="text-align:end;text-anchor:end;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:condensed;font-size:20.4611px;line-height:125%;font-family:Impact;-inkscape-font-specification:'Impact Condensed';letter-spacing:-0.105833px;word-spacing:0px;fill:#93e700;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         style="text-align:end;text-anchor:end;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:condensed;font-size:20px;line-height:125%;font-family:Impact;-inkscape-font-specification:'Impact Condensed';letter-spacing:-0.105833px;word-spacing:0px;fill:#93e700;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          x="323"
          y="120.59898"
          id="player{{loop.index}}_txt"
@@ -4652,7 +4652,7 @@
          <tspan
            sodipodi:role="line"
            id="tspan3186"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:condensed;font-size:20.4611px;font-family:Impact;-inkscape-font-specification:'Impact Condensed';fill:#93e700;fill-opacity:1;stroke-width:0.264583px"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:condensed;font-size:20px;font-family:Impact;-inkscape-font-specification:'Impact Condensed';fill:#93e700;fill-opacity:1;stroke-width:0.264583px"
            >
            {{p.prefix|upper|e}}
            <tspan xml:space="preserve"></tspan>
@@ -4660,7 +4660,7 @@
         {% endif %}
         <tspan
            id="tspan3190"
-           style="font-size:20.4611px;fill:#ffffff;fill-opacity:1;stroke-width:0.264583px"
+           style="font-size:20px;fill:#ffffff;fill-opacity:1;stroke-width:0.264583px"
            >
            {{p.gamerTag|upper|e}}
         </tspan>

lokrez/templates/rebootlyon2020/characters_corrections.j2

@@ -12,7 +12,7 @@
     "captain falcon": { "default": (13, 0) },
     "charizard": { "default": (23, -22) },
     "chrom": { "default": (2, -12) },
-	"cloud": {
+    "cloud": {
         "default": (-20, -10),
         "01": (-57, -10),
         "03": (-57, -10),
@@ -27,7 +27,7 @@
     "donkey kong": { "default": (19, -6) },
     "dr mario": { "default": (40, -6) },
     "duck hunt": { "default": (30, -38) },
-    "falco": { "default": (28, -7) },
+    "falco": { "default": (28, -20) },
     "fox": { "default": (30, -10) },
     "ganondorf": { "default": (-30, -6) },
     "greninja": { "default": (26, -20) },
@@ -46,12 +46,18 @@
         "04": (10, -15),
         "06": (10, -15),
             },
-    "kazuya": { "default": (0, 0) },
+    "kazuya": {
+        "default": (0, -8),
+        "00": (20, -15),
+        "02": (20, -15),
+        "04": (20, -15),
+        "06": (20, -15),
+    },
     "ken": { "default": (20, -10) },
     "king dedede": { "default": (20, -10) },
     "king k rool": { "default": (20, -7) },
     "kirby": { "default": (30, -17) },
-    "link": { "default": (-10, -20) },
+    "link": { "default": (0, -30) },
     "little mac": { "default": (20, -5) },
     "lucario": { "default": (30, -13) },
     "lucas": { "default": (26, -15) },
@@ -63,7 +69,7 @@
     "meta knight": { "default": (10, -38) },
     "mewtwo": { "default": (10, -16) },
     "mii fighter": { "default": (0, 0) },
-    "mii gunner": { "default": (0, 0) },
+    "mii gunner": { "default": (37, -10) },
     "mii swordsman": { "default": (0, 0) },
     "min min": { "default": (10, -23) },
     "mr game and watch": { "default": (26, -11) },
@@ -79,7 +85,7 @@
     "pokemon trainer": { "default": (25, -5) },
     "richter": { "default": (6, -30) },
     "ridley": { "default": (20, -20) },
-    "rob": { "default": (15, -4) },
+    "rob": { "default": (25, -4) },
     "robin": {
         "default": (-32, -8),
         "01": (-70, -17),
@@ -101,6 +107,15 @@
     "simon": { "default": (-20, -11) },
     "snake": { "default": (0, -3) },
     "sonic": { "default": (20, -6) },
+    "sora": {
+        "default": (20, -20),
+        "01": (-10, -40),
+        "02": (-50, -60),
+        "03": (30, -20),
+        "05": (-50, -60),
+        "06": (30, -20),
+        "07": (30, -20),
+    },
     "squirtle": { "default": (33, -2) },
     "steve": { "default": (0, 0) },
     "terry": { "default": (20, 50, 0.66) },
@@ -114,7 +129,7 @@
     "zelda": { "default": (-20,-7) },
     "zero suit samus": { "default": (-13, -11) },
     "pyra" : { "default": (-30, -10) },
-    "pyra & mythra" : { "default": (-65, -18) },
+    "pyra & mythra" : { "default": (-55, -18) },
     "mythra" : { "default": (30, -10) },
     "mythra & pyra" : { "default": (-20, -10) },
 } %}