diff --git a/src/facilities/nursery/childrenReport.tw b/src/facilities/nursery/childrenReport.tw index 81a0926ae9911515a8279954dc2ba34781aaf400..0b9768a47eca05b5f167e554f912f99787245310 100644 --- a/src/facilities/nursery/childrenReport.tw +++ b/src/facilities/nursery/childrenReport.tw @@ -11,8 +11,8 @@ <</if>> <</if>> <<set $nurserySlaves += 1>> - <<if $cribs[_inc].growTime > 0>> - <<set $cribs[_inc].growTime -= 1>> + <<if $cribs[_nur].growTime > 0>> + <<set $cribs[_nur].growTime -= 1>> <br>@@.pink;<<print $cribs[_nur].slaveName>>@@ is growing steadily. $He <<if $cribs[_nur].growTime <= 0>>is @@.lime;ready for release.@@ $He will be ejected from $his crib upon your approach<<else>>will be ready for release in about <<print $cribs[_nur].growTime>> weeks<</if>>. <<else>> @@.pink;$cribs[_nur].slaveName@@ is @@.lime;ready for release.@@ $He will be removed from $nurseryName upon your approach. diff --git a/src/uncategorized/pit.tw b/src/uncategorized/pit.tw index 545cfec7a7711cdc58690b85e62c8197ad1328c5..7c060fe7434c98b1b4561cbdabc8ecbd72663b96 100644 --- a/src/uncategorized/pit.tw +++ b/src/uncategorized/pit.tw @@ -201,7 +201,9 @@ $pitNameCaps is clean and ready, <</if>> /* yes, this block is a mess. if you figure out a cleaner way to do it, let me know */ <<if (_FL > 0 && _HL > 0) || (_FL > 0 && _CL > 0) || (_HL > 0 && _CL > 0)>> | <</if>> - <<if _HL > 0>>[["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]<</if>> + <<if _HL > 0>> + [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]] + <</if>> <<if (_HL > 0 && _FL > 0)>> | <</if>> <<if $activeFeline.species != "cat">> [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]] diff --git a/src/uncategorized/seLethalPit.tw b/src/uncategorized/seLethalPit.tw index fa8b3ad52db9b98107f06ea55befa0f01ba54a95..3511ec0871d36a82f26c48ff8ae7d85ddb6cebfe 100644 --- a/src/uncategorized/seLethalPit.tw +++ b/src/uncategorized/seLethalPit.tw @@ -22,22 +22,16 @@ <<set _animal = $activeHooved>> <<case "feline">> <<set _animal = $activeFeline>> - <<default>> - <<set _animal = "undefined">> <</switch>> <</if>> -<<if $pitAnimal > 0 && _animal == "undefined">> /* TODO: this doesn't work */ - This week, _fighterOne.slaveName was scheduled to fight an animal to the death, but was spared because no animal has been chosen. +This week's pit fight is between _fighterOne.slaveName and <<if $pitAnimal == 0>>_fighterTwo.slaveName<<else>>a _animal.species<</if>>. +<<if $pitAudience == "none">> + You are alone above the pit, left to watch them kill and die in private. +<<elseif $pitAudience == "free">> + Your guests line the rim of the pit, joking and betting, nervous and excited by the close prospect of watching a girl die. <<else>> - This week's pit fight is between _fighterOne.slaveName and <<if $pitAnimal == 0>>_fighterTwo.slaveName<<else>>a _animal.species<</if>>. - <<if $pitAudience == "none">> - You are alone above the pit, left to watch them kill and die in private. - <<elseif $pitAudience == "free">> - Your guests line the rim of the pit, joking and betting, nervous and excited by the close prospect of watching a girl die. - <<else>> - The attendees line the rim of the pit, betting and arguing, nervous and excited by the close prospect of watching a girl die. - <</if>> + The attendees line the rim of the pit, betting and arguing, nervous and excited by the close prospect of watching a girl die. <</if>> <<if $arcologies[0].FSRomanRevivalist != "unset">> diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw index b4fa75afd318a8e14680d30102f2241c7b5fe32c..1121cf41626547e05ff5a555d4bc213131ac0edd 100644 --- a/src/uncategorized/seNonlethalPit.tw +++ b/src/uncategorized/seNonlethalPit.tw @@ -22,14 +22,12 @@ <<set _animal = $activeHooved>> <<case "feline">> <<set _animal = $activeFeline>> - <<default>> - <<set _animal = "undefined">> <</switch>> <</if>> <<if $pitAnimal == 0>> This week's pit fight is between _fighterOne.slaveName and _fighterTwo.slaveName. -<<elseif $pitAnimal == 1 && _animal != "undefined">> +<<elseif $pitAnimal == 1>> This week a _animal.species is going to use _fighterOne.slaveName. <<else>> This week, _fighterOne.slaveName was scheduled to be used by an animal, but is spared because no animal has been chosen. @@ -1006,7 +1004,7 @@ <<if $pitBG == 0 || ($Bodyguard.ID != _loser.ID)>> <<set $fighterIDs.push(_loser.ID)>> <</if>> -<<elseif _animal != "undefined">> /*if an animal is using the slave*/ +<<else>> /*if an animal is using the slave*/ <<set $activeSlave = _fighterOne>> <<if canDoVaginal($activeSlave)>>