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

Fix multiple bugs where a wrong variable is used.

Browse Source 
Those bugs stood out to me as I was experimenting with migrating petra
to ES6 classes. Since this give the code stronger typing, those kind of
errors stand out immediately.
For example, autoResearch is a function, thus referring to it by name
will always return the same result. In other cases the referenced
variables simply don't exist.
This commit is contained in:
Andreas Traber
2025-01-26 15:26:42 +01:00
committed by Nicolas Auvray
parent dffa892c60
commit 05f31300a1
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/simulation/ai/common-api/gamestate.js
+1 -1
View File
@@ -823,7 +823,7 @@ m.GameState.prototype.hasResearchers = function(templateName, noRequirementCheck
return false;
let template = this.getTemplate(templateName);
if (template.autoResearch)
if (template.autoResearch())
return true;
let civ = this.playerData.civ;
binaries/data/mods/public/simulation/ai/petra/attackPlan.js
+1 -1
View File
@@ -1170,7 +1170,7 @@ PETRA.AttackPlan.prototype.checkTargetObstruction = function(gameState, target,
}
else if (struct.get("Obstruction/Unit"))
{
let r = +this.get("Obstruction/Unit/@radius");
let r = +struct.get("Obstruction/Unit/@radius");
if (x*x + y*y < r*r)
{
blocker = struct;
binaries/data/mods/public/simulation/ai/petra/diplomacyManager.js
+1 -1
View File
@@ -357,7 +357,7 @@ PETRA.DiplomacyManager.prototype.lastManStandingCheck = function(gameState)
if (request && request.status !== "allianceBroken")
{
if (request.status === "waitingForTribute")
PETRA.chatAnswerRequestDiplomacy(gameState, player, request.requestType, "decline");
PETRA.chatAnswerRequestDiplomacy(gameState, playerToTurnAgainst, request.requestType, "decline");
request.status = request.status === "accepted" ? "allianceBroken" : "declinedRequest";
}
// If we had sent this player a diplomacy request, just rescind it
binaries/data/mods/public/simulation/ai/petra/headquarters.js
+2 -2
View File
@@ -1575,7 +1575,7 @@ PETRA.HQ.prototype.buildDefenses = function(gameState, queues)
{
// Count all towers + wall towers.
let numTowers = gameState.getOwnEntitiesByClass("Tower", true).length + gameState.getOwnEntitiesByClass("WallTower", true).length;
let towerLapseTime = this.saveResource ? (1 + 0.5 * numTowers) * this.towerLapseTime : this.towerLapseTime;
let towerLapseTime = this.saveResources ? (1 + 0.5 * numTowers) * this.towerLapseTime : this.towerLapseTime;
if (numTowers < this.Config.Military.numSentryTowers && gameState.ai.elapsedTime > towerLapseTime + this.fortStartTime)
{
this.fortStartTime = gameState.ai.elapsedTime;
@@ -1588,7 +1588,7 @@ PETRA.HQ.prototype.buildDefenses = function(gameState, queues)
return;
let numTowers = gameState.getOwnEntitiesByClass("StoneTower", true).length;
let towerLapseTime = this.saveResource ? (1 + numTowers) * this.towerLapseTime : this.towerLapseTime;
let towerLapseTime = this.saveResources ? (1 + numTowers) * this.towerLapseTime : this.towerLapseTime;
if ((!numTowers || gameState.ai.elapsedTime > (1 + 0.1 * numTowers) * towerLapseTime + this.towerStartTime) &&
numTowers < 2 * this.numActiveBases() + 3 + this.extraTowers &&
numTowers < Math.floor(gameState.getPopulation() / 8) &&