Compare commits

..

No commits in common. "9ae221c6d79f739784297684b205af56c3213c4d" and "8522d51719f06fd592b725151f7c8141ff8595c5" have entirely different histories.

12 changed files with 23 additions and 5128 deletions

View File

@ -123,10 +123,7 @@ def get_infos_from_file(
log.info("Loading data from '{}'".format(str(lkrz_file_path))) log.info("Loading data from '{}'".format(str(lkrz_file_path)))
top_players = {} if s in lkrz:
tournament = None
for s in lkrz:
section = lkrz[s] section = lkrz[s]
if s == "Tournament": if s == "Tournament":
tournament = smashgg.Tournament( tournament = smashgg.Tournament(
@ -192,7 +189,7 @@ def get_infos_from_url(
url_parsed = urllib.parse.urlparse(url) url_parsed = urllib.parse.urlparse(url)
if url_parsed.netloc not in [ "smash.gg", "start.gg" ]: if url_parsed.netloc not in [ "smash.gg" ]:
raise ValueError("Unsupported domain name") raise ValueError("Unsupported domain name")
if outform not in [ "dict", "lkrz" ]: if outform not in [ "dict", "lkrz" ]:
raise ValueError("Unsupported outform") raise ValueError("Unsupported outform")
@ -202,7 +199,7 @@ def get_infos_from_url(
event = None event = None
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
if url_parsed.netloc in [ "smash.gg", "start.gg" ]: if url_parsed.netloc == "smash.gg":
if (url_parsed.path.split("/")[1] != "tournament"): if (url_parsed.path.split("/")[1] != "tournament"):
log.error("Incomplete URL '{}'".format(url)) log.error("Incomplete URL '{}'".format(url))

View File

@ -1004,7 +1004,7 @@ EVERYONE = [
}, },
), ),
Character( Character(
smashggid = 1846, smashggid = None,
name = "kazuya", name = "kazuya",
codenames = [ "demon", ], codenames = [ "demon", ],
res_urls = { res_urls = {
@ -1014,16 +1014,5 @@ 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/",
],
},
),
] ]

View File

@ -8,7 +8,7 @@ import requests
from .games import ssbu, melee, pplus from .games import ssbu, melee, pplus
# ============================================================================= # =============================================================================
API_HOST = "api.start.gg" API_HOST = "api.smash.gg"
API_ENDPOINT = "gql/alpha" API_ENDPOINT = "gql/alpha"
API_SCHEME = "https" API_SCHEME = "https"
API_URL = "{scheme}://{host}/{endpoint}".format( API_URL = "{scheme}://{host}/{endpoint}".format(

View File

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

View File

@ -117,15 +117,6 @@
"simon": { "default": (-60, -1) }, "simon": { "default": (-60, -1) },
"snake": { "default": (-48, 0) }, "snake": { "default": (-48, 0) },
"sonic": { "default": (-20, 4) }, "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) }, "squirtle": { "default": (-7, 8) },
"steve": { "default": (0, 0) }, "steve": { "default": (0, 0) },
"terry": { "default": (-60, -7, 0.65) }, "terry": { "default": (-60, -7, 0.65) },

View File

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

View File

@ -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> 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> </g>
<text <text
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" 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"
x="323" x="323"
y="120.59898" y="120.59898"
id="player{{loop.index}}_txt" id="player{{loop.index}}_txt"
@ -4652,7 +4652,7 @@
<tspan <tspan
sodipodi:role="line" sodipodi:role="line"
id="tspan3186" id="tspan3186"
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" 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"
> >
{{p.prefix|upper|e}} {{p.prefix|upper|e}}
<tspan xml:space="preserve"></tspan> <tspan xml:space="preserve"></tspan>
@ -4660,7 +4660,7 @@
{% endif %} {% endif %}
<tspan <tspan
id="tspan3190" id="tspan3190"
style="font-size:20px;fill:#ffffff;fill-opacity:1;stroke-width:0.264583px" style="font-size:20.4611px;fill:#ffffff;fill-opacity:1;stroke-width:0.264583px"
> >
{{p.gamerTag|upper|e}} {{p.gamerTag|upper|e}}
</tspan> </tspan>

View File

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

View File

@ -1,148 +0,0 @@
{% 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) },
} %}

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 30 KiB

File diff suppressed because one or more lines are too long

View File

@ -73,7 +73,7 @@ if os.name == "posix":
long_description = long_description, long_description = long_description,
long_description_content_type = "text/plain", long_description_content_type = "text/plain",
url = lokrez.version.URL, url = lokrez.version.URL,
packages = ["lokrez", "lokrez.games"], packages = ["lokrez"],
install_requires = [ install_requires = [
"jinja2", "jinja2",
"requests", "requests",