From 09ec4e22642adba9ad7c9272c1dc54421fac8bd1 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sun, 30 Aug 2020 21:23:55 -0400
Subject: [PATCH] finish schools
---
src/markets/schools/schools.js | 27 +++++++++++++++++--
src/markets/schools/theUtopianOrphanage.tw | 31 ----------------------
2 files changed, 25 insertions(+), 33 deletions(-)
delete mode 100644 src/markets/schools/theUtopianOrphanage.tw
diff --git a/src/markets/schools/schools.js b/src/markets/schools/schools.js
index 9c59ab9442e..14adcdc863a 100644
--- a/src/markets/schools/schools.js
+++ b/src/markets/schools/schools.js
@@ -165,7 +165,7 @@ App.Markets.TCR = function() {
App.UI.DOM.appendNewElement("p", el, r.join(" "));
el.append(
- App.UI.buyingFromSchoolControls("TCR", "cow", "cattle")
+ App.UI.buyingFromSchoolControls("TCR", costMod, "cow", "cattle")
);
return el;
@@ -258,9 +258,32 @@ App.Markets.TSS = function() {
App.UI.DOM.appendNewElement("p", el, r.join(" "), "scene-intro");
App.UI.DOM.appendNewElement("p", el, `The Slavegirl School offers a fresh graduate for inspection via video call. The interview takes place in a faculty member's office. Absurdly, it's barely distinguishable from an office at any traditional institution of higher education. The only giveaway is the profusion of sex toys on the desk and the pornography on the walls.`);
+ let costMod = 1;
+ if (V.HA.schoolSale !== 0) {
+ costMod = 0.5;
+ } else if (V.HA.schoolUpgrade !== 0) {
+ costMod = 0.8;
+ }
+ el.append(
+ App.UI.buyingFromSchoolControls("TSS", costMod)
+ );
+ return el;
+};
+
+App.Markets.TUO = function() {
+ const el = new DocumentFragment();
+ App.UI.DOM.appendNewElement("p", el, `The Utopian Orphanage is where all slaves dream of being raised. Its business model is to offer intelligent, well educated girls just past their majority. The girls are treated exceptionally well and have no sexual education or experience.`, "scene-intro");
+
+ App.UI.DOM.appendNewElement("p", el, `The Utopian Orphanage offers a fresh graduate for inspection. The interview takes place in the girl's private room, where she showcases her education and wits.`);
+ let costMod = 1;
+ if (V.HA.schoolSale !== 0) {
+ costMod = 0.6;
+ } else if (V.HA.schoolUpgrade !== 0) {
+ costMod = 1.2;
+ }
el.append(
- App.UI.buyingFromSchoolControls("TSS")
+ App.UI.buyingFromSchoolControls("TUO", costMod)
);
return el;
diff --git a/src/markets/schools/theUtopianOrphanage.tw b/src/markets/schools/theUtopianOrphanage.tw
deleted file mode 100644
index 98f300e63ce..00000000000
--- a/src/markets/schools/theUtopianOrphanage.tw
+++ /dev/null
@@ -1,31 +0,0 @@
-:: The Utopian Orphanage [nobr]
-
-<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $encyclopedia = "Slave Schools", $slaveMarket = "TUO">>
-/* Multi-Purchase Support */
-<<if ndef $newSlaves>><<set $newSlaves = []>><</if>>
-<<if $newSlaves.length > 0>>
- <<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $returnTo = "Main", $newSlaveIndex = 0>>
-<</if>>
-
-//
-The Utopian Orphanage is where all slaves dream of being raised. Its business model is to offer intelligent, well educated girls just past their majority. The girls are treated exceptionally well and have no sexual education or experience.
-//
-<br><br>
-The Utopian Orphanage offers a fresh graduate for inspection. The interview takes place in the girl's private room, where she showcases her education and wits.
-
-<<set _marketResult = generateMarketSlave("TUO")>>
-<<set $activeSlave = _marketResult.slave>>
-<<print _marketResult.text>>
-<<set _slaveCost = slaveCost($activeSlave)>>
-<<if $TUO.schoolSale != 0>>
- <<set _slaveCost = Math.trunc(_slaveCost*0.6)>>
-<<elseif $TUO.schoolUpgrade != 0>>
- <<set _slaveCost = Math.trunc(_slaveCost*1.2)>>
-<</if>>
-<<if $slavesSeen > $slaveMarketLimit>><<set _slaveCost += Math.trunc(_slaveCost*(($slavesSeen-$slaveMarketLimit)*0.1))>><</if>>
-
-<br><br>
-The price is <<print cashFormat(_slaveCost)>>.<<if $slavesSeen > $slaveMarketLimit>> You have cast such a wide net for slaves this week that it is becoming more expensive to find more for sale. Your reputation helps determine your reach within the slave market.<</if>>
-
-<<setLocalPronouns $activeSlave>>
-<<buyingFromSchoolControls $TUO "slave" "slaves">>
--
GitLab