mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-21 13:04:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

petra: various minor fixes

Browse Source 
This was SVN commit r20234.
This commit is contained in:
mimo
2017-09-27 18:58:51 +00:00
parent 995f9b5975
commit 49758c8337
4 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/simulation/ai/petra/attackManager.js
+3 -3
View File
@@ -202,7 +202,7 @@ m.AttackManager.prototype.update = function(gameState, queues, events)
if (!attackPlan.failed)
{
if (this.Config.debug > 1)
API3.warn("Headquarters: Rushing plan " + this.totalNumber + " with maxRushes " + this.maxRushes);
API3.warn("Military Manager: Rushing plan " + this.totalNumber + " with maxRushes " + this.maxRushes);
this.totalNumber++;
attackPlan.init(gameState);
this.upcomingAttacks.Rush.push(attackPlan);
@@ -458,7 +458,7 @@ m.AttackManager.prototype.getEnemyPlayer = function(gameState, attack)
}
if (enemyCivCentre)
enemyCount += 500;
if (enemyCount < max)
if (!enemyCount || enemyCount < max)
continue;
max = enemyCount;
enemyPlayer = i;
@@ -495,7 +495,7 @@ m.AttackManager.prototype.raidTargetEntity = function(gameState, ent)
if (!attackPlan.failed)
{
if (this.Config.debug > 1)
API3.warn("Headquarters: Raiding plan " + this.totalNumber);
API3.warn("Military Manager: Raiding plan " + this.totalNumber);
this.totalNumber++;
attackPlan.init(gameState);
this.upcomingAttacks.Raid.push(attackPlan);
binaries/data/mods/public/simulation/ai/petra/config.js
+2 -2
View File
@@ -139,14 +139,12 @@ m.Config.prototype.setConfig = function(gameState)
// changing settings based on difficulty or personality
if (this.difficulty < 2)
{
this.Economy.cityPhase = 240000;
this.Economy.supportRatio = 0.5;
this.Economy.provisionFields = 1;
this.Military.numSentryTowers = this.personality.defensive > 0.66 ? 1 : 0;
}
else if (this.difficulty < 3)
{
this.Economy.cityPhase = 1800;
this.Economy.supportRatio = 0.4;
this.Economy.provisionFields = 1;
this.Military.numSentryTowers = this.personality.defensive > 0.66 ? 1 : 0;
@@ -205,6 +203,8 @@ m.Config.prototype.setConfig = function(gameState)
this.Economy.targetNumWorkers = Math.max(this.Economy.targetNumWorkers, this.Economy.popPhase2);
this.Economy.workPhase3 = Math.min(this.Economy.workPhase3, this.Economy.targetNumWorkers);
this.Economy.workPhase4 = Math.min(this.Economy.workPhase4, this.Economy.targetNumWorkers);
if (this.difficulty < 2)
this.Economy.workPhase3 = Infinity; // prevent the phasing to city phase
if (this.debug < 2)
return;
binaries/data/mods/public/simulation/ai/petra/garrisonManager.js
+12 -6
View File
@@ -113,18 +113,21 @@ m.GarrisonManager.prototype.update = function(gameState, events)
let around = { "defenseStructure": false, "meleeSiege": false, "rangeSiege": false, "unit": false };
for (let ent of gameState.getEnemyEntities().values())
{
if (!ent.position())
if (ent.hasClass("Structure"))
if (!ent.attackRange("Ranged"))
continue;
else if (ent.hasClass("Unit"))
if (ent.owner() == 0 && (!ent.unitAIState() || ent.unitAIState().split(".")[1] != "COMBAT"))
continue;
else
continue;
if (ent.owner() === 0 && (!ent.unitAIState() || ent.unitAIState().split(".")[1] !== "COMBAT"))
if (!ent.position())
continue;
let dist = API3.SquareVectorDistance(ent.position(), holder.position());
if (dist > range*range)
continue;
if (ent.hasClass("Structure"))
{
if (ent.attackRange("Ranged")) // TODO units on wall are not taken into account
around.defenseStructure = true;
}
around.defenseStructure = true;
else if (m.isSiegeUnit(ent))
{
if (ent.attackTypes().indexOf("Melee") !== -1)
@@ -262,6 +265,9 @@ m.GarrisonManager.prototype.keepGarrisoned = function(ent, holder, around)
case 'protection': // hurt unit for healing or infantry for defense
if (holder.buffHeal() && ent.isHealable() && ent.healthLevel() < this.Config.garrisonHealthLevel.high)
return true;
let capture = ent.capturePoints();
if (capture && capture[PlayerID] / capture.reduce((a, b) => a + b) < 0.8)
return true;
if (MatchesClassList(ent.classes(), holder.getGarrisonArrowClasses()))
{
if (around.unit || around.defenseStructure)
binaries/data/mods/public/simulation/ai/petra/headquarters.js
+1 -2
View File
@@ -786,8 +786,7 @@ m.HQ.prototype.findEconomicCCLocation = function(gameState, template, resource,
{
// This builds a map. The procedure is fairly simple. It adds the resource maps
// (which are dynamically updated and are made so that they will facilitate DP placement)
// Then checks for a good spot in the territory. If none, and town/city phase, checks outside
// The AI will currently not build a CC if it wouldn't connect with an existing CC.
// Then look for a good spot.
Engine.ProfileStart("findEconomicCCLocation");