diff --git a/src/pregmod/huskSlave.tw b/src/pregmod/huskSlave.tw index 8e42c4fed8a03cab2cf801f2a570e9855926abd8..1b30e08b60fb57c1e752ba65fbd30af6324556fe 100644 --- a/src/pregmod/huskSlave.tw +++ b/src/pregmod/huskSlave.tw @@ -32,7 +32,7 @@ Nationality: | [[Latina|Husk Slave][$huskSlave.race = "latina"]] | [[Middle Eastern|Husk Slave][$huskSlave.race = "middle eastern"]] | [[Black|Husk Slave][$huskSlave.race = "black"]] -| [[Semetic|Husk Slave][$huskSlave.race = "semetic"]] +| [[Semitic|Husk Slave][$huskSlave.race = "semitic"]] | [[Southern European|Husk Slave][$huskSlave.race = "southern european"]] | [[Indo-aryan|Husk Slave][$huskSlave.race = "indo-aryan"]] | [[Amerindian|Husk Slave][$huskSlave.race = "amerindian"]] diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw index cbaa166baa38c7abb2c3940939e6a0d41c8a310b..889094b6505d912f459bfd12330cbb1f1215b9ad 100644 --- a/src/uncategorized/PETS.tw +++ b/src/uncategorized/PETS.tw @@ -336,7 +336,7 @@ You decide to knit up care's raveled sleeve with a break in the spa. You have yo <</for>> <</replace>> <</link>> -<<if ($subSlave.anus > 0)>> +<<if ($subSlave.anus > 0) && canDoAnal($subSlave)>> <br><<link "The prisoner will take it up the butt, too, if she wants sleep">> <<replace "#name">>$activeSlave.slaveName<</replace>> <<replace "#result">> @@ -356,6 +356,26 @@ You decide to knit up care's raveled sleeve with a break in the spa. You have yo <</replace>> <</link>> <</if>> +<<if ($subSlave.vagina > 0) && canDoVaginal($subSlave)>> +<br><<link "The prisoner will take it up the pussy, too, if she wants sleep">> + <<replace "#name">>$activeSlave + <<replace "#result">> + You silently interrupt $activeSlave.slaveName and indicate that she should sit down on the cell's bed without letting $subSlave.slaveName's head out from between her legs. She sits down with a thump, dragging the struggling $subSlave.slaveName with her. You<<if ($PC.dick == 0)>> pull on a strap-on, and then<</if>> seize $subSlave.slaveName's hips and hoist them into the air, giving her a horrible second of anticipation as you manhandle <<if ($PC.dick == 0)>>the cruelly large phallus<<else>>your cock<</if>> into place. She gives a strangled squeal of protest at the feeling of you pushing your way inexorably up her poor pussy, making $activeSlave.slaveName jerk with surprise at the sensation of $subSlave.slaveName howling into her crotch. Twenty minutes later, you and $activeSlave.slaveName leave her @@.hotpink;quiescent@@ on the floor of the cell. After she locks the door after herself, $activeSlave.slaveName can't resist the urge to @@.hotpink;offer you a cheerful high-five.@@ + <<set $activeSlave.devotion += 10>> + <<set $activeSlave.oralCount += 1>> + <<set $oralTotal += 1>> + <<for $i = 0; $i < $slaves.length; $i++>> + <<if $slaves[$i].ID == $subSlave.ID>> + <<set $slaves[$i].devotion += 4>> + <<set $slaves[$i].oralCount += 2>> + <<set $oralTotal += 2>> + <<set $slaves[$i].vaginaCount += 1>> + <<set $vaginalTotal += 1>> + <</if>> + <</for>> + <</replace>> +<</link>> +<</if>> <<case "comforting attendant">> diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw index 5e7e719070218c3efe8d6034b7261208ce243908..06f46504f29136df5ecff3db475956eec978a6f1 100644 --- a/src/uncategorized/SFMBarracks.tw +++ b/src/uncategorized/SFMBarracks.tw @@ -268,7 +268,13 @@ Increase crew comfort and life support systems to increase operational time. The Colonel picks up a tablet. "Sure boss," she says, "we had a nice score this week. Looters fucked up and left a bunch of nice shit behind." She taps a few commands on the tablet. "@@.green;There's your cut.@@" <</if>> <<set $securityForceGiftToken = 1>> - <<set $cash += 2500>> + <<if $economy == .5>> + <<set $cash += 1500>> + <<elseif $economy == 1>><</if>> + <<set $cash += 2500>> + <<elseif $economy == 1.5>> + <<set $cash += 3500>> + <</if>> <</replace>> <</link>><br> <<link "Ask The Colonel to put in a good word for you with her contacts">><br> @@ -298,7 +304,13 @@ Increase crew comfort and life support systems to increase operational time. The Colonel picks up a tablet. "Sure boss," she says, "I can ensure that the soldiers only use the escrow services here for their business." She taps a few commands on the tablet. "@@.green;There should be a small increase in prosperity,@@ boss." <</if>> <<set $securityForceGiftToken = 1>> - <<set $arcologies[0].prosperity += 2>> + <<if $economy == .5>> + <<set $arcologies[0].prosperity += 1>> + <<elseif $economy == 1>> + <<set $arcologies[0].prosperity += 2>> + <<elseif $economy == 1.5>> + <<set $arcologies[0].prosperity += 3>> + <</if>> <</replace>> <</link>><br> </span> @@ -551,11 +563,23 @@ Increase crew comfort and life support systems to increase operational time. <<if $PC.warfare < 10>> Your complete lack of skill at warfare ensures that in addition to $Bodyguard.slaveName, you need; two full sqauds of $securityForceName on foot, a squadron of fighters, a large convy of $securityForceName ground vehicles. <<elseif $PC.warfare >= 100 && $career == "mercenary">> - Your mastery of wet work and prior work as a PMCs, satisfies The Colonel that you only need; one solider and a single verchile plus $Bodyguard.slaveName. Being able to see and interact with the arcology owner even more directly if they so wis h boosts the mood of your citizen's while also giving them an increased opportunity to try gaining favour with you. - <<set $rep += 10, $cash += 500>> + Your mastery of wet work and prior work as a PMCs, satisfies The Colonel that you only need; one solider and a single vehicle plus $Bodyguard.slaveName. Being able to see and interact with the arcology owner even more directly if they so wish boosts the mood of your citizen's while also giving them an increased opportunity to try gaining favour with you. + <<if $economy == .5>> + <<set $rep += 10, $cash += 450>> + <<elseif $economy == 1>> + <<set $rep += 10, $cash += 500>> + <<elseif $economy == 1.5>> + <<set $rep += 10, $cash += 550>> + <</if>> <<elseif $PC.warfare >= 100>> - Your mastery of wet work, satisfies The Colonel that you only need; two soliders and a single verchile plus $Bodyguard.slaveName. Being able to see and interact with the arcology owner directly if they so wish boosts the mood of your citizens while also giving them the opportunity to try gaining favour with you. - <<set $rep += 5, $cash += 250>> + Your mastery of wet work, satisfies The Colonel that you only need; two soliders and a single vehicle plus $Bodyguard.slaveName. Being able to see and interact with the arcology owner directly if they so wish boosts the mood of your citizens while also giving them the opportunity to try gaining favour with you. + <<if $economy == .5>> + <<set $rep += 5, $cash += 200>> + <<elseif $economy == 1>> + <<set $rep += 5, $cash += 250>> + <<elseif $economy == 1.5>> + <<set $rep += 5, $cash += 300>> + <</if>> <<elseif $PC.warfare >= 60>> Your expertness at warfare means that in addition to $Bodyguard.slaveName you only require; a sqaud of $securityForceName on foot, a two fighters, a tiny convy of $securityForceName ground vehicles. <<elseif $PC.warfare >= 30>> @@ -586,7 +610,13 @@ Increase crew comfort and life support systems to increase operational time. Your total lack of medical skill causes the death of the citizen. <<elseif $PC.medicine >= 100 && $career == "medicine">> Your expertness of medicine ensures that the citizen is probably the best they have ever been. They are so greatful that they are more than happy to try and compensate your time. Word quickly spreads of the kindly medically trained archology owner who took the time to heal a citizen, providing confidence to the rest of the citizens. - <<set $rep += 10, $cash += 150>> + <<if $economy == .5>> + <<set $rep += 10, $cash += 100>> + <<elseif $economy == 1>> + <<set $rep += 10, $cash += 150>> + <<elseif $economy == 1.5>> + <<set $rep += 10, $cash += 200>> + <</if>> <<elseif $PC.medicine >= 100>> Your expertness of medicine ensures that the citizen is probably the best they have ever been. Word quickly spreads of the kindly archology owner who took the time to heal a citizen. <<set $rep += 5>> @@ -606,52 +636,53 @@ Increase crew comfort and life support systems to increase operational time. "Sure, boss." she says, nodding. "I can use a break from all of this." She laughs. <span id="result4"> - <<link "learn some field medicine.">> + <<link "Either learn; field medicine,">> <<replace "#result4">> <<set $PC.medicine + 3>> //<<if $PC.engineering < 10>>Hopefully now, you are less likely to cut yourself on the sharp things.<</if>>// <</replace>> <</link>> - - <<link "listen to some war stories.">> - <<replace "#result4">> - <<set $PC.warfare + 5>> - //<<if $PC.warfare < 10>>There, now you hopefully can hit the broad side of a barn. What am I kidding you still suck.<<elseif $PC.warfare >= 10>>Slightly better but you still have a long way to go.<</if>>// - <</replace>> - <</link>> - <<link "learn some trading.">> + <<link "trading">> <<replace "#result4">> <<set $PC.trading + 2>> //<<if $PC.trading < 10>>Congragulations you have just passed economics 101, "black and red should balance".<</if>>// <</replace>> <</link>> - <<link "learn about slaving.">> + <<link ",slaving">> <<replace "#result4">> <<set $PC.slaving + 2>> //<<if $PC.slaving < 10>>Yes, the rope normally goes around the wrist first and no where near the mouth.<</if>>// <</replace>> <</link>> - <<link "learn about the exciting life of a combat engineer.">> + <<link ",about the exciting life of a combat engineer,">> <<replace "#result4">> <<set $PC.engineering + 2>> //<<if $PC.engineering < 10>>Good job you know what a hammer now looks like.<</if>>// <</replace>> <</link>> - <<link "gain a general education.">> + <<link "gain a general education ">> <<replace "#result4">> <<set $PC.engineering + 1>> <<set $PC.slaving + 1>> <<set $PC.trading + 1>> <<set $PC.warfare + 1>> <<set $PC.medicine + 1>> - //Hopefully this general education I was able to provide may be of use. + //Hopefully this general education I could provide may be of use. <</replace>> <</link>> - + + <<link "or listen to some war stories.">> + <<replace "#result4">> + <<set $PC.warfare + 5>> + //<<if $PC.warfare < 10>>There, now you hopefully can hit the broad side of a barn. What am I kidding you still suck. + //if $PC.warfare >= 10>>Slightly better but you still have a long way to go.<</if>>// + <</replace>> + <</link>> + </span> <</replace>> diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw index 5f4a1f6fe2b55619daba765cc72c1db0ad5098d8..2c0ee6c702ee60a0f972e72d035b3fd89ab87d53 100644 --- a/src/uncategorized/genericPlotEvents.tw +++ b/src/uncategorized/genericPlotEvents.tw @@ -892,6 +892,11 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your <<case "aid invitation">> <<set $PAid = 0>> +<<if ($securityForceActive > 1) && ($securityForceVehiclePower >= 0)>> + <<set _price = 5000>> +<<else>> + <<set _price = 10000>> +<</if>> <<link "Agree">> <<replace "#result">> You dispatch your personal VTOL bird immediately. It lands on the roof of the building they're sheltering in, and brings them across the closest border and into a more functional country. You receive a call expressing their heartfelt thanks and promising to @@.green;spread the word@@ about how you helped them escape, and a wire transfer of their @@.yellowgreen;payment@@ for the airlift. @@ -910,13 +915,11 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your <<if $securityForceActive == 0>> You send your personal VTOL bird to the shop for some immediate and very expensive modifications to its cargo and passenger area. Since this will take several days, you stall the supplicants. Their situation isn't truly dire yet, and they can wait. They are extremely grateful, though they would be less hopeful if they knew the true nature of the aircraft coming to retrieve them. <<set $PAid = 1>> - <<set _price = 10000>> - <<set $cash -= 10000>> + <<set $cash -= _price>> <<elseif ($securityForceActive > 1) && ($securityForceVehiclePower >= 0)>> You ask The Colonel to get the garage to modifiy your personal VTOL's cargo and passenger area, saving on labour costs however it will still take them several days to make the necessary modifications. So your only choice is to stall the supplicants. Their situation isn't truly dire yet, and they can wait. They are extremely grateful, though they would be less hopeful if they knew the true nature of the aircraft coming to retrieve them. <<set $PAid = 1>> - <<set _price = 5000>> - <<set $cash -= 5000>> + <<set $cash -= _price>> <</if>> <</replace>> <</link>> //This will cost ¤<<print _price>>// diff --git a/src/uncategorized/seIndependenceDay.tw b/src/uncategorized/seIndependenceDay.tw index 44e42172e230cb3a16082c315bc6b2a776375f2a..0df5a013813380c34f6f95a42471cbfcc4850cbf 100644 --- a/src/uncategorized/seIndependenceDay.tw +++ b/src/uncategorized/seIndependenceDay.tw @@ -388,7 +388,7 @@ In the Free Cities, Independence Day falls on the day when the Free City achieve <</link>> //Costs ¤10000// \ <<if $securityForceActive > 1>> -<<link "Host a parade ">> +<<link "Host a parade">> <<replace "#result2">> <<nobr>> <<if $securityForcePersonnel < 100>> @@ -450,6 +450,7 @@ In the Free Cities, Independence Day falls on the day when the Free City achieve <<elseif ($securityForceRulesOfEngagement == "free") && ($securityForceDepravity >= 1.5)>> The sight of $securityForceName's forcing their captured slaves to suck them off while frequently firing without any care into the air, enspiring terror in your citizens. <<set $rep -= 200>> + <</if>> <<if ($securityForceRulesOfEngagement == "hold") && ($securityForceDepravity <= 0.3)>> The sight of $securityForceName's profesonally holdstering their weapons provies your citizens with a sense of safety. <<set $rep += 100>> diff --git a/src/uncategorized/seWedding.tw b/src/uncategorized/seWedding.tw index 0feecd8016ec8159899c1a623b34bd8fc6f4c6bb..761b45c245d4928853f0d4a409fbe46e572f936c 100644 --- a/src/uncategorized/seWedding.tw +++ b/src/uncategorized/seWedding.tw @@ -463,7 +463,7 @@ <<if $activeSlave.fetish == "mindbroken">> <<set $desc = "a framed shot of you impregnating the blank-faced " + $activeSlave.slaveName + " at your wedding">> <<elseif $activeSlave.devotion+$activeSlave.trust >= 175>> - <<set $desc = "a framed shot of you impregnating the joyous " + $activeSlave.slaveName + " at your wedding.">> + <<set $desc = "a framed shot of you impregnating the joyous " + $activeSlave.slaveName + " at your wedding">> <<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>> <<set $desc = "a framed shot of you forcefully impregnating the disinterested " + $activeSlave.slaveName + " at your wedding">> <<elseif $activeSlave.devotion < -20>> diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw index d5a14782131665fcb1dc66140c4f9976bb873074..c56f64487142698f2e07e794739a5e551d81c7a4 100644 --- a/src/uncategorized/storyCaption.tw +++ b/src/uncategorized/storyCaption.tw @@ -131,6 +131,7 @@ <br>@@.pink;Total Sex Slaves@@ | _SL <br>@@.pink;Penthouse Beds@@ | <<if $dormitoryPopulation+$roomsPopulation > ($dormitory+$rooms)>>@@.red;<<print $dormitoryPopulation+$roomsPopulation>>@@<<else>><<print $dormitoryPopulation+$roomsPopulation>><</if>>/<<print ($dormitory+$rooms)>> +<br>@@.pink;Dormitory Beds@@ | <<if $dormitoryPopulation > $dormitory>>@@.red;<<print $dormitoryPopulation>>@@<<else>><<print $dormitoryPopulation>><</if>>/<<print $dormitory>> <br>@@.pink;Luxury Rooms@@ | <<if $roomsPopulation > $rooms>>@@.red;<<print $roomsPopulation>>@@<<else>><<print $roomsPopulation>><</if>>/<<print $rooms>> <br>@@.yellowgreen;GSP@@ | <<print Math.trunc(0.1*$arcologies[0].prosperity)>>m diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index 2174d57285c42c5f53f42422543c6e1f1f02c8c4..c718f3f8f951f83875ffa45255a49cc3311f17be 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -1569,6 +1569,7 @@ <<set $SEnunciate = "Th">> <<set $ssEnunciate = "th">> <<set $cEnunciate = "th">> + <<set $ccEnunciate = "th">> <<set $zEnunciate = "th">> <<else>> <<if def $PC.customTitle>><<set $titleEnunciate = $PC.customTitle>><<elseif $PC.title != 0>><<set $titleEnunciate = "Master">><<else>><<set $titleEnunciate = "Mistress">><</if>> @@ -1623,6 +1624,7 @@ <<set $SEnunciate = "S">> <<set $ssEnunciate = "ss">> <<set $cEnunciate = "c">> + <<set $cEnunciate = "cc">> <<set $zEnunciate = "z">> <</if>> <</widget>> @@ -1633,6 +1635,7 @@ <<widget "S">>$SEnunciate<</widget>> <<widget "ss">>$ssEnunciate<</widget>> <<widget "c">>$cEnunciate<</widget>> +<<widget "cc">>$ccEnunciate<</widget>> <<widget "z">>$zEnunciate<</widget>> /%