diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw index 4616011f604e3e46b05e4606ede2e23c71406918..b7ab66137cb8c7a44f7d7d5833e66bf2d1206c4f 100644 --- a/src/SecExp/attackHandler.tw +++ b/src/SecExp/attackHandler.tw @@ -225,6 +225,10 @@ <<set _defMod -= 0.10>> <<set _tacChance -= 0.20>> <<elseif $assistantPower == 2>> + <<set _atkMod += 0.10>> + <<set _defMod += 0.10>> + <<set _tacChance += 0.20>> + <<elseif $assistantPower >= 3>> <<set _atkMod += 0.15>> <<set _defMod += 0.15>> <<set _tacChance += 0.30>> diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw index 3a5a0aad145993d2ebd7f15e3956473d5ee9f5d7..dfb954e2a3f328fde49b66cede8f361370c23689 100644 --- a/src/SecExp/attackReport.tw +++ b/src/SecExp/attackReport.tw @@ -917,9 +917,9 @@ <<if $deployingMercs == 1 || $deployingMilitia == 1 || $deployingSlaves == 1>> No soldier trusts a computer to be their commander, <<if _oldRep < 10000 && _oldAuth < 10000>> - no algorithm can substitute experience<<if $assistantPower == 0>>and as expected<<else>>, however, <</if>> + no algorithm can substitute experience, <<if $assistantPower == 0>>and as expected, <<else>>however, <</if>> <<else>> - but they trust you enough to not question your decision<<if $assistantPower == 0>>, however<<else>>, <</if>> + but they trust you enough to not question your decision<<if $assistantPower == 0>>, however<<else>>, and <</if>> <</if>> <<else>> You find @@ -929,6 +929,8 @@ <<elseif $assistantPower == 1>> your assistant performs decently. While nothing to write home about your men are pleasantly surprised. <<elseif $assistantPower == 2>> + your assistant performs admirably. _HisA upgraded computing power allows _himA to monitor the battlefield closely, enhancing the efficiency of your troops and the effectiveness of your battle plan. + <<elseif $assistantPower >= 3>> your assistant performs admirably. _HisA vast computing power allows _himA to be everywhere on the battlefield, greatly enhancing the efficiency of your troops and the effectiveness of your battle plan. <</if>> <<elseif $leadingTroops == "bodyguard">> diff --git a/src/SecExp/secExpSmilingMan.tw b/src/SecExp/secExpSmilingMan.tw index b58a8526c213df0be3c55363fe3bfcb877b53d82..7953ec802c96274f88cc9129a121f4e63ca5675e 100644 --- a/src/SecExp/secExpSmilingMan.tw +++ b/src/SecExp/secExpSmilingMan.tw @@ -80,18 +80,21 @@ <br>You waste no time in rushing to the console and checking your finances. It's as you feared, @@.red;you have been robbed.@@ <<set _lostCash = Math.clamp(50000 * Math.trunc($week / 20), 50000, 1000000)>> <<if $assistantPower == 1>> - <<set _lostCash -= 20000>> + <<set _lostCash -= Math.min(20000, _lostCash)>> <br>Fortunately, the computing power available to $assistantName allowed _himA to somewhat limit the losses. <<elseif $assistantPower == 2>> - <<set _lostCash -= 30000>> + <<set _lostCash -= Math.min(30000, _lostCash)>> <br>Fortunately, the computing power available to $assistantName allowed _himA to limit the losses. + <<elseif $assistantPower >= 3>> + <<set _lostCash -= Math.min(40000, _lostCash)>> + <br>Fortunately, the computing power available to $assistantName allowed _himA to significantly limit the losses. <</if>> <<if $secUpgrades.cyberBots == 1>> - <<set _lostCash -= 30000>> + <<set _lostCash -= Math.min(30000, _lostCash)>> The additional cyber defenses acquired and running in the security HQ <<if _lostCash < 200000>>further<</if>> limit the damage. <</if>> <<if $investedFunds == 1>> - <<set _lostCash -= 20000>> + <<set _lostCash -= Math.min(20000, _lostCash)>> The funding you dedicated to the Smiling Man case saved some of the assets that would have been otherwise lost. <</if>> <<run cashX(forceNeg(_lostCash), "event")>> diff --git a/src/SecExp/tradeReport.tw b/src/SecExp/tradeReport.tw index eaefe588a9ce1d3ae9411e62aa33fe54dcfe53d8..d7be2a36b3f47b3c7856f7c1c7db9b89e57086ac 100644 --- a/src/SecExp/tradeReport.tw +++ b/src/SecExp/tradeReport.tw @@ -57,7 +57,7 @@ <<if $assistantPower == 1>> Thanks to the computing power available to _himA, $assistantName is able to guide the commercial development of the arcology to greater levels. <<set _tradeChange++>> -<<elseif $assistantPower == 2>> +<<elseif $assistantPower >= 2>> Thanks to the incredible computing power available to _himA, $assistantName is able to guide the commercial development of the arcology to greater levels. <<set _tradeChange += 2>> <</if>> diff --git a/src/uncategorized/neighborDescription.tw b/src/uncategorized/neighborDescription.tw index d16585fddfe0de4a851292e99aa61046aadf9294..163709184ab3c7893bb235af890487e5efebdd9c 100644 --- a/src/uncategorized/neighborDescription.tw +++ b/src/uncategorized/neighborDescription.tw @@ -36,7 +36,7 @@ <</if>> <</if>> <<if $arcologies[$i].PCminority > 0>>You own @@.lime;$arcologies[$i].PCminority%@@ of this arcology<<if (($arcologies[$i].government == "your trustees") || ($arcologies[$i].government == "your agent")) && $arcologies[$i].minority > $arcologies[$i].PCminority-10>>, a dangerously narrow margin over competition with a @@.red;<<print Math.trunc(($arcologies[$i].minority*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>%@@ share<</if>>.<</if>> -<<set $economicUncertainty -= 2*$assistantPower>> +<<set $economicUncertainty -= Math.min(2*$assistantPower, $economicUncertainty)>> The arcology has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcologies[$i].prosperity*random(100-$economicUncertainty,100+$economicUncertainty))/100))>>m,@@ <<if Math.abs($arcologies[$i].prosperity - $averageProsperity) < 5>> average among diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw index 0c86f19588b9aba68c08570249e50a8a73c511dc..f89fc69162d2dcec68ece99bc1c0a98568dddb4f 100644 --- a/src/uncategorized/neighborsDevelopment.tw +++ b/src/uncategorized/neighborsDevelopment.tw @@ -73,7 +73,7 @@ <<else>> <<set _error = 10>> <</if>> -<<set _error -= 2*$assistantPower>> +<<set _error -= Math.min(2*$assistantPower, _error)>> <<set _prosperity = (Math.trunc((0.1*$arcologies[$i].prosperity*random(100-_error,100+_error))/100))>> has an estimated GSP of @@.yellowgreen;<<print cashFormat(_prosperity)>><<if $showNumbers != 2>><<if ($showNumbers == 1) && (_prosperity > $showNumbersMax)>>m<<else>> million<</if>><<else>>m<</if>>,@@ diff --git a/src/uncategorized/reShowerPunishment.tw b/src/uncategorized/reShowerPunishment.tw index c994d66ac4accce6ae565ab62a663010739a8391..3e03dd6993a7f2496814af49aba21c5c2d976b7d 100644 --- a/src/uncategorized/reShowerPunishment.tw +++ b/src/uncategorized/reShowerPunishment.tw @@ -73,7 +73,7 @@ $activeSlave.slaveName is being very thorough. When you first appeared, $he was <br><<link "Get a scrub down too">> <<EventNameDelink $activeSlave>> <<replace "#result">> - You strip off your suit and enter the shower. By the time you get in, $HeadGirl.slaveName's sponge scrub is almost done. _He2 turns to greet you with half-lidded eyes, well pleased with _his2 thorough scrubbing. _His2 $HeadGirl.skin shines with wet cleanliness, and _his2 $HeadGirl.nipples nipples begin to <<if $HeadGirl.nipples == "fuckable">>swell with arousal<<else>>stiffen<</if>> as _he2 sees your gaze take in _his2 nude body. _He2 brusquely orders $activeSlave.slaveName to scrub you, too, anticipating your intention. The rough, exfoliating sensation of the sponge is indeed delightful, and you close your eyes to savor the feeling as the slave rubs it up and down your calves and then the backs of your knees. + You strip off your suit and enter the shower. By the time you get in, $HeadGirl.slaveName's sponge scrub is almost done. _He2 turns to greet you with half-lidded eyes, well pleased with _his2 thorough scrubbing. _His2 $HeadGirl.skin skin shines with wet cleanliness, and _his2 $HeadGirl.nipples nipples begin to <<if $HeadGirl.nipples == "fuckable">>swell with arousal<<else>>stiffen<</if>> as _he2 sees your gaze take in _his2 nude body. _He2 brusquely orders $activeSlave.slaveName to scrub you, too, anticipating your intention. The rough, exfoliating sensation of the sponge is indeed delightful, and you close your eyes to savor the feeling as the slave rubs it up and down your calves and then the backs of your knees. <br><br> <<if $HGSeverity > 0>> You detect tremors of fear in the slave's hands; $he knows that $he hasn't extirpated $his misbehavior, whatever it was, just yet. You let your Head Girl manage that, however, and _he2 does. When $activeSlave.slaveName is stuck in one position for a short time by the need to wash your thighs, you hear a gasp and open your eyes to the sight of your Head Girl crouched behind $him, giving $him an anal fingerfuck. When $activeSlave.slaveName is done washing you, your Head Girl holds the slave's head to your diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw index 168b8141897e430975d53f166ec085c7b2ec5584..d5a89940a8ca566045755654955a98789ed95ad1 100644 --- a/src/uncategorized/saLiveWithHG.tw +++ b/src/uncategorized/saLiveWithHG.tw @@ -799,14 +799,14 @@ <<else>> and keeps $him on $his diet. <</if>> -<<elseif (($slaves[$i].muscles <= 95 && ($arcologies[0].FSPhysicalIdealist > 0 || (($HeadGirl.fetish == "submissive" || $HeadGirl.fetish == "masochist") && $HeadGirl.fetishKnown == 1))) || $slaves[$i].muscles <= 5) && $slaves[$i].amp != 1>> +<<elseif (($slaves[$i].muscles <= 95 && (($arcologies[0].FSPhysicalIdealist > 0 && $arcologies[0].FSPhysicalIdealistLaw == 0) || (($HeadGirl.fetish == "submissive" || $HeadGirl.fetish == "masochist") && $HeadGirl.fetishKnown == 1))) || ($slaves[$i].muscles <= 45 && ($arcologies[0].FSPhysicalIdealist > 0 && $arcologies[0].FSPhysicalIdealistLaw == 1)) || $slaves[$i].muscles <= 5) && $slaves[$i].amp != 1>> $HeadGirl.slaveName thinks $slaves[$i].slaveName - <<if $arcologies[0].FSPhysicalIdealist > 0>> - could use bigger muscles to support your societal goals - <<elseif $HeadGirl.fetish == "submissive">> + <<if $HeadGirl.fetish == "submissive">> could use bigger muscles to better dominate _him2 with in bed <<elseif $HeadGirl.fetish == "masochist">> could use bigger muscles to better spank _him2 + <<elseif $arcologies[0].FSPhysicalIdealist > 0>> + could use bigger muscles to support your societal goals <<else>> could use a bit of muscle <</if>> diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw index 2ed2c237c38694bc92a59a1c6063256ac68baea7..441e284a2389a4b445cae154980f23f2a3abc002 100644 --- a/src/uncategorized/saPleaseYou.tw +++ b/src/uncategorized/saPleaseYou.tw @@ -107,7 +107,7 @@ serves you this week. <<set $slaves[$i].sexualFlaw = "none">> <</if>> <<if ($slaves[$i].skill.vaginal < 100)>> - After a lot of time spent having vanilla sex, $his vaginal skill improves. + After a lot of time spent having vanilla sex, $his @@.green;vaginal skill improves.@@ <<= SkillIncrease.Vaginal($slaves[$i], _trainingEfficiency)>> <</if>> <</if>> @@ -238,7 +238,7 @@ serves you this week. <<set $slaves[$i].sexualFlaw = "none">> <</if>> <<if ($slaves[$i].skill.anal < 100)>> - After a lot of time spent getting buttfucked, $his anal skill improves. + After a lot of time spent getting buttfucked, $his @@.green;anal skill improves.@@ <<= SkillIncrease.Anal($slaves[$i], _trainingEfficiency)>> <</if>> <<if $slaves[$i].fetish == "buttslut">> @@ -382,7 +382,7 @@ serves you this week. <<set $slaves[$i].behavioralFlaw = "none">> <</if>> <<if ($slaves[$i].skill.oral < 100)>> - After a lot of time spent <<if $PC.dick == 1>>sucking you off<<if $PC.vagina == 1>> and eating you out<</if>><<else>>eating you out<</if>>, $his oral skill improves. + After a lot of time spent <<if $PC.dick == 1>>sucking you off<<if $PC.vagina == 1>> and eating you out<</if>><<else>>eating you out<</if>>, $his @@.green;oral skill improves.@@ <<= SkillIncrease.Oral($slaves[$i], _trainingEfficiency)>> <</if>> <<if $slaves[$i].fetish == "cumslut">> @@ -1054,13 +1054,13 @@ serves you this week. <</if>> <<if $slaves[$i].fetish != "mindbroken">> <<if ($slaves[$i].skill.oral < 100)>> - After a lot of time spent with <<if $PC.dick == 1>>your dick in $his mouth<<else>>$his mouth on your cunt<</if>>, $his oral skill improves. + After a lot of time spent with <<if $PC.dick == 1>>your dick in $his mouth<<else>>$his mouth on your cunt<</if>>, $his @@.green;oral skill improves.@@ <<= SkillIncrease.Oral($slaves[$i], _trainingEfficiency)>> <<elseif ($slaves[$i].skill.vaginal < 100) && ($slaves[$i].vagina > 0) && canDoVaginal($slaves[$i])>> - After a lot of time spent getting fucked, $his vaginal skill improves. + After a lot of time spent getting fucked, $his @@.green;vaginal skill improves.@@ <<= SkillIncrease.Vaginal($slaves[$i], _trainingEfficiency)>> <<elseif ($slaves[$i].skill.anal < 100) && ($slaves[$i].anus != 0) && canDoAnal($slaves[$i])>> - After a lot of time spent taking it up the ass, $his anal skill improves. + After a lot of time spent taking it up the ass, $his @@.green;anal skill improves.@@ <<= SkillIncrease.Anal($slaves[$i], _trainingEfficiency)>> <</if>> <</if>>