Merge pull request #201 from JacobSeto/ericmerge2

Ericmerge2

.gitignore

@@ -143,3 +143,7 @@ core/build/tmp/compileJava/previous-compilation-data.bin
 core/build/tmp/compileJava/previous-compilation-data.bin
 desktop/build/tmp/compileJava/previous-compilation-data.bin
 .gradle/file-system.probe
+.gradle/buildOutputCleanup/outputFiles.bin
+.gradle/buildOutputCleanup/outputFiles.bin
+.gradle/file-system.probe
+.gradle/buildOutputCleanup/outputFiles.bin

.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Sun Mar 03 19:44:51 EST 2024
+#Tue Apr 16 21:30:29 EDT 2024
 gradle.version=8.5

assets/Tiled/ExampleLevel.tmx

@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="130" height="17" tilewidth="64" tileheight="64" infinite="0" nextlayerid="20" nextobjectid="546">
+ <editorsettings>
+  <export target="../levelsJson/rabbeatLevel3.tmj" format="json"/>
+ </editorsettings>
+ <tileset firstgid="1" source="Images.tsx"/>
+ <tileset firstgid="75" source="platforms.tsx"/>
+ <tileset firstgid="139" source="walls.tsx"/>
+ <objectgroup id="2" name="background">
+  <object id="204" gid="48" x="0" y="1088" width="7040" height="1088"/>
+ </objectgroup>
+ <objectgroup id="18" name="backgroundArt">
+  <object id="406" type="bgpipe" gid="38" x="0" y="640" width="320" height="320"/>
+  <object id="407" type="bgpipe" gid="38" x="64" y="640" width="320" height="320"/>
+  <object id="185" type="pipeleftskinny" gid="42" x="1856" y="1088" width="320" height="320"/>
+ </objectgroup>
+ <layer id="1" name="walls" width="130" height="17">
+  <data encoding="csv">
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,149,149,149,149,149,149,149,149,149,149,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+146,146,146,146,146,146,146,146,149,149,149,149,149,146,146,146,146,146,149,149,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,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,7,7,7,7,0,0,7,7,7,0,0,7,7,7,7,7,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,7,
+146,146,146,146,146,146,146,147,0,0,0,0,0,145,146,146,146,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,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,7,7,7,0,0,7,7,7,0,0,7,7,7,7,7,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,7,
+146,146,146,146,146,146,146,147,0,0,0,0,0,145,146,146,146,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,7,7,7,7,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,0,0,0,0,0,0,0,7,7,7,7,7,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,7,
+146,146,149,149,149,149,149,150,0,0,0,0,0,148,149,149,149,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,7,7,7,7,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,0,0,0,0,0,0,0,7,7,7,7,7,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,7,
+146,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,145,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,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,7,7,7,7,7,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7,
+146,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,145,7,7,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,0,0,0,0,0,0,7,7,7,7,7,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7,
+146,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,145,7,7,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,0,0,0,0,0,0,7,7,7,7,7,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7,
+146,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,145,7,7,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,0,0,0,0,0,0,7,7,7,7,7,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7,
+146,146,142,143,143,143,143,144,0,0,0,0,0,142,143,143,143,143,143,143,143,143,143,143,143,143,146,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7,
+146,146,146,146,146,146,146,147,0,0,0,0,0,145,146,146,146,146,146,146,146,146,146,146,146,146,146,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7,
+146,146,146,146,146,146,146,147,0,0,0,0,0,145,146,146,146,146,146,146,146,146,146,146,146,146,146,146,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7,
+146,146,146,146,146,146,146,147,0,0,0,0,0,145,146,146,146,146,146,146,146,146,146,146,146,146,146,146,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7,
+146,146,146,146,146,146,146,147,0,0,0,0,0,145,146,146,146,146,146,146,146,146,146,146,146,146,146,146,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7,
+146,146,146,146,146,146,146,147,0,0,0,0,0,145,146,146,146,146,146,146,146,146,146,146,146,146,146,146,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7,
+146,146,146,146,146,146,146,147,0,0,0,0,0,145,146,146,146,146,146,146,146,146,146,146,146,146,146,146,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7,
+146,146,146,146,146,146,146,147,0,0,0,0,0,145,146,146,146,146,146,146,146,146,146,146,146,146,146,146,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7
+</data>
+ </layer>
+ <objectgroup id="10" name="weightedPlatforms"/>
+ <objectgroup id="16" name="movingPlatforms">
+  <object id="483" gid="88" x="2368" y="640" width="192" height="64">
+   <properties>
+    <property name="num" type="int" value="0"/>
+    <property name="pos" type="int" value="1"/>
+    <property name="speed" type="int" value="0"/>
+    <property name="totalPos" type="int" value="2"/>
+   </properties>
+  </object>
+  <object id="489" gid="88" x="1984" y="640" width="192" height="64">
+   <properties>
+    <property name="num" type="int" value="0"/>
+    <property name="pos" type="int" value="0"/>
+    <property name="speed" type="int" value="0"/>
+    <property name="totalPos" type="int" value="2"/>
+   </properties>
+  </object>
+  <object id="534" gid="88" x="3328" y="640" width="192" height="64">
+   <properties>
+    <property name="num" type="int" value="1"/>
+    <property name="pos" type="int" value="0"/>
+    <property name="speed" type="int" value="0"/>
+    <property name="totalPos" type="int" value="2"/>
+   </properties>
+  </object>
+  <object id="535" gid="88" x="3648" y="640" width="192" height="64">
+   <properties>
+    <property name="num" type="int" value="1"/>
+    <property name="pos" type="int" value="1"/>
+    <property name="speed" type="int" value="0"/>
+    <property name="totalPos" type="int" value="2"/>
+   </properties>
+  </object>
+  <object id="536" gid="88" x="3904" y="384" width="192" height="64">
+   <properties>
+    <property name="num" type="int" value="2"/>
+    <property name="pos" type="int" value="1"/>
+    <property name="speed" type="int" value="0"/>
+    <property name="totalPos" type="int" value="2"/>
+   </properties>
+  </object>
+  <object id="537" gid="88" x="4224" y="384" width="192" height="64">
+   <properties>
+    <property name="num" type="int" value="2"/>
+    <property name="pos" type="int" value="0"/>
+    <property name="speed" type="int" value="0"/>
+    <property name="totalPos" type="int" value="2"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="13" name="platforms">
+  <object id="479" type="laser" gid="99" x="6592" y="704" width="168" height="120">
+   <properties>
+    <property name="align" value="vertical"/>
+   </properties>
+  </object>
+  <object id="481" type="laser" gid="100" x="5760" y="576" width="128" height="64"/>
+  <object id="484" type="laser" gid="99" x="5632" y="704" width="168" height="120">
+   <properties>
+    <property name="align" value="vertical"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="7" name="enemies">
+  <object id="475" type="hedgehog" gid="9" x="6464" y="576" width="173" height="200">
+   <properties>
+    <property name="beatList" value="1234"/>
+    <property name="rollingDistance" type="int" value="3"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="8" name="checkpoints">
+  <object id="498" name="0" gid="57" x="256" y="576" width="130" height="130">
+   <properties>
+    <property name="num" type="int" value="0"/>
+   </properties>
+  </object>
+  <object id="499" gid="57" x="1728" y="320" width="130" height="130">
+   <properties>
+    <property name="num" type="int" value="1"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="6" name="player">
+  <object id="2" name="player" gid="3" x="320" y="576" width="75" height="142"/>
+ </objectgroup>
+ <objectgroup id="9" name="goal"/>
+ <objectgroup id="12" name="foregroundArt" class="bigwire">
+  <object id="73" type="dolpod2" gid="21" x="1088" y="576" width="256" height="256"/>
+  <object id="156" type="light" gid="27" x="896" y="512" width="192" height="192"/>
+  <object id="394" type="light" gid="27" x="320" y="512" width="192" height="192"/>
+  <object id="422" type="light" gid="27" x="1152" y="320" width="192" height="192"/>
+  <object id="428" type="wires1" gid="51" x="448" y="256" width="875" height="128"/>
+  <object id="440" type="wires2" gid="55" x="1408" y="192" width="875" height="128"/>
+  <object id="538" type="wires2" gid="55" x="2880" y="320" width="512" height="128"/>
+  <object id="539" type="wires2" gid="55" x="2240" y="192" width="448" height="128"/>
+  <object id="540" type="light" gid="27" x="2688" y="576" width="192" height="192"/>
+  <object id="541" type="light" gid="27" x="3328" y="512" width="192" height="192"/>
+  <object id="542" type="light" gid="27" x="3520" y="512" width="192" height="192"/>
+  <object id="543" type="wires2" gid="55" x="3648" y="192" width="512" height="128"/>
+  <object id="544" type="wires2" gid="55" x="4160" y="192" width="512" height="128"/>
+  <object id="545" type="light" gid="27" x="4608" y="256" width="192" height="192"/>
+ </objectgroup>
+</map>

assets/Tiled/Images.tsx

@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.10" tiledversion="1.10.2" name="Images" tilewidth="6464" tileheight="1088" tilecount="40" columns="0">
+<tileset version="1.10" tiledversion="1.10.2" name="Images" tilewidth="9000" tileheight="1088" tilecount="56" columns="0">
  <grid orientation="orthogonal" width="1" height="1"/>
  <tile id="2">
   <image width="64" height="123" source="playerTile.png"/>
  </tile>
  <tile id="6">
-  <image width="120" height="120" source="../world/platforms/blackTile.png"/>
+  <image width="64" height="64" source="../world/platforms/blackTile.png"/>
  </tile>
  <tile id="7">
-  <image width="128" height="130" source="../world/checkpoints/checkActive.png"/>
+  <image width="130" height="130" source="../world/checkpoints/checkpointInactive.png"/>
  </tile>
  <tile id="8">
-  <image width="256" height="181" source="bearTile.png"/>
+  <image width="173" height="200" source="bear.png"/>
  </tile>
  <tile id="12">
   <image width="128" height="130" source="../world/goal.png"/>
  </tile>
  <tile id="13">
-  <image width="224" height="224" source="../enemies/beehive.png"/>
+  <image width="150" height="150" source="../enemies/beehive.png"/>
  </tile>
  <tile id="14">
   <image width="256" height="256" source="../world/pods/bearpod1.png"/>
@@ -26,7 +26,7 @@
   <image width="256" height="256" source="../world/pods/bearpod2.png"/>
  </tile>
  <tile id="16">
-  <image width="224" height="224" source="../enemies/beehive.png"/>
+  <image width="150" height="150" source="../enemies/beehive.png"/>
  </tile>
  <tile id="17">
   <image width="256" height="256" source="../world/pods/bgpod1.png"/>
@@ -110,7 +110,7 @@
   <image width="320" height="320" source="../world/pipes/pipestraightskinny.png"/>
  </tile>
  <tile id="47">
-  <image width="6464" height="1088" source="../backgrounds/background.png"/>
+  <image width="9000" height="1088" source="../backgrounds/background.png"/>
  </tile>
  <tile id="50">
   <image width="875" height="128" source="../world/wires/wires1.PNG"/>
@@ -121,4 +121,52 @@
  <tile id="55">
   <image width="895" height="256" source="../world/wires/bigwire.png"/>
  </tile>
+ <tile id="58">
+  <image width="176" height="97" source="../enemies/bat.png"/>
+ </tile>
+ <tile id="59">
+  <image width="176" height="97" source="../enemies/bat.png"/>
+ </tile>
+ <tile id="60">
+  <image width="6464" height="1088" source="../backgrounds/labGrafiti.png"/>
+ </tile>
+ <tile id="61">
+  <image width="64" height="64" source="../world/graffiti/emoji_0.png"/>
+ </tile>
+ <tile id="62">
+  <image width="64" height="64" source="../world/graffiti/graffiti_0.png"/>
+ </tile>
+ <tile id="63">
+  <image width="64" height="64" source="../world/graffiti/emoji_2.png"/>
+ </tile>
+ <tile id="64">
+  <image width="64" height="64" source="../world/graffiti/emoji_1.png"/>
+ </tile>
+ <tile id="65">
+  <image width="128" height="128" source="../world/other/tv.png"/>
+ </tile>
+ <tile id="66">
+  <image width="128" height="128" source="../world/other/ceilingCamera.png"/>
+ </tile>
+ <tile id="67">
+  <image width="128" height="128" source="../world/graffiti/caution_0.png"/>
+ </tile>
+ <tile id="68">
+  <image width="84" height="84" source="../world/graffiti/graffiti_1.png"/>
+ </tile>
+ <tile id="69">
+  <image width="75" height="75" source="../world/graffiti/graffiti_3.png"/>
+ </tile>
+ <tile id="70">
+  <image width="90" height="90" source="../world/graffiti/graffiti_2.png"/>
+ </tile>
+ <tile id="71">
+  <image width="320" height="320" source="../world/other/cam_0.PNG"/>
+ </tile>
+ <tile id="72">
+  <image width="320" height="320" source="../world/other/cam_1.PNG"/>
+ </tile>
+ <tile id="73">
+  <image width="320" height="320" source="../world/other/cam_2.PNG"/>
+ </tile>
 </tileset>