diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw index 8c6b91457a7dcb41c3d3ae7e951a6607e599543a..1ee227fd9307670c6705d3fb456df5758c8fdf49 100644 --- a/src/SecExp/attackHandler.tw +++ b/src/SecExp/attackHandler.tw @@ -1141,7 +1141,7 @@ __Tactics__: <br> <br> __Enemy__: -<br>enemy troops: <<print $attackTroops>> +<br>enemy troops: <<print commaNum(Math.round($attackTroops))>> <br>enemy attack: <<print commaNum(Math.round(_enemyAttack))>> <br>enemy defense: <<print commaNum(Math.round(_enemyDefense))>> <br>enemy Hp: <<print commaNum(Math.round(_enemyHp))>> @@ -1162,15 +1162,15 @@ __Enemy__: /* player army attacks */ <<set _damage = Math.clamp(_attack - _enemyDefense,_attack * 0.1,_attack)>> <br> - <<if $showBattleStatistics == 1>> player damage: <<print Math.round(_damage)>><</if>> + <<if $showBattleStatistics == 1>> player damage: <<print commaNum(Math.round(_damage))>><</if>> <<set _enemyHp -= _damage>> <br> - <<if $showBattleStatistics == 1>> remaining enemy Hp: <<print Math.round(_enemyHp)>><</if>> + <<if $showBattleStatistics == 1>> remaining enemy Hp: <<print commaNum(Math.round(_enemyHp))>><</if>> <<set $enemyLosses += _damage / _enemyBaseHp>> <<set _moraleDamage = Math.clamp(_damage / 2 + _damage / _enemyBaseHp,0,_damage*1.5)>> <<set _enemyMorale -= _moraleDamage>> <br> - <<if $showBattleStatistics == 1>> remaining enemy morale: <<print Math.round(_enemyMorale)>><</if>> + <<if $showBattleStatistics == 1>> remaining enemy morale: <<print commaNum(Math.round(_enemyMorale))>><</if>> <<if _enemyHp <= 0 || _enemyMorale <= 0>> <br> <<if $showBattleStatistics == 1>> <br>Victory!<</if>> @@ -1185,10 +1185,10 @@ __Enemy__: <<set _damage = _enemyAttack * 0.1>> <</if>> <br> - <<if $showBattleStatistics == 1>> enemy damage: <<print Math.round(_damage)>><</if>> + <<if $showBattleStatistics == 1>> enemy damage: <<print commaNum(Math.round(_damage))>><</if>> <<set _hp -= _damage>> <br> - <<if $showBattleStatistics == 1>> remaining hp: <<print Math.round(_hp)>><</if>> + <<if $showBattleStatistics == 1>> remaining hp: <<print commaNum(Math.round(_hp))>><</if>> <<set $losses += _damage / _baseHp>> <<set _moraleDamage = Math.clamp(_damage / 2 + _damage / _baseHp,0,_damage*1.5)>> <<set _morale -= _moraleDamage>> @@ -1215,8 +1215,8 @@ __Enemy__: <<if $showBattleStatistics == 1>> <br> - <br>Losses: <<print Math.trunc($losses)>> - <br>Enemy losses: <<print Math.trunc($enemyLosses)>> + <br>Losses: <<print commaNum(Math.trunc($losses))>> + <br>Enemy losses: <<print commaNum(Math.trunc($enemyLosses))>> <</if>> <<if $battleResult > 3 || $battleResult < -3>> diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw index 80a784ce9c03a186b3a65f8af05dd2d055328d93..2dd15748b01f2fc1ece703c0bc1d8ce60647eb58 100644 --- a/src/SecExp/attackReport.tw +++ b/src/SecExp/attackReport.tw @@ -132,7 +132,7 @@ <<if $attackType == "raiders">> Today, the _day of _month _year, our arcology was attacked by a band of wild raiders, $attackTroops men strong. <<if $battleResult != 1 && $battleResult != 0 && $battleResult != -1>> - Our defense forces, <<print commaNum(Math.ceil($troopCount))>> strong, clashed with them + Our defense forces, <<print commaNum(Math.trunc($troopCount))>> strong, 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">> @@ -149,7 +149,7 @@ in the wastelands outside the free city territory, <</if>> <<if $enemyLosses != $attackTroops>> - inflicting <<print $enemyLosses>> casualties, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<elseif $losses > 0>> a casualty <<else>> zero <</if>> themselves. + inflicting <<print commaNum(Math.trunc($enemyLosses))>> casualties, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<elseif $losses > 0>> a casualty <<else>> zero <</if>> themselves. <<else>> completely annihilating their troops, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties. <<elseif $losses > 0>> a casualty. <<else>> zero casualties.<</if>> <</if>> diff --git a/src/SecExp/rebellionHandler.tw b/src/SecExp/rebellionHandler.tw index c388a4d38730b1206544aeaac09b58b3cb17a4aa..57ced876ffcaab068dceaa35f4f295e1585f1af8 100644 --- a/src/SecExp/rebellionHandler.tw +++ b/src/SecExp/rebellionHandler.tw @@ -331,7 +331,7 @@ __Army__: <br> <br> __Rebels__: -<br>enemy troops: <<print $attackTroops>> +<br>enemy troops: <<print commaNum(Math.round($attackTroops))>> <br>enemy attack: <<print commaNum(Math.round(_enemyAttack))>> <br>enemy defense: <<print commaNum(Math.round(_enemyDefense))>> <br>enemy Hp: <<print commaNum(Math.round(_enemyHp))>> @@ -350,15 +350,15 @@ __Rebels__: /* player army attacks */ <<set _damage = Math.clamp(_attack - _enemyDefense,_attack * 0.1,_attack)>> <br> - <<if $showBattleStatistics == 1>> player damage: <<print Math.round(_damage)>><</if>> + <<if $showBattleStatistics == 1>> player damage: <<print commaNum(Math.round(_damage))>><</if>> <<set _enemyHp -= _damage>> <br> - <<if $showBattleStatistics == 1>> remaining enemy Hp: <<print Math.round(_enemyHp)>><</if>> + <<if $showBattleStatistics == 1>> remaining enemy Hp: <<print commaNum(Math.round(_enemyHp))>><</if>> <<set $enemyLosses += _damage / _enemyBaseHp>> <<set _moraleDamage = Math.clamp(_damage/ 2 + _damage / _enemyBaseHp,0,_damage*1.5)>> <<set _enemyMorale -= _moraleDamage>> <br> - <<if $showBattleStatistics == 1>> remaining enemy morale: <<print Math.round(_enemyMorale)>><</if>> + <<if $showBattleStatistics == 1>> remaining enemy morale: <<print commaNum(Math.round(_enemyMorale))>><</if>> <<if _enemyHp <= 0 || _enemyMorale <= 0>> <<if $showBattleStatistics == 1>> <br>Victory!<</if>> <<set $battleResult = 3>> @@ -372,16 +372,16 @@ __Rebels__: <<set _damage = _enemyAttack * 0.1>> <</if>> <br> - <<if $showBattleStatistics == 1>> enemy damage: <<print Math.round(_damage)>><</if>> + <<if $showBattleStatistics == 1>> enemy damage: <<print commaNum(Math.round(_damage))>><</if>> <<if $SFGear>> <<set _S = .85>> <<else>> <<set _S = 1>> <</if>> <<set _hp -= _damage*_S>> <br> - <<if $showBattleStatistics == 1>> remaining hp: <<print Math.round(_hp)>><</if>> + <<if $showBattleStatistics == 1>> remaining hp: <<print commaNum(Math.round(_hp))>><</if>> <<set $losses += _damage / _baseHp>> <<set _moraleDamage = Math.clamp(_damage / 2 + _damage / _baseHp,0,_damage*1.5)>> <<set _morale -= _moraleDamage>> <br> - <<if $showBattleStatistics == 1>> remaining morale: <<print Math.round(_morale)>><</if>> + <<if $showBattleStatistics == 1>> remaining morale: <<print commaNum(Math.round(_morale))>><</if>> <<if _hp <= 0 || _morale <= 0>> <<if $showBattleStatistics == 1>> <br>Defeat!<</if>> <<set $battleResult = -3>> diff --git a/src/SecExp/secBarracks.tw b/src/SecExp/secBarracks.tw index 27bd2fe8036433376f83ce32035a8957dc9aefd2..85f3aafc8b503104e115e93aeeb8e63d8d92d64a 100644 --- a/src/SecExp/secBarracks.tw +++ b/src/SecExp/secBarracks.tw @@ -48,12 +48,11 @@ While this a sore sight for many citizens of $arcologies[0].name, the barracks s <br> <br> <<if $secBarracksUpgrades.size < 5>> - <<link "Increase the size of the barracks">> + <<link "Increase the size of the barracks" "secBarracks">> <<set $cash -= 5000 * ($secBarracksUpgrades.size + 1)>> <<set $secBarracksUpgrades.size += 1>> <<set $maxUnits += 2>> <<set $secBarracksUpkeep += $upgradeUpkeep>> - <<goto "secBarracks">> <</link>> <br>//Costs <<print cashFormat(5000 * ($secBarracksUpgrades.size + 1))>> and will increase the maximum number of units by 2.// <<else>> @@ -61,35 +60,31 @@ While this a sore sight for many citizens of $arcologies[0].name, the barracks s <</if>> <br> <<if $secBarracksUpgrades.luxury == 0>> - <<link "Increase the quality of life of your soldiers by installing high tech furniture and appliances.">> + <<link "Increase the quality of life of your soldiers by installing high tech furniture and appliances." "secBarracks">> <<set $secBarracksUpgrades.luxury += 1>> <<set $cash -= 5000>> <<set $secBarracksUpkeep += $upgradeUpkeep>> - <<goto "secBarracks">> <</link>> <br>//Costs <<print cashFormat(5000)>> and will provide a 5% bonus to morale.// <<elseif $secBarracksUpgrades.luxury == 1>> - <<link "Further increase the quality of life of your soldiers by installing advanced kitchen equipment and hiring skilled chefs.">> + <<link "Further increase the quality of life of your soldiers by installing advanced kitchen equipment and hiring skilled chefs." "secBarracks">> <<set $secBarracksUpgrades.luxury += 1>> <<set $cash -= 10000>> <<set $secBarracksUpkeep += $upgradeUpkeep>> - <<goto "secBarracks">> <</link>> <br>//Costs <<print cashFormat(10000)>> and will provide a 5% bonus to morale, for a total of +10%.// <<elseif $secBarracksUpgrades.luxury == 2>> - <<link "Further increase the quality of life of your soldiers by providing high speed, free access to digital media">> + <<link "Further increase the quality of life of your soldiers by providing high speed, free access to digital media" "secBarracks">> <<set $secBarracksUpgrades.luxury += 1>> <<set $cash -= 10000>> <<set $secBarracksUpkeep += $upgradeUpkeep>> - <<goto "secBarracks">> <</link>> <br>//Costs <<print cashFormat(10000)>> and will provide a 5% bonus to morale, for a total of +15%.// <<elseif $secBarracksUpgrades.luxury == 3>> - <<link "Further increase the quality of life of your soldiers by adding and staffing an exclusive brothel to the structure">> + <<link "Further increase the quality of life of your soldiers by adding and staffing an exclusive brothel to the structure" "secBarracks">> <<set $secBarracksUpgrades.luxury += 1>> <<set $cash -= 15000>> <<set $secBarracksUpkeep += $upgradeUpkeep>> - <<goto "secBarracks">> <</link>> <br>//Costs <<print cashFormat(15000)>> and will provide a 5% bonus to morale, for a total of +20%.// <<else>> @@ -97,19 +92,17 @@ While this a sore sight for many citizens of $arcologies[0].name, the barracks s <</if>> <br> <<if $secBarracksUpgrades.training == 0>> - <<link "Add a training facility to the barracks">> + <<link "Add a training facility to the barracks" "secBarracks">> <<set $secBarracksUpgrades.training += 1>> <<set $cash -= 10000>> <<set $secBarracksUpkeep += $upgradeUpkeep>> - <<goto "secBarracks">> <</link>> <br>//Costs <<print cashFormat(10000)>> and will allow units to accumulate some experience each week.// <<elseif $secBarracksUpgrades.training == 1>> - <<link "Improve the training facility with modern equipment and skilled personnel">> + <<link "Improve the training facility with modern equipment and skilled personnel" "secBarracks">> <<set $secBarracksUpgrades.training += 1>> <<set $cash -= 20000>> <<set $secBarracksUpkeep += $upgradeUpkeep>> - <<goto "secBarracks">> <</link>> <br>//Costs <<print cashFormat(20000)>> and will allow units to accumulate experience each week.// <<else>> @@ -117,19 +110,17 @@ While this a sore sight for many citizens of $arcologies[0].name, the barracks s <</if>> <br> <<if $secBarracksUpgrades.loyaltyMod == 0>> - <<link "Add an indoctrination facility to the barracks">> + <<link "Add an indoctrination facility to the barracks" "secBarracks">> <<set $secBarracksUpgrades.loyaltyMod += 1>> <<set $cash -= 10000>> <<set $secBarracksUpkeep += $upgradeUpkeep>> - <<goto "secBarracks">> <</link>> <br>//Costs <<print cashFormat(10000)>> and will slowly raise loyalty of all units// <<elseif $secBarracksUpgrades.loyaltyMod == 1>> - <<link "Improve the indoctrination facility with advanced equipment and skilled personnel">> + <<link "Improve the indoctrination facility with advanced equipment and skilled personnel" "secBarracks">> <<set $secBarracksUpgrades.loyaltyMod += 1>> <<set $cash -= 20000>> <<set $secBarracksUpkeep += $upgradeUpkeep>> - <<goto "secBarracks">> <</link>> <br>//Costs <<print cashFormat(20000)>> and will raise loyalty of all units faster.// <<else>> @@ -140,6 +131,9 @@ While this a sore sight for many citizens of $arcologies[0].name, the barracks s __Units__ <br> Your current maximum number of units is <<print $maxUnits>> (<<print commaNum($secBots.maxTroops+(50*$maxUnits))>> troops), <<print $activeUnits>> (<<print commaNum($secBots.maxTroops+($slavesEmployedManpower)+($militiaEmployedManpower)+($mercEmployedManpower))>> troops) are active and <<print (2 * $readiness)>> units can be deployed. <<if $secBarracksUpgrades.luxury > 0>>The barracks provides <<print $secBarracksUpgrades.luxury * 5>>% bonus morale when battle occurs.<</if>> <<if $secBarracksUpgrades.training > 0>>The training facility will increase the effectiveness of your units with time.<</if>> +<<if $activeUnits >= $maxUnits>> + <br>You have reached the maximum number of units. You'll have to disband one or enlarge the barracks before forming a new unit. +<</if>> <<if $arcologies[0].FSRomanRevivalist != "unset" || $arcologies[0].FSChineseRevivalist != "unset" || $arcologies[0].FSArabianRevivalist != "unset" || $arcologies[0].FSEdoRevivalist != "unset" || $arcologies[0].FSEgyptianRevivalist != "unset" || $arcologies[0].FSAztecRevivalist != "unset">> <</if>> <br> @@ -152,25 +146,22 @@ __Security Drones__ <br> <<secBotsDescription>> <br> - <<link "Review Equipment and upgrades">> + <<link "Review Equipment and upgrades" "seeUnit">> <<set $targetUnit = "secBots">> - <<goto "seeUnit">> <</link>> <<if $secBots.troops < $secBots.maxTroops>> | - <<link "Replenish the unit">> + <<link "Replenish the unit" "secBarracks">> <<set $cash -= ($secBots.maxTroops - $secBots.troops) * $secBotsCost>> <<set $secBots.troops = $secBots.maxTroops>> - <<goto "secBarracks">> <</link>> <</if>> <<else>> You have lost too many security drones to be able to field them again. - <<link "Reform the unit">> + <<link "Reform the unit" "secBarracks">> <<set $cash -= $secBots.maxTroops * $secBotsCost>> <<set $secBots.troops = $secBots.maxTroops>> <<set $secBots.active = 1>> - <<goto "secBarracks">> <</link>> <</if>> @@ -202,7 +193,7 @@ You are free to organize your menial slaves into fighting units. Currently you h <<set _sL = $slaveUnits.length>> <<if $helots > 0 && $activeUnits < $maxUnits>> <br> - <<link "Form a new unit">> + <<link "Form a new unit" "secBarracks">> <<if $createdSlavesUnits == 0>> <<set _name = (1+$createdSlavesUnits) + "st slave platoon">> <<elseif $createdSlavesUnits == 1>> @@ -256,12 +247,7 @@ You are free to organize your menial slaves into fighting units. Currently you h <<set $createdSlavesUnits++>> <</if>> <<set $activeUnits++>> - <<goto "secBarracks">> <</link>> -<<elseif $helots > 0>> - You have reached the maximum number of units. You'll have to disband one or enlarge the barracks before forming a new unit. -<<elseif $activeUnits < $maxUnits>> - You don't have any free menial slave with which to form a new unit. <</if>> <<for _i = 0; _i < _sL; _i++>> <<capture _i>> @@ -270,22 +256,20 @@ You are free to organize your menial slaves into fighting units. Currently you h <br> <<slaveUnitsDescription $slaveUnits[_i]>> <br> - <<link "Disband the unit">> + <<link "Disband the unit" "secBarracks">> <<set $helots += $slaveUnits[_i].troops>> <<set $slavesEmployedManpower -= $slaveUnits[_i].troops>> <<set $slaveUnits.deleteAt(_i)>> <<set $activeUnits-->> - <<goto "secBarracks">> <</link>> | - <<link "Review Equipment and upgrades">> + <<link "Review Equipment and upgrades" "seeUnit">> <<set $targetUnit = "slaveUnits">> <<set $targetIndex = _i>> - <<goto "seeUnit">> <</link>> | <<if $slaveUnits[_i].troops < $slaveUnits[_i].maxTroops && $helots > 0>> - <<link "Replenish unit">> + <<link "Replenish unit" "secBarracks">> <<if $helots >= $slaveUnits[_i].maxTroops - $slaveUnits[_i].troops>> <<set $helots -= $slaveUnits[_i].maxTroops - $slaveUnits[_i].troops>> <<set $slavesEmployedManpower += $slaveUnits[_i].maxTroops - $slaveUnits[_i].troops>> @@ -299,7 +283,6 @@ You are free to organize your menial slaves into fighting units. Currently you h <<set $slaveUnits[_i].troops += $helots>> <<set $helots = 0>> <</if>> - <<goto "secBarracks">> <</link>> <</if>> @@ -308,7 +291,7 @@ You are free to organize your menial slaves into fighting units. Currently you h <br> $slaveUnits[_i].platoonName lost too many operatives to be considered active. <br> - <<link "Disband the unit">> + <<link "Disband the unit" "secBarracks">> <<set _elimUnit = $slaveUnits[_i]>> <<set _newSlaveUnits = []>> <<for _y = 0; _y < _sL; _y++>> @@ -318,11 +301,10 @@ You are free to organize your menial slaves into fighting units. Currently you h <</for>> <<set $slaveUnits = _newSlaveUnits>> <<set $activeUnits-->> - <<goto "secBarracks">> <</link>> | <<if $helots > 0>> - <<link "Reform the unit">> + <<link "Reform the unit" "secBarracks">> <<if $helots >= $slaveUnits[_i].maxTroops>> <<set $slavesEmployedManpower += $slaveUnits[_i].maxTroops>> <<set $helots -= $slaveUnits[_i].maxTroops>> @@ -335,7 +317,6 @@ You are free to organize your menial slaves into fighting units. Currently you h <<set $slaveUnits[_i].training = 0>> <</if>> <<set $slaveUnits[_i].active = 1>> - <<goto "secBarracks">> <</link>> <</if>> <</if>> @@ -360,7 +341,7 @@ __Militia__ <<set _mL = $militiaUnits.length>> <<if $militiaFreeManpower > 0 && $activeUnits < $maxUnits>> <br> - <<link "Form a new unit">> + <<link "Form a new unit" "secBarracks">> <<if $createdMilitiaUnits == 0>> <<set _name = (1+$createdMilitiaUnits) + "st citizens' platoon">> <<elseif $createdMilitiaUnits == 1>> @@ -414,12 +395,7 @@ __Militia__ <<set $createdMilitiaUnits++>> <</if>> <<set $activeUnits++>> - <<goto "secBarracks">> <</link>> - <<elseif $militiaFreeManpower > 0>> - You have reached the maximum number of units. You'll have to disband one or enlarge the barracks before forming a new unit. - <<elseif $activeUnits < $maxUnits>> - You don't have any free recruits with which to form a new unit. <</if>> <<for _i = 0; _i < _mL; _i++>> <<capture _i>> @@ -428,22 +404,20 @@ __Militia__ <br> <<militiaUnitsDescription $militiaUnits[_i]>> <br> - <<link "Disband the unit">> + <<link "Disband the unit" "secBarracks">> <<set $militiaFreeManpower += $militiaUnits[_i].troops>> <<set $militiaEmployedManpower -= $militiaUnits[_i].troops>> <<set $militiaUnits.deleteAt(_i)>> <<set $activeUnits-->> - <<goto "secBarracks">> <</link>> | - <<link "Review Equipment and upgrades">> + <<link "Review Equipment and upgrades" "seeUnit">> <<set $targetUnit = "militiaUnits">> <<set $targetIndex = _i>> - <<goto "seeUnit">> <</link>> | <<if $militiaUnits[_i].troops < $militiaUnits[_i].maxTroops && $militiaFreeManpower > 0>> - <<link "Replenish unit">> + <<link "Replenish unit" "secBarracks">> <<if $militiaFreeManpower >= $militiaUnits[_i].maxTroops - $militiaUnits[_i].troops>> <<set $militiaFreeManpower -= $militiaUnits[_i].maxTroops - $militiaUnits[_i].troops>> <<set $militiaEmployedManpower += $militiaUnits[_i].maxTroops - $militiaUnits[_i].troops>> @@ -457,7 +431,6 @@ __Militia__ <<set $militiaUnits[_i].troops += $militiaFreeManpower>> <<set $militiaFreeManpower = 0>> <</if>> - <<goto "secBarracks">> <</link>> <</if>> <<else>> @@ -465,7 +438,7 @@ __Militia__ <br> $militiaUnits[_i].platoonName lost too many operatives to be considered active. <br> - <<link "Disband the unit">> + <<link "Disband the unit" "secBarracks">> <<set $militiaFreeManpower += $militiaUnits[_i].troops>> <<set $militiaEmployedManpower -= $militiaUnits[_i].troops>> <<set _elimUnit = $militiaUnits[_i]>> @@ -477,11 +450,10 @@ __Militia__ <</for>> <<set $militiaUnits = _newMilitiaUnits>> <<set $activeUnits-->> - <<goto "secBarracks">> <</link>> | <<if $militiaFreeManpower > 0>> - <<link "Reform the unit">> + <<link "Reform the unit" "secBarracks">> <<if $militiaFreeManpower >= $militiaUnits[_i].maxTroops>> <<set $militiaEmployedManpower += $militiaUnits[_i].maxTroops>> <<set $militiaFreeManpower -= $militiaUnits[_i].maxTroops>> @@ -494,7 +466,6 @@ __Militia__ <<set $militiaUnits[_i].training = 0>> <</if>> <<set $militiaUnits[_i].active = 1>> - <<goto "secBarracks">> <</link>> <</if>> <</if>> @@ -518,7 +489,7 @@ __Mercenaries__ <<set _meL = $mercUnits.length>> <<if $mercFreeManpower > 0 && $activeUnits < $maxUnits>> <br> - <<link "Form a new unit">> + <<link "Form a new unit" "secBarracks">> <<if $createdMercUnits == 0>> <<set _name = (1+$createdMercUnits) + "st mercenary platoon">> <<elseif $createdMercUnits == 1>> @@ -572,12 +543,7 @@ __Mercenaries__ <<set $createdMercUnits++>> <</if>> <<set $activeUnits++>> - <<goto "secBarracks">> <</link>> - <<elseif $mercFreeManpower > 0>> - You have reached the maximum number of units. You'll have to disband one or enlarge the barracks before forming a new unit. - <<elseif $activeUnits < $maxUnits>> - You don't have any free mercenaries with which to form a new unit. <</if>> <<for _i = 0; _i < _meL; _i++>> <<capture _i>> @@ -586,22 +552,20 @@ __Mercenaries__ <br> <<mercUnitsDescription $mercUnits[_i]>> <br> - <<link "Disband the unit">> + <<link "Disband the unit" "secBarracks">> <<set $mercFreeManpower += $mercUnits[_i].troops>> <<set $mercEmployedManpower -= $mercUnits[_i].troops>> <<set $mercUnits.deleteAt(_i)>> <<set $activeUnits-->> - <<goto "secBarracks">> <</link>> | - <<link "Review Equipment and upgrades">> + <<link "Review Equipment and upgrades" "seeUnit">> <<set $targetUnit = "mercUnits">> <<set $targetIndex = _i>> - <<goto "seeUnit">> <</link>> | <<if $mercUnits[_i].troops < $mercUnits[_i].maxTroops && $mercFreeManpower > 0>> - <<link "Replenish unit">> + <<link "Replenish unit" "secBarracks">> <<if $mercFreeManpower >= $mercUnits[_i].maxTroops - $mercUnits[_i].troops>> <<set $mercFreeManpower -= $mercUnits[_i].maxTroops - $mercUnits[_i].troops>> <<set $mercEmployedManpower += $mercUnits[_i].maxTroops - $mercUnits[_i].troops>> @@ -615,7 +579,6 @@ __Mercenaries__ <<set $mercUnits[_i].troops += $mercFreeManpower>> <<set $mercFreeManpower = 0>> <</if>> - <<goto "secBarracks">> <</link>> <</if>> @@ -624,7 +587,7 @@ __Mercenaries__ <br> $mercUnits[_i].platoonName lost too many operatives to be considered active. <br> - <<link "Disband the unit">> + <<link "Disband the unit" "secBarracks">> <<set _elimUnit = $mercUnits[_i]>> <<set _newMercUnits = []>> <<for _y = 0; _y < _sL; _y++>> @@ -634,11 +597,10 @@ __Mercenaries__ <</for>> <<set $mercUnits = _newMercUnits>> <<set $activeUnits-->> - <<goto "secBarracks">> <</link>> | <<if $mercFreeManpower > 0>> - <<link "Reform the unit">> + <<link "Reform the unit" "secBarracks">> <<if $mercFreeManpower >= $mercUnits[_i].maxTroops>> <<set $mercEmployedManpower += $mercUnits[_i].maxTroops>> <<set $mercFreeManpower -= $mercUnits[_i].maxTroops>> @@ -651,7 +613,6 @@ __Mercenaries__ <<set $mercUnits[_i].training = 0>> <</if>> <<set $mercUnits[_i].active = 1>> - <<goto "secBarracks">> <</link>> <</if>> <</if>>