Lit 142

src/main/java/calculationEngine/CeExecuterService.java → src/main/java/calculationengine/CeExecuterServiceUtils.java

@@ -1,10 +1,10 @@
-package calculationEngine;
+package calculationengine;
 
 import config.BattleConstants;
 
 import java.util.concurrent.*;
 
-public class CeExecuterService {
+public class CeExecuterServiceUtils {
 
     private static final ThreadPoolExecutor executorService = (ThreadPoolExecutor) Executors.newFixedThreadPool(4);
     private static final boolean debug = BattleConstants.battleDebug;

src/main/java/calculationEngine/battle/CeBattle.java → src/main/java/calculationengine/battle/CeBattle.java

@@ -1,9 +1,13 @@
-package calculationEngine.battle;
-
-import calculationEngine.CeExecuterService;
-import calculationEngine.entities.*;
-import calculationEngine.environment.CeItem;
-import calculationEngine.environment.CeItemTypes;
+package calculationengine.battle;
+
+import calculationengine.CeExecuterServiceUtils;
+import calculationengine.entities.CeAi;
+import calculationengine.entities.CeAttack;
+import calculationengine.entities.CeBeastTypes;
+import calculationengine.entities.CeEntity;
+import calculationengine.entities.CePlayer;
+import calculationengine.environment.CeItem;
+import calculationengine.environment.CeItemTypes;
 import config.BattleConstants;
 
 import java.util.Random;
@@ -33,7 +37,7 @@ public CeBattle(CePlayer cePlayer1, CePlayer cePlayer2) {
         this.cePlayer2 = cePlayer2;
         this.cePlayer1.setNumber(1);
         this.cePlayer2.setNumber(2);
-        CeExecuterService.addThreadToExecutor(this);
+        CeExecuterServiceUtils.addThreadToExecutor(this);
     }
 
     public CeBattle(CePlayer cePlayer1, CeAi cePlayer2) {

src/main/java/calculationEngine/battle/CeCatching.java → src/main/java/calculationengine/battle/CeCatching.java

@@ -1,18 +1,18 @@
-package calculationEngine.battle;
+package calculationengine.battle;
 
-import calculationEngine.entities.CeAttack;
-import calculationEngine.entities.CeBeastTypes;
-import calculationEngine.entities.CeEntity;
-import calculationEngine.entities.CePlayer;
-import calculationEngine.environment.CeItem;
-import config.GlobalConfig;
+import calculationengine.entities.CeAttack;
+import calculationengine.entities.CeBeastTypes;
+import calculationengine.entities.CeEntity;
+import calculationengine.entities.CePlayer;
+import calculationengine.environment.CeItem;
+import config.GlobalConstants;
 
 import java.util.Random;
 
 public class CeCatching {
     private static Random random = new Random();
     private static String debugInfo;
-    private final static boolean bDebug = GlobalConfig.DEBUG_CONSOLE_OUT;
+    private final static boolean bDebug = GlobalConstants.DEBUG_CONSOLE_OUT;
 
     public static boolean isCaught(CePlayer player, CeEntity beast, CeItem cage) {
 

src/main/java/calculationEngine/battle/CeDamage.java → src/main/java/calculationengine/battle/CeDamage.java

@@ -1,15 +1,15 @@
-package calculationEngine.battle;
+package calculationengine.battle;
 
-import calculationEngine.entities.CeAttack;
-import calculationEngine.entities.CeEntity;
-import config.GlobalConfig;
+import calculationengine.entities.CeAttack;
+import calculationengine.entities.CeEntity;
+import config.GlobalConstants;
 
 import java.util.Random;
 
 public class CeDamage {
     private static Random random = new Random();
     private static String debugInfo;
-    private final static boolean bDebug = GlobalConfig.DEBUG_CONSOLE_OUT;
+    private final static boolean bDebug = GlobalConstants.DEBUG_CONSOLE_OUT;
 
     public static int calculateDamage(CeEntity attacker, CeEntity defender, CeAttack ceAttack) {
         //roll to d50 to get a quasi normal distribution

src/main/java/calculationEngine/battle/testBattle.java → src/main/java/calculationengine/battle/TestBattle.java

@@ -1,33 +1,34 @@
-package calculationEngine.battle;
+package calculationengine.battle;
 
-import calculationEngine.CeExecuterService;
-import calculationEngine.entities.*;
-import calculationEngine.environment.CeLoot;
-import calculationEngine.environment.CeRegions;
+import calculationengine.CeExecuterServiceUtils;
+import calculationengine.entities.CeAi;
+import calculationengine.entities.CeAttack;
+import calculationengine.entities.CeAttacks;
+import calculationengine.entities.CeBeastTypes;
+import calculationengine.entities.CeEntity;
+import calculationengine.entities.CeNature;
+import calculationengine.entities.CePlayer;
+import calculationengine.entities.CeStats;
+import calculationengine.entities.ItemNotInInventoryException;
+import calculationengine.environment.CeLootUtils;
+import calculationengine.environment.CeRegions;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class testBattle {
+public class TestBattle {
 
     public static void main(String[] args) throws Exception {
-//        simulateAiBattle();
+        simulateAiBattle();
         simulateCatch();
-        CeExecuterService.shutdownExecutor();
+        CeExecuterServiceUtils.shutdownExecutor();
     }
 
     private static void simulateCatch() throws Exception {
 
-        List<CeEntity> team = new ArrayList<>();
-        List<CeAttack> attacks = new ArrayList<>();
-        attacks.add(new CeAttack(CeAttacks.Punch));
-        CePlayer cePlayer1 = new CePlayer(new CeStats(CeBeastTypes.PlayerStandard, CeNature.ANGRY, 1, 100, 100, 50, 200, 200, 200, 1), attacks, team, false);
-
-        team.add(new CeEntity(CeRegions.ArkhamCity, cePlayer1));
-        cePlayer1.setTeam(team);
-        cePlayer1.setActiveMonsterIndex(0);
+        CePlayer cePlayer1 = init();
         for (int i = 0; i < 1; i++) {
-            cePlayer1.getInventory().addItemToInventory(CeLoot.lootItem("cage"));
+            cePlayer1.getInventory().addItemToInventory(CeLootUtils.lootItem("cage"));
         }
         CeAi cePlayer2 = new CeAi(cePlayer1, CeRegions.ArkhamCity);
         CeBattle battle = new CeBattle(cePlayer1, cePlayer2);
@@ -38,7 +39,7 @@ private static void simulateCatch() throws Exception {
                 if (battle.getTurn().getNumber() == cePlayer1.getNumber()) {
                     System.out.println("[Test Battle]: Turn of: Player 1");
                     try {
-                        boolean caught = battle.catchBeast(CeLoot.lootItem("cage"));
+                        boolean caught = battle.catchBeast(CeLootUtils.lootItem("cage"));
                         if (caught) System.out.println("[Test Battle]: Beast caught! CONGRATS");
                         else System.out.println("[Test Battle]: Beast doesn't like you");
                     } catch (ItemNotInInventoryException itemNotInInventoryException) {
@@ -49,22 +50,28 @@ private static void simulateCatch() throws Exception {
                         battle.endBatte();
                     }
                 } } else {
-                    System.out.println("[Test Battle]: End of fight");
-                }
-                Thread.sleep(10);
+                System.out.println("[Test Battle]: End of fight");
             }
-            System.out.println("[Test Battle]: End of fight");
+            Thread.sleep(10);
         }
+        System.out.println("[Test Battle]: End of fight");
+    }
 
-    private static void simulateAiBattle() throws InterruptedException {
-
+    private static CePlayer init() {
         List<CeEntity> team = new ArrayList<>();
         List<CeAttack> attacks = new ArrayList<>();
         attacks.add(new CeAttack(CeAttacks.Punch));
         CePlayer cePlayer1 = new CePlayer(new CeStats(CeBeastTypes.PlayerStandard, CeNature.ANGRY, 1, 100, 100, 50, 200, 200, 200, 1), attacks, team, false);
+
         team.add(new CeEntity(CeRegions.ArkhamCity, cePlayer1));
         cePlayer1.setTeam(team);
         cePlayer1.setActiveMonsterIndex(0);
+        return cePlayer1;
+    }
+
+    private static void simulateAiBattle() throws InterruptedException {
+
+        CePlayer cePlayer1 = init();
         CeAi cePlayer2 = new CeAi(cePlayer1, CeRegions.ArkhamCity);
         CeBattle battle = new CeBattle(cePlayer1, cePlayer2);
         System.out.println("[Test Battle]: Battle started");

src/main/java/calculationEngine/battle/WrongItemException.java → src/main/java/calculationengine/battle/WrongItemException.java

@@ -1,6 +1,6 @@
-package calculationEngine.battle;
+package calculationengine.battle;
 
-import calculationEngine.environment.CeItem;
+import calculationengine.environment.CeItem;
 
 public class WrongItemException extends Exception{
     public WrongItemException(CeItem item, String expected) {

src/main/java/calculationEngine/entities/CeAi.java → src/main/java/calculationengine/entities/CeAi.java

@@ -1,7 +1,7 @@
-package calculationEngine.entities;
+package calculationengine.entities;
 
-import calculationEngine.battle.CeBattle;
-import calculationEngine.environment.CeRegions;
+import calculationengine.battle.CeBattle;
+import calculationengine.environment.CeRegions;
 import config.BattleConstants;
 
 import java.util.ArrayList;
@@ -45,7 +45,7 @@ private void finishAIConstruction(CeEntity ceBeast){
         );
         this.setTeam(team);
         if (debug) System.out.println("[AI Construction]: AI CREATION: " + ceBeast.toString());
-        this.setCeStats(new CeStats(ceBeast.getCeStats()));
+        this.setCeStats(ceBeast.getCeStats());
         this.getCeStats().setMaxHitPoints(0);
         this.getCeStats().setCurrentHitPoints(0);
         this.currentMonster = this.getTeam().get(0);

src/main/java/calculationEngine/entities/CeAttack.java → src/main/java/calculationengine/entities/CeAttack.java

@@ -1,4 +1,4 @@
-package calculationEngine.entities;
+package calculationengine.entities;
 
 import config.EntityConstants;
 

src/main/java/calculationEngine/entities/CeAttacks.java → src/main/java/calculationengine/entities/CeAttacks.java

@@ -1,4 +1,4 @@
-package calculationEngine.entities;
+package calculationengine.entities;
 
 public enum CeAttacks {
 

src/main/java/calculationEngine/entities/CeBeastTypes.java → src/main/java/calculationengine/entities/CeBeastTypes.java

@@ -1,4 +1,4 @@
-package calculationEngine.entities;
+package calculationengine.entities;
 
 public enum CeBeastTypes {
 

src/main/java/calculationEngine/entities/CeBeasts.java → src/main/java/calculationengine/entities/CeBeasts.java

@@ -1,6 +1,6 @@
-package calculationEngine.entities;
+package calculationengine.entities;
 
-import calculationEngine.environment.CeRegions;
+import calculationengine.environment.CeRegions;
 
 public enum CeBeasts {
 

src/main/java/calculationEngine/entities/CeEntity.java → src/main/java/calculationengine/entities/CeEntity.java

@@ -1,6 +1,6 @@
-package calculationEngine.entities;
+package calculationengine.entities;
 
-import calculationEngine.environment.CeRegions;
+import calculationengine.environment.CeRegions;
 
 import java.util.ArrayList;
 import java.util.Arrays;