Merge branch 'rc' of https://github.com/Adrian400811/ArcaneOdyssey in…

…to rc
reihoron · Jun 13, 2024 · dbb2481 · dbb2481
2 parents 3f645ac + 91ef726
commit dbb2481
Show file tree

Hide file tree

Showing 69 changed files with 303 additions and 159 deletions.
diff --git a/Brick.java b/Brick.java
@@ -1,18 +1,22 @@
-import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
+import greenfoot.GreenfootImage;
 
 /**
  * Write a description of class Block here.
- * 
- * @author (your name) 
+ *
+ * @author (your name)
  * @version (a version number or a date)
  */
-public class Brick extends Tile
-{
+public class Brick extends Tile {
+    public Brick() {
+        GreenfootImage image = new GreenfootImage("brick.jpg");
+        image.scale(64, 64);
+        setImage(image);
+    }
+
     /**
      * Act - do whatever the Block wants to do. This method is called whenever
      * the 'Act' or 'Run' button gets pressed in the environment.
      */
-    public void act()
-    {
+    public void act() {
     }
 }
diff --git a/Drone.java b/Drone.java
@@ -0,0 +1,19 @@
+import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
+
+/**
+ * Write a description of class Drone here.
+ * 
+ * @author (your name) 
+ * @version (a version number or a date)
+ */
+public class Drone extends FriendlyCreatures
+{
+    /**
+     * Act - do whatever the Drone wants to do. This method is called whenever
+     * the 'Act' or 'Run' button gets pressed in the environment.
+     */
+    public void act()
+    {
+        // Add your action code here.
+    }
+}
diff --git a/ExplodingRobot.java b/ExplodingRobot.java
@@ -0,0 +1,19 @@
+import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
+
+/**
+ * Write a description of class ExplodingRobot here.
+ * 
+ * @author (your name) 
+ * @version (a version number or a date)
+ */
+public class ExplodingRobot extends FriendlyCreatures
+{
+    /**
+     * Act - do whatever the ExplodingRobot wants to do. This method is called whenever
+     * the 'Act' or 'Run' button gets pressed in the environment.
+     */
+    public void act()
+    {
+        // Add your action code here.
+    }
+}
diff --git a/FloorHole.java b/FloorHole.java
@@ -0,0 +1,19 @@
+import greenfoot.Actor;
+import greenfoot.GreenfootImage;
+import greenfoot.World;
+
+import java.util.List;
+
+public class FloorHole extends Actor {
+    public FloorHole() {
+        GreenfootImage image = new GreenfootImage(1, 1);
+        setImage(image);
+    }
+
+    public void addedToWorld(World w) {
+        List<Brick> brick = getObjectsInRange(32, Brick.class);
+        for (Brick b : brick) {
+            w.removeObject(b);
+        }
+    }
+}
diff --git a/FriendlyCreatures.java b/FriendlyCreatures.java
@@ -0,0 +1,19 @@
+import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
+
+/**
+ * Write a description of class FriendlyCreatures here.
+ * 
+ * @author (your name) 
+ * @version (a version number or a date)
+ */
+public class FriendlyCreatures extends SuperSmoothMover
+{
+    /**
+     * Act - do whatever the FriendlyCreatures wants to do. This method is called whenever
+     * the 'Act' or 'Run' button gets pressed in the environment.
+     */
+    public void act()
+    {
+        // Add your action code here.
+    }
+}
diff --git a/JumpBooster.java b/JumpBooster.java
@@ -8,12 +8,13 @@ public class JumpBooster extends Actor {
 
     public JumpBooster() {
         image = new GreenfootImage(64, 64);
+        image.setColor(new Color(63, 81, 181, 128));
+        image.fillRect(0, 0, 64, 64);
+        setImage(image);
     }
 
     public void addedToWorld(World w) {
-        image.setColor(new Color(63, 81, 181, 50));
-        image.drawRect(getX(), getY() + 30, 32, 2);
-        setImage(image);
+
     }
 
     public void act() {

diff --git a/Level.java b/Level.java
@@ -9,6 +9,7 @@ public class Level extends World {
     protected static int totalCoins = 0;
     protected static int totalHP = 5;
     protected static int numOfCrown = 0;
+    private static int level = 0;
     private final int[] worldSize = {2560, 720};
     private final String background = "2dPixelForestBackground.png";
     private final Font font = new Font("Arial", 18);
@@ -17,15 +18,22 @@ public class Level extends World {
     protected Player player;
     protected SuperDisplayLabel coinLabel = new SuperDisplayLabel(Color.BLACK, Color.WHITE, font);
     protected Button saveButton = new Button();
-    private int level = 0;
     private Orb orb;
 
 
     public Level() {
         super(1280, 720, 1, false);
         saveButtonImage.scale(150, 60);
         saveButton.setImage(saveButtonImage);
-        setPaintOrder(Button.class,SuperDisplayLabel.class,Tile.class);
+        setPaintOrder(Button.class, SuperDisplayLabel.class, Tile.class);
+    }
+
+    public Level(int level) {
+        super(1280, 720, 1, false);
+        saveButtonImage.scale(150, 60);
+        saveButton.setImage(saveButtonImage);
+        setPaintOrder(Button.class, SuperDisplayLabel.class, Tile.class);
+        setLevel(level);
     }
 
     public static void resetCoin() {
@@ -41,27 +49,30 @@ public static void addCrown() {
     }
 
     public void spawnFloor(ImgScroll sc) {
-        for (int j = 0; j < sc.getScrollHeight() - 100; j += 300) {
-            for (int i = 0; i < sc.getScrollWidth() + 64; i += 63) {
-                addObject(new Brick(), i, 700);
-            }
+        for (int i = 0; i < sc.getScrollWidth() + 64; i += 64) {
+            addObject(new Brick(), i, 700);
         }
     }
 
     public void checkNext() {
         if (orb.isBeingTouched()) {
-            if (level == 0){
+            if (level == 0) {
                 levelUp();
                 Level1 world = new Level1();
                 Greenfoot.setWorld(world);
+                return;
             }
-            if (level == 1){
+            if (level == 1) {
                 EndScreen end = new EndScreen();
                 Greenfoot.setWorld(end);
             }
         }
     }
 
+    public void setLevel(int level) {
+        Level.level = level;
+    }
+
     public int[] getWorldSize() {
         return worldSize;
     }
@@ -127,6 +138,7 @@ public void spawnTerrain(int[][] identifier) {
                     case 9 -> new Crown();
                     case 10 -> new JumpBooster();
                     case 11 -> new Spike();
+                    case 12 -> new FloorHole();
                     default -> null;
                 };
                 if (a != null) {

diff --git a/Level0.java b/Level0.java
@@ -26,6 +26,7 @@ public Level0() {
         updateCoin(coinLabel);
         resetCoin();
         setHP(5);
+        setLevel(0);
 
         int[][] blockGeneration = loadLevel(0);
         spawnTerrain(blockGeneration);
@@ -34,7 +35,7 @@ public Level0() {
     public void act() {
         followPlayer(scroll, player);
         updateCoin(coinLabel);
-        saveButton.setLocation(getWidth()-100, 40);
+        saveButton.setLocation(getWidth() - 100, 40);
         checkSaveButton();
         checkNext();
     }

diff --git a/LoadSettings.java b/LoadSettings.java
diff --git a/Mobs.java b/Mobs.java
@@ -17,7 +17,8 @@ public Mobs() {
     public void addedToWorld(World w) {
         this.w = w;
     }
-    public void act(){
+
+    public void act() {
         stepped();
     }
 
@@ -110,11 +111,16 @@ public Player getPlayer(int range) {
         }
         return null;
     }
-    public void stepped(){
-        if(getOneObjectAtOffset(getX(), -(getImage().getHeight()/2), Player.class)!=null){
+
+    public void stepped() {
+        if (getWorld() == null) {
+            return;
+        }
+        if (getOneObjectAtOffset(getX(), -(getImage().getHeight() / 2), Player.class) != null) {
             getWorld().removeObject(this);
         }
     }
+
     public void attack(int dmg) {
         Player p = (Player) getOneIntersectingObject(Player.class);
         if (p == null) {

diff --git a/Player.java b/Player.java
@@ -112,11 +112,9 @@ private void fixDirections(){
     }
 
     private void jump() {
-        if (Greenfoot.isKeyDown("Space") && getOneObjectAtOffset((getImage().getHeight() / 2), (getImage().getHeight() / 2) + 1, Brick.class) != null) {
+        if (Greenfoot.isKeyDown("Space") && getOneObjectAtOffset(0, (getImage().getHeight() / 2) + 1, Brick.class) != null) {
             jumpActs = 30;
-        } else if (Greenfoot.isKeyDown("Space") && getOneObjectAtOffset(-(getImage().getHeight() / 2), (getImage().getHeight() / 2) + 1, Brick.class) != null) {
-            jumpActs = 30;
-        }
+        } 
         if (jumpActs > 15) {
             setLocation(getX(), getY() - 8);
         }

diff --git a/Spider.java b/Spider.java
@@ -27,7 +27,7 @@ public void addedToWorld(World w) {
     }
 
     public void act() {
-        if (checkBlock()) {
+        if (checkBlock() || checkY()) {
             holdAct--;
             hold();
         } else {
@@ -61,15 +61,19 @@ private boolean checkBlock() {
         return getOneIntersectingObject(Tile.class) != null;
     }
 
+    private boolean checkY() {
+        return (getY() < 0 || getY() > w.getHeight());
+    }
+
     public void timeout() {
         if (w == null) {
             return;
         }
-        if (!oob && (getX() < 0 || getX() > w.getWidth() || getY() < 0 || getY() > w.getHeight())) {
+        if (!oob && (getX() < 0)) {
             oob = true;
             startTime = System.currentTimeMillis();
         }
-        if (oob && !(getX() < 0 || getX() > w.getWidth() || getY() < 0 || getY() > w.getHeight())) {
+        if (oob && !(getX() < 0)) {
             oob = false;
         }
         if (oob) {

diff --git a/Spike.java b/Spike.java
diff --git a/doc/Bee.html b/doc/Bee.html
diff --git a/doc/BlueBee.html b/doc/BlueBee.html
diff --git a/doc/Brick.html b/doc/Brick.html
diff --git a/doc/Button.html b/doc/Button.html
diff --git a/doc/Coin.html b/doc/Coin.html
diff --git a/doc/Collection.html b/doc/Collection.html
diff --git a/doc/Crown.html b/doc/Crown.html
diff --git a/doc/EndScreen.html b/doc/EndScreen.html
diff --git a/doc/GameOverScreen.html b/doc/GameOverScreen.html
diff --git a/doc/GreenBee.html b/doc/GreenBee.html
diff --git a/doc/ImgScroll.html b/doc/ImgScroll.html
diff --git a/doc/Level.html b/doc/Level.html
diff --git a/doc/Level0.html b/doc/Level0.html
diff --git a/doc/Level1.html b/doc/Level1.html
diff --git a/doc/Mites.html b/doc/Mites.html
diff --git a/doc/Mobs.html b/doc/Mobs.html
diff --git a/doc/Orb.html b/doc/Orb.html
diff --git a/doc/RedBee.html b/doc/RedBee.html
diff --git a/doc/Spider.html b/doc/Spider.html
diff --git a/doc/SuperDisplayLabel.html b/doc/SuperDisplayLabel.html
diff --git a/doc/SuperSmoothMover.html b/doc/SuperSmoothMover.html
diff --git a/doc/Tile.html b/doc/Tile.html
diff --git a/doc/TitleScreen.html b/doc/TitleScreen.html
diff --git a/doc/allclasses-index.html b/doc/allclasses-index.html
diff --git a/doc/allpackages-index.html b/doc/allpackages-index.html
diff --git a/doc/help-doc.html b/doc/help-doc.html
diff --git a/doc/index-all.html b/doc/index-all.html
diff --git a/doc/jquery-ui.overrides.css b/doc/jquery-ui.overrides.css
diff --git a/doc/member-search-index.js b/doc/member-search-index.js
diff --git a/doc/module-search-index.js b/doc/module-search-index.js
diff --git a/doc/overview-tree.html b/doc/overview-tree.html
diff --git a/doc/package-search-index.js b/doc/package-search-index.js
diff --git a/doc/package-tree.html b/doc/package-tree.html
diff --git a/doc/resources/glass.png b/doc/resources/glass.png
diff --git a/doc/resources/x.png b/doc/resources/x.png
diff --git a/doc/script-dir/jquery-3.6.1.min.js b/doc/script-dir/jquery-3.6.1.min.js
diff --git a/doc/script-dir/jquery-ui.min.css b/doc/script-dir/jquery-ui.min.css
diff --git a/doc/script-dir/jquery-ui.min.js b/doc/script-dir/jquery-ui.min.js
diff --git a/doc/search.js b/doc/search.js
diff --git a/doc/stylesheet.css b/doc/stylesheet.css
diff --git a/doc/tag-search-index.js b/doc/tag-search-index.js
diff --git a/doc/type-search-index.js b/doc/type-search-index.js
diff --git a/images/exploding robot/coolDown.png b/images/exploding robot/coolDown.png
diff --git a/images/exploding robot/exploding1.png b/images/exploding robot/exploding1.png
diff --git a/images/exploding robot/exploding2.png b/images/exploding robot/exploding2.png
diff --git a/images/exploding robot/normal1.png b/images/exploding robot/normal1.png
diff --git a/images/exploding robot/normal2.png b/images/exploding robot/normal2.png
diff --git a/images/exploding robot/normal3.png b/images/exploding robot/normal3.png
diff --git a/images/marioCoin.png b/images/marioCoin.png
diff --git a/images/saveButtonImage.png b/images/saveButtonImage.png
diff --git a/images/saveFile1.png b/images/saveFile1.png
diff --git a/images/saveFile2.png b/images/saveFile2.png
diff --git a/images/spikes.png b/images/spikes.png
diff --git a/levels/0.csv b/levels/0.csv
@@ -124,4 +124,53 @@
 59,4,1
 59,3,1
 59,2,1
-60,10,2
+70,11,12
+70,1,1
+70,9,8
+71,11,12
+71,1,1
+71,4,8
+72,11,12
+72,2,1
+72,5,8
+73,10,1
+74,10,1
+75,10,1
+76,10,1
+77,10,1
+78,10,1
+79,11,12
+80,11,12
+80,1,1
+80,2,8
+81,11,12
+82,11,12
+82,1,1
+82,3,8
+83,10,1
+84,10,1
+84,9,1
+85,10,1
+85,9,1
+85,8,1
+86,10,1
+86,9,1
+86,8,1
+86,7,1
+90,8,3
+90,9,3
+91,7,3
+91,8,3
+91,9,3
+91,10,3
+92,7,3
+92,8,3
+92,9,3
+92,10,3
+93,7,3
+93,8,3
+93,9,3
+93,10,3
+94,8,3
+94,9,3
+100,10,2
diff --git a/levels/1.csv b/levels/1.csv
@@ -56,12 +56,12 @@
 17,6,1
 16,6,1
 15,6,1
-3,10,10
-4,10,10
-6,10,10
-7,10,10
-11,10,10
-12,10,10
+3,10,11
+4,10,11
+6,10,11
+7,10,11
+11,10,11
+12,10,11
 15,7,1
 15,8,1
 18,2,1
@@ -100,8 +100,8 @@
 23,8,1
 28,2,1
 29,2,1
-30,10,10
-31,10,10
+30,10,11
+31,10,11
 29,3,1
 29,4,1
 29,5,1
@@ -113,8 +113,8 @@
 32,10,1
 32,9,1
 32,8,1
-33,10,10
-34,10,10
+33,10,11
+34,10,11
 35,10,1
 35,9,1
 35,8,1
-Original file line number
+Diff line change
@@ Expand Up / @@ -124,4 +124,53 @@ @@
 ,4,1
 ,3,1
 ,2,1
-,10,2
+,11,12
+,1,1
+,9,8
+,11,12
+,1,1
+,4,8
+,11,12
+,2,1
+,5,8
+,10,1
+,10,1
+,10,1
+,10,1
+,10,1
+,10,1
+,11,12
+,11,12
+,1,1
+,2,8
+,11,12
+,11,12
+,1,1
+,3,8
+,10,1
+,10,1
+,9,1
+,10,1
+,9,1
+,8,1
+,10,1
+,9,1
+,8,1
+,7,1
+,8,3
+,9,3
+,7,3
+,8,3
+,9,3
+,10,3
+,7,3
+,8,3
+,9,3
+,10,3
+,7,3
+,8,3
+,9,3
+,10,3
+,8,3
+,9,3
+,10,2
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,12 +56,12 @@ @@
 ,6,1
 ,6,1
 ,6,1
-,10,10
-,10,10
-,10,10
-,10,10
-,10,10
-,10,10
+,10,11
+,10,11
+,10,11
+,10,11
+,10,11
+,10,11
 ,7,1
 ,8,1
 ,2,1
@@ Expand Down Expand Up / @@ -100,8 +100,8 @@ @@
 ,8,1
 ,2,1
 ,2,1
-,10,10
-,10,10
+,10,11
+,10,11
 ,3,1
 ,4,1
 ,5,1
@@ Expand All / @@ -113,8 +113,8 @@ @@
 ,10,1
 ,9,1
 ,8,1
-,10,10
-,10,10
+,10,11
+,10,11
 ,10,1
 ,9,1
 ,8,1