Skip to content
Snippets Groups Projects
Commit ddff01de authored by x's avatar x
Browse files

Toggle tweaking

parent 3485b063
No related branches found
No related tags found
1 merge request!2508SF overhual sec exp
Hide whitespace changes
Inline Side-by-side
Showing
with 63 additions and 63 deletions
src/SecExp/attackGenerator.tw
+ 1
− 1
View file @ ddff01de
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
<<if ($week >= 120 && $attackType != "none") || ($forceMajorBattle == 1 && $foughtThisWeek == 0)>> <<if ($week >= 120 && $attackType != "none") || ($forceMajorBattle == 1 && $foughtThisWeek == 0)>>
<<if random(1,100) >= 50 || $forceMajorBattle == 1>> <<if random(1,100) >= 50 || $forceMajorBattle == 1>>
<<set $majorBattle = 1>> <<set $majorBattle = 1>>
<<if $SF.Toggle && $SF.Active === 1>> <<if $SF.Toggle && $SF.Active >= 1>>
<<set $attackTroops = Math.trunc($attackTroops * random(4,6) * $majorBattleMult)>> <<set $attackTroops = Math.trunc($attackTroops * random(4,6) * $majorBattleMult)>>
<<set $attackEquip = either(3,4)>> <<set $attackEquip = either(3,4)>>
<<else>> <<else>>
......
src/SecExp/attackHandler.tw
+ 3
− 3
View file @ ddff01de
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
<<set _enemyMod = 1.5>> <<set _enemyMod = 1.5>>
<<set _SFMod = 1.5>> <<set _SFMod = 1.5>>
<<set _turns = $maxTurns * 2>> <<set _turns = $maxTurns * 2>>
<<if $SF.Toggle && $SF.Active === 1>> <<if $SF.Toggle && $SF.Active >= 1>>
<<if $SFUnit.Firebase >= 7>> <<if $SFUnit.Firebase >= 7>>
<<set _atkMod += ($SFUnit.Firebase - 6) * 0.05>> <<set _atkMod += ($SFUnit.Firebase - 6) * 0.05>>
<</if>> <</if>>
...@@ -961,7 +961,7 @@ ...@@ -961,7 +961,7 @@
<</if>> <</if>>
<</for>> <</for>>
<<if $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<if $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
<<set $SFatk = 0>> <<set $SFatk = 0>>
<<set $SFdef = 0>> <<set $SFdef = 0>>
<<set $SFhp = 0>> <<set $SFhp = 0>>
...@@ -1124,7 +1124,7 @@ __Army__: ...@@ -1124,7 +1124,7 @@ __Army__:
<br>militia morale modifier: <<if _militiaMod > 0>>+<</if>>_militiaMod% <br>militia morale modifier: <<if _militiaMod > 0>>+<</if>>_militiaMod%
<br>slaves morale modifier: <<if _slaveMod > 0>>+<</if>>_slaveMod% <br>slaves morale modifier: <<if _slaveMod > 0>>+<</if>>_slaveMod%
<br>mercenaries morale modifier: <<if _mercMod > 0>>+<</if>>_mercMod% <br>mercenaries morale modifier: <<if _mercMod > 0>>+<</if>>_mercMod%
<<if $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<if $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
<br>special force morale modifier: <<if _SFMod > 0>>+<</if>>_SFMod% <br>special force morale modifier: <<if _SFMod > 0>>+<</if>>_SFMod%
<</if>> <</if>>
<<if $secBarracksUpgrades.luxury >= 1>> <<if $secBarracksUpgrades.luxury >= 1>>
......
src/SecExp/attackOptions.tw
+ 2
− 2
View file @ ddff01de
...@@ -247,7 +247,7 @@ __Battle Plan__: ...@@ -247,7 +247,7 @@ __Battle Plan__:
<<replace "#leader">><strong><<print _leader>></strong><</replace>> <<replace "#leader">><strong><<print _leader>></strong><</replace>>
<</link>> <</link>>
<</if>> <</if>>
<<if $SF.Toggle && $SF.Active === 1 && $SFTradeShow.CanAttend === -1>> <<if $SF.Toggle && $SF.Active >= 1 && $SFTradeShow.CanAttend === -1>>
| |
<<link "Let The Colonel lead the troops">> <<link "Let The Colonel lead the troops">>
<<set $leadingTroops = "colonel">> <<set $leadingTroops = "colonel">>
...@@ -391,7 +391,7 @@ Units about to be deployed: ...@@ -391,7 +391,7 @@ Units about to be deployed:
<</for>> <</for>>
<</if>> <</if>>
<<if $SF.Toggle && $SF.Active === 1 && $majorBattle>> <<if $SF.Toggle && $SF.Active >= 1 && $majorBattle>>
<br> <br>
<br> <br>
The size of the incoming attack warrants the intervention of the special force in its full force. They will <span id="SFI">not intervene</span>. The size of the incoming attack warrants the intervention of the special force in its full force. They will <span id="SFI">not intervene</span>.
......
src/SecExp/attackReport.tw
+ 29
− 29
View file @ ddff01de
...@@ -787,7 +787,7 @@ ...@@ -787,7 +787,7 @@
Your reputation is so high your name carries power by itself. Having you on the battlefield puts fear even in the hardiest of warriors. Your reputation is so high your name carries power by itself. Having you on the battlefield puts fear even in the hardiest of warriors.
<</if>> <</if>>
<</if>> <</if>>
<<if $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<if $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
<<if $PC.career == "mercenary" || $PC.career == "slaver" || $PC.career == "capitalist" || $PC.career == "gang" || $PC.warfare > 75>> <<if $PC.career == "mercenary" || $PC.career == "slaver" || $PC.career == "capitalist" || $PC.career == "gang" || $PC.warfare > 75>>
The soldiers of the $SF.Lower are ready and willing to follow you into battle, confident in your past experience. The soldiers of the $SF.Lower are ready and willing to follow you into battle, confident in your past experience.
<<elseif $PC.career == "wealth" || $PC.career == "medicine" || $PC.career == "engineer">> <<elseif $PC.career == "wealth" || $PC.career == "medicine" || $PC.career == "engineer">>
...@@ -845,58 +845,58 @@ ...@@ -845,58 +845,58 @@
<<if _oldRep < 10000 && _oldAuth < 10000 || $Bodyguard.prestige < 1>> <<if _oldRep < 10000 && _oldAuth < 10000 || $Bodyguard.prestige < 1>>
<<if $deployingMilitia == 1>> <<if $deployingMilitia == 1>>
Your volunteers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a Your volunteers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a
<<if $SF.Toggle && $SF.Active === 1 && $deployingMercs == 1 && $SFIntervention>> <<if $SF.Toggle && $SF.Active >= 1 && $deployingMercs == 1 && $SFIntervention>>
commander and neither are your mercenaries or your soldiers. commander and neither are your mercenaries or your soldiers.
<<elseif $deployingMercs == 1>> <<elseif $deployingMercs == 1>>
commander and neither are your mercenaries. commander and neither are your mercenaries.
<<elseif $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<elseif $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
commander and neither are your soldiers. commander and neither are your soldiers.
<<else>> <<else>>
commander. commander.
<</if>> <</if>>
<<elseif $SF.Toggle && $SF.Active === 1 && $deployingMercs == 1 && $SFIntervention>> <<elseif $SF.Toggle && $SF.Active >= 1 && $deployingMercs == 1 && $SFIntervention>>
Your mercenaries and soldiers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander. Your mercenaries and soldiers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander.
<<elseif $deployingMercs == 1>> <<elseif $deployingMercs == 1>>
Your mercenaries <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander. Your mercenaries <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander.
<<elseif $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<elseif $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
Your soldiers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander. Your soldiers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander.
<</if>> <</if>>
<<elseif $Bodyguard.prestige >= 2>> <<elseif $Bodyguard.prestige >= 2>>
<<if $deployingMilitia == 1>> <<if $deployingMilitia == 1>>
Your Your
<<if $deployingMercs == 1 && $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<if $deployingMercs == 1 && $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
volunteers, your mercenaries and your soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave. volunteers, your mercenaries and your soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<<elseif $deployingMercs == 1>> <<elseif $deployingMercs == 1>>
volunteers and your mercenaries are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave. volunteers and your mercenaries are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<<elseif $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<elseif $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
volunteers and your soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave. volunteers and your soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<<else>> <<else>>
volunteers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave. volunteers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<</if>> <</if>>
<<elseif $deployingMercs == 1 && $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<elseif $deployingMercs == 1 && $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
Your mercenaries and soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave. Your mercenaries and soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<<elseif $deployingMercs == 1>> <<elseif $deployingMercs == 1>>
Your mercenaries are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave. Your mercenaries are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<<elseif $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<elseif $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
Your soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave. Your soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<</if>> <</if>>
<<else>> <<else>>
<<if $deployingMilitia == 1>> <<if $deployingMilitia == 1>>
Your volunteers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a Your volunteers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a
<<if $deployingMercs == 1 && $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<if $deployingMercs == 1 && $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
commander and neither are your mercenaries and soldiers, but they trust you enough not to question your decision. commander and neither are your mercenaries and soldiers, but they trust you enough not to question your decision.
<<elseif $deployingMercs == 1>> <<elseif $deployingMercs == 1>>
commander and neither are your mercenaries, but they trust you enough not to question your decision. commander and neither are your mercenaries, but they trust you enough not to question your decision.
<<elseif $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<elseif $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
commander and neither are your soldiers, but they trust you enough not to question your decision. commander and neither are your soldiers, but they trust you enough not to question your decision.
<<else>> <<else>>
commander, but they trust you enough not to question your decision. commander, but they trust you enough not to question your decision.
<</if>> <</if>>
<<elseif $deployingMercs == 1 && $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<elseif $deployingMercs == 1 && $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
Your mercenaries and soldiers <<if $deployingSlaves == 1>>however,<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision. Your mercenaries and soldiers <<if $deployingSlaves == 1>>however,<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision.
<<elseif $deployingMercs == 1>> <<elseif $deployingMercs == 1>>
Your mercenaries <<if $deployingSlaves == 1>>however,<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision. Your mercenaries <<if $deployingSlaves == 1>>however,<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision.
<<elseif $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<elseif $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
Your soldiers <<if $deployingSlaves == 1>>however,<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision. Your soldiers <<if $deployingSlaves == 1>>however,<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision.
<</if>> <</if>>
<</if>> <</if>>
...@@ -981,58 +981,58 @@ ...@@ -981,58 +981,58 @@
<<if _oldRep < 10000 && _oldAuth < 10000 || $HeadGirl.prestige < 1>> <<if _oldRep < 10000 && _oldAuth < 10000 || $HeadGirl.prestige < 1>>
<<if $deployingMilitia == 1>> <<if $deployingMilitia == 1>>
Your volunteers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a Your volunteers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a
<<if $deployingMercs == 1 && $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<if $deployingMercs == 1 && $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
commander and neither are your mercenaries or your soldiers. commander and neither are your mercenaries or your soldiers.
<<elseif $deployingMercs == 1>> <<elseif $deployingMercs == 1>>
commander and neither are your mercenaries. commander and neither are your mercenaries.
<<elseif $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<elseif $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
commander and neither are your soldiers. commander and neither are your soldiers.
<<else>> <<else>>
commander. commander.
<</if>> <</if>>
<<elseif $deployingMercs == 1 && $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<elseif $deployingMercs == 1 && $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
Your mercenaries and soldiers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander. Your mercenaries and soldiers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander.
<<elseif $deployingMercs == 1>> <<elseif $deployingMercs == 1>>
Your mercenaries <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander. Your mercenaries <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander.
<<elseif $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<elseif $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
Your soldiers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander. Your soldiers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander.
<</if>> <</if>>
<<elseif $HeadGirl.prestige >= 2>> <<elseif $HeadGirl.prestige >= 2>>
<<if $deployingMilitia == 1>> <<if $deployingMilitia == 1>>
Your Your
<<if $deployingMercs == 1 && $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<if $deployingMercs == 1 && $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
volunteers, your mercenaries and your soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave. volunteers, your mercenaries and your soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<<elseif $deployingMercs == 1>> <<elseif $deployingMercs == 1>>
volunteers and your mercenaries are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave. volunteers and your mercenaries are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<<elseif $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<elseif $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
volunteers and your soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave. volunteers and your soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<<else>> <<else>>
volunteers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave. volunteers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<</if>> <</if>>
<<elseif $deployingMercs == 1 && $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<elseif $deployingMercs == 1 && $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
Your mercenaries and soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave. Your mercenaries and soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<<elseif $deployingMercs == 1>> <<elseif $deployingMercs == 1>>
Your mercenaries are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave. Your mercenaries are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<<elseif $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<elseif $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
Your soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave. Your soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<</if>> <</if>>
<<else>> <<else>>
<<if $deployingMilitia == 1>> <<if $deployingMilitia == 1>>
Your volunteers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a Your volunteers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a
<<if $deployingMercs == 1 && $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<if $deployingMercs == 1 && $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
commander and neither are your mercenaries and soldiers, but they trust you enough not to question your decision. commander and neither are your mercenaries and soldiers, but they trust you enough not to question your decision.
<<elseif $deployingMercs == 1>> <<elseif $deployingMercs == 1>>
commander and neither are your mercenaries, but they trust you enough not to question your decision. commander and neither are your mercenaries, but they trust you enough not to question your decision.
<<elseif $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<elseif $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
commander and neither are your soldiers, but they trust you enough not to question your decision. commander and neither are your soldiers, but they trust you enough not to question your decision.
<<else>> <<else>>
commander, but they trust you enough not to question your decision. commander, but they trust you enough not to question your decision.
<</if>> <</if>>
<<elseif $deployingMercs == 1 && $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<elseif $deployingMercs == 1 && $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
Your mercenaries and soldiers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision. Your mercenaries and soldiers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision.
<<elseif $deployingMercs == 1>> <<elseif $deployingMercs == 1>>
Your mercenaries <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision. Your mercenaries <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision.
<<elseif $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<elseif $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
Your soldiers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision. Your soldiers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision.
<</if>> <</if>>
<</if>> <</if>>
...@@ -1134,9 +1134,9 @@ ...@@ -1134,9 +1134,9 @@
<<elseif $deployingMercs == 1>> <<elseif $deployingMercs == 1>>
You mercenaries are not thrilled to be lead by a civilian without any formal martial training or education. You mercenaries are not thrilled to be lead by a civilian without any formal martial training or education.
<</if>> <</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset" && $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<if $arcologies[0].FSRomanRevivalist != "unset" && $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
Since you decided to revive old Rome, many of your citizens took on themselves to educate themselves in martial matters, because of this your soldiers feel safe enough in the hands of one of your volunteers. Since you decided to revive old Rome, many of your citizens took on themselves to educate themselves in martial matters, because of this your soldiers feel safe enough in the hands of one of your volunteers.
<<elseif $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<elseif $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
You soldiers are not thrilled to be lead by a civilian without any formal martial training or education. You soldiers are not thrilled to be lead by a civilian without any formal martial training or education.
<</if>> <</if>>
<<if $leaderWounded == 1>> <<if $leaderWounded == 1>>
...@@ -1147,7 +1147,7 @@ ...@@ -1147,7 +1147,7 @@
<<if $deployingMercs == 1>> <<if $deployingMercs == 1>>
Your mercenaries of course approve of your decision. Your mercenaries of course approve of your decision.
<</if>> <</if>>
<<if $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<if $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
Your soldiers feel more confident going into battle with an experienced commander. Your soldiers feel more confident going into battle with an experienced commander.
<</if>> <</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset" && $deployingMilitia == 1>> <<if $arcologies[0].FSRomanRevivalist != "unset" && $deployingMilitia == 1>>
...@@ -1166,7 +1166,7 @@ ...@@ -1166,7 +1166,7 @@
<<if $deployingMercs == 1>> <<if $deployingMercs == 1>>
Your mercenaries approve of such decisions, as they feel more confident by having a good, experienced commander. Your mercenaries approve of such decisions, as they feel more confident by having a good, experienced commander.
<</if>> <</if>>
<<if $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<if $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
The soldiers of $SF.Lower obviously approved of your decision. The soldiers of $SF.Lower obviously approved of your decision.
<</if>> <</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset" && $deployingMilitia == 1>> <<if $arcologies[0].FSRomanRevivalist != "unset" && $deployingMilitia == 1>>
......
src/SecExp/authorityReport.tw
+ 1
− 1
View file @ ddff01de
...@@ -106,7 +106,7 @@ Your authority is ...@@ -106,7 +106,7 @@ Your authority is
<<set _authGrowth += 12 * $activeUnits>> <<set _authGrowth += 12 * $activeUnits>>
<</if>> <</if>>
<<if $SF.Toggle && $SF.Active === 1 && $SF.Units > 10>> <<if $SF.Toggle && $SF.Active >= 1 && $SF.Units > 10>>
Having a powerful special force, increases your authority. Having a powerful special force, increases your authority.
<<set _authGrowth += $SF.Units/10>> <<set _authGrowth += $SF.Units/10>>
<</if>> <</if>>
......
src/SecExp/edicts.tw
+ 1
− 1
View file @ ddff01de
...@@ -307,7 +307,7 @@ ...@@ -307,7 +307,7 @@
<</if>> <</if>>
<</if>> <</if>>
<<if $SF.Toggle && $SF.Active === 1 && $SFSupportLevel < 5>> <<if $SF.Toggle && $SF.Active >= 1 && $SFSupportLevel < 5>>
<br><br>__Special Force:__ <br><br>__Special Force:__
<<if !$SFSupportLevel && $reqHelots > 5>> <<if !$SFSupportLevel && $reqHelots > 5>>
<br>''Equipment provision:'' $SF.Caps will provide the security HQ with advanced equipment. <br>''Equipment provision:'' $SF.Caps will provide the security HQ with advanced equipment.
......
src/SecExp/rebellionHandler.tw
+ 1
− 1
View file @ ddff01de
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
<</if>> <</if>>
<</for>> <</for>>
<<if $SF.Toggle && $SF.Active === 1>> <<if $SF.Toggle && $SF.Active >= 1>>
<<set $SFatk = 0>> <<set $SFatk = 0>>
<<set $SFdef = 0>> <<set $SFdef = 0>>
<<set $SFhp = 0>> <<set $SFhp = 0>>
......
src/SecExp/rebellionOptions.tw
+ 2
− 2
View file @ ddff01de
...@@ -97,10 +97,10 @@ ...@@ -97,10 +97,10 @@
<</if>> <</if>>
<</if>> <</if>>
<</for>> <</for>>
<<if $SF.Toggle && $SF.Active === 1>>and $SF.Lower, <<print commaNum($SFUnit.Troops)>> strong<</if>> <<if $SF.Toggle && $SF.Active >= 1>>and $SF.Lower, <<print commaNum($SFUnit.Troops)>> strong<</if>>
are called to defend the arcology from this menace. are called to defend the arcology from this menace.
<<else>> <<else>>
<<if $arcologyUpgrade.drones == 1>>Your security drones<<if $SF.Toggle && $SF.Active === 1>>and $SF.Lower, <<print commaNum($SFUnit.Troops)>> strong<</if>> <</if>> <<if $arcologyUpgrade.drones == 1>>Your security drones<<if $SF.Toggle && $SF.Active >= 1>>and $SF.Lower, <<print commaNum($SFUnit.Troops)>> strong<</if>> <</if>>
are called to defend the arcology from this menace. are called to defend the arcology from this menace.
<</if>> <</if>>
<hr> <hr>
......
src/SecExp/securityReport.tw
+ 3
− 3
View file @ ddff01de
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<<set $garrison.assistantTime--, $PC.engineering += .1>> <<set $garrison.assistantTime--, $PC.engineering += .1>>
<</if>> <</if>>
<<if $SF.Toggle && $SF.Active === 1>> <<if $SF.Toggle && $SF.Active >= 1>>
<<if $SFSupportLevel >= 3>> <<if $SFSupportLevel >= 3>>
The two squads of $SF.Lower assigned to the Security HQ provide an essential help to the security department. The two squads of $SF.Lower assigned to the Security HQ provide an essential help to the security department.
<</if>> <</if>>
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
<<if $militiaFounded == 1 || $activeUnits >= 1>> <<if $militiaFounded == 1 || $activeUnits >= 1>>
<br> <br>
<strong> Military</strong>: /* militia */ <strong> Military</strong>: /* militia */
<<if $SF.Toggle && $SF.Active === 1 && $SF.Units > 10>> <<if $SF.Toggle && $SF.Active >= 1 && $SF.Units > 10>>
Having a powerful special force attracts a lot of citizens, hopeful that they may be able to fight along side it. Having a powerful special force attracts a lot of citizens, hopeful that they may be able to fight along side it.
<<set _recruits += random(0,(Math.round($SF.Units/10)))>> <<set _recruits += random(0,(Math.round($SF.Units/10)))>>
<</if>> <</if>>
...@@ -406,7 +406,7 @@ ...@@ -406,7 +406,7 @@
<<if $crime > 60>> <<if $crime > 60>>
The powerful crime organizations that nested themselves in the arcology have an unending need for cheap guns for hire, many mercenaries flock to your free city in search of employment.<<set _newMercs += random(1,2)>> The powerful crime organizations that nested themselves in the arcology have an unending need for cheap guns for hire, many mercenaries flock to your free city in search of employment.<<set _newMercs += random(1,2)>>
<</if>> <</if>>
<<if $SF.Toggle && $SF.Active === 1 && $SF.Units > 10>> <<if $SF.Toggle && $SF.Active >= 1 && $SF.Units > 10>>
Having a powerful special force attracts a lot of mercenaries, hopeful that they may be able to fight along side it. Having a powerful special force attracts a lot of mercenaries, hopeful that they may be able to fight along side it.
<<set _newMercs += random(0,Math.round($SF.Units/10))>> <<set _newMercs += random(0,Math.round($SF.Units/10))>>
<</if>> <</if>>
......
src/SecExp/seeUnit.tw
+ 5
− 5
View file @ ddff01de
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<</link>> <</link>>
Invest in the development of more refined controls for your drones to increase the maximum number of drones in the unit. Invest in the development of more refined controls for your drones to increase the maximum number of drones in the unit.
<br>//Costs <<print cashFormat(5000)>> per upgrade and each will increase the max by 10// <br>//Costs <<print cashFormat(5000)>> per upgrade and each will increase the max by 10//
<<elseif $SF.Toggle && $SF.Active === 1 && $secBots.maxTroops < 100 && $SFSupportLevel >= 1>> <<elseif $SF.Toggle && $SF.Active >= 1 && $secBots.maxTroops < 100 && $SFSupportLevel >= 1>>
<br> <br>
<<link "Refine the drone network with $SF.Lower assistance">> <<link "Refine the drone network with $SF.Lower assistance">>
<<set $secBots.maxTroops += 10>> <<set $secBots.maxTroops += 10>>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<</link>> <</link>>
Utilize the technological developments made by $SF.Lower to further improve the control matrix of the security drones. Utilize the technological developments made by $SF.Lower to further improve the control matrix of the security drones.
<br>//Costs <<print cashFormat(5000 + 10 * $secBotsUpgradeCost * $secBots.equip)>> and will increase the max by 10// <br>//Costs <<print cashFormat(5000 + 10 * $secBotsUpgradeCost * $secBots.equip)>> and will increase the max by 10//
<<elseif $SF.Toggle && $SF.Active === 1 && $SFSupportLevel < 1>> <<elseif $SF.Toggle && $SF.Active >= 1 && $SFSupportLevel < 1>>
There's little left to improve in the matrix. However support from $SF.Lower might give some more room from improvement. There's little left to improve in the matrix. However support from $SF.Lower might give some more room from improvement.
<<else>> <<else>>
There's little left to improve in the matrix. Your control systems are at top capacity and won't be able to handle a bigger drone unit. There's little left to improve in the matrix. Your control systems are at top capacity and won't be able to handle a bigger drone unit.
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
<<else>> <<else>>
<br>The unit has a medic detachment following it into battle, decreasing the number of casualties the unit suffers. <br>The unit has a medic detachment following it into battle, decreasing the number of casualties the unit suffers.
<</if>> <</if>>
<<if $SF.Toggle && $SF.Active === 1>> <<if $SF.Toggle && $SF.Active >= 1>>
<<if $militiaUnits[$targetIndex].SF == 0>> <<if $militiaUnits[$targetIndex].SF == 0>>
<br> <br>
<<link "Attach Special Force advisors">> <<link "Attach Special Force advisors">>
...@@ -318,7 +318,7 @@ ...@@ -318,7 +318,7 @@
<<else>> <<else>>
<br>The unit has a medic detachment following it into battle, decreasing the number of casualties the unit suffers. <br>The unit has a medic detachment following it into battle, decreasing the number of casualties the unit suffers.
<</if>> <</if>>
<<if $SF.Toggle && $SF.Active === 1>> <<if $SF.Toggle && $SF.Active >= 1>>
<<if $slaveUnits[$targetIndex].SF == 0>> <<if $slaveUnits[$targetIndex].SF == 0>>
<br> <br>
<<link "Attach Special Force advisors">> <<link "Attach Special Force advisors">>
...@@ -474,7 +474,7 @@ ...@@ -474,7 +474,7 @@
<<else>> <<else>>
<br>The unit has a medic detachment following it into battle, decreasing the number of casualties the unit suffers. <br>The unit has a medic detachment following it into battle, decreasing the number of casualties the unit suffers.
<</if>> <</if>>
<<if $SF.Toggle && $SF.Active === 1>> <<if $SF.Toggle && $SF.Active >= 1>>
<<if $mercUnits[$targetIndex].SF == 0>> <<if $mercUnits[$targetIndex].SF == 0>>
<br> <br>
<<link "Attach Special Force advisors">> <<link "Attach Special Force advisors">>
......
src/SecExp/tradeReport.tw
+ 1
− 1
View file @ ddff01de
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
<</if>> <</if>>
<</if>> <</if>>
<<if $SF.Toggle && $SF.Active === 1 && $SF.Units > 10>> <<if $SF.Toggle && $SF.Active >= 1 && $SF.Units > 10>>
Having a powerful special force, increases trade security. Having a powerful special force, increases trade security.
<<set _tradeChange += $SF.Units/10>> <<set _tradeChange += $SF.Units/10>>
<</if>> <</if>>
......
src/SecExp/unitsBattleReport.tw
+ 3
− 3
View file @ ddff01de
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<br> <br>
Security Drones: no casualties. Security Drones: no casualties.
<</if>> <</if>>
<<if $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<if $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
<br> <br>
<<print commaNum($SFUnit.Troops)>> soldiers from $SF.Lower joined the battle: no casualties suffered. <<print commaNum($SFUnit.Troops)>> soldiers from $SF.Lower joined the battle: no casualties suffered.
<</if>> <</if>>
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
/* if the losses are more than zero */ /* if the losses are more than zero */
/* generates a list of randomized losses, from which each unit picks one at random */ /* generates a list of randomized losses, from which each unit picks one at random */
<<set _losses = $losses>> <<set _losses = $losses>>
<<if $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<if $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
<<set $deployedUnits++>> <<set $deployedUnits++>>
<</if>> <</if>>
<<set _averageLosses = Math.trunc(_losses / $deployedUnits)>> <<set _averageLosses = Math.trunc(_losses / $deployedUnits)>>
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
<</if>> <</if>>
<br> <br>
<</if>> <</if>>
<<if $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<if $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
<br> <br>
<<set _loss = _lossesList.pluck()>> <<set _loss = _lossesList.pluck()>>
<<set _loss = Math.clamp(_loss,0,$SFUnit.Troops)>> <<set _loss = Math.clamp(_loss,0,$SFUnit.Troops)>>
......
src/SecExp/unitsRebellionReport.tw
+ 3
− 3
View file @ ddff01de
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<br> <br>
Security drones: no casualties suffered. Security drones: no casualties suffered.
<</if>> <</if>>
<<if $SF.Toggle && $SF.Active === 1>> <<if $SF.Toggle && $SF.Active >= 1>>
<br>$SF.Lower, <<print commaNum($SFUnit.Troops)>> strong, was called to join the battle: no casualties suffered. <br>$SF.Lower, <<print commaNum($SFUnit.Troops)>> strong, was called to join the battle: no casualties suffered.
<</if>> <</if>>
<<set _count = 0>> <<set _count = 0>>
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
<<elseif $losses > 0>> <<elseif $losses > 0>>
/* if the losses are more than zero */ /* if the losses are more than zero */
/* generates a list of randomized losses, from which each unit picks one at random */ /* generates a list of randomized losses, from which each unit picks one at random */
<<if $SF.Toggle && $SF.Active === 1>> <<if $SF.Toggle && $SF.Active >= 1>>
<<set $deployedUnits++>> <<set $deployedUnits++>>
<</if>> <</if>>
<<if $irregulars > 0>> <<if $irregulars > 0>>
...@@ -345,7 +345,7 @@ ...@@ -345,7 +345,7 @@
The unit has very few operatives left, it risks complete annihilation if deployed again. The unit has very few operatives left, it risks complete annihilation if deployed again.
<</if>> <</if>>
<</if>> <</if>>
<<if $SF.Toggle && $SF.Active === 1>> <<if $SF.Toggle && $SF.Active >= 1>>
<br> <br>
<br> <br>
<<set _loss = _lossesList.pluck()>> <<set _loss = _lossesList.pluck()>>
......
src/SecExp/weaponsManufacturing.tw
+ 3
− 3
View file @ ddff01de
...@@ -322,7 +322,7 @@ __Upgrades__: ...@@ -322,7 +322,7 @@ __Upgrades__:
<br>//Will take _time weeks, cost <<print cashFormat(120000*$HackingSkillMultiplier)>> and will increase the base hp and morale values of human troops.// <br>//Will take _time weeks, cost <<print cashFormat(120000*$HackingSkillMultiplier)>> and will increase the base hp and morale values of human troops.//
<</if>> <</if>>
<br> <br>
<<if $SF.Toggle && $SF.Active === 1>> <<if $SF.Toggle && $SF.Active >= 1>>
<<if !$completedUpgrades.includes(6) && $weapLab >= 2 && $SFSupportLevel >= 2 && $SFUnit.Firebase >= 7>> <<if !$completedUpgrades.includes(6) && $weapLab >= 2 && $SFSupportLevel >= 2 && $SFUnit.Firebase >= 7>>
<br> <br>
<<link "Develop combined training regimens with $SF.Lower">> <<link "Develop combined training regimens with $SF.Lower">>
...@@ -365,11 +365,11 @@ __Upgrades__: ...@@ -365,11 +365,11 @@ __Upgrades__:
<br>//Will take _time weeks, cost <<print cashFormat(1000000*$HackingSkillMultiplier)>> and will increase all base stats of human troops.// <br>//Will take _time weeks, cost <<print cashFormat(1000000*$HackingSkillMultiplier)>> and will increase all base stats of human troops.//
<</if>> <</if>>
<</if>> <</if>>
<<if $SF.Toggle && $SF.Active === 1 && ($humanUpgrade.attack >= 4 || $humanUpgrade.hp >= 4 || $humanUpgrade.morale >= 40 || $humanUpgrade.defense >= 4)>> <<if $SF.Toggle && $SF.Active >= 1 && ($humanUpgrade.attack >= 4 || $humanUpgrade.hp >= 4 || $humanUpgrade.morale >= 40 || $humanUpgrade.defense >= 4)>>
You have fully upgraded your human troops. You have fully upgraded your human troops.
<<elseif $humanUpgrade.attack >= 2 || $humanUpgrade.hp >= 2 || $humanUpgrade.morale >= 20 || $humanUpgrade.defense >= 2>> <<elseif $humanUpgrade.attack >= 2 || $humanUpgrade.hp >= 2 || $humanUpgrade.morale >= 20 || $humanUpgrade.defense >= 2>>
You have fully upgraded your human troops. You have fully upgraded your human troops.
<<if $SF.Toggle && $SF.Active === 1 && ($humanUpgrade.attack < 4 || $humanUpgrade.hp < 4 || $humanUpgrade.morale < 40 || $humanUpgrade.defense < 4) && (($SFSupportLevel >= 2 && $SFUnit.Firebase >= 7) || ($SFSupportLevel >= 4 && $SFUnit.Drugs >= 8) || ($SFSupportLevel >= 5))>> <<if $SF.Toggle && $SF.Active >= 1 && ($humanUpgrade.attack < 4 || $humanUpgrade.hp < 4 || $humanUpgrade.morale < 40 || $humanUpgrade.defense < 4) && (($SFSupportLevel >= 2 && $SFUnit.Firebase >= 7) || ($SFSupportLevel >= 4 && $SFUnit.Drugs >= 8) || ($SFSupportLevel >= 5))>>
With support from $SF.Lower, however, we may be able to further upgrade our troops. With support from $SF.Lower, however, we may be able to further upgrade our troops.
<</if>> <</if>>
<<elseif $weapLab < 3>> <<elseif $weapLab < 3>>
......
src/SecExp/widgets/battleWidgets.tw
+ 1
− 1
View file @ ddff01de
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<<set _troops += $mercUnits[_i].troops>> <<set _troops += $mercUnits[_i].troops>>
<</if>> <</if>>
<</for>> <</for>>
<<if $SF.Toggle && $SF.Active === 1 && $SFIntervention>> <<if $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
<<set _troops += $carriableSoldiers>> <<set _troops += $carriableSoldiers>>
<</if>> <</if>>
<<set $troopCount = _troops>> <<set $troopCount = _troops>>
......
src/SecExp/widgets/unitsWidgets.tw
+ 3
− 3
View file @ ddff01de
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<<if $args[0].medics == 1>> <<if $args[0].medics == 1>>
The unit has a dedicated squad of medics that will follow them in battle. The unit has a dedicated squad of medics that will follow them in battle.
<</if>> <</if>>
<<if $SF.Toggle && $SF.Active === 1 && $args[0].SF>> <<if $SF.Toggle && $SF.Active >= 1 && $args[0].SF>>
The unit has attached advisors from $SF.Lower that will help the squad remain tactically aware and active. The unit has attached advisors from $SF.Lower that will help the squad remain tactically aware and active.
<</if>> <</if>>
<<else>> <<else>>
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<<if $args[0].medics == 1>> <<if $args[0].medics == 1>>
The unit has a dedicated squad of medics that will follow them in battle. The unit has a dedicated squad of medics that will follow them in battle.
<</if>> <</if>>
<<if $SF.Toggle && $SF.Active === 1 && $args[0].SF>> <<if $SF.Toggle && $SF.Active >= 1 && $args[0].SF>>
The unit has attached advisors from $SF.Lower that will help the squad remain tactically aware and active. The unit has attached advisors from $SF.Lower that will help the squad remain tactically aware and active.
<</if>> <</if>>
<<else>> <<else>>
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<<if $args[0].medics == 1>> <<if $args[0].medics == 1>>
The unit has a dedicated squad of medics that will follow them in battle. The unit has a dedicated squad of medics that will follow them in battle.
<</if>> <</if>>
<<if $SF.Toggle && $SF.Active === 1 && $args[0].SF>> <<if $SF.Toggle && $SF.Active >= 1 && $args[0].SF>>
The unit has attached advisors from $SF.Lower that will help the squad remain tactically aware and active. The unit has attached advisors from $SF.Lower that will help the squad remain tactically aware and active.
<</if>> <</if>>
<<else>> <<else>>
......
src/uncategorized/manageArcology.tw
+ 1
− 1
View file @ ddff01de
...@@ -280,7 +280,7 @@ Your slaves have participated in approximately <<print commaNum($oralTotal+$vagi ...@@ -280,7 +280,7 @@ Your slaves have participated in approximately <<print commaNum($oralTotal+$vagi
<br><br> <br><br>
<<if !$SF.Toggle||!$SF.Active>> <<if !$SF.Toggle||!$SF.Active>>
Your army counts <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower)>> total soldiers. Your army counts <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower)>> total soldiers.
<<elseif $SF.Toggle && $SF.Active === 1>>>> <<elseif $SF.Toggle && $SF.Active >= 1>>>>
Your army counts <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower + $SFUnit.Troops)>> total soldiers of which <<print commaNum($SFUnit.Troops)>> under the special force command and the rest under your direct control. Your army counts <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower + $SFUnit.Troops)>> total soldiers of which <<print commaNum($SFUnit.Troops)>> under the special force command and the rest under your direct control.
<</if>> <</if>>
<<if $hasFoughtOnce == 1>> <<if $hasFoughtOnce == 1>>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment