From 24698f28351f3e77cc3a0f9e7de2970e80c1937a Mon Sep 17 00:00:00 2001
From: j <okp57855@psoxs.com>
Date: Sun, 10 Dec 2017 02:53:29 +1300
Subject: [PATCH] Hopefully everything is saved correctly this time.
---
src/pregmod/theHippolytaAcademy.tw | 4 ----
src/uncategorized/brothel.tw | 2 +-
src/uncategorized/bulkSlaveGenerate.tw | 3 ---
src/uncategorized/cellblock.tw | 2 +-
src/uncategorized/clinic.tw | 6 +++---
src/uncategorized/club.tw | 2 +-
src/uncategorized/corporateMarket.tw | 2 --
src/uncategorized/growthResearchInstitute.tw | 4 ----
src/uncategorized/servantsQuarters.tw | 2 +-
src/uncategorized/slaveMarkets.tw | 4 ----
src/uncategorized/stClaverPreparatory.tw | 4 ----
src/uncategorized/theFutanariSisters.tw | 4 ----
src/uncategorized/theGymnasiumAcademy.tw | 4 ----
src/uncategorized/theSlavegirlSchool.tw | 4 ----
14 files changed, 7 insertions(+), 40 deletions(-)
diff --git a/src/pregmod/theHippolytaAcademy.tw b/src/pregmod/theHippolytaAcademy.tw
index bcc5f4b7363..6483725ea1b 100644
--- a/src/pregmod/theHippolytaAcademy.tw
+++ b/src/pregmod/theHippolytaAcademy.tw
@@ -36,12 +36,8 @@ The Hippolyta Academy is one of the most famous slave bodyguarding schools in al
<br>[[Buy her and check out other slaves to order|The Hippolyta Academy][$cash -= $slaveCost, $HA.schoolSale = 0, $HA.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
<<if $newSlaves.length == 0>>
<br>[[Buy her slave contract|New Slave Intro][$cash -= $slaveCost, $HA.schoolSale = 0, $HA.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
- <if $PC.slaving < 100 && random($PC.slaving,100) > 50>><<set $PC.slaving += .5>><<else>><<set $PC.slaving += .1>><</if>>
- <if $PC.trading < 100 && random($PC.trading,100) > 50>><<set $PC.trading += .5>><<else>><<set $PC.trading += .1>><</if>>
<<else>>
<br>[[Buy her and Finish your order of slaves|Bulk Slave Intro][$cash -= $slaveCost, $HA.schoolSale = 0, $HA.studentsBought += 1, $newSlaves.push($activeSlave)]]
- <if $PC.slaving < 100 && random($PC.slaving,100) > 50>><<set $PC.slaving += .5>><<else>><<set $PC.slaving += .1>><</if>>
- <if $PC.trading < 100 && random($PC.trading,100) > 50>><<set $PC.trading += .5>><<else>><<set $PC.trading += .1>><</if>>
<</if>>
<<else>>
//You lack the necessary funds to buy this slave.//
diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index c7e30bfbbbf..1e4bbce9bf2 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -158,7 +158,7 @@ $brothelNameCaps
It has been upgraded with aphrodisiac injection systems that monitor the whores and adjust dosage to keep them healthy but desperately horny and hopelessly addicted. The systems are currently disabled. [[Enable them|Brothel][$brothelUpgradeDrugs = 1]] //Will increase upkeep costs//
<<else>>
<<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology)>>
- It is a standard brothel. [[Upgrade the brothel with aphrodisiac injection systems|Brothel][$cash -= _Tmult1, $brothelUpgradeDrugs = 0.1,$PC.engineering += 1,$PC.engineering += 1,$PC.slaving+= 1]] //Costs ¤_Tmult1 and will increase upkeep costs//
+ It is a standard brothel. [[Upgrade the brothel with aphrodisiac injection systems|Brothel][$cash -= _Tmult1, $brothelUpgradeDrugs = 0.1,$PC.slaving+= 1]] //Costs ¤_Tmult1 and will increase upkeep costs//
<</if>>
<br>$brothelNameCaps is
diff --git a/src/uncategorized/bulkSlaveGenerate.tw b/src/uncategorized/bulkSlaveGenerate.tw
index 22bab0160b4..b7f734c0528 100644
--- a/src/uncategorized/bulkSlaveGenerate.tw
+++ b/src/uncategorized/bulkSlaveGenerate.tw
@@ -149,6 +149,3 @@
<</switch>>
<<goto "Bulk Slave Intro">>
-
-<if $PC.slaving < 100 && random($PC.slaving,100) > 50>><<set $PC.slaving += .5>><<else>><<set $PC.slaving += .1>><</if>>
-<if $PC.trading < 100 && random($PC.trading,100) > 50>><<set $PC.trading += .5>><<else>><<set $PC.trading += .1>><</if>>
\ No newline at end of file
diff --git a/src/uncategorized/cellblock.tw b/src/uncategorized/cellblock.tw
index 690357c8ca9..610c9dfcdfc 100644
--- a/src/uncategorized/cellblock.tw
+++ b/src/uncategorized/cellblock.tw
@@ -79,7 +79,7 @@ $cellblockNameCaps
Its compliance systems have been upgraded to allow slaves no mental respite, painstakingly correcting the tiniest misbehaviors to soften flaws into quirks at the cost of considerable anguish to inmates denied any rest from correction.
<<else>>
<<set _Tmult1 = Math.trunc(20000*$upgradeMultiplierArcology)>>
- Its compliance systems are standard. [[Upgrade them to soften slave flaws|Cellblock][$cash -= _Tmult1, $cellblockUpgrade = 1,$PC.engineering += 1,$PC.slaving += 1]] //Costs ¤_Tmult1//
+ Its compliance systems are standard. [[Upgrade them to soften slave flaws|Cellblock][$cash -= _Tmult1, $cellblockUpgrade = 1,$PC.slaving += 1]] //Costs ¤_Tmult1//
<</if>>
<br><br>
diff --git a/src/uncategorized/clinic.tw b/src/uncategorized/clinic.tw
index a3e3b2c3b8f..585c282c0f7 100644
--- a/src/uncategorized/clinic.tw
+++ b/src/uncategorized/clinic.tw
@@ -79,7 +79,7 @@ $clinicNameCaps
$clinicNameCaps's scanners have been upgraded with a sampling system that can estimate carcinogenic damage to a slave's genome.
<<else>>
<<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology)>>
- It mounts powerful medical scanning technology. [[Upgrade the scanners to help detect genomic damage|Clinic][$cash -= _Tmult1, $clinicUpgradeScanner = 1,$PC.engineering += 1,$PC.slaving += 1]] //Costs ¤_Tmult1//
+ It mounts powerful medical scanning technology. [[Upgrade the scanners to help detect genomic damage|Clinic][$cash -= _Tmult1, $clinicUpgradeScanner = 1,$PC.slaving += 1]] //Costs ¤_Tmult1//
<</if>>
<br>
@@ -88,14 +88,14 @@ $clinicNameCaps
The entire floor beneath $clinicName is occupied by a huge filtration plant that constantly cycles out the patients' blood to remove impurities. The blood is intensely cleaned to greatly decrease the presence of impurities at the cost of compatibility. Patients will likely be ill for the duration of the treatment.
<<else>>
<<set _Tmult3 = Math.trunc(150000*$upgradeMultiplierArcology)>>
- The entire floor beneath $clinicName is occupied by a huge filtration plant that constantly cycles out the patients' blood to remove impurities. [[Increase the effectiveness of the impurity purging|Clinic][$cash -= _Tmult3, $clinicUpgradePurge to 1,$PC.engineering += 1,$PC.slaving += 1]] //Costs ¤_Tmult3 and may cause health problems in slaves//
+ The entire floor beneath $clinicName is occupied by a huge filtration plant that constantly cycles out the patients' blood to remove impurities. [[Increase the effectiveness of the impurity purging|Clinic][$cash -= _Tmult3, $clinicUpgradePurge to 1,$PC.slaving += 1]] //Costs ¤_Tmult3 and may cause health problems in slaves//
<</if>>
<<if $Nurse == 0>>
<br>However, without a nurse in attendance, the blood treatment equipment remains idle.
<</if>>
<<else>>
<<set _Tmult2 = Math.trunc(50000*$upgradeMultiplierArcology)>>
- It includes standard dialysis equipment. [[Install advanced blood treatment equipment to help address drug side effects|Clinic][$cash -= _Tmult2, $clinicUpgradeFilters = 1,$PC.engineering += 1,$PC.slaving += 1]] //Costs ¤_Tmult2//
+ It includes standard dialysis equipment. [[Install advanced blood treatment equipment to help address drug side effects|Clinic][$cash -= _Tmult2, $clinicUpgradeFilters = 1,$PC.slaving += 1]] //Costs ¤_Tmult2//
<</if>>
<br>
diff --git a/src/uncategorized/club.tw b/src/uncategorized/club.tw
index 6dc22b2fb6e..2c177fd82ac 100644
--- a/src/uncategorized/club.tw
+++ b/src/uncategorized/club.tw
@@ -209,7 +209,7 @@ $clubNameCaps
$clubNameCaps has been wired for unobtrusive personal data assistants to let your sluts pass tips about enslaveable people to your recruiter.
<<else>>
<<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology)>>
- The rooms are standard. [[Upgrade them with PDAs to help your recruiter|Club][$cash -= _Tmult1, $clubUpgradePDAs = 1,$PC.engineering += 1,$PC.slaving += 1]] //Costs ¤_Tmult1 and will increase upkeep costs//
+ The rooms are standard. [[Upgrade them with PDAs to help your recruiter|Club][$cash -= _Tmult1, $clubUpgradePDAs = 1,$PC.slaving += 1]] //Costs ¤_Tmult1 and will increase upkeep costs//
<</if>>
<br>
diff --git a/src/uncategorized/corporateMarket.tw b/src/uncategorized/corporateMarket.tw
index 0f0196beee8..aa4219db5b2 100644
--- a/src/uncategorized/corporateMarket.tw
+++ b/src/uncategorized/corporateMarket.tw
@@ -88,8 +88,6 @@ The offered price is ¤<<print $slaveCost>>.<<if $slavesSeen > $slaveMarketLimit
<br>
<<if $cash >= $slaveCost>>
[[Buy her slave contract|New Slave Intro][$cash -= $slaveCost,$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]]
- <<if $PC.slaving < 100 && random($PC.slaving,100) > 50>><<set $PC.slaving += .5>><<else>><<set $PC.slaving += .1>><</if>>
- <if $PC.trading < 100 && random($PC.trading,100) > 50>><<set $PC.trading += .5>><<else>><<set $PC.trading += .1>><</if>>
<<else>>
//You lack the necessary funds to buy this slave.//
<</if>>
diff --git a/src/uncategorized/growthResearchInstitute.tw b/src/uncategorized/growthResearchInstitute.tw
index d0fad601d2e..8a496ea2c65 100644
--- a/src/uncategorized/growthResearchInstitute.tw
+++ b/src/uncategorized/growthResearchInstitute.tw
@@ -26,12 +26,8 @@
<br>[[Buy her and check out other slaves to order|Growth Research Institute][$cash -= $slaveCost, $GRI.schoolSale = 0, $GRI.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
<<if $newSlaves.length == 0>>
<br>[[Buy her slave contract|New Slave Intro][$cash -= $slaveCost, $GRI.schoolSale = 0, $GRI.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
- <if $PC.slaving < 100 && random($PC.slaving,100) > 50>><<set $PC.slaving += .5>><<else>><<set $PC.slaving += .1>><</if>>
- <if $PC.trading < 100 && random($PC.trading,100) > 50>><<set $PC.trading += .5>><<else>><<set $PC.trading += .1>><</if>>
<<else>>
<br>[[Buy her and Finish your order of slaves|Bulk Slave Intro][$cash -= $slaveCost, $GRI.schoolSale = 0, $GRI.studentsBought += 1, $newSlaves.push($activeSlave)]]
- <if $PC.slaving < 100 && random($PC.slaving,100) > 50>><<set $PC.slaving += .5>><<else>><<set $PC.slaving += .1>><</if>>
- <if $PC.trading < 100 && random($PC.trading,100) > 50>><<set $PC.trading += .5>><<else>><<set $PC.trading += .1>><</if>>
<</if>>
<<else>>
//You lack the necessary funds to buy this slave.//
diff --git a/src/uncategorized/servantsQuarters.tw b/src/uncategorized/servantsQuarters.tw
index 010ab84b69a..9e729237ee0 100644
--- a/src/uncategorized/servantsQuarters.tw
+++ b/src/uncategorized/servantsQuarters.tw
@@ -79,7 +79,7 @@ $servantsQuartersNameCaps
The quarters have been upgraded with enhanced monitoring systems to make the servants work harder, improving their obedience and efficiency.
<<else>>
<<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology)>>
- The quarters are standard. [[Upgrade the monitoring systems to force harder work|Servants' Quarters][$cash -= _Tmult1, $servantsQuartersUpgradeMonitoring = 1,$PC.engineering += 1,$PC.slaving+= 1]] //Costs ¤_Tmult1 and will increase upkeep costs//
+ The quarters are standard. [[Upgrade the monitoring systems to force harder work|Servants' Quarters][$cash -= _Tmult1, $servantsQuartersUpgradeMonitoring = 1,$PC.slaving+= 1]] //Costs ¤_Tmult1 and will increase upkeep costs//
<</if>>
<<if $servantMilkers == 1>>
diff --git a/src/uncategorized/slaveMarkets.tw b/src/uncategorized/slaveMarkets.tw
index 033f8e7ac84..b905ee99862 100644
--- a/src/uncategorized/slaveMarkets.tw
+++ b/src/uncategorized/slaveMarkets.tw
@@ -182,12 +182,8 @@ The offered price is ¤<<print $slaveCost>>.<<if $slavesSeen > $slaveMarketLimit
<br>[[Buy her and check out other slaves to order|Slave Markets][$cash -= $slaveCost, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
<<if $newSlaves.length == 0>>
<br>[[Buy her slave contract|New Slave Intro][$cash -= $slaveCost,$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]]
- <if $PC.slaving < 100 && random($PC.slaving,100) > 50>><<set $PC.slaving += .5>><<else>><<set $PC.slaving += .1>><</if>>
- <if $PC.trading < 100 && random($PC.trading,100) > 50>><<set $PC.trading += .5>><<else>><<set $PC.trading += .1>><</if>>
<<else>>
<br>[[Buy her and Finish your order of slaves|Bulk Slave Intro][$cash -= $slaveCost, $newSlaves.push($activeSlave)]]
- <if $PC.slaving < 100 && random($PC.slaving,100) > 50>><<set $PC.slaving += .5>><<else>><<set $PC.slaving += .1>><</if>>
- <if $PC.trading < 100 && random($PC.trading,100) > 50>><<set $PC.trading += .5>><<else>><<set $PC.trading += .1>><</if>>
<</if>>
<<else>>
//You lack the necessary funds to buy this slave.//
diff --git a/src/uncategorized/stClaverPreparatory.tw b/src/uncategorized/stClaverPreparatory.tw
index 72cf3fa35e8..294d645b780 100644
--- a/src/uncategorized/stClaverPreparatory.tw
+++ b/src/uncategorized/stClaverPreparatory.tw
@@ -26,12 +26,8 @@
<br>[[Buy her and check out other slaves to order|St. Claver Preparatory][$cash -= $slaveCost, $SCP.schoolSale = 0, $SCP.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
<<if $newSlaves.length == 0>>
<br>[[Buy her slave contract|New Slave Intro][$cash -= $slaveCost, $SCP.schoolSale = 0, $SCP.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
- <if $PC.slaving < 100 && random($PC.slaving,100) > 50>><<set $PC.slaving += .5>><<else>><<set $PC.slaving += .1>><</if>>
- <if $PC.trading < 100 && random($PC.trading,100) > 50>><<set $PC.trading += .5>><<else>><<set $PC.trading += .1>><</if>>
<<else>>
<br>[[Buy her and Finish your order of slaves|Bulk Slave Intro][$cash -= $slaveCost, $SCP.schoolSale = 0, $SCP.studentsBought += 1, $newSlaves.push($activeSlave)]]
- <if $PC.slaving < 100 && random($PC.slaving,100) > 50>><<set $PC.slaving += .5>><<else>><<set $PC.slaving += .1>><</if>>
- <if $PC.trading < 100 && random($PC.trading,100) > 50>><<set $PC.trading += .5>><<else>><<set $PC.trading += .1>><</if>>
<</if>>
<<else>>
//You lack the necessary funds to buy this slave.//
diff --git a/src/uncategorized/theFutanariSisters.tw b/src/uncategorized/theFutanariSisters.tw
index d575d5dc246..e2fcf9f1bcc 100644
--- a/src/uncategorized/theFutanariSisters.tw
+++ b/src/uncategorized/theFutanariSisters.tw
@@ -97,12 +97,8 @@ The price is ¤<<print $slaveCost>>.<<if $slavesSeen > $slaveMarketLimit>> You h
<br>[[Buy her and check out other slaves to order|The Futanari Sisters][$cash -= $slaveCost, $TFS.schoolSale = 0, $TFS.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
<<if $newSlaves.length == 0>>
<br>[[Buy her slave contract|New Slave Intro][$cash -= $slaveCost, $TFS.schoolSale = 0, $TFS.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
- <if $PC.slaving < 100 && random($PC.slaving,100) > 50>><<set $PC.slaving += .5>><<else>><<set $PC.slaving += .1>><</if>>
- <if $PC.trading < 100 && random($PC.trading,100) > 50>><<set $PC.trading += .5>><<else>><<set $PC.trading += .1>><</if>>
<<else>>
<br>[[Buy her and Finish your order of slaves|Bulk Slave Intro][$cash -= $slaveCost, $TFS.schoolSale = 0, $TFS.studentsBought += 1, $newSlaves.push($activeSlave)]]
- <if $PC.slaving < 100 && random($PC.slaving,100) > 50>><<set $PC.slaving += .5>><<else>><<set $PC.slaving += .1>><</if>>
- <if $PC.trading < 100 && random($PC.trading,100) > 50>><<set $PC.trading += .5>><<else>><<set $PC.trading += .1>><</if>>
<</if>>
<<else>>
//You lack the necessary funds to buy this slave.//
diff --git a/src/uncategorized/theGymnasiumAcademy.tw b/src/uncategorized/theGymnasiumAcademy.tw
index e8264a3cdf5..05d50656bc3 100644
--- a/src/uncategorized/theGymnasiumAcademy.tw
+++ b/src/uncategorized/theGymnasiumAcademy.tw
@@ -26,12 +26,8 @@
<br>[[Buy her and check out other slaves to order|The Gymnasium-Academy][$cash -= $slaveCost, $TGA.schoolSale = 0, $TGA.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
<<if $newSlaves.length == 0>>
<br>[[Buy her slave contract|New Slave Intro][$cash -= $slaveCost, $TGA.schoolSale = 0, $TGA.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
- <<if $PC.slaving < 100 && random($PC.slaving,100) > 50>><<set $PC.slaving += .5>><<else>><<set $PC.slaving += .1>><</if>>
- <if $PC.trading < 100 && random($PC.trading,100) > 50>><<set $PC.trading += .5>><<else>><<set $PC.trading += .1>><</if>>
<<else>>
<br>[[Buy her and Finish your order of slaves|Bulk Slave Intro][$cash -= $slaveCost, $TGA.schoolSale = 0, $TGA.studentsBought += 1, $newSlaves.push($activeSlave)]]
- <<if $PC.slaving < 100 && random($PC.slaving,100) > 50>><<set $PC.slaving += .5>><<else>><<set $PC.slaving += .1>><</if>>
- <if $PC.trading < 100 && random($PC.trading,100) > 50>><<set $PC.trading += .5>><<else>><<set $PC.trading += .1>><</if>>
<</if>>
<<else>>
//You lack the necessary funds to buy this slave.//
diff --git a/src/uncategorized/theSlavegirlSchool.tw b/src/uncategorized/theSlavegirlSchool.tw
index f63c3034e7d..75e7d1fefd8 100644
--- a/src/uncategorized/theSlavegirlSchool.tw
+++ b/src/uncategorized/theSlavegirlSchool.tw
@@ -27,12 +27,8 @@
<br>[[Buy her and check out other slaves to order|The Slavegirl School][$cash -= $slaveCost, $TSS.schoolSale = 0, $TSS.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
<<if $newSlaves.length == 0>>
<br>[[Buy her slave contract|New Slave Intro][$cash -= $slaveCost, $TSS.schoolSale = 0, $TSS.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
- <<if $PC.slaving < 100 && random($PC.slaving,100) > 50>><<set $PC.slaving += .5>><<else>><<set $PC.slaving += .1>><</if>>
- <if $PC.trading < 100 && random($PC.trading,100) > 50>><<set $PC.trading += .5>><<else>><<set $PC.trading += .1>><</if>>
<<else>>
<br>[[Buy her and Finish your order of slaves|Bulk Slave Intro][$cash -= $slaveCost, $TSS.schoolSale = 0, $TSS.studentsBought += 1, $newSlaves.push($activeSlave)]]
- <<if $PC.slaving < 100 && random($PC.slaving,100) > 50>><<set $PC.slaving += .5>><<else>><<set $PC.slaving += .1>><</if>>
- <if $PC.trading < 100 && random($PC.trading,100) > 50>><<set $PC.trading += .5>><<else>><<set $PC.trading += .1>><</if>>
<</if>>
<<else>>
//You lack the necessary funds to buy this slave.//
--
GitLab