Merge branch 'programmer-branch'

assets/Tiled/Backgrounds.tsx

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.10" tiledversion="1.10.2" name="Backgrounds" tilewidth="6464" tileheight="1088" tilecount="3" columns="0">
+<tileset version="1.10" tiledversion="1.10.2" name="Backgrounds" tilewidth="9696" tileheight="1088" tilecount="3" columns="0">
  <grid orientation="orthogonal" width="1" height="1"/>
  <tile id="3">
   <properties>
    <property name="assetName" value="labBg"/>
   </properties>
-  <image width="6464" height="1088" source="../backgrounds/labBg.png"/>
- </tile>
- <tile id="4">
-  <properties>
-   <property name="assetName" value="discoBg"/>
-  </properties>
-  <image width="6464" height="1088" source="../backgrounds/discoBg.png"/>
+  <image width="9696" height="1088" source="../backgrounds/labBg.png"/>
  </tile>
  <tile id="5">
   <properties>
    <property name="assetName" value="houseBg"/>
   </properties>
   <image width="6464" height="1088" source="../backgrounds/houseBg.png"/>
  </tile>
+ <tile id="7">
+  <properties>
+   <property name="assetName" value="discoBg"/>
+  </properties>
+  <image width="9696" height="1088" source="../backgrounds/discoBg.png"/>
+ </tile>
 </tileset>

assets/Tiled/tutorial2.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="150" height="17" tilewidth="64" tileheight="64" infinite="0" nextlayerid="22" nextobjectid="902">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="150" height="17" tilewidth="64" tileheight="64" infinite="0" nextlayerid="22" nextobjectid="941">
  <editorsettings>
   <export target="../levelsJson/tutorial2.tmj" format="json"/>
  </editorsettings>
@@ -21,7 +21,6 @@
   <object id="737" gid="238" x="3888" y="800" width="960" height="128"/>
   <object id="739" gid="237" x="4837" y="821" width="960" height="128"/>
   <object id="741" gid="239" x="166" y="528" width="192" height="192"/>
-  <object id="744" gid="240" x="430" y="614" width="192" height="192"/>
   <object id="745" gid="243" x="2374" y="709" width="128" height="128"/>
   <object id="748" gid="242" x="2634" y="563" width="128" height="128"/>
   <object id="749" gid="242" x="2736" y="563" width="128" height="128"/>
@@ -41,10 +40,19 @@
   <object id="768" gid="250" x="599" y="768" width="64" height="64"/>
   <object id="769" gid="250" x="2619" y="765" width="64" height="64"/>
   <object id="771" gid="252" x="2666" y="766" width="64" height="64"/>
-  <object id="868" gid="260" x="284" y="449" width="128" height="128"/>
+  <object id="868" gid="260" x="352" y="448" width="128" height="128"/>
   <object id="871" gid="260" x="1497" y="322" width="128" height="128"/>
   <object id="875" gid="260" x="2746" y="450" width="128" height="128"/>
   <object id="886" gid="248" x="1446" y="784" width="128" height="128"/>
+  <object id="902" gid="244" x="576" y="160" width="960" height="128"/>
+  <object id="903" gid="252" x="1856" y="512" width="64" height="64"/>
+  <object id="904" gid="247" x="1712" y="640" width="128" height="128"/>
+  <object id="906" gid="243" x="1296" y="688" width="128" height="128"/>
+  <object id="907" gid="258" x="656" y="256" width="128" height="128"/>
+  <object id="911" gid="274" x="1552" y="400" width="192" height="192"/>
+  <object id="922" gid="251" x="1412" y="769" width="128" height="128"/>
+  <object id="923" gid="253" x="1519" y="815" width="128" height="128"/>
+  <object id="932" gid="238" x="3009" y="178" width="960" height="128"/>
  </objectgroup>
  <objectgroup id="18" name="backgroundArt">
   <object id="722" gid="219" x="731" y="473" width="321" height="42"/>
@@ -84,14 +92,13 @@
   <object id="863" gid="250" x="6011" y="509" width="64" height="64"/>
   <object id="864" gid="280" x="2472" y="709" width="128" height="128"/>
   <object id="865" gid="280" x="6340" y="214" width="128" height="128"/>
-  <object id="867" gid="258" x="3722" y="184" width="128" height="128"/>
-  <object id="870" type="Pulse" gid="265" x="286" y="470" width="128" height="128"/>
+  <object id="867" gid="258" x="3936" y="178" width="128" height="128"/>
+  <object id="870" type="Pulse" gid="265" x="354" y="469" width="128" height="128"/>
   <object id="872" type="Pulse" gid="279" x="1497" y="341" width="128" height="128"/>
   <object id="877" type="Pulse" gid="263" x="2749" y="470" width="128" height="128"/>
   <object id="880" gid="283" x="6340" y="510" width="128" height="128"/>
   <object id="883" gid="285" x="6316" y="514" width="128" height="128"/>
   <object id="884" gid="281" x="5625" y="195" width="128" height="128"/>
-  <object id="885" gid="269" x="3720" y="386" width="256" height="256"/>
   <object id="889" gid="343" x="1086" y="192" width="192" height="192"/>
   <object id="892" gid="51" x="1719" y="124" width="875" height="128"/>
   <object id="893" gid="51" x="3016" y="117" width="875" height="128"/>
@@ -100,7 +107,8 @@
   <object id="896" gid="73" x="5660" y="518" width="320" height="320"/>
   <object id="898" gid="67" x="5894" y="191" width="128" height="128"/>
   <object id="900" gid="67" x="2543" y="448" width="128" height="128"/>
-  <object id="901" gid="51" x="220" y="125" width="875" height="128"/>
+  <object id="901" gid="51" x="624" y="128" width="875" height="128"/>
+  <object id="940" gid="243" x="5516" y="785" width="128" height="128"/>
  </objectgroup>
  <layer id="1" name="walls" width="150" height="17">
   <data encoding="csv">
@@ -116,7 +124,7 @@
 180,180,188,0,0,0,0,0,0,0,0,0,0,179,181,0,0,179,180,181,0,0,0,0,0,0,0,0,179,181,0,0,179,180,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,180,180,181,0,0,0,0,0,0,0,182,183,184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 180,180,188,0,0,0,0,0,0,0,0,0,0,179,180,177,177,180,180,181,0,0,0,0,0,0,0,0,179,181,0,0,179,180,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,180,180,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 180,180,188,0,0,0,0,0,0,0,0,0,0,179,180,180,180,180,180,181,0,0,0,0,0,0,0,0,179,180,177,177,180,180,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,180,180,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-180,180,188,186,186,186,186,186,186,186,187,0,0,179,180,180,180,181,180,181,0,0,185,186,186,187,0,0,179,180,180,180,180,180,181,0,0,0,185,186,186,186,186,186,186,186,186,186,186,187,0,0,0,0,0,0,0,0,179,180,180,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+180,180,180,186,186,186,186,186,186,186,187,0,0,179,180,180,180,180,180,181,0,0,185,186,186,187,0,0,179,180,180,180,180,180,181,0,0,0,185,186,186,186,186,186,186,186,186,186,186,187,0,0,0,0,0,0,0,0,179,180,180,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 180,180,180,180,180,180,180,180,180,180,181,0,0,179,180,180,180,180,180,181,0,0,179,180,180,181,0,0,179,180,180,180,180,180,181,0,0,0,179,180,180,180,180,180,180,180,180,180,180,181,0,0,0,0,0,0,0,0,179,180,180,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 180,180,180,180,180,180,180,180,180,180,180,177,177,180,180,180,180,180,180,180,177,177,180,180,180,181,0,0,179,180,180,180,180,180,181,0,0,0,179,180,180,180,180,180,180,180,180,180,180,181,0,0,0,0,0,0,0,0,179,180,180,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,
 180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,177,177,180,180,180,180,180,180,180,177,177,177,180,180,180,180,180,180,180,180,180,180,180,181,0,0,0,0,0,0,0,0,179,180,180,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,
@@ -133,7 +141,7 @@
   <object id="774" gid="271" x="211" y="931" width="128" height="128"/>
   <object id="778" gid="271" x="607" y="1005" width="128" height="128"/>
   <object id="781" gid="271" x="93" y="779" width="128" height="128"/>
-  <object id="782" gid="271" x="1104" y="784" width="128" height="128"/>
+  <object id="782" gid="271" x="1086" y="772" width="128" height="128"/>
   <object id="783" gid="271" x="2014" y="544" width="128" height="128"/>
   <object id="784" gid="271" x="2910" y="328" width="128" height="128"/>
   <object id="785" gid="271" x="3054" y="930" width="128" height="128"/>
@@ -148,7 +156,7 @@
   <object id="797" gid="272" x="1162" y="484" width="128" height="128"/>
   <object id="798" gid="273" x="179" y="977" width="128" height="128"/>
   <object id="799" gid="273" x="255" y="345" width="128" height="128"/>
-  <object id="800" gid="273" x="1178" y="795" width="128" height="128"/>
+  <object id="800" gid="273" x="1132" y="820" width="128" height="128"/>
   <object id="801" gid="273" x="1782" y="668" width="128" height="128"/>
   <object id="802" gid="273" x="2059" y="560" width="128" height="128"/>
   <object id="803" gid="273" x="2637" y="345" width="128" height="128"/>
@@ -159,10 +167,13 @@
   <object id="809" gid="273" x="6085" y="704" width="128" height="128"/>
   <object id="810" gid="271" x="5930" y="676" width="128" height="128"/>
   <object id="811" gid="271" x="5600" y="729" width="128" height="128"/>
-  <object id="813" gid="270" x="6328" y="767" width="128" height="128"/>
+  <object id="813" gid="270" x="6194" y="720" width="128" height="128"/>
   <object id="815" gid="272" x="6320" y="703" width="128" height="128"/>
   <object id="817" gid="272" x="3693" y="800" width="128" height="128"/>
   <object id="818" gid="272" x="75" y="520" width="128" height="128"/>
+  <object id="915" gid="273" x="1035" y="740" width="128" height="128"/>
+  <object id="920" gid="271" x="897" y="751" width="128" height="128"/>
+  <object id="921" gid="272" x="1552" y="926" width="128" height="128"/>
  </objectgroup>
  <objectgroup id="10" name="weightedPlatforms">
   <object id="696" type="Weighted Platform" gid="141" x="3392" y="480" width="192" height="32">
@@ -218,7 +229,7 @@
  <objectgroup id="13" name="platforms"/>
  <objectgroup id="7" name="enemies"/>
  <objectgroup id="8" name="checkpoints">
-  <object id="565" type="Checkpoint" gid="8" x="384" y="768" width="130" height="130">
+  <object id="565" type="Checkpoint" gid="8" x="368" y="768" width="130" height="130">
    <properties>
     <property name="num" type="int" value="0"/>
    </properties>
@@ -230,7 +241,7 @@
   </object>
  </objectgroup>
  <objectgroup id="6" name="player">
-  <object id="2" name="player" gid="3" x="480" y="768" width="75" height="142"/>
+  <object id="2" name="player" gid="3" x="464" y="768" width="75" height="142"/>
  </objectgroup>
  <objectgroup id="9" name="goal">
   <object id="703" gid="13" x="6208" y="512" width="128" height="130"/>

assets/assets.json

@@ -361,8 +361,8 @@
         "defaultConstants": "defaultConstants.json",
         "level1": "levelsJson/tutorial1.tmj",
         "level2": "levelsJson/tutorial2.tmj",
-        "level3": "levelsJson/EricBearLevel2.tmj",
-        "level4": "levelsJson/ericEasyLevel.tmj",
+        "level3": "levelsJson/ericEasyLevel.tmj",
+        "level4": "levelsJson/EricBearLevel2.tmj",
         "level5": "levelsJson/EricLaserLevel.tmj",
         "level6": "levelsJson/rabbeatLevelBat.tmj",
         "level7": "levelsJson/EricMediumLevel.tmj",