Aktuellesmodel in intelliJ übertragen

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Overworld.java

+package com.galaxytrucker.galaxytruckerreloaded.Model.Map;
+
+import jdk.internal.util.xml.impl.Pair;
+
+import java.util.HashMap;
+
+public class Overworld {
+    private HashMap<Pair,Planet> planetMap;
+
+    public Overworld(int seed) {
+        planetMap = new HashMap<>();
+    }
+}

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Planet/Planet.java → core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Planet.java

-package com.galaxytrucker.galaxytruckerreloaded.Model.Planet;
+package com.galaxytrucker.galaxytruckerreloaded.Model.Map;
 
 public abstract class Planet {
 
-    /** Planet name */
+    /** Map name */
     private String name;
     /** Horizontale Position auf der Karte */
     private float posX;

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Planet/PlanetEvent.java → core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/PlanetEvent.java

-package com.galaxytrucker.galaxytruckerreloaded.Model.Planet;
+package com.galaxytrucker.galaxytruckerreloaded.Model.Map;
 
 public enum PlanetEvent {
 

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java

 package com.galaxytrucker.galaxytruckerreloaded.Model;
 
+import jdk.internal.util.xml.impl.Pair;
+
 public class Ship {
 
     /**
      * HP
      */
-    private int hp;
+    private int health;
+
+    /**
+     * Resources are stored in ship
+     */
+    private int money;
+    private int missiles;
+    private int fuel;
+
+    /**
+     * Energy to be distributed
+     */
+    private int energy;
+
+    /**
+     * Shields that are currently active
+     */
+    private int shieldCharge;
+
+    /**
+     * Total number of Shields that are powered. Possibly redundant through Shield.getEnergy/2
+     */
+    private int maxShieldCharge;
+
+    /**
+     * chance for the ship to dodge incoming attacks
+     */
+    private float evasion;
+
+    /**
+     * X and Y coordinates on the map
+     */
+    private Pair position;
 
     /**
-     * Shields
+     * time needed until position can be changed again
      */
-    private int shields;
+    private int FTLcharge;
 
     /**
      * Take damage

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.java → core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Section.java

 package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout;
 
-public abstract class Room {
+public abstract class Section {
     /**
      * Höhe des Raumes. Räume sind immer rechteckig.
      */

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/System.java

 package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout;
 
-public abstract class System extends Room {
+public abstract class System extends Section {
     private int energy;
     private int maxEnergy;
     private int damage;

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java

@@ -14,6 +14,10 @@ public abstract class Weapon {
     private int missileCost;
     private float dropchance;
     private int crewdamage;
+    /**
+     * Amount of shields ignored by attack
+     */
+    private int piercing;
     /**
      * How many projectiles are fired per burst
      */