From 65e2ba1d76811e86312e9ca22cd1720d2dbe3cc3 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Sat, 21 Apr 2018 22:18:14 -0400 Subject: [PATCH] fixes --- src/SecExp/attackReport.tw | 2 +- src/pregmod/widgets/slaveSummaryWidgets.tw | 18 +++++++++--------- src/uncategorized/arcmgmt.tw | 2 +- src/utility/descriptionWidgetsFlesh.tw | 2 ++ 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw index 7b020a39e32..32595fd62bb 100644 --- a/src/SecExp/attackReport.tw +++ b/src/SecExp/attackReport.tw @@ -1520,7 +1520,7 @@ /* resets variables */ <<set $leaderWounded = 0>> <<set $gainedWarfare = 0>> -<<set $slaveIncreasedPrestige = 1>> +<<set $slaveIncreasedPrestige = 0>> <<set $woundType = 0>> <<set $tacticsSuccessful = 0>> <<set $attackType = "none">> diff --git a/src/pregmod/widgets/slaveSummaryWidgets.tw b/src/pregmod/widgets/slaveSummaryWidgets.tw index 8f5b19cd9d6..698c06b2a4f 100644 --- a/src/pregmod/widgets/slaveSummaryWidgets.tw +++ b/src/pregmod/widgets/slaveSummaryWidgets.tw @@ -1448,35 +1448,35 @@ Release rules: _Slave.releaseRules. @@.red; <<if _Slave.hips < -1>> <<if _Slave.butt > 2 && ($arcologies[0].FSTransformationFetishist < 20 || $arcologies[0].FSTransformationFetishist == "unset") && ($arcologies[0].FSHedonisticDecadence < 20 || $arcologies[0].FSHedonisticDecadence == "unset")>> - Disp + Disp+ <</if>> <<elseif _Slave.hips < 0>> <<if _Slave.butt > 4 && ($arcologies[0].FSTransformationFetishist < 20 || $arcologies[0].FSTransformationFetishist == "unset") && ($arcologies[0].FSHedonisticDecadence < 20 || $arcologies[0].FSHedonisticDecadence == "unset")>> - Disp + Disp+ <</if>> <<elseif _Slave.hips > 2>> <<if _Slave.butt <= 8>> - Disp + Disp- <</if>> <<elseif _Slave.hips > 1>> <<if _Slave.butt <= 3 && ($arcologies[0].FSSlimnessEnthusiast == "unset" || (_Slave.boobs >= 500))>> - Disp + Disp- <</if>> <<elseif _Slave.hips > 0>> <<if _Slave.butt > 8>> <<if ($arcologies[0].FSTransformationFetishist < 20 || $arcologies[0].FSTransformationFetishist == "unset") && ($arcologies[0].FSHedonisticDecadence < 20 || $arcologies[0].FSHedonisticDecadence == "unset")>> - Disp + Disp+ <</if>> <<elseif _Slave.butt <= 2 && ($arcologies[0].FSSlimnessEnthusiast == "unset" || (_Slave.boobs >= 500))>> - Disp + Disp- <</if>> <<else>> <<if _Slave.butt > 6>> <<if ($arcologies[0].FSTransformationFetishist < 20 || $arcologies[0].FSTransformationFetishist == "unset") && ($arcologies[0].FSHedonisticDecadence < 20 || $arcologies[0].FSHedonisticDecadence == "unset")>> - Disp + Disp+ <</if>> <<elseif _Slave.butt <= 1 && ($arcologies[0].FSSlimnessEnthusiast == "unset" || (_Slave.boobs >= 500))>> - Disp + Disp- <</if>> <</if>> @@ @@ -1534,7 +1534,7 @@ Release rules: _Slave.releaseRules. Underage. <</if>> <<if _Slave.actualAge != _Slave.physicalAge>> - _Slave.visualAge year old body. + _Slave.physicalAge year old body. <</if>> <<if _Slave.visualAge != _Slave.physicalAge>> Looks _Slave.visualAge. diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw index ef5682ab17a..f8fd3be4f45 100644 --- a/src/uncategorized/arcmgmt.tw +++ b/src/uncategorized/arcmgmt.tw @@ -51,7 +51,7 @@ <</if>> <<set $oldFlux = _flux>> <<set $ACitizens -= _flux, $ASlaves += _flux>> -This week, <<if _flux > 0>>few to none<<else>>many<</if>> of $arcologies[0].name's citizens fell into slavery. +This week, <<if _flux >= 20>>many<<elseif _flux >= 5>>some<<else>>few to none<</if>> of $arcologies[0].name's citizens fell into slavery. <<if $ACitizens < $ACitizenLimit>> <<if $AntiImmigrationCash == 1>> diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index f9a25a4c6d8..02c60d48660 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -3503,6 +3503,8 @@ $pronounCap's got a $possessiveCap <<if $activeSlave.genes == "XX">> beautifully natural + <<elseif $activeSlave.ovaries == 1>> + finely crafted <<else>> artificial <</if>> -- GitLab