lertsenem
/
ssbu_lokrez
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into multismash

master
Lertsenem 2021-07-26 09:58:42 +02:00
parent c5e2e062b8 06a67559fb
commit 6d6d26e384
6 changed files with 116 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lokrez/games/ssbu.py
View File

@ -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/",
],
},
),
] ]

8
lokrez/templates/_covid/covid.j2
View File

@ -358,6 +358,7 @@
"10": "jigglypuff", "10": "jigglypuff",
}, },
"joker": { "joker": {
"00": "joker",
"01": "joker", "01": "joker",
"02": "joker", "02": "joker",
"03": "joker", "03": "joker",
@ -559,6 +560,9 @@
"09": "mewtwo", "09": "mewtwo",
"10": "mewtwo", "10": "mewtwo",
}, },
"mii fighter": {},
"mii gunner": {},
"mii swordsman": {},
"min min": { "min min": {
"00": "min min", "00": "min min",
"01": "min min", "01": "min min",
@ -1030,6 +1034,10 @@
"09": "zero suit samus", "09": "zero suit samus",
"10": "zero suit samus", "10": "zero suit samus",
}, },
"pyra": {},
"pyra & mythra": {},
"mythra": {},
"mythra & pyra": {},
} %} } %}

32
lokrez/templates/confismash/characters_corrections.j2
View File

@ -16,10 +16,10 @@
}, },
"byleth": { "byleth": {
"default": (-55, 5, 0.85), "default": (-55, 5, 0.85),
"01": (-20,-10, 0.85), "01": (-27,-10, 0.85),
"03": (-20,-10, 0.85), "03": (-27,-10, 0.85),
"05": (-20,-10, 0.85), "05": (-27,-10, 0.85),
"07": (-20,-10, 0.85), "07": (-27,-10, 0.85),
}, },
"captain falcon": { "default": (-60, 10) }, "captain falcon": { "default": (-60, 10) },
"charizard": { "default": (-17, -12) }, "charizard": { "default": (-17, -12) },
@ -62,6 +62,7 @@
"06": (-20, -8), "06": (-20, -8),
"07": (-20, -8), "07": (-20, -8),
}, },
"kazuya": { "default": (0, 0) },
"ken": { "default": (-20, 0) }, "ken": { "default": (-20, 0) },
"king dedede": { "default": (-20, 0) }, "king dedede": { "default": (-20, 0) },
"king k rool": { "default": (-20, 3) }, "king k rool": { "default": (-20, 3) },
@ -73,16 +74,19 @@
"lucina": { "default": (-83, 2) }, "lucina": { "default": (-83, 2) },
"luigi": { "default": (-5, 3) }, "luigi": { "default": (-5, 3) },
"mario": { "default": (-10, -10) }, "mario": { "default": (-10, -10) },
"marth": { "default": (-70, -3) }, "marth": { "default": (-97, -3) },
"mega man": { "default": (-10, 0) }, "mega man": { "default": (-10, 0) },
"meta knight": { "default": (-30, -28) }, "meta knight": { "default": (-30, -28) },
"mewtwo": { "default": (-30, -6) }, "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) }, "mr game and watch": { "default": (0, -3) },
"ness": { "default": (-2, 0) }, "ness": { "default": (-2, 0) },
"olimar": { "default": (-20, -17) }, "olimar": { "default": (-20, -17) },
"pacman": { "default": (-6, 2) }, "pacman": { "default": (-6, 2) },
"palutena": { "default": (-85, -30) }, "palutena": { "default": (-125, -40) },
"peach": { "default": (-32, -6) }, "peach": { "default": (-32, -6) },
"pichu": { "default": (7, -15) }, "pichu": { "default": (7, -15) },
"pikachu": { "default": (0, -17) }, "pikachu": { "default": (0, -17) },
@ -92,7 +96,13 @@
"richter": { "default": (-50, -30) }, "richter": { "default": (-50, -30) },
"ridley": { "default": (-52, -40) }, "ridley": { "default": (-52, -40) },
"rob": { "default": (-25, 6) }, "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) }, "rosalina and luma": { "default": (-30, 0) },
"roy": { "default": (-25, -7) }, "roy": { "default": (-25, -7) },
"ryu": { "default": (-30, 6) }, "ryu": { "default": (-30, 6) },
@ -117,7 +127,11 @@
"wolf": { "default": (-17, 3) }, "wolf": { "default": (-17, 3) },
"yoshi": { "default": (0, 9) }, "yoshi": { "default": (0, 9) },
"young link": { "default": (-16, 0) }, "young link": { "default": (-16, 0) },
"zelda": { "default": (-70, 0) }, "zelda": { "default": (-80, 0) },
"zero suit samus": { "default": (-53, -1) }, "zero suit samus": { "default": (-53, -1) },
"pyra" : { "default": (-90, 0) },
"pyra & mythra" : { "default": (-140, 0) },
"mythra" : { "default": (-30, 0) },
"mythra & pyra" : { "default": (-80, 0) },
} %} } %}

15
lokrez/templates/meltdownlyon2020/characters_corrections.j2
View File

@ -67,6 +67,9 @@
"mega man": { "default": (30, -10) }, "mega man": { "default": (30, -10) },
"meta knight": { "default": (10, -38) }, "meta knight": { "default": (10, -38) },
"mewtwo": { "default": (10, -16) }, "mewtwo": { "default": (10, -16) },
"mii fighter": { "default": (0, 0) },
"mii gunner": { "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) },
"ness": { "default": (38, -10) }, "ness": { "default": (38, -10) },
@ -82,7 +85,13 @@
"richter": { "default": (20, -20) }, "richter": { "default": (20, -20) },
"ridley": { "default": (15, -37) }, "ridley": { "default": (15, -37) },
"rob": { "default": (15, -4) }, "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) }, "rosalina and luma": { "default": (10, -10) },
"roy": { "default": (15, -17) }, "roy": { "default": (15, -17) },
"ryu": { "default": (10, -4) }, "ryu": { "default": (10, -4) },
@ -109,5 +118,9 @@
"young link": { "default": (24, -10) }, "young link": { "default": (24, -10) },
"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 & mythra" : { "default": (-140, 0) },
"mythra" : { "default": (-30, 0) },
"mythra & pyra" : { "default": (-80, 0) },
} %} } %}

20
lokrez/templates/rebootlyon2020/characters_corrections.j2
View File

@ -46,6 +46,7 @@
"04": (10, -15), "04": (10, -15),
"06": (10, -15), "06": (10, -15),
}, },
"kazuya": { "default": (0, 0) },
"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) },
@ -61,12 +62,15 @@
"mega man": { "default": (30, -10) }, "mega man": { "default": (30, -10) },
"meta knight": { "default": (10, -38) }, "meta knight": { "default": (10, -38) },
"mewtwo": { "default": (10, -16) }, "mewtwo": { "default": (10, -16) },
"mii fighter": { "default": (0, 0) },
"mii gunner": { "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) },
"ness": { "default": (38, -10) }, "ness": { "default": (38, -10) },
"olimar": { "default": (20, -27) }, "olimar": { "default": (20, -27) },
"pacman": { "default": (34, -13) }, "pacman": { "default": (34, -13) },
"palutena": { "default": (-20, -20) }, "palutena": { "default": (-50, -35) },
"peach": { "default": (8, -16) }, "peach": { "default": (8, -16) },
"pichu": { "default": (47, -25) }, "pichu": { "default": (47, -25) },
"pikachu": { "default": (30, -19) }, "pikachu": { "default": (30, -19) },
@ -76,15 +80,21 @@
"richter": { "default": (6, -30) }, "richter": { "default": (6, -30) },
"ridley": { "default": (20, -20) }, "ridley": { "default": (20, -20) },
"rob": { "default": (15, -4) }, "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) }, "rosalina and luma": { "default": (10, -10) },
"roy": { "default": (15, -17) }, "roy": { "default": (15, -17) },
"ryu": { "default": (10, -4) }, "ryu": { "default": (10, -4) },
"samus": { "default": (30, -18) }, "samus": { "default": (30, -18) },
"sephiroth": { "sephiroth": {
"default": (-90, -30), "default": (-20, -30),
"06": (-120, 0), "06": (-50, 0),
"07": (-120, 0), "07": (-50, 0),
}, },
"sheik": { "default": (0, -13) }, "sheik": { "default": (0, -13) },
"shulk": { "default": (18, -20) }, "shulk": { "default": (18, -20) },

2
lokrez/templates/rebootlyon2020/template.svg.j2
View File

@ -759,7 +759,7 @@
y="86.067726" y="86.067726"
x="40.968357" x="40.968357"
id="tspan1263" id="tspan1263"
sodipodi:role="line">rebootlyon</tspan></text> sodipodi:role="line">smashlyon</tspan></text>
<path <path
id="path1337" id="path1337"
d="m 28.927372,43.169476 c 0,-1.022499 -0.833954,-1.856452 -1.856454,-1.856452 -1.022498,0 -1.856453,0.833953 -1.856453,1.856452 0,1.022499 0.833955,1.856453 1.856453,1.856453 1.0225,0 1.856454,-0.833954 1.856454,-1.856453 z m 1.856452,0 c 0,0.442356 -0.05076,0.899219 -0.239311,1.298066 l -2.639641,5.612868 c -0.152288,0.319077 -0.485867,0.514873 -0.833954,0.514873 -0.348085,0 -0.681665,-0.195796 -0.8267,-0.514873 L 23.59732,44.467542 c -0.188546,-0.398847 -0.239307,-0.85571 -0.239307,-1.298066 0,-2.052251 1.660653,-3.712906 3.712905,-3.712906 2.052249,0 3.712906,1.660655 3.712906,3.712906 z" d="m 28.927372,43.169476 c 0,-1.022499 -0.833954,-1.856452 -1.856454,-1.856452 -1.022498,0 -1.856453,0.833953 -1.856453,1.856452 0,1.022499 0.833955,1.856453 1.856453,1.856453 1.0225,0 1.856454,-0.833954 1.856454,-1.856453 z m 1.856452,0 c 0,0.442356 -0.05076,0.899219 -0.239311,1.298066 l -2.639641,5.612868 c -0.152288,0.319077 -0.485867,0.514873 -0.833954,0.514873 -0.348085,0 -0.681665,-0.195796 -0.8267,-0.514873 L 23.59732,44.467542 c -0.188546,-0.398847 -0.239307,-0.85571 -0.239307,-1.298066 0,-2.052251 1.660653,-3.712906 3.712905,-3.712906 2.052249,0 3.712906,1.660655 3.712906,3.712906 z"