From d7bf99ded21f4353c39c3ecefd8f03620d1aec6f Mon Sep 17 00:00:00 2001 From: Lertsenem Date: Wed, 3 Mar 2021 09:13:51 +0100 Subject: [PATCH 01/12] Update chars positions in SSBU templates --- lokrez/templates/_covid/covid.j2 | 1 + .../templates/confismash/characters_corrections.j2 | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lokrez/templates/_covid/covid.j2 b/lokrez/templates/_covid/covid.j2 index 4675af7..4baa87f 100644 --- a/lokrez/templates/_covid/covid.j2 +++ b/lokrez/templates/_covid/covid.j2 @@ -358,6 +358,7 @@ "10": "jigglypuff", }, "joker": { + "00": "joker", "01": "joker", "02": "joker", "03": "joker", diff --git a/lokrez/templates/confismash/characters_corrections.j2 b/lokrez/templates/confismash/characters_corrections.j2 index d915138..601b921 100644 --- a/lokrez/templates/confismash/characters_corrections.j2 +++ b/lokrez/templates/confismash/characters_corrections.j2 @@ -16,10 +16,10 @@ }, "byleth": { "default": (-55, 5, 0.85), - "01": (-20,-10, 0.85), - "03": (-20,-10, 0.85), - "05": (-20,-10, 0.85), - "07": (-20,-10, 0.85), + "01": (-27,-10, 0.85), + "03": (-27,-10, 0.85), + "05": (-27,-10, 0.85), + "07": (-27,-10, 0.85), }, "captain falcon": { "default": (-60, 10) }, "charizard": { "default": (-17, -12) }, @@ -67,7 +67,7 @@ "lucina": { "default": (-83, 2) }, "luigi": { "default": (-5, 3) }, "mario": { "default": (-10, -10) }, - "marth": { "default": (-70, -3) }, + "marth": { "default": (-97, -3) }, "mega man": { "default": (-10, 0) }, "meta knight": { "default": (-30, -28) }, "mewtwo": { "default": (-30, -6) }, @@ -111,7 +111,7 @@ "wolf": { "default": (-17, 3) }, "yoshi": { "default": (0, 9) }, "young link": { "default": (-16, 0) }, - "zelda": { "default": (-70, 0) }, + "zelda": { "default": (-80, 0) }, "zero suit samus": { "default": (-53, -1) }, } %} From 2db56f45af3edf6b6f4ee0e8faff71a51bfc1a0d Mon Sep 17 00:00:00 2001 From: Lertsenem Date: Wed, 3 Mar 2021 16:15:22 +0100 Subject: [PATCH 02/12] Add Mii to SSBU templates --- lokrez/templates/_covid/covid.j2 | 3 +++ lokrez/templates/confismash/characters_corrections.j2 | 3 +++ lokrez/templates/meltdownlyon2020/characters_corrections.j2 | 3 +++ lokrez/templates/rebootlyon2020/characters_corrections.j2 | 3 +++ 4 files changed, 12 insertions(+) diff --git a/lokrez/templates/_covid/covid.j2 b/lokrez/templates/_covid/covid.j2 index 4baa87f..a5d379e 100644 --- a/lokrez/templates/_covid/covid.j2 +++ b/lokrez/templates/_covid/covid.j2 @@ -560,6 +560,9 @@ "09": "mewtwo", "10": "mewtwo", }, + "mii fighter": {}, + "mii gunner": {}, + "mii swordsman": {}, "min min": { "00": "min min", "01": "min min", diff --git a/lokrez/templates/confismash/characters_corrections.j2 b/lokrez/templates/confismash/characters_corrections.j2 index 601b921..4c8ebe3 100644 --- a/lokrez/templates/confismash/characters_corrections.j2 +++ b/lokrez/templates/confismash/characters_corrections.j2 @@ -71,6 +71,9 @@ "mega man": { "default": (-10, 0) }, "meta knight": { "default": (-30, -28) }, "mewtwo": { "default": (-30, -6) }, + "mii fighter": { "default": (0, 0) }, + "mii gunner": { "default": (0, 0) }, + "mii swordsman": { "default": (0, 0) }, "min min": { "default": (-30, -13) }, "mr game and watch": { "default": (0, -3) }, "ness": { "default": (-2, 0) }, diff --git a/lokrez/templates/meltdownlyon2020/characters_corrections.j2 b/lokrez/templates/meltdownlyon2020/characters_corrections.j2 index 9b9eb46..1b1464f 100644 --- a/lokrez/templates/meltdownlyon2020/characters_corrections.j2 +++ b/lokrez/templates/meltdownlyon2020/characters_corrections.j2 @@ -61,6 +61,9 @@ "mega man": { "default": (30, -10) }, "meta knight": { "default": (10, -38) }, "mewtwo": { "default": (10, -16) }, + "mii fighter": { "default": (0, 0) }, + "mii gunner": { "default": (0, 0) }, + "mii swordsman": { "default": (0, 0) }, "min min": { "default": (10, -23) }, "mr game and watch": { "default": (26, -13) }, "ness": { "default": (38, -10) }, diff --git a/lokrez/templates/rebootlyon2020/characters_corrections.j2 b/lokrez/templates/rebootlyon2020/characters_corrections.j2 index 9c9c58b..89850fb 100644 --- a/lokrez/templates/rebootlyon2020/characters_corrections.j2 +++ b/lokrez/templates/rebootlyon2020/characters_corrections.j2 @@ -55,6 +55,9 @@ "mega man": { "default": (30, -10) }, "meta knight": { "default": (10, -38) }, "mewtwo": { "default": (10, -16) }, + "mii fighter": { "default": (0, 0) }, + "mii gunner": { "default": (0, 0) }, + "mii swordsman": { "default": (0, 0) }, "min min": { "default": (10, -23) }, "mr game and watch": { "default": (26, -11) }, "ness": { "default": (38, -10) }, From e103348201a47aa8c783852a514d8b574b2b1981 Mon Sep 17 00:00:00 2001 From: Lertsenem Date: Mon, 8 Mar 2021 23:37:39 +0100 Subject: [PATCH 03/12] Adding new SSBU character Pyra & Mythra Since there are 4 different images variations, there are actually 4 characters added: - pyra - pyra & mythra - mythra - mythra & pyra --- lokrez/characters_ssbu.py | 32 +++++++++++++++++++ lokrez/templates/_covid/covid.j2 | 4 +++ .../confismash/characters_corrections.j2 | 6 +++- .../characters_corrections.j2 | 4 +++ .../rebootlyon2020/characters_corrections.j2 | 4 +++ 5 files changed, 49 insertions(+), 1 deletion(-) diff --git a/lokrez/characters_ssbu.py b/lokrez/characters_ssbu.py index 8cc5c2f..71afc99 100644 --- a/lokrez/characters_ssbu.py +++ b/lokrez/characters_ssbu.py @@ -703,5 +703,37 @@ EVERYONE = [ "https://www.spriters-resource.com/download/145102/", ], ), + SSBUCharacter( + smashggid = None, + name = "pyra", + codename = "eflame_only", + spritersurls = [ + "https://www.spriters-resource.com/download/149626/", + ], + ), + SSBUCharacter( + smashggid = None, + name = "pyra & mythra", + codename = "eflame_first", + spritersurls = [ + "https://www.spriters-resource.com/download/149627/", + ], + ), + SSBUCharacter( + smashggid = None, + name = "mythra", + codename = "elight_only", + spritersurls = [ + "https://www.spriters-resource.com/download/149628/", + ], + ), + SSBUCharacter( + smashggid = None, + name = "mythra & pyra", + codename = "elight_first", + spritersurls = [ + "https://www.spriters-resource.com/download/149629/", + ], + ), ] diff --git a/lokrez/templates/_covid/covid.j2 b/lokrez/templates/_covid/covid.j2 index a5d379e..b962719 100644 --- a/lokrez/templates/_covid/covid.j2 +++ b/lokrez/templates/_covid/covid.j2 @@ -1034,6 +1034,10 @@ "09": "zero suit samus", "10": "zero suit samus", }, + "pyra": {}, + "pyra & mythra": {}, + "mythra": {}, + "mythra & pyra": {}, } %} diff --git a/lokrez/templates/confismash/characters_corrections.j2 b/lokrez/templates/confismash/characters_corrections.j2 index 4c8ebe3..93f6111 100644 --- a/lokrez/templates/confismash/characters_corrections.j2 +++ b/lokrez/templates/confismash/characters_corrections.j2 @@ -74,7 +74,7 @@ "mii fighter": { "default": (0, 0) }, "mii gunner": { "default": (0, 0) }, "mii swordsman": { "default": (0, 0) }, - "min min": { "default": (-30, -13) }, + "min min": { "default": (-60, -13) }, "mr game and watch": { "default": (0, -3) }, "ness": { "default": (-2, 0) }, "olimar": { "default": (-20, -17) }, @@ -116,5 +116,9 @@ "young link": { "default": (-16, 0) }, "zelda": { "default": (-80, 0) }, "zero suit samus": { "default": (-53, -1) }, + "pyra" : { "default": (0, 0) }, + "pyra & mythra" : { "default": (0, 0) }, + "mythra" : { "default": (0, 0) }, + "mythra & pyra" : { "default": (0, 0) }, } %} diff --git a/lokrez/templates/meltdownlyon2020/characters_corrections.j2 b/lokrez/templates/meltdownlyon2020/characters_corrections.j2 index 1b1464f..07170cb 100644 --- a/lokrez/templates/meltdownlyon2020/characters_corrections.j2 +++ b/lokrez/templates/meltdownlyon2020/characters_corrections.j2 @@ -106,5 +106,9 @@ "young link": { "default": (24, -10) }, "zelda": { "default": (-20,-7) }, "zero suit samus": { "default": (-13, -11) }, + "pyra" : { "default": (0, 0) }, + "pyra & mythra" : { "default": (0, 0) }, + "mythra" : { "default": (0, 0) }, + "mythra & pyra" : { "default": (0, 0) }, } %} diff --git a/lokrez/templates/rebootlyon2020/characters_corrections.j2 b/lokrez/templates/rebootlyon2020/characters_corrections.j2 index 89850fb..e9495cf 100644 --- a/lokrez/templates/rebootlyon2020/characters_corrections.j2 +++ b/lokrez/templates/rebootlyon2020/characters_corrections.j2 @@ -100,5 +100,9 @@ "young link": { "default": (24, -10) }, "zelda": { "default": (-20,-7) }, "zero suit samus": { "default": (-13, -11) }, + "pyra" : { "default": (0, 0) }, + "pyra & mythra" : { "default": (0, 0) }, + "mythra" : { "default": (0, 0) }, + "mythra & pyra" : { "default": (0, 0) }, } %} From d156a8f54cea535e04f0401a3cc83ac8db46ef30 Mon Sep 17 00:00:00 2001 From: Lertsenem Date: Mon, 8 Mar 2021 23:55:39 +0100 Subject: [PATCH 04/12] Add character corrections for Pyra & Mythra There's still a bug with secondaries though --- lokrez/templates/confismash/characters_corrections.j2 | 8 ++++---- .../templates/meltdownlyon2020/characters_corrections.j2 | 8 ++++---- lokrez/templates/rebootlyon2020/characters_corrections.j2 | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lokrez/templates/confismash/characters_corrections.j2 b/lokrez/templates/confismash/characters_corrections.j2 index 93f6111..5727860 100644 --- a/lokrez/templates/confismash/characters_corrections.j2 +++ b/lokrez/templates/confismash/characters_corrections.j2 @@ -116,9 +116,9 @@ "young link": { "default": (-16, 0) }, "zelda": { "default": (-80, 0) }, "zero suit samus": { "default": (-53, -1) }, - "pyra" : { "default": (0, 0) }, - "pyra & mythra" : { "default": (0, 0) }, - "mythra" : { "default": (0, 0) }, - "mythra & pyra" : { "default": (0, 0) }, + "pyra" : { "default": (-90, 0) }, + "pyra & mythra" : { "default": (-140, 0) }, + "mythra" : { "default": (-30, 0) }, + "mythra & pyra" : { "default": (-80, 0) }, } %} diff --git a/lokrez/templates/meltdownlyon2020/characters_corrections.j2 b/lokrez/templates/meltdownlyon2020/characters_corrections.j2 index 07170cb..894b2b2 100644 --- a/lokrez/templates/meltdownlyon2020/characters_corrections.j2 +++ b/lokrez/templates/meltdownlyon2020/characters_corrections.j2 @@ -106,9 +106,9 @@ "young link": { "default": (24, -10) }, "zelda": { "default": (-20,-7) }, "zero suit samus": { "default": (-13, -11) }, - "pyra" : { "default": (0, 0) }, - "pyra & mythra" : { "default": (0, 0) }, - "mythra" : { "default": (0, 0) }, - "mythra & pyra" : { "default": (0, 0) }, + "pyra" : { "default": (-90, 0) }, + "pyra & mythra" : { "default": (-140, 0) }, + "mythra" : { "default": (-30, 0) }, + "mythra & pyra" : { "default": (-80, 0) }, } %} diff --git a/lokrez/templates/rebootlyon2020/characters_corrections.j2 b/lokrez/templates/rebootlyon2020/characters_corrections.j2 index e9495cf..65b62e2 100644 --- a/lokrez/templates/rebootlyon2020/characters_corrections.j2 +++ b/lokrez/templates/rebootlyon2020/characters_corrections.j2 @@ -100,9 +100,9 @@ "young link": { "default": (24, -10) }, "zelda": { "default": (-20,-7) }, "zero suit samus": { "default": (-13, -11) }, - "pyra" : { "default": (0, 0) }, - "pyra & mythra" : { "default": (0, 0) }, - "mythra" : { "default": (0, 0) }, - "mythra & pyra" : { "default": (0, 0) }, + "pyra" : { "default": (-90, 0) }, + "pyra & mythra" : { "default": (-140, 0) }, + "mythra" : { "default": (-30, 0) }, + "mythra & pyra" : { "default": (-80, 0) }, } %} From 7dd02cef5c4d67cc9081976f24eb90b499331693 Mon Sep 17 00:00:00 2001 From: Lertsenem Date: Wed, 10 Mar 2021 09:08:08 +0100 Subject: [PATCH 05/12] Change Robin charcorrs Robin has 2 different illustations (man/woman) for their even and odd skins. New characar_corrections take this into account. Tested with the confismash theme. --- lokrez/templates/confismash/characters_corrections.j2 | 8 +++++++- .../templates/meltdownlyon2020/characters_corrections.j2 | 8 +++++++- lokrez/templates/rebootlyon2020/characters_corrections.j2 | 8 +++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/lokrez/templates/confismash/characters_corrections.j2 b/lokrez/templates/confismash/characters_corrections.j2 index 5727860..6827d03 100644 --- a/lokrez/templates/confismash/characters_corrections.j2 +++ b/lokrez/templates/confismash/characters_corrections.j2 @@ -89,7 +89,13 @@ "richter": { "default": (-20, -10) }, "ridley": { "default": (-52, -40) }, "rob": { "default": (-25, 6) }, - "robin": { "default": (-40, -8) }, + "robin": { + "default": (-32, -8), + "01": (-70, -17), + "03": (-70, -17), + "05": (-70, -17), + "07": (-70, -17), + }, "rosalina and luma": { "default": (-30, 0) }, "roy": { "default": (-25, -7) }, "ryu": { "default": (-30, 6) }, diff --git a/lokrez/templates/meltdownlyon2020/characters_corrections.j2 b/lokrez/templates/meltdownlyon2020/characters_corrections.j2 index 894b2b2..9a37bd4 100644 --- a/lokrez/templates/meltdownlyon2020/characters_corrections.j2 +++ b/lokrez/templates/meltdownlyon2020/characters_corrections.j2 @@ -79,7 +79,13 @@ "richter": { "default": (20, -20) }, "ridley": { "default": (15, -37) }, "rob": { "default": (15, -4) }, - "robin": { "default": (0, -18) }, + "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) }, diff --git a/lokrez/templates/rebootlyon2020/characters_corrections.j2 b/lokrez/templates/rebootlyon2020/characters_corrections.j2 index 65b62e2..92ed847 100644 --- a/lokrez/templates/rebootlyon2020/characters_corrections.j2 +++ b/lokrez/templates/rebootlyon2020/characters_corrections.j2 @@ -73,7 +73,13 @@ "richter": { "default": (6, -30) }, "ridley": { "default": (20, -20) }, "rob": { "default": (15, -4) }, - "robin": { "default": (0, -18) }, + "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) }, From 8de436f55c116906fb4639895e84869e3e063f98 Mon Sep 17 00:00:00 2001 From: Lertsenem Date: Wed, 9 Jun 2021 00:24:27 +0200 Subject: [PATCH 06/12] Change Richter and Cloud charcorr --- lokrez/templates/confismash/characters_corrections.j2 | 10 ++++++++-- .../meltdownlyon2020/characters_corrections.j2 | 8 +++++++- .../templates/rebootlyon2020/characters_corrections.j2 | 8 +++++++- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/lokrez/templates/confismash/characters_corrections.j2 b/lokrez/templates/confismash/characters_corrections.j2 index 6827d03..512294d 100644 --- a/lokrez/templates/confismash/characters_corrections.j2 +++ b/lokrez/templates/confismash/characters_corrections.j2 @@ -24,7 +24,13 @@ "captain falcon": { "default": (-60, 10) }, "charizard": { "default": (-17, -12) }, "chrom": { "default": (-38, -12) }, - "cloud": { "default": (-20, 0) }, + "cloud": { + "default": (-20, 0), + "01": (-57,0), + "03": (-57,0), + "05": (-57,0), + "07": (-57,0), + }, "corrin": { "default": (-77, 3) }, "daisy": { "default": (-5, 0) }, "dark pit": { "default": (-40, -8) }, @@ -86,7 +92,7 @@ "piranha plant": { "default": (-25, 5) }, "pit": { "default": (-40, -7) }, "pokemon trainer": { "default": (-15, 5) }, - "richter": { "default": (-20, -10) }, + "richter": { "default": (-50, -30) }, "ridley": { "default": (-52, -40) }, "rob": { "default": (-25, 6) }, "robin": { diff --git a/lokrez/templates/meltdownlyon2020/characters_corrections.j2 b/lokrez/templates/meltdownlyon2020/characters_corrections.j2 index 9a37bd4..20b3ab7 100644 --- a/lokrez/templates/meltdownlyon2020/characters_corrections.j2 +++ b/lokrez/templates/meltdownlyon2020/characters_corrections.j2 @@ -18,7 +18,13 @@ "captain falcon": { "default": (-20, 0) }, "charizard": { "default": (23, -22) }, "chrom": { "default": (2, -12) }, - "cloud": { "default": (20, -10) }, + "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) }, diff --git a/lokrez/templates/rebootlyon2020/characters_corrections.j2 b/lokrez/templates/rebootlyon2020/characters_corrections.j2 index 92ed847..9848d18 100644 --- a/lokrez/templates/rebootlyon2020/characters_corrections.j2 +++ b/lokrez/templates/rebootlyon2020/characters_corrections.j2 @@ -12,7 +12,13 @@ "captain falcon": { "default": (13, 0) }, "charizard": { "default": (23, -22) }, "chrom": { "default": (2, -12) }, - "cloud": { "default": (20, -10) }, + "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) }, From d811ef6577f5b1b5367e28b8ab88b9110dd73e0e Mon Sep 17 00:00:00 2001 From: Lertsenem Date: Wed, 23 Jun 2021 11:06:26 +0200 Subject: [PATCH 07/12] Add character corrections for rebootlyon2020 New character corrections for pyra & mythra. --- lokrez/templates/rebootlyon2020/characters_corrections.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lokrez/templates/rebootlyon2020/characters_corrections.j2 b/lokrez/templates/rebootlyon2020/characters_corrections.j2 index 9848d18..7694ea0 100644 --- a/lokrez/templates/rebootlyon2020/characters_corrections.j2 +++ b/lokrez/templates/rebootlyon2020/characters_corrections.j2 @@ -112,9 +112,9 @@ "young link": { "default": (24, -10) }, "zelda": { "default": (-20,-7) }, "zero suit samus": { "default": (-13, -11) }, - "pyra" : { "default": (-90, 0) }, - "pyra & mythra" : { "default": (-140, 0) }, - "mythra" : { "default": (-30, 0) }, - "mythra & pyra" : { "default": (-80, 0) }, + "pyra" : { "default": (-30, -10) }, + "pyra & mythra" : { "default": (-65, -18) }, + "mythra" : { "default": (30, -10) }, + "mythra & pyra" : { "default": (-20, -10) }, } %} From abc2d82ca149ca54eef227452c96ad46241aa699 Mon Sep 17 00:00:00 2001 From: Lertsenem Date: Sat, 3 Jul 2021 20:41:25 +0200 Subject: [PATCH 08/12] Add characters missing smashgg id --- lokrez/characters_ssbu.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lokrez/characters_ssbu.py b/lokrez/characters_ssbu.py index 71afc99..a01e3b0 100644 --- a/lokrez/characters_ssbu.py +++ b/lokrez/characters_ssbu.py @@ -24,7 +24,7 @@ EVERYONE = [ ], ), SSBUCharacter( - smashggid = None, + smashggid = 1271, name = "bayonetta", codename = "bayonetta", spritersurls = [ @@ -88,7 +88,7 @@ EVERYONE = [ ], ), SSBUCharacter( - smashggid = None, + smashggid = 1276, name = "corrin", codename = "kamui", spritersurls = [ @@ -104,7 +104,7 @@ EVERYONE = [ ], ), SSBUCharacter( - smashggid = None, + smashggid = 1278, name = "dark pit", codename = "pitb", spritersurls = [ @@ -168,7 +168,7 @@ EVERYONE = [ ], ), SSBUCharacter( - smashggid = None, + smashggid = 1289, name = "greninja", codename = "gekkouga", spritersurls = [ @@ -304,7 +304,7 @@ EVERYONE = [ ], ), SSBUCharacter( - smashggid = None, + smashggid = 1304, name = "marth", codename = "marth", spritersurls = [ @@ -336,7 +336,7 @@ EVERYONE = [ ], ), SSBUCharacter( - smashggid = None, + smashggid = 1311, name = "mii fighter", codename = "miifighter", spritersurls = [ @@ -352,7 +352,7 @@ EVERYONE = [ ], ), SSBUCharacter( - smashggid = None, + smashggid = 1414, name = "mii swordsman", codename = "miiswordsman", spritersurls = [ @@ -512,7 +512,7 @@ EVERYONE = [ ], ), SSBUCharacter( - smashggid = None, + smashggid = 1411, name = "simon", codename = "simon", spritersurls = [ @@ -712,7 +712,7 @@ EVERYONE = [ ], ), SSBUCharacter( - smashggid = None, + smashggid = 1795, name = "pyra & mythra", codename = "eflame_first", spritersurls = [ From 89b78d1125649cb8f66f4f76e7fe1b68e3445d53 Mon Sep 17 00:00:00 2001 From: Lertsenem Date: Thu, 8 Jul 2021 20:10:31 +0200 Subject: [PATCH 09/12] Add new character: Kazuya --- lokrez/characters_ssbu.py | 8 ++++++++ lokrez/templates/confismash/characters_corrections.j2 | 1 + lokrez/templates/rebootlyon2020/characters_corrections.j2 | 1 + 3 files changed, 10 insertions(+) diff --git a/lokrez/characters_ssbu.py b/lokrez/characters_ssbu.py index a01e3b0..116abb1 100644 --- a/lokrez/characters_ssbu.py +++ b/lokrez/characters_ssbu.py @@ -735,5 +735,13 @@ EVERYONE = [ "https://www.spriters-resource.com/download/149629/", ], ), + SSBUCharacter( + smashggid = None, + name = "kazuya", + codename = "demon", + spritersurls = [ + "https://www.spriters-resource.com/download/156997/", + ], + ), ] diff --git a/lokrez/templates/confismash/characters_corrections.j2 b/lokrez/templates/confismash/characters_corrections.j2 index 512294d..101117e 100644 --- a/lokrez/templates/confismash/characters_corrections.j2 +++ b/lokrez/templates/confismash/characters_corrections.j2 @@ -62,6 +62,7 @@ "06": (-20, -8), "07": (-20, -8), }, + "kazuya": { "default": (0, 0) }, "ken": { "default": (-20, 0) }, "king dedede": { "default": (-20, 0) }, "king k rool": { "default": (-20, 3) }, diff --git a/lokrez/templates/rebootlyon2020/characters_corrections.j2 b/lokrez/templates/rebootlyon2020/characters_corrections.j2 index 7694ea0..9515e8c 100644 --- a/lokrez/templates/rebootlyon2020/characters_corrections.j2 +++ b/lokrez/templates/rebootlyon2020/characters_corrections.j2 @@ -46,6 +46,7 @@ "04": (10, -15), "06": (10, -15), }, + "kazuya": { "default": (0, 0) }, "ken": { "default": (20, -10) }, "king dedede": { "default": (20, -10) }, "king k rool": { "default": (20, -7) }, From 90535b9675f0aee8f4e6aefd1ece6c8fe8a861fc Mon Sep 17 00:00:00 2001 From: Lertsenem Date: Thu, 8 Jul 2021 20:13:07 +0200 Subject: [PATCH 10/12] Change Twitch stream from rebootlyon to smashlyon --- lokrez/templates/rebootlyon2020/template.svg.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lokrez/templates/rebootlyon2020/template.svg.j2 b/lokrez/templates/rebootlyon2020/template.svg.j2 index d7e114b..14720cd 100644 --- a/lokrez/templates/rebootlyon2020/template.svg.j2 +++ b/lokrez/templates/rebootlyon2020/template.svg.j2 @@ -759,7 +759,7 @@ y="86.067726" x="40.968357" id="tspan1263" - sodipodi:role="line">rebootlyon + sodipodi:role="line">smashlyon Date: Thu, 8 Jul 2021 20:21:29 +0200 Subject: [PATCH 11/12] Fix character position: sephiroth --- lokrez/templates/rebootlyon2020/characters_corrections.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lokrez/templates/rebootlyon2020/characters_corrections.j2 b/lokrez/templates/rebootlyon2020/characters_corrections.j2 index 9515e8c..10e9557 100644 --- a/lokrez/templates/rebootlyon2020/characters_corrections.j2 +++ b/lokrez/templates/rebootlyon2020/characters_corrections.j2 @@ -92,9 +92,9 @@ "ryu": { "default": (10, -4) }, "samus": { "default": (30, -18) }, "sephiroth": { - "default": (-90, -30), - "06": (-120, 0), - "07": (-120, 0), + "default": (-20, -30), + "06": (-50, 0), + "07": (-50, 0), }, "sheik": { "default": (0, -13) }, "shulk": { "default": (18, -20) }, From 06a67559fb9bad039b2f9a667b068fb63df4e790 Mon Sep 17 00:00:00 2001 From: Lertsenem Date: Fri, 23 Jul 2021 16:38:39 +0200 Subject: [PATCH 12/12] Fix Palutena position --- lokrez/templates/confismash/characters_corrections.j2 | 2 +- lokrez/templates/rebootlyon2020/characters_corrections.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lokrez/templates/confismash/characters_corrections.j2 b/lokrez/templates/confismash/characters_corrections.j2 index 101117e..2d7e69b 100644 --- a/lokrez/templates/confismash/characters_corrections.j2 +++ b/lokrez/templates/confismash/characters_corrections.j2 @@ -86,7 +86,7 @@ "ness": { "default": (-2, 0) }, "olimar": { "default": (-20, -17) }, "pacman": { "default": (-6, 2) }, - "palutena": { "default": (-85, -30) }, + "palutena": { "default": (-125, -40) }, "peach": { "default": (-32, -6) }, "pichu": { "default": (7, -15) }, "pikachu": { "default": (0, -17) }, diff --git a/lokrez/templates/rebootlyon2020/characters_corrections.j2 b/lokrez/templates/rebootlyon2020/characters_corrections.j2 index 10e9557..aa47ae4 100644 --- a/lokrez/templates/rebootlyon2020/characters_corrections.j2 +++ b/lokrez/templates/rebootlyon2020/characters_corrections.j2 @@ -70,7 +70,7 @@ "ness": { "default": (38, -10) }, "olimar": { "default": (20, -27) }, "pacman": { "default": (34, -13) }, - "palutena": { "default": (-20, -20) }, + "palutena": { "default": (-50, -35) }, "peach": { "default": (8, -16) }, "pichu": { "default": (47, -25) }, "pikachu": { "default": (30, -19) },