From d1abae1986c14121abfd32ff41fcb26974c8c751 Mon Sep 17 00:00:00 2001
From: Lertsenem <lertsenem@lertsenem.com>
Date: Sat, 25 Jul 2020 23:41:48 +0200
Subject: [PATCH] Change rebootlyon2020 template layers order

Now the secondary and pocket characters will be drawn on top of the main
character picture.
---
 .../templates/rebootlyon2020/template.svg.j2  | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/lokrez/templates/rebootlyon2020/template.svg.j2 b/lokrez/templates/rebootlyon2020/template.svg.j2
index 176584b..35c4c07 100644
--- a/lokrez/templates/rebootlyon2020/template.svg.j2
+++ b/lokrez/templates/rebootlyon2020/template.svg.j2
@@ -807,6 +807,29 @@
            id="path1020_{{loop.index}}"
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cccccc" />
+      </g>
+     <g
+         mask="url(#player{{loop.index}}_msk)"
+         >
+      <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] ) }}"
+         transform="scale({{0.07 if loop.index == 1 else 0.0615}})"
+         style="display:inline;image-rendering:optimizeQuality"
+         id="player{{loop.index}}_img"
+         inkscape:svg-dpi="1" />
+     {% if "covid" in options %}
+     <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] )) }}
+                       )"
+         >
+         {% include "rebootlyon2020/covid/{}.svg.j2".format(covid.masks_filenames[p.get_mains()[0][0]][p.get_mains()[0][1]]) ignore missing %}
+      </g>
+     {% endif %}
         <rect
            style="opacity:1;vector-effect:none;fill:url(#colorPlayerSecondary);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5972681;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers stroke fill"
            id="rect1022_{{loop.index}}"
@@ -821,7 +844,6 @@
            width="13.229841"
            id="rect1024_{{loop.index}}"
            style="opacity:1;vector-effect:none;fill:url(#colorPlayerSecondary);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5972681;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers stroke fill" />
-      </g>
      {% if p.get_mains()[1] %}
       <g>
       <image
@@ -850,28 +872,6 @@
          inkscape:svg-dpi="1" />
        </g>
      {% endif %}
-     <g
-         mask="url(#player{{loop.index}}_msk)"
-         >
-      <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] ) }}"
-         transform="scale({{0.07 if loop.index == 1 else 0.0615}})"
-         style="display:inline;image-rendering:optimizeQuality"
-         id="player{{loop.index}}_img"
-         inkscape:svg-dpi="1" />
-     {% if "covid" in options %}
-     <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] )) }}
-                       )"
-         >
-         {% include "rebootlyon2020/covid/{}.svg.j2".format(covid.masks_filenames[p.get_mains()[0][0]][p.get_mains()[0][1]]) ignore missing %}
-      </g>
-     {% endif %}
      </g>
       <text
         inkscape:label="#playertag"