Beta Merge

JacobSeto · Apr 28, 2024 · 9d08d22 · 9d08d22
2 parents 1dd1ff7 + 65d3981
commit 9d08d22
Show file tree

Hide file tree

Showing 186 changed files with 10,693 additions and 407 deletions.
diff --git a/assets/Tiled/level1Beta.tmx b/assets/Tiled/level1Beta.tmx
@@ -89,20 +89,23 @@
    <properties>
     <property name="genre" value="synth"/>
     <property name="num" type="int" value="2"/>
+    <property name="platformInterval" type="int" value="1"/>
     <property name="speed" type="int" value="0"/>
    </properties>
   </object>
   <object id="575" gid="114" x="1920" y="640" width="192" height="36">
    <properties>
     <property name="genre" value="jazz"/>
     <property name="num" type="int" value="2"/>
+    <property name="platformInterval" type="int" value="1"/>
     <property name="speed" type="int" value="0"/>
    </properties>
   </object>
   <object id="577" type="Weighted Platform" gid="115" x="2880" y="1024" width="192" height="36">
    <properties>
     <property name="genre" value="synth"/>
     <property name="num" type="int" value="3"/>
+    <property name="platformInterval" type="int" value="1"/>
     <property name="speed" type="int" value="0"/>
     <property name="waitTime" type="int" value="4"/>
    </properties>
@@ -111,6 +114,7 @@
    <properties>
     <property name="genre" value="jazz"/>
     <property name="num" type="int" value="3"/>
+    <property name="platformInterval" type="int" value="1"/>
     <property name="speed" type="int" value="0"/>
     <property name="waitTime" type="int" value="4"/>
    </properties>
@@ -119,13 +123,15 @@
    <properties>
     <property name="genre" value="jazz"/>
     <property name="num" type="int" value="4"/>
+    <property name="platformInterval" type="int" value="1"/>
     <property name="speed" type="int" value="0"/>
    </properties>
   </object>
-  <object id="654" type="Weighted Platform" gid="115" x="1920" y="640" width="192" height="36">
+  <object id="654" type="Weighted Platform" gid="115" x="1929.09" y="640" width="192" height="36">
    <properties>
     <property name="genre" value="synth"/>
     <property name="num" type="int" value="4"/>
+    <property name="platformInterval" type="int" value="1"/>
     <property name="speed" type="int" value="0"/>
    </properties>
   </object>

diff --git a/assets/Tiled/rabbeatLevelBat.tmx b/assets/Tiled/rabbeatLevelBat.tmx
@@ -84,22 +84,24 @@
   </object>
  </objectgroup>
  <objectgroup id="16" name="movingPlatforms">
-  <object id="579" gid="135" x="4736" y="996" width="192" height="36">
+  <object id="579" type="Moving Platform" gid="135" x="4736" y="996" width="192" height="36">
    <properties>
     <property name="num" type="int" value="0"/>
     <property name="pos" type="int" value="0"/>
     <property name="speed" type="int" value="1"/>
     <property name="totalPos" type="int" value="2"/>
     <property name="wait" value="2"/>
+    <property name="waitTime" type="int" value="2"/>
    </properties>
   </object>
-  <object id="580" gid="135" x="4736" y="484" width="192" height="36">
+  <object id="580" type="Moving Platform" gid="135" x="4736" y="484" width="192" height="36">
    <properties>
     <property name="num" type="int" value="0"/>
     <property name="pos" type="int" value="1"/>
     <property name="speed" type="int" value="1"/>
     <property name="totalPos" type="int" value="2"/>
     <property name="wait" value="2"/>
+    <property name="waitTime" type="int" value="2"/>
    </properties>
   </object>
   <object id="581" gid="135" x="5184" y="548" width="192" height="36">

diff --git a/assets/assets.json b/assets/assets.json
@@ -34,11 +34,11 @@
 
       "world:tilesets:wallsTileset:11" : "world/tilesets/wallsTileset/11.png",
 
-      "world:platforms:weightedSynth" : "world/platforms/synthPlat.PNG",
+      "world:platforms:weightedSynth" : "world/platforms/synthPlat.png",
 
       "world:platforms:weightedJazz" : "world/platforms/jazzPlat.png",
 
-      "world:platforms:movingSynth" : "world/platforms/synthPlat.PNG",
+      "world:platforms:movingSynth" : "world/platforms/synthPlat.png",
 
       "world:platforms:movingJazz" : "world/platforms/jazzPlat.png",
 
@@ -213,7 +213,7 @@
 
       "world:pipes:pipestraightskinny" : "world/pipes/pipestraightskinny.png",
 
-      "world:pipes:bgpipe" : "world/pipes/bgpipe.png",
+      "world:pipes:bgpipe" : "world/pipes/bgpipe.PNG",
 
       "world:wires:bigwire" : "world/wires/bigwire.png",
 
@@ -227,11 +227,11 @@
 
       "world:other:ceilingCamera": "world/other/ceilingCamera.png",
 
-      "world:other:cam_0": "world/other/cam_0.png",
+      "world:other:cam_0": "world/other/cam_0.PNG",
 
-      "world:other:cam_1": "world/other/cam_1.png",
+      "world:other:cam_1": "world/other/cam_1.PNG",
 
-      "world:other:cam_2": "world/other/cam_2.png",
+      "world:other:cam_2": "world/other/cam_2.PNG",
 
       "world:graffiti:emoji_0" : "world/graffiti/emoji_0.png",
 
@@ -249,7 +249,7 @@
 
       "world:graffiti:caution_0" : "world/graffiti/caution_0.png",
 
-      "world:laser" : "world/laser.png",
+      "world:laser" : "world/laser.PNG",
       "world:laserMiddle" : "world/lasers/laserMiddle.png",
       "world:laserTop" : "world/lasers/laserTop.png",
       "world:laserBottom" : "world/lasers/laserBottom.png"

diff --git a/assets/defaultConstants.json b/assets/defaultConstants.json
@@ -7,23 +7,24 @@
     "gravity": -49.0
   },
   "player" : {
-    "shrink": [0.7, 0.95],
+    "shrink": [0.6, 0.95],
     "force": 75.0,
     "damping": 6.0,
     "density": 1.3,
     "friction": 0.3,
     "synth_jump_force": 38.0,
     "jazz_jump_force": 49,
+    "jazz_jump_force": 49,
     "jump_cool": 30,
     "shot_cool": 40,
     "sensor": {
-      "shrink" : 0.6,
+      "shrink" : 0.8,
       "height" : 0.05
     },
     "max_speed": {
       "synth": 8.5,
       "jazz": 4.7
-    }
+    },
   },
   "goal": {
     "density": 0.0,
@@ -89,8 +90,8 @@
   },
   "bats": {
     "shrink": [
-      0.7,
-      0.95
+      0.6,
+      0.8
     ],
     "force": 20.0,
     "damping": 10.0,

diff --git a/assets/levelsJson/level1Beta.tmj b/assets/levelsJson/level1Beta.tmj
@@ -388,6 +388,11 @@
                          "type":"int",
                          "value":2
                         }, 
+                        {
+                         "name":"platformInterval",
+                         "type":"int",
+                         "value":1
+                        }, 
                         {
                          "name":"speed",
                          "type":"int",
@@ -416,6 +421,11 @@
                          "type":"int",
                          "value":2
                         }, 
+                        {
+                         "name":"platformInterval",
+                         "type":"int",
+                         "value":1
+                        }, 
                         {
                          "name":"speed",
                          "type":"int",
@@ -444,6 +454,11 @@
                          "type":"int",
                          "value":3
                         }, 
+                        {
+                         "name":"platformInterval",
+                         "type":"int",
+                         "value":1
+                        }, 
                         {
                          "name":"speed",
                          "type":"int",
@@ -477,6 +492,11 @@
                          "type":"int",
                          "value":3
                         }, 
+                        {
+                         "name":"platformInterval",
+                         "type":"int",
+                         "value":1
+                        }, 
                         {
                          "name":"speed",
                          "type":"int",
@@ -510,6 +530,11 @@
                          "type":"int",
                          "value":4
                         }, 
+                        {
+                         "name":"platformInterval",
+                         "type":"int",
+                         "value":1
+                        }, 
                         {
                          "name":"speed",
                          "type":"int",
@@ -538,6 +563,11 @@
                          "type":"int",
                          "value":4
                         }, 
+                        {
+                         "name":"platformInterval",
+                         "type":"int",
+                         "value":1
+                        }, 
                         {
                          "name":"speed",
                          "type":"int",
@@ -547,7 +577,7 @@
                  "type":"Weighted Platform",
                  "visible":true,
                  "width":192,
-                 "x":1920,
+                 "x":1929.09090909091,
                  "y":640
                 }],
          "opacity":1,

diff --git a/assets/levelsJson/rabbeatLevelBat.tmj b/assets/levelsJson/rabbeatLevelBat.tmj
@@ -325,6 +325,11 @@
                  "id":579,
                  "name":"",
                  "properties":[
+                        {
+                         "name":"moveTime",
+                         "type":"int",
+                         "value":1
+                        }, 
                         {
                          "name":"num",
                          "type":"int",
@@ -349,9 +354,14 @@
                          "name":"wait",
                          "type":"string",
                          "value":"2"
+                        }, 
+                        {
+                         "name":"waitTime",
+                         "type":"int",
+                         "value":2
                         }],
                  "rotation":0,
-                 "type":"",
+                 "type":"Moving Platform",
                  "visible":true,
                  "width":192,
                  "x":4736,
@@ -363,6 +373,11 @@
                  "id":580,
                  "name":"",
                  "properties":[
+                        {
+                         "name":"moveTime",
+                         "type":"int",
+                         "value":1
+                        }, 
                         {
                          "name":"num",
                          "type":"int",
@@ -387,9 +402,14 @@
                          "name":"wait",
                          "type":"string",
                          "value":"2"
+                        }, 
+                        {
+                         "name":"waitTime",
+                         "type":"int",
+                         "value":2
                         }],
                  "rotation":0,
-                 "type":"",
+                 "type":"Moving Platform",
                  "visible":true,
                  "width":192,
                  "x":4736,

diff --git a/core/src/edu/cornell/gdiac/rabbeat/GameController.java b/core/src/edu/cornell/gdiac/rabbeat/GameController.java
@@ -1159,7 +1159,8 @@ public void setLevelsUnlocked(int levelsUnlocked) {
 
 	/** Increments the integer levelsUnlocked if a player completes a level and the next level is locked*/
 	public void incrementLevelsUnlocked() {
-		if(currentLevelInt == levelsUnlocked) {
+		//TODO Implement more levels beyond 3
+		if(currentLevelInt == levelsUnlocked && levelsUnlocked != 3) {
 			levelsUnlocked++;
 		}
 	}

diff --git a/core/src/edu/cornell/gdiac/rabbeat/obstacles/enemies/BatEnemy.java b/core/src/edu/cornell/gdiac/rabbeat/obstacles/enemies/BatEnemy.java
@@ -89,7 +89,7 @@ public void makeEcho() {
         for(int i = 0; i < 2; i++){
             if(GameController.getInstance().genre == Genre.SYNTH){
                 echo = new Echo(getX() + offset, getY(),
-                        3, .75f,  echoAnimation);
+                        2, .75f,  echoAnimation);
             }
             else{
                 echo = new Echo(getX(), getY()+ offset,

diff --git a/core/src/edu/cornell/gdiac/rabbeat/obstacles/projectiles/Bee.java b/core/src/edu/cornell/gdiac/rabbeat/obstacles/projectiles/Bee.java
@@ -8,11 +8,10 @@
 import edu.cornell.gdiac.rabbeat.obstacles.IGenreObject;
 import edu.cornell.gdiac.rabbeat.obstacles.Type;
 import edu.cornell.gdiac.rabbeat.obstacles.WheelGameObject;
-import edu.cornell.gdiac.rabbeat.sync.ISynced;
 import edu.cornell.gdiac.rabbeat.sync.ISyncedAnimated;
 
 
-public class Bee extends WheelGameObject implements ISynced, IGenreObject {
+public class Bee extends WheelGameObject implements ISyncedAnimated, IGenreObject {
 
     public int beatCount = 0;
     private float hiveY;

diff --git a/core/src/edu/cornell/gdiac/rabbeat/obstacles/projectiles/Bullet.java b/core/src/edu/cornell/gdiac/rabbeat/obstacles/projectiles/Bullet.java
@@ -22,7 +22,7 @@ public Bullet(float x, float y, float radius, float synthVX, float jazzVX, boole
         float dir = (fr ? 1 : -1);
         bulletGenre = genre;
         setType(Type.LETHAL);
-        //setSensor(true);
+        setSensor(true);
     }
 
     @Override

diff --git a/desktop/build/resources/main/assets.json b/desktop/build/resources/main/assets.json
@@ -34,11 +34,11 @@
 
       "world:tilesets:wallsTileset:11" : "world/tilesets/wallsTileset/11.png",
 
-      "world:platforms:weightedSynth" : "world/platforms/synthPlat.PNG",
+      "world:platforms:weightedSynth" : "world/platforms/synthPlat.png",
 
       "world:platforms:weightedJazz" : "world/platforms/jazzPlat.png",
 
-      "world:platforms:movingSynth" : "world/platforms/synthPlat.PNG",
+      "world:platforms:movingSynth" : "world/platforms/synthPlat.png",
 
       "world:platforms:movingJazz" : "world/platforms/jazzPlat.png",
 
@@ -213,7 +213,7 @@
 
       "world:pipes:pipestraightskinny" : "world/pipes/pipestraightskinny.png",
 
-      "world:pipes:bgpipe" : "world/pipes/bgpipe.png",
+      "world:pipes:bgpipe" : "world/pipes/bgpipe.PNG",
 
       "world:wires:bigwire" : "world/wires/bigwire.png",
 
@@ -227,11 +227,11 @@
 
       "world:other:ceilingCamera": "world/other/ceilingCamera.png",
 
-      "world:other:cam_0": "world/other/cam_0.png",
+      "world:other:cam_0": "world/other/cam_0.PNG",
 
-      "world:other:cam_1": "world/other/cam_1.png",
+      "world:other:cam_1": "world/other/cam_1.PNG",
 
-      "world:other:cam_2": "world/other/cam_2.png",
+      "world:other:cam_2": "world/other/cam_2.PNG",
 
       "world:graffiti:emoji_0" : "world/graffiti/emoji_0.png",
 
@@ -249,7 +249,7 @@
 
       "world:graffiti:caution_0" : "world/graffiti/caution_0.png",
 
-      "world:laser" : "world/laser.png",
+      "world:laser" : "world/laser.PNG",
       "world:laserMiddle" : "world/lasers/laserMiddle.png",
       "world:laserTop" : "world/lasers/laserTop.png",
       "world:laserBottom" : "world/lasers/laserBottom.png"