From cd6fd58140b56bb3985dc872c1d60b43bce0bf2c Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Fri, 4 Sep 2020 22:53:24 -0400
Subject: [PATCH] don't dupe newSlave if it's in called in newSlaveIntro
---
src/Mods/SecExp/secExpSmilingMan.tw | 3 +--
src/markets/marketUI.js | 1 -
src/markets/specificMarkets/eliteSlave.js | 1 -
src/markets/specificMarkets/prestigiousSlave.js | 1 -
src/markets/specificMarkets/slaveShelter.js | 1 -
src/pregmod/pRaped.tw | 1 -
src/uncategorized/bulkSlaveIntro.tw | 4 ----
src/uncategorized/pRivalryCapture.js | 1 -
8 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/src/Mods/SecExp/secExpSmilingMan.tw b/src/Mods/SecExp/secExpSmilingMan.tw
index 8cf3fa49afb..308d1ed55eb 100644
--- a/src/Mods/SecExp/secExpSmilingMan.tw
+++ b/src/Mods/SecExp/secExpSmilingMan.tw
@@ -429,8 +429,7 @@
<</if>>
</p>
<<includeDOM App.Desc.longSlave(_activeSlave)>>
- <p> <<includeDOM App.UI.newSlaveIntro(_activeSlave)>> </p>
- <<= newSlave(_activeSlave)>>
+ <<includeDOM App.UI.newSlaveIntro(_activeSlave)>>
<</if>>
<<run delete $SecExp.smilingMan.relationship>>
<</if>>
\ No newline at end of file
diff --git a/src/markets/marketUI.js b/src/markets/marketUI.js
index 0ac1a7fb6ba..14613ebd429 100644
--- a/src/markets/marketUI.js
+++ b/src/markets/marketUI.js
@@ -91,7 +91,6 @@ App.Markets.purchaseFramework = function(slaveMarket, {sTitleSingular = "slave",
V.nextButton = "Continue";
V.returnTo = "Main";
student();
- newSlave(slave);
jQuery("#slave-markets").empty().append(App.UI.newSlaveIntro(slave));
},
)
diff --git a/src/markets/specificMarkets/eliteSlave.js b/src/markets/specificMarkets/eliteSlave.js
index 4e89b9a6c3b..abd9e8549b6 100644
--- a/src/markets/specificMarkets/eliteSlave.js
+++ b/src/markets/specificMarkets/eliteSlave.js
@@ -263,7 +263,6 @@ App.Markets["Elite Slave"] = function() {
`Place that bid`,
() => {
cashX(forceNeg(cost), "slaveTransfer", slave);
- newSlave(slave);
jQuery("#slave-markets").empty().append(App.UI.newSlaveIntro(slave));
}
)
diff --git a/src/markets/specificMarkets/prestigiousSlave.js b/src/markets/specificMarkets/prestigiousSlave.js
index 2f35bd71ad1..61626be83d8 100644
--- a/src/markets/specificMarkets/prestigiousSlave.js
+++ b/src/markets/specificMarkets/prestigiousSlave.js
@@ -897,7 +897,6 @@ App.Markets["Prestigious Slave"] = function() {
`Place that bid`,
() => {
cashX(forceNeg(cost), "slaveTransfer", slave);
- newSlave(slave);
jQuery("#slave-markets").empty().append(App.UI.newSlaveIntro(slave));
}
)
diff --git a/src/markets/specificMarkets/slaveShelter.js b/src/markets/specificMarkets/slaveShelter.js
index 242ba0c72b4..68458a056a0 100644
--- a/src/markets/specificMarkets/slaveShelter.js
+++ b/src/markets/specificMarkets/slaveShelter.js
@@ -369,7 +369,6 @@ App.Markets["Slave Shelter"] = function() {
cashX(forceNeg(cost), "slaveTransfer", V.shelterSlave);
V.shelterSlaveBought = 1;
V.shelterSlave.origin = "You got $him at the Slave Shelter. " + V.shelterSlave.origin;
- newSlave(V.shelterSlave);
jQuery("#slave-markets").empty().append(App.UI.newSlaveIntro(V.shelterSlave));
}
)
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index 0435d462a3f..a147177facc 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -322,7 +322,6 @@ While returning from a meeting with a prospective investor, an unfortunate wrong
<<set $activeSlave.balls = 0>>
<<set $activeSlave.devotion -= 25>>
<<set $activeSlave.trust -= 25>>
- <<run newSlave($activeSlave)>>
<<run cashX(forceNeg(_ContractCost), "slaveTransfer", $activeSlave)>>
<<replace "#result">>
You want $him to suffer for what $he tried to pull on you. You make sure $he is fully awake as $he is strapped into the autosurgery, taking the time to roughly fondle $his balls. You take great pleasure in watching $him struggle as $his testicles are removed. Once $he can stand again, it's off to the penthouse for basic slave induction.
diff --git a/src/uncategorized/bulkSlaveIntro.tw b/src/uncategorized/bulkSlaveIntro.tw
index 802c19c7a97..345f759d84c 100644
--- a/src/uncategorized/bulkSlaveIntro.tw
+++ b/src/uncategorized/bulkSlaveIntro.tw
@@ -73,10 +73,6 @@
<</if>>
<<goto $returnTo>>
<<else>>
- /* If looking at 2nd slave, push the induction changes for the prior slave to the newSlave array */
- <<if $market.newSlaveIndex > 0>>
- <<run newSlave($activeSlave)>>
- <</if>>
<<if $market.newSlaves.length > 1>>
Showing new slave <<print $market.newSlaveIndex+1>> of <<print $market.newSlaves.length>>:
<</if>>
diff --git a/src/uncategorized/pRivalryCapture.js b/src/uncategorized/pRivalryCapture.js
index 6b13d38f211..d54d8ca94f4 100644
--- a/src/uncategorized/pRivalryCapture.js
+++ b/src/uncategorized/pRivalryCapture.js
@@ -64,7 +64,6 @@ globalThis.pRivalryCapture = function() {
V.rivalID = slave.ID;
// proceed directly to rival initiation event after New Slave Intro
- newSlave(slave);
el.append(App.UI.newSlaveIntro(slave));
V.nextLink = "P rival initiation";
--
GitLab