Skip to content
Snippets Groups Projects
Commit 6589c2c1 authored by Pregmodder's avatar Pregmodder
Browse files

Fixed mismatched sexEx militia recruiting (I hope)

parent f89baef6
No related branches found
No related tags found
No related merge requests found
...@@ -166,6 +166,9 @@ ...@@ -166,6 +166,9 @@
<<if ndef $recruitVolunteers>> <<if ndef $recruitVolunteers>>
<<set $recruitVolunteers = 0>> <<set $recruitVolunteers = 0>>
<</if>> <</if>>
<<if ndef $conscription>>
<<set $conscription = 0>>
<</if>>
<<if ndef $militaryService>> <<if ndef $militaryService>>
<<set $militaryService = 0>> <<set $militaryService = 0>>
<</if>> <</if>>
...@@ -652,9 +655,6 @@ ...@@ -652,9 +655,6 @@
<<if ndef $militiaFounded>> <<if ndef $militiaFounded>>
<<set $militiaFounded = 0>> <<set $militiaFounded = 0>>
<</if>> <</if>>
<<if ndef $militiaRecruitment>>
<<set $militiaRecruitment = 0>>
<</if>>
<<if ndef $militiaTotalManpower>> <<if ndef $militiaTotalManpower>>
<<set $militiaTotalManpower = 0>> <<set $militiaTotalManpower = 0>>
<</if>> <</if>>
......
...@@ -295,12 +295,14 @@ You are free to organize your menial slaves into fighting units. Currently you h ...@@ -295,12 +295,14 @@ You are free to organize your menial slaves into fighting units. Currently you h
__Militia__ __Militia__
<br>/* militia */ <br>/* militia */
You founded the $arcologies[0].name free militia. You are now able to organize your citizens in fighting units. 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. 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. 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. 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>> <</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. 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> <br>
......
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
<<set $discountMercenaries = 0>> <<set $discountMercenaries = 0>>
<<set $militiaFounded = 0>> <<set $militiaFounded = 0>>
<<set $recruitVolunteers = 0>> <<set $recruitVolunteers = 0>>
<<set $conscription = 0>>
<<set $militaryService = 0>> <<set $militaryService = 0>>
<<set $militarizedSociety = 0>> <<set $militarizedSociety = 0>>
<<set $militaryExemption = 0>> <<set $militaryExemption = 0>>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment