From 5bd0417ccaae8ec436f019fce893a8da1889c625 Mon Sep 17 00:00:00 2001 From: klorpa <30924131+klorpa@users.noreply.github.com> Date: Tue, 8 Jan 2019 22:56:08 -0600 Subject: [PATCH] Commit --- devNotes/Extended Family Mode Explained.txt | 2 +- devNotes/QuickList.txt | 18 +- devNotes/VersionChangeLog-Premod+LoliMod.txt | 20 +- slave variables documentation - Pregmod.txt | 1 - src/SecExp/riotControlCenter.tw | 2 +- src/SecExp/securityHQ.tw | 10 +- src/SecExp/unitsBattleReport.tw | 6 +- src/SecExp/unitsRebellionReport.tw | 4 +- src/SpecialForce/Upgrades.tw | 28 +- src/art/vector/Arm.tw | 4 +- src/art/vector/Belly.tw | 3 +- src/art/vector/Boob.tw | 3 +- src/art/vector/Boob_Addons.tw | 1 - src/art/vector/Feet.tw | 3 +- src/art/vector/Head.tw | 2 +- src/art/vector/Pussy.tw | 1 - src/art/vector/Set_Colour_Outfit_JS.tw | 1 - src/art/vector/Set_Colour_Shoe.tw | 1 - src/art/vector/Torso_Outfit.tw | 2 +- src/facilities/farmyard/farmyard.tw | 12 +- src/facilities/farmyard/farmyardAnimals.tw | 60 ++-- src/facilities/nursery/nursery.tw | 4 +- src/interaction/researchLab.tw | 6 +- src/npc/asDump.tw | 2 - src/pregmod/FSuckle.tw | 2 +- src/pregmod/incubator.tw | 4 +- src/pregmod/manageEconomy.tw | 2 +- src/pregmod/reMaleArcologyOwner.tw | 2 +- src/pregmod/reMaleCitizenHookup.tw | 2 +- src/pregmod/reTheSirenStrikesBack.tw | 4 +- src/pregmod/surrogacy.tw | 10 +- src/societies/aztec/slaveSacrifice.tw | 2 +- .../REresistantmotherdaughter.tw | 12 +- src/uncategorized/corporationDevelopments.tw | 6 +- src/uncategorized/costsReport.tw | 6 +- src/uncategorized/genericPlotEvents.tw | 6 +- .../industrialDairyAssignmentScene.tw | 267 +++++++++--------- src/uncategorized/lawCompliance.tw | 2 +- src/uncategorized/pCitizensAndCivilians.tw | 48 ++-- src/uncategorized/pSchoolSuggestion.tw | 2 +- src/uncategorized/reAWOL.tw | 7 +- src/uncategorized/reBusyArcade.tw | 12 +- src/uncategorized/reBusyBrothel.tw | 2 +- src/uncategorized/rePokerNight.tw | 6 +- src/uncategorized/reRebels.tw | 23 +- src/uncategorized/reRelationshipAdvice.tw | 72 ++--- src/uncategorized/reShelterInspection.tw | 30 +- src/uncategorized/recETS.tw | 2 +- src/uncategorized/remoteSurgery.tw | 4 +- src/uncategorized/saLongTermEffects.tw | 16 +- src/uncategorized/slaveAssignmentsReport.tw | 12 +- src/uncategorized/wardrobeUse.tw | 2 +- 52 files changed, 381 insertions(+), 380 deletions(-) diff --git a/devNotes/Extended Family Mode Explained.txt b/devNotes/Extended Family Mode Explained.txt index 235e9ffb9eb..6e888e909c3 100644 --- a/devNotes/Extended Family Mode Explained.txt +++ b/devNotes/Extended Family Mode Explained.txt @@ -37,8 +37,8 @@ The utility JS, courtesy of FCGudder. This JS should only be called if you know randomRelatedSlave(slave, filterFunction) - returns a random related slave to the slave passed into it. filterFunction is called in the following JS but not needed if you just want a random relative. randomRelatedAvailableSlave(slave) - returns a random available related slave. randomSister(slave) - returns a random sister. -randomTwinSister(slave) - returns a random twin. randomAvailableSister(slave) - returns a random available sister. +randomTwinSister(slave) - returns a random twin. randomAvailableTwinSister(slave) - returns a random available twin. randomDaughter(slave) - returns a random daughter. randomAvailableDaughter(slave) - returns a random available daughter. diff --git a/devNotes/QuickList.txt b/devNotes/QuickList.txt index d06492a0312..03f875b67fa 100644 --- a/devNotes/QuickList.txt +++ b/devNotes/QuickList.txt @@ -10,27 +10,27 @@ QuickList is built from the interaction of six parts. if shown has a button for each slave name in the list, in columns up to 5 wide. 5] The Slave Summary Passage contains invisible <a> links or any other - html element nearby or tied to each slave's name. These are + html element nearby or tied to each slave's name. These are generated with an html attribute id set to "slave-##" where ## is the slave's ID. 6] The JS code to tie a scroll animation from the visible name buttons in the quick list table down to the invisible links/elements. -The slave summary passage is called in many strange contexts, and for -this reason, there is some serious complexity in getting consistent -results. As it stands now, the passage sometimes calls itself -recursively (for facilities), but it doesn't do that for the Main +The slave summary passage is called in many strange contexts, and for +this reason, there is some serious complexity in getting consistent +results. As it stands now, the passage sometimes calls itself +recursively (for facilities), but it doesn't do that for the Main penthouse page. -The list context is duplicated, so that we can quickly loop over the +The list context is duplicated, so that we can quickly loop over the list context to get the slave names in the list, all without disturbing the principal list context for the slave data. -If the list context has more than one slave, and is either the first +If the list context has more than one slave, and is either the first call for the Main/penthouse list, or the recursive call for any other -facility, And we haven't *already* built a quick list table, then we +facility, And we haven't *already* built a quick list table, then we proceed to build the quick list table. We use special attributes on the built button to name the invisible -link to which we'll navigate, the speed that we'll animate our +link to which we'll navigate, the speed that we'll animate our navigation and an offset. diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 3cf91963036..a5064e35755 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -322,7 +322,7 @@ 34 -added a couple new recruit events that have been sitting in my todo pile for ages -fixes - -major changes to how data is cleaned after cheatmode/during backwards compatability + -major changes to how data is cleaned after cheatmode/during backwards compatibility -more fixes to bellies by deepmurk -ripped out several large chunks of walkPast into JS and apparently didn't make a dent in it @@ -6522,13 +6522,13 @@ -fixed RESS, "<if" got me again Tweaked 4 with some fixes - 1. Tweak: can change slave drugs and other settings while they are on assignment - 2. Tweak: when devotion/trust are maxed for a slave, some of the weekly report summary text showing devotion/trust gains will be hidden. - 3. Tweak: when the arcology has been fully decorated for a future society, weekly summary text showing society approval related to that future society will be suppressed. - 4. Bug fix: when assigning an ID to a new slave, make sure it isn't already in use - 5. Bug fix: egyptian preferentialist slave twins acquisition used incorrect relationship ID offset for second slave (-1000) … because it is coded differently from all other multi-slave acquisition events - 6. Bug fix: Several $pronounCap tokens changed to $possessiveCap where appropriate. - 7. Bug fix (?): When buying arcology ownership with reputation, increase value of ownership share same as when buying with cash + 1. Tweak: can change slave drugs and other settings while they are on assignment + 2. Tweak: when devotion/trust are maxed for a slave, some of the weekly report summary text showing devotion/trust gains will be hidden. + 3. Tweak: when the arcology has been fully decorated for a future society, weekly summary text showing society approval related to that future society will be suppressed. + 4. Bug fix: when assigning an ID to a new slave, make sure it isn't already in use + 5. Bug fix: egyptian preferentialist slave twins acquisition used incorrect relationship ID offset for second slave (-1000) ... because it is coded differently from all other multi-slave acquisition events + 6. Bug fix: Several $pronounCap tokens changed to $possessiveCap where appropriate. + 7. Bug fix (?): When buying arcology ownership with reputation, increase value of ownership share same as when buying with cash 8. Misc. smaller fixes (typos, missing $'s) Pregmod updated to 0.9.10.1. @@ -6824,7 +6824,7 @@ 3 -fixed >>60110 - 0.9.8.1 + 0.9.8.1 -preliminary integration of anon's animal pregnancy mod, not functional yet 02/14/17 @@ -6984,7 +6984,7 @@ 0.9.5.3 -fixes $rep issues, - -added, able to play matchmaker and take two emotionally bonded slaves to you and put them in a relationship with each other. + -added, able to play matchmaker and take two emotionally bonded slaves to you and put them in a relationship with each other. 01/26/17 diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt index c40eee31b2f..aeb5709722b 100644 --- a/slave variables documentation - Pregmod.txt +++ b/slave variables documentation - Pregmod.txt @@ -3557,7 +3557,6 @@ All this womb system can be much more automated (.preg .pregType .pregSource .pr Right now they are set correctly, based on state of .womb object through pregnancy, but not outside. Also old style pregnancy initiation (setting only .preg to >0 and .pregType to >=1 ) working too - WombImpregnation function for proper setup of .womb will be called on next SetBellySize call. Also old style pregnancy progression through using .preg++ is supported too, but can have minor issues with character descriptions in some cases, if SetBellySize widget not called before descriptions widgets. - Advanced pregnancy control structure: Now, with support of human-animal pregnancy, there is need for ability to change values that been constant before. New structure designed for it. diff --git a/src/SecExp/riotControlCenter.tw b/src/SecExp/riotControlCenter.tw index 6d81ae9f9e8..dbe2d9124d7 100644 --- a/src/SecExp/riotControlCenter.tw +++ b/src/SecExp/riotControlCenter.tw @@ -87,7 +87,7 @@ The riot control center opens its guarded doors to you. The great chamber inside <</if>> <br> <br>You can send out the squad to slow down the progress of hostile groups within the arcology: - <<link "spend authority" "riotControlCenter">> + <<link "spend authority" "riotControlCenter">> <<set $riotUpgrades.rapidUnitCost = 0>> <</link>> | <<link "spend reputation" "riotControlCenter">> diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw index e77ea4bdfe7..12d88ac8b32 100644 --- a/src/SecExp/securityHQ.tw +++ b/src/SecExp/securityHQ.tw @@ -252,15 +252,15 @@ Considering the current upgrades the resting level for security is <<print $secR /* crime level and upgrades */ Your crime level (@@.orangered;<<print $crime>>@@) <<if $crime <= 20>> - is very low. + is very low. <<elseif $crime <= $upgradeUpkeep>> - is low. + is low. <<elseif $crime <= 60>> - is average. + is average. <<elseif $crime <= $upgradeUpkeep>> - is high. + is high. <<else>> - is extremely high. + is extremely high. <</if>> Considering the current upgrades the maximum level of crime is <<print $crimeCap>>, while the effective maximum level is <<print Math.trunc(Math.clamp($crimeCap + ($crimeCap - $crimeCap * ($secMenials / $reqMenials)),0,100))>>. diff --git a/src/SecExp/unitsBattleReport.tw b/src/SecExp/unitsBattleReport.tw index e8e1f63ab1d..5e61ee17df9 100644 --- a/src/SecExp/unitsBattleReport.tw +++ b/src/SecExp/unitsBattleReport.tw @@ -16,7 +16,7 @@ $militiaUnits[_j].platoonName: no casualties. <<if $militiaUnits[_j].training < 100>> <<if random(1,100) > 60>> - Experience has increased. + Experience has increased. <<set $militiaUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>> <</if>> <</if>> @@ -30,7 +30,7 @@ $slaveUnits[_j].platoonName: no casualties. <<if $slaveUnits[_j].training < 100>> <<if random(1,100) > 60>> - Experience has increased. + Experience has increased. <<set $slaveUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>> <</if>> <</if>> @@ -44,7 +44,7 @@ $mercUnits[_j].platoonName: no casualties. <<if $mercUnits[_j].training < 100>> <<if random(1,100) > 60>> - Experience has increased. + Experience has increased. <<set $mercUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>> <</if>> <</if>> diff --git a/src/SecExp/unitsRebellionReport.tw b/src/SecExp/unitsRebellionReport.tw index 00b09199bb5..7d95b762863 100644 --- a/src/SecExp/unitsRebellionReport.tw +++ b/src/SecExp/unitsRebellionReport.tw @@ -245,7 +245,7 @@ <</if>> <</for>> <<if _mercRebelledID.length > 0>> - made the grave mistake of betraying you. They participated in the looting following the rebellion, then vanished in the wastes. + made the grave mistake of betraying you. They participated in the looting following the rebellion, then vanished in the wastes. <</if>> <<set $cash -= 1000 * _mercRebelledID.length>> <<removeUnits _mercRebelledID>> @@ -723,7 +723,7 @@ <</if>> <</for>> <<if _mercRebelledID.length > 0>> - made the grave mistake of betraying you. They participated in the looting following the battle, then vanished in the wastes. + made the grave mistake of betraying you. They participated in the looting following the battle, then vanished in the wastes. <</if>> <<set $cash -= 1000 * _mercRebelledID.length>> <<removeUnits _mercRebelledID>> diff --git a/src/SpecialForce/Upgrades.tw b/src/SpecialForce/Upgrades.tw index 5a8258e57ec..133ed6f6483 100644 --- a/src/SpecialForce/Upgrades.tw +++ b/src/SpecialForce/Upgrades.tw @@ -21,7 +21,7 @@ <<else>>//Cannot afford to upgrade the Firebase.//<</if>> - //Costs @@.yellowgreen;<<print cashFormat(_cF)>>@@ // + //Costs @@.yellowgreen;<<print cashFormat(_cF)>>@@ // <<elseif $SF.Squad.Firebase == _FU>>//The Firebase has been fully upgraded.// @@ -78,7 +78,7 @@ <<else>>//Cannot afford to upgrade the Drone Bay.//<</if>> - //Costs @@.yellowgreen;<<print cashFormat(Math.ceil(45000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.Drones/100))*HSM()))>>@@ // <span style="float:right;"> <<print progress($SF.Squad.Drones)>> </span> + //Costs @@.yellowgreen;<<print cashFormat(Math.ceil(45000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.Drones/100))*HSM()))>>@@ // <span style="float:right;"> <<print progress($SF.Squad.Drones)>> </span> <<elseif $SF.Squad.Drones == _DU>>//The Drone Bay has been fully upgraded.//<span style="float:right;"> <<print progress($SF.Squad.Drones)>> </span> @@ -97,7 +97,7 @@ <<else>>//Cannot afford to upgrade the Attack Vehicle Fleet.//<</if>> - //Costs @@.yellowgreen;<<print cashFormat(_cAV)>>@@//<span style="float:right;"><<print progress($SF.Squad.AV)>></span> + //Costs @@.yellowgreen;<<print cashFormat(_cAV)>>@@//<span style="float:right;"><<print progress($SF.Squad.AV)>></span> <<elseif $SF.Squad.AV == _AVU>>//The Attack Vehicle Fleet has been fully upgraded.//<span style="float:right;"><<print progress($SF.Squad.AV)>></span> @@ -116,7 +116,7 @@ <<else>>//Cannot afford to upgrade Transport Vehicle Fleet.//<</if>> - //Costs @@.yellowgreen;<<print cashFormat(_cTV)>>@@//<span style="float:right;"><<print progress($SF.Squad.TV)>> </span> + //Costs @@.yellowgreen;<<print cashFormat(_cTV)>>@@//<span style="float:right;"><<print progress($SF.Squad.TV)>> </span> <<elseif $SF.Squad.TV == _TVU>>//The Transport Vehicle Fleet has been fully upgraded.//<span style="float:right;"><<print progress($SF.Squad.TV)>></span> @@ -133,7 +133,7 @@ <<else>>//Cannot afford to upgrade Prototype Goliath Tank.//<</if>> - //Costs @@.yellowgreen;<<print cashFormat(_cPGT)>>@@ //<span style="float:right;"> <<print progress($SF.Squad.PGT)>> </span> + //Costs @@.yellowgreen;<<print cashFormat(_cPGT)>>@@ //<span style="float:right;"> <<print progress($SF.Squad.PGT)>> </span> <<elseif $SF.Squad.PGT == _PGTU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.PGT)>> </span> @@ -152,7 +152,7 @@ <<else>>//Cannot afford to upgrade Attack Aircraft Fleet.//<</if>> - //Costs @@.yellowgreen;<<print cashFormat(_cAA)>>@@ //<span style="float:right;"> <<print progress($SF.Squad.AA)>> </span> + //Costs @@.yellowgreen;<<print cashFormat(_cAA)>>@@ //<span style="float:right;"> <<print progress($SF.Squad.AA)>> </span> <<elseif $SF.Squad.AA == _AAU>>//The Attack Aircraft Fleet has been fully upgraded.//<span style="float:right;"> <<print progress($SF.Squad.AA)>> </span> @@ -186,7 +186,7 @@ <<else>>//Cannot afford to upgrade the Spaceplane.//<</if>> - //Costs @@.yellowgreen;<<print cashFormat(_cSP)>>@@//<span style="float:right;"><<print progress($SF.Squad.SpacePlane)>> </span> + //Costs @@.yellowgreen;<<print cashFormat(_cSP)>>@@//<span style="float:right;"><<print progress($SF.Squad.SpacePlane)>> </span> <<elseif $SF.Squad.SpacePlane == _SPU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.SpacePlane)>> </span> @@ -203,7 +203,7 @@ <<else>>//Cannot afford to upgrade Gunship.//<</if>> - //Costs @@.yellowgreen;<<print cashFormat(_cGunS)>>@@ //<span style="float:right;"> <<print progress($SF.Squad.GunS)>> </span> + //Costs @@.yellowgreen;<<print cashFormat(_cGunS)>>@@ //<span style="float:right;"> <<print progress($SF.Squad.GunS)>> </span> <<elseif $SF.Squad.GunS == _GunSU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.GunS)>> </span> @@ -222,7 +222,7 @@ <<else>>//Cannot afford to upgrade Satellite.//<</if>> - //Costs @@.yellowgreen;<<print cashFormat(_cSat)>>@@//<span style="float:right;"><<print progress($SF.Squad.Satellite.lv)>> </span> + //Costs @@.yellowgreen;<<print cashFormat(_cSat)>>@@//<span style="float:right;"><<print progress($SF.Squad.Satellite.lv)>> </span> <<elseif $SF.Squad.Satellite.lv == _SatU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.Satellite.lv)>> </span> @@ -241,7 +241,7 @@ <<else>>//Cannot afford to upgrade the Giant Robot.//<</if>> - //Costs @@.yellowgreen;<<print cashFormat(_cGR)>>@@//<span style="float:right;"><<print progress($SF.Squad.GiantRobot)>></span> + //Costs @@.yellowgreen;<<print cashFormat(_cGR)>>@@//<span style="float:right;"><<print progress($SF.Squad.GiantRobot)>></span> <<elseif $SF.Squad.GiantRobot == _GRU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.GiantRobot)>> </span> @@ -258,7 +258,7 @@ <<else>>//Cannot afford to upgrade Cruise Missile.//<</if>> - //Costs @@.yellowgreen;<<print cashFormat(_cMS)>>@@ //<span style="float:right;"><<print progress($SF.Squad.MissileSilo)>></span> + //Costs @@.yellowgreen;<<print cashFormat(_cMS)>>@@ //<span style="float:right;"><<print progress($SF.Squad.MissileSilo)>></span> <<elseif $SF.Squad.MissileSilo == _MSU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.MissileSilo)>> </span> @@ -277,7 +277,7 @@ <<else>>//Cannot afford to upgrade Aircraft Carrier.//<</if>> - //Costs @@.yellowgreen;<<print cashFormat(Math.ceil(650000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.AircraftCarrier/100))*HSM()))>>@@ //<span style="float:right;"> <<print progress($SF.Squad.AircraftCarrier)>> </span> + //Costs @@.yellowgreen;<<print cashFormat(Math.ceil(650000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.AircraftCarrier/100))*HSM()))>>@@ //<span style="float:right;"> <<print progress($SF.Squad.AircraftCarrier)>> </span> <<elseif $SF.Squad.AircraftCarrier == _ACU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.AircraftCarrier)>> </span> @@ -294,7 +294,7 @@ <<else>>//Cannot afford to upgrade Submarine//<</if>> - //Costs @@.yellowgreen;<<print cashFormat(_cSub)>>@@ //<span style="float:right;"> <<print progress($SF.Squad.Sub)>> </span> + //Costs @@.yellowgreen;<<print cashFormat(_cSub)>>@@ //<span style="float:right;"> <<print progress($SF.Squad.Sub)>> </span> <<elseif $SF.Squad.Sub == _SubU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.Sub)>> </span> @@ -311,7 +311,7 @@ <<else>>//Cannot afford to upgrade Amphibious Transport.//<</if>> - //Costs @@.yellowgreen;<<print cashFormat(_cHAT)>>@@ //<span style="float:right;"> <<print progress($SF.Squad.HAT)>> </span> + //Costs @@.yellowgreen;<<print cashFormat(_cHAT)>>@@ //<span style="float:right;"> <<print progress($SF.Squad.HAT)>> </span> <<elseif $SF.Squad.HAT == _HATU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.HAT)>> </span> diff --git a/src/art/vector/Arm.tw b/src/art/vector/Arm.tw index 442f7f39d08..2092c54ca85 100644 --- a/src/art/vector/Arm.tw +++ b/src/art/vector/Arm.tw @@ -121,7 +121,7 @@ <<include _art>> <</if>> -/* shiny clothings */ +/* shiny clothing */ <<if $seeVectorArtHighlights == 1>> <<if _artSlave.fuckdoll != 0 || _artSlave.clothes == "restrictive latex" || _artSlave.clothes == "a latex catsuit" || _artSlave.clothes == "body oil">> /* only some arm positions have art (feel free to add more) */ @@ -138,7 +138,7 @@ <</if>> <</if>> -/* TODO: simplify selection (select prefix, infix and suffix and combine instead of using switch statemens) */ +/* TODO: simplify selection (select prefix, infix and suffix and combine instead of using switch statements) */ <<switch _artSlave.clothes>> diff --git a/src/art/vector/Belly.tw b/src/art/vector/Belly.tw index 2518fc04e26..04491ed3072 100644 --- a/src/art/vector/Belly.tw +++ b/src/art/vector/Belly.tw @@ -35,7 +35,7 @@ <<include _art >> <</switch>> - /* shiny clothings */ + /* shiny clothing */ <<if $seeVectorArtHighlights == 1>> <<if _artSlave.fuckdoll != 0 || _artSlave.clothes == "restrictive latex" || _artSlave.clothes == "a latex catsuit" || _artSlave.clothes == "body oil">> <<include Art_Vector_Belly_Outfit_Shine >> @@ -84,4 +84,3 @@ <<if _artSlave.bellyAccessory == "a huge empathy belly">> <<include Art_Vector_Empathy_Belly_Huge>> <</if>> - diff --git a/src/art/vector/Boob.tw b/src/art/vector/Boob.tw index 248f098558a..7d12da83858 100644 --- a/src/art/vector/Boob.tw +++ b/src/art/vector/Boob.tw @@ -34,7 +34,7 @@ _art_transform will affect the display. /* boobs too small - draw areolae directly onto torso */ <<else>> <<include Art_Vector_Boob_Alt>> - /* shiny clothings */ + /* shiny clothing */ <<if $seeVectorArtHighlights == 1>> <<if _artSlave.fuckdoll != 0 || _artSlave.clothes == "a latex catsuit" || _artSlave.clothes == "body oil">> <<include Art_Vector_Boob_Outfit_Shine>> @@ -90,4 +90,3 @@ _art_transform will affect the display. /* set _art_transform to empty string so stray SVG groups in other passages are not affected */ <<set _art_transform = "">> - diff --git a/src/art/vector/Boob_Addons.tw b/src/art/vector/Boob_Addons.tw index feaf1a12246..2cd26186e15 100644 --- a/src/art/vector/Boob_Addons.tw +++ b/src/art/vector/Boob_Addons.tw @@ -49,7 +49,6 @@ <</if>> <</if>> - /* set _art_transform to empty string so stray SVG groups in other passages are not affected */ <<set _art_transform = "">> diff --git a/src/art/vector/Feet.tw b/src/art/vector/Feet.tw index 0b83887bb97..0212fcce766 100644 --- a/src/art/vector/Feet.tw +++ b/src/art/vector/Feet.tw @@ -285,7 +285,7 @@ <<set _art_outfit = clothing2artSuffix(_artSlave.clothes) >> <</switch>> -/* special case for shiny clothings */ +/* special case for shiny clothing */ <<if $seeVectorArtHighlights == 1>> /* this one is leg and partly butt-related, but needs to be here as shoes are drawn over legs and butt */ <<if _artSlave.fuckdoll != 0 || _artSlave.clothes == "restrictive latex" || _artSlave.clothes == "a latex catsuit" || _artSlave.clothes == "body oil">> @@ -307,4 +307,3 @@ <</if>> <</if>> <</if>> - diff --git a/src/art/vector/Head.tw b/src/art/vector/Head.tw index 59bd83b829d..20ad2473e5b 100644 --- a/src/art/vector/Head.tw +++ b/src/art/vector/Head.tw @@ -2,7 +2,7 @@ <<include Art_Vector_Head>> -/* shiny clothings */ +/* shiny clothing */ <<if $seeVectorArtHighlights == 1>> <<if _artSlave.fuckdoll != 0 || _artSlave.clothes == "restrictive latex" || _artSlave.clothes == "a latex catsuit">> <<include Art_Vector_Head_Outfit_Shine>> diff --git a/src/art/vector/Pussy.tw b/src/art/vector/Pussy.tw index 4a3012f1004..7ba2a9af163 100644 --- a/src/art/vector/Pussy.tw +++ b/src/art/vector/Pussy.tw @@ -3,4 +3,3 @@ <<if _artSlave.vagina >= 0 && _artSlave.clothes != "a latex catsuit" && _artSlave.clothes != "a comfortable bodysuit" && _artSlave.clothes != "a cybersuit">> <<include Art_Vector_Pussy>> <</if>> - diff --git a/src/art/vector/Set_Colour_Outfit_JS.tw b/src/art/vector/Set_Colour_Outfit_JS.tw index 26bf686a47e..dee464deef3 100644 --- a/src/art/vector/Set_Colour_Outfit_JS.tw +++ b/src/art/vector/Set_Colour_Outfit_JS.tw @@ -53,4 +53,3 @@ if (artSlave.eyeColor) { return s; } - diff --git a/src/art/vector/Set_Colour_Shoe.tw b/src/art/vector/Set_Colour_Shoe.tw index 49d4ae6062f..c33f5997f3c 100644 --- a/src/art/vector/Set_Colour_Shoe.tw +++ b/src/art/vector/Set_Colour_Shoe.tw @@ -31,4 +31,3 @@ <<set _shoeColour = _skinColour>> <<set _shoeShadowColour = _shoeColour+";opacity: 0.5">> /* TODO: do not abuse "color" variable for style definitions. do not rely on dark background for shadow effect either. */ <</if>> - diff --git a/src/art/vector/Torso_Outfit.tw b/src/art/vector/Torso_Outfit.tw index 9619c6ece26..5659b8f6422 100644 --- a/src/art/vector/Torso_Outfit.tw +++ b/src/art/vector/Torso_Outfit.tw @@ -24,7 +24,7 @@ <<include _art >> <</switch>> -/* shiny clothings */ +/* shiny clothing */ <<if $seeVectorArtHighlights == 1>> <<if _artSlave.fuckdoll != 0 || _artSlave.clothes == "restrictive latex" || _artSlave.clothes == "a latex catsuit">> <<if _artSlave.amp != 0>> diff --git a/src/facilities/farmyard/farmyard.tw b/src/facilities/farmyard/farmyard.tw index 9a23e88275e..1d1e6534839 100644 --- a/src/facilities/farmyard/farmyard.tw +++ b/src/facilities/farmyard/farmyard.tw @@ -205,7 +205,7 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and <br> <<elseif ($farmyardKennels == 1)>> <br> - <<link"Kennels" "FarmyardAnimals">><</link>> have been built in one corner of $farmyardName, and are currently <<if _CL == 0>>empty.<<else>>occupied by + <<link "Kennels" "FarmyardAnimals">><</link>> have been built in one corner of $farmyardName, and are currently <<if _CL == 0>>empty.<<else>>occupied by <<if _CL == 1>> <<print $canines>>. <<elseif _CL <= 3>> @@ -223,7 +223,7 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and <br> <<elseif ($farmyardKennels == 2)>> <br> - <<link"Large kennels" "FarmyardAnimals">><</link>> have been built in one corner of $farmyardName, and are currently <<if _CL == 0>>empty.<<else>>occupied by + <<link "Large kennels" "FarmyardAnimals">><</link>> have been built in one corner of $farmyardName, and are currently <<if _CL == 0>>empty.<<else>>occupied by <<if _CL == 1>> <<print $canines>>. <<elseif _CL <= 3>> @@ -242,7 +242,7 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and <br> <<elseif ($farmyardStable == 1)>> <br> - <<link "Stables" "FarmyardAnimals">><</link>> have been built at the far end of $farmyardName, and are currently <<if _HL == 0>>empty.<<else>>occupied by + <<link "Stables" "FarmyardAnimals">><</link>> have been built at the far end of $farmyardName, and are currently <<if _HL == 0>>empty.<<else>>occupied by <<if _CL == 1>> <<print $hooved>>. <<elseif _CL <= 3>> @@ -259,7 +259,7 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and <br> <<elseif $farmyardStable == 2>> <br> - <<link "Large stables" "FarmyardAnimals">><</link>> have been build at the far end of $farmyardName, and are currently <<if _HL == 0>>empty.<<else>>occupied by + <<link "Large stables" "FarmyardAnimals">><</link>> have been build at the far end of $farmyardName, and are currently <<if _HL == 0>>empty.<<else>>occupied by <<if _CL == 1>> <<print $hooved>>. <<elseif _CL <= 3>> @@ -278,7 +278,7 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and <br> <<elseif ($farmyardCages == 1)>> <br> - <<link"Cages" "FarmyardAnimals">><</link>> have been built in one corner of $farmyardName, and are currently <<if _FL == 0>>empty.<<else>>occupied by + <<link "Cages" "FarmyardAnimals">><</link>> have been built in one corner of $farmyardName, and are currently <<if _FL == 0>>empty.<<else>>occupied by <<if _FL == 1>> <<print $felines>>. <<elseif _FL <= 3>> @@ -294,7 +294,7 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and <</if>> <<elseif ($farmyardCages == 2)>> <br> - <<link"Large cages" "FarmyardAnimals">><</link>> have been built in one corner of $farmyardName, and are currently <<if _FL == 0>>empty.<<else>>occupied by + <<link "Large cages" "FarmyardAnimals">><</link>> have been built in one corner of $farmyardName, and are currently <<if _FL == 0>>empty.<<else>>occupied by <<if _FL == 1>> <<print $felines>>. <<elseif _FL <= 3>> diff --git a/src/facilities/farmyard/farmyardAnimals.tw b/src/facilities/farmyard/farmyardAnimals.tw index e4edb96bd1e..b992a284e7b 100644 --- a/src/facilities/farmyard/farmyardAnimals.tw +++ b/src/facilities/farmyard/farmyardAnimals.tw @@ -20,7 +20,7 @@ <<elseif $animalsBought.labradorRetrievers == 1>> Labrador Retrievers <<if $activeCanine.breed != "Labrador Retriever">> - [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dog", speciesCap: "Dog", speciesPlural: "dogs", breed: "Labrador Retriever", type: "canine", dickSize: "big", ballType: "dog"}]] + [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dog", speciesCap: "Dog", speciesPlural: "dogs", breed: "Labrador Retriever", type: "canine", dickSize: "big", ballType: "dog"}]] <<else>> //Set as active canine// <</if>> @@ -32,7 +32,7 @@ <<elseif $animalsBought.germanShepherds == 1>> German Shepherds <<if $activeCanine.breed != "German Shepherd">> - [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dog", speciesCap: "Dog", speciesPlural: "dogs", breed: "German Shepherd", type: "canine", dickSize: "big", ballType: "dog"}]] + [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dog", speciesCap: "Dog", speciesPlural: "dogs", breed: "German Shepherd", type: "canine", dickSize: "big", ballType: "dog"}]] <<else>> //Set as active canine// <</if>> @@ -44,7 +44,7 @@ <<elseif $animalsBought.goldenRetrievers == 1>> Golden Retrievers <<if $activeCanine.breed != "Golden Retriever">> - [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dog", speciesCap: "Dog", speciesPlural: "dogs", breed: "Golden Retriever", type: "canine", dickSize: "big", ballType: "dog"}]] + [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dog", speciesCap: "Dog", speciesPlural: "dogs", breed: "Golden Retriever", type: "canine", dickSize: "big", ballType: "dog"}]] <<else>> //Set as active canine// <</if>> @@ -56,7 +56,7 @@ <<elseif $animalsBought.frenchBulldogs == 1>> French Bulldogs <<if $activeCanine.breed != "French Bulldog">> - [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dog", speciesCap: "Dog", speciesPlural: "dogs", breed: "French Bulldog", type: "canine", dickSize: "big", ballType: "dog"}]] + [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dog", speciesCap: "Dog", speciesPlural: "dogs", breed: "French Bulldog", type: "canine", dickSize: "big", ballType: "dog"}]] <<else>> //Set as active canine// <</if>> @@ -68,7 +68,7 @@ <<elseif $animalsBought.bulldogs == 1>> Bulldogs <<if $activeCanine.breed != "Bulldog">> - [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dog", speciesCap: "Dog", speciesPlural: "dogs", breed: "Bulldog", type: "canine", dickSize: "big", ballType: "dog"}]] + [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dog", speciesCap: "Dog", speciesPlural: "dogs", breed: "Bulldog", type: "canine", dickSize: "big", ballType: "dog"}]] <<else>> //Set as active canine// <</if>> @@ -80,7 +80,7 @@ <<elseif $animalsBought.beagles == 1>> Beagles <<if $activeCanine.breed != "Beagle">> - [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dog", speciesCap: "Dog", speciesPlural: "dogs", breed: "Beagle", type: "canine", dickSize: "big", ballType: "dog"}]] + [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dog", speciesCap: "Dog", speciesPlural: "dogs", breed: "Beagle", type: "canine", dickSize: "big", ballType: "dog"}]] <<else>> //Set as active canine// <</if>> @@ -92,7 +92,7 @@ <<elseif $animalsBought.poodles == 1>> Poodles <<if $activeCanine.breed != "Poodle">> - [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dog", speciesCap: "Dog", speciesPlural: "dogs", breed: "Poodle", type: "canine", dickSize: "big", ballType: "dog"}]] + [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dog", speciesCap: "Dog", speciesPlural: "dogs", breed: "Poodle", type: "canine", dickSize: "big", ballType: "dog"}]] <<else>> //Set as active canine// <</if>> @@ -104,7 +104,7 @@ <<elseif $animalsBought.rottweilers == 1>> Rottweilers <<if $activeCanine.breed != "Rottweiler">> - [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dog", speciesCap: "Dog", speciesPlural: "dogs", breed: "Rottweiler", type: "canine", dickSize: "big", ballType: "dog"}]] + [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dog", speciesCap: "Dog", speciesPlural: "dogs", breed: "Rottweiler", type: "canine", dickSize: "big", ballType: "dog"}]] <<else>> //Set as active canine// <</if>> @@ -116,7 +116,7 @@ <<elseif $animalsBought.yorkshireTerriers == 1>> Yorkshire Terriers <<if $activeCanine.breed != "Yorkshire Terrier">> - [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dog", speciesCap: "Dog", speciesPlural: "dogs", breed: "Yorkshire Terrier", type: "canine", dickSize: "big", ballType: "dog"}]] + [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dog", speciesCap: "Dog", speciesPlural: "dogs", breed: "Yorkshire Terrier", type: "canine", dickSize: "big", ballType: "dog"}]] <<else>> //Set as active canine// <</if>> @@ -128,7 +128,7 @@ <<elseif $animalsBought.siberianHuskies == 1>> Siberian Huskies <<if $activeCanine.breed != "Siberian Husky">> - [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dog", speciesCap: "Dog", speciesPlural: "dogs", breed: "Siberian Husky", type: "canine", dickSize: "big", ballType: "dog"}]] + [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dog", speciesCap: "Dog", speciesPlural: "dogs", breed: "Siberian Husky", type: "canine", dickSize: "big", ballType: "dog"}]] <<else>> //Set as active canine// <</if>> @@ -165,7 +165,7 @@ <<elseif $animalsBought.siameses == 1>> Siamese cats <<if $activeFeline.breed != "Siamese">> - [[Set as active canine|FarmyardAnimals][$activeFeline = {species: "cat", speciesCap: "Cat", speciesPlural: "cats", breed: "Siamese", type: "feline", dickSize: "small", ballType: "cat"}]] + [[Set as active canine|FarmyardAnimals][$activeFeline = {species: "cat", speciesCap: "Cat", speciesPlural: "cats", breed: "Siamese", type: "feline", dickSize: "small", ballType: "cat"}]] <<else>> //Set as active feline// <</if>> @@ -177,7 +177,7 @@ <<elseif $animalsBought.persians == 1>> Persian cats <<if $activeFeline.breed != "Persian">> - [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "cat", speciesCap: "Cat", speciesPlural: "cats", breed: "Persian", type: "feline", dickSize: "small", ballType: "cat"}]] + [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "cat", speciesCap: "Cat", speciesPlural: "cats", breed: "Persian", type: "feline", dickSize: "small", ballType: "cat"}]] <<else>> //Set as active feline// <</if>> @@ -189,7 +189,7 @@ <<elseif $animalsBought.maineCoons == 1>> Maine Coon cats <<if $activeFeline.breed != "Maine Coon">> - [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "cat", speciesCap: "Cat", speciesPlural: "cats", breed: "Maine Coon", type: "feline", dickSize: "small", ballType: "cat"}]] + [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "cat", speciesCap: "Cat", speciesPlural: "cats", breed: "Maine Coon", type: "feline", dickSize: "small", ballType: "cat"}]] <<else>> //Set as active feline// <</if>> @@ -201,7 +201,7 @@ <<elseif $animalsBought.ragdolls == 1>> Ragdoll cats <<if $activeFeline.breed != "Ragdoll">> - [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "cat", speciesCap: "Cat", speciesPlural: "cats", breed: "Ragdoll", type: "feline", dickSize: "small", ballType: "cat"}]] + [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "cat", speciesCap: "Cat", speciesPlural: "cats", breed: "Ragdoll", type: "feline", dickSize: "small", ballType: "cat"}]] <<else>> //Set as active feline// <</if>> @@ -213,7 +213,7 @@ <<elseif $animalsBought.bengals == 1>> Bengal cats <<if $activeFeline.breed != "Bengal">> - [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "cat", speciesCap: "Cat", speciesPlural: "cats", breed: "Bengal", type: "feline", dickSize: "small", ballType: "cat"}]] + [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "cat", speciesCap: "Cat", speciesPlural: "cats", breed: "Bengal", type: "feline", dickSize: "small", ballType: "cat"}]] <<else>> //Set as active feline// <</if>> @@ -225,7 +225,7 @@ <<elseif $animalsBought.abbysinians == 1>> Abbysinian cats <<if $activeFeline.breed != "Abbysinian">> - [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "cat", speciesCap: "Cat", speciesPlural: "cats", breed: "Abbysinian", type: "feline", dickSize: "small", ballType: "cat"}]] + [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "cat", speciesCap: "Cat", speciesPlural: "cats", breed: "Abbysinian", type: "feline", dickSize: "small", ballType: "cat"}]] <<else>> //Set as active feline// <</if>> @@ -237,7 +237,7 @@ <<elseif $animalsBought.birmans == 1>> Birman cats <<if $activeFeline.breed != "Birman">> - [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "cat", speciesCap: "Cat", speciesPlural: "cats", breed: "Birman", type: "feline", dickSize: "small", ballType: "cat"}]] + [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "cat", speciesCap: "Cat", speciesPlural: "cats", breed: "Birman", type: "feline", dickSize: "small", ballType: "cat"}]] <<else>> //Set as active feline// <</if>> @@ -249,7 +249,7 @@ <<elseif $animalsBought.orientalShorthairs == 1>> Oriental Shorthair cats <<if $activeFeline.breed != "Oriental Shorthair">> - [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "cat", speciesCap: "Cat", speciesPlural: "cats", breed: "Oriental Shorthair", type: "feline", dickSize: "small", ballType: "cat"}]] + [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "cat", speciesCap: "Cat", speciesPlural: "cats", breed: "Oriental Shorthair", type: "feline", dickSize: "small", ballType: "cat"}]] <<else>> //Set as active feline// <</if>> @@ -261,7 +261,7 @@ <<elseif $animalsBought.sphynxes == 1>> Sphynx cats <<if $activeFeline.breed != "Sphynx">> - [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "cat", speciesCap: "Cat", speciesPlural: "cats", breed: "Sphynx", type: "feline", dickSize: "small", ballType: "cat"}]] + [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "cat", speciesCap: "Cat", speciesPlural: "cats", breed: "Sphynx", type: "feline", dickSize: "small", ballType: "cat"}]] <<else>> //Set as active feline// <</if>> @@ -273,7 +273,7 @@ <<elseif $animalsBought.russianBlues == 1>> Russian Blue cats <<if $activeFeline.breed != "Russian Blue">> - [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "cat", speciesCap: "Cat", speciesPlural: "cats", breed: "Russian Blue", type: "feline", dickSize: "small", ballType: "cat"}]] + [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "cat", speciesCap: "Cat", speciesPlural: "cats", breed: "Russian Blue", type: "feline", dickSize: "small", ballType: "cat"}]] <<else>> //Set as active feline// <</if>> @@ -300,7 +300,7 @@ /*A couple of adult wolves are lounging about in their kennels.(OLD)*/ Wolves <<if $activeCanine.species != "wolf">> - [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "wolf", speciesCap: "Wolf", speciesPlural: "wolves", type: "canine", dickSize: "large", ballType: "wolf"}]] + [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "wolf", speciesCap: "Wolf", speciesPlural: "wolves", type: "canine", dickSize: "large", ballType: "wolf"}]] <<else>> //Set as active canine// <</if>> @@ -313,7 +313,7 @@ /*Red foxes play in one corner of their kennels, chasing one another.(OLD)*/ Foxes <<if $activeCanine.species != "fox">> - [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "fox", speciesCap: "Fox", speciesPlural: "foxes", type: "canine", dickSize: "large", ballType: "fox"}]] + [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "fox", speciesCap: "Fox", speciesPlural: "foxes", type: "canine", dickSize: "large", ballType: "fox"}]] <<else>> //Set as active canine// <</if>> @@ -326,7 +326,7 @@ /*A group of male jackals are fighting over a potential mate, causing quite a ruckus.(OLD)*/ Jackals <<if $activeCanine.species != "jackal">> - [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "jackal", speciesCap: "Jackal", speciesPlural: "jackals", type: "canine", dickSize: "large", ballType: "jackal"}]] + [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "jackal", speciesCap: "Jackal", speciesPlural: "jackals", type: "canine", dickSize: "large", ballType: "jackal"}]] <<else>> //Set as active canine// <</if>> @@ -339,7 +339,7 @@ /*The dingos are eating their meal, growling at each other when one gets to close to another's food.(OLD)*/ Dingos <<if $activeCanine.species != "dingo">> - [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dingo", speciesCap: "Dingo", speciesPlural: "dingos", type: "canine", dickSize: "large", ballType: "dingo"}]] + [[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dingo", speciesCap: "Dingo", speciesPlural: "dingos", type: "canine", dickSize: "large", ballType: "dingo"}]] <<else>> //Set as active canine// <</if>> @@ -377,7 +377,7 @@ /*The cougars are sleeping, their lean bodies scattered around under trees. (OLD)*/ Cougars <<if $activeFeline.species != "cougar">> - [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "cougar", speciesCap: "Cougar", speciesPlural: "cougars", type: "feline", dickSize: "large", ballType: "cougar"}]] + [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "cougar", speciesCap: "Cougar", speciesPlural: "cougars", type: "feline", dickSize: "large", ballType: "cougar"}]] <<else>> //Set as active feline// <</if>> @@ -390,7 +390,7 @@ /*You can see a few jaguars laying around in the trees in their enclosure. (OLD)*/ Jaguars <<if $activeFeline.species != "jaguar">> - [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "jaguar", speciesCap: "Jaguar", speciesPlural: "jaguars", type: "feline", dickSize: "large", ballType: "jaguar"}]] + [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "jaguar", speciesCap: "Jaguar", speciesPlural: "jaguars", type: "feline", dickSize: "large", ballType: "jaguar"}]] <<else>> //Set as active feline// <</if>> @@ -403,7 +403,7 @@ /*The lynxes are playfully running around their enclosure. (OLD)*/ Lynx <<if $activeFeline.species != "lynx">> - [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "lynx", speciesCap: "Lynx", speciesPlural: "lynx", type: "feline", dickSize: "large", ballType: "lynx"}]] + [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "lynx", speciesCap: "Lynx", speciesPlural: "lynx", type: "feline", dickSize: "large", ballType: "lynx"}]] <<else>> //Set as active feline// <</if>> @@ -416,7 +416,7 @@ /*The leopards are lazing about in the trees in their enclosure. (OLD)*/ Leopards <<if $activeFeline.species != "leopard">> - [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "leopard", speciesCap: "Leopard", speciesPlural: "leopards", type: "feline", dickSize: "large", ballType: "leopard"}]] + [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "leopard", speciesCap: "Leopard", speciesPlural: "leopards", type: "feline", dickSize: "large", ballType: "leopard"}]] <<else>> //Set as active feline// <</if>> @@ -429,7 +429,7 @@ /*Most of the lions are sunning themselves. (OLD)*/ Lions <<if $activeFeline.species != "lion">> - [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "lion", speciesCap: "Lion", speciesPlural: "lions", type: "feline", dickSize: "large", ballType: "lion"}]] + [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "lion", speciesCap: "Lion", speciesPlural: "lions", type: "feline", dickSize: "large", ballType: "lion"}]] <<else>> //Set as active feline// <</if>> @@ -442,7 +442,7 @@ /*Some of the tigers are swimming, and the ones that aren't are lazing about. (OLD)*/ Tigers <<if $activeFeline.species != "tiger">> - [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "tiger", speciesCap: "Tiger", speciesPlural: "tigers", type: "feline", dickSize: "large", ballType: "tiger"}]] + [[Set as active feline|FarmyardAnimals][$activeFeline = {species: "tiger", speciesCap: "Tiger", speciesPlural: "tigers", type: "feline", dickSize: "large", ballType: "tiger"}]] <<else>> //Set as active feline// <</if>> diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw index 6ba575f928e..b3212684ccd 100644 --- a/src/facilities/nursery/nursery.tw +++ b/src/facilities/nursery/nursery.tw @@ -365,13 +365,13 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $ <</if>> <<if $reservedChildrenNursery != 0 || _childrenReservedNursery == 1>> /* the oops I made it go negative somehow button */ <br> - <<link "Clear all reserved children">> + <<link "Clear all reserved children">> <<for _u = 0; _u < _SL; _u++>> <<run WombCleanGenericReserve($slaves[_u], "nursery", 9999)>> <</for>> <<run WombCleanGenericReserve($PC, "nursery", 9999)>> <<goto "Nursery">> - <</link>> + <</link>> <</if>> <br><br> diff --git a/src/interaction/researchLab.tw b/src/interaction/researchLab.tw index 74667629ac0..98994d58605 100644 --- a/src/interaction/researchLab.tw +++ b/src/interaction/researchLab.tw @@ -69,9 +69,9 @@ | [[x10|Research Lab][$researchLab.hired += 10,$cash -= 50000]] <</if>> scientists.<br> - //Each scientist will require an initial fee of <<print cashFormat(5000)>> and incur <<print cashFormat(300)>> weekly.// - <br> - <<if $menials > 0>> + //Each scientist will require an initial fee of <<print cashFormat(5000)>> and incur <<print cashFormat(300)>> weekly.// + <br> + <<if $menials > 0>> Assign [[x1|Research Lab][$researchLab.menials += 1,$menials -= 1]] <<if ($researchLab.maxSpace - ($researchLab.hired + $researchLab.menials)) >= 5 && $menials >= 5>> | [[x5|Research Lab][$researchLab.menials += 5,$menials -= 5]] diff --git a/src/npc/asDump.tw b/src/npc/asDump.tw index 35df1e2b2f7..3e0c69edeb9 100644 --- a/src/npc/asDump.tw +++ b/src/npc/asDump.tw @@ -49,5 +49,3 @@ <<goto $returnTo>> <</if>> - - diff --git a/src/pregmod/FSuckle.tw b/src/pregmod/FSuckle.tw index a70dd269101..a1e0b896ff7 100644 --- a/src/pregmod/FSuckle.tw +++ b/src/pregmod/FSuckle.tw @@ -85,7 +85,7 @@ You <<if _mood == 2>>demand<<else>>beckon<</if>> $activeSlave.slaveName to <<elseif $activeSlave.devotion < -20>> Though $he is rebellious, <<if _mood == 2>> - seeing such a gravid person take such a predatory stance shakes $him and $he becomes more compliant. + seeing such a gravid person take such a predatory stance shakes $him and $he becomes more compliant. <<else>> $his inability to move and distaste for falling to the ground kept $him from giving $his help much trouble. <</if>> diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw index 369d9c3da26..99feb3a3b65 100644 --- a/src/pregmod/incubator.tw +++ b/src/pregmod/incubator.tw @@ -224,7 +224,7 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $ <</if>> <<if $reservedChildren != 0 || _childrenReserved == 1>> /* the oops I made it go negative somehow button */ <br> - <<link "Clear all reserved children">> + <<link "Clear all reserved children">> <<for _u = 0; _u < _SL; _u++>> <<if WombReserveCount($slaves[_u], "incubator") != 0>> <<set WombCleanGenericReserve($slaves[_u], 'incubator', 9999)>> @@ -232,7 +232,7 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $ <</for>> <<set WombCleanGenericReserve($PC, 'incubator', 9999)>> <<goto "Incubator">> - <</link>> + <</link>> <</if>> <br><br> diff --git a/src/pregmod/manageEconomy.tw b/src/pregmod/manageEconomy.tw index c6991cbc3ec..acd1c9cc63e 100644 --- a/src/pregmod/manageEconomy.tw +++ b/src/pregmod/manageEconomy.tw @@ -158,7 +158,7 @@ Slave demand is <</if>> <<if $deltaDemand != 0>> <<if $demandTimer - $elapsedDemandTimer < 3>> - but it might change soon + but it might change soon <</if>> <</if>> <<if ($cheatMode) && ($cheatModeM)>> diff --git a/src/pregmod/reMaleArcologyOwner.tw b/src/pregmod/reMaleArcologyOwner.tw index 6aedacf973e..f3f783df67f 100644 --- a/src/pregmod/reMaleArcologyOwner.tw +++ b/src/pregmod/reMaleArcologyOwner.tw @@ -50,7 +50,7 @@ He strikes a fine balance in conversation with you, firm enough to not overpower <<elseif $PC.boobsBonus >= 2>> You adjust your dress to better emphasize your huge <<if $PC.boobsImplant == 1>>fake tits<<else>>soft breasts<</if>> and head over to join to the <<if _randomForeignFS > 80>> slimness - conversation between him and the woman trying to convince him to invest in her solar power concern. After a few minutes of you jiggling your cleavage around, however, it becomes apparent that this is not turning him on at all. He excuses himself and withdraws. You return to your <<if $PC.refreshmentType == 0>>$PC.refreshment<<elseif $PC.refreshmentType == 1>>glass of $PC.refreshment<<elseif $PC.refreshmentType == 2>>plate of $PC.refreshment<<elseif $PC.refreshmentType == 3>>pouch of $PC.refreshment<<elseif $PC.refreshmentType == 4>>syringe of $PC.refreshment<<elseif $PC.refreshmentType == 5>>bottle of $PC.refreshment<<elseif $PC.refreshmentType == 6>>sheet of $PC.refreshment<</if>>, consoling yourself that you are not exactly starved for company. + conversation between him and the woman trying to convince him to invest in her solar power concern. After a few minutes of you jiggling your cleavage around, however, it becomes apparent that this is not turning him on at all. He excuses himself and withdraws. You return to your <<if $PC.refreshmentType == 0>>$PC.refreshment<<elseif $PC.refreshmentType == 1>>glass of $PC.refreshment<<elseif $PC.refreshmentType == 2>>plate of $PC.refreshment<<elseif $PC.refreshmentType == 3>>pouch of $PC.refreshment<<elseif $PC.refreshmentType == 4>>syringe of $PC.refreshment<<elseif $PC.refreshmentType == 5>>bottle of $PC.refreshment<<elseif $PC.refreshmentType == 6>>sheet of $PC.refreshment<</if>>, consoling yourself that you are not exactly starved for company. <<elseif _randomForeignFS > 60>> transformation conversation between him and the woman trying to convince him to invest in her solar power concern. <<if $PC.boobsImplant != 1>> diff --git a/src/pregmod/reMaleCitizenHookup.tw b/src/pregmod/reMaleCitizenHookup.tw index 9ba6c20dd7b..c2b4d1676fd 100644 --- a/src/pregmod/reMaleCitizenHookup.tw +++ b/src/pregmod/reMaleCitizenHookup.tw @@ -363,7 +363,7 @@ He's clearly attracted to you; even the most consummate actor would have difficu <<else>> young <</if>> - body + body <<set $arcologies[0].FSYouthPreferentialist += 5>> <<case "Maturity Preferentialist">> mature body diff --git a/src/pregmod/reTheSirenStrikesBack.tw b/src/pregmod/reTheSirenStrikesBack.tw index 4acae22f213..2cd3a27a7b4 100644 --- a/src/pregmod/reTheSirenStrikesBack.tw +++ b/src/pregmod/reTheSirenStrikesBack.tw @@ -48,8 +48,8 @@ Several weeks have passed since you gained the musical prodigy and you couldn't <<if def _ssb>> <<run Enunciate(_ssb)>> - Just as the little weasel at your feet finishes, _ssb.slaveName - <<if canWalk(_ssb)>> + Just as the little weasel at your feet finishes, _ssb.slaveName + <<if canWalk(_ssb)>> walks in, <<else>> is carried in, diff --git a/src/pregmod/surrogacy.tw b/src/pregmod/surrogacy.tw index adb863de668..4c5f98cc67b 100644 --- a/src/pregmod/surrogacy.tw +++ b/src/pregmod/surrogacy.tw @@ -17,7 +17,7 @@ <<run WombNormalizePreg($receptrix)>> <<setLocalPronouns $receptrix>> <<if $receptrix.fetish == "mindbroken">> - $receptrix.slaveName leaves the surgery with a certain warmth in $his lower abdomen, $he knows that $he has been impregnated. + $receptrix.slaveName leaves the surgery with a certain warmth in $his lower abdomen, $he knows that $he has been impregnated. <<elseif ($receptrix.fetish == "pregnancy") && ($receptrix.fetishStrength > 60) && ($receptrix.fetishKnown == 1)>> <<if canSee($receptrix)>> Since the surgery required only a local anesthetic, $receptrix.slaveName remained fully aware throughout the procedure. $He was overjoyed at the sight of the syringe containing $his future child emptying into $his womb. @@ -79,7 +79,7 @@ <</if>> <<setLocalPronouns $receptrix>> <<if $receptrix.fetish == "mindbroken">> - $receptrix.slaveName leaves the surgery with a certain warmth in $his lower abdomen, $he knows that $he has been impregnated. + $receptrix.slaveName leaves the surgery with a certain warmth in $his lower abdomen, $he knows that $he has been impregnated. <<elseif ($receptrix.fetish == "pregnancy") && ($receptrix.fetishStrength > 60) && ($receptrix.fetishKnown == 1)>> <<if canSee($receptrix)>> Since the surgery required only a local anesthetic, $receptrix.slaveName remained fully aware throughout the procedure. $He was overjoyed at the sight of the syringe containing $his future child emptying into $his womb. @@ -149,10 +149,10 @@ <<run WombNormalizePreg($receptrix)>> <<setLocalPronouns $receptrix>> <<if $receptrix.fetish == "mindbroken">> - $receptrix.slaveName leaves the surgery with a certain warmth in $his lower abdomen, - <<if $receptrix.ID == $donatrix.ID>> + $receptrix.slaveName leaves the surgery with a certain warmth in $his lower abdomen, + <<if $receptrix.ID == $donatrix.ID>> but has no idea $he carries $his own clone. - <<else>> + <<else>> $he knows that $he has been impregnated. <</if>> <<elseif ($receptrix.fetish == "pregnancy") && ($receptrix.fetishStrength > 60) && ($receptrix.fetishKnown == 1)>> diff --git a/src/societies/aztec/slaveSacrifice.tw b/src/societies/aztec/slaveSacrifice.tw index 4b0aad61114..11032cc8bdd 100644 --- a/src/societies/aztec/slaveSacrifice.tw +++ b/src/societies/aztec/slaveSacrifice.tw @@ -69,7 +69,7 @@ <<elseif ($activeSlave.sexualFlaw == "shamefast")>> $He bursts into tears. "I'm going to be practically naked where everyone can <<s>>ee me!" <<elseif ($activeSlave.sexualFlaw == "repressed")>> - A big smile appears on $his face. "I'm going to be clean<<s>>ed. I'll be cleaned for the godde<<ss>>..." + A big smile appears on $his face. "I'm going to be clean<<s>>ed. I'll be cleaned for the godde<<ss>>..." <</if>> <<else>> $He does $his best to control $himself and avoid punishment. "<<Master>>, I will do it. I'll do the peniten<<c>>e for the godde<<ss>>." $He holds $himself together until you dismiss $him; as $he turns to leave, the tears come fast, and $he almost runs into the door frame on $his way out<<if canSee($activeSlave)>>, blinded with weeping<</if>>. diff --git a/src/uncategorized/REresistantmotherdaughter.tw b/src/uncategorized/REresistantmotherdaughter.tw index f6c6b669468..35377b6191a 100644 --- a/src/uncategorized/REresistantmotherdaughter.tw +++ b/src/uncategorized/REresistantmotherdaughter.tw @@ -4,14 +4,16 @@ <<set $i = $slaveIndices[$mother]>> <<set $j = $slaveIndices[$daughter]>> +<<setLocalPronouns $slaves[$i]>> +<<setLocalPronouns $slaves[$j] 2>> -$slaves[$i].slaveName and her daughter are both having trouble getting acclimated to your ownership, with their obedience suffering as a result. Though neither of them have done anything particular egregious lately, their combined list of minor transgressions is reaching a point where rendering punishment on the two would not be seen as unfair. By happenstance they come before you for inspection one after the other. Though they certainly see each other naked frequently around the penthouse, neither seems particularly comfortable around the other when nudity is involved. While you finish $slaves[$i].slaveName's inspection, her daughter fidgets uneasily even while trying to mimic the posture and appearance of an obedient slave. It occurs to you that the current situation presents an opportunity to do //something// about this resistant mother daughter pair. +$slaves[$i].slaveName and $his daughter are both having trouble getting acclimated to your ownership, with their obedience suffering as a result. Though neither of them have done anything particular egregious lately, their combined list of minor transgressions is reaching a point where rendering punishment on the two would not be seen as unfair. By happenstance they come before you for inspection one after the other. Though they certainly see each other naked frequently around the penthouse, neither seems particularly comfortable around the other when nudity is involved. While you finish $slaves[$i].slaveName's inspection, $his daughter fidgets uneasily even while trying to mimic the posture and appearance of an obedient slave. It occurs to you that the current situation presents an opportunity to do //something// about this resistant mother daughter pair. <br><br> <span id="result"> <br><<link "Spend the evening gently acclimating them to your ownership">> <<replace "#result">> - Though neither of the two vehemently protests your decision to have them both join you in bed, furtive uneasy glances are exchanged between the two. Since they're already naked, they clamber onto your bed before you and reluctantly kneel facing each other, leaving enough space between them for you and for them to avert their eyes to avoid the other's nakedness. They clearly assume you would start by using one of them, so they're quite taken aback when you remain standing at the edge of the bed and suggest that $slaves[$i].slaveName play with her daughter. $slaves[$j].slaveName awkwardly flounders a little as her mother's hands roam about her body, but does not reel back from the intimate touching. In time you instruct $slaves[$j].slaveName to pleasure her mother, but still decline to join the incestuous union unfolding on your sheets. You extend the foreplay for hours, bringing both mother and daughter to such a state of naked arousal that they begin grinding against each other uninhibitedly. They are both so desperate for release that they do not object when you finally decide to join them, instead eagerly moving to include you in their coupling. What started with $slaves[$j].slaveName awkwardly kneeling unmoving while her mother sucked her nipples ends with $slaves[$j].slaveName on all fours getting fucked by you while orally pleasuring $slaves[$i].slaveName. You gaze over at $slaves[$i].slaveName and she moans and licks her lips enticingly back at you as $slaves[$j].slaveName moans into her fuckhole. + Though neither of the two vehemently protests your decision to have them both join you in bed, furtive uneasy glances are exchanged between the two. Since they're already naked, they clamber onto your bed before you and reluctantly kneel facing each other, leaving enough space between them for you and for them to avert their eyes to avoid the other's nakedness. They clearly assume you would start by using one of them, so they're quite taken aback when you remain standing at the edge of the bed and suggest that $slaves[$i].slaveName play with $his daughter. $slaves[$j].slaveName awkwardly flounders a little as _his2 mother's hands roam about _his2 body, but does not reel back from the intimate touching. In time you instruct $slaves[$j].slaveName to pleasure _his2 mother, but still decline to join the incestuous union unfolding on your sheets. You extend the foreplay for hours, bringing both mother and daughter to such a state of naked arousal that they begin grinding against each other uninhibitedly. They are both so desperate for release that they do not object when you finally decide to join them, instead eagerly moving to include you in their coupling. What started with $slaves[$j].slaveName awkwardly kneeling unmoving while _his2 mother sucked _his2 nipples ends with $slaves[$j].slaveName on all fours getting fucked by you while orally pleasuring $slaves[$i].slaveName. You gaze over at $slaves[$i].slaveName and $he moans and licks $his lips enticingly back at you as $slaves[$j].slaveName moans into $his fuckhole. @@.mediumaquamarine;They have both become more trusting of you.@@ <<set $slaves[$i].trust += 4, $slaves[$j].trust += 4, $slaves[$i].oralCount += 1, $slaves[$j].oralCount += 1, $oralTotal += 2>> @@ -36,10 +38,10 @@ $slaves[$i].slaveName and her daughter are both having trouble getting acclimate <</link>> <br><<link "Make an example of the mother">> <<replace "#result">> - You give them orders of devastating simplicity: You are going to assrape $slaves[$i].slaveName and if her daughter offers even the most token of resistance, you'll punish $slaves[$i].slaveName. They're stunned, but you shake them out of their shock by grabbing $slaves[$i].slaveName by the arm<<if $PC.dick == 0>>,donning a strap-on<</if>> and shoving her over your desk. $slaves[$j].slaveName flinches visibly as you enter her mother's ass in one brutal stroke, for which you stain her mother's asscheeks a rosy red with a torrent of harsh spanks. $slaves[$i].slaveName takes the rough anal pounding with only quiet sobbing and the occasional whimper of pain, but her daughter can't bear to see $slaves[$i].slaveName in such duress and breaks her shortlived silence to beg for mercy. When you step away from $slaves[$i].slaveName, $slaves[$j].slaveName lets out a sigh of relief, but her expression soon turns to horror and revulsion when you return to mount her mother with a lash in hand. + You give them orders of devastating simplicity: You are going to assrape $slaves[$i].slaveName and if $his daughter offers even the most token of resistance, you'll punish $slaves[$i].slaveName. They're stunned, but you shake them out of their shock by grabbing $slaves[$i].slaveName by the arm<<if $PC.dick == 0>>,donning a strap-on<</if>> and shoving $him over your desk. $slaves[$j].slaveName flinches visibly as you enter _his2 mother's ass in one brutal stroke, for which you stain _his2 mother's asscheeks a rosy red with a torrent of harsh spanks. $slaves[$i].slaveName takes the rough anal pounding with only quiet sobbing and the occasional whimper of pain, but $his daughter can't bear to see $slaves[$i].slaveName in such duress and breaks _his2 short-lived silence to beg for mercy. When you step away from $slaves[$i].slaveName, $slaves[$j].slaveName lets out a sigh of relief, but _his2 expression soon turns to horror and revulsion when you return to mount _his2 mother with a lash in hand. <br><br> - When you eventually finish your merciless assrape of $slaves[$i].slaveName, her body is covered in bruises, marks, and handprints. A testament to $slaves[$j].slaveName's inability to keep her silence as you brutalized her mother. You leave your office wordlessly to attend to other matters, while behind you $slaves[$j].slaveName gazes forlornly at the gibbering mess you have reduced her mother to. - Your severe punishment of her mother has encouraged $slaves[$j].slaveName to @@.gold;fear you.@@ $slaves[$i].slaveName has been fucked into @@.hotpink;submission@@ but your savage treatment has caused her to @@.red;hate buttsex.@@ + When you eventually finish your merciless assrape of $slaves[$i].slaveName, $his body is covered in bruises, marks, and handprints. A testament to $slaves[$j].slaveName's inability to keep _his2 silence as you brutalized _his2 mother. You leave your office wordlessly to attend to other matters, while behind you $slaves[$j].slaveName gazes forlornly at the gibbering mess you have reduced _his2 mother to. + Your severe punishment of _his2 mother has encouraged $slaves[$j].slaveName to @@.gold;fear you.@@ $slaves[$i].slaveName has been fucked into @@.hotpink;submission@@ but your savage treatment has caused $him to @@.red;hate buttsex.@@ <<set $slaves[$j].trust -= 10>> <<set $slaves[$i].devotion += 4, $slaves[$i].analCount += 1, $analTotal += 1, $slaves[$i].sexualFlaw = "hates anal">> diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw index 9b5e208dd4d..d658deb400d 100644 --- a/src/uncategorized/corporationDevelopments.tw +++ b/src/uncategorized/corporationDevelopments.tw @@ -513,7 +513,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p <</if>> <</link>> | <<link "Invest Half">> - <<if $generalAssetPrice*1000 < $corpCash>> + <<if $generalAssetPrice*1000 < $corpCash>> <<set $generalAssets += (Math.trunc($corpCash/($generalAssetPrice*1000)))*500>> <<set $corpCash -= (Math.trunc($corpCash/($generalAssetPrice*1000)))*($generalAssetPrice*500)>> <<replace "#cashOnHand">> @@ -531,7 +531,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p <</if>> <</link>> | <<link "Massive investment">> - <<if $generalAssetPrice*1000 < $corpCash>> + <<if $generalAssetPrice*1000 < $corpCash>> <<set $generalAssets += (Math.trunc($corpCash/($generalAssetPrice*500)))*500>> <<set $corpCash -= (Math.trunc($corpCash/($generalAssetPrice*500)))*($generalAssetPrice*500)>> <<replace "#cashOnHand">> @@ -606,7 +606,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p Slave prices are <<if $slaveAssetPrice > 12>>@@.yellowgreen;very high@@<<elseif $slaveAssetPrice > 10>>@@.yellowgreen;high@@<<elseif $slaveAssetPrice == 10>>average<<elseif $slaveAssetPrice >= 8>>@@.gold;low@@<<else>>@@.gold;very low@@<</if>>. | <<link "Buy">> - <<if $slaveAssetPrice*500 < $corpCash>> + <<if $slaveAssetPrice*500 < $corpCash>> <<set $slaveAssets += 500>> <<set $corpCash -= 500*$slaveAssetPrice>> <<replace "#cashOnHand">> diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw index 68047388717..07f7d4f835b 100644 --- a/src/uncategorized/costsReport.tw +++ b/src/uncategorized/costsReport.tw @@ -239,7 +239,7 @@ $nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 || <br>__Militia Platoons Upkeep__: <<for _i = 0; _i < $militiaUnits.length; _i++>> <br> - <i> <<print ordinalSuffix($militiaUnits.length-[_i])>>:</i> @@.yellowgreen;<<print cashFormat($militiaUnits[_i].troops*$soldierUpkeep * _soldierMod)>>@@ + <i> <<print ordinalSuffix($militiaUnits.length-[_i])>>:</i> @@.yellowgreen;<<print cashFormat($militiaUnits[_i].troops*$soldierUpkeep * _soldierMod)>>@@ <<set _milTotal += $militiaUnits[_i].troops*$soldierUpkeep * _soldierMod>> <<set _numItems += 1>> <</for>> @@ -249,7 +249,7 @@ $nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 || <br>__Slave Platoons Upkeep__: <<for _i = 0; _i < $slaveUnits.length; _i++>> <br> - <i> <<print ordinalSuffix($slaveUnits.length-[_i])>>:</i> @@.yellowgreen;<<print cashFormat($slaveUnits[_i].troops*$soldierUpkeep * 0.5 * _soldierMod)>>@@ + <i> <<print ordinalSuffix($slaveUnits.length-[_i])>>:</i> @@.yellowgreen;<<print cashFormat($slaveUnits[_i].troops*$soldierUpkeep * 0.5 * _soldierMod)>>@@ <<set _slaveTotal += $slaveUnits[_i].troops*$soldierUpkeep * 0.5 * _soldierMod>> <</for>> <br><br> ''Total: @@.yellowgreen;<<print cashFormat(_slaveTotal)>>@@'' @@ -258,7 +258,7 @@ $nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 || <br>__Mercenary Platoons Upkeep__: <<for _i = 0; _i < $mercUnits.length; _i++>> <br> - <i> <<print ordinalSuffix($mercUnits.length-[_i])>>:</i> @@.yellowgreen;<<print cashFormat($mercUnits[_i].troops*$soldierUpkeep * 1.5 * _soldierMod)>>@@ + <i> <<print ordinalSuffix($mercUnits.length-[_i])>>:</i> @@.yellowgreen;<<print cashFormat($mercUnits[_i].troops*$soldierUpkeep * 1.5 * _soldierMod)>>@@ <<set _mercTotal += $mercUnits[_i].troops*$soldierUpkeep * 1.5 * _soldierMod>> <</for>> <br><br> ''Total: @@.yellowgreen;<<print cashFormat(_mercTotal)>>@@'' diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw index 58ec1912d12..f51185b2e01 100644 --- a/src/uncategorized/genericPlotEvents.tw +++ b/src/uncategorized/genericPlotEvents.tw @@ -198,11 +198,11 @@ in the capital city. <<if $PAidTarget != "seizedMission">> They are deeply worried by the situation. There have been large riots over the past week, and yesterday they became seriously violent. The unrest is targeting <<if $PAidTarget == "convent">> - better-off citizens, including the caller. Though most of the nuns have already left, the leader and a few of her women are now stuck in the area and are running out of options as the riots lock down transportation. + better-off citizens, including the caller. Though most of the nuns have already left, the leader and a few of her women are now stuck in the area and are running out of options as the riots lock down transportation. <<elseif $PAidTarget == "school">> - better-off citizens, including the caller. Though most of the students and faculty have already made it out, the principal and a few students are now stuck in the area and are running out of options as the riots lock down transportation. + better-off citizens, including the caller. Though most of the students and faculty have already made it out, the principal and a few students are now stuck in the area and are running out of options as the riots lock down transportation. <<elseif $PAidTarget == "housewives">> - better-off citizens, including the caller. Though most of them have taken flights out, the leader and a few of them are now stuck in the area and are running out of options as the riots lock down transportation. + better-off citizens, including the caller. Though most of them have taken flights out, the leader and a few of them are now stuck in the area and are running out of options as the riots lock down transportation. <<elseif $PAidTarget == "maternity">> better-off citizens, including the caller. Though most of the patients have already left, several of the most pregnant are now stuck in the area and are running out of options as the riots lock down transportation. <<elseif $PAidTarget == "conversion">> diff --git a/src/uncategorized/industrialDairyAssignmentScene.tw b/src/uncategorized/industrialDairyAssignmentScene.tw index eb245eafc93..5f471dff538 100644 --- a/src/uncategorized/industrialDairyAssignmentScene.tw +++ b/src/uncategorized/industrialDairyAssignmentScene.tw @@ -2,146 +2,147 @@ <<set $nextButton = "Continue">> <<set $nextLink = $returnTo>> + <<setLocalPronouns $activeSlave>> -When $activeSlave.slaveName reports to the dairy, it's to the sight of an unoccupied milking machine waiting for her, its straps ready to immure her in what is to be her new home. +When $activeSlave.slaveName reports to the dairy, it's to the sight of an unoccupied milking machine waiting for $him, its straps ready to immure $him in what is to be $his new home. <<if $activeSlave.sexualFlaw == "self hating">> /* GETTING IN */ -As she realizes her fate, a kind of peace comes over the self hating slut. +As $he realizes $his fate, a kind of peace comes over the self hating slut. <<if !canTalk($activeSlave)>> - She <<if ($activeSlave.amp != 1)>>mouths<<else>>gestures<</if>> her thanks dreamily. + $He <<if ($activeSlave.amp != 1)>>mouths<<else>>gestures<</if>> $his thanks dreamily. <<else>> - "Thank you, <<Master>>," she <<say>>s simply. "I de<<s>>erve thi<<s>>," she adds quietly, half to herself. + "Thank you, <<Master>>," $he <<say>>s simply. "I de<<s>>erve thi<<s>>," $he adds quietly, half to $himself. <</if>> -Then she falls silent and stares at the machine. Though she hates herself and looks forward to the release of being unable to do anything but get fucked, that doesn't mean she isn't afraid. +Then $he falls silent and stares at the machine. Though $he hates $himself and looks forward to the release of being unable to do anything but get fucked, that doesn't mean $he isn't afraid. <<if ($activeSlave.amp != 1)>> <<if ($dairyStimulatorsSetting > 1)>> - She gauges the size of the sodomizer with her hand, finding that it's wider than her fist, and then presses the fist against her own anus. Realizing what's about to happen, she gives a little shudder. + $He gauges the size of the sodomizer with $his hand, finding that it's wider than $his fist, and then presses the fist against $his own anus. Realizing what's about to happen, $he gives a little shudder. <<if ($dairyPregSetting > 1) && isFertile($activeSlave) && $activeSlave.mpreg != 1>> - She does the same with the dildo that will keep her pregnant and her pussy, and her lower lip starts to quiver. + $He does the same with the dildo that will keep $him pregnant and $his pussy, and $his lower lip starts to quiver. <</if>> <<else>> <<if ($dairyPregSetting > 1) && isFertile($activeSlave) && $activeSlave.mpreg != 1>> - She gauges the size of the dildo that will keep her pregnant with her hand, finding that it's wider than her fist, and then presses the fist against her pussy. Realizing what's about to happen, she gives a little shudder. + $He gauges the size of the dildo that will keep $him pregnant with $his hand, finding that it's wider than $his fist, and then presses the fist against $his pussy. Realizing what's about to happen, $he gives a little shudder. <</if>> <</if>> <<if ($dairyFeedersSetting > 1)>> - Looking at the phallus that will feed her, she begins to cry softly. + Looking at the phallus that will feed $him, $he begins to cry softly. <</if>> <</if>> <br><br> <<if ($activeSlave.amp != 1)>> - She strips and climbs into the machine's embrace, + $He strips and climbs into the machine's embrace, <<else>> - Another slave helps her strip and lays her in the machine, + Another slave helps $him strip and lays $him in the machine, <</if>> -her tears pattering onto the uncaring metal. When she's in place, her shoulders slump as she gives up completely. +$his tears pattering onto the uncaring metal. When $he's in place, $his shoulders slump as $he gives up completely. <<if !canTalk($activeSlave)>> - She mouths 'Goodbye.' + $He mouths 'Goodbye.' <<elseif SlaveStatsChecker.checkForLisp($activeSlave)>> - "'bye," she lisps. + "'bye," $he lisps. <<else>> - "'bye," she whispers. + "'bye," $he whispers. <</if>> <<elseif ($activeSlave.sexualFlaw == "breeder") && isFertile($activeSlave) && $activeSlave.mpreg != 1>> -As she realizes what's about to happen, she begins to cry openly. A curious mix of arousal, joy, and abject horror is obvious on her face, and she deals with the conflicting feelings by sobbing. +As $he realizes what's about to happen, $he begins to cry openly. A curious mix of arousal, joy, and abject horror is obvious on $his face, and $he deals with the conflicting feelings by sobbing. <<if !canTalk($activeSlave)>> - She <<if ($activeSlave.amp != 1)>>mouths<<else>>gestures<</if>> her thanks shakily. + $He <<if ($activeSlave.amp != 1)>>mouths<<else>>gestures<</if>> $his thanks shakily. <<else>> - "Th-thank you, <<Master>>," she <<say>>s through her tears. "I love you." + "Th-thank you, <<Master>>," $he <<say>>s through $his tears. "I love you." <</if>> -Then she falls silent and stares at the machine. She's probably imagined this a thousand times, but the prospect is still frightening. +Then $he falls silent and stares at the machine. $He's probably imagined this a thousand times, but the prospect is still frightening. <<if ($activeSlave.amp != 1)>> <<if ($dairyStimulatorsSetting > 1)>> - She gauges the size of the sodomizer with her hand, finding that it's wider than her fist, and then presses the fist against her own anus. Realizing that her anus is about to be permanently gaped, she looks doubtful, but then visibly reassures herself. She'll need both her mouth and her ass to eat enough. + $He gauges the size of the sodomizer with $his hand, finding that it's wider than $his fist, and then presses the fist against $his own anus. Realizing that $his anus is about to be permanently gaped, $he looks doubtful, but then visibly reassures $himself. $He'll need both $his mouth and $his ass to eat enough. <</if>> <<if ($dairyFeedersSetting > 1)>> - Looking at the phallus that will feed her, she inserts a finger into its faux urethra, measuring how fast it can pour nutrition in her. + Looking at the phallus that will feed $him, $he inserts a finger into its faux urethra, measuring how fast it can pour nutrition in $him. <</if>> - She strokes the dildo that will keep her pregnant like a lover, which, of course, it's about to be. + $He strokes the dildo that will keep $him pregnant like a lover, which, of course, it's about to be. <</if>> <br><br> <<if ($activeSlave.amp != 1)>> - She strips and climbs into the machine's embrace, shaking with nerves. + $He strips and climbs into the machine's embrace, shaking with nerves. <<else>> - Another slave helps her strip and lays her in the machine. She shakes with nerves. + Another slave helps $him strip and lays $him in the machine. $He shakes with nerves. <</if>> <<if $activeSlave.pregKnown == 1>> - She cranes around to look at her already-pregnant belly, and looks impatient. + $He cranes around to look at $his already-pregnant belly, and looks impatient. <<if !canTalk($activeSlave)>> - She mouths 'hurry up, I need room.' + $He mouths 'hurry up, I need room.' <<else>> - "Hurry up, I need the room," she whispers. + "Hurry up, I need the room," $he whispers. <</if>> <<else>> - She cranes around to look at her belly, and looks impatient. + $He cranes around to look at $his belly, and looks impatient. <<if !canTalk($activeSlave)>> - She mouths 'come on, I'm ready.' + $He mouths 'come on, I'm ready.' <<else>> - "Come on, I'm ready," she whispers. + "Come on, I'm ready," $he whispers. <</if>> <</if>> <<elseif $activeSlave.devotion > 95>> /* GETTING IN */ -As she realizes her fate, the worshipful slave squares her shoulders, steeling herself. "<<Master>>," she <<if !canTalk($activeSlave)>>signs<<else>><<say>>s<</if>>, "I will do my best to <<s>>erve you." She steps over to the machine. -She looks it over clinically, getting herself into the right mindset. +As $he realizes $his fate, the worshipful slave squares $his shoulders, steeling $himself. "<<Master>>," $he <<if !canTalk($activeSlave)>>signs<<else>><<say>>s<</if>>, "I will do my best to <<s>>erve you." $He steps over to the machine. +$He looks it over clinically, getting $himself into the right mindset. <<if ($activeSlave.amp != 1)>> <<if ($dairyStimulatorsSetting > 1)>> - She gauges the size of the massive phallus that will soon penetrate her anus. It's broader than her fist. "I think I can take this. It'll be tough, but I'll need all the hydration I can get." + $He gauges the size of the massive phallus that will soon penetrate $his anus. It's broader than $his fist. "I think I can take this. It'll be tough, but I'll need all the hydration I can get." <</if>> <<if ($dairyPregSetting > 1) && isFertile($activeSlave) && $activeSlave.mpreg != 1>> - She considers the enormous dildo that will fill her with cum when she's fertile, and switch to ejaculating drugs when she conceives. "I'll be a mother to a whole generation of <<s>>lave<<s>>," she <<say>>s proudly, taking strength from it. + $He considers the enormous dildo that will fill $him with cum when $he's fertile, and switch to ejaculating drugs when $he conceives. "I'll be a mother to a whole generation of <<s>>lave<<s>>," $he <<say>>s proudly, taking strength from it. <</if>> <<if ($dairyFeedersSetting > 1)>> - She moves her hand to the dildo that will occupy her throat, feeding her. "I will need my mouth to take in as much food as I can," she <<if !canTalk($activeSlave)>>signs<<else>><<say>>s<</if>>. "I won't be able to talk. <<s>>o, I'll <<s>>ay it one la<<s>>t time, <<Master>>: I love you." + $He moves $his hand to the dildo that will occupy $his throat, feeding $him. "I will need my mouth to take in as much food as I can," $he <<if !canTalk($activeSlave)>>signs<<else>><<say>>s<</if>>. "I won't be able to talk. <<s>>o, I'll <<s>>ay it one la<<s>>t time, <<Master>>: I love you." <</if>> <</if>> <br><br> <<if ($activeSlave.amp != 1)>> - She strips and climbs into the machine's embrace. + $He strips and climbs into the machine's embrace. <<else>> - Another slave helps her strip and lays her in the machine. + Another slave helps $him strip and lays $him in the machine. <</if>> -She does not hesitate or glance back at you. You stand by as the straps automatically tighten, robbing her of the ability to move. "<<Master>>," she <<if !canTalk($activeSlave)>>signs<<else>><<say>>s quietly<</if>>, "I will try to be <<s>>trong enough to <<s>>tand up to thi<<s>>. But if I'm not, and I forget too much, plea<<s>>e leave me in here <<s>>o I can be u<<s>>eful." +$He does not hesitate or glance back at you. You stand by as the straps automatically tighten, robbing $him of the ability to move. "<<Master>>," $he <<if !canTalk($activeSlave)>>signs<<else>><<say>>s quietly<</if>>, "I will try to be <<s>>trong enough to <<s>>tand up to thi<<s>>. But if I'm not, and I forget too much, plea<<s>>e leave me in here <<s>>o I can be u<<s>>eful." <<elseif $activeSlave.devotion > 60>> -As she realizes her fate, the tears come quickly. "<<Master>>," she <<if !canTalk($activeSlave)>>signs<<else>><<say>>s quietly<</if>>, "i<<s>> thi<<s>> for me?" You nod, and she steps over to the machine. She lightly traces its gleaming metal, looking wistful. +As $he realizes $his fate, the tears come quickly. "<<Master>>," $he <<if !canTalk($activeSlave)>>signs<<else>><<say>>s quietly<</if>>, "i<<s>> thi<<s>> for me?" You nod, and $he steps over to the machine. $He lightly traces its gleaming metal, looking wistful. <<if ($activeSlave.amp != 1)>> <<if ($dairyStimulatorsSetting > 1)>> - She gently touches the head of the massive phallus that will soon penetrate her anus. It's broader than her fist. "M-my butthole i<<s>>n't going to be any good for anal after thi<<s>>." + $He gently touches the head of the massive phallus that will soon penetrate $his anus. It's broader than $his fist. "M-my butthole i<<s>>n't going to be any good for anal after thi<<s>>." <</if>> <<if ($dairyPregSetting > 1) && isFertile($activeSlave) && $activeSlave.mpreg != 1>> - She considers the enormous dildo that will fill her with cum when she's fertile, and switch to ejaculating drugs when she conceives. "I gue<<ss>> that thing won't have any trouble reaching my cervix." + $He considers the enormous dildo that will fill $him with cum when $he's fertile, and switch to ejaculating drugs when $he conceives. "I gue<<ss>> that thing won't have any trouble reaching my cervix." <</if>> <<if ($dairyFeedersSetting > 1)>> - She moves her hand to the dildo that will occupy her throat, feeding her. "I-I won't be able to t-talk m-much," she <<if !canTalk($activeSlave)>>signs<<else>><<say>>s<</if>> sadly. "<<S>>-<<s>>o, I'll <<s>>ay it one la<<s>>t time, <<Master>>: I love you." + $He moves $his hand to the dildo that will occupy $his throat, feeding $him. "I-I won't be able to t-talk m-much," $he <<if !canTalk($activeSlave)>>signs<<else>><<say>>s<</if>> sadly. "<<S>>-<<s>>o, I'll <<s>>ay it one la<<s>>t time, <<Master>>: I love you." <</if>> <</if>> <br><br> <<if ($activeSlave.amp != 1)>> - She strips and climbs into the machine's embrace. + $He strips and climbs into the machine's embrace. <<else>> - Another slave helps her strip and lays her in the machine. + Another slave helps $him strip and lays $him in the machine. <</if>> -"<<Master>>," she <<if !canTalk($activeSlave)>>signs<<else>>gasps out<</if>>, the tears coming fast now. "C-can you +"<<Master>>," $he <<if !canTalk($activeSlave)>>signs<<else>>gasps out<</if>>, the tears coming fast now. "C-can you <<if ($activeSlave.amp != 1)>> - h-hold my h-hand while it a-activate<<s>>? Plea<<s>>e?" You take her hand as the straps automatically tighten, robbing her of the ability to move. She grips your hand tightly. + h-hold my h-hand while it a-activate<<s>>? Plea<<s>>e?" You take $his hand as the straps automatically tighten, robbing $him of the ability to move. $He grips your hand tightly. <<else>> - <<S>>-<<s>>tay with me while it activate<<s>>? Plea<<s>>e?" You stand by as the straps automatically tighten, robbing her of the ability to move. + <<S>>-<<s>>tay with me while it activate<<s>>? Plea<<s>>e?" You stand by as the straps automatically tighten, robbing $him of the ability to move. <</if>> <<elseif $activeSlave.devotion > 20>> -She desperately tries to be brave and obey, but as her fate dawns on her, her courage and conditioning fail her. +$He desperately tries to be brave and obey, but as $his fate dawns on $him, $his courage and conditioning fail $him. <<if ($activeSlave.amp != 1)>> - She tries to wriggle away from the machine, so + $He tries to wriggle away from the machine, so <<else>> - She turns and tries to run, so + $He turns and tries to run, so <</if>> <<if ($Milkmaid == 0)>> you are @@ -150,12 +151,12 @@ She desperately tries to be brave and obey, but as her fate dawns on her, her co <</if>> obliged to <<if ($activeSlave.amp != 1)>> - subdue her and strap her, + subdue $him and strap $him, <<else>> - place her, + place $him, <</if>> begging and sobbing, into the machine's embrace. -"Plea<<s>>e, <<Master>>!" she <<if !canTalk($activeSlave)>>signs<<else>>begs<</if>>. "Plea<<s>>e no! +"Plea<<s>>e, <<Master>>!" $he <<if !canTalk($activeSlave)>>signs<<else>>begs<</if>>. "Plea<<s>>e no! <<if ($dairyStimulatorsSetting > 1)>> I-it'll fuck my b-butthole so wide I'll be u<<s>>ele<<ss>> for anal! <</if>> @@ -168,14 +169,14 @@ I'll d-do anything!" <<else>> -She starts to weep as soon as she realizes her fate. +$He starts to weep as soon as $he realizes $his fate. <<if $activeSlave.trust >= -20>> - She is afraid of you, but not afraid enough that she will not resist this. + $He is afraid of you, but not afraid enough that $he will not resist this. <</if>> <<if ($activeSlave.amp == 1)>> - She tries to wriggle away from the machine, so + $He tries to wriggle away from the machine, so <<else>> - She turns and tries to run, so + $He turns and tries to run, so <</if>> <<if ($Milkmaid == 0)>> you are @@ -184,13 +185,13 @@ She starts to weep as soon as she realizes her fate. <</if>> obliged to <<if ($activeSlave.amp != 1)>> - subdue her and strap her, + subdue $him and strap $him, <<else>> - place her, + place $him, <</if>> begging and sobbing, into the machine's embrace. -"Plea<<s>>e, <<Master>>!" she <<if !canTalk($activeSlave)>>signs<<else>>begs<</if>>. "Plea<<s>>e no! +"Plea<<s>>e, <<Master>>!" $he <<if !canTalk($activeSlave)>>signs<<else>>begs<</if>>. "Plea<<s>>e no! <<if ($dairyStimulatorsSetting > 1)>> I-it'll fuck my b-butthole so loo<<s>>e I'll be u<<s>>ele<<ss>> for anal! I p-promi<<s>>e I'll be a good little bitch from now on! <</if>> @@ -204,27 +205,27 @@ I'll d-do anything!" <</if>> /* CLOSES DEVOTION */ <<if $activeSlave.lactation > 0>> - A big soft cup attaches itself <<if $activeSlave.nipples == "fuckable">>over<<else>>to<</if>> each of her nipples. + A big soft cup attaches itself <<if $activeSlave.nipples == "fuckable">>over<<else>>to<</if>> each of $his nipples. <<if ($activeSlave.nipples == "inverted")>> - She gasps with pain as suction unceremoniously hauls her inverted nipples down into the cups. + $He gasps with pain as suction unceremoniously hauls $his inverted nipples down into the cups. <</if>> <</if>> <<if $activeSlave.balls > 0>> <<if $activeSlave.dick > 0>> - The first drugs hiss into her, + The first drugs hiss into $him, <<if $activeSlave.dick > 8>> - and her eyes roll back as much of her blood volume rushes into her dick, though it remains soft. + and $his eyes roll back as much of $his blood volume rushes into $his dick, though it remains soft. <<elseif $activeSlave.dick > 6>> - and she goes limp as much of her blood volume rushes to bring her to half mast. + and $he goes limp as much of $his blood volume rushes to bring $him to half mast. <<else>> - bringing her to a full erection. + bringing $him to a full erection. <</if>> - She gasps as the warm, wet receptacle surrounds her cock. + $He gasps as the warm, wet receptacle surrounds $his cock. <<else>> - <<if $activeSlave.lactation > 0>>Another<<else>>A big soft<</if>> cup is placed against her little front cumhole. + <<if $activeSlave.lactation > 0>>Another<<else>>A big soft<</if>> cup is placed against $his little front cumhole. <</if>> <</if>> -A visor lowers onto her face to keep her mind at least minimally stimulated. It will display garish hardcore pornography featuring +A visor lowers onto $his face to keep $his mind at least minimally stimulated. It will display garish hardcore pornography featuring <<if ($dairyFeedersSetting > 1)>> throatfucking, cum swallowing, <</if>> @@ -243,162 +244,162 @@ and brutal sodomy. <<if ($activeSlave.anus < 3) || (($activeSlave.vagina < 3) && ($activeSlave.vagina > -1))>> <<set $activeSlave.anus = 3>> <<if $activeSlave.vagina > -1>><<set $activeSlave.vagina = 3>><</if>> - The machine detects that she requires the attention of the preparatory raper before it can penetrate her successfully, and holds her in place while the raper slides along its track in the ceiling. It comes to rest above the slave's defenseless body and extends its implements towards her. She can't see or hear it, but she senses that something's happening and shivers. + The machine detects that $he requires the attention of the preparatory raper before it can penetrate $him successfully, and holds $him in place while the raper slides along its track in the ceiling. It comes to rest above the slave's defenseless body and extends its implements towards $him. $He can't see or hear it, but $he senses that something's happening and shivers. <<if ($dairyPregSetting > 1) && ($dairyPregSetting > 1) && isFertile($activeSlave) && ($activeSlave.vagina < 3) && $activeSlave.mpreg != 1>> - Her pussy is nowhere near ready to accept the passage of drugs and cum in and new slaves out. The new machine lubes her thoroughly and then <<if $activeSlave.vagina == 0>>takes her virginity<<else>>starts to fuck her<</if>> with a reasonably sized dildo. + $His pussy is nowhere near ready to accept the passage of drugs and cum in and new slaves out. The new machine lubes $him thoroughly and then <<if $activeSlave.vagina == 0>>takes $his virginity<<else>>starts to fuck $him<</if>> with a reasonably sized dildo. <</if>> <<if ($dairyStimulatorsSetting > 1) && ($activeSlave.anus < 3)>> - She'll be drinking through her mouth almost constantly, but that won't be enough. She'll have to absorb hydration and nutrition from both ends to keep up with the outflow she'll produce. <<if ($dairyPregSetting > 1) && ($dairyPregSetting > 1) && isFertile($activeSlave) && ($activeSlave.vagina < 3) && $activeSlave.mpreg != 1>>It<<else>>The new machine<</if>> fills her ass with lube and then penetrates her <<if $activeSlave.anus == 0>>her virgin anus<<else>>her rectum<</if>> gently. + $He'll be drinking through $his mouth almost constantly, but that won't be enough. $He'll have to absorb hydration and nutrition from both ends to keep up with the outflow $he'll produce. <<if ($dairyPregSetting > 1) && ($dairyPregSetting > 1) && isFertile($activeSlave) && ($activeSlave.vagina < 3) && $activeSlave.mpreg != 1>>It<<else>>The new machine<</if>> fills $his ass with lube and then penetrates $his <<if $activeSlave.anus == 0>>virgin anus<<else>>rectum<</if>> gently. <</if>> - She's worked in gradually, but every time she's loosened just slightly, the now-inadequate dildo is replaced by a larger one, and eventually more than one. + $He's worked in gradually, but every time $he's loosened just slightly, the now-inadequate dildo is replaced by a larger one, and eventually more than one. <<if ($dairyPregSetting > 1) && isFertile($activeSlave) && ($activeSlave.vagina < 3) && $activeSlave.mpreg != 1>> <<if ($dairyStimulatorsSetting > 1) && ($activeSlave.anus < 3)>> - She goes from a dildo in the pussy and a dildo in the ass, through numerous interesting combinations of double penetration, until she's got two porn star sized dildos sliding in and out of her pussy and two more fucking her ass. + $He goes from a dildo in the pussy and a dildo in the ass, through numerous interesting combinations of double penetration, until $he's got two porn star sized dildos sliding in and out of $his pussy and two more fucking $his ass. <<else>> - Her womanhood goes from a normal dildo to a big dildo to two dildos, and so on, until she's taking the equivalent of two porn star cocks. + $His womanhood goes from a normal dildo to a big dildo to two dildos, and so on, until $he's taking the equivalent of two porn star cocks. <</if>> <<else>> - Her asshole goes from a normal dildo to a big dildo to two dildos, and so on, until she's taking the equivalent of two porn star cocks up the butt. + $His asshole goes from a normal dildo to a big dildo to two dildos, and so on, until $he's taking the equivalent of two porn star cocks up the butt. <</if>> This is a long process, and though <<if $activeSlave.devotion > 95>> - she started out getting off on it, + $he started out getting off on it, <<elseif $activeSlave.devotion > 60>> - she did her best to enjoy herself for a while, + $he did $his best to enjoy $himself for a while, <<elseif $activeSlave.devotion > 20>> - she tried to relax and make it easier on herself at the start, + $he tried to relax and make it easier on $himself at the start, <<else>> - she cried and tried to break loose for a while, + $he cried and tried to break loose for a while, <</if>> - she's slumped against the machine from sheer exhaustion by the end. Its work completed, the preparatory raper withdraws and lets the milking machine begin its work. It's only been a few hours since $activeSlave.slaveName's ordeal began, but now she's ready to begin giving back. The machine revives her with a hit of pharmaceuticals. + $he's slumped against the machine from sheer exhaustion by the end. Its work completed, the preparatory raper withdraws and lets the milking machine begin its work. It's only been a few hours since $activeSlave.slaveName's ordeal began, but now $he's ready to begin giving back. The machine revives $him with a hit of pharmaceuticals. <br><br> <</if>> <<if ($dairyPregSetting > 1) && isFertile($activeSlave) && $activeSlave.mpreg != 1>> - Her vagina goes first. She relaxes her loose cunt for the elephantine dildo, but despite her best efforts, it forces a gasp out of her as it slides in. It remains stationary for now, but $activeSlave.slaveName know it's just the beginning, and she already feels full to bursting. + $His vagina goes first. $He relaxes $his loose cunt for the elephantine dildo, but despite $his best efforts, it forces a gasp out of $him as it slides in. It remains stationary for now, but $activeSlave.slaveName know it's just the beginning, and $he already feels full to bursting. <<if $activeSlave.devotion > 95>> - She takes more deep breaths, doing her best to remain calm. + $He takes more deep breaths, doing $his best to remain calm. <<elseif $activeSlave.devotion > 60>> - Terrified, she cries harder. + Terrified, $he cries harder. <<elseif $activeSlave.devotion > 20>> - Terrified, she cries harder. + Terrified, $he cries harder. <<else>> - Terrified, she starts to scream and cry. + Terrified, $he starts to scream and cry. <</if>> <<elseif ($dairyPregSetting > 0) && isFertile($activeSlave) && $activeSlave.mpreg != 1>> <<if $activeSlave.devotion > 95>> - She moans with pleasure + $He moans with pleasure <<elseif $activeSlave.devotion > 60>> - She gasps + $He gasps <<elseif $activeSlave.devotion > 20>> - She moans with fear + $He moans with fear <<else>> - She moans with anguish + $He moans with anguish <</if>> - as the machine inserts a warm, lubricated dildo into her vagina. + as the machine inserts a warm, lubricated dildo into $his vagina. <</if>> <<if ($dairyStimulatorsSetting > 1)>> - Her anus is next. An auxiliary dildo the size of the largest human cocks goes first, assraping her so hard she'd probably be injured if she wasn't already very loose. + $His anus is next. An auxiliary dildo the size of the largest human cocks goes first, assraping $him so hard $he'd probably be injured if $he wasn't already very loose. <<if $activeSlave.devotion > 95>> - She relaxes and does her best to enjoy herself, her cheeks flushing with arousal. Once her sphincter is well stretched, the machine withdraws the dildo, and before her anus can begin to close, the machine replaces it with the main instrument. Despite the preparation, it's so huge that she moans with fear she feels the head touch her buttocks. The moan becomes a long low groan as her butthole accommodates the enormous thing. When it's all the way in, the dildo begins to withdraw for its first stroke, and she <<if !canTalk($activeSlave)>>signs<<else>>whispers<</if>>, "<<Master>>, it's <<s>>-<<s>>o b-big." She relaxes and recollects herself, and then adds, "I can do thi<<s>>." + $He relaxes and does $his best to enjoy $himself, $his cheeks flushing with arousal. Once $his sphincter is well stretched, the machine withdraws the dildo, and before $his anus can begin to close, the machine replaces it with the main instrument. Despite the preparation, it's so huge that $he moans with fear $he feels the head touch $his buttocks. The moan becomes a long low groan as $his butthole accommodates the enormous thing. When it's all the way in, the dildo begins to withdraw for its first stroke, and $he <<if !canTalk($activeSlave)>>signs<<else>>whispers<</if>>, "<<Master>>, it's <<s>>-<<s>>o b-big." $He relaxes and recollects $himself, and then adds, "I can do thi<<s>>." <<elseif $activeSlave.devotion > 60>> - She tries to <<if $activeSlave.analSkill > 10>>apply her anal training<<else>>relax<</if>>, but it fucks her butt so mercilessly that she eventually gives up and relaxes completely. This is what the machine was aiming for; it withdraws the dildo, and before her sphincter can close, it replaces it with the main instrument. Despite the preparation, it's so huge that she begins to scream in terror as she feels the head touch her buttocks. Her yelling becomes a drawn-out shriek as her butthole accommodates the enormous thing. When she finally runs out of breath and slumps within her restraints, the dildo begins to withdraw for its first stroke, and she <<if !canTalk($activeSlave)>>signs<<else>>whispers<</if>>, "<<Master>>, it's too b-big. It hu-hurt<<s>>." + $He tries to <<if $activeSlave.analSkill > 10>>apply $his anal training<<else>>relax<</if>>, but it fucks $his butt so mercilessly that $he eventually gives up and relaxes completely. This is what the machine was aiming for; it withdraws the dildo, and before $his sphincter can close, it replaces it with the main instrument. Despite the preparation, it's so huge that $he begins to scream in terror as $he feels the head touch $his buttocks. $His yelling becomes a drawn-out shriek as $his butthole accommodates the enormous thing. When $he finally runs out of breath and slumps within $his restraints, the dildo begins to withdraw for its first stroke, and $he <<if !canTalk($activeSlave)>>signs<<else>>whispers<</if>>, "<<Master>>, it's too b-big. It hu-hurt<<s>>." <<elseif $activeSlave.devotion > 20>> - Crying, she tries to <<if $activeSlave.analSkill > 10>>apply her anal training<<else>>relax<</if>>, but it fucks her butt so mercilessly that she eventually gives up and relaxes completely. This is what the machine was aiming for; it withdraws the dildo, and before her sphincter can close, it replaces it with the main instrument. Despite the preparation, it's so huge that she begins to beg desperately as she feels the head touch her buttocks. Her whining becomes a drawn-out shriek as her butthole accommodates the enormous thing. When she finally runs out of breath and slumps within her restraints, the dildo begins to withdraw for its first stroke, and she is racked with sobs. + Crying, $he tries to <<if $activeSlave.analSkill > 10>>apply $his anal training<<else>>relax<</if>>, but it fucks $his butt so mercilessly that $he eventually gives up and relaxes completely. This is what the machine was aiming for; it withdraws the dildo, and before $his sphincter can close, it replaces it with the main instrument. Despite the preparation, it's so huge that $he begins to beg desperately as $he feels the head touch $his buttocks. $His whining becomes a drawn-out shriek as $his butthole accommodates the enormous thing. When $he finally runs out of breath and slumps within $his restraints, the dildo begins to withdraw for its first stroke, and $he is racked with sobs. <<else>> - She obviously thinks this is what her butt will suffer, and doesn't like it. She's tragically wrong. When she finally relaxes, the machine withdraws the dildo, and before her sphincter can close, it replaces it with the main instrument. She screams with the horror of realization and begins to beg desperately as she feels its head touch her buttocks. Her cries become a drawn-out shriek as her butthole accommodates the enormous thing. When she finally runs out of breath and slumps within her restraints, the dildo begins to withdraw for its first stroke, and she is racked with weeping. + $He obviously thinks this is what $his butt will suffer, and doesn't like it. $He's tragically wrong. When $he finally relaxes, the machine withdraws the dildo, and before $his sphincter can close, it replaces it with the main instrument. $He screams with the horror of realization and begins to beg desperately as $he feels its head touch $his buttocks. $His cries become a drawn-out shriek as $his butthole accommodates the enormous thing. When $he finally runs out of breath and slumps within $his restraints, the dildo begins to withdraw for its first stroke, and $he is racked with weeping. <</if>> <<if ($dairyPregSetting > 1) && isFertile($activeSlave) && $activeSlave.mpreg != 1>> - The dildo in her vagina begins to fuck her as well. Between her terribly broadened holes, her stretched perineum is barely visible at all. + The dildo in $his vagina begins to fuck $him as well. Between $his terribly broadened holes, $his stretched perineum is barely visible at all. <</if>> <<elseif ($dairyStimulatorsSetting > 0)>> <<if $activeSlave.devotion > 95>> - She groans as the machine pushes a big dildo up her butt and begins to sodomize her powerfully. + $He groans as the machine pushes a big dildo up $his butt and begins to sodomize $him powerfully. <<elseif $activeSlave.devotion > 60>> - She sobs as the machine pushes a big dildo up her butt and begins to sodomize her powerfully. + $He sobs as the machine pushes a big dildo up $his butt and begins to sodomize $him powerfully. <<elseif $activeSlave.devotion > 20>> - She sobs as the machine pushes a big dildo up her butt and begins to sodomize her powerfully. + $He sobs as the machine pushes a big dildo up $his butt and begins to sodomize $him powerfully. <<else>> - She cries as the machine pushes a big dildo up her butt and begins to sodomize her powerfully. + $He cries as the machine pushes a big dildo up $his butt and begins to sodomize $him powerfully. <</if>> <</if>> <<if ($dairyFeedersSetting > 1)>> <<if $activeSlave.devotion > 95>> - A manipulator prods her jaw open and a phallus slides into her throat, working around for a while to find the optimal position for maximum penetration where she can still breathe through her nose. There is a hiss as the food begins rushing through the phallus and down her throat. + A manipulator prods $his jaw open and a phallus slides into $his throat, working around for a while to find the optimal position for maximum penetration where $he can still breathe through $his nose. There is a hiss as the food begins rushing through the phallus and down $his throat. <<elseif $activeSlave.devotion > 60>> - She tries to say something, but she left it too late. A manipulator forces her jaw open and a phallus slides into her throat, working around for a while to find the optimal position for maximum penetration where she can still breathe through her nose. There is a hiss as the food begins rushing through the phallus and down her throat. + $He tries to say something, but $he left it too late. A manipulator forces $his jaw open and a phallus slides into $his throat, working around for a while to find the optimal position for maximum penetration where $he can still breathe through $his nose. There is a hiss as the food begins rushing through the phallus and down $his throat. <<elseif $activeSlave.devotion > 20>> - Her crying is abruptly cut off as a manipulator forces her jaw open and a phallus slides into her throat, working around for a while to find the optimal position for maximum penetration where she can still breathe through her nose. + $His crying is abruptly cut off as a manipulator forces $his jaw open and a phallus slides into $his throat, working around for a while to find the optimal position for maximum penetration where $he can still breathe through $his nose. <<else>> - She cries hopelessly, "I'm n-never going t-to leave h-here, am I, M-" Her noise is abruptly cut off as a manipulator forces her jaw open and a phallus slides into her throat, working around for a while to find the optimal position for maximum penetration where she can still breathe through her nose. + $He cries hopelessly, "I'm n-never going t-to leave h-here, am I, M-" $His noise is abruptly cut off as a manipulator forces $his jaw open and a phallus slides into $his throat, working around for a while to find the optimal position for maximum penetration where $he can still breathe through $his nose. <</if>> <<elseif ($dairyFeedersSetting > 0)>> <<if $activeSlave.devotion > 95>> - The machine gives her a phallus to suck on. + The machine gives $him a phallus to suck on. <<elseif $activeSlave.devotion > 60>> - She tries to say something, but she left it too late. The machine gives her a phallus to suck on. + $He tries to say something, but $he left it too late. The machine gives $him a phallus to suck on. <<elseif $activeSlave.devotion > 20>> - Her crying is abruptly cut off as the machine gives her a phallus to suck on. + $His crying is abruptly cut off as the machine gives $him a phallus to suck on. <<else>> - She cries hopelessly, "I'm n-never going t-to leave h-here, am I, M-" Her noise is abruptly cut off as the machine forces a phallus into her mouth. + $He cries hopelessly, "I'm n-never going t-to leave h-here, am I, M-" $His noise is abruptly cut off as the machine forces a phallus into $his mouth. <</if>> <</if>> <br><br> -With its various applicators inserted and working, the machine begins to ejaculate necessary fluids into her body. You cannot see much direct evidence, but the inrush of fluids is clear from the draining reservoirs scattered around the machine. +With its various applicators inserted and working, the machine begins to ejaculate necessary fluids into $his body. You cannot see much direct evidence, but the inrush of fluids is clear from the draining reservoirs scattered around the machine. <<if ($dairyStimulatorsSetting > 1)>> - The gargantuan phallus fucking her butthole ejaculates industrial lubricant, hydration, nutrition, and medication, to be absorbed by her lower intestines. + The gargantuan phallus fucking $his butthole ejaculates industrial lubricant, hydration, nutrition, and medication, to be absorbed by $his lower intestines. <<elseif ($dairyStimulatorsSetting > 0)>> - The phallus fucking her ass ejaculates hydration, nutrition, and medication, to be absorbed by her colon. + The phallus fucking $his ass ejaculates hydration, nutrition, and medication, to be absorbed by $his colon. <</if>> <<if ($dairyPregSetting > 1) && isFertile($activeSlave) && $activeSlave.mpreg != 1>> - The dildo in her vagina ejaculates cum, fertility drugs, and medication designed to cause uncontrollable natural lubrication, so it will not damage her too severely. + The dildo in $his vagina ejaculates cum, fertility drugs, and medication designed to cause uncontrollable natural lubrication, so it will not damage $him too severely. <<elseif ($dairyPregSetting > 0) && isFertile($activeSlave) && $activeSlave.mpreg != 1>> - The dildo in her vagina ejaculates cum and fertility drugs. + The dildo in $his vagina ejaculates cum and fertility drugs. <</if>> <<if ($dairyFeedersSetting > 0)>> - There is a hiss as still more fluid containing hydration, nutrition, and medication begins rushing through the phallus in her mouth and down her throat. + There is a hiss as still more fluid containing hydration, nutrition, and medication begins rushing through the phallus in $his mouth and down $his throat. <</if>> -Finally, multiple drug injectors attach themselves to her and begin to use hypersonic jets to drive pharmaceuticals into her without needles. +Finally, multiple drug injectors attach themselves to $him and begin to use hypersonic jets to drive pharmaceuticals into $him without needles. <<if $activeSlave.devotion > 95>> - Her eyes fly wide as she hears and feels the number of injections. She knows these drugs are not without side effects, and she's being injected with a normal day's dose every minute. She musters her resolve and relaxes again, relying on her knowledge that you want her to accept this fate. + $His eyes fly wide as $he hears and feels the number of injections. $He knows these drugs are not without side effects, and $he's being injected with a normal day's dose every minute. $He musters $his resolve and relaxes again, relying on $his knowledge that you want $him to accept this fate. <<elseif $activeSlave.devotion > 60>> - Her eyes fly wide and she stiffens with fear as she hears and feels the number of injections. She knows these drugs are not without side effects, and she's being injected with a normal day's dose every minute. She visibly tries to accept it, knowing that you want her to submit to this fate. + $His eyes fly wide and $he stiffens with fear as $he hears and feels the number of injections. $He knows these drugs are not without side effects, and $he's being injected with a normal day's dose every minute. $He visibly tries to accept it, knowing that you want $him to submit to this fate. <<elseif $activeSlave.devotion > 20>> - The tears streaming out of her eyes come faster as she hears and feels the number of injections. She knows these drugs are not without side effects, and she's being injected with a normal day's dose every minute. + The tears streaming out of $his eyes come faster as $he hears and feels the number of injections. $He knows these drugs are not without side effects, and $he's being injected with a normal day's dose every minute. <<else>> - She begins to struggle desperately as she hears and feels the number of injections. She knows these drugs are not without side effects, and she's being injected with a normal day's dose every minute. + $He begins to struggle desperately as $he hears and feels the number of injections. $He knows these drugs are not without side effects, and $he's being injected with a normal day's dose every minute. <</if>> <br><br> -Fluids begin to come out of her. The drugs are strong, and despite everything she experiences an orgasm so powerful that it's clear why the straps that bind her are reinforced. +Fluids begin to come out of $him. The drugs are strong, and despite everything $he experiences an orgasm so powerful that it's clear why the straps that bind $him are reinforced. <<if $activeSlave.balls > 0>> - <<if $activeSlave.dick > 0>>The anal dildo fucks her even harder<<else>>If she had a dick, it would be caressed by a nice warm receptacle, but she doesn't. The milker is forced to rape her ass without mercy to force her to cum<</if>>, and she tries to scream around the dildo in her mouth. <<if $activeSlave.scrotum > 0>>Her balls tighten as she<<else>>She<</if>> shoots rope after rope of semen into the machine. + <<if $activeSlave.dick > 0>>The anal dildo fucks $him even harder<<else>>If $he had a dick, it would be caressed by a nice warm receptacle, but $he doesn't. The milker is forced to rape $his ass without mercy to force $him to cum<</if>>, and $he tries to scream around the dildo in $his mouth. <<if $activeSlave.scrotum > 0>>$His balls tighten as $he<<else>>$He<</if>> shoots rope after rope of semen into the machine. <</if>> <<if ($activeSlave.vagina > -1)>> - She gives the machine a nice gush of femcum. + $He gives the machine a nice gush of femcum. <</if>> <<if ($activeSlave.lactation > 0)>> - The cups sucking her nipples work away ceaselessly, her milk whitening the clear piping running into the machine. + The cups sucking $his nipples work away ceaselessly, $his milk whitening the clear piping running into the machine. <<set $activeSlave.lactationDuration = 2>> <<set $activeSlave.boobs -= $activeSlave.boobsMilk, $activeSlave.boobsMilk = 0>> <</if>> -The machine continues fucking her despite her climax. +The machine continues fucking $him despite $his climax. <<if $activeSlave.devotion > 95>> - Though it's difficult to tell, it's possible she's smiling around the dildo in her mouth. She may be such a well-broken sex slave that she can stand up to a life of nothing but drugs, milking, and an endless string of orgasms. To ease her acclimation to her new life, the drug cocktail is adjusted as her orgasm fades, + Though it's difficult to tell, it's possible $he's smiling around the dildo in $his mouth. $He may be such a well-broken sex slave that $he can stand up to a life of nothing but drugs, milking, and an endless string of orgasms. To ease $his acclimation to $his new life, the drug cocktail is adjusted as $his orgasm fades, <<elseif $activeSlave.devotion > 60>> - Despite her attempt to be brave, tears begin to leak out from behind her visor as she realizes that there will be no respite from the penetration. The drug cocktail is adjusted as her orgasm fades, + Despite $his attempt to be brave, tears begin to leak out from behind $his visor as $he realizes that there will be no respite from the penetration. The drug cocktail is adjusted as $his orgasm fades, <<elseif $activeSlave.devotion > 20>> - To ease her acclimation to her new life, the drug cocktail is adjusted as her orgasm fades, + To ease $his acclimation to $his new life, the drug cocktail is adjusted as $his orgasm fades, <<else>> - To allow her some rest despite her terror, the drug cocktail is adjusted as her orgasm fades, + To allow $him some rest despite $his terror, the drug cocktail is adjusted as $his orgasm fades, <</if>> -to put her to sleep. She slumps against the machine as she drops off. -<<if ($activeSlave.amp != 1)>>Her painfully tight grip on your hand finally loosens<</if>>. +to put $him to sleep. $He slumps against the machine as $he drops off. +<<if ($activeSlave.amp != 1)>>$His painfully tight grip on your hand finally loosens<</if>>. <<if ($dairyStimulatorsSetting > 1)>> - Her anus has not yet stretched to take the necessary full power setting, so she is gently sodomized as she sleeps to get her sphincter used to its permanent occupier. + $His anus has not yet stretched to take the necessary full power setting, so $he is gently sodomized as $he sleeps to get $his sphincter used to its permanent occupier. <</if>> <<if ($activeSlave.belly < 1500)>> - Her belly has already begun to distend from the mass of fluid ejaculated down her throat and into her stomach, <<if $activeSlave.ovaries == 1>>inside her womanhood and into her womb, and <</if>>up her butt and into her lower intestine. + $His belly has already begun to distend from the mass of fluid ejaculated down $his throat and into $his stomach, <<if $activeSlave.ovaries == 1>>inside $his womanhood and into $his womb, and <</if>>up $his butt and into $his lower intestine. <</if>> Silence returns to the dairy. diff --git a/src/uncategorized/lawCompliance.tw b/src/uncategorized/lawCompliance.tw index a164fe4cb23..ae4a1c955ec 100644 --- a/src/uncategorized/lawCompliance.tw +++ b/src/uncategorized/lawCompliance.tw @@ -51,7 +51,7 @@ <<set $activeSlave.muscles = random(50,100)>> lifting weights, <</if>> - and $his health has been raised to an almost unnatural level. + and $his health has been raised to an almost unnatural level. <<set $activeSlave.health = random(50,90)>> <<set $activeSlave.weight = random(-20,0)>> <<elseif $arcologies[0].FSHedonisticDecadenceSMR == 1>> diff --git a/src/uncategorized/pCitizensAndCivilians.tw b/src/uncategorized/pCitizensAndCivilians.tw index e1f45d648e6..e1cf7adea2d 100644 --- a/src/uncategorized/pCitizensAndCivilians.tw +++ b/src/uncategorized/pCitizensAndCivilians.tw @@ -10,7 +10,7 @@ <<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event">> <<if $assistant > 0>> - While working at your desk, you are accompanied by the luscious sound of $assistantName humming to herself, which _heA does to indicate _heA's working on a difficult task. After this goes on for a while, + While working at your desk, you are accompanied by the luscious sound of $assistantName humming to _himselfA, which _heA does to indicate _heA's working on a difficult task. After this goes on for a while, <<switch $assistantAppearance>> <<case "monstergirl">> _hisA monstergirl avatar uses _hisA tentacle hair to wave for your attention @@ -70,7 +70,7 @@ <<set $mercenaries = 5>> <<set $mercenariesTitle = "Knights">> <</replace>> -<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <<if $arcologies[0].FSRomanRevivalist >= 10>> <br><<link "They shall be my Evocati">> <<replace "#result">> @@ -80,7 +80,7 @@ <<set $mercenaries = 5>> <<set $mercenariesTitle = "Evocati">> <</replace>> -<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> <<if $arcologies[0].FSAztecRevivalist >= 10>> <br><<link "They shall be my Shorn Ones">> @@ -92,7 +92,7 @@ <<set $mercenaries = 5>> <<set $mercenariesTitle = "Shorn Ones">> <</replace>> -<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> <<if $arcologies[0].FSChineseRevivalist >= 10>> <<link "They shall be my Imperial Guards">> @@ -104,7 +104,7 @@ <<set $mercenaries = 5>> <<set $mercenariesTitle = "Imperial Guards">> <</replace>> -<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> <<if $arcologies[0].FSEgyptianRevivalist >= 10>> <br><<link "They shall be my Medjay">> @@ -115,7 +115,7 @@ <<set $mercenaries = 5>> <<set $mercenariesTitle = "Medjay">> <</replace>> -<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> <<if $arcologies[0].FSEdoRevivalist >= 10>> <br><<link "Naturally, they shall be the Samurai">> @@ -126,7 +126,7 @@ <<set $mercenaries = 5>> <<set $mercenariesTitle = "Samurai">> <</replace>> -<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> <<if $arcologies[0].FSArabianRevivalist >= 10>> <br><<link "They shall be my Janissaries">> @@ -137,7 +137,7 @@ <<set $mercenaries = 5>> <<set $mercenariesTitle = "Janissaries">> <</replace>> -<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> <<if $arcologies[0].FSChattelReligionist >= 10>> <br><<link "They shall be the Knights Templar">> @@ -148,7 +148,7 @@ <<set $mercenaries = 5>> <<set $mercenariesTitle = "Knights Templar">> <</replace>> -<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> <<if $arcologies[0].FSDegradationist >= 10>> <br><<link "They shall be my Immortals">> @@ -159,7 +159,7 @@ <<set $mercenaries = 5>> <<set $mercenariesTitle = "Immortals">> <</replace>> -<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> <<if $arcologies[0].FSAssetExpansionist >= 10>> <br><<link "They shall be the Vast Legions">> @@ -170,7 +170,7 @@ <<set $mercenaries = 5>> <<set $mercenariesTitle = "Vast Legions">> <</replace>> -<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> <<if $arcologies[0].FSTransformationFetishist >= 10>> <br><<link "They shall be the Surgical Corps">> @@ -181,7 +181,7 @@ <<set $mercenaries = 5>> <<set $mercenariesTitle = "Surgical Corps">> <</replace>> -<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> <<if $arcologies[0].FSGenderRadicalist >= 10>> <br><<link "They shall be the Inglorious Bitches">> @@ -192,7 +192,7 @@ <<set $mercenaries = 5>> <<set $mercenariesTitle = "Inglorious Bitches">> <</replace>> -<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> <<if $arcologies[0].FSGenderFundamentalist >= 10>> <br><<link "They shall be the Thousand Sons">> @@ -203,7 +203,7 @@ <<set $mercenaries = 5>> <<set $mercenariesTitle = "Thousand Sons">> <</replace>> -<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> <<if $arcologies[0].FSRepopulationFocus >= 10>> <br><<link "They shall be the Guardians of the Unborn">> @@ -214,7 +214,7 @@ <<set $mercenaries = 5>> <<set $mercenariesTitle = "Guardians of the Unborn">> <</replace>> -<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> <<if $arcologies[0].FSRestart >= 10>> <br><<link "They shall be my Shadowed Hand">> @@ -225,7 +225,7 @@ <<set $mercenaries = 5>> <<set $mercenariesTitle = "Shadowed Hand">> <</replace>> -<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> <<if $arcologies[0].FSPhysicalIdealist >= 10>> <br><<link "They shall be the Asgardians">> @@ -236,7 +236,7 @@ <<set $mercenaries = 5>> <<set $mercenariesTitle = "Asgardians">> <</replace>> -<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> <<if $arcologies[0].FSHedonisticDecadence >= 10>> <br><<link "They shall be the Tasters">> @@ -247,7 +247,7 @@ <<set $mercenaries = 5>> <<set $mercenariesTitle = "Tasters">> <</replace>> -<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> <<if $arcologies[0].FSSupremacist >= 10>> <br><<link "They shall be the Knights of the Blood">> @@ -258,7 +258,7 @@ <<set $mercenaries = 5>> <<set $mercenariesTitle = "Knights of the Blood">> <</replace>> -<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> <<if $arcologies[0].FSSubjugationist >= 10>> <br><<link "They shall be the Knights of the Purge">> @@ -269,7 +269,7 @@ <<set $mercenaries = 5>> <<set $mercenariesTitle = "Knights of the Purge">> <</replace>> -<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> <<if $arcologies[0].FSPaternalist >= 10>> <br><<link "They shall be the Wardens">> @@ -280,7 +280,7 @@ <<set $mercenaries = 5>> <<set $mercenariesTitle = "Wardens">> <</replace>> -<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> <<if $arcologies[0].FSBodyPurist >= 10>> <br><<link "They shall be the Purifiers">> @@ -291,7 +291,7 @@ <<set $mercenaries = 5>> <<set $mercenariesTitle = "Purifiers">> <</replace>> -<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> <<if $arcologies[0].FSSlimnessEnthusiast >= 10>> <br><<link "They shall be the Abstemious">> @@ -302,7 +302,7 @@ <<set $mercenaries = 5>> <<set $mercenariesTitle = "Abstemious">> <</replace>> -<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> <<if $arcologies[0].FSPastoralist >= 10>> <br><<link "They shall be the Rangers">> @@ -313,6 +313,6 @@ <<set $mercenaries = 5>> <<set $mercenariesTitle = "Rangers">> <</replace>> -<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> </span> diff --git a/src/uncategorized/pSchoolSuggestion.tw b/src/uncategorized/pSchoolSuggestion.tw index 0af88f73a4c..e3af1155036 100644 --- a/src/uncategorized/pSchoolSuggestion.tw +++ b/src/uncategorized/pSchoolSuggestion.tw @@ -30,7 +30,7 @@ The unusually competent young heiress standing next to him snickers. "If you're <br><br> "If you like them soft and mellow, you got to go with The Cattle Ranch," a buff man blurts loudly while slamming down his empty mug. "I've got a pair of 'em for my bedroom; they are so loving after a good milking. Taste good too." His drinking buddy retorts, "Too much work is what they are. They might as well be animals with how they act.<<if $seePreg == 0>> In addition, hope you like pregnant pussies cause you need to keep them gravid or their milk dries up.<</if>>" <br><br> -"I see good taste is scarce within this walls" suddenly stated a young man previously quiet in his corner. "I say quality and strength is where the game should be played and there's nothing better than the girls from the Hippolyta Academy. +"I see good taste is scarce within this walls," suddenly stated a young man previously quiet in his corner. "I say quality and strength is where the game should be played and there's nothing better than the girls from the Hippolyta Academy. <br><br> The older gentleman who seems to have been acting as unofficial moderator before you came in turns to you. "In any case, <<if $PC.title == 1>>sir<<else>>madam<</if>>, we agreed before you came in. We'd like to get together and pay half the cost of encouraging a slave school to set up a branch campus here, if you'd be willing to pay the other half and choose which. I think <<print cashFormat(10000)>> from you would cover it." He looks around the group. "Before we started this little debate, we all agreed to chip in regardless of which you chose." diff --git a/src/uncategorized/reAWOL.tw b/src/uncategorized/reAWOL.tw index 0497d3edf2e..d524af17309 100644 --- a/src/uncategorized/reAWOL.tw +++ b/src/uncategorized/reAWOL.tw @@ -39,7 +39,9 @@ <<set $activeSlave.sexualFlaw = "hates men">> <<set $activeSlave.hStyle = "shaved into a mohawk">> <<set $activeSlave.customTat = "She has a number of tattoos from a variety of mercenary companies.">> + <<setLocalPronouns $activeSlave>> +<<setAssistantPronouns>> Human soldiers are superior to drones in a number of ways - they have the capability for suspicion, the ability to understand human interactions, and are impervious to the ever-present threat of cyber-warfare. That said, a crucial failing of any sentient warrior is their agency. @@ -47,9 +49,9 @@ Human soldiers are superior to drones in a number of ways - they have the capabi On this particular evening, you find your work interrupted by an urgent alert from $assistantName. <<if $assistant > 0>> - "<<= properMaster()>>, one of the $mercenariesTitle has gone AWOL." She pauses before continuing. "$He's taken a number of weapons with $him." + "<<= properMaster()>>, one of the $mercenariesTitle has gone AWOL." _HeA pauses before continuing. "$He's taken a number of weapons with $him." <<else>> - It informs you that one of the $mercenariesTitle has disappeared, seemingly taking with $him a small stash of weapons. + _HeA informs you that one of the $mercenariesTitle has disappeared, seemingly taking with $him a small stash of weapons. <</if>> <br><br> @@ -189,4 +191,3 @@ Your window of opportunity to act is closing. If you have plans for punishing th <</if>> /* cash >= 5000 */ </span> /* closes result */ - diff --git a/src/uncategorized/reBusyArcade.tw b/src/uncategorized/reBusyArcade.tw index 6e9665a71d4..8d5a3a9caaf 100644 --- a/src/uncategorized/reBusyArcade.tw +++ b/src/uncategorized/reBusyArcade.tw @@ -14,21 +14,22 @@ <<else>> <<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "RIE Eligibility Check">> +<<setLocalPronouns $activeSlave>> <<run Enunciate($activeSlave)>> -Slaves in your arcade are not immured in the facility permanently, since holding them in one position at all times would negatively impact their health. They are released to exercise, eat, bathe, and sleep, though for nothing else. You occasionally inspect them when they do so, to see that their harsh lives are not inappropriately difficult for them. One day when you are doing so, <<EventNameLink $activeSlave>> flings herself on the ground in front of you the instant she sees you. +Slaves in your arcade are not immured in the facility permanently, since holding them in one position at all times would negatively impact their health. They are released to exercise, eat, bathe, and sleep, though for nothing else. You occasionally inspect them when they do so, to see that their harsh lives are not inappropriately difficult for them. One day when you are doing so, <<EventNameLink $activeSlave>> flings $himself on the ground in front of you the instant $he sees you. <br><br> -Facing the ground, <<if !canTalk($activeSlave)>>she gestures with shaking hands that she cannot take any more. She begs you abjectly to let her out of the arcade and promises to be a perfect sex slave if you do.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>she lisps through tears, <<else>>she sobs, <</if>>"<<Master>>, plea<<s>>e. I can't take any more of thi<<s>>. Plea<<s>>e let me out. I'll do anything, <<Master>>. I'll love you forever, <<Master>> - ju<<s>>t don't make me go back in<<s>>ide that wall." +Facing the ground, <<if !canTalk($activeSlave)>>$he gestures with shaking hands that $he cannot take any more. $He begs you abjectly to let $him out of the arcade and promises to be a perfect sex slave if you do.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>$he lisps through tears, <<else>>$he sobs, <</if>>"<<Master>>, plea<<s>>e. I can't take any more of thi<<s>>. Plea<<s>>e let me out. I'll do anything, <<Master>>. I'll love you forever, <<Master>> - ju<<s>>t don't make me go back in<<s>>ide that wall." <br><br> <span id="result"> -<<link "Accept her pledge">> +<<link "Accept $his pledge">> <<EventNameDelink $activeSlave>> <<replace "#result">> - When you accept, $activeSlave.slaveName looks up at you in incomprehension, expecting you to correct yourself or reveal that this is a cruel trick. When you do neither, she scrabbles spastically to your feet, kisses them as she cries, and then clings to your knees, sobbing. She is so relieved by this reprieve that she is now on the cusp of @@.hotpink;devotion to you,@@ and will obey out of near-paralytic fear of being sent back to the arcade. + When you accept, $activeSlave.slaveName looks up at you in incomprehension, expecting you to correct yourself or reveal that this is a cruel trick. When you do neither, $he scrabbles spastically to your feet, kisses them as $he cries, and then clings to your knees, sobbing. $He is so relieved by this reprieve that $he is now on the cusp of @@.hotpink;devotion to you,@@ and will obey out of near-paralytic fear of being sent back to the arcade. <<set $activeSlave.devotion = 45>> <<= removeJob($activeSlave, "be confined in the arcade")>> <</replace>> @@ -36,10 +37,9 @@ Facing the ground, <<if !canTalk($activeSlave)>>she gestures with shaking hands <br><<link "Refuse">> <<EventNameDelink $activeSlave>> <<replace "#result">> - She did not really expect mercy, but her sobs take on a distinctly dark tone of hopelessness at your refusal. As you personally immure her in the arcade for another day of endless dick, you wonder whether she'll damage her throat with all the commotion she's making. Several of the other arcade slaves glance dully over at the noise. Then, they look away. + $He did not really expect mercy, but $his sobs take on a distinctly dark tone of hopelessness at your refusal. As you personally immure $him in the arcade for another day of endless dick, you wonder whether $he'll damage $his throat with all the commotion $he's making. Several of the other arcade slaves glance dully over at the noise. Then, they look away. <</replace>> <</link>> </span> <</if>> - diff --git a/src/uncategorized/reBusyBrothel.tw b/src/uncategorized/reBusyBrothel.tw index 3b7594a3acd..fee3125824e 100644 --- a/src/uncategorized/reBusyBrothel.tw +++ b/src/uncategorized/reBusyBrothel.tw @@ -23,7 +23,7 @@ Of course, $brothelName is the best establishment of its kind in the arcology. C <</link>> //This will cost <<print cashFormat(1000)>>// <br><<link "Hire an expert hooker to give lessons">> <<replace "#result">> - The citizen streetwalker has had her day. A few of the cleverest have avoided being driven into poverty, either by becoming madams or by finding a way to build a new career serving the slave brothel industry. One of these is touring the city, offering her long sexual experience in seminars for slave prostitutes. Her services are not cheap, but it rapidly becomes clear that they are worth it. She is a grey-haired but still elegant woman with deep crow's feet and a smoker's voice. She is not only a sexual master, but a hardbitten and comprehensively experienced businesswoman. All of your brothel slaves with any room for improvement in their whoring skills @@.green;learn from her lessons,@@ while those who have nothing to learn @@.hotpink;gain confidence@@ from her praise. + The citizen streetwalker has had her day. A few of the cleverest have avoided being driven into poverty, either by becoming madams or by finding a way to build a new career serving the slave brothel industry. One of these is touring the city, offering her long sexual experience in seminars for slave prostitutes. Her services are not cheap, but it rapidly becomes clear that they are worth it. She is a grey-haired but still elegant woman with deep crow's feet and a smoker's voice. She is not only a sexual master, but a hard-bitten and comprehensively experienced businesswoman. All of your brothel slaves with any room for improvement in their whoring skills @@.green;learn from her lessons,@@ while those who have nothing to learn @@.hotpink;gain confidence@@ from her praise. <<for $i = 0; $i < $BrothiIDs.length; $i++>> <<if $slaves[$slaveIndices[$BrothiIDs[$i]]].whoreSkill < 100>> <<set $slaves[$i].whoreSkill += 10>> diff --git a/src/uncategorized/rePokerNight.tw b/src/uncategorized/rePokerNight.tw index b001bf1695c..f4d308cf4da 100644 --- a/src/uncategorized/rePokerNight.tw +++ b/src/uncategorized/rePokerNight.tw @@ -2,15 +2,17 @@ <<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", $returnTo = "RIE Eligibility Check">> +<<setAssistantPronouns>> + Despite their persistent presence in your arcology, interaction with your mercenaries is relatively scarce. Aside from mutually exchanged nods on the street and the occasional briefing, your $mercenariesTitle enjoy a degree of autonomy. <br><br> On a particularly lackadaisical evening, you find yourself alerted to a message alert by $assistantName. <<if $assistant > 0>> - "<<= properMaster()>>, a message from your $mercenariesTitle." She pauses before continuing. "It seems they're asking if you'd like to join their poker night." + "<<= properMaster()>>, a message from your $mercenariesTitle." _HeA pauses before continuing. "It seems they're asking if you'd like to join their poker night." <<else>> - It informs you that the $mercenariesTitle have sent a message asking you to join them at their poker night. + _HeA informs you that the $mercenariesTitle have sent a message asking you to join them at their poker night. <</if>> <br><br> diff --git a/src/uncategorized/reRebels.tw b/src/uncategorized/reRebels.tw index ccc2bf2733b..428043986e5 100644 --- a/src/uncategorized/reRebels.tw +++ b/src/uncategorized/reRebels.tw @@ -2,8 +2,11 @@ <<set $nextButton = "Continue">> <<set $nextLink = "RIE Eligibility Check">> + <<set _i = $slaveIndices[$rebelSlaves[0]]>> <<set _j = $slaveIndices[$rebelSlaves[1]]>> +<<setLocalPronouns $slaves[_i]>> +<<setLocalPronouns $slaves[_j] 2>> You have a rebel problem. $slaves[_i].slaveName and $slaves[_j].slaveName are both unbroken, and they seem to draw strength from each other. They're discreet about it, but the arcology's always-vigilant systems occasionally catch them nodding to one another after one of them is punished, or giving each other quiet words of encouragement when they think no one is listening. This is extremely dangerous and should be addressed promptly. @@ -38,47 +41,47 @@ You have a rebel problem. $slaves[_i].slaveName and $slaves[_j].slaveName are bo You haul your bound little rebel bitches into one of the deepest, most out of the way rooms of your penthouse with bags over their heads. When you pull them off, they are met with the sight of a gallows, complete with a pair of nooses. You haul them, one at a time up onto a stool and loop the rope around their necks. They scream and beg the whole time for you to reconsider, before turning on each other to try and avoid their fate. It won't be that easy for them. You hold up a pair of spoons and explain the rules of the game. They'll hold them in their pussies, and whoever loses their grip and drops it first, dies. <br><br> <<if $slaves[_i].vagina > 3>> - You start with $slaves[_i].slaveName and no sooner than you turn to $slaves[_j].slaveName do you hear the telltale clatter of the spoon hitting the floor. With a simple kick, the unfortunately loose $slaves[_i].slaveName is left struggling in the air. $slaves[_j].slaveName <<if canSee($slaves[_j])>>watches<<elseif canHear($slaves[_j])>>listens<<else>>stares blankly<</if>> in horror as the life drains from her former accomplice. @@.gold;She promises to never cross you again.@@ + You start with $slaves[_i].slaveName and no sooner than you turn to $slaves[_j].slaveName do you hear the telltale clatter of the spoon hitting the floor. With a simple kick, the unfortunately loose $slaves[_i].slaveName is left struggling in the air. $slaves[_j].slaveName <<if canSee($slaves[_j])>>watches<<elseif canHear($slaves[_j])>>listens<<else>>stares blankly<</if>> in horror as the life drains from _his2 former accomplice. @@.gold;_He2 promises to never cross you again.@@ <<set $slaves[_j].trust -= 20>> <<set $activeSlave = $slaves[_i]>> <<include "Remove activeSlave">> <<elseif $slaves[_j].vagina > 3>> - You start with $slaves[_i].slaveName before moving to $slaves[_j].slaveName as she holds her life between her netherlips. Setting the spoon inside $slaves[_j].slaveName, you prepare to kick the stools out from under them; but the telltale clatter of the spoon hitting the floor saves you the trouble. With a simple kick, the unfortunately loose $slaves[_j].slaveName is left struggling in the air. $slaves[_i].slaveName <<if canSee($slaves[_i])>>watches<<elseif canHear($slaves[_i])>>listens<<else>>stares blankly<</if>> in horror as the life drains from her former accomplice. @@.gold;She promises to never cross you again.@@ + You start with $slaves[_i].slaveName before moving to $slaves[_j].slaveName as $he holds $his life between $his netherlips. Setting the spoon inside $slaves[_j].slaveName, you prepare to kick the stools out from under them; but the telltale clatter of the spoon hitting the floor saves you the trouble. With a simple kick, the unfortunately loose $slaves[_j].slaveName is left struggling in the air. $slaves[_i].slaveName <<if canSee($slaves[_i])>>watches<<elseif canHear($slaves[_i])>>listens<<else>>stares blankly<</if>> in horror as the life drains from $his former accomplice. @@.gold;$He promises to never cross you again.@@ <<set $slaves[_i].trust -= 20>> <<set $activeSlave = $slaves[_j]>> <<include "Remove activeSlave">> <<elseif random(1,100) == 69>> - You start with $slaves[_i].slaveName before moving to $slaves[_j].slaveName as she holds her life between her netherlips. Once both spoons are inserted, you sit back and watch them squirm at the cold metal in their most sensitive recesses. They are both desperate to survive and clamp down as hard as they can, but it can't go on forever as the sounds of a spoon clattering to the floor fills the room. Both slaves freeze as they realize the other has lost their grip on the silverware, uncertain of what comes next. You answer the question by knocking the stools out from under them, allowing them both to hang. They came into this together and they are going out together. + You start with $slaves[_i].slaveName before moving to $slaves[_j].slaveName as $he holds $his life between $his netherlips. Once both spoons are inserted, you sit back and watch them squirm at the cold metal in their most sensitive recesses. They are both desperate to survive and clamp down as hard as they can, but it can't go on forever as the sounds of a spoon clattering to the floor fills the room. Both slaves freeze as they realize the other has lost their grip on the silverware, uncertain of what comes next. You answer the question by knocking the stools out from under them, allowing them both to hang. They came into this together and they are going out together. <<set $activeSlave = $slaves[_i]>> <<include "Remove activeSlave">> <<set $activeSlave = $slaves[_j]>> <<include "Remove activeSlave">> <<elseif $slaves[_i].vagina == $slaves[_j].vagina && random(1,100) > 50>> - You start with $slaves[_i].slaveName before moving to $slaves[_j].slaveName as she holds her life between her netherlips. Once both spoons are inserted, you sit back and watch them squirm at the cold metal in their most sensitive recesses. They are both <<if $slaves[_i].vagina == 1>>quite tight, so it's no surprise when they put up a good show.<<else>>not the tightest slaves, so it's a surprise they manage to hold on as long as they do<</if>>. But it can't go on forever as the sound of the spoon clattering to the floor fills the room. + You start with $slaves[_i].slaveName before moving to $slaves[_j].slaveName as $he holds $his life between $his netherlips. Once both spoons are inserted, you sit back and watch them squirm at the cold metal in their most sensitive recesses. They are both <<if $slaves[_i].vagina == 1>>quite tight, so it's no surprise when they put up a good show.<<else>>not the tightest slaves, so it's a surprise they manage to hold on as long as they do<</if>>. But it can't go on forever as the sound of the spoon clattering to the floor fills the room. <<if random(1,100) <= 50>> - You kick the stool out from under $slaves[_j].slaveName and let her hang. $slaves[_i].slaveName <<if canSee($slaves[_i])>>watches<<elseif canHear($slaves[_i])>>listens<<else>>stares blankly<</if>> in horror as the life drains from her former accomplice, @@.gold;terrified that you'd so callously toy with their lives.@@ The ordeal @@.red;leaves her behaving strangely.@@ + You kick the stool out from under $slaves[_j].slaveName and let _him2 hang. $slaves[_i].slaveName <<if canSee($slaves[_i])>>watches<<elseif canHear($slaves[_i])>>listens<<else>>stares blankly<</if>> in horror as the life drains from $his former accomplice, @@.gold;terrified that you'd so callously toy with their lives.@@ The ordeal @@.red;leaves $him behaving strangely.@@ <<set $slaves[_i].trust -= -20, $slaves[_i].behavioralFlaw = "odd">> <<set $activeSlave = $slaves[_j]>> <<else>> - You kick the stool out from under $slaves[_i].slaveName and let her hang. $slaves[_j].slaveName <<if canSee($slaves[_j])>>watches<<elseif canHear($slaves[_j])>>listens<<else>>stares blankly<</if>> in horror as the life drains from her former accomplice, @@.gold;terrified that you'd so callously toy with their lives.@@ The ordeal @@.red;leaves her behaving strangely.@@ + You kick the stool out from under $slaves[_i].slaveName and let $him hang. $slaves[_j].slaveName <<if canSee($slaves[_j])>>watches<<elseif canHear($slaves[_j])>>listens<<else>>stares blankly<</if>> in horror as the life drains from _his2 former accomplice, @@.gold;terrified that you'd so callously toy with their lives.@@ The ordeal @@.red;leaves _him2 behaving strangely.@@ <<set $slaves[_j].trust -= -20, $slaves[_j].behavioralFlaw = "odd">> <<set $activeSlave = $slaves[_i]>> <</if>> <<include "Remove activeSlave">> <<elseif $slaves[_j].vagina > $slaves[_i].vagina && random(1,100) > 50>> - You start with $slaves[_i].slaveName before moving to $slaves[_j].slaveName as she holds her life between her netherlips. Once both spoons are inserted, you sit back and watch them squirm at the cold metal in their most sensitive recesses. $slaves[_i].slaveName is the clear favorite in this game, but the looser $slaves[_j].slaveName refuses to give in, using her experience to clamp down as hard as she can. But it can't go on forever as the sound of the spoon clattering to the floor fills the room. + You start with $slaves[_i].slaveName before moving to $slaves[_j].slaveName as $he holds $his life between $his netherlips. Once both spoons are inserted, you sit back and watch them squirm at the cold metal in their most sensitive recesses. $slaves[_i].slaveName is the clear favorite in this game, but the looser $slaves[_j].slaveName refuses to give in, using _his2 experience to clamp down as hard as _he2 can. But it can't go on forever as the sound of the spoon clattering to the floor fills the room. <<if random(1,100) <= 90>> - You kick the stool out from under $slaves[_j].slaveName and let her hang. $slaves[_i].slaveName <<if canSee($slaves[_i])>>watches<<elseif canHear($slaves[_i])>>listens<<else>>stares blankly<</if>> in horror as the life drains from her former accomplice, @@.gold;terrified that you'd so callously toy with their lives.@@ The ordeal @@.red;leaves her behaving strangely.@@ + You kick the stool out from under $slaves[_j].slaveName and let _him2 hang. $slaves[_i].slaveName <<if canSee($slaves[_i])>>watches<<elseif canHear($slaves[_i])>>listens<<else>>stares blankly<</if>> in horror as the life drains from $his former accomplice, @@.gold;terrified that you'd so callously toy with their lives.@@ The ordeal @@.red;leaves $him behaving strangely.@@ <<set $slaves[_i].trust -= -20, $slaves[_i].behavioralFlaw = "odd">> <<set $activeSlave = $slaves[_j]>> <<else>> - You kick the stool out from under $slaves[_i].slaveName and let her hang. $slaves[_j].slaveName <<if canSee($slaves[_j])>>watches<<elseif canHear($slaves[_j])>>listens<<else>>stares blankly<</if>> in horror as the life drains from her former accomplice, @@.gold;terrified that you'd so callously toy with their lives.@@ The ordeal @@.red;leaves her behaving strangely.@@ <<if $slaves[_j].vagina >= 3>>You can't say you expected this outcome, but it was amusing all the same to discover the blown out whore has some talent<<else>>You're glad no bets were riding on this<</if>>. + You kick the stool out from under $slaves[_i].slaveName and let $him hang. $slaves[_j].slaveName <<if canSee($slaves[_j])>>watches<<elseif canHear($slaves[_j])>>listens<<else>>stares blankly<</if>> in horror as the life drains from _his2 former accomplice, @@.gold;terrified that you'd so callously toy with their lives.@@ The ordeal @@.red;leaves _him2 behaving strangely.@@ <<if $slaves[_j].vagina >= 3>>You can't say you expected this outcome, but it was amusing all the same to discover the blown out whore has some talent<<else>>You're glad no bets were riding on this<</if>>. <<set $slaves[_j].trust -= -20, $slaves[_j].behavioralFlaw = "odd">> <<set $activeSlave = $slaves[_i]>> <</if>> <<include "Remove activeSlave">> <<else>> - You start with $slaves[_i].slaveName before moving to $slaves[_j].slaveName as she holds her life between her netherlips. Once both spoons are inserted, you sit back and watch them squirm at the cold metal in their most sensitive recesses. In a show of underhandedness, $slaves[_j].slaveName kicks $slaves[_i].slaveName, knocking her off balance and sending her hanging. $slaves[_j].slaveName <<if canSee($slaves[_j])>>watches<<elseif canHear($slaves[_j])>>listens<<else>>stares blankly<</if>> as the life drains from her accomplice, @@.gold;horrified at what she just did.@@ The ordeal @@.red;leaves her behaving strangely.@@ + You start with $slaves[_i].slaveName before moving to $slaves[_j].slaveName as $he holds $his life between $his netherlips. Once both spoons are inserted, you sit back and watch them squirm at the cold metal in their most sensitive recesses. In a show of underhandedness, $slaves[_j].slaveName kicks $slaves[_i].slaveName, knocking $him off balance and sending $him hanging. $slaves[_j].slaveName <<if canSee($slaves[_j])>>watches<<elseif canHear($slaves[_j])>>listens<<else>>stares blankly<</if>> as the life drains from _his2 accomplice, @@.gold;horrified at what she just did.@@ The ordeal @@.red;leaves _him2 behaving strangely.@@ <<set $slaves[_j].trust = -100, $slaves[_j].behavioralFlaw = "odd">> <<set $activeSlave = $slaves[_i]>> <<include "Remove activeSlave">> diff --git a/src/uncategorized/reRelationshipAdvice.tw b/src/uncategorized/reRelationshipAdvice.tw index e3740ea0763..da0d45534d0 100644 --- a/src/uncategorized/reRelationshipAdvice.tw +++ b/src/uncategorized/reRelationshipAdvice.tw @@ -2,12 +2,14 @@ <<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Next Week", $activeSlave = $eventSlave>> <<run Enunciate($activeSlave)>> +<<setLocalPronouns $activeSlave>> <<set _i = $slaveIndices[$activeSlave.relationshipTarget]>> <<set $subSlave = $slaves[_i]>> +<<setLocalPronouns $subSlave 2>> -<<EventNameLink $activeSlave>> is standing for an inspection. She's a good girl, and is cooperating, but she seems preoccupied. After ignoring it for a while, you give in to curiosity and flatly ask her what's going on. "I'm <<s>>orry, <<Master>>," she <<if SlaveStatsChecker.checkForLisp($activeSlave)>>lisp<<else>>mutter<</if>>s, biting her lip. "It'<<s>> $subSlave.slaveName." -She hesitates, so you prompt her, asking if she's having trouble with her +<<EventNameLink $activeSlave>> is standing for an inspection. $He's a good $girl, and is cooperating, but $he seems preoccupied. After ignoring it for a while, you give in to curiosity and flatly ask $him what's going on. "I'm <<s>>orry, <<Master>>," $he <<if SlaveStatsChecker.checkForLisp($activeSlave)>>lisp<<else>>mutter<</if>>s, biting $his lip. "It'<<s>> $subSlave.slaveName." +$He hesitates, so you prompt $him, asking if $he's having trouble with $his <<if $activeSlave.relationship == 2>> friend <<elseif $activeSlave.relationship == 3>> @@ -15,22 +17,22 @@ She hesitates, so you prompt her, asking if she's having trouble with her <<elseif $activeSlave.relationship == 4>> lover <</if>>. -She quickly shakes her head no. "N-no, <<Master>>, it's ju<<s>>t -" She subsides into silence again, blushing and staring at her feet. Comprehension dawning, you ask her if +$He quickly shakes $his head no. "N-no, <<Master>>, it's ju<<s>>t -" $He subsides into silence again, blushing and staring at $his feet. Comprehension dawning, you ask $him if <<if $activeSlave.relationship == 2>> - she wants to be more than friends with $subSlave.slaveName. + $he wants to be more than friends with $subSlave.slaveName. <<elseif $activeSlave.relationship == 3>> - she's wanting to bring emotions into relationship with $subSlave.slaveName, rather than keep it friendly and sexual. + $he's wanting to bring emotions into relationship with $subSlave.slaveName, rather than keep it friendly and sexual. <<elseif $activeSlave.relationship == 4>> - she wants to make an honest woman out of $subSlave.slaveName. + $he wants to make an honest _woman2 out of $subSlave.slaveName. <</if>> -She nods her head quickly, still staring at her feet. She shuts her eyes tight and waits for you to weigh in on the situation. +$He nods $his head quickly, still staring at $his feet. $He shuts $his eyes tight and waits for you to weigh in on the situation. <span id="result"> <br><<link "Break them up">> <<EventNameDelink $activeSlave>> <<replace "#result">> <br><br> - In a cold tone of voice, you admit your irritation with this schoolgirl nonsense, and tell her she's to stop spending time with $subSlave.slaveName. She's unable to prevent her eyes from flicking up at you in @@.mediumorchid;shock and horror,@@ but she instantly lowers them again, the tears coming fast. You dismiss her, and she turns to go, but is so discombobulated by anguish that she trips over her own feet and falls with a slap of naked $activeSlave.skin flesh against the floor. Their relationship @@.lightsalmon;is over.@@ + In a cold tone of voice, you admit your irritation with this schoolgirl nonsense, and tell $him $he's to stop spending time with $subSlave.slaveName. $He's unable to prevent $his eyes from flicking up at you in @@.mediumorchid;shock and horror,@@ but $he instantly lowers them again, the tears coming fast. You dismiss $him, and $he turns to go, but is so discombobulated by anguish that $he trips over $his own feet and falls with a slap of naked $activeSlave.skin flesh against the floor. Their relationship @@.lightsalmon;is over.@@ <<set $activeSlave.devotion -= 5>> <<set $activeSlave.relationship = 0>> @@ -39,11 +41,11 @@ She nods her head quickly, still staring at her feet. She shuts her eyes tight a <<set $slaves[_i].relationshipTarget = 0>> <</replace>> <</link>> -<br><<link "Build her confidence">> +<br><<link "Build $his confidence">> <<EventNameDelink $activeSlave>> <<replace "#result">> <br><br> - In a warm tone of voice, you tell her you approve of her relationship with $subSlave.slaveName. She raises her chin and looks at you with @@.hotpink;growing adoration@@ as you point out how lucky $subSlave.slaveName is to have her. You tell her that you're not planning to intervene personally, but that you think she really ought to pursue the relationship, that they're good for each other, and that you're confident $subSlave.slaveName feels the same way. She thanks you prettily and leaves at a flat run, in a hurry to tell her + In a warm tone of voice, you tell $him you approve of $his relationship with $subSlave.slaveName. $He raises $his chin and looks at you with @@.hotpink;growing adoration@@ as you point out how lucky $subSlave.slaveName is to have $him. You tell $him that you're not planning to intervene personally, but that you think $he really ought to pursue the relationship, that they're good for each other, and that you're confident $subSlave.slaveName feels the same way. $He thanks you prettily and leaves at a flat run, in a hurry to tell $his <<if $activeSlave.relationship == 2>> sexy friend <<elseif $activeSlave.relationship == 3>> @@ -51,13 +53,13 @@ She nods her head quickly, still staring at her feet. She shuts her eyes tight a <<elseif $activeSlave.relationship == 4>> dear lover <</if>> - how she feels about her. + how $he feels about _him2. <<if $activeSlave.relationship == 2>> The next time you see them together, they're looking like they've been getting a little less sleep lately, but @@.lightgreen;can't seem to keep their hands off each other.@@ $activeSlave.slaveName mouths a silent thanks to you when $subSlave.slaveName isn't looking. <<elseif $activeSlave.relationship == 3>> The next time you see them together, they're @@.lightgreen;holding hands at breakfast,@@ looking almost ashamed of themselves, but not letting go. $activeSlave.slaveName mouths a silent thanks to you when $subSlave.slaveName isn't looking. <<elseif $activeSlave.relationship == 4>> - She comes running right back, a happy $subSlave.slaveName <<if canWalk($subSlave)>>running in with her<<else>>being helped in by her lover<</if>>. You @@.lightgreen;marry them@@ solemnly, and they embrace tightly, hugging each other close. $activeSlave.slaveName comes to face you over her wife's shoulder, and she mouths a silent, tearful thanks to you. + $He comes running right back, a happy $subSlave.slaveName <<if canWalk($subSlave)>>running in with $him<<else>>being helped in by _his2 lover<</if>>. You @@.lightgreen;marry them@@ solemnly, and they embrace tightly, hugging each other close. $activeSlave.slaveName comes to face you over $his wife's shoulder, and $he mouths a silent, tearful thanks to you. <</if>> <<set $activeSlave.devotion += 5>> @@ -65,11 +67,11 @@ She nods her head quickly, still staring at her feet. She shuts her eyes tight a <<set $slaves[_i].relationship += 1>> <</replace>> <</link>> -<br><<link "Bring the other girl in">> +<br><<link "Bring the other _girl2 in">> <<EventNameDelink $activeSlave>> <<replace "#result">> <br><br> - You tell $activeSlave.slaveName to wait, and page $subSlave.slaveName up to your office. $activeSlave.slaveName looks terrified, but tries to conceal her emotions behind a happy greeting for her + You tell $activeSlave.slaveName to wait, and page $subSlave.slaveName up to your office. $activeSlave.slaveName looks terrified, but tries to conceal $his emotions behind a happy greeting for $his <<if $activeSlave.relationship == 2>> friend <<elseif $activeSlave.relationship == 3>> @@ -77,53 +79,53 @@ She nods her head quickly, still staring at her feet. She shuts her eyes tight a <<elseif $activeSlave.relationship == 4>> lover <</if>> - when she comes in. $subSlave.slaveName knows her well enough to detect her inner turmoil, and asks her what's wrong. $activeSlave.slaveName flinches and looks to you in desperation, but you just nod at her to spit it out. After two false starts, she manages to say, + when _he2 comes in. $subSlave.slaveName knows $him well enough to detect $his inner turmoil, and asks $him what's wrong. $activeSlave.slaveName flinches and looks to you in desperation, but you just nod at $him to spit it out. After two false starts, $he manages to say, "$subSlave.slaveName, I really want <<if $activeSlave.relationship == 2>> <<if ($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "buttslut")>> - to fuck your butt." $subSlave.slaveName looks relieved that that's all it is, and <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> She kisses $activeSlave.slaveName and then grinds her ass against $activeSlave.slaveName's crotch. + to fuck your butt." $subSlave.slaveName looks relieved that that's all it is, and <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> _He2 kisses $activeSlave.slaveName and then grinds _his2 ass against $activeSlave.slaveName's crotch. <<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "cumslut")>> - to <<if ($subSlave.vagina != -1)>>eat you out<<else>>blow you<</if>>." $subSlave.slaveName looks relieved that that's all it is, and <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> She <<if ($subSlave.vagina != -1)>>offers her pussy<<else>>flops her dick at $activeSlave.slaveName<</if>> comically. + to <<if ($subSlave.vagina != -1)>>eat you out<<else>>blow you<</if>>." $subSlave.slaveName looks relieved that that's all it is, and <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> _He2 <<if ($subSlave.vagina != -1)>>offers _his2 pussy<<else>>flops _his2 dick at $activeSlave.slaveName<</if>> comically. <<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "humiliation")>> to fuck you in public." $subSlave.slaveName looks relieved that that's all it is, and <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> <<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "masochist")>> - you to hurt me. Like, really hurt me." $subSlave.slaveName looks relieved that that's all it is, and <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> She pinches one of $activeSlave.slaveName's nipples experimentally. + you to hurt me. Like, really hurt me." $subSlave.slaveName looks relieved that that's all it is, and <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> _He2 pinches one of $activeSlave.slaveName's nipples experimentally. <<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "sadist")>> - to hold you down." $subSlave.slaveName looks relieved that that's all it is, and <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> She steps in close to $activeSlave.slaveName, takes $activeSlave.slaveName's hands, and places them around her own throat. + to hold you down." $subSlave.slaveName looks relieved that that's all it is, and <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> _He2 steps in close to $activeSlave.slaveName, takes $activeSlave.slaveName's hands, and places them around _his2 own throat. <<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "dom")>> - to be your top." $subSlave.slaveName looks relieved that that's all it is, and <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> She sidles up to $activeSlave.slaveName, looking up at her submissively. + to be your top." $subSlave.slaveName looks relieved that that's all it is, and <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> _He2 sidles up to $activeSlave.slaveName, looking up at $him submissively. <<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "submissive")>> - to be your bottom." $subSlave.slaveName looks relieved that that's all it is, and says, <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> She takes $activeSlave.slaveName's face in her hands and kisses her dominantly. + to be your bottom." $subSlave.slaveName looks relieved that that's all it is, and says, <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> _He2 takes $activeSlave.slaveName's face in _his2 hands and kisses $him dominantly. <<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "boobs")>> - to fuck your boob<<s>>." $subSlave.slaveName looks relieved that that's all it is, and says, <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> She takes $activeSlave.slaveName's hands and places them right on her breasts. + to fuck your boob<<s>>." $subSlave.slaveName looks relieved that that's all it is, and says, <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> _He2 takes $activeSlave.slaveName's hands and places them right on _his2 breasts. <<else>> - to fuck you." $subSlave.slaveName looks relieved that that's all it is, and <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> She takes $activeSlave.slaveName's hands and places them right on her breasts. + to fuck you." $subSlave.slaveName looks relieved that that's all it is, and <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> _He2 takes $activeSlave.slaveName's hands and places them right on _his2 breasts. <</if>> $activeSlave.slaveName bursts out laughing. They're now @@.lightgreen;friends with benefits.@@ <<elseif $activeSlave.relationship == 3>> - t-to b-be your girlfriend." She takes a deep breath. "It'<<s>> fun, ju<<s>>t + t-to b-be your girlfriend." $He takes a deep breath. "It'<<s>> fun, ju<<s>>t <<if ($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "buttslut")>> - fucking your butt. + fucking your butt. <<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "cumslut")>> - to <<if ($subSlave.vagina != -1)>>eating you out<<else>>blowing you<</if>>. + to <<if ($subSlave.vagina != -1)>>eating you out<<else>>blowing you<</if>>. <<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "humiliation")>> - fucking you in public. + fucking you in public. <<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "masochist")>> - having you hurt me. + having you hurt me. <<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "sadist")>> - holding you down. + holding you down. <<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "dom")>> - topping you. + topping you. <<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "submissive")>> - being your bottom. + being your bottom. <<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "boobs")>> - fucking your boob<<s>>. + fucking your boob<<s>>. <<else>> - having <<s>>e<<x>> with you. + having <<s>>e<<x>> with you. <</if>> - But I - I really like you." $subSlave.slaveName looks relieved, and <<if $subSlave.voice != 0>>says, "I really like you too. And you're really cute! I'd love to be your girlfriend." She<<else>>lovingly<</if>> takes $activeSlave.slaveName's hands in hers, and then kisses her on the cheek. $activeSlave.slaveName crushes $subSlave.slaveName in a hug, pressing a squeak out of her. They're now @@.lightgreen;lovers.@@ + But I - I really like you." $subSlave.slaveName looks relieved, and <<if $subSlave.voice != 0>>says, "I really like you too. And you're really cute! I'd love to be your girlfriend." _He2<<else>>lovingly<</if>> takes $activeSlave.slaveName's hands in hers, and then kisses $him on the cheek. $activeSlave.slaveName crushes $subSlave.slaveName in a hug, pressing a squeak out of _him2. They're now @@.lightgreen;lovers.@@ <<elseif $activeSlave.relationship == 4>> - - " She stops herself. "No, I want to do thi<<s>> right." She takes $subSlave.slaveName's hand, and then drops to one knee. After a moment of uncomprehending shock, $subSlave.slaveName begins to cry. "Will you marry me?" $subSlave.slaveName turns to you and asks if it's all right with you; you nod, and she turns back to $activeSlave.slaveName. <<if !canTalk($subSlave)>>She gestures distractedly that $activeSlave.slaveName is being silly, and of course she'll marry her, because she loves her.<<else>><<run Enunciate($subSlave)>>"O-of cour<<s>>e I'll m-marry you, <<s>>illy girl. I love you."<</if>> $activeSlave.slaveName jumps up and crushes $subSlave.slaveName in a hug, kissing her frantically through her tears. You @@.lightgreen;marry them@@ solemnly, and they embrace tightly, hugging each other close. $activeSlave.slaveName comes to face you over her wife's shoulder, and she mouths a silent thanks to you. + - " $He stops $himself. "No, I want to do thi<<s>> right." $He takes $subSlave.slaveName's hand, and then drops to one knee. After a moment of uncomprehending shock, $subSlave.slaveName begins to cry. "Will you marry me?" $subSlave.slaveName turns to you and<<if !canTalk($subSlave)>> wordlessly<</if>> asks if it's all right with you; you nod, and _he2 turns back to $activeSlave.slaveName. <<if !canTalk($subSlave)>>_He2 gestures distractedly that $activeSlave.slaveName is being silly, and of course _he2'll marry $him, because _he2 loves $him.<<else>><<run Enunciate($subSlave)>>"O-of cour<<s>>e I'll m-marry you, <<s>>illy girl. I love you."<</if>> $activeSlave.slaveName jumps up and crushes $subSlave.slaveName in a hug, kissing _him2 frantically through $his tears. You @@.lightgreen;marry them@@ solemnly, and they embrace tightly, hugging each other close. $activeSlave.slaveName comes to face you over $his wife's shoulder, and $he mouths a silent thanks to you. <</if>> If $activeSlave.slaveName had doubts about you, @@.mediumaquamarine;they've been addressed.@@ diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw index 437ec5667b2..c5cb2ad79c1 100644 --- a/src/uncategorized/reShelterInspection.tw +++ b/src/uncategorized/reShelterInspection.tw @@ -111,7 +111,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema <<if $Bodyguard != 0 || $mercenaries > 1 || ($SF.Toggle && $SF.Active >= 1)>> <br> [[Escort her off your property.|RE shelter inspection][$InspectionOption = "Escort"]] <<replace "#result">> - You along with <<if $Bodyguard != 0>> your bodyguard <<print SlaveFullName($Bodyguard)>> and<</if>> <<if $mercenaries > 1>>a squad of $mercenariesTitle <<elseif ($SF.Toggle && $SF.Active >= 1)>>, a squad of $SF.Lower <<elseif $mercenaries > 1 && ($SF.Toggle && $SF.Active >= 1)>> a sqaud of both $mercenariesTitle and $SF.Lower <</if>> forcefully escort the inspector off your property. You barely make it back to the penthouse before the massage deeming you permanently banned from the Slave Shelter arrives. + You along with <<if $Bodyguard != 0>> your bodyguard <<print SlaveFullName($Bodyguard)>> and<</if>> <<if $mercenaries > 1>>a squad of $mercenariesTitle <<elseif ($SF.Toggle && $SF.Active >= 1)>>, a squad of $SF.Lower <<elseif $mercenaries > 1 && ($SF.Toggle && $SF.Active >= 1)>> a squad of both $mercenariesTitle and $SF.Lower <</if>> forcefully escort the inspector off your property. You barely make it back to the penthouse before the massage deeming you permanently banned from the Slave Shelter arrives. <<set $shelterAbuse += 100>> <<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */ <</replace>> @@ -123,7 +123,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema <<set $activeSlave.clothes = "no clothing">> <<set $cash -= $contractCost/2>> <<replace "#result">> - _Inspectee.slaveName is attached to a milking machine, so it would be extremely unwise to let the inspector report on _Inspectee.slaveName's industrial fate in all its gorgeous productivity. So, you greet her politely, and bring her down to $dairyName to show her _Inspectee.slaveName. The inspector has a single moment to stiffen in shock at the sight before she stiffens involuntarily due to the security drone tazing her unconscious. It takes a few credits here and there to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing, but you finish the day richer by one more big-boobed milk producer. You leave the inspector's drug dosage low to start, so she can appreciate her situation for a while. When the inspector awakes, her visor is set to show an overhead view of her bay in $dairyName. She sees her breasts, already larger than she remembers, gently swaying with the pumping of the milkers.<<if $dairyFeedersSetting > 1>> She sees the huge phallus occupying her mouth, and feels nutrition sliding down her throat.<</if>><<if $dairyPregSetting > 1>> She sees her vagina drooling as it's fucked in preparation for pregnancy.<</if>><<if $dairyPregSetting > 1>> She sees a massive piston moving slowly back and forth beneath her buttocks, and understands what the ache of impossible fullness in her bottom is.<</if>> Her hands ball into fists. + _Inspectee.slaveName is attached to a milking machine, so it would be extremely unwise to let the inspector report on _Inspectee.slaveName's industrial fate in all its gorgeous productivity. So, you greet her politely, and bring her down to $dairyName to show her _Inspectee.slaveName. The inspector has a single moment to stiffen in shock at the sight before she stiffens involuntarily due to the security drone tasing her unconscious. It takes a few credits here and there to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing, but you finish the day richer by one more big-boobed milk producer. You leave the inspector's drug dosage low to start, so she can appreciate her situation for a while. When the inspector awakes, her visor is set to show an overhead view of her bay in $dairyName. She sees her breasts, already larger than she remembers, gently swaying with the pumping of the milkers.<<if $dairyFeedersSetting > 1>> She sees the huge phallus occupying her mouth, and feels nutrition sliding down her throat.<</if>><<if $dairyPregSetting > 1>> She sees her vagina drooling as it's fucked in preparation for pregnancy.<</if>><<if $dairyPregSetting > 1>> She sees a massive piston moving slowly back and forth beneath her buttocks, and understands what the ache of impossible fullness in her bottom is.<</if>> Her hands ball into fists. <<set $shelterAbuse += 10>> <<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */ <<run newSlave($activeSlave)>> /* skip New Slave Intro */ @@ -135,13 +135,13 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema <<set $activeSlave.clothes = "no clothing">> <<set $cash -= $contractCost/2>> <<replace "#result">> - _Inspectee.slaveName is sealed in a box and currently in use, so it would be extremely unwise to let the inspector report on _Inspectee.slaveName's permanent position in the service industry. So, you greet her politely, and bring her down to $arcadeName to show her _Inspectee.slaveName. The inspector has a single moment to stiffen in shock at the sight before she stiffens involuntarily due to the security drone tazing her unconscious. It takes a few credits here and there to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing, but you finish the day richer by three more fuckable holes. When the inspector awakes to a dick intruding her body, the pitch blackness and sound prooofing disorienates her. + _Inspectee.slaveName is sealed in a box and currently in use, so it would be extremely unwise to let the inspector report on _Inspectee.slaveName's permanent position in the service industry. So, you greet her politely, and bring her down to $arcadeName to show her _Inspectee.slaveName. The inspector has a single moment to stiffen in shock at the sight before she stiffens involuntarily due to the security drone tasing her unconscious. It takes a few credits here and there to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing, but you finish the day richer by three more fuckable holes. When the inspector awakes to a dick intruding her body, the pitch blackness and sound proofing disorientates her. <<if $arcadeUpgradeInjectors == 1 She gasps as a needle breaks her skin, filling her veins with a potent mixture of aphrodisiacs to help her better service the cock in her cunt. She attempts to defy, but a strong shock forces her to tighten and bring her partner to climax. <<elseif $arcadeUpgradeCollectors == 1>> She groans at the feeling of something sucking away at her milkless tits, but it does nothing the distract from her rape. She struggles to resist in any way she can, but she is too firmly anchored to move. <<else>> - She struggles to resist in any way she can, but she is too firmly anchored to move. + She struggles to resist in any way she can, but she is too firmly anchored to move. <</if>> Before she gets the chance to swear defiance against you, another patron rams his dick down her throat, putting a stop to that notion. Her hands ball into fists as she endures her spit-roasting. <<set $shelterAbuse += 15>> @@ -161,7 +161,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema <br><<link "The slave is little more than a latex wrapped doll, and so will be the inspector">> <<set $cash -= $contractCost/2>> <<replace "#result">> - You have her ushered up to your office, and order _Inspectee.slaveName brought in. The inspector has a single moment to stiffen in shock at the sight before she stiffens involuntarily due to the security drone tazing her unconscious. It takes a few credits here and there to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing, but you finish the day richer by one more fuckdoll. Odds are she wants to be defiant, but the suit works perfectly and leaves her no outlet to make her thoughts known. + You have her ushered up to your office, and order _Inspectee.slaveName brought in. The inspector has a single moment to stiffen in shock at the sight before she stiffens involuntarily due to the security drone tasing her unconscious. It takes a few credits here and there to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing, but you finish the day richer by one more fuckdoll. Odds are she wants to be defiant, but the suit works perfectly and leaves her no outlet to make her thoughts known. <<set $activeSlave.toyHole="all her holes", $activeSlave.pubicHStyle="waxed", $activeSlave.livingRules="spare", $activeSlave.speechRules="restrictive", $activeSlave.releaseRules="restrictive", $activeSlave.relationshipRules="restrictive", $activeSlave.fuckdoll=1, $activeSlave.choosesOwnClothes=0, $activeSlave.clothes="a Fuckdoll suit", $activeSlave.collar="none", $activeSlave.shoes="heels",$activeSlave.legAccessory="none", $activeSlave.vaginalAccessory="none", $activeSlave.dickAccessory="none", $activeSlave.buttplug="none", $activeSlave.attrKnown=1, $activeSlave.fetishKnown=1>> <<set $shelterAbuse += 10>> <<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */ @@ -252,17 +252,17 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema <</if>> <<if !["apathetic", "neglectful"].includes(_Inspectee.sexualFlaw) && !["odd", "anorexic"].includes(_Inspectee.behavioralFlaw) && !["none", "masochist"].includes(_Inspectee.fetish)>> - The inspector can see that her personaility is much better than before. The inspector looks deflated, and reluctantly makes a positive note on her tablet. + The inspector can see that her personality is much better than before. The inspector looks deflated, and reluctantly makes a positive note on her tablet. <<set $shelterAbuse -= 3>> <</if>> <<case "You got her at the Slave Shelter. Her previous owner forced her to cut off her breasts and cook them.">> <<if _Inspectee.boobs > $genePool[_Arrival].boobs>> - The inspector can see that she has a new set of breats. The inspector looks deflated, and reluctantly makes a positive note on her tablet. + The inspector can see that she has a new set of breasts. The inspector looks deflated, and reluctantly makes a positive note on her tablet. <<set $shelterAbuse -= 2>> <</if>> <<if !["apathetic", "neglectful", "self hating"].includes(_Inspectee.sexualFlaw) && !["odd", "anorexic"].includes(_Inspectee.behavioralFlaw) && !["none", "masochist"].includes(_Inspectee.fetish)>> - The inspector can see that $his personaility is much better than before. The inspector looks deflated, and reluctantly makes a positive note on her tablet. + The inspector can see that $his personality is much better than before. The inspector looks deflated, and reluctantly makes a positive note on her tablet. <<set $shelterAbuse -= 3>> <</if>> @@ -284,7 +284,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema <<case "You got her at the Slave Shelter. Her background is obscure, but seems to have involved terrible abuse of her huge cock and balls.">> <<if _Inspectee.energy > $genePool[_Arrival].energy>> - The inspector notices that _Inspectee.birthName has more engery. The inspector looks deflated, and reluctantly makes a positive note on her tablet. + The inspector notices that _Inspectee.birthName has more energy. The inspector looks deflated, and reluctantly makes a positive note on her tablet. <<set $shelterAbuse-->> <</if>> @@ -315,21 +315,21 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema <<set $shelterAbuse++>> <</if>> <<if _Inspectee.dick < $genePool[_Arrival].dick>> - The inspector meresures _Inspectee.birthName's dick and finds that has been reduced. The inspector looks deflated, and reluctantly makes a positive note on her tablet. + The inspector measures _Inspectee.birthName's dick and finds that has been reduced. The inspector looks deflated, and reluctantly makes a positive note on her tablet. <<set $shelterAbuse-->> <<else>> - The inspector meresures _Inspectee.birthName's dick and finds that has increased. The inspector is horrified, though she tries to conceal it. + The inspector measures _Inspectee.birthName's dick and finds that has increased. The inspector is horrified, though she tries to conceal it. <<set $shelterAbuse++>> <</if>> <<if _Inspectee.balls < $genePool[_Arrival].balls>> - The inspector meresures _Inspectee.birthName's balls and finds they has been reduced. The inspector looks deflated, and reluctantly makes a positive note on her tablet. + The inspector measures _Inspectee.birthName's balls and finds they has been reduced. The inspector looks deflated, and reluctantly makes a positive note on her tablet. <<set $shelterAbuse-->> <<else>> - The inspector meresures _Inspectee.birthName's balls and finds they has been increased. The inspector is horrified, though she tries to conceal it. + The inspector measures _Inspectee.birthName's balls and finds they has been increased. The inspector is horrified, though she tries to conceal it. <<set $shelterAbuse++>> <</if>> <<if _Inspectee.fetish != $genePool[_Arrival].fetish>> - The inspector meresures _Inspectee.birthName's balls and finds they has been reduced. The inspector looks deflated, and reluctantly makes a positive note on her tablet. + The inspector measures _Inspectee.birthName's balls and finds they has been reduced. The inspector looks deflated, and reluctantly makes a positive note on her tablet. <<set $shelterAbuse-->> <<else>> The inspector is happy that _Inspectee.birthName's balls and finds they has been increased. The inspector is horrified, though she tries to conceal it. @@ -370,7 +370,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema <<elseif _Inspectee.trust < -20>> She is sufficiently afraid of you that she tells the inspector whatever she thinks you'd want her to say. The inspector, experienced at this, is not amused. She offers you a few choice words, makes notes on her tablet, and storms out. <<elseif _Inspectee.devotion <= 20>> - She does not like you and isn't particularly terrified of you, so she is not flattering. She's not stupid enough to really criticise you, but she is honest and makes no effort to conceal troubling particulars. The inspector takes copious notes. She offers you a few choice words, makes notes on her tablet, and storms out. + She does not like you and isn't particularly terrified of you, so she is not flattering. She's not stupid enough to really criticize you, but she is honest and makes no effort to conceal troubling particulars. The inspector takes copious notes. She offers you a few choice words, makes notes on her tablet, and storms out. <<elseif _Inspectee.anus > 2>> She cooperates with the inspector, who pulls on a pair of latex gloves and performs a complete examination. When she pulls the girl's buttocks apart and probes the slave's asshole, she pulls her hand away as if scalded. "Oh my God," she says. "_Inspectee.birthName, what happened to your anus?" <br><br> diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw index 75f23133a7a..04132d6714a 100644 --- a/src/uncategorized/recETS.tw +++ b/src/uncategorized/recETS.tw @@ -1587,7 +1587,7 @@ You receive so many messages, as a noted titan of the new Free Cities world, tha <br><br> -This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. You aren't far off; the caller is a <<if $activeSlave.actualAge >= 18>>young woman<<elseif $activeSlave.actualAge >= 13>>teen<<else>>loli<</if>> desperate for work, carrying a young child on $his shoulder, quadruplets on $his back and a large sack against $his middle, while looking absolutely exhausted. "Please, would you happen to have any work for a desperate mother? I need to eat, and my babies are starting to go hungry... I tried whoring, but I got pregnant again..." $He struggles back to allow you to see $his full body. The object you thought were $his possessions is, in fact, $his massively distended stomach. "I'm having so many and I don't know what to do anymore... I can't care for this many... Anything you can do for meeEEEEEE!" $He groans as an intense contraction hits $him. "Oh god! Not now! Not like this! I'm not ready... Please, I'm giving birth right now... Forget work, I'll be your slave if you can help me..." $He begs, tears streaming down $his face as $he struggles to hold back the child threatening to slide into $his birth canal.<<if $minimumSlaveAge <= 3>> "Please... My eldest is of age here... Help me and they'll be yours too! You'll help mommy, right sweetie?" The toddler nods to $him, unlikely to understand exactly what is going on.<</if>> +This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. You aren't far off; the caller is a <<if $activeSlave.actualAge >= 18>>young $woman<<elseif $activeSlave.actualAge >= 13>>teen<<else>>$loli<</if>> desperate for work, carrying a young child on $his shoulder, quadruplets on $his back and a large sack against $his middle, while looking absolutely exhausted. "Please, would you happen to have any work for a desperate mother? I need to eat, and my babies are starting to go hungry... I tried whoring, but I got pregnant again..." $He struggles back to allow you to see $his full body. The object you thought were $his possessions is, in fact, $his massively distended stomach. "I'm having so many and I don't know what to do anymore... I can't care for this many... Anything you can do for meeEEEEEE!" $He groans as an intense contraction hits $him. "Oh god! Not now! Not like this! I'm not ready... Please, I'm giving birth right now... Forget work, I'll be your slave if you can help me..." $He begs, tears streaming down $his face as $he struggles to hold back the child threatening to slide into $his birth canal.<<if $minimumSlaveAge <= 3>> "Please... My eldest is of age here... Help me and they'll be yours too! You'll help mommy, right sweetie?" The toddler nods to $him, unlikely to understand exactly what is going on.<</if>> <br><br> diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index 1d3ef377d2f..d643116ba2d 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -124,7 +124,7 @@ $His $activeSlave.faceShape face is <br> $He has working <<if $activeSlave.eyes == -1>> - eyes, but is nearsighted. + eyes, but is nearsighted. <<if ($activeSlave.origEye != "implant")>> [[Correct eyesight|Surgery Degradation][$activeSlave.eyes = 1, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "eyeFix"]] <</if>> @@ -814,7 +814,7 @@ Work on $his sex: <<elseif $activeSlave.clit == 2>> a huge clit<<if ($seeCircumcision == 1) && $activeSlave.foreskin > 0>> with a hood<</if>>. <<elseif $activeSlave.clit > 2>> - an enormous clit<<if ($seeCircumcision == 1) && $activeSlave.foreskin > 0>> with a hood<</if>>. + an enormous clit<<if ($seeCircumcision == 1) && $activeSlave.foreskin > 0>> with a hood<</if>>. <</if>> <<if $activeSlave.clit > 0>> <<if $activeSlave.indentureRestrictions < 2>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index a7d970fa6f0..7b25a89ebd8 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -5670,7 +5670,7 @@ /* ** Boobs, nipples and areolae. ** Boobs always fires for over 5000 cc, - ** nipples/areolae shrinkage wil fire for boobs under 5000, + ** nipples/areolae shrinkage will fire for boobs under 5000, ** where nipples are tiny/cute at 30% chance. ** anything over 300 will fire if ** the slave's accumulated youthening is 6 or higher, @@ -5736,8 +5736,8 @@ <</if>> /* ** Balls. - ** Massive testicals (10+) drop by 2 levels, - ** Others decreace by chance based on current size. + ** Massive testicles (10+) drop by 2 levels, + ** Others decrease by chance based on current size. */ <<if ($slaves[$i].balls >= 10)>> $His @@.orange;NCS@@ gets busy @@.orange;reducing the size of $his titanic balls.@@ @@ -5762,7 +5762,7 @@ ** Scrotum and Labia ** One or the other can fire per week. ** Pendulous ballsacks or sagging labia will always fire. - ** Otherwise by reducing chance based on current sizes, but labias are a little more likley. + ** Otherwise by reducing chance based on current sizes, but labias are a little more likely. */ <<if $slaves[$i].geneMods.rapidCellGrowth != 1>> <<if ($slaves[$i].scrotum >= 5)>> @@ -5788,8 +5788,8 @@ <<set $slaves[$i].voice += 1, _countNCS++>> <</if>> /* - ** Pussy/Ass-Pussy rejuvination. - ** 10% chance of either one rejuvinating per week. (The Child Whore's delight!) + ** Pussy/Ass-Pussy rejuvenation. + ** 10% chance of either one rejuvenating per week. (The Child Whore's delight!) */ <<if $slaves[$i].geneMods.rapidCellGrowth != 1>> <<if ((_countNCS < 2) && ($slaves[$i].vagina > 1) && (random(1,100) < ($slaves[$i].vagina * 10)))>> @@ -6237,7 +6237,7 @@ <<elseif $slaves[$i].fetish == "mindbroken">> $He struggles along $his daily tasks as if nothing is out of the ordinary. <<else>> - This is @@.mediumorchid;horrifying@@ to $him. $He is in excrutiating pain and each + This is @@.mediumorchid;horrifying@@ to $him. $He is in excruciating pain and each <<if $slaves[$i].bellyPreg > 100>> movement within $his tearing <<if $slaves[$i].mpreg == 0 && $slaves[$i].ovaries == 0>>belly<<else>>womb<</if>> <<else>> @@ -6636,7 +6636,7 @@ <<if $slaves[$i].boobsMilk > 0>> /*Without release, $his breasts have become @@.lime;<<if $slaves[$i].lactationAdaptation > 50>>massively <</if>>engorged@@ with pent-up milk.*/ /* I don't know where to put this since it happens at the tail end of endWeek now */ <<if $slaves[$i].boobs+$slaves[$i].boobsMilk > $slaves[$i].boobs*2>> - Having breasts bloated to the point of bursting is @@.red;incredibly painful.@@ Spending a week like that is exruciating, + Having breasts bloated to the point of bursting is @@.red;incredibly painful.@@ Spending a week like that is excruciating, <<set $slaves[$i].health -= 20>> <<elseif $slaves[$i].boobs+$slaves[$i].boobsMilk > $slaves[$i].boobs*.5>> Having breasts so swollen with milk that every motion hurts is @@.red;very uncomfortable.@@ Spending a week like that only makes it worse, diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw index 532afaf2787..80683b88d23 100644 --- a/src/uncategorized/slaveAssignmentsReport.tw +++ b/src/uncategorized/slaveAssignmentsReport.tw @@ -596,16 +596,16 @@ <br><br> /** Old code: <<= '<div id="button-' + _str + '" class="unStaffed">' + _facSubArr[1] + ' is currently unstaffed</div>'>> */ <<else>> - <<if _facSubArr[1] == "Rules Assistant">> - <<= '<button type="button"' + _disTxt + ' id="button-' + _str + '" class="buttonBar' + _accText + '" data-after="' + '">' + _facSubArr[1] + ' Report</button>'>> /** Yes, display the bar with information */ - <<else>> - <<= '<button type="button"' + _disTxt + ' id="button-' + _str + '" class="buttonBar' + _accText + '" data-after="' + _facSubArr[3] + ' slaves in ' + _facSubArr[1] + '">' + _facSubArr[1] + ' Report</button>'>> /** Yes, display the bar with information */ + <<if _facSubArr[1] == "Rules Assistant">> + <<= '<button type="button"' + _disTxt + ' id="button-' + _str + '" class="buttonBar' + _accText + '" data-after="' + '">' + _facSubArr[1] + ' Report</button>'>> /** Yes, display the bar with information */ + <<else>> + <<= '<button type="button"' + _disTxt + ' id="button-' + _str + '" class="buttonBar' + _accText + '" data-after="' + _facSubArr[3] + ' slaves in ' + _facSubArr[1] + '">' + _facSubArr[1] + ' Report</button>'>> /** Yes, display the bar with information */ <</if>> - <<if $useAccordion == 0>> + <<if $useAccordion == 0>> <br> <<include `_facSubArr[0]`>> /** not using accordion -- just include the report under the disabled button above */ <br> - <</if>> + <</if>> <</if>> <div class="accHidden"> <<if $useAccordion == 1>> diff --git a/src/uncategorized/wardrobeUse.tw b/src/uncategorized/wardrobeUse.tw index a74fe368846..dbc25bd7756 100644 --- a/src/uncategorized/wardrobeUse.tw +++ b/src/uncategorized/wardrobeUse.tw @@ -839,7 +839,7 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.'' | <<link "Cruel retirement counter">> <<set $activeSlave.collar = "cruel retirement counter">> <<replace "#collar">>$activeSlave.collar<</replace>> - <<replace "#collarDescription">><br>//<<collarDescription>>//<</replace>> + <<replace "#collarDescription">><br>//<<collarDescription>>//<</replace>> <</link>> <</if>> | <<link "Uncomfortable leather">> -- GitLab