From 6589c2c131d0f9c6a327dfc5d4e8ab02b6bb5d4e Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Tue, 12 Mar 2019 18:29:14 -0400 Subject: [PATCH] Fixed mismatched sexEx militia recruiting (I hope) --- src/SecExp/SecExpBackwardCompatibility.tw | 6 +++--- src/SecExp/secBarracks.tw | 8 +++++--- src/SecExp/secInit.tw | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/SecExp/SecExpBackwardCompatibility.tw b/src/SecExp/SecExpBackwardCompatibility.tw index 3ec837428ca..1708368a8f1 100644 --- a/src/SecExp/SecExpBackwardCompatibility.tw +++ b/src/SecExp/SecExpBackwardCompatibility.tw @@ -166,6 +166,9 @@ <<if ndef $recruitVolunteers>> <<set $recruitVolunteers = 0>> <</if>> +<<if ndef $conscription>> + <<set $conscription = 0>> +<</if>> <<if ndef $militaryService>> <<set $militaryService = 0>> <</if>> @@ -652,9 +655,6 @@ <<if ndef $militiaFounded>> <<set $militiaFounded = 0>> <</if>> -<<if ndef $militiaRecruitment>> - <<set $militiaRecruitment = 0>> -<</if>> <<if ndef $militiaTotalManpower>> <<set $militiaTotalManpower = 0>> <</if>> diff --git a/src/SecExp/secBarracks.tw b/src/SecExp/secBarracks.tw index 05ece2be7e1..e6d51d05669 100644 --- a/src/SecExp/secBarracks.tw +++ b/src/SecExp/secBarracks.tw @@ -295,12 +295,14 @@ You are free to organize your menial slaves into fighting units. Currently you h __Militia__ <br>/* militia */ You founded the $arcologies[0].name free militia. You are now able to organize your citizens in fighting units. - <<if $militiaRecruitment == 0>> + <<if $recruitVolunteers == 1>> The militia is composed entirely of volunteers, your manpower is approximately 1.5% of the citizens population of your arcology. - <<elseif $militiaRecruitment == 1>> + <<elseif $conscription == 1>> With the establishment of conscription, your available manpower has increased to now approximately 3% of the arcology's citizens population. - <<elseif $militiaRecruitment == 2>> + <<elseif $militaryService == 1>> By establishing obligatory military service to obtain citizenship you have enlarged your manpower pool to be approximately 5% of the arcology's citizens population. + <<elseif $militarizedSociety == 1>> + With the adoption of a militarized society, your available manpower has swelled to be approximately 15% of the arcology's citizens population. <</if>> Your current total manpower is <<print commaNum($militiaTotalManpower)>>, of which <<print commaNum($militiaEmployedManpower)>> is in active duty. You lost in total <<print commaNum($militiaTotalCasualties)>> citizens, leaving you with <<print commaNum($militiaFreeManpower)>> available citizens. <br> diff --git a/src/SecExp/secInit.tw b/src/SecExp/secInit.tw index 4d9d98f715e..a0a61843951 100644 --- a/src/SecExp/secInit.tw +++ b/src/SecExp/secInit.tw @@ -58,6 +58,7 @@ <<set $discountMercenaries = 0>> <<set $militiaFounded = 0>> <<set $recruitVolunteers = 0>> +<<set $conscription = 0>> <<set $militaryService = 0>> <<set $militarizedSociety = 0>> <<set $militaryExemption = 0>> -- GitLab