Added a forced flag to the end-battle flags

Again, useful for the battle factory.
varkor · Jan 10, 2016 · 5948268 · 5948268
1 parent 7019e64
commit 5948268
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/battle/scripts/objects/general/BattleContext.js b/battle/scripts/objects/general/BattleContext.js
@@ -909,6 +909,9 @@ function BattleContext (client) {
 					"escape" [the allies escaped from a wild battle]
 					"illegal battle" [the trainers did not have Pokémon matching the battle requirements]
 				*/
+				if (!battleContext.endingFlags.hasOwnProperty("forced")) {
+					battleContext.endingFlags.forced = false;
+				}
 				battleContext.callback(battleContext.endingFlags, stored);
 			}
 			battleContext.notifyDelegates("battleIsEnding");

diff --git a/battle/scripts/objects/unique/Supervisor.js b/battle/scripts/objects/unique/Supervisor.js
@@ -215,7 +215,8 @@ Supervisor = {
 						alliedVictory = false;
 				}
 				process.battle.end({
-					"outcome" : alliedVictory === null ? "draw" : (alliedVictory === true ? "allied victory" : (alliedVictory === false ? "opposing victory" : "termination"))
+					"outcome" : alliedVictory === null ? "draw" : (alliedVictory === true ? "allied victory" : (alliedVictory === false ? "opposing victory" : "termination")),
+					"forced" : true
 				}, true);
 				foreach(process.parties, function (party) {
 					Supervisor.send(party, "force", data, identifier);