From 17072b232151d91d188007a2ec6fdeda4c94cabb Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Fri, 24 May 2024 18:11:22 -0400
Subject: [PATCH] Swap warp and AND tutorial order.

---
 modules/game/levels/tutorial-7.tmx | 112 +++++++-----------
 modules/game/levels/tutorial-8.tmx | 178 +++++++++++++++++------------
 2 files changed, 145 insertions(+), 145 deletions(-)

diff --git a/modules/game/levels/tutorial-7.tmx b/modules/game/levels/tutorial-7.tmx
index 4f831d2..96add2f 100644
--- a/modules/game/levels/tutorial-7.tmx
+++ b/modules/game/levels/tutorial-7.tmx
@@ -1,118 +1,92 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.6" orientation="orthogonal" renderorder="right-down" width="20" height="15" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="50">
+<map version="1.8" tiledversion="1.8.6" orientation="orthogonal" renderorder="right-down" width="20" height="15" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="47">
  <tileset firstgid="1" source="tiles.tsx"/>
  <layer id="1" name="background" width="20" height="15">
   <data encoding="csv">
-190,169,105,24,24,24,106,171,111,150,111,112,105,24,24,24,106,131,171,111,
-89,170,105,24,24,24,106,109,171,189,90,151,105,24,28,24,86,129,211,190,
-82,82,108,31,24,31,106,110,130,189,129,110,105,31,31,31,107,82,82,82,
-3,24,31,24,24,24,86,209,89,111,91,111,105,24,3,3,3,3,3,3,
-24,24,24,24,24,24,107,83,82,83,82,83,108,3,24,24,24,24,24,24,
-24,24,31,24,24,24,31,24,24,24,24,24,24,24,24,24,24,24,24,24,
-102,102,88,24,24,24,3,3,24,24,24,3,3,24,24,24,87,103,103,102,
-151,92,85,3,3,24,24,24,31,24,24,24,24,24,3,24,106,131,151,169,
-170,189,85,24,24,24,3,3,24,24,24,3,24,24,24,24,86,169,109,129,
-90,171,85,24,24,24,24,24,24,24,24,24,24,24,24,24,86,150,170,190,
-151,129,105,24,24,24,24,24,24,24,24,24,24,24,24,24,86,151,109,151,
-89,189,105,24,24,24,24,24,24,24,24,24,24,24,24,24,106,129,210,151,
-211,110,85,31,24,31,87,102,102,102,103,103,88,31,24,31,106,210,169,171,
-171,171,85,24,24,24,106,130,130,171,111,189,85,24,24,24,106,90,110,209,
-171,91,105,24,24,24,86,190,149,211,131,210,85,24,24,24,106,191,111,111
+209,171,111,130,150,130,191,210,110,189,209,209,149,149,209,209,190,211,190,131,
+171,210,131,109,131,111,131,170,111,90,111,209,149,171,90,171,170,110,129,129,
+111,190,130,190,131,170,169,151,89,90,111,171,191,189,110,170,109,131,209,169,
+83,82,83,83,82,82,83,83,84,90,81,82,83,83,82,83,82,83,83,82,
+24,24,31,24,24,24,24,28,106,169,105,24,3,3,3,24,24,31,24,24,
+24,24,31,24,24,24,3,24,106,171,105,62,24,24,24,24,24,31,24,24,
+24,24,24,24,24,24,24,62,106,111,105,62,24,24,24,24,24,31,24,24,
+24,24,31,24,24,24,24,62,86,109,85,62,24,24,24,24,24,31,24,24,
+102,103,102,103,88,24,24,62,106,189,85,62,24,24,87,103,102,102,102,103,
+210,169,190,149,105,24,24,62,107,83,108,62,24,24,106,189,149,170,209,190,
+130,190,109,149,105,24,24,62,24,31,24,62,24,24,106,130,211,171,149,210,
+189,149,131,189,105,24,24,62,24,31,24,62,24,24,106,89,191,109,210,130,
+189,130,189,169,105,24,24,64,61,61,61,63,24,24,106,169,131,211,210,151,
+90,170,89,170,85,24,24,24,24,31,24,24,24,24,86,170,129,111,89,170,
+90,109,169,169,101,102,102,103,103,102,102,102,103,103,104,191,170,150,91,171
 </data>
  </layer>
  <objectgroup id="2" name="objects">
-  <object id="1" type="player-spawn" gid="1" x="144" y="160" width="16" height="16"/>
-  <object id="7" type="gem" gid="29" x="64" y="64" width="16" height="16"/>
-  <object id="27" type="clock-emitter" gid="49" x="128" y="96" width="16" height="16">
+  <object id="1" type="player-spawn" gid="1" x="192" y="112" width="16" height="16"/>
+  <object id="7" type="gem" gid="29" x="288" y="96" width="16" height="16"/>
+  <object id="28" type="electric-switch" gid="8" x="80" y="128" width="16" height="16">
    <properties>
-    <property name="interval" type="int" value="4"/>
+    <property name="target-x" type="int" value="2"/>
+    <property name="target-y" type="int" value="6"/>
    </properties>
   </object>
-  <object id="30" type="gate" gid="46" x="64" y="192" width="16" height="16"/>
-  <object id="31" type="block" gid="30" x="304" y="64" width="16" height="16">
+  <object id="30" type="gate" gid="46" x="32" y="96" width="16" height="16"/>
+  <object id="31" type="block" gid="30" x="288" y="80" width="16" height="16">
    <properties>
     <property name="kind" value="crate"/>
    </properties>
   </object>
-  <object id="32" type="block" gid="4" x="64" y="0" width="16" height="16">
+  <object id="32" type="block" gid="4" x="96" y="192" width="16" height="16">
    <properties>
     <property name="kind" value="copper"/>
    </properties>
   </object>
-  <object id="33" type="block" gid="30" x="64" y="48" width="16" height="16">
+  <object id="33" type="block" gid="30" x="288" y="64" width="16" height="16">
    <properties>
     <property name="kind" value="crate"/>
    </properties>
   </object>
-  <object id="34" type="block" gid="30" x="112" y="80" width="16" height="16">
+  <object id="34" type="block" gid="30" x="288" y="112" width="16" height="16">
    <properties>
     <property name="kind" value="crate"/>
    </properties>
   </object>
-  <object id="35" type="block" gid="30" x="192" y="128" width="16" height="16">
+  <object id="35" type="block" gid="30" x="96" y="112" width="16" height="16">
    <properties>
     <property name="kind" value="crate"/>
    </properties>
   </object>
-  <object id="36" type="clock-emitter" gid="49" x="128" y="128" width="16" height="16">
+  <object id="38" type="gate" gid="46" x="144" y="192" width="16" height="16"/>
+  <object id="39" type="electric-switch" gid="8" x="64" y="80" width="16" height="16">
    <properties>
-    <property name="interval" type="int" value="4"/>
-   </properties>
-  </object>
-  <object id="37" type="and-gate" gid="43" x="208" y="112" width="16" height="16">
-   <properties>
-    <property name="direction" value="right"/>
-   </properties>
-  </object>
-  <object id="38" type="and-gate" gid="43" x="80" y="112" width="16" height="16">
-   <properties>
-    <property name="direction" value="left"/>
-   </properties>
-  </object>
-  <object id="39" type="electric-switch" gid="8" x="240" y="112" width="16" height="16">
-   <properties>
-    <property name="target-x" type="int" value="14"/>
+    <property name="target-x" type="int" value="9"/>
     <property name="target-y" type="int" value="12"/>
    </properties>
   </object>
-  <object id="40" type="gate" gid="46" x="224" y="192" width="16" height="16"/>
-  <object id="42" type="clock-emitter" gid="49" x="160" y="96" width="16" height="16">
+  <object id="41" type="block" gid="30" x="96" y="96" width="16" height="16">
    <properties>
-    <property name="interval" type="int" value="4"/>
+    <property name="kind" value="crate"/>
    </properties>
   </object>
-  <object id="43" type="clock-emitter" gid="49" x="160" y="128" width="16" height="16">
+  <object id="42" type="electron-warp" gid="72" x="112" y="80" width="16" height="16">
    <properties>
-    <property name="interval" type="int" value="4"/>
-   </properties>
-  </object>
-  <object id="44" type="floor-switch" gid="25" x="80" y="176" width="16" height="16">
-   <properties>
-    <property name="target-x" type="int" value="4"/>
-    <property name="target-y" type="int" value="12"/>
-   </properties>
-  </object>
-  <object id="45" type="gate" gid="46" x="32" y="64" width="16" height="16"/>
-  <object id="46" type="electric-switch" gid="8" x="16" y="48" width="16" height="16">
-   <properties>
-    <property name="target-x" type="int" value="2"/>
+    <property name="target-x" type="int" value="11"/>
     <property name="target-y" type="int" value="4"/>
    </properties>
   </object>
-  <object id="47" type="switched-emitter" gid="48" x="224" y="80" width="16" height="16">
+  <object id="43" type="electron-warp" gid="72" x="176" y="64" width="16" height="16">
+   <properties>
+    <property name="target-x" type="int" value="7"/>
+    <property name="target-y" type="int" value="5"/>
+   </properties>
+  </object>
+  <object id="45" type="clock-emitter" gid="49" x="240" y="64" width="16" height="16">
    <properties>
     <property name="interval" type="int" value="4"/>
    </properties>
   </object>
-  <object id="48" type="floor-switch" gid="25" x="240" y="96" width="16" height="16">
+  <object id="46" type="block" gid="4" x="80" y="80" width="16" height="16">
    <properties>
-    <property name="target-x" type="int" value="14"/>
-    <property name="target-y" type="int" value="5"/>
-   </properties>
-  </object>
-  <object id="49" type="block" gid="30" x="304" y="80" width="16" height="16">
-   <properties>
-    <property name="kind" value="crate"/>
+    <property name="kind" value="copper"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/modules/game/levels/tutorial-8.tmx b/modules/game/levels/tutorial-8.tmx
index 96add2f..4f831d2 100644
--- a/modules/game/levels/tutorial-8.tmx
+++ b/modules/game/levels/tutorial-8.tmx
@@ -1,93 +1,119 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.6" orientation="orthogonal" renderorder="right-down" width="20" height="15" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="47">
+<map version="1.8" tiledversion="1.8.6" orientation="orthogonal" renderorder="right-down" width="20" height="15" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="50">
  <tileset firstgid="1" source="tiles.tsx"/>
  <layer id="1" name="background" width="20" height="15">
   <data encoding="csv">
-209,171,111,130,150,130,191,210,110,189,209,209,149,149,209,209,190,211,190,131,
-171,210,131,109,131,111,131,170,111,90,111,209,149,171,90,171,170,110,129,129,
-111,190,130,190,131,170,169,151,89,90,111,171,191,189,110,170,109,131,209,169,
-83,82,83,83,82,82,83,83,84,90,81,82,83,83,82,83,82,83,83,82,
-24,24,31,24,24,24,24,28,106,169,105,24,3,3,3,24,24,31,24,24,
-24,24,31,24,24,24,3,24,106,171,105,62,24,24,24,24,24,31,24,24,
-24,24,24,24,24,24,24,62,106,111,105,62,24,24,24,24,24,31,24,24,
-24,24,31,24,24,24,24,62,86,109,85,62,24,24,24,24,24,31,24,24,
-102,103,102,103,88,24,24,62,106,189,85,62,24,24,87,103,102,102,102,103,
-210,169,190,149,105,24,24,62,107,83,108,62,24,24,106,189,149,170,209,190,
-130,190,109,149,105,24,24,62,24,31,24,62,24,24,106,130,211,171,149,210,
-189,149,131,189,105,24,24,62,24,31,24,62,24,24,106,89,191,109,210,130,
-189,130,189,169,105,24,24,64,61,61,61,63,24,24,106,169,131,211,210,151,
-90,170,89,170,85,24,24,24,24,31,24,24,24,24,86,170,129,111,89,170,
-90,109,169,169,101,102,102,103,103,102,102,102,103,103,104,191,170,150,91,171
+190,169,105,24,24,24,106,171,111,150,111,112,105,24,24,24,106,131,171,111,
+89,170,105,24,24,24,106,109,171,189,90,151,105,24,28,24,86,129,211,190,
+82,82,108,31,24,31,106,110,130,189,129,110,105,31,31,31,107,82,82,82,
+3,24,31,24,24,24,86,209,89,111,91,111,105,24,3,3,3,3,3,3,
+24,24,24,24,24,24,107,83,82,83,82,83,108,3,24,24,24,24,24,24,
+24,24,31,24,24,24,31,24,24,24,24,24,24,24,24,24,24,24,24,24,
+102,102,88,24,24,24,3,3,24,24,24,3,3,24,24,24,87,103,103,102,
+151,92,85,3,3,24,24,24,31,24,24,24,24,24,3,24,106,131,151,169,
+170,189,85,24,24,24,3,3,24,24,24,3,24,24,24,24,86,169,109,129,
+90,171,85,24,24,24,24,24,24,24,24,24,24,24,24,24,86,150,170,190,
+151,129,105,24,24,24,24,24,24,24,24,24,24,24,24,24,86,151,109,151,
+89,189,105,24,24,24,24,24,24,24,24,24,24,24,24,24,106,129,210,151,
+211,110,85,31,24,31,87,102,102,102,103,103,88,31,24,31,106,210,169,171,
+171,171,85,24,24,24,106,130,130,171,111,189,85,24,24,24,106,90,110,209,
+171,91,105,24,24,24,86,190,149,211,131,210,85,24,24,24,106,191,111,111
 </data>
  </layer>
  <objectgroup id="2" name="objects">
-  <object id="1" type="player-spawn" gid="1" x="192" y="112" width="16" height="16"/>
-  <object id="7" type="gem" gid="29" x="288" y="96" width="16" height="16"/>
-  <object id="28" type="electric-switch" gid="8" x="80" y="128" width="16" height="16">
-   <properties>
-    <property name="target-x" type="int" value="2"/>
-    <property name="target-y" type="int" value="6"/>
-   </properties>
-  </object>
-  <object id="30" type="gate" gid="46" x="32" y="96" width="16" height="16"/>
-  <object id="31" type="block" gid="30" x="288" y="80" width="16" height="16">
-   <properties>
-    <property name="kind" value="crate"/>
-   </properties>
-  </object>
-  <object id="32" type="block" gid="4" x="96" y="192" width="16" height="16">
-   <properties>
-    <property name="kind" value="copper"/>
-   </properties>
-  </object>
-  <object id="33" type="block" gid="30" x="288" y="64" width="16" height="16">
-   <properties>
-    <property name="kind" value="crate"/>
-   </properties>
-  </object>
-  <object id="34" type="block" gid="30" x="288" y="112" width="16" height="16">
-   <properties>
-    <property name="kind" value="crate"/>
-   </properties>
-  </object>
-  <object id="35" type="block" gid="30" x="96" y="112" width="16" height="16">
-   <properties>
-    <property name="kind" value="crate"/>
-   </properties>
-  </object>
-  <object id="38" type="gate" gid="46" x="144" y="192" width="16" height="16"/>
-  <object id="39" type="electric-switch" gid="8" x="64" y="80" width="16" height="16">
-   <properties>
-    <property name="target-x" type="int" value="9"/>
-    <property name="target-y" type="int" value="12"/>
-   </properties>
-  </object>
-  <object id="41" type="block" gid="30" x="96" y="96" width="16" height="16">
-   <properties>
-    <property name="kind" value="crate"/>
-   </properties>
-  </object>
-  <object id="42" type="electron-warp" gid="72" x="112" y="80" width="16" height="16">
-   <properties>
-    <property name="target-x" type="int" value="11"/>
-    <property name="target-y" type="int" value="4"/>
-   </properties>
-  </object>
-  <object id="43" type="electron-warp" gid="72" x="176" y="64" width="16" height="16">
-   <properties>
-    <property name="target-x" type="int" value="7"/>
-    <property name="target-y" type="int" value="5"/>
-   </properties>
-  </object>
-  <object id="45" type="clock-emitter" gid="49" x="240" y="64" width="16" height="16">
+  <object id="1" type="player-spawn" gid="1" x="144" y="160" width="16" height="16"/>
+  <object id="7" type="gem" gid="29" x="64" y="64" width="16" height="16"/>
+  <object id="27" type="clock-emitter" gid="49" x="128" y="96" width="16" height="16">
    <properties>
     <property name="interval" type="int" value="4"/>
    </properties>
   </object>
-  <object id="46" type="block" gid="4" x="80" y="80" width="16" height="16">
+  <object id="30" type="gate" gid="46" x="64" y="192" width="16" height="16"/>
+  <object id="31" type="block" gid="30" x="304" y="64" width="16" height="16">
+   <properties>
+    <property name="kind" value="crate"/>
+   </properties>
+  </object>
+  <object id="32" type="block" gid="4" x="64" y="0" width="16" height="16">
    <properties>
     <property name="kind" value="copper"/>
    </properties>
   </object>
+  <object id="33" type="block" gid="30" x="64" y="48" width="16" height="16">
+   <properties>
+    <property name="kind" value="crate"/>
+   </properties>
+  </object>
+  <object id="34" type="block" gid="30" x="112" y="80" width="16" height="16">
+   <properties>
+    <property name="kind" value="crate"/>
+   </properties>
+  </object>
+  <object id="35" type="block" gid="30" x="192" y="128" width="16" height="16">
+   <properties>
+    <property name="kind" value="crate"/>
+   </properties>
+  </object>
+  <object id="36" type="clock-emitter" gid="49" x="128" y="128" width="16" height="16">
+   <properties>
+    <property name="interval" type="int" value="4"/>
+   </properties>
+  </object>
+  <object id="37" type="and-gate" gid="43" x="208" y="112" width="16" height="16">
+   <properties>
+    <property name="direction" value="right"/>
+   </properties>
+  </object>
+  <object id="38" type="and-gate" gid="43" x="80" y="112" width="16" height="16">
+   <properties>
+    <property name="direction" value="left"/>
+   </properties>
+  </object>
+  <object id="39" type="electric-switch" gid="8" x="240" y="112" width="16" height="16">
+   <properties>
+    <property name="target-x" type="int" value="14"/>
+    <property name="target-y" type="int" value="12"/>
+   </properties>
+  </object>
+  <object id="40" type="gate" gid="46" x="224" y="192" width="16" height="16"/>
+  <object id="42" type="clock-emitter" gid="49" x="160" y="96" width="16" height="16">
+   <properties>
+    <property name="interval" type="int" value="4"/>
+   </properties>
+  </object>
+  <object id="43" type="clock-emitter" gid="49" x="160" y="128" width="16" height="16">
+   <properties>
+    <property name="interval" type="int" value="4"/>
+   </properties>
+  </object>
+  <object id="44" type="floor-switch" gid="25" x="80" y="176" width="16" height="16">
+   <properties>
+    <property name="target-x" type="int" value="4"/>
+    <property name="target-y" type="int" value="12"/>
+   </properties>
+  </object>
+  <object id="45" type="gate" gid="46" x="32" y="64" width="16" height="16"/>
+  <object id="46" type="electric-switch" gid="8" x="16" y="48" width="16" height="16">
+   <properties>
+    <property name="target-x" type="int" value="2"/>
+    <property name="target-y" type="int" value="4"/>
+   </properties>
+  </object>
+  <object id="47" type="switched-emitter" gid="48" x="224" y="80" width="16" height="16">
+   <properties>
+    <property name="interval" type="int" value="4"/>
+   </properties>
+  </object>
+  <object id="48" type="floor-switch" gid="25" x="240" y="96" width="16" height="16">
+   <properties>
+    <property name="target-x" type="int" value="14"/>
+    <property name="target-y" type="int" value="5"/>
+   </properties>
+  </object>
+  <object id="49" type="block" gid="30" x="304" y="80" width="16" height="16">
+   <properties>
+    <property name="kind" value="crate"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>