From 34cdfc860698e0f8907704234557d6b6fc4068de Mon Sep 17 00:00:00 2001
From: Lertsenem <lertsenem@lertsenem.com>
Date: Fri, 21 Aug 2020 22:50:10 +0200
Subject: [PATCH] Add skin-dependant framing for reboot2020 template

Some characters have skins different enough that they need to be framed
differently (bowser jr, bayonetta, etc). Now the character
"corrections" used by the template to frame the characters correctly can
be set independently for each skin.
---
 .../rebootlyon2020/characters_corrections.j2  | 167 +++++++++---------
 .../templates/rebootlyon2020/template.svg.j2  |   8 +-
 2 files changed, 90 insertions(+), 85 deletions(-)

diff --git a/lokrez/templates/rebootlyon2020/characters_corrections.j2 b/lokrez/templates/rebootlyon2020/characters_corrections.j2
index b240ce0..e7aec8d 100644
--- a/lokrez/templates/rebootlyon2020/characters_corrections.j2
+++ b/lokrez/templates/rebootlyon2020/characters_corrections.j2
@@ -1,84 +1,89 @@
 {% set charcorr = {
-    "banjo & kazooie": (30, -18),
-    "bayonetta": (-28, -16),
-    "bowser": (10, -30),
-    "bowser jr": (40, -16),
-    "byleth": (-15, -5),
-    "captain falcon": (13, 0),
-    "charizard": (23, -22),
-    "chrom": (2, -12),
-    "cloud": (20, -10),
-    "corrin": (-37, -7),
-    "daisy": (35, -10),
-    "dark pit": (0, -18),
-    "dark samus": (-10, -5),
-    "diddy kong": (15, -10),
-    "donkey kong": (19, -6),
-    "dr mario": (40, -6),
-    "duck hunt": (30, -38),
-    "falco": (28, -7),
-    "fox": (30, -10),
-    "ganondorf": (-30, -6),
-    "greninja": (26, -20),
-    "hero": (25, -8),
-    "ice climbers": (12, -15),
-    "ike": (17, -7),
-    "incineroar": (20, -10),
-    "inkling": (20,-10),
-    "isabelle": (40, -20),
-    "ivysaur": (20, -33),
-    "jigglypuff": (30, -15),
-    "joker": (0, -18),
-    "ken": (20, -10),
-    "king dedede": (20, -10),
-    "king k rool": (20, -7),
-    "kirby": (30, -17),
-    "link": (-10, -20),
-    "little mac": (20, -5),
-    "lucario": (30, -13),
-    "lucas": (26, -15),
-    "lucina": (-23, -8),
-    "luigi": (35, -7),
-    "mario": (30, -20),
-    "marth": (-30, -13),
-    "mega man": (30, -10),
-    "meta knight": (10, -38),
-    "mewtwo": (10, -16),
-    "min min": (10, -23),
-    "mr game and watch": (26, -13),
-    "ness": (38, -10),
-    "olimar": (20, -27),
-    "pacman": (34, -13),
-    "palutena": (-20, -20),
-    "peach": (8, -16),
-    "pichu": (33, -25),
-    "pikachu": (30, -19),
-    "piranha plant": (15, -5),
-    "pit": (0, -17),
-    "pokemon trainer": (25, -5),
-    "richter": (20, -20),
-    "ridley": (20, -20),
-    "rob": (15, -4),
-    "robin": (0, -18),
-    "rosalina and luma": (10, -10),
-    "roy": (15, -17),
-    "ryu": (10, -4),
-    "samus": (30, -18),
-    "sheik": (0, -13),
-    "shulk": (18, -20),
-    "simon": (-20, -11),
-    "snake": (0, -3),
-    "sonic": (20, -6),
-    "squirtle": (33, -2),
-    "terry": (0, -8),
-    "toon link": (20, -27),
-    "villager": (28, -18),
-    "wario": (10, -5),
-    "wii fit trainer": (20, -5),
-    "wolf": (23, -7),
-    "yoshi": (28, -3),
-    "young link": (24, -10),
-    "zelda": (-20,-7),
-    "zero suit samus": (-13, -11),
+    "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) },
+    "captain falcon": { "default": (13, 0) },
+    "charizard": { "default": (23, -22) },
+    "chrom": { "default": (2, -12) },
+    "cloud": { "default": (20, -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, -7) },
+    "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) },
+    "isabelle": { "default": (40, -20) },
+    "ivysaur": { "default": (20, -33) },
+    "jigglypuff": { "default": (30, -15) },
+    "joker": { "default": (0, -18) },
+    "ken": { "default": (20, -10) },
+    "king dedede": { "default": (20, -10) },
+    "king k rool": { "default": (20, -7) },
+    "kirby": { "default": (30, -17) },
+    "link": { "default": (-10, -20) },
+    "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) },
+    "min min": { "default": (10, -23) },
+    "mr game and watch": { "default": (26, -13) },
+    "ness": { "default": (38, -10) },
+    "olimar": { "default": (20, -27) },
+    "pacman": { "default": (34, -13) },
+    "palutena": { "default": (-20, -20) },
+    "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": (20, -20) },
+    "rob": { "default": (15, -4) },
+    "robin": { "default": (0, -18) },
+    "rosalina and luma": { "default": (10, -10) },
+    "roy": { "default": (15, -17) },
+    "ryu": { "default": (10, -4) },
+    "samus": { "default": (30, -18) },
+    "sheik": { "default": (0, -13) },
+    "shulk": { "default": (18, -20) },
+    "simon": { "default": (-20, -11) },
+    "snake": { "default": (0, -3) },
+    "sonic": { "default": (20, -6) },
+    "squirtle": { "default": (33, -2) },
+    "terry": { "default": (0, -8) },
+    "toon link": { "default": (20, -27) },
+    "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) },
 } %}
 
diff --git a/lokrez/templates/rebootlyon2020/template.svg.j2 b/lokrez/templates/rebootlyon2020/template.svg.j2
index 2257c37..8dbc6ba 100644
--- a/lokrez/templates/rebootlyon2020/template.svg.j2
+++ b/lokrez/templates/rebootlyon2020/template.svg.j2
@@ -813,8 +813,8 @@
          >
       <image
          xlink:href="{{dir_res_ssbu}}/{{p.get_mains()[0][0]|e}}/chara_3_{{p.get_mains()[0][0]|e}}_{{p.get_mains()[0][1]}}.png"
-         x="{{ (1/(0.07 if loop.index == 1 else 0.0615)) * ( 51.0 + charcorr.charcorr[p.get_mains()[0][0]][0] ) }}"
-         y="{{ (1/(0.07 if loop.index == 1 else 0.0615)) * ( (114 if loop.index==1 else 124) + charcorr.charcorr[p.get_mains()[0][0]][1] ) }}"
+         x="{{ (1/(0.07 if loop.index == 1 else 0.0615)) * ( 51.0 + charcorr.charcorr[ p.get_mains()[0][0] ].get( p.get_mains()[0][1], charcorr.charcorr[ p.get_mains()[0][0] ]["default"] )[0] ) }}"
+         y="{{ (1/(0.07 if loop.index == 1 else 0.0615)) * ( (114 if loop.index==1 else 124) + charcorr.charcorr[p.get_mains()[0][0]].get( p.get_mains()[0][1], charcorr.charcorr[ p.get_mains()[0][0] ]["default"] )[1] ) }}"
          transform="scale({{0.07 if loop.index == 1 else 0.0615}})"
          style="display:inline;image-rendering:optimizeQuality"
          id="player{{loop.index}}_img"
@@ -823,8 +823,8 @@
      <g
          transform="scale({{0.07 if loop.index == 1 else 0.0615}})
                     translate(
-                       {{ "{:.5f}".format((1/(0.07 if loop.index == 1 else 0.0615))*( 51 + charcorr.charcorr[p.get_mains()[0][0]][0] )) }},
-                       {{ "{:.5f}".format((1/(0.07 if loop.index == 1 else 0.0615))*( (114 if loop.index==1 else 124) + charcorr.charcorr[p.get_mains()[0][0]][1] )) }}
+                       {{ "{:.5f}".format((1/(0.07 if loop.index == 1 else 0.0615))*( 51 + charcorr.charcorr[p.get_mains()[0][0]].get( p.get_mains()[0][1], charcorr.charcorr[ p.get_mains()[0][0] ]["default"] )[0] )) }},
+                       {{ "{:.5f}".format((1/(0.07 if loop.index == 1 else 0.0615))*( (114 if loop.index==1 else 124) + charcorr.charcorr[p.get_mains()[0][0]].get( p.get_mains()[0][1], charcorr.charcorr[ p.get_mains()[0][0] ]["default"] )[1] )) }}
                        )"
          >
          {% include "rebootlyon2020/covid/{}.svg.j2".format(covid.masks_filenames[p.get_mains()[0][0]][p.get_mains()[0][1]]) ignore missing %}