From 165ad247c42f93dca96d0ff807f0f88b1ff12d34 Mon Sep 17 00:00:00 2001 From: hexall90 <hexall90@gmail.com> Date: Fri, 3 Nov 2017 17:22:33 +0100 Subject: [PATCH] forgot to revert test flags --- src/SecExp/attackReport.tw | 6 +++--- src/SecExp/rebellionGenerator.tw | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw index 780384897cd..3ae15cf2852 100644 --- a/src/SecExp/attackReport.tw +++ b/src/SecExp/attackReport.tw @@ -192,7 +192,7 @@ You decided in favor of a financial approach rather than open hostilities. Your troops remain inside the arcology's walls. <</if>> <<elseif $attackType == "free city">> - Today, the <<print _day + random(0,7)>> of _month, _year, our arcology was attacked by a contingent of mercenaries hired by a competing free city, $attackTroops men strong. Our defense forces clashed with them + Today, the _day of _month _year, our arcology was attacked by a contingent of mercenaries hired by a competing free city, $attackTroops men strong. Our defense forces clashed with them <<if $battleTerrain == "urban">> in the streets of <<if $terrain == "urban">>the old world city surrounding the arcology<<else>>of the free city<</if>>, <<elseif $battleTerrain == "rural">> @@ -255,7 +255,7 @@ You decided in favor of a financial approach rather than open hostilities. Your troops remain inside the arcology's walls. <</if>> <<elseif $attackType == "freedom fighters">> - Today, the <<print _day + random(0,7)>> of _month, _year, our arcology was attacked by a group of freedom fighters bent on the destruction of the institution of slavery, $attackTroops men strong. Our defense forces clashed with them + Today, the _day of _month _year, our arcology was attacked by a group of freedom fighters bent on the destruction of the institution of slavery, $attackTroops men strong. Our defense forces clashed with them <<if $battleTerrain == "urban">> in the streets of <<if $terrain == "urban">>the old world city surrounding the arcology<<else>>of the free city<</if>>, <<elseif $battleTerrain == "rural">> @@ -318,7 +318,7 @@ You decided in favor of a financial approach rather than open hostilities. Your troops remain inside the arcology's walls. <</if>> <<elseif $attackType == "old world">> - Today, the <<print _day + random(0,7)>> of _month, _year, our arcology was attacked by an old world nation boasting a misplaced sense of superiority, $attackTroops men strong. Our defense forces clashed with them + Today, the _day of _month _year, our arcology was attacked by an old world nation boasting a misplaced sense of superiority, $attackTroops men strong. Our defense forces clashed with them <<if $battleTerrain == "urban">> in the streets of <<if $terrain == "urban">>the old world city surrounding the arcology<<else>>of the free city<</if>>, <<elseif $battleTerrain == "rural">> diff --git a/src/SecExp/rebellionGenerator.tw b/src/SecExp/rebellionGenerator.tw index b6e3933222b..859985db42d 100644 --- a/src/SecExp/rebellionGenerator.tw +++ b/src/SecExp/rebellionGenerator.tw @@ -186,9 +186,6 @@ <</if>> <</if>> -<<set $slaveRebellion = 0>> -<<set $citizenRebellion = 1>> - <<if $slaveRebellion == 1>> <<set $lastRebellionWeeks = 0>> <<set $leadingTroops = "assistant">> -- GitLab