From 9d4b8fac75262354e3f007d934c80d57bb1e40a5 Mon Sep 17 00:00:00 2001
From: hexall90 <hexall90@gmail.com>
Date: Tue, 17 Oct 2017 12:46:15 +0200
Subject: [PATCH] finishing up
---
TODO.txt | 2 --
src/SecExp/SecExpBackwardCompatibility.tw | 14 +++++-------
src/SecExp/renameUnits.tw | 2 --
src/SecExp/secBarracks.tw | 28 ++++++++++++-----------
src/SecExp/secInit.tw | 3 +++
5 files changed, 24 insertions(+), 25 deletions(-)
delete mode 100644 src/SecExp/renameUnits.tw
diff --git a/TODO.txt b/TODO.txt
index e081d9fe7d2..490a988449f 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,6 +1,4 @@
Base:
--min rep for upgrades
--renaming of units depending on FSs
-encyclopedia entries
Rebellions:
diff --git a/src/SecExp/SecExpBackwardCompatibility.tw b/src/SecExp/SecExpBackwardCompatibility.tw
index 962754d4e7f..18022874fa2 100644
--- a/src/SecExp/SecExpBackwardCompatibility.tw
+++ b/src/SecExp/SecExpBackwardCompatibility.tw
@@ -295,16 +295,14 @@
<<if ndef $soldierUpkeep>>
<<set $soldierUpkeep = 10>>
<</if>>
-
-/* upgrades */
-<<if ndef $riskSim>>
-<<set $riskSim = 0>>
+<<if ndef $createdSlavesUnits>>
+<<set $createdSlavesUnits = 0>>
<</if>>
-<<if ndef $riskSimExpectedAttack>>
-<<set $riskSimExpectedAttack = "none">>
+<<if ndef $createdMilitiaUnits>>
+<<set $createdMilitiaUnits = 0>>
<</if>>
-<<if ndef $perimeterDrones>>
-<<set $perimeterDrones = 0>>
+<<if ndef $createdMercUnits>>
+<<set $createdMercUnits = 0>>
<</if>>
/* battle relevant vars */
diff --git a/src/SecExp/renameUnits.tw b/src/SecExp/renameUnits.tw
deleted file mode 100644
index e5dc2d000c0..00000000000
--- a/src/SecExp/renameUnits.tw
+++ /dev/null
@@ -1,2 +0,0 @@
-:: renameUnits [nobr]
-
diff --git a/src/SecExp/secBarracks.tw b/src/SecExp/secBarracks.tw
index 0c0e0dd5a88..79c8fd3136f 100644
--- a/src/SecExp/secBarracks.tw
+++ b/src/SecExp/secBarracks.tw
@@ -108,10 +108,6 @@ __Units__
<br>
Your maximum number of units is <<print $maxUnits>>, currently you have <<print $activeUnits>>. <<if $secBarracksUpgrades.luxury > 0>>The barracks provide <<print $secBarracksUpgrades.luxury * 5>>% bonus morale in case of a battle.<</if>><<if $secBarracksUpgrades.training > 0>> The training facility will increase the effectiveness of your units with time.<</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">>
- <br>
- <<link "Rename units to comform with future societies choices">>
- /* TODO */
- <</link>>
<</if>>
<br>
@@ -154,11 +150,11 @@ You are free to organize your menial slaves into fighting units. Currently you h
<<set _sL = $slaveUnits.length>>
<<if $helots > 0 && $activeUnits < $maxUnits>>
<<link "Form a new unit">>
- <<if $slaveUnits.length == 0>>
+ <<if $createdSlavesUnits == 0>>
<<set _name = (1+$slaveUnits.length) + "st slave platoon">>
- <<elseif $slaveUnits.length == 1>>
+ <<elseif $createdSlavesUnits == 1>>
<<set _name = (1+$slaveUnits.length) + "nd slave platoon">>
- <<elseif $slaveUnits.length == 2>>
+ <<elseif $createdSlavesUnits == 2>>
<<set _name = (1+$slaveUnits.length) + "rd slave platoon">>
<<else>>
<<set _name = (1+$slaveUnits.length) + "th slave platoon">>
@@ -178,6 +174,7 @@ You are free to organize your menial slaves into fighting units. Currently you h
<<set $slaveUnits.push(_newUnit)>>
<<set $helots -= 30>>
<<set $slavesEmployedManpower += 30>>
+ <<set $createdSlavesUnits++>>
<<else>>
<<set _newUnit = {
platoonName: _name,
@@ -193,6 +190,7 @@ You are free to organize your menial slaves into fighting units. Currently you h
<<set $slaveUnits.push(_newUnit)>>
<<set $slavesEmployedManpower += _newUnit.troops>>
<<set $helots = 0>>
+ <<set $createdSlavesUnits++>>
<</if>>
<<set $activeUnits++>>
<<goto "secBarracks">>
@@ -303,11 +301,11 @@ You are free to organize your menial slaves into fighting units. Currently you h
<<set _mL = $militiaUnits.length>>
<<if $militiaFreeManpower > 0 && $activeUnits < $maxUnits>>
<<link "Form a new unit">>
- <<if $militiaUnits.length == 0>>
+ <<if $createdMilitiaUnits == 0>>
<<set _name = (1+$militiaUnits.length) + "st citizens' platoon">>
- <<elseif $militiaUnits.length == 1>>
+ <<elseif $createdMilitiaUnits == 1>>
<<set _name = (1+$militiaUnits.length) + "nd citizens' platoon">>
- <<elseif $militiaUnits.length == 2>>
+ <<elseif $createdMilitiaUnits == 2>>
<<set _name = (1+$militiaUnits.length) + "rd citizens' platoon">>
<<else>>
<<set _name = (1+$militiaUnits.length) + "th citizens' platoon">>
@@ -327,6 +325,7 @@ You are free to organize your menial slaves into fighting units. Currently you h
<<set $militiaUnits.push(_newUnit)>>
<<set $militiaFreeManpower -= 30>>
<<set $militiaEmployedManpower += 30>>
+ <<set $createdMilitiaUnits++>>
<<else>>
<<set _newUnit = {
platoonName: _name,
@@ -342,6 +341,7 @@ You are free to organize your menial slaves into fighting units. Currently you h
<<set $militiaUnits.push(_newUnit)>>
<<set $militiaEmployedManpower += _newUnit.troops>>
<<set $militiaFreeManpower = 0>>
+ <<set $createdMilitiaUnits++>>
<</if>>
<<set $activeUnits++>>
<<goto "secBarracks">>
@@ -448,11 +448,11 @@ You are free to organize your menial slaves into fighting units. Currently you h
<<set _meL = $mercUnits.length>>
<<if $mercFreeManpower > 0 && $activeUnits < $maxUnits>>
<<link "Form a new unit">>
- <<if $mercUnits.length == 0>>
+ <<if $createdMercUnits == 0>>
<<set _name = (1+$mercUnits.length) + "st mercenary platoon">>
- <<elseif $mercUnits.length == 1>>
+ <<elseif $createdMercUnits == 1>>
<<set _name = (1+$mercUnits.length) + "nd mercenary platoon">>
- <<elseif $mercUnits.length == 2>>
+ <<elseif $createdMercUnits == 2>>
<<set _name = (1+$mercUnits.length) + "rd mercenary platoon">>
<<else>>
<<set _name = (1+$mercUnits.length) + "th mercenary platoon">>
@@ -472,6 +472,7 @@ You are free to organize your menial slaves into fighting units. Currently you h
<<set $mercUnits.push(_newUnit)>>
<<set $mercFreeManpower -= 30>>
<<set $mercEmployedManpower += 30>>
+ <<set $createdMercUnits++>>
<<else>>
<<set _newUnit = {
platoonName: _name,
@@ -487,6 +488,7 @@ You are free to organize your menial slaves into fighting units. Currently you h
<<set $mercUnits.push(_newUnit)>>
<<set $mercEmployedManpower += _newUnit.troops>>
<<set $mercFreeManpower = 0>>
+ <<set $createdMercUnits++>>
<</if>>
<<set $activeUnits++>>
<<goto "secBarracks">>
diff --git a/src/SecExp/secInit.tw b/src/SecExp/secInit.tw
index 0053d967653..5b88a951ed0 100644
--- a/src/SecExp/secInit.tw
+++ b/src/SecExp/secInit.tw
@@ -114,6 +114,9 @@
<<set $slaveArmyLoyalty = 0>>
<<set $mercLoyalty = 0>>
<<set $soldierUpkeep = 10>>
+<<set $createdSlavesUnits = 0>>
+<<set $createdMilitiaUnits = 0>>
+<<set $createdMercUnits = 0>>
/* enhancements and improvements */
<<set $riskSim = 0>>
--
GitLab