diff --git a/src/interaction/prostheticConfig.tw b/src/interaction/prostheticConfig.tw index a5d6e382e3ea7d53481744563d6ffb193ddeaa1e..1f290e7646704a0d52d4f4b399cfefc985b1f7f0 100644 --- a/src/interaction/prostheticConfig.tw +++ b/src/interaction/prostheticConfig.tw @@ -61,7 +61,7 @@ This room is lined with shelves and cabinets, it could be easily mistaken for a | [[Sky-Blue|Prosthetics Configuration][$activeSlave.eyeColor = "sky-blue", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] | [[Hazel|Prosthetics Configuration][$activeSlave.eyeColor = "hazel", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] | [[Pale-Grey|Prosthetics Configuration][$activeSlave.eyeColor = "pale-grey", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] - | [[White|Prosthetics Configuration][$activeSlave.eyeColor = "white", $prostheticsConfig = "eyeColor" ,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[White|Prosthetics Configuration][$activeSlave.eyeColor = "white", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] | [[Pink|Prosthetics Configuration][$activeSlave.eyeColor = "pink", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] | [[Amber|Prosthetics Configuration][$activeSlave.eyeColor = "amber", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] | [[Red|Prosthetics Configuration][$activeSlave.eyeColor = "red", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] diff --git a/src/npc/newSlaveIncestSex.tw b/src/npc/newSlaveIncestSex.tw index 2c9a3eca8252c9b84ce8fd56ec6dc49505fddb98..ac87a2082afe97c73e6c52ba8fcf722956df0603 100644 --- a/src/npc/newSlaveIncestSex.tw +++ b/src/npc/newSlaveIncestSex.tw @@ -42,10 +42,10 @@ /* gender relation descriptions */ /* TODO: is there a function for gender-aware relationships? */ <<if $relative.vagina == -1 >> - <<set _one = _one.replace("mother","father").replace("sister","brother").replace("daughter","son") >> + <<set _one = _one.replace("mother", "father").replace("sister", "brother").replace("daughter", "son") >> <</if>> <<if $relative2.vagina == -1 >> - <<set _other = _other.replace("mother","father").replace("sister","brother").replace("daughter","son") >> + <<set _other = _other.replace("mother", "father").replace("sister", "brother").replace("daughter", "son") >> <</if>> <<if _one == _other >> diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw index c68bdefa7f9fff2f9be5b520c80ffd2a7181721b..759b8a7ee50dad5a3597e18a66cbee019bd7e527 100644 --- a/src/uncategorized/bodyModification.tw +++ b/src/uncategorized/bodyModification.tw @@ -44,7 +44,7 @@ <</if>> <<switch $scarDesign.local>> <<case "whip">> - Targetting a single area with a whip is not easy. You set the mood by carefully arranging candles drippping on to a whimpering $activeSlave.slaveName, then got $his attention with a quick <<if canSee($activeSLave)>>wave<<elseif canHear($activeSlave)>>crack<<else>>tap<</if>> of the whip. One by one, you carefully snuffed out the candles, flicking hot wax as you went. After pausing a moment, you prepared to leave your mark. + Targetting a single area with a whip is not easy. You set the mood by carefully arranging candles dripping on to a whimpering $activeSlave.slaveName, then got $his attention with a quick <<if canSee($activeSLave)>>wave<<elseif canHear($activeSlave)>>crack<<else>>tap<</if>> of the whip. One by one, you carefully snuffed out the candles, flicking hot wax as you went. After pausing a moment, you prepared to leave your mark. <<if ["penis", "vagina"].includes($scarTarget.local)>> <<if $activeSlave.dick > 4 && $seeDicks>> $His dick was large enough that it was not too difficult to hit, diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw index bec5870b44b6d7d1b6e4dafe723ee58c22be10b9..d504c68148a1bd7e18027484b95791ebafdfde32 100644 --- a/src/uncategorized/newSlaveIntro.tw +++ b/src/uncategorized/newSlaveIntro.tw @@ -1299,7 +1299,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' << <<else>> twists and turns, but without limbs is powerless to escape the curling whip. <</if>> - If $he didn't know $he was a slave before, @@.mediumorchid;$he does now,@@ and $he's got the @@.gold;agonizing@@ @@.red;injury@@ to prove it. What $he doesn't yet know is just how permanent this lashing's effects will be. The level of violence and the coating you used will leave $him scarred with the marks of slavery forever. + If $he didn't know $he was a slave before, @@.mediumorchid;$he does now,@@ and $he's got the @@.gold;agonizing@@ @@.red;injury@@ to prove it. What $he doesn't yet know is just how permanent this lashing's effects will be. The level of violence and the coating you used will leave $him scarred with the marks of slavery forever. <<if ($arcologies[0].FSSubjugationistRace == $activeSlave.race) && ($arcologies[0].FSSubjugationist > 0)>> Society @@.green;approves@@ of your purchase and whipping of an inferior $activeSlave.race person; this advances the idea that $activeSlave.race people ought to be enslaved. <<= FutureSocieties.Change("Subjugationist", 2)>> @@ -1312,7 +1312,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' << | <<link "Scar $him on the _scarTarget">> <<replace "#introResult">> - You drag $him to the body modification studio and strap $him down with $his _scarTarget clear and defenseless. $He doesn't understand what's coming for a while, even as disinfectant is applied to $his _scarTarget. You have a wide selection of tools to create scars, the trick is to keep the wound from healing correctly afterward. Of course, $he has no way of knowing that the pain you are inflicting as you cut into $his flesh will leave such a permanent mark, but the basic message is clear: if $he didn't know $he was a slave before, @@.mediumorchid;$he does now,@@ and $he's got the @@.gold;agonizing@@ @@.red;injury@@ to prove it. + You drag $him to the body modification studio and strap $him down with $his _scarTarget clear and defenseless. $He doesn't understand what's coming for a while, even as disinfectant is applied to $his _scarTarget. You have a wide selection of tools to create scars, the trick is to keep the wound from healing correctly afterwards. Of course, $he has no way of knowing that the pain you are inflicting as you cut into $his flesh will leave such a permanent mark, but the basic message is clear: if $he didn't know $he was a slave before, @@.mediumorchid;$he does now,@@ and $he's got the @@.gold;agonizing@@ @@.red;injury@@ to prove it. <<if ($arcologies[0].FSSubjugationistRace == $activeSlave.race) && ($arcologies[0].FSSubjugationist > 0)>> Society @@.green;approves@@ of your purchase and scarring of an inferior $activeSlave.race person; this advances the idea that $activeSlave.race people ought to be enslaved. <<= FutureSocieties.Change("Subjugationist", 2)>> diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw index 894ff15e923ca041c39d708d74bcbd8ef5852709..c6299b14814c76855d609a5a9472c1d3533ff9f2 100644 --- a/src/uncategorized/personalAssistantAppearance.tw +++ b/src/uncategorized/personalAssistantAppearance.tw @@ -426,7 +426,7 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF <<case "slave professionalism">> _hisA swollen hips and pregnant belly loosely wrapped in an elegant kimono. _HeA radiates experience. <<case "petite admiration">> - _hisA big pregnant belly utterly dominating _hisA short height. _HeA's nude aside from a crown of flowers, _hisA modesty protected only by _hisA flowing hair. + _hisA big pregnant belly utterly dominating _hisA short height. _HeA's nude aside from a crown of flowers, _hisA modesty protected only by _hisA flowing hair. <<case "statuesque glorification">> with swollen breasts and an enormous pregnant belly to fit _hisA towering form. _HeA's nude aside from a crown of flowers, _hisA modesty protected only by _hisA flowing hair. <<default>> diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw index 65b4843bc9ee2c99404eda41d4d9c2c0e8701580..169e311099addb11e86c9564584ddc829f39c287 100644 --- a/src/uncategorized/saRelationships.tw +++ b/src/uncategorized/saRelationships.tw @@ -43,7 +43,7 @@ <<if _j == _SL>> /* gone through the full loop, found no matches, so reset _SlaveJ */ <<set _SlaveJ = null>> <</if>> - <<elseif (_SlaveI.origin == "You were acquainted with $him before you were an arcology owner; your rival tried to use $him to manipulate you, but you rescued $him.") && ($rivalryDuration > 20) && !["Intellectual Dependency", "Paternalism", "Racial Supremacism", "Slave Professionalism"].includes($rivalryFS)&& _SlaveI.newGamePlus == 0>> + <<elseif (_SlaveI.origin == "You were acquainted with $him before you were an arcology owner; your rival tried to use $him to manipulate you, but you rescued $him.") && ($rivalryDuration > 20) && !["Intellectual Dependency", "Paternalism", "Racial Supremacism", "Slave Professionalism"].includes($rivalryFS)&& _SlaveI.newGamePlus == 0>> <<for _j = 0; _j < _SL; _j++>> <<set _SlaveJ = $slaves[_j]>> <<setLocalPronouns _SlaveJ 2>> diff --git a/src/uncategorized/universalRules.tw b/src/uncategorized/universalRules.tw index 2f8122318f777ced9e0191b3df27740c946724b5..0fdc15dd1cb41f7b1a3c7d42a56e296cc3cbdfa7 100644 --- a/src/uncategorized/universalRules.tw +++ b/src/uncategorized/universalRules.tw @@ -150,7 +150,7 @@ Or design your own: <<textbox "$brandDesign.official" $brandDesign.official "Uni <br><br> -One 'welcome' for a new slave is to have them branded. Where would you like such brands to be applied? +One 'welcome' for a new slave is to have them branded. Where would you like such brands to be applied? <<if ["ankle", "breast", "buttock", "calf", "cheek", "ear", "foot", "hand", "lower arm", "shoulder", "testicle", "thigh", "upper arm", "wrist"].includes($brandTarget.primary)>> <br> On the [[left|Universal Rules][$brandTarget.primary = ("left " + $brandTarget.primary)]] @@ -324,7 +324,7 @@ Or design your own: <<textbox "$scarDesign.primary" $scarDesign.primary "Univers <</if>> <</if>> -One 'welcome' for a new slave is to have them scarred. Where would you like such scars to be applied? +One 'welcome' for a new slave is to have them scarred. Where would you like such scars to be applied? <<if ["ankle", "breast", "buttock", "calf", "cheek", "ear", "foot", "hand", "lower arm", "shoulder", "testicle", "thigh", "upper arm", "wrist"].includes($scarTarget.primary)>> <br> On the [[left|Universal Rules][$scarTarget.primary = ("left " + $scarTarget.primary)]]