From 01ad6af5e729c40bf447498a65729ff95acdc320 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 14 Jan 2021 10:37:17 -0500
Subject: [PATCH] Correct issue with PC.counter.storedCum
---
src/002-config/fc-version.js | 2 +-
src/data/backwardsCompatibility/datatypeCleanup.js | 2 +-
src/player/electiveSurgery.tw | 6 +++---
src/pregmod/artificialInsemination.tw | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/002-config/fc-version.js b/src/002-config/fc-version.js
index 94fb7ad7313..97eba33f28e 100644
--- a/src/002-config/fc-version.js
+++ b/src/002-config/fc-version.js
@@ -2,5 +2,5 @@ App.Version = {
base: "0.10.7.1", // The vanilla version the mod is based off of, this should never be changed.
pmod: "3.8.5",
commitHash: null,
- release: 1115 // When getting close to 2000, please remove the check located within the onLoad() function defined at line five of src/js/eventHandlers.js.
+ release: 1116 // When getting close to 2000, please remove the check located within the onLoad() function defined at line five of src/js/eventHandlers.js.
};
diff --git a/src/data/backwardsCompatibility/datatypeCleanup.js b/src/data/backwardsCompatibility/datatypeCleanup.js
index c25ce7d6f1c..ab48fbab607 100644
--- a/src/data/backwardsCompatibility/datatypeCleanup.js
+++ b/src/data/backwardsCompatibility/datatypeCleanup.js
@@ -1265,6 +1265,7 @@ globalThis.PCDatatypeCleanup = function() {
PC.counter.birthFutaSis = Math.max(+PC.counter.birthFutaSis, 0) || 0;
PC.counter.slavesFathered = Math.max(+PC.counter.slavesFathered, 0) || 0;
PC.counter.slavesKnockedUp = Math.max(+PC.counter.slavesKnockedUp, 0) || 0;
+ PC.counter.storedCum = Math.max(+PC.counter.storedCum, 0) || 0;
PC.intelligence = 100;
PC.face = 100;
PC.actualAge = Math.clamp(+PC.actualAge, 14, 80) || 35;
@@ -1278,7 +1279,6 @@ globalThis.PCDatatypeCleanup = function() {
PC.fertDrugs = Math.clamp(+PC.fertDrugs, 0, 1) || 0;
PC.forcedFertDrugs = Math.max(+PC.forcedFertDrugs, 0) || 0;
PC.staminaPills = Math.clamp(+PC.staminaPills, 0, 1) || 0;
- PC.storedCum = Math.max(+PC.storedCum, 0) || 0;
PC.mpreg = 0; /* So knockMeUp() may be used with the PC */
PC.lactation = Math.max(+PC.lactation, 0) || 0;
PC.lactationDuration = Math.max(+PC.lactationDuration, 0) || 0;
diff --git a/src/player/electiveSurgery.tw b/src/player/electiveSurgery.tw
index 945eae70c50..502a18a9d4d 100644
--- a/src/player/electiveSurgery.tw
+++ b/src/player/electiveSurgery.tw
@@ -373,10 +373,10 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
<<if $PC.dick != 0 && $PC.vagina != -1>>
You have working @@.orange;male and female reproductive organs@@ and a @@.orange;<<if $PC.title > 0>>masculine<<else>>feminine<</if>> appearance.@@ "We'll store some of your sperm for you, should you decide to lose your maleness, and have it shipped to your arcology. Who you decide to use it on, well... That's up to you!"
<br>
- [[Remove your male half|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.scrotum = 0, $PC.dick = 0, $PC.prostate = 0, $PC.storedCum += 10, cashX(forceNeg(25000), "PCmedical"), $surgeryType = "herm2female"]] |
+ [[Remove your male half|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.scrotum = 0, $PC.dick = 0, $PC.prostate = 0, $PC.counter.storedCum += 10, cashX(forceNeg(25000), "PCmedical"), $surgeryType = "herm2female"]] |
[[Remove your female half|PC Surgery Degradation][$PC.vagina = -1, $PC.vaginaLube = 0, $PC.ovaries = 0, $PC.preg = 0, WombFlush($PC), cashX(forceNeg(25000), "PCmedical"), $surgeryType = "herm2male"]]
<<if $PC.title > 0>>
- | [[Remove your male half completely|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.scrotum = 0, $PC.dick = 0, $PC.prostate = 0, $PC.storedCum += 10, $PC.title = 0, generatePlayerPronouns($PC), cashX(forceNeg(25000), "PCmedical"), $surgeryType = "herm2truefemale"]]
+ | [[Remove your male half completely|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.scrotum = 0, $PC.dick = 0, $PC.prostate = 0, $PC.counter.storedCum += 10, $PC.title = 0, generatePlayerPronouns($PC), cashX(forceNeg(25000), "PCmedical"), $surgeryType = "herm2truefemale"]]
<<else>>
| [[Remove your female half completely|PC Surgery Degradation][$PC.vagina = -1, $PC.vaginaLube = 0, $PC.ovaries = 0, $PC.preg = 0, WombFlush($PC), $PC.boobs = 100, $PC.boobsImplant = 0, $PC.title = 1, generatePlayerPronouns($PC), cashX(forceNeg(25000), "PCmedical"), $surgeryType = "herm2truemale"]]
<</if>>
@@ -386,7 +386,7 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
[[Have your male organs replaced with female ones|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.scrotum = 0, $PC.dick = 0, $PC.prostate = 0, $PC.vagina = 1, $PC.newVag = 1, $PC.vaginaLube = 1, $PC.ovaries = 1, cashX(forceNeg(50000), "PCmedical"), $surgeryType = "male2female"]] |
[[Add a female reproductive tract|PC Surgery Degradation][$PC.vagina = 1, $PC.newVag = 1, $PC.vaginaLube = 1, $PC.ovaries = 1, $PC.preg = 0, WombFlush($PC), cashX(forceNeg(150000), "PCmedical"), $surgeryType = "male2herm"]]
<<if $PC.title > 0>>
- | [[Become a woman|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.scrotum = 0, $PC.dick = 0, $PC.prostate = 0, $PC.storedCum += 10, $PC.vagina = 1, $PC.newVag = 1, $PC.vaginaLube = 1, $PC.ovaries = 1, $PC.preg = 0, $PC.title = 0, generatePlayerPronouns($PC), cashX(forceNeg(50000), "PCmedical"), $surgeryType = "male2truefemale"]]
+ | [[Become a woman|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.scrotum = 0, $PC.dick = 0, $PC.prostate = 0, $PC.counter.storedCum += 10, $PC.vagina = 1, $PC.newVag = 1, $PC.vaginaLube = 1, $PC.ovaries = 1, $PC.preg = 0, $PC.title = 0, generatePlayerPronouns($PC), cashX(forceNeg(50000), "PCmedical"), $surgeryType = "male2truefemale"]]
| [[Become a hermaphrodite girl|PC Surgery Degradation][$PC.vagina = 1, $PC.newVag = 1, $PC.vaginaLube = 1, $PC.ovaries = 1, $PC.preg = 0, WombFlush($PC), $PC.title = 0, generatePlayerPronouns($PC), cashX(forceNeg(150000), "PCmedical"), $surgeryType = "male2hermfemale"]]
<</if>>
<<else>>
diff --git a/src/pregmod/artificialInsemination.tw b/src/pregmod/artificialInsemination.tw
index 4efe97259c3..fa5e2e35b25 100644
--- a/src/pregmod/artificialInsemination.tw
+++ b/src/pregmod/artificialInsemination.tw
@@ -45,8 +45,8 @@ __Select an eligible slave to serve as the semen donatrix:__
<<if $PC.balls != 0>>
<br>
[[Use your own|Surgery Degradation][$impregnatrix = $PC, cashX(forceNeg($surgeryCost), "slaveSurgery", getSlave($AS)), $surgeryType = "insemination"]]
-<<elseif $PC.storedCum > 0>>
+<<elseif $PC.counter.storedCum > 0>>
<br>
- [[Use a vial of your own|Surgery Degradation][$impregnatrix = $PC, cashX(forceNeg($surgeryCost), "slaveSurgery", getSlave($AS)), $surgeryType = "insemination", $PC.storedCum--]]
- //You have enough sperm stored away to inseminate $PC.storedCum more slave<<if $PC.storedCum > 1>>s<</if>>.//
+ [[Use a vial of your own|Surgery Degradation][$impregnatrix = $PC, cashX(forceNeg($surgeryCost), "slaveSurgery", getSlave($AS)), $surgeryType = "insemination", $PC.counter.storedCum--]]
+ //You have enough sperm stored away to inseminate $PC.counter.storedCum more slave<<if $PC.counter.storedCum > 1>>s<</if>>.//
<</if>>
--
GitLab