From 95be91ce9c3d88ceb77cd2c7bfbd9798ceb97962 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Fri, 30 Nov 2018 22:23:36 -0500
Subject: [PATCH] Text changes, mostly
---
src/facilities/nursery/childInteract.tw | 2 +-
.../nursery/longChildDescription.tw | 58 ++++++------
src/pregmod/beastFucked.tw | 2 +-
src/uncategorized/RESS.tw | 8 +-
src/uncategorized/pit.tw | 88 ++++++++++---------
5 files changed, 83 insertions(+), 75 deletions(-)
diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw
index 04e62a95faa..f8443315ed4 100644
--- a/src/facilities/nursery/childInteract.tw
+++ b/src/facilities/nursery/childInteract.tw
@@ -1053,7 +1053,7 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1
<</if>>
<</if>>
<</if>>
-
+/*
<<if $nursery > 0>>
<<if $activeSlave.preg > 0 && $activeSlave.broodmother == 0 && $activeSlave.pregKnown == 1 && $activeSlave.eggType == "human">>
<<if $activeSlave.assignment == "work in the dairy" && $dairyPregSetting > 0>>
diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index f2a408aca9b..9f352410701 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -23,20 +23,22 @@
<<if $activeSlave.customLabel>> (@@.yellow;''<<print $activeSlave.customLabel>>''@@)<</if>>
+/*
<<if $ui == "start">>
<<elseif $saleDescription == 1>>
<<if $applyLaw == 1>>
has passed inspection to be sold in your arcology.
- <<include "Law Compliance">> /* includes CheckForGingering */
+ <<include "Law Compliance">> /* includes CheckForGingering *//*
<<else>>
is for sale and is available to inspect.
- <<if $prisonCrime>> /* reports a slave's crime in the criminal market */
+ <<if $prisonCrime>> /* reports a slave's crime in the criminal market *//*
$He $prisonCrime
<<set $prisonCrime = 0>>
<</if>>
<</if>>
<br> ''$activeSlave.slaveName''
<</if>>
+*/
is
@@ -72,7 +74,7 @@ is
<</if>>
<</if>>
-<<set $desc = SlaveTitle($activeSlave)>>
+<<set $desc = "child">>
''@@.coral;$desc.@@''
@@ -229,6 +231,7 @@ $he's
$activeSlave.actualAge years old<<if $showAgeDetail == 1 && ($seeAge != 0)>>; <<if $activeSlave.birthWeek == 51>>$his birthday is next week<<else>>$his birthday is in <<print 52-$activeSlave.birthWeek>> weeks<</if>><</if>>.
<</if>>
<</if>>
+/* TODO: do we need this check? bodyswapping won't be possible with children */
<<if $activeSlave.actualAge != $activeSlave.physicalAge>>
However, $he has the body of a <<print $activeSlave.physicalAge>>-year old;
<<if $activeSlave.physicalAge < 18 && $activeSlave.actualAge >= 18>>
@@ -248,6 +251,7 @@ $he's
/*
** NCS will not be enabled for children
*/
+/* TODO: do we need this? */
<<if $activeSlave.physicalAge != $activeSlave.visualAge>>
<<if $activeSlave.visualAge <= $activeSlave.physicalAge-20 || $activeSlave.visualAge >= $activeSlave.physicalAge+20>>
$He has undergone radical age therapy that makes $him look
@@ -404,7 +408,7 @@ $he's
$he's spent awake.
<</if>>
<</if>>
-
+/*
<<if ($activeSlave.lactation > 0) && ($activeSlave.milk < 20)>>
$He has given a small quantity of milk<<if ($activeSlave.cum > 0)>> and about <<print commaNum($activeSlave.cum)>> deciliters of cum<</if>>.
<<elseif ($activeSlave.milk > 1)>>
@@ -442,7 +446,8 @@ $he's
<</if>>
<</if>>
<</if>>
-
+*/
+/*
<<if $activeSlave.fuckdoll == 0>> /* NORMAL NON-FUCKDOLL MENTAL REPORT */
<<eyeDescription>>
@@ -839,9 +844,9 @@ $he's
<<else>>
You do not understand $his sexuality very well.
<</if>>
-
+/*
<<else>> /* FUCKDOLL MENTAL REPORT */
-
+/*
It's impossible to tell what intelligence or inclinations a fuckdoll might have by looking at it, but the most recent records indicate that this one is
<<if ($activeSlave.intelligence+$activeSlave.intelligenceImplant > 95)>>
@@.deepskyblue;brilliant@@
@@ -1016,7 +1021,7 @@ $he's
<</if>>
<</if>> /* END MENTAL REPORT */
-
+*/
<<if $saleDescription == 0>>
<<if $eventDescription == 0>>
<<if canSee($activeSlave)>>
@@ -1106,12 +1111,12 @@ $he's
<<else>>
<<if $activeSlave.relation != 0>>
- <<set _lsd = $slaveIndices[$activeSlave.relationTarget]>>
- <<if def _lsd>>
- <<if ($slaves[_lsd].ID == $activeSlave.relationshipTarget) && ($activeSlave.relationship >= 3)>>
- $He is @@.lightgreen;<<= SlaveFullName($slaves[_lsd])>>'s $activeSlave.relation, making their relationship incestuous.@@
+ <<set _lcd = $slaveIndices[$activeSlave.relationTarget]>>
+ <<if def _lcd>>
+ <<if ($slaves[_lcd].ID == $activeSlave.relationshipTarget) && ($activeSlave.relationship >= 3)>>
+ $He is @@.lightgreen;<<= SlaveFullName($slaves[_lcd])>>'s $activeSlave.relation, making their relationship incestuous.@@
<<else>>
- $He is @@.lightgreen;<<= SlaveFullName($slaves[_lsd])>>'s $activeSlave.relation.@@
+ $He is @@.lightgreen;<<= SlaveFullName($slaves[_lcd])>>'s $activeSlave.relation.@@
<</if>>
<</if>>
<</if>>
@@ -1119,31 +1124,31 @@ $he's
<</if>> /* closes extended family mode */
<<if $activeSlave.rivalry != 0>>
- <<set _lsd = $slaveIndices[$activeSlave.rivalryTarget]>>
- <<if def _lsd>>
+ <<set _lcd = $slaveIndices[$activeSlave.rivalryTarget]>>
+ <<if def _lcd>>
$He
<<if $activeSlave.rivalry <= 1>>
- @@.lightsalmon;dislikes@@ <<= SlaveFullName($slaves[_lsd])>>.
+ @@.lightsalmon;dislikes@@ <<= SlaveFullName($slaves[_lcd])>>.
<<elseif $activeSlave.rivalry <= 2>>
- is <<= SlaveFullName($slaves[_lsd])>>'s @@.lightsalmon;rival.@@
+ is <<= SlaveFullName($slaves[_lcd])>>'s @@.lightsalmon;rival.@@
<<else>>
- @@.lightsalmon;bitterly hates@@ <<= SlaveFullName($slaves[_lsd])>>.
+ @@.lightsalmon;bitterly hates@@ <<= SlaveFullName($slaves[_lcd])>>.
<</if>>
<</if>>
<</if>>
-
+/*
<<if $activeSlave.bodySwap > 0>>
<<if $activeSlave.origBodyOwner !== "">>
$He currently possesses <<print $activeSlave.origBodyOwner>>'s body.
<</if>>
<<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0 && $activeSlave.origBodyOwnerID > 0>>
- <<set _lsd = $slaveIndices[$activeSlave.origBodyOwnerID]>>
- <<if def _lsd>>
- $He is fully aware that <<= SlaveFullName($slaves[_lsd])>> is in $his old body.
+ <<set _lcd = $slaveIndices[$activeSlave.origBodyOwnerID]>>
+ <<if def _lcd>>
+ $He is fully aware that <<= SlaveFullName($slaves[_lcd])>> is in $his old body.
<</if>>
<</if>>
<</if>>
-
+*/
<br>
<<if $saleDescription == 0>>
@@ -1153,7 +1158,7 @@ $he's
<</if>>
/*TODO: This will DEFINITELY need updating - children born in your arcology do not have past experience*/
-
+/*
<<if $activeSlave.fuckdoll == 0>>
<<if $activeSlave.career != 0>>
<<if $activeSlave.career == "a slave">>
@@ -1223,6 +1228,7 @@ $he's
<</if>>
<</if>>
<</if>>
+*/
<<if $activeSlave.prestige > 0>>
<<if $activeSlave.prestigeDesc>>$activeSlave.prestigeDesc<</if>>
@@ -1618,7 +1624,7 @@ $He is
<<accentDescription>>
<</if>>
-
+/*
<<if ($activeSlave.ID == $Bodyguard.ID) && ($activeSlave.scars > 1) && ($activeSlave.scars < 6)>>
$His scars make $him look even more menacing than $he actually is.
<<elseif ($activeSlave.ID == $Bodyguard.ID) && ($activeSlave.scars == 6)>>
@@ -1626,7 +1632,7 @@ $He is
<<elseif ($activeSlave.ID == $Wardeness.ID) && ($activeSlave.scars > 1)>>
$His scars make $him look like $he's in the right place.
<</if>>
-
+*/
<<if $activeSlave.fuckdoll == 0>>
<<if $activeSlave.markings == "birthmark" && $activeSlave.prestige == 0 && $activeSlave.pornPrestige < 2>>
$He has a large, liver-colored birthmark, detracting from $his beauty.
diff --git a/src/pregmod/beastFucked.tw b/src/pregmod/beastFucked.tw
index d9e2b2b6d5a..e70e66765c3 100644
--- a/src/pregmod/beastFucked.tw
+++ b/src/pregmod/beastFucked.tw
@@ -159,7 +159,7 @@
<<if ($activeSlave.devotion <= 20)>>
and only the threat of worse punishment prevents $him from running out of the room.
<</if>>
- You have $him <<if ($activeSlave.clothing != "naked") && (_sexAct != "oral")>>take off $his clothing and <</if>><<if ($activeSlave.collar != "no collar" || $activeSlave.collar != "none")>>$his $activeSlave.collar, then <</if>><<if _sexAct == "oral">>lay <<else>>kneel <</if>>down on the floor <<if _sexAct != "oral">>with $his ass in the air<<else>>on $his back<</if>>
+ You have $him <<if ($activeSlave.clothing != "naked") && (_sexAct != "oral")>>take off $his clothing, then <</if>><<if _sexAct == "oral">>lay <<else>>kneel <</if>>down on the floor <<if _sexAct != "oral">>with $his ass in the air<<else>>on $his back<</if>>
<<else>>
and $Bodyguard.slaveName has to physically prevent $him from running out of the room<<if random(1,100) > 75>><<set $activeSlave.minorInjury = either("black eye", "split lip", "bruise")>>, resulting in a $activeSlave.minorInjury. <<else>>. <</if>>You <<if ($activeSlave.clothing != "naked")>>force $him to take off $his $activeSlave.clothing and <</if>>restrain $him on the floor <<if _sexAct != "oral">>with $his ass in the air<<else>>with a ring gag in $his mouth<</if>> -- all the while ignoring $his screams and pleas for mercy --
<</if>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index f672df29910..4a44b4418fd 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -4286,7 +4286,7 @@ $He cranes $his neck, glancing over $his shoulder to give you a pleading look.
<<case "devoted fearful slave">>
-You are working late tonight, poring over some particularly troublesome business documents, though thankfully the end appears to be in sight. The sun has all but completely slipped below the horizon, drowning your office in moody twilight. $assistantName, seeing that you are finally approaching the end of a long day, takes the liberty of having a
+You are working late tonight, poring over some particularly troublesome business documents -- though, thankfully, the end appears to be in sight. The sun has all but completely slipped below the horizon, drowning your office in moody twilight. Seeing that you are finally approaching the end of a long day, $assistantName, takes the liberty of having a
<<if $PC.refreshmentType == 0>>
$PC.refreshment
<<elseif $PC.refreshmentType == 1>>
@@ -4302,7 +4302,7 @@ You are working late tonight, poring over some particularly troublesome business
<<elseif $PC.refreshmentType == 6>>
tab of $PC.refreshment
<</if>>
-brought in to you. This time <<EventNameLink $activeSlave>> has been sent to deliver it. $He loves you, but fears you simultaneously. Such relationships were not uncommon before the advent of modern slavery, but they are especially prevalent in its wake, as fear has proven a highly effective control method for those slave owners with the inclination and relative lack of conscience to utilize it as such. You hurriedly put the finishing touches on your work, eager to be done, and then reach for your $PC.refreshment. $activeSlave.slaveName flinches at your sudden movement, taking a few frightened steps back, nearly dropping the serving tray and leaving you grasping at thin air. It was a simple fear response, $he didn't realize you were ready for your treat and instinctively thought you were reaching out to strike $him. Tears swell up in $his eyes as $he apologizes profusely.
+brought in to you. This time <<EventNameLink $activeSlave>> has been sent to deliver it. $He loves you, but fears you simultaneously. Such relationships were not uncommon before the advent of modern slavery, but they are especially prevalent in its wake, as fear has proven a highly effective control method for those slave owners with the inclination and relative lack of conscience to utilize it as such. You hurriedly put the finishing touches on your work, eager to be done, and then reach for your $PC.refreshment. $activeSlave.slaveName flinches at your sudden movement, taking a few frightened steps back, nearly dropping the serving tray and leaving you grasping at thin air. It was a simple fear response; $he didn't realize you were ready for your treat and instinctively thought you were reaching out to strike $him. Tears swell up in $his eyes as $he apologizes profusely.
<<default>>
<br>ERROR: bad RESS event $RESSevent
@@ -20530,7 +20530,7 @@ You tell her kindly that you understand, and that $he'll be trained to address t
<<link "Comfort $him">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You set the $PC.refreshment aside on your desk for now, and take $him gently by the hand. You lead $him out onto the balcony of the Penthouse over to the railing. $He obediently assumes a position for you, bracing $his arms on the railing, arching $his back and sticking $his bottom out to present $himself for use. Much to $his surprise, your hand guides $him back into a comfortable position, and simply pulls $him close into you. You explain to $him that $he is a good $girl who tries $his best, and that you don't want $him to fear you. After a little coddling, you fall silent, and simply hold $him tight, watching the street lights of $arcologies[0].name blink to life one after the other, slowly transforming the arcology into a vibrant, elegant light show. $activeSlave.slaveName can hardly believe whats happening, but eventually is able to relax fully, melting into your arms like butter into a hot pan. $He rests $his head lovingly against your chest and silently appreciates the view with you. When $he eventually departs, $he does so with @@.hotpink;tears of joy@@, @@.mediumaquamarine;rather than fear@@, welling behind $his eyes.
+ You set the $PC.refreshment aside on your desk for now, and take $him gently by the hand. You lead $him out onto the balcony of the Penthouse over to the railing. $He obediently assumes a position for you, bracing $his arms on the railing, arching $his back and sticking $his bottom out to present $himself for use. Much to $his surprise, your hand guides $him back into a comfortable position, and simply pulls $him close into you. You explain to $him that $he is a good $girl who tries $his best, and that you don't want $him to fear you. After a little coddling, you fall silent, and simply hold $him tight, watching the street lights of $arcologies[0].name blink to life one after the other, slowly transforming the arcology into a vibrant, elegant light show. $activeSlave.slaveName can hardly believe what's happening, but eventually is able to relax fully, melting into your arms like butter into a hot pan. $He rests $his head lovingly against your chest and silently appreciates the view with you. When $he eventually departs, $he does so with @@.hotpink;tears of joy,@@ @@.mediumaquamarine;rather than fear,@@ welling behind $his eyes.
<<set $activeSlave.devotion += 15>>
<<set $activeSlave.trust += 15>>
<</replace>>
@@ -20546,7 +20546,7 @@ You tell her kindly that you understand, and that $he'll be trained to address t
<br><<link "Vindicate $his fears">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You set the $PC.refreshment aside on your desk, then spin around as the slave least expects it, delivering a fierce backhand slap to $his <<if $activeSlave.face >= -10>>pretty<<else>>homely<</if>> face that nearly sends $him to the ground. You instruct $him to be more careful in future, and that you wont tolerate slaves that shy away from you for any reason, nor ones that are clumsy enough to nearly drop a serving tray while standing still. $He all but begs upon $his hands and knees for your forgiveness. You dismiss $him without further comment, and sit down to enjoy your evening refreshments. The battered, dejected slave slinks away, @@.gold;choking down tears@@. $He will be @@.hotpink;less careless@@ in future.
+ You set the $PC.refreshment aside on your desk, then spin around as the slave least expects it/*TODO: this sentence needs work*/, delivering a fierce backhand slap to $his <<if $activeSlave.face >= -10>>pretty<<else>>homely<</if>> face that nearly sends $him to the ground. You instruct $him to be more careful in future, and that you won't tolerate slaves that shy away from you for any reason, nor ones that are clumsy enough to nearly drop a serving tray while standing still. $He all but begs upon $his hands and knees for your forgiveness. You dismiss $him without further comment, and sit down to enjoy your evening refreshments. The battered, dejected slave slinks away, @@.gold;choking down tears@@. $He will be @@.hotpink;less careless@@ in future.
<<set $activeSlave.devotion += 10>>
<<set $activeSlave.trust -= 10>>
<</replace>>
diff --git a/src/uncategorized/pit.tw b/src/uncategorized/pit.tw
index efad4386b39..01a0e6051c3 100644
--- a/src/uncategorized/pit.tw
+++ b/src/uncategorized/pit.tw
@@ -106,14 +106,14 @@ $pitNameCaps is clean and ready,
<<if $pitAnimal == 1>>
<br>
<<if $pitLethal == 1>>
- <<if $pitAnimalType.type == $activeCanine.type>>
+ <<if $pitAnimalType == $activeCanine.type>>
<<if $activeCanine.species != "dog">>
Your slave will fight a ''$activeCanine.species''.
$activeCanine.speciesCap
- <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]<</if>>
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]]<</if>>
<<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
<<else>>
//Housecats are too small for your slave to fight//
<</if>>
@@ -122,34 +122,34 @@ $pitNameCaps is clean and ready,
<<if _animalEligible == 1>>
Your slave will fight a ''$activeCanine.breed''.
$activeCanine.breed
- <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]<</if>>
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]]<</if>>
<<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
<<else>>
//Housecats are too small for your slave to fight//
<</if>>
<</if>>
<<else>>
//<<print $activeCanine.breed>>s are too small for your slave to fight//
- <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]<</if>>
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]]<</if>>
<<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
<<else>>
//Housecats are too small for your slave to fight//
<</if>>
<</if>>
<</if>>
<</if>>
- <<elseif $pitAnimalType.type == $activeHooved.type>>
+ <<elseif $pitAnimalType == $activeHooved.type>>
Your slave will fight a ''$activeHooved.species''.
<<if _CL > 0>>
<<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine]] |
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = "canine"]] |
<<else>>
<<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine]] |
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = "canine"]] |
<<else>>
//<<print $activeCanine.breed>>s are too small for your slave to fight// |
<</if>>
@@ -158,12 +158,12 @@ $pitNameCaps is clean and ready,
$activeHooved.speciesCap
<<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
<<else>>
//Housecats are too small for your slave to fight//
<</if>>
<</if>>
- <<elseif $pitAnimalType.type == $activeFeline.type>>
+ <<elseif $pitAnimalType == $activeFeline.type>>
<<if $activeFeline.species != "cat">>
Your slave will fight a ''$activeFeline.species''.
<<else>>
@@ -171,16 +171,16 @@ $pitNameCaps is clean and ready,
<</if>>
<<if _CL > 0>>
<<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine]]
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = "canine"]]
<<else>>
<<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine]]
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = "canine"]]
<<else>>
//<<print $activeCanine.breed>>s are too small for your slave to fight//
<</if>>
<</if>>
<</if>>
- <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]] | <</if>>
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]] | <</if>>
<<if $activeFeline.species != "cat">>
$activeFeline.speciesCap
<<else>>
@@ -190,10 +190,10 @@ $pitNameCaps is clean and ready,
Select an animal for your slave to fight.
<<if _CL > 0>>
<<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine]]
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = "canine"]]
<<else>>
<<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine]]
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = "canine"]]
<<else>>
//<<print $activeCanine.breed>>s are too small for your slave to fight//
<</if>>
@@ -201,18 +201,20 @@ $pitNameCaps is clean and ready,
<</if>>
<<if (_CL > 0 && _HL > 0) || (_CL > 0 && _FL > 0) || (_HL > 0 && _FL > 0)>> | <</if>>
<<if _HL > 0>>
- [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]
+ [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]]
<</if>>
<<if (_HL > 0 && _FL > 0)>> | <</if>>
- <<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
- <<else>>
- //Housecats are too small for your slave to fight//
+ <<if _FL > 0>>
+ <<if $activeFeline.species != "cat">>
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
+ <<else>>
+ //Housecats are too small for your slave to fight//
+ <</if>>
<</if>>
<</if>>
<<elseif $pitLethal == 0>>
- <<if $pitAnimalType.type == $activeCanine.type>>
+ <<if $pitAnimalType == $activeCanine.type>>
<<if $activeCanine.species != "dog">>
Your slave will try to avoid being used by a ''$activeCanine.species''.
$activeCanine.speciesCap
@@ -220,42 +222,42 @@ $pitNameCaps is clean and ready,
<<if _animalEligible == 1>>
Your slave will try to avoid being used by a ''$activeCanine.breed''.
$activeCanine.breed
- <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]<</if>>
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]]<</if>>
<<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
<<else>>
//Housecats are too small to use your slave//
<</if>>
<</if>>
<<else>>
//<<print $activeCanine.breed>>s are too small to use your slave//
- <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]<</if>>
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]]<</if>>
<<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
<<else>>
//Housecats are too small to use your slave//
<</if>>
<</if>>
<</if>>
<</if>>
- <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]<</if>>
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]]<</if>>
<<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
<<else>>
//Housecats are too small to use your slave//
<</if>>
<</if>>
- <<elseif $pitAnimalType.type == $activeHooved.type>>
+ <<elseif $pitAnimalType == $activeHooved.type>>
Your slave will try to avoid being used by a ''$activeHooved.species''.
<<if _CL > 0>>
<<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine]] |
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = "canine"]] |
<<else>>
<<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine]] |
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = "canine"]] |
<<else>>
//<<print $activeCanine.breed>>s are too small for your slave to fight// |
<</if>>
@@ -264,12 +266,12 @@ $pitNameCaps is clean and ready,
$activeHooved.speciesCap
<<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
<<else>>
//Housecats are too small to use your slave//
<</if>>
<</if>>
- <<elseif $pitAnimalType.type == $activeFeline.type>>
+ <<elseif $pitAnimalType == $activeFeline.type>>
<<if $activeFeline.species != "cat">>
Your slave will try to avoid being used by a ''$activeFeline.species''.
<<else>>
@@ -277,16 +279,16 @@ $pitNameCaps is clean and ready,
<</if>>
<<if _CL > 0>>
<<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine]]
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = "canine"]]
<<else>>
<<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine]]
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = "canine"]]
<<else>>
//<<print $activeCanine.breed>>s are too small for your slave to fight//
<</if>>
<</if>>
<</if>>
- <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]] | <</if>>
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]] | <</if>>
<<if $activeFeline.species != "cat">>
$activeFeline.speciesCap
<<else>>
@@ -296,10 +298,10 @@ $pitNameCaps is clean and ready,
Select an animal for your slave to try to avoid.
<<if _CL > 0>>
<<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine]]
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = "canine"]]
<<else>>
<<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine]]
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = "canine"]]
<<else>>
//<<print $activeCanine.breed>>s are too small for your slave to fight//
<</if>>
@@ -307,12 +309,12 @@ $pitNameCaps is clean and ready,
<</if>>
<<if (_CL > 0 && _HL > 0) || (_CL > 0 && _FL > 0) || (_HL > 0 && _FL > 0)>> | <</if>>
<<if _HL > 0>>
- [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]
+ [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]]
<</if>>
<<if (_HL > 0 && _FL > 0)>> | <</if>>
- <<if $activeFeline.species != "cat">>
- <<if _FL > 0>>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
+ <<if _FL > 0>>
+ <<if $activeFeline.species != "cat">>
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
<<else>>
//Housecats are too small to use your slave//
<</if>>
--
GitLab