diff --git a/src/SpecialForce/Firebase.tw b/src/SpecialForce/Firebase.tw index d6921a0fbc5a859b5b9fecaf500911137d77f50e..560a8c27e996e9234deb90e2e73ab61ed42070e3 100644 --- a/src/SpecialForce/Firebase.tw +++ b/src/SpecialForce/Firebase.tw @@ -76,9 +76,9 @@ <<if $SF.MercCon.History >= 1 && ((Math.trunc(($week-1)/24) === ($week-1)/24) || (Math.trunc(($week-2)/24) === ($week-2)/24) || (Math.trunc(($week-3)/24) === ($week-3)/24))>> - While at the recent merc meetup, the Colonel made @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Income))>>@@ selling generic schematics to her friends, <<print commaNum($SF.V.SF.MercCon.Menials)>> menial slaves were won in a poker game, and <<print commaNum($SF.MercCon.TotalMercs)>> mercenaries were persuaded to join $SF.Lower. + While at the recent merc meetup, the Colonel made @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Income))>>@@ selling generic schematics to her friends, <<print commaNum($SF.MercCon.Menials)>> menial slaves were won in a poker game, and <<print commaNum($SF.MercCon.TotalMercs)>> mercenaries were persuaded to join $SF.Lower. - <br>Total earnings thus far: @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Revenue))>>@@ in income, <<print commaNum($SF.V.SF.MercCon.TotalMenials)>> menial slaves and <<print commaNum($SF.MercCon.Mercs)>> mercenaries joined across $SF.MercCon.History meetups. + <br>Total earnings thus far: @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Revenue))>>@@ in income, <<print commaNum($SF.MercCon.TotalMenials)>> menial slaves and <<print commaNum($SF.MercCon.Mercs)>> mercenaries joined across $SF.MercCon.History meetups. <</if>> diff --git a/src/SpecialForce/Report.tw b/src/SpecialForce/Report.tw index 3d48a0a15e744866c0d85364cc4a37d4db6207f9..09269e573cb30f1422de24a95054b855d8978664 100644 --- a/src/SpecialForce/Report.tw +++ b/src/SpecialForce/Report.tw @@ -186,13 +186,13 @@ $SF.Caps managed to recruit <<print Math.round(_FNGs/2)>> new soldiers this week | <<link "No Accountability">> <<set $SF.Regs = "none">> <<replace "#accountability">> ''No Accountability'' <</replace>> <</link>> <<if $SF.MercCon.View > 0 && $SF.MercCon.CanAttend === 1>> <br>''TradeShow'': - <<set $SF.MercCon.Income = 0,$SF.V.SF.MercCon.Menials = 0>> + <<set $SF.MercCon.Income = 0,$SF.MercCon.Menials = 0>> <<set _TradeShowAttendes = 200,_MenialSlavesPerAttendee = 5>> <<set _MenialSlaves = Math.ceil(random(1,((_TradeShowAttendes*_MenialSlavesPerAttendee)/10)))>> <<set _TSProfit = Math.ceil(500000*(1+($SF.Size/1000))*(1+($arcologies[0].prosperity/1000))*_Env)>> During a break, The Colonel managed to sell some generic schematics to the _TradeShowAttendes attendees, some decided to also give her some menial slaves as a bonus.<br> <<set $menials += _MenialSlaves>> - <<set $SF.V.SF.MercCon.Menials += _MenialSlaves,$SF.V.SF.MercCon.TotalMenials += _MenialSlaves>> + <<set $SF.MercCon.Menials += _MenialSlaves,$SF.MercCon.TotalMenials += _MenialSlaves>> <<set $cash += _TSProfit,$SF.MercCon.Income += _TSProfit>> <<set $SF.MercCon.Revenue += _TSProfit>> <<if $secExp > 0 && $mercenaries > 0>> <<set $SF.MercCon.Mercs = 0>> diff --git a/src/init/dummy.tw b/src/init/dummy.tw index cc5417ebcd6d1430c7e7925e7c8c7fe372c62e03..ce1436f2bfaaacc48169c24c06c43ad9b648d960 100644 --- a/src/init/dummy.tw +++ b/src/init/dummy.tw @@ -18,6 +18,7 @@ $ArcologyNamesEugenics, $ArcologyNamesRepopulationist, $ArcologyNamesHedonisticD $LurcherSpeed $$i $activeSlave.bodySwap, $activeSlave.customImageFormat, $activeSlave.customHairVector, $activeSlave.shoeColor, $activeSlave.newGamePlus, $activeSlave.nipplesAccessory +$activeSlave.noun, $activeSlave.pronoun, $activeSlave.possessive, $activeSlave.possessivePronoun, $activeSlave.object, $activeSlave.objectReflexive $drugs, $harshCollars, $shoes, $bellyAccessories, $vaginalAccessories, $dickAccessories, $buttplugs $PC.origRace, $PC.origSkin $isReady, $fatherID, diff --git a/src/npc/startingGirls/moreCustomOptions.tw b/src/npc/startingGirls/moreCustomOptions.tw index b16e1a7329241e4c699dcc6692364710e70a7000..9b8af44787f48e973975afa02fa6d79a8e63f4a8 100644 --- a/src/npc/startingGirls/moreCustomOptions.tw +++ b/src/npc/startingGirls/moreCustomOptions.tw @@ -27,9 +27,9 @@ <br>Custom origin story: <<textbox "$activeSlave.origin" $activeSlave.origin "More customization options">> //Use complete, capitalized and punctuated sentences.// <br> <<if $originOveride == 0>> - [[Origin Override|More customization options][$originOveride = 1]] //Will keep your custom origin from being overwritten.// + [[Origin Override|More customization options][$originOveride = 1]] //Will keep your custom origin and tattoo from being overwritten.// <<else>> - [[Disable Override|More customization options][$originOveride = 0]] //Will unlock origin and allow slavegen to overwrite it.// + [[Disable Override|More customization options][$originOveride = 0]] //Will unlock origin and allow slavegen to overwrite it and its related tattoo.// <</if>> <<if $activeSlave.prestige>> <br>Reason for prestigiousness: <<textbox "$activeSlave.prestigeDesc" $activeSlave.prestigeDesc>> //Use complete, capitalized and punctuated sentences.// diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw index 8c4e2c5cbae3b1aaadfe3032e91f87071c9e6e47..bd5d924d57554e61a39d36ef91735687acd5aebd 100644 --- a/src/npc/startingGirls/startingGirls.tw +++ b/src/npc/startingGirls/startingGirls.tw @@ -353,14 +353,15 @@ __You are customizing this slave:__ <<set $activeSlave.origin = "You won her at cards, a memento from your life as one of the idle rich before you became an arcology owner.">> <<set $activeSlave.customTat = "She has the silhouette of an arcology tattooed on the nape of her neck.">> <</if>> -<</if>> <<if $activeSlave.fetish == "mindbroken">> - <<if $activeSlave.amp != 1>> - <<set $activeSlave.origin = "You brought her into the arcology mindbroken, little more than a walking collection of fuckable holes.">> - <<else>> - <<set $activeSlave.origin = "You brought her into the arcology mindbroken, little more than a human onahole.">> - <</if>> + <<if $activeSlave.amp != 1>> + <<set $activeSlave.origin = "You brought her into the arcology mindbroken, little more than a walking collection of fuckable holes.">> + <<else>> + <<set $activeSlave.origin = "You brought her into the arcology mindbroken, little more than a human onahole.">> + <</if>> <</if>> +<</if>> + <<set $activeSlave.father = Number($activeSlave.father) || 0>> <<set $activeSlave.mother = Number($activeSlave.mother) || 0>> <<if ($activeSlave.anus > 2 && $activeSlave.analSkill <= 10) || ($activeSlave.anus == 0 && $activeSlave.analSkill > 30)>> diff --git a/src/uncategorized/pUndergroundRailroad.tw b/src/uncategorized/pUndergroundRailroad.tw index 158b77bfdafc147617981308da82deecb08fdde3..15b0dd0d1d5f01c7e040d3ac950d1da650726f66 100644 --- a/src/uncategorized/pUndergroundRailroad.tw +++ b/src/uncategorized/pUndergroundRailroad.tw @@ -66,7 +66,7 @@ This is disturbing, to say the least. After close investigation, it appears some <br><br> <<run Enunciate($activeSlave)>> -<<setLocalPronouns $activeSlave)>> +<<setLocalPronouns $activeSlave>> You call $activeSlave.slaveName in and politely inquire as to whether $he knows anything about the matter. $He nearly flees in terror, but gathers $his courage and <<if !canTalk($activeSlave)>> diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw index 2a0b288bacd3eb1c3b3522afcdd09dcb20364fc0..1731d8ed637bc9f0f11871162c01f22caabea7c5 100644 --- a/src/uncategorized/reShelterInspection.tw +++ b/src/uncategorized/reShelterInspection.tw @@ -109,12 +109,13 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema <</replace>> <</link>> //This will cost <<print cashFormat($contractCost)>>// <<if $Bodyguard != 0 || $mercenaries > 1 || ($SF.Toggle && $SF.Active >= 1)>> - <br> [[Escort her off your property.|RE shelter inspection][$InspectionOption = "Escort"]] + <br><<link "Escort her off your property">> <<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 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>> + <</link>> <</if>> <<if ($dairy > 0) && ($dairyRestraintsSetting > 1) && (_Inspectee.assignment == "work in the dairy")>> <br><<link "The slave is attached to a milking machine in $dairyName, and so will be the inspector">> @@ -136,7 +137,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema <<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 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 + <<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. diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw index 09ada1756ca3021c18089a3258a97a72f0982478..93d82eb6242cd632495c0feb17d6d03b366d0357 100644 --- a/src/uncategorized/surgeryDegradation.tw +++ b/src/uncategorized/surgeryDegradation.tw @@ -568,7 +568,7 @@ As the remote surgery's long recovery cycle completes, <<case "freshOvaries">> <<if $activeSlave.ovaryAge >= 45 && $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>> - <<if (($activeSlave.fetish == "pregnancy") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)) || $activeSlave.origin == "$He sold $himself to you in the hope of someday bearing children.">> + <<if (($activeSlave.fetish == "pregnancy") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)) || $activeSlave.origin == "She sold herself to you in the hope of someday bearing children.">> $He leaves the surgery with nothing but a nonspecific ache, yet a familiar warmth, in $his lower abdomen, but $he knows enough about surgery and sex slaves to know that it means $he now has a chance to get pregnant once more. $He is @@.hotpink;filled with joy@@ whenever $he thinks about the fact that $he'll have the chance to feel a life growing within $him again. $He's so pleased that $he now @@.mediumaquamarine;trusts@@ your plans for $his body. As with all surgery @@.red;$his health has been slightly affected.@@ <<set $activeSlave.trust += 4, $activeSlave.devotion += 5>> <<elseif ($activeSlave.devotion > 50)>> @@ -1912,7 +1912,7 @@ As the remote surgery's long recovery cycle completes, <<case "fert">> <<if $activeSlave.fetish == "mindbroken">> $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but lacks the mental faculties to realize that $he now has a chance to get pregnant. As with all surgery @@.red;$his health has been slightly affected.@@ - <<elseif (($activeSlave.fetish == "pregnancy") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)) || $activeSlave.origin == "$He sold $himself to you in the hope of someday bearing children.">> + <<elseif (($activeSlave.fetish == "pregnancy") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)) || $activeSlave.origin == "She sold herself to you in the hope of someday bearing children.">> $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but $he knows enough about surgery and sex slaves to know that it means $he now has a chance to get pregnant. $He is @@.hotpink;filled with joy@@ whenever $he thinks about the fact that feeling a life growing within $him is now, at last, a possibility. $He's so pleased that $he now @@.mediumaquamarine;trusts@@ your plans for $his body. As with all surgery @@.red;$his health has been slightly affected.@@ <<set $activeSlave.trust += 4, $activeSlave.devotion += 5>> <<elseif ($activeSlave.devotion > 50)>> @@ -1929,7 +1929,7 @@ As the remote surgery's long recovery cycle completes, <<case "addOvaries">> <<if $activeSlave.fetish == "mindbroken">> $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but lacks the mental faculties to realize that $he now has a chance to get pregnant. As with all surgery @@.red;$his health has been slightly affected.@@ - <<elseif (($activeSlave.fetish == "pregnancy") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)) || $activeSlave.origin == "$He sold $himself to you in the hope of someday bearing children.">> + <<elseif (($activeSlave.fetish == "pregnancy") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)) || $activeSlave.origin == "She sold herself to you in the hope of someday bearing children.">> $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but $he has managed to catch enough slave rumors about what the organ farm can do to know that it means $he now has a chance to get pregnant. $He is filled with joy whenever $he thinks about the fact that feeling a life growing within $him is now, at last, a possibility. $He now places @@.mediumaquamarine;total faith@@ in your plans for $his body and @@.hotpink;adores you@@ for giving $him a gift $he once thought impossible. As with all surgery @@.red;$his health has been slightly affected.@@ <<set $activeSlave.trust += 10, $activeSlave.devotion += 10>> <<elseif ($activeSlave.devotion > 50)>> @@ -1965,7 +1965,7 @@ As the remote surgery's long recovery cycle completes, <<case "addAnimalOvaries">> <<if $activeSlave.fetish == "mindbroken">> $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but lacks the mental faculties to realize that $he now has a chance of carrying an animal baby to term. As with all surgery @@.red;$his health has been slightly affected.@@ - <<elseif (($activeSlave.fetish == "pregnancy") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)) || $activeSlave.origin == "$He sold $himself to you in the hope of someday bearing children.">> + <<elseif (($activeSlave.fetish == "pregnancy") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)) || $activeSlave.origin == "She sold herself to you in the hope of someday bearing children.">> $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but $he has managed to catch enough slave rumors about what the organ farm can do to know that it means $he now has a chance to get pregnant. $He is filled with joy whenever $he thinks about the fact that feeling a life growing within $him is now, at last, a possibility. $He now places @@.mediumaquamarine;total faith@@ in your plans for $his body and @@.hotpink;adores you@@ for giving $him a gift $he once thought impossible. $He doesn't realize exactly what the surgery entailed, however -- the happiness $he felt at first will most likely be replaced with horror once $he realizes the babies in $his womb are not human. As with all surgery @@.red;$his health has been slightly affected.@@ <<set $activeSlave.trust += 10, $activeSlave.devotion += 10>> <<elseif ($activeSlave.devotion > 50)>>