Merge branch 'pregmod-master' into 'pregmod-master'

Pregmod v1017-21

See merge request !453

src/uncategorized/reFSAcquisition.tw

@@ -90,7 +90,7 @@
 <<set $activeSlave.areolaePiercing = 1>>
 <<set $activeSlave.clothes = "a slutty outfit">>
 <<set $activeSlave.shoes = "heels">>
-/*<<set $slaves[$i].inflation = 3, $slaves[$i].inflationType = "food", $slaves[$i].inflationMethod = 1>>*/
+<<set $slaves[$i].inflation = 3, $slaves[$i].inflationType = "food", $slaves[$i].inflationMethod = 1>>
 <<slaveCost $activeSlave>>
 <<set $slaveCost -= 1000>>
 

src/uncategorized/wardrobe.tw

@@ -6,7 +6,7 @@
 <</nobr>>\
 \
 ''__Slave Wardrobe__''
-//The room containing all the clothes and accessories you have available to dress your slaves in, as well as the supplies and tools your tailor needs to resize them to better fit your slaves.  Several mirrors are set up for a slave to try on outfits should she be allowed to dress herself.  The selection includes <<if ($cheatMode == 1) || (($clothesBoughtBunny == 1 || $arcologies[0].FSGenderFundamentalist != "unset") && ($clothesBoughtChains == 1 || $arcologies[0].FSDegradationist != "unset") && ($clothesBoughtConservative == 1 || $arcologies[0].FSPaternalist != "unset") && ($clothesBoughtWestern == 1 || $arcologies[0].FSPastoralist != "unset") && ($clothesBoughtOil == 1 || $arcologies[0].FSPhysicalIdealist != "unset") && ($clothesBoughtHabit == 1 || $arcologies[0].FSChattelReligionist != "unset") && ($clothesBoughtToga == 1 || $arcologies[0].FSRomanRevivalist != "unset") && ($clothesBoughtHuipil == 1 || $arcologies[0].FSAztecRevivalist != "unset") && ($clothesBoughtKimono == 1 || $arcologies[0].FSEdoRevivalist != "unset") && ($clothesBoughtHarem == 1 || $arcologies[0].FSArabianRevivalist != "unset") && ($clothesBoughtQipao == 1 || $arcologies[0].FSChineseRevivalist != "unset") && ($clothesBoughtEgypt == 1 || $arcologies[0].FSEgyptianRevivalist != "unset") && ($clothesBoughtMaternityDress == 1 || $arcologies[0].FSRepopulationFocus != "unset") && ($clothesBoughtMaternityLingerie == 1 || $arcologies[0].FSRepopulationFocus != "unset") && ($clothesBoughtBelly == 1 || $arcologies[0].FSRepopulationFocus != "unset") && ($clothesBoughtLazy == 1 || $arcologies[0].FSHedonisticDecadence != "unset"))>>outfits from all manner of cultures and societies, not a single style eludes you.<<else>>many styles of clothing ranging from exciting to mundane and sexy to practical.<</if>><<if $toysBoughtDildos == 1 && $toysBoughtGags == 1 && $toysBoughtButtPlugs == 1>> Sex toys of all kinds and shapes line the shelves.<<elseif $toysBoughtDildos == 1 || $toysBoughtGags == 1 || $toysBoughtButtPlugs == 1>> Some sex toys line the shelves.<</if>><<if $enema == 1>> A number of drums of specially formulated water for use in enemas line one of the walls.<</if>><<if $medicalEnema == 1>> Alongside them, multiple drums of mixtures for use in medical enemas.<</if>>//
+//The room containing all the clothes and accessories you have available to dress your slaves in, as well as the supplies and tools your tailor needs to resize them to better fit your slaves.  Several mirrors are set up for a slave to try on outfits should she be allowed to dress herself.  The selection includes <<if ($cheatMode == 1) || (($clothesBoughtBunny == 1 || $arcologies[0].FSGenderFundamentalist != "unset") && ($clothesBoughtChains == 1 || $arcologies[0].FSDegradationist != "unset") && ($clothesBoughtConservative == 1 || $arcologies[0].FSPaternalist != "unset") && ($clothesBoughtWestern == 1 || $arcologies[0].FSPastoralist != "unset") && ($clothesBoughtOil == 1 || $arcologies[0].FSPhysicalIdealist != "unset") && ($clothesBoughtHabit == 1 || $arcologies[0].FSChattelReligionist != "unset") && ($clothesBoughtToga == 1 || $arcologies[0].FSRomanRevivalist != "unset") && ($clothesBoughtHuipil == 1 || $arcologies[0].FSAztecRevivalist != "unset") && ($clothesBoughtKimono == 1 || $arcologies[0].FSEdoRevivalist != "unset") && ($clothesBoughtHarem == 1 || $arcologies[0].FSArabianRevivalist != "unset") && ($clothesBoughtQipao == 1 || $arcologies[0].FSChineseRevivalist != "unset") && ($clothesBoughtEgypt == 1 || $arcologies[0].FSEgyptianRevivalist != "unset") && ($clothesBoughtMaternityDress == 1 || $arcologies[0].FSRepopulationFocus != "unset") && ($clothesBoughtMaternityLingerie == 1 || $arcologies[0].FSRepopulationFocus != "unset") && ($clothesBoughtBelly == 1 || $arcologies[0].FSRepopulationFocus != "unset") && ($clothesBoughtLazyClothes == 1 || $arcologies[0].FSHedonisticDecadence != "unset"))>>outfits from all manner of cultures and societies, not a single style eludes you.<<else>>many styles of clothing ranging from exciting to mundane and sexy to practical.<</if>><<if $toysBoughtDildos == 1 && $toysBoughtGags == 1 && $toysBoughtButtPlugs == 1>> Sex toys of all kinds and shapes line the shelves.<<elseif $toysBoughtDildos == 1 || $toysBoughtGags == 1 || $toysBoughtButtPlugs == 1>> Some sex toys line the shelves.<</if>><<if $enema == 1>> A number of drums of specially formulated water for use in enemas line one of the walls.<</if>><<if $medicalEnema == 1>> Alongside them, multiple drums of mixtures for use in medical enemas.<</if>>//
 <br>
 <<nobr>>
 <<if $clothesBoughtBunny == 0 && $arcologies[0].FSGenderFundamentalist == "unset" && $cheatMode == 0>>
@@ -43,10 +43,10 @@
 <</if>>
 <</nobr>>
 <<nobr>>
-<<if $clothesBoughtLazy == 0 && $arcologies[0].FSHedonisticDecadence == "unset" && $cheatMode == 0>>
-	[[Order a shipment of comfortable, rather stretchy, clothes|Wardrobe][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $clothesBoughtLazy = 1]]
+<<if $clothesBoughtLazyClothes == 0 && $arcologies[0].FSHedonisticDecadence == "unset" && $cheatMode == 0>>
+	[[Order a shipment of comfortable, rather stretchy, clothes|Wardrobe][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $clothesBoughtLazyClothes = 1]]
 	//Costs ¤<<print Math.trunc(5000*$upgradeMultiplierArcology)>>//
-<<else>>You are well stocked with various body oils.
+<<else>>You are well stocked with various comfy pants and rather tight crop-tops.
 <</if>>
 <</nobr>>
 <<nobr>>
@@ -99,21 +99,21 @@
 <</if>>
 <</nobr>>
 <<nobr>>
-<<if $clothesBoughtMaternityDress == 0 && $arcologies[0].FSRepopulationFocus is "unset" && $cheatMode == 0>>
+<<if $clothesBoughtMaternityDress == 0 && $arcologies[0].FSRepopulationFocus == "unset" && $cheatMode == 0>>
 	[[Order a shipment of maternity dresses|Wardrobe][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $clothesBoughtMaternityDress = 1]]
 	//Costs ¤<<print Math.trunc(5000*$upgradeMultiplierArcology)>>//
 <<else>>You are well stocked with dresses specially tailored for pregnant women.
 <</if>>
 <</nobr>>
 <<nobr>>
-<<if $clothesBoughtMaternityLingerie == 0 && $arcologies[0].FSRepopulationFocus is "unset" && $cheatMode == 0>>
+<<if $clothesBoughtMaternityLingerie == 0 && $arcologies[0].FSRepopulationFocus == "unset" && $cheatMode == 0>>
 	[[Order a shipment of maternity lingerie|Wardrobe][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $clothesBoughtMaternityLingerie = 1]]
 	//Costs ¤<<print Math.trunc(5000*$upgradeMultiplierArcology)>>//
 <<else>>You are well stocked with sexy silken lingerie designed for pregnant women.
 <</if>>
 <</nobr>>
 <<nobr>>
-<<if $clothesBoughtBelly == 0 && $cheatMode == 0 && $arcologies[0].FSRepopulationFocus is "unset">>
+<<if $clothesBoughtBelly == 0 && $cheatMode == 0 && $arcologies[0].FSRepopulationFocus == "unset">>
 	[[Order a shipment of fake pregnancy bellies|Wardrobe][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $clothesBoughtBelly = 1]]
 	//Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
 <<else>>You are well stocked with silicone pregnancy bellies modeled after variously sized women.