diff --git a/core/AssetManager.java b/core/AssetManager.java index 2cb1a6e..85bba45 100644 --- a/core/AssetManager.java +++ b/core/AssetManager.java @@ -106,12 +106,12 @@ public class AssetManager { goldMines = new goldMine[16]; goldMines[0] = new goldMine(2f,-0.515f, 1.25f, 45000); goldMines[1] = new goldMine(9.5f,-0.515f, 5.5f, 45000); - goldMines[2] = new goldMine(2f,-0.515f, 28.25f, 52500); - goldMines[3] = new goldMine(26f,-0.515f, 3.5f, 52500); + goldMines[2] = new goldMine(2f,-0.515f, 28.25f, 55000); + goldMines[3] = new goldMine(26f,-0.515f, 3.5f, 55000); goldMines[4] = new goldMine(29.75f,-0.515f, 30f, 45000); goldMines[5] = new goldMine(22.5f,-0.515f, 25.5f, 45000); - goldMines[6] = new goldMine(15.75f,-0.515f, 18f, 52500); - goldMines[7] = new goldMine(16.25f,-0.515f, 12.25f, 52500); + goldMines[6] = new goldMine(15.75f,-0.515f, 18f, 55000); + goldMines[7] = new goldMine(16.25f,-0.515f, 12.25f, 55000); //create trees from bitmap @@ -318,6 +318,7 @@ public class AssetManager { rockets = null; mainThread.gridMap.reset(); + solidObject.globalUniqID = 0; } diff --git a/enemyAI/baseExpensionAI.java b/enemyAI/baseExpensionAI.java index 301c919..6a49881 100644 --- a/enemyAI/baseExpensionAI.java +++ b/enemyAI/baseExpensionAI.java @@ -34,15 +34,15 @@ public class baseExpensionAI { int randomeNumber = gameData.getRandom(); - if(randomeNumber < 170) + if(randomeNumber < 100) expensionPiorityList = new int[]{5,6,2,3,7}; - else if(randomeNumber >= 170 && randomeNumber < 340) + else if(randomeNumber >= 100 && randomeNumber < 200) expensionPiorityList = new int[]{5,6,3,2,7}; - else if(randomeNumber >= 340 && randomeNumber < 510) + else if(randomeNumber >= 200 && randomeNumber < 407) expensionPiorityList = new int[]{5,2,6,3,7}; - else if(randomeNumber >= 510 && randomeNumber < 680) + else if(randomeNumber >= 407 && randomeNumber < 614) expensionPiorityList = new int[]{5,2,3,6,7}; - else if(randomeNumber >= 680 && randomeNumber < 850) + else if(randomeNumber >= 614 && randomeNumber < 821) expensionPiorityList = new int[]{5,3,6,2,7}; else expensionPiorityList = new int[]{5,3,2,6,7}; @@ -52,9 +52,6 @@ public class baseExpensionAI { lastExpansionLocation = 7; lowGoldmineThreshold = 22500; - - - System.out.println(expensionPiorityList[1]); } diff --git a/enemyAI/combatManagerAI.java b/enemyAI/combatManagerAI.java index 54a9195..f1e28da 100644 --- a/enemyAI/combatManagerAI.java +++ b/enemyAI/combatManagerAI.java @@ -69,7 +69,7 @@ public class combatManagerAI { public combatManagerAI(){ this.theBaseInfo = mainThread.ec.theBaseInfo; - standardAttackTime = 600; + standardAttackTime = 500; rushAttackTime = 250 + gameData.getRandom()/4; goldMines = mainThread.theAssetManager.goldMines; diff --git a/enemyAI/defenseManagerAI.java b/enemyAI/defenseManagerAI.java index b001515..96c6c84 100644 --- a/enemyAI/defenseManagerAI.java +++ b/enemyAI/defenseManagerAI.java @@ -81,7 +81,7 @@ public class defenseManagerAI { lightTanksControlledByCombatAI = mainThread.ec.theUnitProductionAI.lightTanksControlledByCombatAI; //after 500 seconds mark, borrow 2 stealth tanks from combat manager, and send them to guard western and southern side of the main base - if(frameAI >= 480 && mainThread.ec.theCombatManagerAI.checkIfAIHasBiggerForce(0.8f)) { + if(frameAI >= 630 && mainThread.ec.theCombatManagerAI.checkIfAIHasBiggerForce(0.8f)) { for(int i = 0; i < 2; i++) { if(observers[i] == null || observers[i].currentHP <=0) { for(int j = 0; j < stealthTanksControlledByCombatAI.length; j++) { @@ -135,7 +135,7 @@ public class defenseManagerAI { zPos = 24.5f; } - if(frameAI > 980) { + if(frameAI > 1000) { if(frameAI%18 < 9) { xPos = 0.25f; zPos = 20.5f; @@ -157,7 +157,7 @@ public class defenseManagerAI { zPos = 20f; } - if(frameAI > 980) { + if(frameAI > 1000) { if(frameAI%14 < 7) { xPos = 18.75f; zPos = 5f; diff --git a/enemyAI/microManagementAI.java b/enemyAI/microManagementAI.java index a764cc9..eb5e729 100644 --- a/enemyAI/microManagementAI.java +++ b/enemyAI/microManagementAI.java @@ -157,19 +157,13 @@ public class microManagementAI { solidObject currentTarget = unitInCombatRadius[i].targetObject; int targetHP = 99999; int level = 0; - - if(currentTarget != null) { - level = currentTarget.level; - } - - float distanceToDesination = 99999; for(int j=0; j < numberOfPlayerUnitsOnMinimap; j++){ if(playerUnitInMinimap[j] != null && playerUnitInMinimap[j].currentHP > 0){ - if(((playerUnitInMinimap[j].getMaxHp() / playerUnitInMinimap[j].currentHP >= 4) && !(currentTarget != null && currentTarget.currentHP < playerUnitInMinimap[j].currentHP)) || playerUnitInMinimap[j].level > level){ + if((playerUnitInMinimap[j].getMaxHp() / playerUnitInMinimap[j].currentHP > 4 && !(currentTarget != null && currentTarget.currentHP < playerUnitInMinimap[j].currentHP)) || playerUnitInMinimap[j].level > level){ x1 = playerUnitInMinimap[j].centre.x; x2 = unitInCombatRadius[i].centre.x; z1 = playerUnitInMinimap[j].centre.z; diff --git a/entity/gunTurret.java b/entity/gunTurret.java index 85b2811..9226ca0 100644 --- a/entity/gunTurret.java +++ b/entity/gunTurret.java @@ -753,7 +753,7 @@ public class gunTurret extends solidObject{ } int theDamage = myDamage; - if(targetObject.type == 0) + if(targetObject.type == 0 || targetObject.type == 6) theDamage = 20; if(attackCoolDown == 0 ){ diff --git a/entity/solidObject.java b/entity/solidObject.java index c8b9f0b..49a7f6e 100644 --- a/entity/solidObject.java +++ b/entity/solidObject.java @@ -139,7 +139,7 @@ public abstract class solidObject{ public vector tempCentre = new vector(0,0,0); public vector tempVector = new vector(0,0,0); - public static int globalUniqID = 1; + public static int globalUniqID = 0; public int ID;