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

Fix gaia units ignoring players without CCs.

Browse Source 
As demonstrated by Dizaka, it allowed players to win a game by deleting
all buildings, sending one unit across the map and having the enemy get
defeated by the double gaia count.
It also means that players that still have buildings but no CCs/Wonders
are targetted by elephants.

This was SVN commit r21777.
This commit is contained in:
elexis
2018-04-24 12:46:59 +00:00
parent 067bbb38d6
commit 76d648349d
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/maps/random/jebel_barkal_triggers.js
+11 -15
View File
@@ -142,12 +142,6 @@ var jebelBarkal_cityPatrolGroup_triggerPointPath = "A";
*/
var jebelBarkal_attackerGroup_triggerPointPatrol = "B";
/**
* Attacker groups approach these player buildings and attack enemies of the given classes encountered.
*/
var jebelBarkal_pathTargetClasses = "CivCentre Wonder";
/**
* Number of points the attackers patrol.
*/
@@ -515,26 +509,27 @@ Trigger.prototype.JebelBarkal_SpawnAttackerGroups = function()
if (!this.jebelBarkal_attackerGroupSpawnPoints)
return;
let targets = TriggerHelper.GetAllPlayersEntitiesByClass(jebelBarkal_pathTargetClasses);
if (!targets.length)
{
this.JebelBarkal_StartAttackTimer(jebelBarkal_attackInterval());
return;
}
this.debugLog("Attacker wave (at most " + (jebelBarkal_maxPopulation - this.jebelBarkal_attackerUnits.length) + " attackers)");
let time = TriggerHelper.GetMinutes();
let activePlayers = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetActivePlayers();
let playerEntities = activePlayers.map(playerID => TriggerHelper.GetEntitiesByPlayer(playerID));
let patrolPoints = this.GetTriggerPoints(jebelBarkal_attackerGroup_triggerPointPatrol);
let groupSizeFactor = jebelBarkal_attackerGroup_sizeFactor(
Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetActivePlayers().length,
activePlayers.length,
this.numInitialSpawnPoints,
this.GetDifficulty());
let spawnedAnything = false;
for (let spawnPointBalancing of jebelBarkal_attackerGroup_balancing)
{
let targets = playerEntities.reduce((allTargets, playerEnts) =>
allTargets.concat(shuffleArray(TriggerHelper.MatchEntitiesByClass(playerEnts, spawnPointBalancing.targetClasses())).slice(0, 10)), []);
if (!targets.length)
continue;
for (let spawnEnt of TriggerHelper.MatchEntitiesByClass(this.jebelBarkal_attackerGroupSpawnPoints, spawnPointBalancing.buildingClasses))
{
let unitCount = Math.min(
jebelBarkal_maxPopulation - this.jebelBarkal_attackerUnits.length,
groupSizeFactor * spawnPointBalancing.unitCount(time));
@@ -580,6 +575,7 @@ Trigger.prototype.JebelBarkal_SpawnAttackerGroups = function()
});
}
}
}
if (spawnedAnything)
Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface).PushNotification({
binaries/data/mods/public/maps/scripts/TriggerHelper.js
+1 -1
View File
@@ -267,7 +267,7 @@ TriggerHelper.DefeatPlayer = function(playerID, defeatReason)
};
/**
* Returns the number of current players
* Returns the number of players including gaia and defeated ones.
*/
TriggerHelper.GetNumberOfPlayers = function()
{
binaries/data/mods/public/simulation/components/PlayerManager.js
+3
View File
@@ -85,6 +85,9 @@ PlayerManager.prototype.GetPlayerByID = function(id)
return INVALID_ENTITY;
};
/**
* Returns the number of players including gaia.
*/
PlayerManager.prototype.GetNumPlayers = function()
{
return this.playerEntities.length;