From f37aa91fad530f134d6e30e0702d7c031cc54f8b Mon Sep 17 00:00:00 2001 From: Solargale Date: Sun, 7 Apr 2019 14:58:48 -0600 Subject: [PATCH] Made every appropriate Text and Logic class --- .idea/workspace.xml | 403 +++++++++--------- src/gui/MainGUI.java | 1 + src/logic/BankLogic.java | 4 + src/logic/FileSaving.java | 2 +- src/logic/GameEndLogic.java | 4 + src/logic/MainLogic.java | 4 + src/logic/RandomEventLogic.java | 4 + src/logic/StartLogic.java | 4 + src/logic/TravelLogic.java | 4 + src/logic/WarehouseLogic.java | 4 + src/text/GameEndText.java | 10 + ...{loanSharkText.java => LoanSharkText.java} | 4 +- src/text/MainText.java | 10 + src/text/RandomEventText.java | 10 + src/text/ShipWarfareText.java | 2 - src/text/StartText.java | 10 + src/text/TaipanShopText.java | 2 +- src/text/WarehouseText.java | 1 + 18 files changed, 278 insertions(+), 205 deletions(-) create mode 100644 src/logic/BankLogic.java create mode 100644 src/logic/GameEndLogic.java create mode 100644 src/logic/MainLogic.java create mode 100644 src/logic/RandomEventLogic.java create mode 100644 src/logic/StartLogic.java create mode 100644 src/logic/TravelLogic.java create mode 100644 src/logic/WarehouseLogic.java create mode 100644 src/text/GameEndText.java rename src/text/{loanSharkText.java => LoanSharkText.java} (65%) create mode 100644 src/text/MainText.java create mode 100644 src/text/RandomEventText.java create mode 100644 src/text/StartText.java diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b304fe3..4f676da 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,30 +1,25 @@ - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -269,7 +177,7 @@ - + @@ -339,8 +247,8 @@ - + @@ -424,12 +332,12 @@ - @@ -756,7 +664,6 @@ - @@ -771,15 +678,15 @@ - + - + - + - + @@ -870,7 +777,6 @@ - @@ -895,61 +801,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1040,37 +898,184 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - - + + + + + + + + + + + + + + + + diff --git a/src/gui/MainGUI.java b/src/gui/MainGUI.java index 3828af1..5e4db43 100644 --- a/src/gui/MainGUI.java +++ b/src/gui/MainGUI.java @@ -2,6 +2,7 @@ package gui; import javafx.application.Application; import javafx.stage.Stage; +import logic.Player; /** * 2019-03-10 diff --git a/src/logic/BankLogic.java b/src/logic/BankLogic.java new file mode 100644 index 0000000..3d78cef --- /dev/null +++ b/src/logic/BankLogic.java @@ -0,0 +1,4 @@ +package logic; + +public class BankLogic extends Player { +} diff --git a/src/logic/FileSaving.java b/src/logic/FileSaving.java index 634a96a..c0d2039 100644 --- a/src/logic/FileSaving.java +++ b/src/logic/FileSaving.java @@ -3,7 +3,7 @@ package logic; import java.io.*; /** * 2019-03-10 (Edited on 2019-03-19) - * Authors: + * Authors: Harkamal Randhawa * FileSaving Class allows the user to save the current status of the game and to continue from where they left off. */ diff --git a/src/logic/GameEndLogic.java b/src/logic/GameEndLogic.java new file mode 100644 index 0000000..71ce1d9 --- /dev/null +++ b/src/logic/GameEndLogic.java @@ -0,0 +1,4 @@ +package logic; + +public class GameEndLogic extends Player{ +} diff --git a/src/logic/MainLogic.java b/src/logic/MainLogic.java new file mode 100644 index 0000000..cc625e3 --- /dev/null +++ b/src/logic/MainLogic.java @@ -0,0 +1,4 @@ +package logic; + +public class MainLogic extends Player{ +} diff --git a/src/logic/RandomEventLogic.java b/src/logic/RandomEventLogic.java new file mode 100644 index 0000000..51e3776 --- /dev/null +++ b/src/logic/RandomEventLogic.java @@ -0,0 +1,4 @@ +package logic; + +public class RandomEventLogic extends Player{ +} diff --git a/src/logic/StartLogic.java b/src/logic/StartLogic.java new file mode 100644 index 0000000..7656c2d --- /dev/null +++ b/src/logic/StartLogic.java @@ -0,0 +1,4 @@ +package logic; + +public class StartLogic extends Player { +} diff --git a/src/logic/TravelLogic.java b/src/logic/TravelLogic.java new file mode 100644 index 0000000..0441468 --- /dev/null +++ b/src/logic/TravelLogic.java @@ -0,0 +1,4 @@ +package logic; + +public class TravelLogic extends Player { +} diff --git a/src/logic/WarehouseLogic.java b/src/logic/WarehouseLogic.java new file mode 100644 index 0000000..36ae6fd --- /dev/null +++ b/src/logic/WarehouseLogic.java @@ -0,0 +1,4 @@ +package logic; + +public class WarehouseLogic extends Player { +} diff --git a/src/text/GameEndText.java b/src/text/GameEndText.java new file mode 100644 index 0000000..928fb3b --- /dev/null +++ b/src/text/GameEndText.java @@ -0,0 +1,10 @@ +package text; + +import logic.Player; + +public class GameEndText extends Player { + public GameEndText(Player player) { + Player playerDummy = new Player(player); + setPlayer(playerDummy); + } +} diff --git a/src/text/loanSharkText.java b/src/text/LoanSharkText.java similarity index 65% rename from src/text/loanSharkText.java rename to src/text/LoanSharkText.java index 2d67f45..fef0da4 100644 --- a/src/text/loanSharkText.java +++ b/src/text/LoanSharkText.java @@ -2,8 +2,8 @@ package text; import logic.Player; -public class loanSharkText extends Player { - public loanSharkText(Player player) { +public class LoanSharkText extends Player { + public LoanSharkText(Player player) { Player playerDummy = new Player(player); setPlayer(playerDummy); } diff --git a/src/text/MainText.java b/src/text/MainText.java new file mode 100644 index 0000000..140de8d --- /dev/null +++ b/src/text/MainText.java @@ -0,0 +1,10 @@ +package text; + +import logic.Player; + +public class MainText extends Player { + public MainText(Player player) { + Player playerDummy = new Player(player); + setPlayer(playerDummy); + } +} diff --git a/src/text/RandomEventText.java b/src/text/RandomEventText.java new file mode 100644 index 0000000..b6de8e3 --- /dev/null +++ b/src/text/RandomEventText.java @@ -0,0 +1,10 @@ +package text; + +import logic.Player; + +public class RandomEventText extends Player { + public RandomEventText(Player player) { + Player playerDummy = new Player(player); + setPlayer(playerDummy); + } +} diff --git a/src/text/ShipWarfareText.java b/src/text/ShipWarfareText.java index cb12e02..552856c 100644 --- a/src/text/ShipWarfareText.java +++ b/src/text/ShipWarfareText.java @@ -13,8 +13,6 @@ import java.util.concurrent.TimeUnit; * ShipWarfareText class, Based on logic class for ShipWarfare, text-based version which allwos for ship warfare */ - - public class ShipWarfareText extends Player { ShipWarfareLogic logic = new ShipWarfareLogic(getPlayer()); diff --git a/src/text/StartText.java b/src/text/StartText.java new file mode 100644 index 0000000..13751fe --- /dev/null +++ b/src/text/StartText.java @@ -0,0 +1,10 @@ +package text; + +import logic.Player; + +public class StartText extends Player { + public StartText(Player player) { + Player playerDummy = new Player(player); + setPlayer(playerDummy); + } +} diff --git a/src/text/TaipanShopText.java b/src/text/TaipanShopText.java index 533d2b2..2103345 100644 --- a/src/text/TaipanShopText.java +++ b/src/text/TaipanShopText.java @@ -61,7 +61,7 @@ public class TaipanShopText extends Player { * this method is evoked if the user wants to use get a loan or pay a loan off. */ public void loan(){ - loanSharkText loan = new loanSharkText(getPlayer()); + LoanSharkText loan = new LoanSharkText(getPlayer()); loan.loanMoney(); setPlayer(loan.getPlayer()); } diff --git a/src/text/WarehouseText.java b/src/text/WarehouseText.java index cc36ed8..1fea82c 100644 --- a/src/text/WarehouseText.java +++ b/src/text/WarehouseText.java @@ -3,6 +3,7 @@ package text; import logic.Player; public class WarehouseText extends Player { + public WarehouseText(Player player) { Player playerDummy = new Player(player); setPlayer(playerDummy);