Added a forfeit flag to the end-battle flags

At this stage, primarily for use in the Battle Factory.
varkor · Jan 8, 2016 · a3345dc · a3345dc
1 parent cc8c64e
commit a3345dc
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/battle/scripts/objects/general/BattleContext.js b/battle/scripts/objects/general/BattleContext.js
@@ -1705,22 +1705,25 @@ function BattleContext (client) {
 							Textbox.state(opponents + " forfeited the battle!");
 						}
 						endBattleFlags = {
-							"outcome" : "allied victory"
+							"outcome" : "allied victory",
+							"forfeit" : true
 						};
 					} else if (forfeiters.length === 1 && forfeiters.first() === battleContext.alliedTrainers.first().identification) {
 						if (!battleContext.process) {
 							var playerName = !battleContext.process ? battleContext.alliedTrainers.first().pronoun(true) : null;
 							Textbox.state(playerName + " forfeited the battle!");
 						}
 						endBattleFlags = {
-							"outcome" : "opposing victory"
+							"outcome" : "opposing victory",
+							"forfeit" : true
 						};
 					} else {
 						if (!battleContext.process) {
 							Textbox.state("Everyone forfeited the battle!");
 						}
 						endBattleFlags = {
-							"outcome" : "draw"
+							"outcome" : "draw",
+							"forfeit" : true
 						};
 					}
 					if (battleContext.state.kind === "waiting") {
@@ -2698,7 +2701,8 @@ function BattleContext (client) {
 					}
 					var effect = function () {
 						battleContext.end({
-							"outcome" : "draw"
+							"outcome" : "draw",
+							"forfeit" : false
 						});
 					};
 					if (!battleContext.process)
@@ -2940,7 +2944,8 @@ function BattleContext (client) {
 								if (!battleContext.process) Textbox.state(playerName + " blacked out!");
 						}
 						endBattleFlags = {
-							"outcome" : "opposing victory"
+							"outcome" : "opposing victory",
+							"forfeit" : false
 						};
 					} else {
 						if (!battleContext.process) Textbox.state(playerName + " " + (battleContext.alliedTrainers.first() !== Game.player ? "has" : "have") + " defeated " + (trainerBattle ? opponents : "the wild Pokémon") + "!");
@@ -2969,7 +2974,8 @@ function BattleContext (client) {
 							}
 						}
 						endBattleFlags = {
-							"outcome" : "allied victory"
+							"outcome" : "allied victory",
+							"forfeit" : false
 						};
 					}
 					battleContext.endingFlags = endBattleFlags;