From 59fa8a5d343c8240b4250b6f49e077ad1ad6693f Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Thu, 28 Dec 2017 18:29:48 -0500 Subject: [PATCH] fixes --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 4 ++++ src/SecExp/secBarracks.tw | 6 +++--- src/uncategorized/reputation.tw | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 575a15d1a40..d590b25acc5 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,6 +4,10 @@ 12/28/17 + 239 + -fixed reputation bug + -fixed secBarracks bugs + 238 -fixed slave summary bug diff --git a/src/SecExp/secBarracks.tw b/src/SecExp/secBarracks.tw index 91ffe646371..4dd1e5159da 100644 --- a/src/SecExp/secBarracks.tw +++ b/src/SecExp/secBarracks.tw @@ -177,7 +177,7 @@ __Security Drones__ __Slaves__ <br>/* slaves */ -You are free to organize your menial slaves into fighting units. Currently you have <<print <<print commaNum($helots)>> slaves available, while <<print <<print commaNum($slavesEmployedManpower)>> are already employed as soldiers. During all your battles you lost a total of <<print <<print commaNum($slavesTotalCasualties)>>. +You are free to organize your menial slaves into fighting units. Currently you have <<print commaNum($helots)>> slaves available, while <<print commaNum($slavesEmployedManpower)>> are already employed as soldiers. During all your battles you lost a total of <<print commaNum($slavesTotalCasualties)>>. <<set _menialPrice = Math.trunc(($slaveCostFactor*1000)/100)*100>> <<set _menialPrice = Math.clamp(_menialPrice, 500, 1500)>> <<silently>><<MenialPopCap>><</silently>> @@ -358,7 +358,7 @@ __Militia__ <<elseif $militiaRecruitment == 2>> By establishing obligatory military service to obtain citizenship you have enlarged your manpower pool to be approximately 5% of the arcology's citizens population. <</if>> - Your current total manpower is <<print <<print commaNum($militiaTotalManpower)>>, of which <<print commaNum($militiaEmployedManpower)>> is in active duty. You lost in total <<print <<print commaNum($militiaTotalCasualties)>> citizens, leaving you with <<print <<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> <<set _mL = $militiaUnits.length>> <<if $militiaFreeManpower > 0 && $activeUnits < $maxUnits>> @@ -523,7 +523,7 @@ __Militia__ __Mercenaries__ <br>/* mercenaries */ With the installation of a mercenary company in the arcology, many other are attracted to your free city, hoping to land a contract with you. - You are able to organize them in units to use in the defense of the arcology. Excluding the defense force you set up, there are <<print <<print commaNum($mercTotalManpower)>> mercenaries in your arcology, of which <<print <<print commaNum($mercEmployedManpower)>> actively employed and <<print $mercFreeManpower>> not yet under contract. In total <<print <<print commaNum($mercTotalCasualties)>> mercenaries have died defending your arcology. + You are able to organize them in units to use in the defense of the arcology. Excluding the defense force you set up, there are <<print commaNum($mercTotalManpower)>> mercenaries in your arcology, of which <<print commaNum($mercEmployedManpower)>> actively employed and <<print $mercFreeManpower>> not yet under contract. In total <<print commaNum($mercTotalCasualties)>> mercenaries have died defending your arcology. <br> <<set _meL = $mercUnits.length>> <<if $mercFreeManpower > 0 && $activeUnits < $maxUnits>> diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw index 6947164c1ea..63696fee65d 100644 --- a/src/uncategorized/reputation.tw +++ b/src/uncategorized/reputation.tw @@ -586,7 +586,7 @@ On formal occasions, you are announced as $PCTitle. The public @@.red;disapproves@@ of the way you're providing for $citizenOrphanageTotal of your slaves' children to be raised as citizens. <<set _care = -$citizenOrphanageTotal>> <<FSChange "Degradationist" _care>> - <<if <<print commaNum($privateOrphanageTotal)>> > 0>>Fortunately your raising slaves' children privately is not publicly known.<</if>> + <<if $privateOrphanageTotal > 0>>Fortunately your raising slaves' children privately is not publicly known.<</if>> <</if>> <<elseif $privateOrphanageTotal > 0>> <<if $arcologies[0].FSPaternalist != "unset">> -- GitLab