diff --git a/src/pregmod/forceFeeding.tw b/src/pregmod/forceFeeding.tw index 492ccd4ef021362988ea8c1d5723f5858898f13c..9e4424ad422c7fbaa8d95dcfea011ec7767927f1 100644 --- a/src/pregmod/forceFeeding.tw +++ b/src/pregmod/forceFeeding.tw @@ -76,7 +76,7 @@ $He is going to eat it all and you're going to enjoy $him as $he does it. <<else>> $He devotedly <<if canSee($activeSlave)>>looks<<else>>smiles<</if>> - at you heft as you $him onto your lap, wrapping your arm + at you as you heft $him onto your lap, wrapping your arm <</if>> <<else>> You inform $him $he'll be taking a seat on your lap and opening wide for $his meal. diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw index 1e782c60a067075bddc00ffd2bbd1eb1a8a94f91..ea9eb4f096225acec2f9747c2cd43f3333de42ed 100644 --- a/src/uncategorized/storyCaption.tw +++ b/src/uncategorized/storyCaption.tw @@ -57,7 +57,7 @@ <br><br> <<if $nextButton == "END WEEK">> <span id="endWeekButton"><strong><<link [[($nextButton)|($nextLink)]]>> - <<resetAssignmentFilter>> /* very important! */ + <<resetAssignmentFilter>> /* very important! */ <</link>></strong></span> @@.cyan;[Ent]@@ <<if $rulesError && $rulesAssistantAuto == 1>><br>@@.yellow; WARNING: some custom rules will change slave variables@@<</if>> <<else>> @@ -75,53 +75,53 @@ <<if $newModelUI == 0>> <<if _Pass == "Main">> <span id="manageArcology"> - <<link "Manage Arcology">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Arcology">><</link>> - </span> @@.cyan;[C]@@ + <<link "Manage Arcology">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Arcology">><</link>> + </span> @@.cyan;[C]@@ <</if>> <br> <</if>> <<set $cash = Math.trunc($cash)>> <span id="cash"> -<<if $cash > 0>> - @@.yellowgreen;Cash@@ -<<else>> - __@@.red;Cash@@__ -<</if>> -| <<print cashFormat($cash)>> + <<if $cash > 0>> + @@.yellowgreen;Cash@@ + <<else>> + __@@.red;Cash@@__ + <</if>> + | <<print cashFormat($cash)>> </span> <br> <<if _Pass == "Main">> <<set _TCash2 = ($cash-$cashLastWeek)>> <span id="oldcash"> - <<if _TCash2 < 0>> - (@@.red;<<print cashFormat(_TCash2)>>@@ - <<else>> - (@@.yellowgreen;+<<print cashFormat(_TCash2)>>@@ - <</if>> + <<if _TCash2 < 0>> + (@@.red;<<print cashFormat(_TCash2)>>@@ + <<else>> + (@@.yellowgreen;+<<print cashFormat(_TCash2)>>@@ + <</if>> </span> since last week) <<if ($cheatMode) && ($cheatModeM)>> <<set _TCash1 = $cash>> <<textbox "$cash" $cash>> <<link "Apply">> - <<set $cash = Math.trunc(Number($cash) || _TCash1), $cheater = 1>> - <<replace "#cash">> - <<if $cash > 0>> - @@.yellowgreen;Cash@@ - <<else>> - __@@.red;Cash@@__ - <</if>> - | <<print cashFormat($cash)>> - <</replace>> - <<set _TCash2 = ($cash-$cashLastWeek)>> - <<replace "#oldcash">> - <<if _TCash2 < 0>> - (@@.red;<<print cashFormat(_TCash2)>>@@ - <<else>> - (@@.yellowgreen;+<<print cashFormat(_TCash2)>>@@ - <</if>> - <</replace>> - since last week) + <<set $cash = Math.trunc(Number($cash) || _TCash1), $cheater = 1>> + <<replace "#cash">> + <<if $cash > 0>> + @@.yellowgreen;Cash@@ + <<else>> + __@@.red;Cash@@__ + <</if>> + | <<print cashFormat($cash)>> + <</replace>> + <<set _TCash2 = ($cash-$cashLastWeek)>> + <<replace "#oldcash">> + <<if _TCash2 < 0>> + (@@.red;<<print cashFormat(_TCash2)>>@@ + <<else>> + (@@.yellowgreen;+<<print cashFormat(_TCash2)>>@@ + <</if>> + <</replace>> + since last week) <</link>> <</if>> @@ -130,54 +130,54 @@ <<set $food = Math.trunc($food)>> <<set $foodConsumption = (($lowerClass*$lowerRate) + ($middleClass*$middleRate) + ($upperClass*$upperRate) + ($topClass*$topRate))>> <span id="food"> - <<if $food > $foodConsumption>> /* if there is enough food for the next week */ - @@.chocolate;Food@@ - <<else>> - @@.red;Food@@ - <</if>> - <<if $food < 0>> - <<set $food = 0>> - <</if>> - | <<print massFormat($food)>> + <<if $food > $foodConsumption>> /* if there is enough food for the next week */ + @@.chocolate;Food@@ + <<else>> + @@.red;Food@@ + <</if>> + <<if $food < 0>> + <<set $food = 0>> + <</if>> + | <<print massFormat($food)>> </span> <br> <<set _TFood2 = ($food-$foodLastWeek)>> <span id="oldfood"> - <<if _TFood2 < 0>> - (@@.red;<<print massFormat(_TFood2)>>@@ - <<else>> - (@@.chocolate;+<<print massFormat(_TFood2)>>@@ - <</if>> + <<if _TFood2 < 0>> + (@@.red;<<print massFormat(_TFood2)>>@@ + <<else>> + (@@.chocolate;+<<print massFormat(_TFood2)>>@@ + <</if>> </span> since last week) <<if ($cheatMode) && ($cheatModeM)>> <<set _TFood1 = $food>> <<textbox "$food" $food>> <<link "Apply">> - <<if $food < 0>> - <<set $food = 0>> - <<else>> - <<set $food = Math.trunc(Number($food) || _TFood1), $cheater = 1>> - <</if>> - <<replace "#food">> - <<if $food > $foodConsumption>> /* if there is enough food for the next week */ - @@.chocolate;Food@@ - <<else>> - __@@.red;Food@@__ - <</if>> - | <<print massFormat($food)>> - <</replace>> - <<set _TFood2 = ($food-$foodLastWeek)>> - <<replace "#oldfood">> - <<if _TFood2 < 0>> - (@@.red;<<print massFormat(_TFood2)>>@@ - <<else>> - (@@.chocolate;+<<print massFormat(_TFood2)>>@@ - <</if>> - <</replace>> - since last week) + <<if $food < 0>> + <<set $food = 0>> + <<else>> + <<set $food = Math.trunc(Number($food) || _TFood1), $cheater = 1>> + <</if>> + <<replace "#food">> + <<if $food > $foodConsumption>> /* if there is enough food for the next week */ + @@.chocolate;Food@@ + <<else>> + __@@.red;Food@@__ + <</if>> + | <<print massFormat($food)>> + <</replace>> + <<set _TFood2 = ($food-$foodLastWeek)>> + <<replace "#oldfood">> + <<if _TFood2 < 0>> + (@@.red;<<print massFormat(_TFood2)>>@@ + <<else>> + (@@.chocolate;+<<print massFormat(_TFood2)>>@@ + <</if>> + <</replace>> + since last week) <</link>> <</if>> <</if>> @@ -186,12 +186,12 @@ <<if $foodMarket > 0>> <<set $food = Math.trunc($food)>> <span id="food"> - <<if $food > $foodConsumption>> /* if there is enough food for the next week */ - @@.chocolate;Food@@ - <<else>> - @@.red;Food@@ - <</if>> - | <<print massFormat($food)>> + <<if $food > $foodConsumption>> /* if there is enough food for the next week */ + @@.chocolate;Food@@ + <<else>> + @@.red;Food@@ + <</if>> + | <<print massFormat($food)>> </span> <<else>> <br> diff --git a/src/uncategorized/wardrobe.tw b/src/uncategorized/wardrobe.tw index aa26b714b8f39be153190a51469693160c6f3d17..30646575aaa8f208f2caaaa5dd5cb12aff75cf60 100644 --- a/src/uncategorized/wardrobe.tw +++ b/src/uncategorized/wardrobe.tw @@ -13,7 +13,7 @@ <br> // The room containing all the clothes and accessories you have available to dress your slaves in, as well as the supplies and tools your tailor needs to resize them to better fit your slaves. Several mirrors are set up for a slave to try on outfits should they be allowed to dress themselves. The selection includes -<<if ($cheatMode == 1) || (isItemAccessible("a bunny outfit") && isItemAccessible("chains") && isItemAccessible("conservative clothing") && isItemAccessible("Western clothing") && isItemAccessible("body oil") && isItemAccessible("a chattel habit") && isItemAccessible("a toga") && isItemAccessible("a huipil") && isItemAccessible("a kimono") && isItemAccessible("harem gauze") && isItemAccessible("a slutty qipao") && isItemAccessible("ancient Egyptian") && isItemAccessible("a maternity dress") && isItemAccessible("attractive lingerie for a pregnant woman") && isItemAccessible("a small empathy belly") && isItemAccessible("stretch pants and a crop-top") && isItemAccessible("striped panties") && isItemAccessible("a schutzstaffel uniform") && isItemAccessible("a burqa") && isItemAccessible("a dirndl") && isItemAccessible("battlearmor") && isItemAccessible("a police uniform") && isItemAccessible("a gothic lolita dress") && isItemAccessible("a cybersuit") && isItemAccessible("jeans") && isItemAccessible("boyshorts") && isItemAccessible("sport shorts and a sports bra") && isItemAccessible("a monokini") && isItemAccessible("a nice pony outfit"))>> +<<if ($cheatMode == 1) || (isItemAccessible("a bunny outfit") && isItemAccessible("chains") && isItemAccessible("conservative clothing") && isItemAccessible("Western clothing") && isItemAccessible("body oil") && isItemAccessible("a chattel habit") && isItemAccessible("a toga") && isItemAccessible("a huipil") && isItemAccessible("a kimono") && isItemAccessible("harem gauze") && isItemAccessible("a slutty qipao") && isItemAccessible("ancient Egyptian") && isItemAccessible("a maternity dress") && isItemAccessible("attractive lingerie for a pregnant woman") && isItemAccessible("a small empathy belly") && isItemAccessible("stretch pants and a crop-top") && isItemAccessible("striped panties") && isItemAccessible("a schutzstaffel uniform") && isItemAccessible("a burqa") && isItemAccessible("a dirndl") && isItemAccessible("battlearmor") && isItemAccessible("a police uniform") && isItemAccessible("a gothic lolita dress") && isItemAccessible("a cybersuit") && isItemAccessible("jeans") && isItemAccessible("boyshorts") && isItemAccessible("sport shorts and a sports bra") && isItemAccessible("a monokini") && isItemAccessible("a nice pony outfit") && isItemAccessible("a Santa dress"))>> outfits from all manner of cultures and societies; not a single style eludes you. <<else>> many styles of clothing ranging from exciting to mundane and sexy to practical. @@ -255,7 +255,8 @@ The room containing all the clothes and accessories you have available to dress <<if !isItemAccessible("a kimono")>> [[Order a shipment of kimonos|Wardrobe][cashX(forceNeg(Math.trunc(7500 * $upgradeMultiplierTrade)), "capEx"), $clothesBoughtKimono = 1]] <br>//Costs <<print cashFormat(Math.trunc(7500 * $upgradeMultiplierTrade))>>// -<<else>>You are well stocked with elegant Japanese kimonos. +<<else>> + You are well stocked with elegant Japanese kimonos. <</if>> </td> </tr> diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index df82592433e9b9f10b066cd6f3989d344687b72f..57d6cd2ebf38701e0f35d0f8cfae9fc750e4a3a2 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -17462,10 +17462,16 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies; _was fathered by one of your citizens, <<elseif _slaveWD.litterData[_litCount][0].fatherID == -3>> _was fathered by your former Master, + <<elseif _slaveWD.litterData[_litCount][0].fatherID == -4>> + _was fathered by another arcology owner, + <<elseif _slaveWD.litterData[_litCount][0].fatherID == -5>> + _was fathered by one of your clients, + <<elseif _slaveWD.litterData[_litCount][0].fatherID == -6>> + _was fathered by a member of the Societal Elite, <<elseif _slaveWD.litterData[_litCount][0].fatherID == -9>> _was fathered by the Futanari Sisters, <<elseif _slaveWD.litterData[_litCount][0].fatherID == 0>> - _is from an indentifiable source, + _is from an unidentifiable source, <<elseif _slaveWD.litterData[_litCount][0].fatherID == $activeSlave.ID>> _is from $his own handiwork, <<else>> @@ -17501,10 +17507,16 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies; _was fathered by one of your citizens. <<elseif _slaveWD.litterData[_litCount][0].fatherID == -3>> _was fathered by your former Master. He was quite the busy man. + <<elseif _slaveWD.litterData[_litCount][0].fatherID == -4>> + _was fathered by another arcology owner. + <<elseif _slaveWD.litterData[_litCount][0].fatherID == -5>> + _was fathered by one of your clients. + <<elseif _slaveWD.litterData[_litCount][0].fatherID == -6>> + _was fathered by a member of the Societal Elite. <<elseif _slaveWD.litterData[_litCount][0].fatherID == -9>> _was fathered by the Futanari Sisters. <<elseif _slaveWD.litterData[_litCount][0].fatherID == 0>> - _is from an indentifiable source. + _is from an unidentifiable source. <<elseif _slaveWD.litterData[_litCount][0].fatherID == $activeSlave.ID>> _is from $his own seed. <<else>> @@ -17534,10 +17546,16 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies; _was fathered by one of your citizens, <<elseif _slaveWD.litterData[_litCount][0].fatherID == -3>> _was fathered by your former Master, + <<elseif _slaveWD.litterData[_litCount][0].fatherID == -4>> + _was fathered by another arcology owner, + <<elseif _slaveWD.litterData[_litCount][0].fatherID == -5>> + _was fathered by one of your clients, + <<elseif _slaveWD.litterData[_litCount][0].fatherID == -6>> + _was fathered by a member of the Societal Elite, <<elseif _slaveWD.litterData[_litCount][0].fatherID == -9>> _was fathered by the Futanari Sisters, <<elseif _slaveWD.litterData[_litCount][0].fatherID == 0>> - _is from an indentifiable source, + _is from an unidentifiable source, <<elseif _slaveWD.litterData[_litCount][0].fatherID == $activeSlave.ID>> _is from $his own handiwork, <<else>> diff --git a/src/utility/descriptionWidgetsPiercings.tw b/src/utility/descriptionWidgetsPiercings.tw index 78a315ad376b5414fdddfb1b3877eeab8ab50c8c..e06e7847bdce367e62083fa7cbcdf85497c9ca8f 100644 --- a/src/utility/descriptionWidgetsPiercings.tw +++ b/src/utility/descriptionWidgetsPiercings.tw @@ -8,7 +8,7 @@ $His ears are heavily pierced, with multiple lobe piercings and a row of helix piercings. <</if>> <<if ($activeSlave.assignment == "get milked") || ($activeSlave.assignment == "work in the dairy")>> - $He has a plastic livestock tag in one ear to help identify $him for milking. + $He has a plastic livestock tag in one ear to help identify $him for milking. <<else>> <<switch $activeSlave.clothes>> <<case "attractive lingerie" "attractive lingerie for a pregnant woman">> @@ -183,9 +183,9 @@ <<case "a scalemail bikini">> The piercings are severe steel, as befits a hardened warrior. <<case "a schoolgirl outfit">> - <<if ($activeSlave.boobs <= 2000)>> - The piercings are tantalizingly visible under the thin material. - <</if>> + <<if ($activeSlave.boobs <= 2000)>> + The piercings are tantalizingly visible under the thin material. + <</if>> <<case "battledress">> The piercings are tantalizingly visible under $his tank top. <<case "nice business attire">> @@ -309,15 +309,15 @@ <<widget "vaginaPiercingDescription">> <<if ($activeSlave.vagina != -1)>> - <<if $activeSlave.vaginaPiercing > 0>> - $He has a - <<if ($activeSlave.vaginaPiercing == 1)>> - simple row of studs - <<else>> - row of big rings + <<if $activeSlave.vaginaPiercing > 0>> + $He has a + <<if ($activeSlave.vaginaPiercing == 1)>> + simple row of studs + <<else>> + row of big rings + <</if>> + down $his labia<<if $activeSlave.fuckdoll > 0>>, which are looped into the edge of the suit's material as it stops around $his vulva<</if>>. <</if>> - down $his labia<<if $activeSlave.fuckdoll > 0>>, which are looped into the edge of the suit's material as it stops around $his vulva<</if>>. - <</if>> <</if>> <</widget>> @@ -604,7 +604,7 @@ $He has a corset piercing, a ladder of steel rings running up each side of $his <<if ($activeSlave.devotion > 20)>> <<if ($activeSlave.energy > 90)>> $His very special body allows $him to wear an incredibly lewd piece of jewelry: a thin golden chain that runs from nipple to nipple, through $his pierced cockhead. The chain is short, and any motion at all tugs at $his nipples and penis. - <<if $activeSlave.amp != 1>> + <<if canWalk($activeSlave)>> The stimulation is almost unbearable, and the mere act of walking sometimes causes $him to cum. <</if>> <</if>> diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw index b2c68ffb18d7ea48459162022b7b10ddafd1d735..f5fc4fe9c2035dca62e45b905943a560e6839c6f 100644 --- a/src/utility/descriptionWidgetsStyle.tw +++ b/src/utility/descriptionWidgetsStyle.tw @@ -2944,8 +2944,10 @@ $His is permed into short waves and tied so $he can do business without them getting in the way. <<case "a slutty nurse outfit" "a nice nurse outfit">> is permed into short waves secured by white cloth ties emblazoned with little red crosses. - <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">> + <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">> is permed into short waves, but they're hidden by $his modest garb. + <<case "a klan robe" "a slutty klan robe">> + is permed into short waves, but they're hidden by $his hood. <<case "a police uniform" "overalls">> is permed into short waves and kept out of $his face by a couple of sturdy hairpins. <<case "a hanbok">> @@ -2971,8 +2973,10 @@ $His <</switch>> <<else>> <<switch $activeSlave.clothes>> - <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">> + <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">> is hidden by $his modest garb. + <<case "a klan robe" "a slutty klan robe">> + is hidden by $his hood. <<case "a scalemail bikini" "striped panties">> is permed into short curls and topped by a gold headband. <<case "kitty lingerie">> diff --git a/src/utility/descriptionWidgetsTattoos.tw b/src/utility/descriptionWidgetsTattoos.tw index 4867d70dc391a2a68f6a220ace0e9a70854307f8..6301deafe0f0dbf26cba96084f53b0cf3c142e22 100644 --- a/src/utility/descriptionWidgetsTattoos.tw +++ b/src/utility/descriptionWidgetsTattoos.tw @@ -608,7 +608,7 @@ <<widget "customTatDescription">> -<<switch $args[0].custom.tattoo>> + <<switch $args[0].custom.tattoo>> <<case "She has a famous corporate logo tattooed on the nape of her neck.">> <<print "$He has a famous corporate logo tattooed on the nape of $his neck.">> <<case "She has a small tattoo of a private military company's coat of arms on the nape of her neck.">> @@ -649,5 +649,5 @@ <<print "$He has a barcode tattooed on $his neck.">> <<default>> <<print $args[0].custom.tattoo>> -<</switch>> + <</switch>> <</widget>>