Add new saucismash2023 theme

Change smash.gg URLs to start.gg
The package name stays the same though. start.gg is only added as another URL for smash.gg, and used as replacement for the "api.smash.gg" URL, in case the old one become deprecated.
2023-07-07 12:36:54 +02:00 · 2022-08-26 09:09:58 +02:00 · 2021-11-29 01:45:46 +01:00 · 2021-11-29 00:54:27 +01:00 · 2021-11-29 00:42:14 +01:00 · 2021-11-28 23:58:08 +01:00
12 changed files with 5128 additions and 23 deletions
--- a/lokrez/init.py
+++ b/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(
@ -189,7 +192,7 @@ def get_infos_from_url(

    url_parsed = urllib.parse.urlparse(url)

-    if url_parsed.netloc not in [ "smash.gg" ]:
+    if url_parsed.netloc not in [ "smash.gg", "start.gg" ]:
        raise ValueError("Unsupported domain name")
    if outform not in [ "dict", "lkrz" ]:
        raise ValueError("Unsupported outform")
@ -199,7 +202,7 @@ def get_infos_from_url(
    event = None

    # -------------------------------------------------------------------------
-    if url_parsed.netloc == "smash.gg":
+    if url_parsed.netloc in [ "smash.gg", "start.gg" ]:

        if (url_parsed.path.split("/")[1] != "tournament"):
            log.error("Incomplete URL '{}'".format(url))
--- a/lokrez/games/ssbu.py
+++ b/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/",
+                        ],
+                    },
+                ),
        ]

--- a/lokrez/smashgg.py
+++ b/lokrez/smashgg.py
@ -8,7 +8,7 @@ import requests
 from .games import ssbu, melee, pplus

 # =============================================================================
-API_HOST = "api.smash.gg"
+API_HOST = "api.start.gg"
 API_ENDPOINT = "gql/alpha"
 API_SCHEME = "https"
 API_URL = "{scheme}://{host}/{endpoint}".format(
--- a/lokrez/templates/_covid/covid.j2
+++ b/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",
--- a/lokrez/templates/confismash/characters_corrections.j2
+++ b/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": (-10, -40),
+        "06": (-50, -60),
+        "07": (30, -20),
+    },
    "squirtle": { "default": (-7, 8) },
    "steve": { "default": (0, 0) },
    "terry": { "default": (-60, -7, 0.65) },
--- a/lokrez/templates/meltdownlyon2020/characters_corrections.j2
+++ b/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": (-10, -40),
+        "06": (-50, -60),
+        "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) },
 } %}
--- a/lokrez/templates/meltdownlyon2020/template.svg.j2
+++ b/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>
--- a/lokrez/templates/rebootlyon2020/characters_corrections.j2
+++ b/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": (-10, -40),
+        "06": (-50, -60),
+        "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) },
 } %}
--- a/lokrez/templates/saucismash2023/characters_corrections.j2
+++ b/lokrez/templates/saucismash2023/characters_corrections.j2
@ -0,0 +1,148 @@
+{% set charcorr = {
+    "banjo & kazooie": { "default": (30, -18) },
+    "bayonetta": { "default": (-28, -16) },
+    "bowser": { "default": (10, -30) },
+    "bowser jr": {
+        "default": (40, -10),
+        "00": (40, -10),
+        "03": (40, -10),
+        "04": (40, -16),
+        },
+    "byleth": {
+        "default": (-15, -5),
+        "01": (20,-20),
+        "03": (20,-20),
+        "05": (20,-20),
+        "07": (20,-20),
+        },
+    "captain falcon": { "default": (-20, 0) },
+    "charizard": { "default": (23, -22) },
+    "chrom": { "default": (2, -12) },
+    "cloud": {
+        "default": (-20, -10),
+        "01": (-57, -10),
+        "03": (-57, -10),
+        "05": (-57, -10),
+        "07": (-57, -10),
+     },
+    "corrin": { "default": (-37, -7) },
+    "daisy": { "default": (35, -10) },
+    "dark pit": { "default": (0, -18) },
+    "dark samus": { "default": (-10, -5) },
+    "diddy kong": { "default": (15, -10) },
+    "donkey kong": { "default": (19, -6) },
+    "dr mario": { "default": (40, -6) },
+    "duck hunt": { "default": (30, -38) },
+    "falco": { "default": (28, -20) },
+    "fox": { "default": (30, -10) },
+    "ganondorf": { "default": (-30, -6) },
+    "greninja": { "default": (26, -20) },
+    "hero": { "default": (25, -8) },
+    "ice climbers": { "default": (12, -15) },
+    "ike": { "default": (17, -7) },
+    "incineroar": { "default": (20, -10) },
+    "inkling": {
+        "default": (20, -10),
+        "01": (26, -23),
+        "03": (26, -23),
+        "05": (26, -23),
+        "07": (26, -23),
+         },
+    "isabelle": { "default": (40, -20) },
+    "ivysaur": { "default": (20, -33) },
+    "jigglypuff": { "default": (30, -15) },
+    "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": (0, -30) },
+    "little mac": { "default": (20, -5) },
+    "lucario": { "default": (30, -13) },
+    "lucas": { "default": (26, -15) },
+    "lucina": { "default": (-23, -8) },
+    "luigi": { "default": (35, -7) },
+    "mario": { "default": (30, -20) },
+    "marth": { "default": (-30, -13) },
+    "mega man": { "default": (30, -10) },
+    "meta knight": { "default": (10, -38) },
+    "mewtwo": { "default": (10, -16) },
+    "mii fighter": { "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) },
+    "ness": { "default": (38, -10) },
+    "olimar": { "default": (20, -27) },
+    "pacman": { "default": (34, -8) },
+    "palutena": { "default": (-45, -40) },
+    "peach": { "default": (8, -16) },
+    "pichu": { "default": (33, -25) },
+    "pikachu": { "default": (30, -19) },
+    "piranha plant": { "default": (15, -5) },
+    "pit": { "default": (0, -17) },
+    "pokemon trainer": { "default": (25, -5) },
+    "richter": { "default": (20, -20) },
+    "ridley": { "default": (15, -37) },
+    "rob": { "default": (25, -4) },
+    "robin": {
+        "default": (-32, -8),
+        "01": (-70, -17),
+        "03": (-70, -17),
+        "05": (-70, -17),
+        "07": (-70, -17),
+     },
+    "rosalina and luma": { "default": (10, -10) },
+    "roy": { "default": (15, -17) },
+    "ryu": { "default": (10, -4) },
+    "samus": { "default": (30, -18) },
+    "sephiroth": {
+        "default": (-90, -30),
+        "06": (-120, 0),
+        "07": (-120, 0),
+    },
+    "sheik": { "default": (0, -13) },
+    "shulk": { "default": (18, -20) },
+    "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": (-10, -40),
+        "06": (-50, -60),
+        "07": (30, -20),
+    },
+    "squirtle": { "default": (33, -2) },
+    "steve": { "default": (0, 0) },
+    "terry": { "default": (-20, -20, 0.65) },
+    "toon link": { "default": (30, -20) },
+    "villager": { "default": (28, -18) },
+    "wario": { "default": (22, -5) },
+    "wii fit trainer": { "default": (20, -5) },
+    "wolf": { "default": (23, -7) },
+    "yoshi": { "default": (28, -3) },
+    "young link": { "default": (24, -10) },
+    "zelda": { "default": (-20,-7) },
+    "zero suit samus": { "default": (-13, -11) },
+    "pyra" : { "default": (-90, 0) },
+    "pyra & mythra" : { "default": (-55, -18) },
+    "mythra" : { "default": (-30, 0) },
+    "mythra & pyra" : { "default": (-80, 0) },
+} %}
+
--- a/lokrez/templates/saucismash2023/logo_zeph.svg.j2
+++ b/lokrez/templates/saucismash2023/logo_zeph.svg.j2
--- a/lokrez/templates/saucismash2023/template.svg.j2
+++ b/lokrez/templates/saucismash2023/template.svg.j2
--- a/setup.py
+++ b/setup.py
@ -73,7 +73,7 @@ if os.name == "posix":
            long_description = long_description,
            long_description_content_type = "text/plain",
            url = lokrez.version.URL,
-            packages = ["lokrez"],
+            packages = ["lokrez", "lokrez.games"],
            install_requires = [
                "jinja2",
                "requests",
Author	SHA1	Message	Date
Lertsenem	9ae221c6d7	Add new saucismash2023 theme	2023-07-07 12:36:54 +02:00
Lertsenem	fa729e056d	Change smash.gg URLs to start.gg The package name stays the same though. start.gg is only added as another URL for smash.gg, and used as replacement for the "api.smash.gg" URL, in case the old one become deprecated.	2022-08-26 09:09:58 +02:00
Lertsenem	4d983bb080	Fix character position (Sora)	2021-11-29 01:45:46 +01:00
Lertsenem	8b0ffb8a21	Fix setup.py again because I'm stupid	2021-11-29 00:54:27 +01:00
Lertsenem	1dc05aa10a	Fix setup.py pckage generation	2021-11-29 00:42:14 +01:00
Lertsenem	809b999ab3	Fix generation from lkrz file	2021-11-28 23:58:08 +01:00
Lertsenem	8055d8af80	Add last SSBU character: Sora	2021-11-28 23:57:58 +01:00
Lertsenem	790fb8ad4c	Fix character positions In rebootlyon2020 and meltdownlyon2020	2021-09-01 21:10:14 +02:00
Lertsenem	46fcfd13da	Fix Kazuya ID	2021-09-01 21:01:50 +02:00
Lertsenem	dabd05f216	Fix meltdown template font size	2021-09-01 20:55:07 +02:00