Browse Source

Merge branch 'master' into multismash

Lertsenem 2 years ago
parent
commit
6d6d26e384

+ 55 - 0
lokrez/games/ssbu.py

@@ -959,5 +959,60 @@ EVERYONE = [
959 959
                         ],
960 960
                     },
961 961
                 ),
962
+        Character(
963
+                smashggid = None,
964
+                name = "pyra",
965
+                codename = [ "eflame_only", ]
966
+                res_urls = {
967
+                    "spriters": [
968
+                        "https://www.spriters-resource.com/download/149626/",
969
+                        "https://www.spriters-resource.com/download/111395/",
970
+                        ],
971
+                    },
972
+                ),
973
+        Character(
974
+                smashggid = 1795,
975
+                name = "pyra & mythra",
976
+                codename =  [ "eflame_first", ]
977
+                res_urls = {
978
+                    "spriters": [
979
+                        "https://www.spriters-resource.com/download/149627/",
980
+                        "https://www.spriters-resource.com/download/111395/",
981
+                        ],
982
+                    },
983
+                ),
984
+        Character(
985
+                smashggid = None,
986
+                name = "mythra",
987
+                codename = [ "elight_only", ]
988
+                res_urls = {
989
+                    "spriters": [
990
+                        "https://www.spriters-resource.com/download/149628/",
991
+                        "https://www.spriters-resource.com/download/111395/",
992
+                        ],
993
+                    },
994
+                ),
995
+        Character(
996
+                smashggid = None,
997
+                name = "mythra & pyra",
998
+                codename = [ "elight_first", ]
999
+                res_urls = {
1000
+                    "spriters": [
1001
+                        "https://www.spriters-resource.com/download/149629/",
1002
+                        "https://www.spriters-resource.com/download/111395/",
1003
+                        ],
1004
+                    },
1005
+                ),
1006
+        Character(
1007
+                smashggid = None,
1008
+                name = "kazuya",
1009
+                codename = [ "demon", ]
1010
+                res_urls = {
1011
+                    "spriters": [
1012
+                        "https://www.spriters-resource.com/download/156997/",
1013
+                        "https://www.spriters-resource.com/download/111395/",
1014
+                        ],
1015
+                    },
1016
+                ),
962 1017
         ]
963 1018
 

+ 8 - 0
lokrez/templates/_covid/covid.j2

@@ -358,6 +358,7 @@
358 358
         "10": "jigglypuff",
359 359
     },
360 360
     "joker": {
361
+        "00": "joker",
361 362
         "01": "joker",
362 363
         "02": "joker",
363 364
         "03": "joker",
@@ -559,6 +560,9 @@
559 560
         "09": "mewtwo",
560 561
         "10": "mewtwo",
561 562
     },
563
+    "mii fighter": {},
564
+    "mii gunner": {},
565
+    "mii swordsman": {},
562 566
     "min min": {
563 567
         "00": "min min",
564 568
         "01": "min min",
@@ -1030,6 +1034,10 @@
1030 1034
         "09": "zero suit samus",
1031 1035
         "10": "zero suit samus",
1032 1036
     },
1037
+    "pyra": {},
1038
+    "pyra & mythra": {},
1039
+    "mythra": {},
1040
+    "mythra & pyra": {},
1033 1041
 } %}
1034 1042
 
1035 1043
 

+ 23 - 9
lokrez/templates/confismash/characters_corrections.j2

@@ -16,10 +16,10 @@
16 16
         },
17 17
     "byleth": {
18 18
         "default": (-55, 5, 0.85),
19
-        "01": (-20,-10, 0.85),
20
-        "03": (-20,-10, 0.85),
21
-        "05": (-20,-10, 0.85),
22
-        "07": (-20,-10, 0.85),
19
+        "01": (-27,-10, 0.85),
20
+        "03": (-27,-10, 0.85),
21
+        "05": (-27,-10, 0.85),
22
+        "07": (-27,-10, 0.85),
23 23
         },
24 24
     "captain falcon": { "default": (-60, 10) },
25 25
     "charizard": { "default": (-17, -12) },
@@ -62,6 +62,7 @@
62 62
         "06": (-20, -8),
63 63
         "07": (-20, -8),
64 64
         },
65
+    "kazuya": { "default": (0, 0) },
65 66
     "ken": { "default": (-20, 0) },
66 67
     "king dedede": { "default": (-20, 0) },
67 68
     "king k rool": { "default": (-20, 3) },
@@ -73,16 +74,19 @@
73 74
     "lucina": { "default": (-83, 2) },
74 75
     "luigi": { "default": (-5, 3) },
75 76
     "mario": { "default": (-10, -10) },
76
-    "marth": { "default": (-70, -3) },
77
+    "marth": { "default": (-97, -3) },
77 78
     "mega man": { "default": (-10, 0) },
78 79
     "meta knight": { "default": (-30, -28) },
79 80
     "mewtwo": { "default": (-30, -6) },
80
-    "min min": { "default": (-63, -35) },
81
+    "mii fighter": { "default": (0, 0) },
82
+    "mii gunner": { "default": (0, 0) },
83
+    "mii swordsman": { "default": (0, 0) },
84
+    "min min": { "default": (-60, -13) },
81 85
     "mr game and watch": { "default": (0, -3) },
82 86
     "ness": { "default": (-2, 0) },
83 87
     "olimar": { "default": (-20, -17) },
84 88
     "pacman": { "default": (-6, 2) },
85
-    "palutena": { "default": (-85, -30) },
89
+    "palutena": { "default": (-125, -40) },
86 90
     "peach": { "default": (-32, -6) },
87 91
     "pichu": { "default": (7, -15) },
88 92
     "pikachu": { "default": (0, -17) },
@@ -92,7 +96,13 @@
92 96
     "richter": { "default": (-50, -30) },
93 97
     "ridley": { "default": (-52, -40) },
94 98
     "rob": { "default": (-25, 6) },
95
-    "robin": { "default": (-40, -8) },
99
+    "robin": {
100
+        "default": (-32, -8),
101
+        "01": (-70, -17),
102
+        "03": (-70, -17),
103
+        "05": (-70, -17),
104
+        "07": (-70, -17),
105
+     },
96 106
     "rosalina and luma": { "default": (-30, 0) },
97 107
     "roy": { "default": (-25, -7) },
98 108
     "ryu": { "default": (-30, 6) },
@@ -117,7 +127,11 @@
117 127
     "wolf": { "default": (-17, 3) },
118 128
     "yoshi": { "default": (0, 9) },
119 129
     "young link": { "default": (-16, 0) },
120
-    "zelda": { "default": (-70, 0) },
130
+    "zelda": { "default": (-80, 0) },
121 131
     "zero suit samus": { "default": (-53, -1) },
132
+    "pyra" : { "default": (-90, 0) },
133
+    "pyra & mythra" : { "default": (-140, 0) },
134
+    "mythra" : { "default": (-30, 0) },
135
+    "mythra & pyra" : { "default": (-80, 0) },
122 136
 } %}
123 137
 

+ 14 - 1
lokrez/templates/meltdownlyon2020/characters_corrections.j2

@@ -67,6 +67,9 @@
67 67
     "mega man": { "default": (30, -10) },
68 68
     "meta knight": { "default": (10, -38) },
69 69
     "mewtwo": { "default": (10, -16) },
70
+    "mii fighter": { "default": (0, 0) },
71
+    "mii gunner": { "default": (0, 0) },
72
+    "mii swordsman": { "default": (0, 0) },
70 73
     "min min": { "default": (10, -23) },
71 74
     "mr game and watch": { "default": (26, -13) },
72 75
     "ness": { "default": (38, -10) },
@@ -82,7 +85,13 @@
82 85
     "richter": { "default": (20, -20) },
83 86
     "ridley": { "default": (15, -37) },
84 87
     "rob": { "default": (15, -4) },
85
-    "robin": { "default": (0, -18) },
88
+    "robin": {
89
+        "default": (-32, -8),
90
+        "01": (-70, -17),
91
+        "03": (-70, -17),
92
+        "05": (-70, -17),
93
+        "07": (-70, -17),
94
+     },
86 95
     "rosalina and luma": { "default": (10, -10) },
87 96
     "roy": { "default": (15, -17) },
88 97
     "ryu": { "default": (10, -4) },
@@ -109,5 +118,9 @@
109 118
     "young link": { "default": (24, -10) },
110 119
     "zelda": { "default": (-20,-7) },
111 120
     "zero suit samus": { "default": (-13, -11) },
121
+    "pyra" : { "default": (-90, 0) },
122
+    "pyra & mythra" : { "default": (-140, 0) },
123
+    "mythra" : { "default": (-30, 0) },
124
+    "mythra & pyra" : { "default": (-80, 0) },
112 125
 } %}
113 126
 

+ 15 - 5
lokrez/templates/rebootlyon2020/characters_corrections.j2

@@ -46,6 +46,7 @@
46 46
         "04": (10, -15),
47 47
         "06": (10, -15),
48 48
             },
49
+    "kazuya": { "default": (0, 0) },
49 50
     "ken": { "default": (20, -10) },
50 51
     "king dedede": { "default": (20, -10) },
51 52
     "king k rool": { "default": (20, -7) },
@@ -61,12 +62,15 @@
61 62
     "mega man": { "default": (30, -10) },
62 63
     "meta knight": { "default": (10, -38) },
63 64
     "mewtwo": { "default": (10, -16) },
65
+    "mii fighter": { "default": (0, 0) },
66
+    "mii gunner": { "default": (0, 0) },
67
+    "mii swordsman": { "default": (0, 0) },
64 68
     "min min": { "default": (10, -23) },
65 69
     "mr game and watch": { "default": (26, -11) },
66 70
     "ness": { "default": (38, -10) },
67 71
     "olimar": { "default": (20, -27) },
68 72
     "pacman": { "default": (34, -13) },
69
-    "palutena": { "default": (-20, -20) },
73
+    "palutena": { "default": (-50, -35) },
70 74
     "peach": { "default": (8, -16) },
71 75
     "pichu": { "default": (47, -25) },
72 76
     "pikachu": { "default": (30, -19) },
@@ -76,15 +80,21 @@
76 80
     "richter": { "default": (6, -30) },
77 81
     "ridley": { "default": (20, -20) },
78 82
     "rob": { "default": (15, -4) },
79
-    "robin": { "default": (0, -18) },
83
+    "robin": {
84
+        "default": (-32, -8),
85
+        "01": (-70, -17),
86
+        "03": (-70, -17),
87
+        "05": (-70, -17),
88
+        "07": (-70, -17),
89
+     },
80 90
     "rosalina and luma": { "default": (10, -10) },
81 91
     "roy": { "default": (15, -17) },
82 92
     "ryu": { "default": (10, -4) },
83 93
     "samus": { "default": (30, -18) },
84 94
     "sephiroth": {
85
-        "default": (-90, -30),
86
-        "06": (-120, 0),
87
-        "07": (-120, 0),
95
+        "default": (-20, -30),
96
+        "06": (-50, 0),
97
+        "07": (-50, 0),
88 98
     },
89 99
     "sheik": { "default": (0, -13) },
90 100
     "shulk": { "default": (18, -20) },

File diff suppressed because it is too large
+ 1 - 1
lokrez/templates/rebootlyon2020/template.svg.j2