From 282c0dde07de987760817610369f18e2ba1dbc46 Mon Sep 17 00:00:00 2001 From: Pan Date: Tue, 16 Apr 2019 19:50:44 +1200 Subject: [PATCH] home commit --- enemyAI/combatManagerAI.java | 4 ++-- enemyAI/defenseManagerAI.java | 10 +++++----- enemyAI/unitProductionAI.java | 2 +- entity/goldMine.java | 7 +++++++ 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/enemyAI/combatManagerAI.java b/enemyAI/combatManagerAI.java index ac7de08..9dfc92d 100644 --- a/enemyAI/combatManagerAI.java +++ b/enemyAI/combatManagerAI.java @@ -364,7 +364,7 @@ public class combatManagerAI { //check if the player force has become stronger than the AI during the marching towards attack position //System.out.println("distanceToTarget: " + distanceToTarget); - if(checkIfAIHasBiggerForce(1.2f) == false && distanceToTarget > 5){ + if(checkIfAIHasBiggerForce(1.5f) == false && distanceToTarget > 5){ playerHasBecomeStrongerThanAIDuringMarching = true; } @@ -711,7 +711,7 @@ public class combatManagerAI { double playerForceStrength = unrevealedPlayerForceStrength + numberOfLightTanks_player + 0.75f*numberOfRocketTanks_player + 1.5*numberOfStealthTanks_player + 3* numberOfHeavyTanks_player; - //System.out.println("unrevealedPlayerForceStrength" + unrevealedPlayerForceStrength + " " + "enemyAIForceStrength " + enemyAIForceStrength + " " + "playerForceStrength" + playerForceStrength); + System.out.println("unrevealedPlayerForceStrength" + unrevealedPlayerForceStrength + " " + "enemyAIForceStrength " + enemyAIForceStrength + " " + "playerForceStrength" + playerForceStrength); return enemyAIForceStrength > 0 && playerForceStrength/enemyAIForceStrength < ratio; } diff --git a/enemyAI/defenseManagerAI.java b/enemyAI/defenseManagerAI.java index 90c616e..dcb6a5e 100644 --- a/enemyAI/defenseManagerAI.java +++ b/enemyAI/defenseManagerAI.java @@ -216,7 +216,7 @@ public class defenseManagerAI { majorThreatCooldown = 20; majorThreatLocation.set(mainPlayerForceLocation); } - /* + else { float d = playerForceIsMovingTwoardsBase(mainPlayerForceLocation, mainPlayerForceDirection); if(d != -1) { @@ -226,7 +226,7 @@ public class defenseManagerAI { majorThreatLocation.add(mainPlayerForceDirection, d); } } - */ + } @@ -403,7 +403,7 @@ public class defenseManagerAI { //find deploy location of gun turret if(threatX != 0 && distanceToThreat < 4.75 && numOfGunTurretNearThreat < (float)mainPlayerForceSize/3) { - float d = 1.75f; //minimum deploy distance from conyard + float d = 1.85f; //minimum deploy distance from conyard if(distanceToThreat > d + gunTurret.attackRange) d = distanceToThreat - gunTurret.attackRange; @@ -416,7 +416,7 @@ public class defenseManagerAI { //find deploy location of missile turret if(threatX != 0 && distanceToThreat < 5.15 && (numOfMissileTurretNearThreat < mainPlayerForceSize/6 || !gunTurretAlreadyInQueue)) { - float d = 1.35f; //minimum deploy distance from conyard + float d = 1.65f; //minimum deploy distance from conyard if(distanceToThreat > d + missileTurret.attackRange) d = distanceToThreat - missileTurret.attackRange; @@ -500,7 +500,7 @@ public class defenseManagerAI { threatToBaseDirection.unit(); if(threatToBaseDirection.dot(direction) > 0.8) { - float currentThreatDistance = Math.max(3f, d - 3f); + float currentThreatDistance = Math.max(3f, d - 2f); if(currentThreatDistance < threatDistance) threatDistance = currentThreatDistance; diff --git a/enemyAI/unitProductionAI.java b/enemyAI/unitProductionAI.java index d8fa5f8..800ff01 100644 --- a/enemyAI/unitProductionAI.java +++ b/enemyAI/unitProductionAI.java @@ -194,7 +194,7 @@ public class unitProductionAI { } } - if(mainThread.ec.theEconomyManagerAI.numberOfharvesters > 6 && theBaseInfo.currentCredit > 1500) { + if(mainThread.ec.theEconomyManagerAI.numberOfharvesters >= 6 && theBaseInfo.currentCredit > 1500) { if(!communicationCenter.harvesterSpeedResearched_enemy) { if(communicationCenter.harvesterSpeedResearchProgress_enemy == 255){ communicationCenter.researchHarvesterSpeed(1); diff --git a/entity/goldMine.java b/entity/goldMine.java index beacd82..53561a3 100644 --- a/entity/goldMine.java +++ b/entity/goldMine.java @@ -284,6 +284,13 @@ public class goldMine extends solidObject{ for(int i = 0; i < polygons.length; i++) polygons[i].myTexture = mainThread.textures[textureIndex]; } + }else { + if(textureIndex == 41 && goldDeposite == maxDeposite) { + textureIndex = 39; + for(int i = 0; i < polygons.length; i++) { + polygons[i].myTexture = mainThread.textures[textureIndex]; + } + } }