Changed project package struckture

Tobi-Tob · Jul 5, 2023 · c593eb2 · c593eb2
1 parent 7be2b1e
commit c593eb2
Show file tree

Hide file tree

Showing 71 changed files with 136 additions and 142 deletions.
diff --git a/SpaceApes/bin/actions/ChangeAngleAction.class b/SpaceApes/bin/actions/ChangeAngleAction.class
diff --git a/SpaceApes/bin/actions/ChangePowerAction.class b/SpaceApes/bin/actions/ChangePowerAction.class
diff --git a/SpaceApes/bin/actions/ChangeWeaponAction.class b/SpaceApes/bin/actions/ChangeWeaponAction.class
diff --git a/SpaceApes/bin/actions/ItemCollisionAction.class b/SpaceApes/bin/actions/ItemCollisionAction.class
diff --git a/SpaceApes/bin/actions/MoveOnPlanetAction.class b/SpaceApes/bin/actions/MoveOnPlanetAction.class
diff --git a/SpaceApes/bin/actions/PolicyNextMoveAction.class b/SpaceApes/bin/actions/PolicyNextMoveAction.class
diff --git a/SpaceApes/bin/actions/ProjectileBehaviorAction.class b/SpaceApes/bin/actions/ProjectileBehaviorAction.class
diff --git a/SpaceApes/bin/actions/ShootAction.class b/SpaceApes/bin/actions/ShootAction.class
diff --git a/SpaceApes/bin/entities/Ape.class b/SpaceApes/bin/entities/Ape.class
diff --git a/SpaceApes/bin/entities/ControlPanel.class b/SpaceApes/bin/entities/ControlPanel.class
diff --git a/SpaceApes/bin/entities/DamageDisplay.class b/SpaceApes/bin/entities/DamageDisplay.class
diff --git a/SpaceApes/bin/entities/Planet.class b/SpaceApes/bin/entities/Planet.class
diff --git a/SpaceApes/bin/entities/Projectile.class b/SpaceApes/bin/entities/Projectile.class
diff --git a/SpaceApes/bin/events/LeavingWorldEvent.class b/SpaceApes/bin/events/LeavingWorldEvent.class
diff --git a/SpaceApes/bin/events/LessThan2ApesLeftEvent.class b/SpaceApes/bin/events/LessThan2ApesLeftEvent.class
diff --git a/SpaceApes/bin/events/PolicyEvent.class b/SpaceApes/bin/events/PolicyEvent.class
diff --git a/SpaceApes/bin/factories/ApeFactory.class b/SpaceApes/bin/factories/ApeFactory.class
diff --git a/SpaceApes/bin/factories/ItemFactory.class b/SpaceApes/bin/factories/ItemFactory.class
diff --git a/SpaceApes/bin/factories/PlanetFactory$PlanetType.class b/SpaceApes/bin/factories/PlanetFactory$PlanetType.class
diff --git a/SpaceApes/bin/factories/PlanetFactory.class b/SpaceApes/bin/factories/PlanetFactory.class
diff --git a/SpaceApes/bin/factories/ProjectileFactory.class b/SpaceApes/bin/factories/ProjectileFactory.class
diff --git a/SpaceApes/bin/spaceapes/GameplayState.class → SpaceApes/bin/gamestates/GameplayState.class b/SpaceApes/bin/spaceapes/GameplayState.class → SpaceApes/bin/gamestates/GameplayState.class
diff --git a/SpaceApes/bin/spaceapes/HighscoreState.class → ...eApes/bin/gamestates/HighscoreState.class b/SpaceApes/bin/spaceapes/HighscoreState.class → ...eApes/bin/gamestates/HighscoreState.class
diff --git a/SpaceApes/bin/spaceapes/MainMenuState.class → SpaceApes/bin/gamestates/MainMenuState.class b/SpaceApes/bin/spaceapes/MainMenuState.class → SpaceApes/bin/gamestates/MainMenuState.class
diff --git a/SpaceApes/bin/map/Map$1.class b/SpaceApes/bin/map/Map$1.class
diff --git a/...s/bin/utils/InverseTrajectoryPolicy.class → ...bin/policys/InverseTrajectoryPolicy.class b/...s/bin/utils/InverseTrajectoryPolicy.class → ...bin/policys/InverseTrajectoryPolicy.class
diff --git a/...eApes/bin/utils/Policy$PolicyAction.class → ...pes/bin/policys/Policy$PolicyAction.class b/...eApes/bin/utils/Policy$PolicyAction.class → ...pes/bin/policys/Policy$PolicyAction.class
diff --git a/SpaceApes/bin/policys/Policy.class b/SpaceApes/bin/policys/Policy.class
diff --git a/SpaceApes/bin/utils/RandomPolicy.class → SpaceApes/bin/policys/RandomPolicy.class b/SpaceApes/bin/utils/RandomPolicy.class → SpaceApes/bin/policys/RandomPolicy.class
diff --git a/SpaceApes/bin/utils/RuleBasedPolicy.class → SpaceApes/bin/policys/RuleBasedPolicy.class b/SpaceApes/bin/utils/RuleBasedPolicy.class → SpaceApes/bin/policys/RuleBasedPolicy.class
diff --git a/SpaceApes/bin/spaceapes/Constants.class b/SpaceApes/bin/spaceapes/Constants.class
diff --git a/SpaceApes/bin/map/Initializer.class → SpaceApes/bin/spaceapes/Initializer.class b/SpaceApes/bin/map/Initializer.class → SpaceApes/bin/spaceapes/Initializer.class
diff --git a/SpaceApes/bin/spaceapes/Map$1.class b/SpaceApes/bin/spaceapes/Map$1.class
diff --git a/SpaceApes/bin/map/Map.class → SpaceApes/bin/spaceapes/Map.class b/SpaceApes/bin/map/Map.class → SpaceApes/bin/spaceapes/Map.class
diff --git a/SpaceApes/bin/spaceapes/SpaceApes.class b/SpaceApes/bin/spaceapes/SpaceApes.class
diff --git a/SpaceApes/bin/utils/Constants.class b/SpaceApes/bin/utils/Constants.class
diff --git a/SpaceApes/bin/utils/Policy.class b/SpaceApes/bin/utils/Policy.class
diff --git a/SpaceApes/bin/utils/Utils.class b/SpaceApes/bin/utils/Utils.class
diff --git a/SpaceApes/src/actions/ChangeAngleAction.java b/SpaceApes/src/actions/ChangeAngleAction.java
@@ -6,7 +6,7 @@
 import eea.engine.component.Component;
 import eea.engine.entity.Entity;
 import entities.Ape;
-import map.Map;
+import spaceapes.Map;
 
 public class ChangeAngleAction extends ButtonAnimationAction {
 	private float angleToChange;

diff --git a/SpaceApes/src/actions/ChangePowerAction.java b/SpaceApes/src/actions/ChangePowerAction.java
@@ -6,7 +6,7 @@
 import eea.engine.component.Component;
 import eea.engine.entity.Entity;
 import entities.Ape;
-import map.Map;
+import spaceapes.Map;
 
 public class ChangePowerAction extends ButtonAnimationAction {
 	private float powerToChange;

diff --git a/SpaceApes/src/actions/ChangeWeaponAction.java b/SpaceApes/src/actions/ChangeWeaponAction.java
@@ -6,7 +6,7 @@
 import eea.engine.component.Component;
 import eea.engine.entity.Entity;
 import entities.Ape;
-import map.Map;
+import spaceapes.Map;
 
 public class ChangeWeaponAction extends ButtonAnimationAction {
 

diff --git a/SpaceApes/src/actions/ItemCollisionAction.java b/SpaceApes/src/actions/ItemCollisionAction.java
@@ -11,7 +11,7 @@
 import entities.Ape;
 import entities.Item;
 import factories.ItemFactory.ItemType;
-import map.Map;
+import spaceapes.Map;
 
 public class ItemCollisionAction implements Action {
 

diff --git a/SpaceApes/src/actions/MoveOnPlanetAction.java b/SpaceApes/src/actions/MoveOnPlanetAction.java
@@ -6,8 +6,8 @@
 import eea.engine.action.Action;
 import eea.engine.component.Component;
 import entities.Ape;
-import map.Map;
-import spaceapes.Constants;
+import utils.Constants;
+import spaceapes.Map;
 import spaceapes.SpaceApes;
 
 public class MoveOnPlanetAction implements Action {

diff --git a/SpaceApes/src/actions/PolicyNextMoveAction.java b/SpaceApes/src/actions/PolicyNextMoveAction.java
@@ -6,7 +6,7 @@
 import eea.engine.action.Action;
 import eea.engine.component.Component;
 import entities.Ape;
-import utils.Policy;
+import policys.Policy;
 
 public class PolicyNextMoveAction implements Action {
 

diff --git a/SpaceApes/src/actions/ProjectileBehaviorAction.java b/SpaceApes/src/actions/ProjectileBehaviorAction.java
@@ -16,8 +16,8 @@
 import entities.DamageDisplay;
 import entities.Projectile;
 import factories.ProjectileFactory.ProjectileStatus;
-import map.Map;
-import spaceapes.Constants;
+import utils.Constants;
+import spaceapes.Map;
 import spaceapes.SpaceApes;
 import utils.Utils;
 

diff --git a/SpaceApes/src/actions/ShootAction.java b/SpaceApes/src/actions/ShootAction.java
@@ -11,8 +11,8 @@
 import factories.ProjectileFactory;
 import factories.ProjectileFactory.MovementType;
 import factories.ProjectileFactory.ProjectileType;
-import map.Map;
-import spaceapes.Constants;
+import spaceapes.Map;
+import utils.Constants;
 import utils.Utils;
 
 public class ShootAction implements Action {

diff --git a/SpaceApes/src/entities/Ape.java b/SpaceApes/src/entities/Ape.java
@@ -2,9 +2,9 @@
 
 import org.newdawn.slick.geom.Vector2f;
 import eea.engine.entity.Entity;
-import spaceapes.Constants;
+import policys.Policy;
+import utils.Constants;
 import spaceapes.SpaceApes;
-import utils.Policy;
 import utils.Utils;
 
 public class Ape extends Entity {
@@ -17,7 +17,9 @@ public class Ape extends Entity {
 	private float movementSpeed; // Faktor fuer die Schrittweite des Affen
 	private float distancePlanetCenter; // Abstand des Planetenmittelpunkts zur Kreisbahn auf der sich der Affe bewegt
 
-	private final float scalingFactor = Constants.APE_DESIRED_SIZE / Utils.pixelLengthToWorldLength(Constants.APE_PIXEL_HEIGHT);
+	public final int apePixelHeight = 300;
+	public final int apePixelFeetToCenter = 130;
+	private final float scalingFactor = Constants.APE_SIZE / Utils.pixelLengthToWorldLength(apePixelHeight);
 
 	private final int maxHealth = Constants.APE_MAX_HEALTH;
 	private final int maxEnergy = Constants.APE_MAX_ENERGY;
@@ -235,7 +237,7 @@ public void setEnergy(float value) {
 	public void changeEnergy(float value) {
 		if (energy + value > maxEnergy) {
 			energy = maxEnergy;
-		} else if (energy - value < 0) {
+		} else if (energy + value < 0) {
 			energy = 0;
 		} else {
 			energy += value;
@@ -246,8 +248,13 @@ public float getDistanceToPlanetCenter() {
 		return distancePlanetCenter;
 	}
 
-	public void setDistanceToPlanetCenter(float distancePlanetCenter) {
-		this.distancePlanetCenter = distancePlanetCenter;
+	public void setDistanceToPlanetCenter() {
+		float distance = homePlanet.getRadius()
+				+ Utils.pixelLengthToWorldLength(apePixelFeetToCenter * scalingFactor);
+		if (distance < 0.1f) {
+			throw new RuntimeException("Distance to planet center is to close to 0");
+		}
+		this.distancePlanetCenter = distance;
 	}
 
 	public void setPlanet(Planet planet) {
@@ -278,7 +285,7 @@ public void increaseCoins(int value) {
 	}
 
 	public float getRadiusInWorldUnits() { //necessary for collision check
-		return Constants.APE_DESIRED_SIZE / 2;
+		return Constants.APE_SIZE / 2;
 	}
 
 	/**

diff --git a/SpaceApes/src/entities/ApeInfoSign.java b/SpaceApes/src/entities/ApeInfoSign.java
@@ -14,7 +14,7 @@
 import eea.engine.component.render.ImageRenderComponent;
 import eea.engine.entity.Entity;
 import eea.engine.entity.StateBasedEntityManager;
-import spaceapes.Constants;
+import utils.Constants;
 import spaceapes.SpaceApes;
 import utils.Utils;
 

diff --git a/SpaceApes/src/entities/ControlPanel.java b/SpaceApes/src/entities/ControlPanel.java
@@ -30,9 +30,9 @@
 import factories.ProjectileFactory;
 import factories.ProjectileFactory.MovementType;
 import factories.ProjectileFactory.ProjectileType;
-import map.Map;
-import spaceapes.Constants;
+import spaceapes.Map;
 import spaceapes.SpaceApes;
+import utils.Constants;
 import utils.Utils;
 
 public class ControlPanel extends Entity {

diff --git a/SpaceApes/src/entities/DamageDisplay.java b/SpaceApes/src/entities/DamageDisplay.java
@@ -7,8 +7,8 @@
 import org.newdawn.slick.state.StateBasedGame;
 import eea.engine.entity.Entity;
 import eea.engine.entity.StateBasedEntityManager;
-import spaceapes.Constants;
 import spaceapes.SpaceApes;
+import utils.Constants;
 import utils.Utils;
 
 /**

diff --git a/SpaceApes/src/entities/Planet.java b/SpaceApes/src/entities/Planet.java
@@ -4,7 +4,6 @@
 
 import eea.engine.entity.Entity;
 import factories.PlanetFactory.PlanetType;
-import spaceapes.Constants;
 import utils.Utils;
 
 public class Planet extends Entity {
@@ -29,7 +28,7 @@ public Planet(String entityID) {
 	 * @throws RuntimeException wenn Radius zu klein
 	 */
 	public float distanceToApePosition() {
-		float dist = getRadius() + Utils.pixelLengthToWorldLength(Constants.APE_PIXEL_FEET_TO_CENTER * ape.getScalingFactor());
+		float dist = getRadius() + Utils.pixelLengthToWorldLength(ape.apePixelFeetToCenter * ape.getScalingFactor());
 		if (dist > 0.1f) {
 			return dist;
 		} else

diff --git a/SpaceApes/src/entities/Projectile.java b/SpaceApes/src/entities/Projectile.java
@@ -7,8 +7,8 @@
 import factories.PlanetFactory.PlanetType;
 import factories.ProjectileFactory.ProjectileStatus;
 import factories.ProjectileFactory.ProjectileType;
-import map.Map;
-import spaceapes.Constants;
+import spaceapes.Map;
+import utils.Constants;
 import utils.Utils;
 
 public class Projectile extends Entity {
@@ -18,8 +18,8 @@ public class Projectile extends Entity {
 	private double vx; // Geschwindigkeit in x-Richtung
 	private double vy; // Geschwindigkeit in y-Richtung
 	private float direction; // Winkel Spitze des Projektils gegenueber x-Achse
-	private float rotationSpeed; // Rotationsgeschwindigkeit (wird nicht benutzt)
-	private final float mass; // verschiede Massen der Geschosse moeglich (wird nicht benutzt)
+	// private float rotationSpeed; // Rotationsgeschwindigkeit (wird nicht benutzt)
+	// private final float mass; // verschiede Massen der Geschosse moeglich (wird nicht benutzt)
 	private ProjectileType type;
 	private int price = 0; // default
 	private int maxDamage = 10; // default
@@ -38,8 +38,6 @@ public Projectile(String entityID, Vector2f coordinates, Vector2f velocity) {
 		this.setCoordinates(coordinates);
 		this.setVelocity(velocity);
 		this.direction = getMovementDirection();
-		this.rotationSpeed = 0f;
-		this.mass = 1f;
 
 		setPosition(Utils.toPixelCoordinates((float) x, (float) y));
 	}

diff --git a/SpaceApes/src/events/LeavingWorldEvent.java b/SpaceApes/src/events/LeavingWorldEvent.java
@@ -6,7 +6,7 @@
 
 import eea.engine.entity.Entity;
 import eea.engine.event.Event;
-import spaceapes.Constants;
+import utils.Constants;
 import utils.Utils;
 
 public class LeavingWorldEvent extends Event {

diff --git a/SpaceApes/src/events/LessThan2ApesLeftEvent.java b/SpaceApes/src/events/LessThan2ApesLeftEvent.java
@@ -3,7 +3,7 @@
 import org.newdawn.slick.GameContainer;
 import org.newdawn.slick.state.StateBasedGame;
 import eea.engine.event.Event;
-import map.Map;
+import spaceapes.Map;
 
 public class LessThan2ApesLeftEvent extends Event {
 

diff --git a/SpaceApes/src/events/PolicyEvent.java b/SpaceApes/src/events/PolicyEvent.java
@@ -4,8 +4,8 @@
 import org.newdawn.slick.state.StateBasedGame;
 
 import eea.engine.event.Event;
-import utils.Policy;
-import utils.Policy.PolicyAction;
+import policys.Policy;
+import policys.Policy.PolicyAction;
 
 public class PolicyEvent extends Event {
 	Policy policy;

diff --git a/SpaceApes/src/factories/ApeFactory.java b/SpaceApes/src/factories/ApeFactory.java
@@ -15,19 +15,18 @@
 import eea.engine.event.ANDEvent;
 import eea.engine.event.Event;
 import eea.engine.event.basicevents.KeyDownEvent;
-import eea.engine.event.basicevents.KeyPressedEvent;
 import eea.engine.event.basicevents.LoopEvent;
 import eea.engine.event.basicevents.MouseClickedEvent;
 import eea.engine.event.basicevents.MouseEnteredEvent;
 import entities.Ape;
 import entities.Planet;
 import events.PolicyEvent;
 import factories.ProjectileFactory.MovementType;
-import map.Map;
-import spaceapes.Constants;
+import policys.Policy;
+import policys.Policy.PolicyAction;
+import utils.Constants;
+import spaceapes.Map;
 import spaceapes.SpaceApes;
-import utils.Policy;
-import utils.Policy.PolicyAction;
 import utils.Utils;
 
 public abstract class ApeFactory {
@@ -49,18 +48,11 @@ public abstract class ApeFactory {
 	public static Ape createApe(String name, Planet homePlanet, float angleOnPlanet, int apeImageIndex, boolean isActive,
 			boolean isInteractionAllowed, Policy policy) {
 
-		final float scalingFactor = Constants.APE_DESIRED_SIZE / Utils.pixelLengthToWorldLength(Constants.APE_PIXEL_HEIGHT);
-		final float distancePlanetCenter = homePlanet.getRadius()
-				+ Utils.pixelLengthToWorldLength(Constants.APE_PIXEL_FEET_TO_CENTER * scalingFactor);
-		if (distancePlanetCenter < 0.1f) {
-			throw new RuntimeException("Radius ist zu nah an null");
-		}
-
 		Ape ape = new Ape(name);
 
 		ape.setPlanet(homePlanet);
 		homePlanet.setApe(ape);
-		ape.setDistanceToPlanetCenter(distancePlanetCenter);
+		ape.setDistanceToPlanetCenter();
 		ape.setAngleOnPlanet(angleOnPlanet);
 		ape.setAngleOfView(0);
 		ape.setHealth(Constants.APE_MAX_HEALTH);
@@ -71,7 +63,7 @@ public static Ape createApe(String name, Planet homePlanet, float angleOnPlanet,
 		ape.setInteractionAllowed(isInteractionAllowed);
 		ape.setPolicy(policy);
 		ape.setPosition(Utils.toPixelCoordinates(ape.getWorldCoordinates()));
-		ape.setScale(scalingFactor);
+		ape.setScale(ape.getScalingFactor());
 		ape.setRotation(angleOnPlanet + 90f);
 
 		if (SpaceApes.renderImages) {

diff --git a/SpaceApes/src/factories/ItemFactory.java b/SpaceApes/src/factories/ItemFactory.java
@@ -9,8 +9,8 @@
 import eea.engine.entity.StateBasedEntityManager;
 import eea.engine.event.basicevents.LoopEvent;
 import entities.Item;
-import map.Map;
-import spaceapes.Constants;
+import utils.Constants;
+import spaceapes.Map;
 import spaceapes.SpaceApes;
 import utils.Utils;
 

diff --git a/SpaceApes/src/factories/PlanetFactory.java b/SpaceApes/src/factories/PlanetFactory.java
@@ -2,7 +2,6 @@
 
 import org.newdawn.slick.geom.Vector2f;
 
-import actions.DisplayPlanetInfoAction;
 import actions.MoveInOrbitAction;
 
 import java.util.Random;
@@ -14,8 +13,8 @@
 import eea.engine.entity.Entity;
 import eea.engine.entity.StateBasedEntityManager;
 import entities.Planet;
-import map.Map;
-import spaceapes.Constants;
+import utils.Constants;
+import spaceapes.Map;
 import spaceapes.SpaceApes;
 import utils.Utils;
 import eea.engine.event.basicevents.*;