From 3d50cb809e18711b8e94d3e04db25a28e4b591cb Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Thu, 25 Oct 2018 02:26:24 -0400
Subject: [PATCH] Fixes
---
devNotes/twine JS.txt | 5 +----
src/js/generateNewSlaveJS.tw | 3 ---
src/js/slaveSummaryWidgets.tw | 2 +-
src/uncategorized/BackwardsCompatibility.tw | 11 -----------
src/utility/slaveCreationWidgets.tw | 3 +++
5 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 9b28dae7919..4446a379bf4 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -21711,7 +21711,7 @@ window.SlaveSummaryUncached = (function(){
} else if (slave.lips > 10) {
r += `Lips${V.summaryStats? `[${slave.lips}]` : ''}`;
} else {
- r += `<span class="red">Lips-</span>${V.summaryStats? `[${slave.lips}]` : ''}`;
+ r += `<span class="red">Lips-${V.summaryStats? `[${slave.lips}]` : ''}</span>`;
}
r += " ";
}
@@ -31569,9 +31569,6 @@ window.GenerateNewSlave = (function(){
generateSkills();
generateDisabilities();
generatePronouns(slave);
- if ((passage() == "Corporate Market" || (passage() == "Bulk Slave Generate" && V.slaveMarket == "corporate")) && V.captureUpgradeRace != "unselected" && V.captureUpgradeRace != "none") {
- slave.race = V.captureUpgradeRace;
- }
slave.origRace = slave.race;
slave.origEye = slave.eyeColor;
slave.origHColor = slave.hColor;
diff --git a/src/js/generateNewSlaveJS.tw b/src/js/generateNewSlaveJS.tw
index df83aaa66cd..07af35e96df 100644
--- a/src/js/generateNewSlaveJS.tw
+++ b/src/js/generateNewSlaveJS.tw
@@ -61,9 +61,6 @@ window.GenerateNewSlave = (function(){
generateSkills();
generateDisabilities();
generatePronouns(slave);
- if ((passage() == "Corporate Market" || (passage() == "Bulk Slave Generate" && V.slaveMarket == "corporate")) && V.captureUpgradeRace != "unselected" && V.captureUpgradeRace != "none") {
- slave.race = V.captureUpgradeRace;
- }
slave.origRace = slave.race;
slave.origEye = slave.eyeColor;
slave.origHColor = slave.hColor;
diff --git a/src/js/slaveSummaryWidgets.tw b/src/js/slaveSummaryWidgets.tw
index 03d2516e5a3..8b1df321417 100644
--- a/src/js/slaveSummaryWidgets.tw
+++ b/src/js/slaveSummaryWidgets.tw
@@ -1978,7 +1978,7 @@ window.SlaveSummaryUncached = (function(){
} else if (slave.lips > 10) {
r += `Lips${V.summaryStats? `[${slave.lips}]` : ''}`;
} else {
- r += `<span class="red">Lips-</span>${V.summaryStats? `[${slave.lips}]` : ''}`;
+ r += `<span class="red">Lips-${V.summaryStats? `[${slave.lips}]` : ''}</span>`;
}
r += " ";
}
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index dd03c0b52b7..4600359ef94 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3234,17 +3234,6 @@ Setting missing slave variables:
<</if>>
<</if>>
<</if>>
-<<if (($ver.startsWith("0.6") == true && !$ver.startsWith("10.6")) || ($ver.startsWith("0.7") == true) || ($ver.startsWith("0.8") == true) || ($ver.startsWith("0.9") != true) || ($ver == "0.9"))>>
- <<if _Slave.lips != 0>>
- <<if _Slave.lips == 3>>
- <<set _Slave.lips = 85>>
- <<elseif _Slave.lips == 2>>
- <<set _Slave.lips = 55>>
- <<elseif _Slave.lips == 1>>
- <<set _Slave.lips = 35>>
- <</if>>
- <</if>>
-<</if>>
<<switch _Slave.boobsTat>>
<<case "floral designs">>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 00bd6de3546..054a3f10860 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -1877,6 +1877,9 @@
<</if>>
<</if>>
<<set $one_time_age_overrides_pedo_mode = 1>>
+ <<if $captureUpgradeRace != "none" && $captureUpgradeRace != "unselected">>
+ <<set $fixedRace = $captureUpgradeRace>>
+ <</if>>
<<if $captureUpgradeGender == "XX">>
Slaves without pussies are not trained.
<<include "Generate XX Slave">>
--
GitLab