Merge branch 'Modulsicht'

core/src/com/galaxytrucker/galaxytruckerreloaded/Controller/Actions/Attack.java

+package com.galaxytrucker.galaxytruckerreloaded.Controller.Actions;
+
+public class Attack {
+
+
+
+}

core/src/com/galaxytrucker/galaxytruckerreloaded/Controller/Actions/Move.java

+package com.galaxytrucker.galaxytruckerreloaded.Controller.Actions;
+
+public class Move {
+
+}

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

+package com.galaxytrucker.galaxytruckerreloaded.Model.Map;
+
+
+import java.util.HashMap;
+
+public class Overworld {
+    private HashMap<float[],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;
 
 import com.j256.ormlite.field.DatabaseField;
 import lombok.*;

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 com.galaxytrucker.galaxytruckerreloaded.Model.Map.Planet;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 import lombok.*;
@@ -26,15 +27,50 @@ public class Ship implements Serializable {
      */
     @NonNull
     @DatabaseField(columnName = "HP")
-    private int hp;
+
+
+    /**
+     * Resources are stored in ship
+     */
+    private int money;
+    private int missiles;
+    private int fuel;
 
     /**
-     * Shields
+     * 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 Planet position;
+
+    /**
+     * time needed until position can be changed again
      */
     @NonNull
     @DatabaseField(columnName = "SHIELDS")
     private int shields;
 
+    private int FTLcharge;
+
+
     /**
      * Take damage
      */

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

 package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout;
 
+
 import com.j256.ormlite.field.DatabaseField;
 import lombok.*;
 

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

 package com.galaxytrucker.galaxytruckerreloaded.Model.Weapons;
 
+import com.galaxytrucker.galaxytruckerreloaded.Model.Ship;
+
 public abstract class Weapon {
 
     /** Weapon damage */
     private int damage;
 
-    /** Weapon coolDown */
+    /** Amount of rounds for the weapon to be used again */
     private int cooldown;
 
     /** Weapon energy */
     private int energy;
 
+    /** Amount of missiles spent per attack */
     private int missileCost;
-    private float dropchance;
-    private int crewdamage;
-    /**
-     * How many projectiles are fired per burst
-     */
-    private int burst;
     private float precision;
+    /** probability of randomly finding this weapon */
+    private float dropChance;
+    /** Amount of shield bars this Weapon can ignore */
+    private int shieldPiercing;
+    /** Probability of causing a breach in the section on hit */
+    private float breachChance;
+    /** Damage taken by crew in the hit section */
+    private int crewDamage;
+    /** How many projectiles are fired per burst */
+    private int burst;
+
+    public int getCooldown() {
+        return cooldown;
+    }
+
+    public void setCooldown(int cooldown) {
+        this.cooldown = cooldown;
+    }
+
+    public int getEnergy() {
+        return energy;
+    }
+
+    public void setEnergy(int energy) {
+        this.energy = energy;
+    }
+
+    public float getDropChance() {
+        return dropChance;
+    }
+
+    public void setDropChance(float dropChance) {
+        this.dropChance = dropChance;
+    }
+
+    public void attack(Ship target){}
 }

doc/Architekturbeschreibung.tex

@@ -1201,6 +1201,16 @@ in die Details von spezifischen Technologien abzugleiten. Sie wird in den
 nachfolgenden Sichten konkretisiert und verfeinert. Die konzeptionelle Sicht 
 wird mit {UML}-Komponentendiagrammen visualisiert.}
 
+\newpage
+
+\begin{figure}[H]
+\begin{center}
+  \includegraphics[width=340px]{UML/KonzeptioneleSicht.pdf}
+  \caption{Die konzeptionelle Sicht}
+  \label{fig:boat1}
+\end{center}
+\end{figure}
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \section{Modulsicht} \label{sec:modulsicht}