diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw index fa1ea2cb75d41e53694e63fd5b91c38ab5e39897..fa8f160352cdc1947a9315b08861cb499b8cedb1 100644 --- a/src/SecExp/securityReport.tw +++ b/src/SecExp/securityReport.tw @@ -14,6 +14,7 @@ <<set _crimeCap = 0>> <<set _newCrime = 0>> <<set _recruits = 0>> +<<set _recruitsMultiplier = 1>> <<set _newMercs = 0>> <<if $useTabs == 0>> <br>__Security__<</if>> @@ -286,127 +287,113 @@ <strong> Military</strong>: /* militia */ <<if $SF.Toggle && $SF.Active >= 1 && $SF.Size > 10>> 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.Size/10)))>> + <<set _recruitsMultiplier *= 1 + (random(0, (Math.round($SF.Size / 10))) / 20)>> /* not sure how high $SF.Size goes, so I hope this makes sense */ <</if>> <<if $propCampaign >= 1 && $propFocus == "recruitment">> <<if $RecuriterOffice == 0 || $Recruiter == 0>> <<if $propCampaignBoost == 1>> - <<set _recruits += 2>> + <<set _recruitsMultiplier *= 1.1>> <<else>> - <<set _recruits += 1>> + <<set _recruitsMultiplier *= 1.05>> <</if>> <<else>> <<setLocalPronouns $Recruiter>> ''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' is able to further boost your militia recruitment campaign from $his PR hub office. <<if $propCampaignBoost == 1>> - <<set _recruits += 4+Math.floor(($Recruiter.intelligence+$Recruiter.intelligenceImplant)/32)>> + <<set _recruitsMultiplier *= 1.2+Math.floor(($Recruiter.intelligence+$Recruiter.intelligenceImplant)/650)>> <<else>> - <<set _recruits += 3+Math.floor(($Recruiter.intelligence+$Recruiter.intelligenceImplant)/32)>> + <<set _recruitsMultiplier *= 1.15+Math.floor(($Recruiter.intelligence+$Recruiter.intelligenceImplant)/650)>> <</if>> <</if>> <</if>> <<if $recruitVolunteers == 1>> Your militia accepts only volunteering citizens, ready to defend their arcology. - <<set _recruits = random(1,2)>> + <<set _recruitLimit = 0.02>> <<if $rep >= 10000>> Many citizens volunteer just to fight for someone of your renown. - <<set _recruits += 1>> + <<set _recruitLimit += 0.0025>> <</if>> <<if $authority >= 10000>> Many citizens feel it is their duty to fight for you, boosting volunteer enrollment. - <<set _recruits += 1>> + <<set _recruitLimit += 0.0025>> <</if>> <<if $lowerRquirements == 1>> Your lax physical requirements to enter the militia allows for a greater number of citizens to join. - <<set _recruits += 1>> - <</if>> - <<if $militiaTotalManpower - $militiaTotalCasualties + _recruits <= 0.02 * $ACitizens>> - <<set $militiaTotalManpower += _recruits>> - <<set $militiaFreeManpower += _recruits>> - This week <<print _recruits>> citizens joined the militia. - <<else>> - There are not many more citizens willing to join the arcology armed forces. You'll need to enact higher recruitment edicts if you need more manpower. + <<set _recruitLimit += 0.0025>> <</if>> <<elseif $conscription == 1>> Adult citizens are required to join the militia for a period of time. - <<set _recruits = random(3,5)>> + <<set _recruitLimit = 0.05>> <<if $militaryExemption == 1>> Some citizens prefer to contribute to the arcology's defense through financial support rather than military service, making you @@.yellowgreen;a small sum@@. - <<set _recruits -= random(1,2)>> + <<set _recruitLimit -= 0.005>> <<run cashX(250, "securityExpansion")>> <</if>> <<if $lowerRquirements == 1>> Your lax physical requirements to enter the militia allows for a greater number of citizens to join. - <<set _recruits += 1>> + <<set _recruitLimit += 0.005>> <</if>> <<if $noSubhumansInArmy == 1>> Guaranteeing the purity of your armed forces comes with a small loss of potential recruits. - <<set _recruits -= random(0,1)>> + <<set _recruitLimit -= 0.005>> <</if>> <<if $pregExemption == 1>> Many pregnant citizens prefer to avoid military service not to endanger themselves and their children. - <<set _recruits -= 1>> - <</if>> - <<if $militiaTotalManpower - $militiaTotalCasualties + _recruits <= 0.05 * $ACitizens>> - <<set $militiaTotalManpower += _recruits>> - <<set $militiaFreeManpower += _recruits>> - This week <<print _recruits>> citizens joined the militia. - <<else>> - There are not many more citizens able to join the arcology armed forces. You'll need to enact higher recruitment edicts if you need more manpower. + <<set _recruitLimit -= 0.005>> <</if>> <<elseif $militaryService == 1>> Adult citizens are required to register and serve in the militia whenever necessary. - <<set _recruits = random(5,7)>> + <<set _recruitLimit = 0.1>> <<if $militaryExemption == 1>> Some citizens prefer to contribute to the arcology's defense through financial support rather than military service, making you @@.yellowgreen;a small sum@@. - <<set _recruits -= random(1,2)>> + <<set _recruitLimit -= 0.01>> <<run cashX(250, "securityExpansion")>> <</if>> <<if $lowerRquirements == 1>> Your lax physical requirements to enter the militia allows for a greater number of citizens to join. - <<set _recruits += 1>> + <<set _recruitLimit += 0.01>> <</if>> <<if $noSubhumansInArmy == 1>> Guaranteeing the purity of your armed forces comes with a small loss of potential recruits. - <<set _recruits -= random(0,1)>> + <<set _recruitLimit -= 0.01>> <</if>> <<if $pregExemption == 1>> Many pregnant citizens prefer to avoid military service not to endanger themselves and their children. - <<set _recruits -= 1>> - <</if>> - <<if $militiaTotalManpower - $militiaTotalCasualties + _recruits <= 0.10 * $ACitizens>> - <<set $militiaTotalManpower += _recruits>> - <<set $militiaFreeManpower += _recruits>> - This week <<print _recruits>> citizens joined the militia. - <<else>> - There are not many more citizens able to join the arcology armed forces. You'll need to enact higher recruitment edicts if you need more manpower. + <<set _recruitLimit -= 0.01>> <</if>> <<elseif $militarizedSociety == 1>> Every citizen is required to train and participate in the military activities of the arcology. - <<set _recruits = random(7,9)>> + <<set _recruitLimit = 0.2>> <<if $militaryExemption == 1>> Some citizens prefer to contribute to the arcology's defense through financial support rather than military service, making you @@.yellowgreen;a small sum@@. - <<set _recruits -= random(1,2)>> + <<set _recruitLimit -= 0.02>> <<run cashX(250, "securityExpansion")>> <</if>> <<if $lowerRquirements == 1>> Your lax physical requirements to enter the militia allows for a greater number of citizens to join. - <<set _recruits += 1>> + <<set _recruitLimit += 0.02>> <</if>> <<if $noSubhumansInArmy == 1>> Guaranteeing the purity of your armed forces comes with a small loss of potential recruits. - <<set _recruits -= random(0,1)>> + <<set _recruitLimit -= 0.02>> <</if>> <<if $pregExemption == 1>> Many pregnant citizens prefer to avoid military service not to endanger themselves and their children. - <<set _recruits -= 1>> + <<set _recruitLimit -= 0.02>> <</if>> - <<if $militiaTotalManpower - $militiaTotalCasualties + _recruits <= 0.20 * $ACitizens>> + <</if>> + <<if $militiaFounded == 1>> + <<set _recruits = Math.trunc((_recruitLimit * $ACitizens - ($militiaTotalManpower - $militiaTotalCasualties)) / 20 * _recruitsMultiplier)>> + <<if _recruits > 0>> <<set $militiaTotalManpower += _recruits>> <<set $militiaFreeManpower += _recruits>> This week <<print _recruits>> citizens joined the militia. + <<elseif $militarizedSociety == 1>> + No citizens joined your militia this week because your society is as militarized as it can get. + <<elseif $recruitVolunteers == 1>> + There are no more citizens willing to join the arcology armed forces. You'll need to enact higher recruitment edicts if you need more manpower. <<else>> - There are not many more citizens able to join the arcology armed forces. You'll need to enact higher recruitment edicts if you need more manpower. + No more citizens could be drafted into your militia. You'll need to enact higher recruitment edicts if you need more manpower. <</if>> <br> <</if>>