diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 0a3a69fa5ffe451bdaff82ecdb6ab206e754380b..bbde3a951429525ad155f3fb6486e76e7a44dac6 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -2239,6 +2239,9 @@ window.getCost = function(array) {
costs += Math.ceil(T.SFCashBonus);
}
}
+ if(State.variables.econWeatherDamage && State.variables.disasterResponse > 0) {
+ costs += Math.trunc(State.variables.disasterResponse * 200000 / State.variables.localEcon);
+ }
// clean up
if(costs < 0) {
costs = 0;
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index f16808347daed9fbd54e8e2fce797194c941ec07..ea974b0dbf8ebe94a21d33eb9a9fbd9174a10d35 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -389,6 +389,8 @@ You should have received a copy of the GNU General Public License along with thi
<<set $economy = 100>>
<<set $econRate = 2>>
<<set $difficultySwitch = 0>>
+ <<set $econWeatherDamage = 0>>
+ <<set $disasterResponse = 0>>
<<set $neighboringArcologies = 3>>
<<set $newDescriptions = 0>>
<<set $familyTesting = 0>>
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index 42629b15dd99e68082736416ff610658bda2a24f..99cc80c6fcc8b844f06f86258d2e84a6b7d139b9 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -335,6 +335,9 @@ window.getCost = function(array) {
costs += Math.ceil(T.SFCashBonus);
}
}
+ if(State.variables.econWeatherDamage && State.variables.disasterResponse > 0) {
+ costs += Math.trunc(State.variables.disasterResponse * 200000 / State.variables.localEcon);
+ }
// clean up
if(costs < 0) {
costs = 0;
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index 85847e33991177e558bc159e5ff7659bac9c4d72..cedd7caa2ef2fb8de1ed398e2191390871c13ebd 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -169,7 +169,7 @@ My favorite part of my body i<<s>>
Thank you for breeding u<<s>>, <<Master>>! Our womb i<<s>> your<<s>> to impregnate.
<</if>>
What? Oh, I'm thinking of my<<s>>elf and my <<if ($activeSlave.fetus_count >=2) || ($activeSlave.broodmother >=1)>> babie<<s>> <<else>> baby <</if>> as one person again, aren't I? I'm <<s>>orry, <<Master>>. It'<<s>> ju<<s>>t so hard to remember when my womb i<<s>> <<s>>o much more than I am in every way.
- <<eleif ($activeSlave.bellyPreg >= 15000)>>
+ <<elseif ($activeSlave.bellyPreg >= 15000)>>
... um... our bulging pregnant belly, of cour<<s>>e. we love feeling our womb <<s>>well with life.
<<if $activeSlave.pregSource == -1>>
Thank you for breeding u<<s>>, <<Master>>! Our womb i<<s>> your<<s>> to impregnate.
diff --git a/src/pregmod/manageEconomy.tw b/src/pregmod/manageEconomy.tw
index d66c6ff712636aa4d33c6bf6ab550229c599c26f..bb05654a2803365049580cb4e5ac9366f41f2906 100644
--- a/src/pregmod/manageEconomy.tw
+++ b/src/pregmod/manageEconomy.tw
@@ -45,6 +45,20 @@
<<set _econPercent = Math.trunc(100000/$localEcon-1000)/10>>
increasing prices by @@.red;''<<print _econPercent>> %.''@@
<</if>>
+ <<if $econWeatherDamage > 0>>
+ <br><br>The recent terrible weather has damaged the local infrastructure. It is @@.red;reducing the local economy score by <<print $econWeatherDamage>>.@@
+ <<if $disasterResponse == 0>>
+ <br>Locals will do their best to repair the damage on their own, but setting up a disaster response unit <br>will improve the recovery of infrastructure critical for keeping goods, people and information flowing smoothly in and out of your arcology.
+ <br>Creating the unit will cost <<print cashFormat(50000)>> and incur upkeep. [[Create Disaster Response Unit|Manage Economy][$cash -= 50000, $disasterResponse = 1]]
+ <<elseif $disasterResponse == 1>>
+ <br>You are sending your disaster response unit to repair critical infrastructure. They are doing what they can.
+ <br>The unit can be made more effective with an additional investment of <<print cashFormat(100000)>>. This will also increase upkeep. [[Improve Disaster Response Unit|Manage Economy][$cash -= 100000, $disasterResponse = 2]]
+ <<else>>
+ <br>Your highly capable disaster response unit is rapidly repairing the weather damage.
+ <</if>>
+ <<elseif $disasterResponse > 0>>
+ <br><br>Your disaster response unit is idle. It won't cost you any upkeep this week.
+ <</if>>
<br><br>
<</if>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index ad3fa0f716081e29dfd8836c7df5cc8e63b0534b..d09af19cea8922c78f62738a4557aefb843ef361 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3495,3 +3495,12 @@ Done!
<<if $releaseID < 1031>>
<<set $releaseID = 1031>>
<</if>>
+
+<<if $difficultySwitch == 1>>
+ <<if ndef $econWeatherDamage>>
+ <<set $econWeatherDamage = 0>>
+ <</if>>
+ <<if ndef $disasterResponse>>
+ <<set $disasterResponse = 0>>
+ <</if>>
+<</if>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index a13317949b1beae4d5bf77dd8671213713465235..e149db8b50e1bf9ce4fe49eaa955aa8404dfe860 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -20417,21 +20417,21 @@ You tell her kindly that you understand, and that $he'll be trained to address t
<br><<link "Try the 'Butter Strategy'">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You ponder her predicament for a moment before settling on a solution. You procure an industrial sized jar of curative laced moisturizing butter--specially formulated to ease the strain of hypermassive pregnancy--and explain to your slave that, to free $him, you're going to need to completely cover her in it so that $he can squeeze through.
+ You ponder $his predicament for a moment before settling on a solution. You procure an industrial sized jar of curative laced moisturizing butter--specially formulated to ease the strain of hypermassive pregnancy--and explain to your slave that, to free $him, you're going to need to completely cover $him in it so that $he can squeeze through.
<<if $activeSlave.devotion > 95>>
$He grins at you and then huffs, pretending to be put off by the idea.
<<elseif $activeSlave.devotion > 50>>
$He quirks an eyebrow, then smiles, clearly intrigued.
<<elseif $activeSlave.devotion > 20>>
- $He nods, happy to hear you've considered a way to free her without causing her undue harm.
+ $He nods, happy to hear you've considered a way to free $him without causing $him undue harm.
<<elseif ($activeSlave.trust < -20) && ($activeSlave.devotion > -10)>>
$He had seemed uneasy when you first described your idea, but seems to resign $himself to it once you finish your description.
<<elseif ($activeSlave.trust < -50)>>
- The wide eyed slave nods as you describe your idea, clearly hoping you'll free her as quickly as possible so that $he can get away from you.
+ The wide eyed slave nods as you describe your idea, clearly hoping you'll free $him as quickly as possible so that $he can get away from you.
<<else>>
$He laughs derisively at you after you describe your idea, then motions for you to get on with it.
<</if>>
- You move toward $him and slather a generous helping of the stuff over her back and
+ You move toward $him and slather a generous helping of the stuff over $his back and
<<if $activeSlave.butt > 10>>
couch-smothering ass,
<<elseif $activeSlave.butt > 4>>
@@ -20441,24 +20441,26 @@ You tell her kindly that you understand, and that $he'll be trained to address t
<</if>>
for the sake of "being thorough." You then move forward, covering the parts of $his belly you can reach from behind and taking special care to
<<if ($activeSlave.boobs >= 20000)>>
- massage the soft butter into every inch of her colossal tits, noting with satisfaction as her distant nipples, stuck on the other side of the doorway with the bulk of her room filling breasts, harden with arousal.
+ massage the soft butter into every inch of $his colossal tits, noting with satisfaction $his distant nipples, stuck on the other side of the doorway with the bulk of $his room filling breasts, harden with arousal.
<<elseif ($activeSlave.boobs >= 12000)>>
- massage the soft butter into her massive tits as they push up between the arch of the doorway and her bulging belly. You note with satisfaction as $his nipples harden with arousal.
+ massage the soft butter into $his massive tits as they push up between the arch of the doorway and $his bulging belly. You note with satisfaction $his nipples harden with arousal.
<<elseif ($activeSlave.boobs >= 7000)>>
- massage the soft butter into her monstrous tits, enjoying the struggle it takes to heft each butter-slick, glistening melon with both hands. You note with satisfaction as $his nipples harden with arousal.
+ massage the soft butter into $his monstrous tits, enjoying the struggle it takes to heft each butter-slick, glistening melon with both hands. You note with satisfaction $his nipples harden with arousal.
<<elseif ($activeSlave.boobs >= 3000)>>
- massage the soft butter into each of her huge tits. Your slave cranes her head back a bit to avoid being smothered by her own breasts as you work the butter into them, but you can tell $he's aroused by what you're doing--$his nipples have turned hard as rocks.
+ massage the soft butter into each of $his huge tits. Your slave cranes $his head back a bit to avoid being smothered by $his own breasts as you work the butter into them, but you can tell $he's aroused by what you're doing--$his nipples have turned hard as rocks.
<<elseif Math.floor($activeSlave.boobsImplant/$activeSlave.boobs) >= .60>>
- massage the soft butter into her fat, fake titties, noting with satisfaction as $his nipples harden with arousal.
+ massage the soft butter into $his fat, fake titties, noting with satisfaction $his nipples harden with arousal.
<<elseif ($activeSlave.boobs >= 650)>>
- massage the soft butter into her big tits, noting with satisfaction as $his nipples harden with arousal.
+ massage the soft butter into $his big tits, noting with satisfaction $his nipples harden with arousal.
<<elseif ($activeSlave.boobs >= 300)>>
- massage the soft butter into her small, girlish chest, noting with satisfaction as $his nipples harden with arousal.
+ massage the soft butter into $his small, girlish chest, noting with satisfaction $his nipples harden with arousal.
+ <<else>>
+ massage the soft butter into $his flat chest, noting with satisfaction $his nipples harden with arousal.
<</if>>
<br><br>
- Satisfied with your covering of your slave's back half, you then resolve to work on her front. Getting down on your hands and knees, you crawl through the narrow triangle of space between the base of your slave's massive belly, the floor, and the doorway. It's a tight squeeze, and you take longer than you need to in order to enjoy the sound of your slave groaning as you rub up against her sweaty, buttered up belly, but you eventually make it through. Taking generous handfuls of butter, you slick up the front half of your slave's stomach, starting at the flattened nub of her pressure obliterated belly button and slowly working your way up to the round oval of baby-packed flesh being constricted by the doorway.
+ Satisfied with your covering of your slave's back half, you then resolve to work on $his front. Getting down on your hands and knees, you crawl through the narrow triangle of space between the base of your slave's massive belly, the floor, and the doorway. It's a tight squeeze, and you take longer than you need to in order to enjoy the sound of your slave groaning as you rub up against $his sweaty, buttered up belly, but you eventually make it through. Taking generous handfuls of butter, you slick up the front half of your slave's stomach, starting at the flattened nub of $his pressure obliterated belly button and slowly working your way up to the round oval of baby-packed flesh being constricted by the doorway.
<br><br>
- With your slave's body dripping with the thick moisturizer, you call out to $him to start pulling $his belly through the doorway, pushing your body up against $his stomach to help push. You didn't bother to strip your clothes while buttering her gravid figure and, as you crush up against $him and heave, again and again, against the sheer mass of $his abdomen, you can't help but get aroused by the way your greasy clothes rub between your body and $hers with each motion. At first, $his belly is so firmly lodged that it doesn't move, but momentum eventually builds up and, with an audible "pop," the poor baby-laden breeder finally breaks free from her containment, falling onto her back and pulling you with her into an absurd, buttery mass of flailing limbs and giggles. You take some time to flip her into a position where $he won't be crushed by the weight of her own womb, and then take some more time to enjoy the fruits of your labors.
+ With your slave's body dripping with the thick moisturizer, you call out to $him to start pulling $his belly through the doorway, pushing your body up against $his stomach to help push. You didn't bother to strip your clothes while buttering $his gravid figure and, as you crush up against $him and heave, again and again, against the sheer mass of $his abdomen, you can't help but get aroused by the way your greasy clothes rub between your body and $hers with each motion. At first, $his belly is so firmly lodged that it doesn't move, but momentum eventually builds up and, with an audible "pop," the poor baby-laden breeder finally breaks free from $his containment, falling onto $his back and pulling you with $him into an absurd, buttery mass of flailing limbs and giggles. You take some time to flip $him into a position where $he won't be crushed by the weight of $his own womb, and then take some more time to enjoy the fruits of your labors.
<br><br>
Once finished, you allow your servants to carry your @@.hotpink;thoroughly satisfied slave@@ to the baths for a needed cleaning. You could pay to have the door widened, but then you wouldn't have such a perfect excuse to lather $him in cream, would you?
<<set $activeSlave.devotion += 5>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index 6d2c9df6844084c1ef3175008ceafa871d2ed63d..9b3f39662ae8ee4b5b16c01d51f9a2d39f0c3658 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -156,6 +156,10 @@ your __personal living expenses__ are <<print cashFormat(Math.trunc($girls*(250+
<</for>>
<</if>>
+<<if $econWeatherDamage && $disasterResponse > 0>>
+ <<set _DRUUpkeep = Math.trunc($disasterResponse * 200000 / $localEcon)>>
+ <br>__Disaster Response Unit__ expenses: <<print cashFormat(_DRUUpkeep)>>
+<</if>>
<<if $FSSpending != 0>>
<br>__Society Shaping__ expenses: <<print cashFormat($FSSpending)>>
<</if>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 67f4610ca5262211b4e61ebdfcf4c56f76aea2a0..6af760b0874c3c856fa07db7de70d68aa3465d0c 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -1692,7 +1692,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<br>
<<link "Make $him an office ornament for the day">>
<<replace "#introResult">>
- You cuff $his wrists and ankles, bend all four limbs behind $him, secure them together, and hoist $him up to the ceiling on a rope. $He hangs up there like a sex slave chandelier, breasts swaying in a lovely way whenever $he struggles. Periodically you let $him down to stretch $his aching limbs, but whenever you put your decoration back up you add some clips with little bells on them: first the nose, then the nipples, and finally the <<if $activeSlave.dick != 0>>dickhead<<else>>pussylips<</if>>. By the end of the day your work is accompanied by the sweet sounds of ringing bells and @@.gold;agonized pleas@@ for mercy in $his <<if $activeSlave.voice == 3>>high, girlish<<elseif $activeSlave.voice == 2>>feminine<<else>>deep<</if>> voice. $He will remember @@.mediumorchid;what you can do to $him@@.
+ You cuff $his wrists and ankles, bend all four limbs behind $him, secure them together, and hoist $him up to the ceiling on a rope. $He hangs up there like a sex slave chandelier<<if $activeSlave.boobs >= 650>>, breasts swaying in a lovely way whenever $he struggles<</if>>. Periodically you let $him down to stretch $his aching limbs, but whenever you put your decoration back up you add some clips with little bells on them: first the nose, then the nipples, and finally the <<if $activeSlave.dick != 0>>dickhead<<else>>pussylips<</if>>. By the end of the day your work is accompanied by the sweet sounds of ringing bells and @@.gold;agonized pleas@@ for mercy in $his <<if $activeSlave.voice == 3>>high, girlish<<elseif $activeSlave.voice == 2>>feminine<<else>>deep<</if>> voice. $He will remember @@.mediumorchid;what you can do to $him@@.
<</replace>>
<<set $activeSlave.devotion -= 5>>
<<set $activeSlave.trust -= 10>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index e9a301d8ad15dac163324c951e40d22c967db59e..c8a9e955591c2a6bd7ef6bdbfa8692737766e674 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -37,7 +37,7 @@
<<set $economy = 20>>
<</if>>
<<set _localEconSeed = random(1,100)>>
- <<if $localEcon <= ($globalEcon + $econAdvantage)>>
+ <<if $localEcon <= ($economy + $econAdvantage)>>
<<if _localEconSeed > 95>>
<<set $localEcon += 2>>
<<elseif _localEconSeed > 50>>
@@ -47,7 +47,7 @@
<<elseif _localEconSeed <= 10>>
<<set $localEcon -= 1>>
<</if>>
- <<elseif $localEcon <= ($globalEcon + $econAdvantage + 5)>>
+ <<elseif $localEcon <= ($economy + $econAdvantage + 5)>>
<<if _localEconSeed > 98>>
<<set $localEcon += 2>>
<<elseif _localEconSeed > 66>>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 111294fe8f9917893847bcd94d25cfe6267703ca..83e582bcec2035ef332dcb0e2339db2304ae8d0b 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -1033,14 +1033,45 @@ The RomanFS may need further tweaking (it probably got weaker). Could increase t
<</if>>
<<if $difficultySwitch == 1>>
+<<if $econWeatherDamage > 0>>
+ <<set _repairSeed = random(1,3)>>
+ <<if $disasterResponse == 0>>
+ <<if _repairSeed == 3>>
+ <<set $econWeatherDamage -= 1>>
+ <<set $localEcon += 1>>
+ <</if>>
+ <<elseif $disasterResponse == 1>>
+ <<if _repairSeed > 1>>
+ <<set $econWeatherDamage -= 1>>
+ <<set $localEcon += 1>>
+ <</if>>
+ <<else>>
+ <<if _repairSeed == 3>>
+ <<if $econWeatherDamage > 1>>
+ <<set $econWeatherDamage -= 2>>
+ <<set $localEcon += 2>>
+ <<else>>
+ <<set $econWeatherDamage -= 1>>
+ <<set $localEcon += 1>>
+ <</if>>
+ <<else>>
+ <<set $econWeatherDamage -= 1>>
+ <<set $localEcon += 1>>
+ <</if>>
+ <</if>>
+<</if>>
+<<if $terrain != "oceanic">>
<<if $weatherToday.severity == 3>>
<<set $localEcon -= 1>>
+ <<set $econWeatherDamage += 1>>
<br><br>This week's terrible weather did a number on the region, @@.red;hurting the local economy.@@
<<elseif $weatherToday.severity > 3>>
<<set $localEcon -= 3>>
+ <<set $econWeatherDamage += 3>>
<br><br>This week's extreme weather ravaged the region, @@.red;the local economy is seriously disrupted.@@
<</if>>
<</if>>
+<</if>>