Merge branch 'master' into network

core/assets/shipsys/weapon/desktop.ini

+[LocalizedFileNames]
+box_weapons_on.png=@box_weapons_on,0

core/src/com/galaxytrucker/galaxytruckerreloaded/Controller/TraderController.java

 package com.galaxytrucker.galaxytruckerreloaded.Controller;
 
 
+import com.badlogic.gdx.Screen;
+import com.galaxytrucker.galaxytruckerreloaded.Communication.ClientControllerCommunicator;
 import com.galaxytrucker.galaxytruckerreloaded.Model.Crew.Crew;
 import com.galaxytrucker.galaxytruckerreloaded.Model.Map.Trader;
 import com.galaxytrucker.galaxytruckerreloaded.Model.Ship;
 import com.galaxytrucker.galaxytruckerreloaded.Model.Weapons.Weapon;
+import com.galaxytrucker.galaxytruckerreloaded.Server.RequestObject;
+import com.galaxytrucker.galaxytruckerreloaded.Server.RequestType;
+import com.galaxytrucker.galaxytruckerreloaded.Server.ResponseObject;
 import lombok.*;
 
+import java.util.List;
+
 @Getter
 @Setter
 @RequiredArgsConstructor(access = AccessLevel.PUBLIC)
 public class TraderController extends Controller{
-    /** My own ship */
-    @NonNull
-    private Ship myself;
+
     /** the trader */
     @NonNull
     private Trader trader;
 
+    /** ClientControllerCommunicator */
+    @NonNull
+    private ClientControllerCommunicator clientControllerCommunicator;
+
     /**
      * Buy a weapon from the trader
      * @param weapon - the weapon to buy
      */
-    private void purchaseWeapon(Weapon weapon) {
+    public boolean purchaseWeapon(Weapon weapon) {
+        try {
+            RequestObject requestObject = new RequestObject();
+            requestObject.setWeapon(weapon);
+            requestObject.setShip(clientControllerCommunicator.getClientShip());
+            requestObject.setTrader(trader);
+            requestObject.setRequestType(RequestType.TRADERBUYWEAPON);
+            ResponseObject responseObject = clientControllerCommunicator.sendRequest(requestObject);
+            if (responseObject.isValidRequest()) {
+                //remove from trader
+                List<Weapon> traderWeapons = trader.getWeaponStock();
+                traderWeapons.remove(weapon);
+                trader.setWeaponStock(traderWeapons);
+                //add to ship
+                Ship ship = clientControllerCommunicator.getClientShip();
+                List<Weapon> shipWeapons = ship.getInventory();
+                shipWeapons.add(weapon);
+                ship.setInventory(shipWeapons);
+                ship.setCoins(ship.getCoins() - weapon.getPrice().get(weapon.getWeaponLevel()));
+                clientControllerCommunicator.setClientShip(ship);
+                return true;
+            }
+            return false;
+        }
+        catch(Exception e) {
+            e.printStackTrace();
+            return false;
+        }
     }
 
     /**
      * Buy crew from a trader
      * @param crew   - the crew to buy
      */
-    public void purchaseCrew(Crew crew) {
+    public boolean purchaseCrew(Crew crew) {
+        try {
+            RequestObject requestObject = new RequestObject();
+            requestObject.setRequestType(RequestType.TRADERBUYCREW);
+            requestObject.setTrader(trader);
+            requestObject.setShip(clientControllerCommunicator.getClientShip());
+            requestObject.setCrew(crew);
+            ResponseObject responseObject = clientControllerCommunicator.sendRequest(requestObject);
+            if(responseObject.isValidRequest()) {
+                //remove from trader
+                List<Crew> tcrew = trader.getCrewStock();
+                tcrew.remove(crew);
+                trader.setCrewStock(tcrew);
+                //put in room
+                Ship ship = clientControllerCommunicator.getClientShip();
+                crew.setCurrentRoom(ship.getSystems().get(0));
+                crew.setAssociatedUser(clientControllerCommunicator.getClientShip().getAssociatedUser());
+                ship.setCoins(ship.getCoins() - crew.getPrice());
+                clientControllerCommunicator.setClientShip(ship);
+                return true;
+            }
+            return false;
+        }
+        catch(Exception e) {
+            e.printStackTrace();
+            return false;
+        }
     }
 
     /**
      * Buy rockets from the trader
      * @param amount - the amount of rockets to buy
      */
-    public void purchaseRockets(int amount) {
+    public boolean purchaseRockets(int amount) {
+        try {
+            RequestObject requestObject = new RequestObject();
+            requestObject.setRequestType(RequestType.TRADERBUYROCKETS);
+            requestObject.setShip(clientControllerCommunicator.getClientShip());
+            requestObject.setTrader(trader);
+            requestObject.setIntAmount(amount);
+            ResponseObject responseObject = clientControllerCommunicator.sendRequest(requestObject);
+            if(responseObject.isValidRequest()) {
+                //remove from trader
+                int tAmount = trader.getMissileStock();
+                tAmount -= amount;
+                trader.setMissileStock(tAmount);
+                //add to ship
+                Ship ship = clientControllerCommunicator.getClientShip();
+                ship.setMissiles(ship.getMissiles() + amount);
+                ship.setCoins(ship.getCoins() - 5*amount); //TODO festpreis
+                clientControllerCommunicator.setClientShip(ship);
+                return true;
+            }
+            return false;
+        }
+        catch(Exception e) {
+            e.printStackTrace();
+            return false;
+        }
     }
 
     /**
      * Buy fuel from the trader
      * @param amount - the amount of fuel to buy
      */
-    public void purchaseFuel( int amount) {
+    public boolean purchaseFuel( int amount) {
+        try {
+            RequestObject requestObject = new RequestObject();
+            requestObject.setShip(clientControllerCommunicator.getClientShip());
+            requestObject.setTrader(trader);
+            requestObject.setRequestType(RequestType.TRADERBUYFUEL);
+            requestObject.setIntAmount(amount);
+            ResponseObject responseObject = clientControllerCommunicator.sendRequest(requestObject);
+            if(responseObject.isValidRequest()) {
+                //remove from trader
+                int tAmount = trader.getFuelStock();
+                tAmount -= amount;
+                trader.setFuelStock(tAmount);
+                //add to ship
+                Ship ship = clientControllerCommunicator.getClientShip();
+                ship.setFuel(ship.getFuel() + amount);
+                ship.setCoins(ship.getCoins() - 5*amount); //TODO festpreis
+                clientControllerCommunicator.setClientShip(ship);
+                return true;
+            }
+            return false;
+        }
+        catch(Exception e) {
+            e.printStackTrace();
+            return false;
+        }
     }
 
     /**
      * Buy health from the trader
      * @param amount - the amount to buy
      */
-    public void purchaseHP(int amount) {
+    public boolean purchaseHP(int amount) {
+        try {
+            RequestObject requestObject = new RequestObject();
+            requestObject.setShip(clientControllerCommunicator.getClientShip());
+            requestObject.setTrader(trader);
+            requestObject.setRequestType(RequestType.TRADERBUYHP);
+            requestObject.setIntAmount(amount);
+            ResponseObject responseObject = clientControllerCommunicator.sendRequest(requestObject);
+            if(responseObject.isValidRequest()) {
+                //remove from trader
+                int tAmount = trader.getHpStock();
+                tAmount -= amount;
+                trader.setHpStock(tAmount);
+                //add to ship
+                Ship ship = clientControllerCommunicator.getClientShip();
+                ship.setHp(ship.getHp() + amount);
+                ship.setCoins(ship.getCoins() - 5*amount); //TODO festpreis
+                clientControllerCommunicator.setClientShip(ship);
+                return true;
+            }
+            return false;
+        }
+        catch(Exception e) {
+            e.printStackTrace();
+            return false;
+        }
     }
 
+    /**
+     * Sell weapon to the trader
+     * @param weapon the weapon
+     */
+    public boolean sellWeapon(Weapon weapon) {
+        try {
+            RequestObject requestObject = new RequestObject();
+            requestObject.setShip(clientControllerCommunicator.getClientShip());
+            requestObject.setTrader(trader);
+            requestObject.setWeapon(weapon);
+            requestObject.setRequestType(RequestType.TRADERSELLWEAPON);
+            ResponseObject responseObject = clientControllerCommunicator.sendRequest(requestObject);
+            if(responseObject.isValidRequest()) {
+                //add to trader
+                List<Weapon> traderWeapon = trader.getWeaponStock();
+                traderWeapon.add(weapon);
+                trader.setWeaponStock(traderWeapon);
+                //remove from ship
+                Ship ship = clientControllerCommunicator.getClientShip();
+                List<Weapon> shipWeapon = ship.getInventory();
+                shipWeapon.remove(weapon);
+                ship.setInventory(shipWeapon);
+                ship.setCoins(ship.getCoins() + weapon.getPrice().get(weapon.getWeaponLevel()));
+                clientControllerCommunicator.setClientShip(ship);
+                return true;
+            }
+            return false;
+        }
+        catch(Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
 
+    /**
+     * sell rockets to the trader
+     * @param amount the amount of rockets
+     */
+    public boolean sellRockets(int amount) {
+        try {
+            RequestObject requestObject = new RequestObject();
+            requestObject.setShip(clientControllerCommunicator.getClientShip());
+            requestObject.setTrader(trader);
+            requestObject.setRequestType(RequestType.TRADERSELLROCKETS);
+            requestObject.setIntAmount(amount);
+            ResponseObject responseObject = clientControllerCommunicator.sendRequest(requestObject);
+            if(responseObject.isValidRequest()) {
+                //add to trader
+                trader.setMissileStock(trader.getMissileStock() + amount);
+                //remove from ship
+                Ship ship = clientControllerCommunicator.getClientShip();
+                ship.setMissiles(ship.getMissiles() - amount);
+                ship.setCoins(ship.getCoins() + 5*amount);
+                clientControllerCommunicator.setClientShip(ship);
+                return true;
+            }
+            return false;
+        }
+        catch(Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
 }

core/src/com/galaxytrucker/galaxytruckerreloaded/Main.java

 package com.galaxytrucker.galaxytruckerreloaded;
 
 import com.badlogic.gdx.ApplicationAdapter;
+import com.badlogic.gdx.Game;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.OrthographicCamera;
@@ -8,7 +9,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.galaxytrucker.galaxytruckerreloaded.View.Screen.GameStateManager;
 import com.galaxytrucker.galaxytruckerreloaded.View.Screen.MainMenu;
 
-public class Main extends ApplicationAdapter {
+public class Main extends Game {
 
     /**
      * Settings
@@ -17,39 +18,27 @@ public class Main extends ApplicationAdapter {
     public static final int HEIGHT = 1080;
 
     public static final String TITLE = "Galaxy Trucker";
-    private GameStateManager gsm;
     /**
      * Sprite batch
      */
-    private SpriteBatch batch;
-
-    /**
-     * Orthographic camera
-     */
-    private OrthographicCamera camera;
+    public SpriteBatch batch;
 
     @Override
     public void create() {
         batch = new SpriteBatch();
-        gsm = new GameStateManager();
-        //this.camera = new OrthographicCamera();
-        Gdx.gl.glClearColor(1, 0, 0, 1);
-        gsm.push(new MainMenu(gsm));
+
+        setScreen(new MainMenu(this));
     }
 
     @Override
     public void render() {
-        Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
+        /*Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
         gsm.update(Gdx.graphics.getDeltaTime());
         //batch.begin();
         //batch.draw("1080p.png",0,0,WIDTH, HEIGHT);
         gsm.render(batch);
-        //batch.end();
-    }
-
-    @Override
-    public void dispose() {
-
+        //batch.end();*/
+        super.render();
     }
 
     /**
@@ -61,12 +50,11 @@ public class Main extends ApplicationAdapter {
         return this.batch;
     }
 
-    /**
-     * Get the orthographic camera
-     *
-     * @return the orthographic camera
-     */
-    public OrthographicCamera getCamera() {
-        return this.camera;
+    public void setFullscreen() {
+        Gdx.graphics.setFullscreenMode(Gdx.graphics.getDisplayMode());
+    }
+
+    public void setWindowed() {
+        Gdx.graphics.setWindowedMode(WIDTH,HEIGHT);
     }
 }

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

@@ -53,6 +53,11 @@ public class Crew implements Serializable {
     @OneToOne
     private Room currentRoom;
 
+    /**
+     * The price of the different crew-members
+     */
+    private int price;
+
     /**
      * The user who owns this crew member
      */

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

@@ -43,7 +43,7 @@ public class Planet implements Serializable {
      * Ereignis dass auf diesem Planeten eintrifft
      */
     @NonNull
-    private Enum<PlanetEvent> event;
+    private PlanetEvent event;
 
     /**
      * If already discovered set to true

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

@@ -37,6 +37,10 @@ public class Trader implements Serializable {
     @NonNull
     private int fuelStock;
 
+    /** HP for sale */
+    @NonNull
+    private int hpStock;
+
     /** Crew for sale */
     @OneToMany (cascade = CascadeType.ALL)
     @NonNull

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

@@ -5,6 +5,7 @@ import lombok.*;
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.util.List;
 
 
 @Getter
@@ -83,6 +84,12 @@ public abstract class Weapon implements Serializable {
     @NonNull
     private int burst;
 
+    /**
+     * Weapon price, sorted by Weapon-level 1-6
+     */
+    @ElementCollection
+    private List<Integer> price;
+
     /** Weapon system this weapon belongs to */
     @OneToOne
     private System weaponSystem;

core/src/com/galaxytrucker/galaxytruckerreloaded/Server/ClientHandler.java

@@ -80,7 +80,7 @@ public class ClientHandler implements Runnable {
     /**
      * Planet name list
      */
-    private List<String> planetNames;
+    private List<String> planetNames = new ArrayList<>();
 
     /**
      * Used planet names list