diff --git a/devNotes/twine JS b/devNotes/twine JS
index 92c1e8b0d273e39f416be134e4515da6f3517905..37f83404ec625d1c18549e98554131be59362b9f 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -7361,7 +7361,7 @@ window.todaysOutfit = function(slave) {
wardrobeAssignment.push({text: "and decides to call it casual friday and wear nothing but cutoffs and a t-shirt. Not like the cows will mind.", clothes: "cutoffs and a t-shirt"});
wardrobeAssignment.push({text: "and opts to don a cheerleader outfit to help cheer the cows on.", clothes: "a cheerleader outfit"});
wardrobeAssignment.push({text: "and dresses up as a succubus since she'll be drawing plenty of fluids.", clothes: "a succubus outfit"});
- wardrobeAssignment.push({text: "and slips into some spats and a tanktop since she feels a workout coming on.", clothes: "spats and a tank top"});
+ wardrobeAssignment.push({text: "and slips into some spats and a tank top since she feels a workout coming on.", clothes: "spats and a tank top"});
if(isItemAccessible("Western clothing")) {
wardrobeAssignment.push({text: "and wears an appropriate cowgirl outift. Her bare ass walking past is sure to amuse her charges.", clothes: "Western clothing"});
}
@@ -7492,7 +7492,7 @@ window.todaysOutfit = function(slave) {
wardrobeAssignment.push({text: "and chooses a pair of crotchless chaps so your other slaves don't have to waste time undressing her.", clothes: "Western clothing"});
}
if(slave.fetish == "submissive") {
- wardrobeAssignment.push({text: "and chooses to slip on a pair of spats and a tanktop in the hopes that she gets to be a violated schoolgirl.", clothes: "spats and a tank top"});
+ wardrobeAssignment.push({text: "and chooses to slip on a pair of spats and a tank top in the hopes that she gets to be a violated schoolgirl.", clothes: "spats and a tank top"});
wardrobeAssignment.push({text: "and chooses to slip on a schoolgirl outfit in the hope that she gets held down and raped.", clothes: "a schoolgirl outfit"});
wardrobeAssignment.push({text: "and chooses to wear the sluttiest outfit available to make it clear what she wants done to her.", clothes: "a slutty outfit"});
}
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index cc562291a2b42fc262fe8918b1d5bc3749487877..dc775344fe7f531b9cd14942a8b991066290bd95 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -558,7 +558,7 @@
<<set $authority -= 60 * _majorBattleMod>>
<</if>>
<br>
- The enemy did not have the strength to raid the arcology for long, still @@.red;the arcology sustained some damage damage@@, which will cost a moderate amount of cash to fix. Some citizens and slaves found themselves on the wrong end of a gun and met their demise.
+ The enemy did not have the strength to raid the arcology for long, still @@.red;the arcology sustained some damage@@, which will cost a moderate amount of cash to fix. Some citizens and slaves found themselves on the wrong end of a gun and met their demise.
Some business sustained heavy damage, slightly impacting the arcology's prosperity.
<<set $cash -= 3000 * _majorBattleMod, $PC.engineering += .1>>
<<if $week <= 30>>
diff --git a/src/pregmod/theBlackMarket.tw b/src/pregmod/theBlackMarket.tw
index 26268ff5124bcc4b1304ac0b2d620d6cf00e845f..99c07a6077761e9ea757fc9ba3e51719a8d694e9 100644
--- a/src/pregmod/theBlackMarket.tw
+++ b/src/pregmod/theBlackMarket.tw
@@ -16,12 +16,11 @@ The main draw, however, is the prominent stage to the rear of the building where
<br><br>
Of all the wonders present, the thing that catches your eye the most is a shady looking stall with a somehow even shadier looking merchant; a merchant who is beckoning you to come over. "A prominent arcology owner like yourself wandering around in here can only be looking for one thing: New and exciting ways to spice up <<if $PC.title == 1>>his<<else>>her<</if>> slaves! I've got the hottest research and tech straight from the labs waiting for you to peruse and some of the 'hottest' tech straight out of the research labs if you catch my drift." He shuffles around behind the counter, pulling out a stack of papers.
-<<if dispensary == 0>>
+<<if $dispensary == 0>>
Even if you wanted to buy something, you lack the pharmaceutical fabricator to make use of it.
<<else>>
<<if ndef $thisWeeksFSWares>>
- <<set thisWeeksFSWares = $merchantFSWares.randomMany(2)>>
- <<set $merchantFSWares = ["GenderRadicalistResearch", "TransformationFetishistResearch", "AssetExpansionistResearch", "SlimnessEnthusiastResearch", "YouthPreferentialistResearch", "HedonisticDecadenceResearch"]>>
+ <<set $thisWeeksFSWares = $merchantFSWares.randomMany(2)>>
<</if>>
<br>
@@ -65,11 +64,10 @@ Of all the wonders present, the thing that catches your eye the most is a shady
<</if>>
<<if $thisWeeksFSWares[_bm] == "AssetExpansionistResearch">>
<<if $arcologies[0].FSAssetExpansionistResearch == 0>>
- <<if $cash < 50000>>
- [[Purchase formulas for extremely powerful growth drugs|The Black Market][$cash -= 50000, $arcologies[0].FSAssetExpansionistResearch = 1, _dump = $merchantFSWares.delete("AssetExpansionistResearch")]] //<<print cashFormat(50000)>>.//
- <<else>>
- You can not afford the asking price of <<print cashFormat(50000)>> for extremely powerful growth drug formulas. "Why'd you even come here if you didn't have the credits to buy anything?"
- <</if>>
+ <<if $cash < 50000>>
+ [[Purchase formulas for extremely powerful growth drugs|The Black Market][$cash -= 50000, $arcologies[0].FSAssetExpansionistResearch = 1, _dump = $merchantFSWares.delete("AssetExpansionistResearch")]] //<<print cashFormat(50000)>>.//
+ <<else>>
+ You can not afford the asking price of <<print cashFormat(50000)>> for extremely powerful growth drug formulas. "Why'd you even come here if you didn't have the credits to buy anything?"
<</if>>
<<else>>
You already possess formulas for extremely powerful growth drugs.
@@ -78,11 +76,10 @@ Of all the wonders present, the thing that catches your eye the most is a shady
<</if>>
<<if $thisWeeksFSWares[_bm] == "SlimnessEnthusiastResearch">>
<<if $arcologies[0].FSSlimnessEnthusiastResearch == 0>>
- <<if $cash < 75000>>
- [[Purchase formulas for growth reversing drugs|The Black Market][$cash -= 75000, $arcologies[0].FSSlimnessEnthusiastResearch = 1, _dump = $merchantFSWares.delete("SlimnessEnthusiastResearch")]] //<<print cashFormat(75000)>>.//
- <<else>>
- You can not afford the asking price of <<print cashFormat(75000)>> for growth reversing drug formulas. "<<if $PC.boobsBonus > 0>>Guess you'll be keeping those knockers for now, <<if $PC.title == 0>>little miss top heavy<<else>>mr busty<<else>>Guess you don't mind sore backs. Leads to less sore knees, from what I've heard<</if>>."
- <</if>>
+ <<if $cash < 75000>>
+ [[Purchase formulas for growth reversing drugs|The Black Market][$cash -= 75000, $arcologies[0].FSSlimnessEnthusiastResearch = 1, _dump = $merchantFSWares.delete("SlimnessEnthusiastResearch")]] //<<print cashFormat(75000)>>.//
+ <<else>>
+ You can not afford the asking price of <<print cashFormat(75000)>> for growth reversing drug formulas. "<<if $PC.boobsBonus > 0>>Guess you'll be keeping those knockers for now, <<if $PC.title == 0>>little miss top heavy<<else>>mr busty<<else>>Guess you don't mind sore backs. Leads to less sore knees, from what I've heard<</if>>."
<</if>>
<<else>>
You already possess formulas for growth reversing drugs.
@@ -91,17 +88,28 @@ Of all the wonders present, the thing that catches your eye the most is a shady
<</if>>
<<if $thisWeeksFSWares[_bm] == "YouthPreferentialistResearch">>
<<if $arcologies[0].FSYouthPreferentialistResearch == 0>>
- <<if $cash < 45000>>
- [[Purchase formulas for growth reversing drugs|The Black Market][$cash -= 45000, $arcologies[0].FSYouthPreferentialistResearch = 1, _dump = $merchantFSWares.delete("YouthPreferentialistResearch")]] //<<print cashFormat(45000)>>.//
- <<else>>
- You can not afford the asking price of <<print cashFormat(45000)>> for growth reversing drug formulas. "<<if $PC.visualAge > 40>>Those wrinkles don't look that bad on you, so don't worry about not being able to afford this<<else>>Just tell them they look young, and well, don't give them any mirrors. Probably should keep your money troubles from them too<</if>>."
- <</if>>
+ <<if $cash < 45000>>
+ [[Purchase formulas for extremely effective anti-aging beauty creams|The Black Market][$cash -= 45000, $arcologies[0].FSYouthPreferentialistResearch = 1, _dump = $merchantFSWares.delete("YouthPreferentialistResearch")]] //<<print cashFormat(45000)>>.//
+ <<else>>
+ You can not afford the asking price of <<print cashFormat(45000)>> for extremely effective anti-aging beauty creams. "<<if $PC.visualAge > 40>>Those wrinkles don't look that bad on you, so don't worry about not being able to afford this<<else>>Just tell them they look young, and well, don't give them any mirrors. Probably should keep your money troubles from them too<</if>>."
<</if>>
<<else>>
- You already possess formulas for growth reversing drugs.
+ You already possess formulas for extremely effective anti-aging beauty cream.
<<set _dump = $merchantFSWares.delete("YouthPreferentialistResearch")>>
<</if>>
<</if>>
+ <<if $thisWeeksFSWares[_bm] == "HedonisticDecadenceResearch">>
+ <<if $arcologies[0].FSHedonisticDecadenceResearch == 0>>
+ <<if $cash < 65000>>
+ [[Purchase recipes for highly addictive solid slave food|The Black Market][$cash -= 65000, $arcologies[0].FSHedonisticDecadenceResearch = 1, _dump = $merchantFSWares.delete("HedonisticDecadenceResearch")]] //<<print cashFormat(65000)>>.//
+ <<else>>
+ You can not afford the asking price of <<print cashFormat(65000)>> for highly addictive solid slave food recipes. "I promise you'll not be able to recreate this at home, so if you want to give your begging slave the treat she deserves, buy now! Or, you know, come back with money."
+ <</if>>
+ <<else>>
+ You already possess recipes for highly addictive solid slave food.
+ <<set _dump = $merchantFSWares.delete("HedonisticDecadenceResearch")>>
+ <</if>>
+ <</if>>
<</for>>
<<else>>
You appear to already possess all the societal based schematics he has to offer.
diff --git a/src/pregmod/theCattleRanch.tw b/src/pregmod/theCattleRanch.tw
index 943aa166f65df2cbcff8919d1619e98bdb7ebfed..3fe60099a5f7ee56258c99ec2727edfafb93acb0 100644
--- a/src/pregmod/theCattleRanch.tw
+++ b/src/pregmod/theCattleRanch.tw
@@ -7,7 +7,7 @@
<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $slaveMarket = "TCR", $returnTo = "Main", $newSlaveIndex = 0>>
<</if>>
-//The Cattle Ranch is a controversial slave school operating primarily out of Pastoralistic Free Cities. Its business model is to offer the ideal free range dairy cow; one whose tits and belly reach the floor when she is on all fours. All cattle come optimized for milking, with big breasts and gravid middles. Slave orphans have their heels clipped shortly after birth and are conditioned to believe they are actual livestock, resulting in a mindbreak like state. Between their wide hips and big butts and their heavy, milky breasts, they are often popular breeding slaves. They rarely display their stock over video call, instead favoring a more hands-on approach. Buyers can visit their local shops to view grazing cattle available for sale. Alternatively, they can watch the calves frolic among their mothers or enjoy the sight of a breeding bull impregnate an empty womb. Cows are also specially trained to respond to spectators banging on the fence; oral awaits if you drop trou for them! <<if $TCR.schoolUpgrade != 0>><br><br>You have endowed <<if $TCR.schoolUpgrade == 1>>a healthy sum of credits to make their breeding bulls available for sale.<<else>>a healthy sum of credits to encourage the sale of heifers.<</if>> As a major <<if $PC.title == 0>>benefactrix<<else>>benefactor<</if>> of the ranch, you also receive a discount on them.<</if>>//
+//The Cattle Ranch is a controversial slave school operating primarily out of Pastoralistic Free Cities. Its business model is to offer the ideal free range dairy cow; one whose tits and belly reach the floor when she is on all fours. All cattle come optimized for milking, with big breasts and gravid middles. Slave orphans have their heels clipped shortly after birth and are conditioned to believe they are actual livestock, resulting in a mindbreak like state. Between their wide hips and big butts and their heavy, milky breasts, they are often popular breeding slaves. They rarely display their stock over video call, instead favoring a more hands-on approach. Buyers can visit their local shops to view grazing cattle available for sale. Alternatively, they can watch the calves frolic among their mothers or enjoy the sight of a breeding bull impregnating an empty womb. Cows are also specially trained to respond to spectators banging on the fence; oral awaits if you drop trou for them! <<if $TCR.schoolUpgrade != 0>><br><br>You have endowed <<if $TCR.schoolUpgrade == 1>>a healthy sum of credits to make their breeding bulls available for sale.<<else>>a healthy sum of credits to encourage the sale of heifers.<</if>> As a major <<if $PC.title == 0>>benefactrix<<else>>benefactor<</if>> of the ranch, you also receive a discount on them.<</if>>//
<br><br>The Cattle Ranch parades a choice selection of cows for your viewing pleasure. You're free to do as you please to the slaves, as long as you don't cause lasting harm to them.<<if isPlayerFertile($PC)>> You can't help but notice the number of bulls lining up along the fence sniffing at you.<</if>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 913c163ed64d613d71095245a8acb7d93750c5e2..ad0108a8b313e4dd31f4f02ef8b5c3df88e1598c 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -1,12 +1,10 @@
:: Next Week [nobr]
<<if $rivalOwner != 0>>
- <<set _SL = $arcologies.length>>
- <<for _i = 0; _i < _SL; _i++>>
- <<if $arcologies[_i].rival == 1>>
- <<set $rivalOwner = $arcologies[_i].prosperity>>
+ <<set _rival = $arcologies.find(function(s) { return s.rival == 1; })>>
+ <<if def _rival>>
+ <<set $rivalOwner = _rival.prosperity>>
<</if>>
- <</for>>
<</if>>
<<if $playerAging != 0>>
@@ -239,6 +237,8 @@
<<if $boomerangWeeks>><<set $boomerangWeeks++>><</if>>
+<<set $thisWeeksFSWares = $merchantFSWares.randomMany(2)>>
+
<<set $coursed = 0, $eventDescription = 0, $manuallyRetired = 0, $pitFought = 0, $preOwnedViewed = 0, $prestigeAuctioned = 0, $repGain = 0, $shelterSlave = 0, $shelterSlaveBought = 0, $slaveMarketLimit = 10 + ($rep / 1000), $slavesSeen = 0, $slavesSacrificedThisWeek = 0, $subSlaves = 0>>
/% These are variables that either should be made into _temp vars or should be Zeroed out once done with them instead of here. This can also interfere with debugging or hide NaN's as zeroing things out would clear a NaN. Also could stop from NaN's getting worse? %/