diff --git a/src/npc/fKiss.tw b/src/npc/fKiss.tw index f86cea9e17bba2687304b7a40cefa69ab113e251..7d0ba19505106a60e79f36012b1c9f1190d34ef3 100644 --- a/src/npc/fKiss.tw +++ b/src/npc/fKiss.tw @@ -161,7 +161,7 @@ Then, you gently raise her <<if $activeSlave.face > 95>>heartrendingly beautiful She is nearly frozen with fear, and does not resist as you kiss her deeply. In fact, she barely reacts at all. She opens her mouth mechanically in response to your insistent tongue, but it's like kissing a doll. She is so filled with terror that she remains stiff even as it becomes clear to her you're not going to hurt her. When you bore of making out with your wife and pull away, she stares at you in utter incomprehension. <<if (($activeSlave.amp == 1) && (!canTalk($activeSlave)))>> Her <<if canSee($activeSlave)>>eyes beg<<else>>expression begs<</if>> for an answer: is that it? - <<elseif canTalk($activeSlave) == false>> + <<elseif !canTalk($activeSlave)>> She signs spastically, begging fearfully to know if that's it. <<else>> She asks nervously before cringing, "I-i<<s>> that it, <<Master>>?" diff --git a/src/player/actions/fondleBoobs.tw b/src/player/actions/fondleBoobs.tw index 058b8a19f3ae89d69be41822b68a810bc6dc8db0..46330c55ba789218628f1c3864ef0e81705af7fd 100644 --- a/src/player/actions/fondleBoobs.tw +++ b/src/player/actions/fondleBoobs.tw @@ -161,7 +161,7 @@ You call her over so you can fondle her cute breasts, cupping them and gently playing with her $activeSlave.nipples nipples between your fingers and thumbs, <<else>> flat breasts, gently playing with her hard, erect nipples between your fingers and thumbs, - <</if>> teasing them and pulling them gently towards you. Moving your head close to her breasts, you nuzzle on a nipple with your lips and even lick it delicately with your tongue. Then you alternate, gently nibbling with your teeth on the other nipple. You squeeze the tips of her<<if ($activeSlave.lactation > 0)>> milky<</if>> nipples with your thumbs and fingers and tweak them in your fingertips, then you dab her nipples with your thumbs, flicking them in different directions. She moans passionately at the continued stimulation of her breasts and nipples. When you finally stop, she reaches up to your face with her hand and lovingly strokes it, a blissful look on her $activeSlave.skin face. <<if ($activeSlave.accent >= 3)>>She does her best to communicate devotion with her $activeSlave.eyeColor eyes, since she's not confident in her ability to express it in $language.<<elseif ($activeSlave.amp == 1) && (canTalk($activeSlave) == false)>>She does her best to communicate devotion with her $activeSlave.eyeColor eyes.<<elseif canTalk($activeSlave) == false>>She signs that she loves you.<<else>>"I love you, <<Master>>," she <<say>>s euphorically.<</if>> She looks at you longingly, eager for more. + <</if>> teasing them and pulling them gently towards you. Moving your head close to her breasts, you nuzzle on a nipple with your lips and even lick it delicately with your tongue. Then you alternate, gently nibbling with your teeth on the other nipple. You squeeze the tips of her<<if ($activeSlave.lactation > 0)>> milky<</if>> nipples with your thumbs and fingers and tweak them in your fingertips, then you dab her nipples with your thumbs, flicking them in different directions. She moans passionately at the continued stimulation of her breasts and nipples. When you finally stop, she reaches up to your face with her hand and lovingly strokes it, a blissful look on her $activeSlave.skin face. <<if ($activeSlave.accent >= 3)>>She does her best to communicate devotion with her $activeSlave.eyeColor eyes, since she's not confident in her ability to express it in $language.<<elseif ($activeSlave.amp == 1) && !canTalk($activeSlave)>>She does her best to communicate devotion with her $activeSlave.eyeColor eyes.<<elseif !canTalk($activeSlave)>>She signs that she loves you.<<else>>"I love you, <<Master>>," she <<say>>s euphorically.<</if>> She looks at you longingly, eager for more. <<elseif ($activeSlave.devotion > 20)>> She willingly gives herself up to you. You place your hands on her <<if ($activeSlave.boobs >= 20000)>> diff --git a/src/uncategorized/industrialDairyAssignmentScene.tw b/src/uncategorized/industrialDairyAssignmentScene.tw index b436452518e2bfe3a0dbfdaf3c1c096a7ec29dff..267c068780e1d076a3fb9a308bdcf480a8f0a4d9 100644 --- a/src/uncategorized/industrialDairyAssignmentScene.tw +++ b/src/uncategorized/industrialDairyAssignmentScene.tw @@ -8,7 +8,7 @@ When $activeSlave.slaveName reports to the dairy, it's to the sight of an unoccu <<if $activeSlave.sexualFlaw == "self hating">> /* GETTING IN */ As she realizes her fate, a kind of peace comes over the self hating slut. -<<if canTalk($activeSlave) == false>> +<<if !canTalk($activeSlave)>> She <<if ($activeSlave.amp != 1)>>mouths<<else>>gestures<</if>> her thanks dreamily. <<else>> "Thank you, <<Master>>," she <<say>>s simply. "I de<<s>>erve thi<<s>>," she adds quietly, half to herself. @@ -18,7 +18,7 @@ Then she falls silent and stares at the machine. Though she hates herself and lo <<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. <<if ($dairyPregSetting > 1) && isFertile($activeSlave) && $activeSlave.mpreg != 1>> - She does the same with dildo that will keep her pregnant and her pussy, and her lower lip starts to quiver. + She does the same with the dildo that will keep her pregnant and her pussy, and her lower lip starts to quiver. <</if>> <<else>> <<if ($dairyPregSetting > 1) && isFertile($activeSlave) && $activeSlave.mpreg != 1>> @@ -47,7 +47,7 @@ her tears pattering onto the uncaring metal. When she's in place, her shoulders <<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. -<<if canTalk($activeSlave) == false>> +<<if !canTalk($activeSlave)>> She <<if ($activeSlave.amp != 1)>>mouths<<else>>gestures<</if>> her thanks shakily. <<else>> "Th-thank you, <<Master>>," she <<say>>s through her tears. "I love you." @@ -77,7 +77,7 @@ Then she falls silent and stares at the machine. She's probably imagined this a <</if>> <<else>> She cranes around to look at her belly, and looks impatient. - <<if canTalk($activeSlave) == false>> + <<if !canTalk($activeSlave)>> She mouths 'come on, I'm ready.' <<else>> "Come on, I'm ready," she whispers. @@ -86,7 +86,7 @@ Then she falls silent and stares at the machine. She's probably imagined this a <<elseif $activeSlave.devotion > 95>> /* GETTING IN */ -As she realizes her fate, the worshipful slave squares her shoulders, steeling herself. "<<Master>>," she <<if canTalk($activeSlave) == false>>signs<<else>><<say>>s<</if>>, "I will do my best to <<s>>erve you." She steps over to the machine. +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. <<if ($activeSlave.amp != 1)>> <<if ($dairyStimulatorsSetting > 1)>> @@ -96,7 +96,7 @@ She looks it over clinically, getting herself into the right mindset. 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. <</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) == false>>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." + 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." <</if>> <</if>> <br><br> @@ -105,11 +105,11 @@ She looks it over clinically, getting herself into the right mindset. <<else>> Another slave helps her strip and lays her 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) == false>>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." +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." <<elseif $activeSlave.devotion > 60>> -As she realizes her fate, the tears come quickly. "<<Master>>," she <<if canTalk($activeSlave) == false>>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 she realizes her fate, the tears come quickly. "<<Master>>," she <<if !canTalk($activeSlave)<<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. <<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>>." @@ -118,7 +118,7 @@ As she realizes her fate, the tears come quickly. "<<Master>>," she <<if canTalk 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." <</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) == false>>signs<<else>><<say>>s<</if>> sadly. "<<S>>-<<s>>o, I'll <<s>>ay it one la<<s>>t time, <<Master>>: I love you." + 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." <</if>> <</if>> <br><br> @@ -127,7 +127,7 @@ As she realizes her fate, the tears come quickly. "<<Master>>," she <<if canTalk <<else>> Another slave helps her strip and lays her in the machine. <</if>> -"<<Master>>," she <<if canTalk($activeSlave) == false>>signs<<else>>gasps out<</if>>, the tears coming fast now. "C-can you +"<<Master>>," she <<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. <<else>> @@ -154,7 +154,7 @@ obliged to place her, <</if>> begging and sobbing, into the machine's embrace. -"Plea<<s>>e, <<Master>>!" she <<if canTalk($activeSlave) == false>>signs<<else>>begs<</if>>. "Plea<<s>>e no! +"Plea<<s>>e, <<Master>>!" she <<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>> @@ -189,7 +189,7 @@ obliged to <</if>> begging and sobbing, into the machine's embrace. -"Plea<<s>>e, <<Master>>!" she <<if canTalk($activeSlave) == false>>signs<<else>>begs<</if>>. "Plea<<s>>e no! +"Plea<<s>>e, <<Master>>!" she <<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>> @@ -299,9 +299,9 @@ and brutal sodomy. <<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. <<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) == false>>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>>." + 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>>." <<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) == false>>signs<<else>>whispers<</if>>, "<<Master>>, it's too b-big. It hu-hurt<<s>>." + 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>>." <<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. <<else>> diff --git a/src/uncategorized/lawCompliance.tw b/src/uncategorized/lawCompliance.tw index 35ec76dd18613d8010b795396a344345023497a3..f1e58d5e55a500d474f2c4edf4923198889efe1d 100644 --- a/src/uncategorized/lawCompliance.tw +++ b/src/uncategorized/lawCompliance.tw @@ -359,7 +359,7 @@ <<set $activeSlave.trust -= 10>> <<set $activeSlave.height += 10, $activeSlave.heightImplant = 1, $activeSlave.health -= -40>> <<else>> - While she was in the slave pens, she was treated as nothing more than an unsalvagable slab of meat suitable only for the lowliest of jobs. She's @@.hotpink;desperate@@ enough to follow any order in @@.gold;fear@@ that should she fail, she'll be discarded like so many other shorties. + While she was in the slave pens, she was treated as nothing more than an unsalvageable slab of meat suitable only for the lowliest of jobs. She's @@.hotpink;desperate@@ enough to follow any order in @@.gold;fear@@ that should she fail, she'll be discarded like so many other shorties. <<set $activeSlave.devotion += 10, $activeSlave.trust -= 10>> <</if>> <<else>> @@ -373,7 +373,7 @@ <<set $activeSlave.trust -= 10>> <<set $activeSlave.height -= 10, $activeSlave.heightImplant = -1, $activeSlave.health -= -40>> <<else>> - While she was in the slave pens, she was treated as nothing more than an unsalvagable slab of meat suitable only for the lowliest of jobs. She's @@.hotpink;desperate@@ enough to follow any order in @@.gold;fear@@ that should she fail, she'll be discarded like all the other tall girls. + While she was in the slave pens, she was treated as nothing more than an unsalvageable slab of meat suitable only for the lowliest of jobs. She's @@.hotpink;desperate@@ enough to follow any order in @@.gold;fear@@ that should she fail, she'll be discarded like all the other tall girls. <<set $activeSlave.devotion += 10, $activeSlave.trust -= 10>> <</if>> <<else>> diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw index 2b2e25d990791570a4f0c235a925cbccee9e8bad..7517dea4126b738353ad100186c25b43bde4f464 100644 --- a/src/uncategorized/longSlaveDescription.tw +++ b/src/uncategorized/longSlaveDescription.tw @@ -88,12 +88,10 @@ is <<elseif $eventDescription == 1>> $pronounCap is currently involved in an event, but is assigned to $activeSlave.assignment. <<if $activeSlave.assignment == "be a subordinate slave">> - <<for _lsd = 0; _lsd < $slaves.length; _lsd++>> - <<if $activeSlave.subTarget == $slaves[_lsd].ID>> + <<set _lsd = $slaves.findIndex(function(s) { return s.ID == $activeSlave.subTarget; })>> + <<if _lsd != -1>> She has been ordered to serve ''@@.pink;<<SlaveFullName $slaves[_lsd]>>@@'' specifically. - <<break>> <</if>> - <</for>> <</if>> <<else>> @@ -198,8 +196,8 @@ She comes to you for an inspection <<elseif $activeSlave.relationship == -2>> She is @@.lightgreen;emotionally bound to you;@@ her feelings for you are comparable to those in a healthy, loving relationship. <<elseif $activeSlave.relationship != 0>> -<<for _lsd = 0; _lsd < $slaves.length; _lsd++>> -<<if $slaves[_lsd].ID == $activeSlave.relationshipTarget>> +<<set _lsd = $slaves.findIndex(function(s) { return s.ID == $activeSlave.relationshipTarget; })>> +<<if _lsd != -1>> She is <<if $activeSlave.relationship <= 1>> ''@@.lightgreen;friends with <<SlaveFullName $slaves[_lsd]>>;@@'' the rules <<if $activeSlave.relationshipRules != "restrictive">>encourage<<else>> discourage<</if>> their relationship. @@ -212,9 +210,7 @@ She comes to you for an inspection <<elseif $slaves[_lsd].relationship > 4>> ''@@.lightgreen;<<SlaveFullName $slaves[_lsd]>>'s slave wife;@@'' the rules <<if $activeSlave.relationshipRules == "permissive">>encourage<<else>> discourage<</if>> marital bliss. <</if>> - <<break>> <</if>> -<</for>> <<elseif $activeSlave.fuckdoll == 0>> <<if $activeSlave.relationshipRules == "restrictive">> The rules forbid her from associating freely with other slaves. @@ -419,7 +415,7 @@ $pronounCap has been with you <<if $week-$activeSlave.weekAcquired >= 1>> and <<else>> - She + $pronounCap <</if>> has had little or no sexual experience as your slave yet. <</if>> @@ -437,7 +433,7 @@ $pronounCap has been with you <<else>> about once every four hours <</if>> - she's spent awake. + $pronoun's spent awake. <<elseif ($seed*112)/$activeSlave.oralCount < 4>> Remarkably, this means that $pronoun's sucked something off <<if ($seed*112)/$activeSlave.oralCount < 1>> @@ -451,7 +447,7 @@ $pronounCap has been with you <<else>> about once every four hours <</if>> - she's spent awake. + $pronoun's spent awake. <<elseif ($seed*112)/$activeSlave.vaginalCount < 4>> Remarkably, this means that $possessive pussy has been fucked <<if ($seed*112)/$activeSlave.vaginalCount < 1>> @@ -1155,24 +1151,21 @@ when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of its lower <<else>> <<if $activeSlave.relation != 0>> - <<for _lsd = 0; _lsd < $slaves.length; _lsd++>> - <<if $slaves[_lsd].ID == $activeSlave.relationTarget>> + <<set _lsd = $slaves.findIndex(function(s) { return s.ID == $activeSlave.relationTarget; })>> + <<if _lsd != -1>> <<if ($slaves[_lsd].ID == $activeSlave.relationshipTarget) && ($activeSlave.relationship >= 3)>> $pronounCap is @@.lightgreen;<<SlaveFullName $slaves[_lsd]>>'s $activeSlave.relation, making their relationship incestuous.@@ - <<break>> <<else>> $pronounCap is @@.lightgreen;<<SlaveFullName $slaves[_lsd]>>'s $activeSlave.relation.@@ - <<break>> <</if>> <</if>> - <</for>> <</if>> <</if>> /* closes extended family mode */ <<if $activeSlave.rivalry != 0>> - <<for _lsd = 0; _lsd < $slaves.length; _lsd++>> - <<if $slaves[_lsd].ID == $activeSlave.rivalryTarget>> + <<set _lsd = $slaves.findIndex(function(s) { return s.ID == $activeSlave.rivalryTarget; })>> + <<if _lsd != -1>> $pronounCap <<if $activeSlave.rivalry <= 1>> @@.lightsalmon;dislikes@@ <<SlaveFullName $slaves[_lsd]>>. @@ -1181,9 +1174,7 @@ when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of its lower <<else>> @@.lightsalmon;bitterly hates@@ <<SlaveFullName $slaves[_lsd]>>. <</if>> - <<break>> <</if>> - <</for>> <</if>> <br> @@ -1589,7 +1580,7 @@ and <</if>> <<elseif $activeSlave.weight > 130 >> <<if $arcologies[0].FSHedonisticDecadence != "unset">> - <<print either("amazingly curvy", "amzingly plush")>>. + <<print either("amazingly curvy", "amazingly plush")>>. <<else>> @@.red;<<print either("very overweight", "obese", "very fat")>>.@@ <</if>> diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw index 438d88128df0cc6a2154eb17c212b08b6f5da1da..d490f979ba2165b94b449add96abfb2f634dde45 100644 --- a/src/uncategorized/main.tw +++ b/src/uncategorized/main.tw @@ -5,7 +5,7 @@ <<if $releaseID >= 1000 || $ver.includes("0.9") || $ver.includes("0.8") || $ver.includes("0.7") || $ver.includes("0.6")>> <<if $releaseID >= 1022>> <<elseif $releaseID >= 1019>> - ''@@.red;INCOMPATIBILITY WARNING:@@'' your saved game was created using version $ver build $releaseID. Due to a major change to nationality weighting, you must run backwards compatiblity. + ''@@.red;INCOMPATIBILITY WARNING:@@'' your saved game was created using version $ver build $releaseID. Due to a major change to nationality weighting, you must run backwards compatibility. <<else>> ''@@.red;INCOMPATIBLE SAVE WARNING:@@'' your saved game was created using version $ver build $releaseID. Please select New Game Plus from the Options menu or start a new game. <br><br> diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw index feca9e882d874b16e3da3b4bbc38e41813f570e1..16e655df90b0ba79ee2edbc25e07c40262114e8d 100644 --- a/src/uncategorized/manageArcology.tw +++ b/src/uncategorized/manageArcology.tw @@ -138,7 +138,7 @@ __Construction__ <<if $corpIncorporated == 1 || $corpMarket == 1>> __Corporation__ <<if $corpIncorporated == 1 && $corpMarket == 0>> - <<link "Disolve the corporation">> + <<link "Dissolve the corporation">> <<set $corpIncorporated = 0>> <<set $corpPeopleEnslaved = 0>> <<set $slaveAssets = 0>> @@ -182,7 +182,7 @@ __Construction__ <<goto "Manage Arcology">> <</link>> <<elseif $corpIncorporated == 1 && $corpMarket == 1>> - <br><<link "Disolve both corporation and the market">> + <br><<link "Dissolve both corporation and the market">> <<set $corpIncorporated = 0>> <<set $corpPeopleEnslaved = 0>> <<set $slaveAssets = 0>> diff --git a/src/uncategorized/managePenthouse.tw b/src/uncategorized/managePenthouse.tw index cca507e9b3b7dda27859724c1d660b602e4947c9..2ed1239cc347b0cf3fb1c4245c367e3d53fff7db 100644 --- a/src/uncategorized/managePenthouse.tw +++ b/src/uncategorized/managePenthouse.tw @@ -191,7 +191,7 @@ __Penthouse Upgrades__ <br> <<if $buttAccessibility != 1>> <<if $boobAccessibility == 1 || $dickAccessibility || $ballsAccessibility>> - Your penthouse has already been widened to make life for overly wide slaves easier but there are no special accommodations for slaves with gigantic posteriours. [[Remodel for accessibility|Manage Penthouse][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $buttAccessibility = 1, $PC.engineering += .5]] + Your penthouse has already been widened to make life for overly wide slaves easier but there are no special accommodations for slaves with gigantic posteriors. [[Remodel for accessibility|Manage Penthouse][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $buttAccessibility = 1, $PC.engineering += .5]] //Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>>// <<else>> Your penthouse has no special accessibility provisions for slaves with enormous posteriors. [[Remodel for accessibility|Manage Penthouse][$cash -= Math.trunc(50000*$upgradeMultiplierArcology), $buttAccessibility = 1, $PC.engineering += 1]] diff --git a/src/uncategorized/matchmaking.tw b/src/uncategorized/matchmaking.tw index e5a8ef1f69a83638806fa1f824209c2b914ab4e0..95abd5e9dbc697216c6126f274b00d268ba46821 100644 --- a/src/uncategorized/matchmaking.tw +++ b/src/uncategorized/matchmaking.tw @@ -520,11 +520,8 @@ Being ordered into a relationship would be difficult for anyone, but they're so <<set $eventSlave.relationshipTarget = $subSlave.ID>> <<set $eventSlave.devotion -= 20>> -<<for _i = 0; _i < $slaves.length; _i++>> - <<if $slaves[_i].ID == $subSlave.ID>> - <<set $slaves[_i] = $subSlave>> - <</if>> -<</for>> +<<set _i = $slaves.findIndex(function(s) { return s.ID == $subSlave.ID; })>> +<<set $slaves[_i] = $subSlave>> <<set $activeSlave = $eventSlave>>