abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Don't reset wonder victory timer on ally defeat.

Browse Source 
Follows d86148defc.
Resetting the wonder time when an ally to the wonder-owner is defeated
seems like double-punishment, and should not happen.

Resetting on explicit diplomacy change remains in Allied victory mode.

Fixes #6527

Reported by: Langbart
Differential Revision: https://code.wildfiregames.com/D4661
This was SVN commit r26914.
This commit is contained in:
wraitii 2022-06-01 15:44:53 +00:00
parent 7946def863
commit b5abab5c79
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
binaries/data/mods/public/maps/scripts/WonderVictory.js
View File

@ -131,17 +131,6 @@ Trigger.prototype.WonderVictoryPlayerWon = function(data)
this.WonderVictoryDeleteTimer(ent); this.WonderVictoryDeleteTimer(ent);
}; };
Trigger.prototype.WonderVictoryPlayerDefeated = function(data)
{
for (let ent in this.wonderVictoryMessages)
if (this.wonderVictoryMessages[ent].allies.has(data.playerId))
{
let owner = this.wonderVictoryMessages[ent].playerID;
this.WonderVictoryDeleteTimer(ent);
this.WonderVictoryStartTimer(ent, owner);
}
};
Trigger.prototype.WonderVictorySetWinner = function(playerID) Trigger.prototype.WonderVictorySetWinner = function(playerID)
{ {
let cmpEndGameManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_EndGameManager); let cmpEndGameManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_EndGameManager);
@ -163,6 +152,5 @@ Trigger.prototype.WonderVictorySetWinner = function(playerID)
cmpTrigger.RegisterTrigger("OnOwnershipChanged", "WonderVictoryOwnershipChanged", { "enabled": true }); cmpTrigger.RegisterTrigger("OnOwnershipChanged", "WonderVictoryOwnershipChanged", { "enabled": true });
cmpTrigger.RegisterTrigger("OnDiplomacyChanged", "WonderVictoryDiplomacyChanged", { "enabled": true }); cmpTrigger.RegisterTrigger("OnDiplomacyChanged", "WonderVictoryDiplomacyChanged", { "enabled": true });
cmpTrigger.RegisterTrigger("OnPlayerWon", "WonderVictoryPlayerWon", { "enabled": true }); cmpTrigger.RegisterTrigger("OnPlayerWon", "WonderVictoryPlayerWon", { "enabled": true });
cmpTrigger.RegisterTrigger("OnPlayerDefeated", "WonderVictoryPlayerDefeated", { "enabled": true });
cmpTrigger.wonderVictoryMessages = {}; cmpTrigger.wonderVictoryMessages = {};
} }