Merge remote-tracking branch 'origin/master'

src/logic/MainLogic.java

@@ -1,4 +0,0 @@
-package logic;
-
-public class MainLogic extends Player{
-}

src/logic/RandomEventLogic.java

@@ -1,4 +1,45 @@
 package logic;
 
+import java.util.Random;
+
 public class RandomEventLogic extends Player{
+
+    /**
+     * constructor; only runs when a Player object is provided. The constructor is fully encapsulated.
+     *
+     * @param player is a Player object that will be copied and the player instance variable is set to the copy.
+     */
+    public RandomEventLogic(Player player) {
+        Player playerDummy = new Player(player);
+        setPlayer(playerDummy);
+    }
+
+    public int[] randEvent() {
+        Random rand = new Random();
+        int itemPrice;
+        int randGenNum = rand.nextInt(3) + 1;
+        while(true){
+            //Buy Guns
+            if (randGenNum == 1) {
+                itemPrice = (int) ((getPlayer().getMoney() * 0.1) + 10);
+                break;
+            }
+            //Liu Yuen
+            if (randGenNum == 2) {
+                itemPrice = (int) ((getPlayer().getMoney() * 0.1) + 10);
+                setAttackingShips(true);
+                break;
+            }
+            //Ship Repair
+            if (randGenNum == 3 && getHP() < 100) {
+                itemPrice = (int) ((100 - getPlayer().getHP()) * 10 + 10);
+                break;
+            }
+            else {
+                randGenNum = 2;
+            }
+        }
+        return new int[]{randGenNum,itemPrice};
+    }
+
 }

src/logic/TaipanShopLogic.java

@@ -1,6 +1,7 @@
-package logic; /**
+package logic;
+
+/**
  * TaipanShopLogic deals with the computations necessary for the shop such as randomizing prices.
- *
  * Author: Vikram Bawa
  */
 import java.util.Random;

src/logic/WarehouseLogic.java

@@ -1,4 +1,94 @@
 package logic;
 
 public class WarehouseLogic extends Player {
+
+    /**
+     * constructor; only runs when a Player object is provided. The constructor is fully encapsulated.
+     *
+     * @param player is a Player object that will be copied and the player instance variable is set to the copy.
+     */
+    public WarehouseLogic(Player player) {
+        Player playerDummy = new Player(player);
+        setPlayer(playerDummy);
+    }
+
+    public String deposit(String str, int goodsNum) {
+        try {
+            int deposit = Integer.parseInt(str);
+            if(deposit <= 0){
+                return "Please enter a valid value";
+            }
+            //Transfers General amount
+            else if(goodsNum == 1 && deposit <= getGeneralHeld()){
+                setGeneralHeld(getPlayer().getGeneralHeld()-deposit);
+                setwGeneral(getPlayer().getwGeneral()+deposit);
+                return "Successful deposit";
+            }
+            //Transfers Arms amount
+            else if(goodsNum == 2 && deposit <= getArmsHeld()){
+                setArmsHeld(getPlayer().getArmsHeld()-deposit);
+                setwArms(getPlayer().getwArms()+deposit);
+                return "Successful deposit";
+            }
+            //Transfers Silk amount
+            else if(goodsNum == 3 && deposit <= getSilkHeld()){
+                setSilkHeld(getPlayer().getSilkHeld()-deposit);
+                setwSilk(getPlayer().getwSilk()+deposit);
+                return "Successful deposit";
+            }
+            //Transfers Opium amount
+            else if(goodsNum == 4 && deposit <= getOpiumHeld()){
+                setOpiumHeld(getPlayer().getOpiumHeld()-deposit);
+                setwOpium(getPlayer().getwOpium()+deposit);
+                return "Successful deposit";
+            }
+            //Checks if the correct value is entered
+            else{
+                return "Please enter a valid value";
+            }
+        }
+        catch (Exception e) {
+            return "Please enter a valid value";
+        }
+    }
+
+    public String withdraw(String str, int goodsNum) {
+        try {
+            int withdraw = Integer.parseInt(str);
+            if(withdraw <= 0){
+                return "Please enter a valid value";
+            }
+            //Transfers general amount
+            else if(goodsNum == 1 && withdraw <= getwGeneral()){
+                setGeneralHeld(getPlayer().getGeneralHeld()+withdraw);
+                setwGeneral(getPlayer().getwGeneral()-withdraw);
+                return "Successful withdraw";
+            }
+            //Transfers Arms amount
+            else if(goodsNum == 2 && withdraw <= getwArms()){
+                setArmsHeld(getPlayer().getArmsHeld()+withdraw);
+                setwArms(getPlayer().getwArms()-withdraw);
+                return "Successful withdraw";
+            }
+            //Transfers Silk Amount
+            else if(goodsNum == 3 && withdraw <= getwSilk()){
+                setSilkHeld(getPlayer().getSilkHeld()+withdraw);
+                setwSilk(getPlayer().getwSilk()-withdraw);
+                return "Successful withdraw";
+            }
+            //Transfers Opium amount
+            else if(goodsNum == 4 && withdraw <= getwOpium()) {
+                setOpiumHeld(getPlayer().getOpiumHeld() + withdraw);
+                setwOpium(getPlayer().getwOpium() - withdraw);
+                return "Successful withdraw";
+            }
+            // Ensures a valid value is entered
+            else{
+                return "Please enter a valid value";
+            }
+        }
+        catch (Exception e) {
+            return "Please enter a valid value";
+        }
+    }
 }