diff --git a/lokrez/games/ssbu.py b/lokrez/games/ssbu.py index 91f2813..cd5c7fe 100644 --- a/lokrez/games/ssbu.py +++ b/lokrez/games/ssbu.py @@ -959,5 +959,60 @@ EVERYONE = [ ], }, ), + Character( + smashggid = None, + name = "pyra", + codename = [ "eflame_only", ] + res_urls = { + "spriters": [ + "https://www.spriters-resource.com/download/149626/", + "https://www.spriters-resource.com/download/111395/", + ], + }, + ), + Character( + smashggid = 1795, + name = "pyra & mythra", + codename = [ "eflame_first", ] + res_urls = { + "spriters": [ + "https://www.spriters-resource.com/download/149627/", + "https://www.spriters-resource.com/download/111395/", + ], + }, + ), + Character( + smashggid = None, + name = "mythra", + codename = [ "elight_only", ] + res_urls = { + "spriters": [ + "https://www.spriters-resource.com/download/149628/", + "https://www.spriters-resource.com/download/111395/", + ], + }, + ), + Character( + smashggid = None, + name = "mythra & pyra", + codename = [ "elight_first", ] + res_urls = { + "spriters": [ + "https://www.spriters-resource.com/download/149629/", + "https://www.spriters-resource.com/download/111395/", + ], + }, + ), + Character( + smashggid = None, + name = "kazuya", + codename = [ "demon", ] + res_urls = { + "spriters": [ + "https://www.spriters-resource.com/download/156997/", + "https://www.spriters-resource.com/download/111395/", + ], + }, + ), ] diff --git a/lokrez/templates/_covid/covid.j2 b/lokrez/templates/_covid/covid.j2 index 4675af7..b962719 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", @@ -559,6 +560,9 @@ "09": "mewtwo", "10": "mewtwo", }, + "mii fighter": {}, + "mii gunner": {}, + "mii swordsman": {}, "min min": { "00": "min min", "01": "min min", @@ -1030,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 85d4287..2d7e69b 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) }, @@ -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) }, @@ -73,16 +74,19 @@ "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) }, - "min min": { "default": (-63, -35) }, + "mii fighter": { "default": (0, 0) }, + "mii gunner": { "default": (0, 0) }, + "mii swordsman": { "default": (0, 0) }, + "min min": { "default": (-60, -13) }, "mr game and watch": { "default": (0, -3) }, "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) }, @@ -92,7 +96,13 @@ "richter": { "default": (-50, -30) }, "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) }, @@ -117,7 +127,11 @@ "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) }, + "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 26434aa..20b3ab7 100644 --- a/lokrez/templates/meltdownlyon2020/characters_corrections.j2 +++ b/lokrez/templates/meltdownlyon2020/characters_corrections.j2 @@ -67,6 +67,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) }, @@ -82,7 +85,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) }, @@ -109,5 +118,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) }, } %} diff --git a/lokrez/templates/rebootlyon2020/characters_corrections.j2 b/lokrez/templates/rebootlyon2020/characters_corrections.j2 index b589362..aa47ae4 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) }, @@ -61,12 +62,15 @@ "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) }, "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) }, @@ -76,15 +80,21 @@ "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) }, "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) }, 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