From 6ff77184ab230bcd841e35aac2520707f2947dc7 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Mon, 11 Sep 2017 02:51:36 -0400 Subject: [PATCH] fixes --- src/init/storyInit.tw | 6 +++++ src/pregmod/fFeet.tw | 30 ++++++++++++--------- src/pregmod/incubatorReport.tw | 2 +- src/uncategorized/BackwardsCompatibility.tw | 17 ++++++++++++ src/uncategorized/saRivalries.tw | 17 +++++++++++- src/uncategorized/slaveGenerationWidgets.tw | 12 ++++----- 6 files changed, 63 insertions(+), 21 deletions(-) diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 328fadfaefb..bbe2f2e1a3c 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -1148,6 +1148,7 @@ FertilityAge($fertilityAge) <<set $securityForceDepravity = 0>> /* How depraved has the SF become? Used for flavor text injections. */ <<set $securityForceUpgradeToken = 0>> /* Flag to keep track of single upgrade/week. */ <<set $securityForceGiftToken = 0>> /* Flag to keep track of single gift/week. */ +<<set $securityForceColonelToken = 0>> /* Flag to keep track of fucking the colonel? */ /* Variables for the SF Personnel/Gear */ <<set $securityForcePersonnel = 40>> /* How big is the SF? Maxes out at battalion/regimental (~1000) strength */ @@ -1157,6 +1158,11 @@ FertilityAge($fertilityAge) <<set $securityForceDronePower = 0>> /* How many drone upgrades has the player bought? */ <<set $securityForceStimulantPower = 0>> /* How many stimulant upgrades has the player bought? */ <<set $securityForceArcologyUpgrades = 0>> /* How many militarized arcology upgrades has the player bought? */ +<<set $securityForceDronePower = 0>> /* How many frone upgrades has the player bought? */ +<<set $securityForceSpacePlanePower = 0>> /* Has the SF found a busted down spaceplane begging for work? */ +<<set $securityForceSatalitePower = 0>> /* Has the SF commendeered a satelite relay? */ +<<set $securityForceGiantRobot = 0>> /* Has the player assembled a makeshift giant robot */ +<<set $SSLevel = 0>> /* Has the player sent any slaves to 'help out' */ <<set $securityForceMissionEfficiency = 1>> /* How efficient is the SF at completing its assigned task? (Upgrades*Drug Multiplier) */ /* Misc mod variables */ diff --git a/src/pregmod/fFeet.tw b/src/pregmod/fFeet.tw index 475b8f3b315..aaec239636d 100644 --- a/src/pregmod/fFeet.tw +++ b/src/pregmod/fFeet.tw @@ -1,8 +1,9 @@ :: FFeet [nobr] /* WIP I found tucked away in the bowels of my archives */ +/* Slightly more additions */ <<ClearSummaryCache $activeSlave>> - You call your slave over to your office and shift your chair towards her. You tell her to use her feet to please you. + You call your slave over to your office, shifting your chair towards her. You tell her to use her feet to please you. <<if ($activeSlave.devotion < -50)>> She strongly refuses, and you have to restrain her to get her to obey. <<elseif ($activeSlave.devotion < -20)>> @@ -20,7 +21,7 @@ She rushes to comply. <</if>> - You pour lubricant in your hands, and start massaging her feet. + You pour lubricant into your hands and start massaging her feet. <<if ($activeSlave.devotion < -50)>> She tries to stay hateful despite the stimulation. <<elseif ($activeSlave.devotion < -20)>> @@ -33,13 +34,13 @@ She loves the massage, not holding back her moans. <</if>> - Then, you lay back on her chair and tell her to get to work. + Then, you lie down under her chair and tell her to get to work. <<if ($activeSlave.devotion < -50)>> When she refuses to comply, you take both her feet and start thrusting between them. <<elseif ($activeSlave.devotion < -20)>> - She seems a bit reluctant when massaging you with her feet, and you have to do most of the work. + She seems a bit reluctant when massaging you with her feet so you have to do most of the work. <<elseif ($activeSlave.devotion < 20)>> - She tries to make it pleasurable for you, trying to find the right angle and speed, but she seems a bit tense. + She tries to make it pleasurable for you, trying to find the right angle and speed, but she seems a bit tense and ruins her pacing. <<elseif ($activeSlave.devotion < 60)>> She does her best to please you, massaging you nicely. <<else>> @@ -47,24 +48,27 @@ <</if>> <<if ($activeSlave.sexualQuirk == "tease")>> - She makes sure to flash her <<if $activeSlave.dick != 0>>hole<<else>>holes<</if>> to you. + She makes sure to flash her <<if $activeSlave.dick != 0>>hole<<else>>holes<</if>> at you as she rubs your cock. +<<elseif ($activeSlave.sexualQuirk == "insecure")>> + She constanly asks if it feels good, much to your annoyance. <</if>> - <<if ($activeSlave.fetish == "dom") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 0)>> She is quite aggressive, sometimes bordering insubordination, but with a peek at your face, she tones it down. -<</if>> +<<elseif ($activeSlave.fetish == "sub") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 0)>> + She is quite the submissive and is a little uncomfortable taking the lead role in guiding your pleasure. +<</if>> You finally cum all over her feet. <<if $seeRace == 1>> <<if $activeSlave.race == "white">> - Her white, $activeSlave.skin feet barely show the cum + Her white, $activeSlave.skin feet barely shows the cum. <<elseif $activeSlave.race == "asian">> - Her asian, $activeSlave.skin feet show the cum a bit. + Her asian, $activeSlave.skin feet shows the cum a bit. <<elseif $activeSlave.race == "middle eastern">> - Her middle eastern, $activeSlave.skin feet show the cum a bit + Her middle eastern, $activeSlave.skin feet shows the cum a bit <<elseif $activeSlave.race == "latina">> - Her latina, $activeSlave.skin feet barely show the cum + Her latina, $activeSlave.skin feet barely shows the cum. <<elseif $activeSlave.race == "black">> - Her black, $activeSlave.skin feet make the cum stand out. + Her black, $activeSlave.skin feet makes the cum stand out. <</if>> <</if>> diff --git a/src/pregmod/incubatorReport.tw b/src/pregmod/incubatorReport.tw index fd372cca6fb..1fa60a191ff 100644 --- a/src/pregmod/incubatorReport.tw +++ b/src/pregmod/incubatorReport.tw @@ -13,7 +13,7 @@ <<set $incubatorSlaves += 1>> <<if $tanks[_inc].growTime > 0>> <<set $tanks[_inc].growTime -= $incubatorUpgradeSpeed>> - <br>@@.pink;<<print $tanks[_inc].slaveName>>'s@@ growth is currently being accelerated. She <<if Math.round($tanks[_inc].growTime/$incubatorUpgradeSpeed) == 0>>is @@.lime;ready for release.@@ She will be ejected from her tank upon your approach<<else>>will be ready for release in about <<print Math.round($tanks[_inc].growTime/$incubatorUpgradeSpeed)>> weeks<</if>>. + <br>@@.pink;<<print $tanks[_inc].slaveName>>'s@@ growth is currently being accelerated. She <<if Math.round($tanks[_inc].growTime/$incubatorUpgradeSpeed) <= 0>>is @@.lime;ready for release.@@ She will be ejected from her tank upon your approach<<else>>will be ready for release in about <<print Math.round($tanks[_inc].growTime/$incubatorUpgradeSpeed)>> weeks<</if>>. <<else>> @@.pink;$tanks[_inc].slaveName@@ is @@.lime;ready for release.@@ She will be ejected from her tank upon your approach. <</if>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index c3334335abc..c21cc144a20 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -545,6 +545,23 @@ <<set $cheatModeM = 1>> <</if>> +/* SF anon stuff */ +<<if ndef $securityForceColonelToken>> + <<set $securityForceColonelToken = 0>> +<</if>> +<<if ndef $securityForceSpacePlanePower>> + <<set $securityForceSpacePlanePower = 0>> +<</if>> +<<if ndef $securityForceSatalitePower>> + <<set $securityForceSatalitePower = 0>> +<</if>> +<<if ndef $securityForceGiantRobot>> + <<set $securityForceGiantRobot = 0>> +<</if>> +<<if ndef $SSLevel>> + <<set $SSLevel = 0>> +<</if>> + <<if ndef $arcologies[0].FSAztecRevivalist>> <<for _bci = 0; _bci < $arcologies.length; _bci++>> <<set $arcologies[_bci].FSAztecRevivalist = "unset", $arcologies[_bci].FSAztecRevivalistDecoration = 0>> diff --git a/src/uncategorized/saRivalries.tw b/src/uncategorized/saRivalries.tw index 6c533be1d92..d7f21242576 100644 --- a/src/uncategorized/saRivalries.tw +++ b/src/uncategorized/saRivalries.tw @@ -97,7 +97,22 @@ <</if>> <<if $slaves[_j].assignment == $slaves[$i].assignment>> <<if random(0,1) == 1>> - $slaves[$i].slaveName and <<SlaveFullName $slaves[_j]>> see too much of each other while they $slaves[_j].assignment and @@.lightsalmon;start to dislike each other.@@ + $slaves[$i].slaveName and <<SlaveFullName $slaves[_j]>> see too much of each other while they + <<switch $slaves[_j].assignment>> + <<case "be a servant" "work as a servant">> + work as servants + <<case "be a subordinate slave">> + prepare to serve your other slaves + <<case "work a glory hole">> + work nearby glory holes + <<case "be confined in the cellblock">> + are confined in nearby cells + <<case "please you">> + wait for you to use them + <<default>> + $slaves[_j].assignment + <</switch>> + and @@.lightsalmon;start to dislike each other.@@ <<set $slaves[_j].rivalry = 1, $slaves[$i].rivalry = 1, $slaves[_j].rivalryTarget = $slaves[$i].ID, $slaves[$i].rivalryTarget = $slaves[_j].ID>> <<break>> <</if>> diff --git a/src/uncategorized/slaveGenerationWidgets.tw b/src/uncategorized/slaveGenerationWidgets.tw index 212b96d6a6a..bbb1dc83e56 100644 --- a/src/uncategorized/slaveGenerationWidgets.tw +++ b/src/uncategorized/slaveGenerationWidgets.tw @@ -480,9 +480,9 @@ <<set $args[0].accent = _naturalAccent>> <</if>> <<case "Montenegrin")>> - <<set $args[0].accent = $seed>> + <<set $args[0].accent = _naturalAccent>> <<case "Cambodian")>> - <<set $args[0].accent = $seed>> + <<set $args[0].accent = _naturalAccent>> <<case "Cameroonian">> <<if $language == "French">> <<set $args[0].accent = 1>> @@ -502,9 +502,9 @@ <<set $args[0].accent = _naturalAccent>> <</if>> <<case "Greenlandic")>> - <<set $args[0].accent = $seed>> + <<set $args[0].accent = _naturalAccent>> <<case "Tuvaluan")>> - <<set $args[0].accent = $seed>> + <<set $args[0].accent = _naturalAccent>> <<case "Zambian">> <<if $language == "English">> <<set $args[0].accent = 1>> @@ -512,9 +512,9 @@ <<set $args[0].accent = _naturalAccent>> <</if>> <<case "Albanian")>> - <<set $args[0].accent = $seed>> + <<set $args[0].accent = _naturalAccent>> <<case "Bruneian")>> - <<set $args[0].accent = $seed>> + <<set $args[0].accent = _naturalAccent>> <<case "Singaporean")>> <<if $language == "English">> <<set $args[0].accent = 1>> -- GitLab