From 050d869f700cf1f7e9acb1083972802e8bb7d660 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Fri, 21 Dec 2018 16:47:12 -0600
Subject: [PATCH] Fixes
---
devNotes/twine JS.txt | 2 +-
slave variables documentation - Pregmod.txt | 2 +-
src/SecExp/rebellionReport.tw | 6 -----
src/js/DefaultRules.tw | 23 ++++++++-----------
src/js/storyJS.tw | 4 +---
src/js/wombJS.tw | 2 +-
src/pregmod/fSlaveSlaveVag.tw | 1 -
.../widgets/playerDescriptionWidgets.tw | 6 ++---
8 files changed, 16 insertions(+), 30 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 99e4f65a428..5fcf402614a 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -11170,7 +11170,7 @@ window.generateChild = function(mother, ova, destination) {
/*:: wombJS [script]*/
/*
-This is womb processor/simulator script. It takes care about calculation of belly sizes based on individual fetus sizes, with full support of broodmothers implant random turning on and off possibility. Also this can be expanded to store more parents data in each individual fetus in future.
+This is a womb processor/simulator script. It takes care of calculation of belly sizes based on individual fetus sizes, with full support of broodmothers implant random turning on and off possibility. Also this can be expanded to store more parents data in each individual fetus in future.
Design limitations:
- Mother can't gestate children with different speeds at same time. All speed changes apply to all fetuses.
- Sizes of individual fetuses updated only on call of WombGetVolume - not every time as called WombProgress. This is for better overall code speed.
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index cf997b164a9..6030c820319 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -3488,7 +3488,7 @@ To test if your slave is functioning, start up a normal game, swap to cheat mode
wombJS.tw subsystem:
-This is womb processor/simulator script. It takes care of calculation of belly sizes based on individual fetus sizes, with full support of broodmothers implant random turning on and off possibility. Also this can be expanded to store more parents data in each individual fetus in future.
+This is a womb processor/simulator script. It takes care of calculation of belly sizes based on individual fetus sizes, with full support of broodmothers implant random turning on and off possibility. Also this can be expanded to store more parents data in each individual fetus in future.
Should be initialized for all slaves not female only. Currently it's not affect pregnancy mechanic in game directly - it's addon for better sizes calculation, and optional mechanics for future usage.
Design limitations:
- Mother can't gestate children with different speeds at same time. All speed changes apply to all fetuses.
diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw
index ffa9e859cb4..afc4a39e388 100644
--- a/src/SecExp/rebellionReport.tw
+++ b/src/SecExp/rebellionReport.tw
@@ -1,12 +1,6 @@
:: rebellionReport [nobr]
<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "Battles">>
-<<if $Concubine != 0>>
- <<setLocalPronouns $Concubine>>
-<</if>>
-<<if $Bodyguard != 0>>
- <<setLocalPronouns $Bodyguard 2>>
-<</if>>
<<set _oldRep = $rep>>
<<set _oldAuth = $authority>>
<<set $enemyLosses = Math.trunc($enemyLosses)>>
diff --git a/src/js/DefaultRules.tw b/src/js/DefaultRules.tw
index 005a905be45..b128270e51b 100644
--- a/src/js/DefaultRules.tw
+++ b/src/js/DefaultRules.tw
@@ -1007,7 +1007,7 @@ window.DefaultRules = (function() {
} else if ((rule.growth_boobs == "no default setting" && rule.growth_butt == "no default setting" && rule.growth_lips == "no default setting" && rule.growth_dick == "no default setting" && rule.growth_dick == "no default setting" && rule.growth_balls == "no default setting")) {
return;
}
- if (slave.assignmentVisible) { // More resource intensive version with prioritizing. Possible to give this a toggle rather than basing it on visibility.
+ if (!rule.hyper_drugs) { // More resource intensive version with prioritizing.
let _priorities = [];
if (rule.growth_boobs != "no default setting") {
let _priority;
@@ -1104,15 +1104,10 @@ window.DefaultRules = (function() {
return;
}
} else {
- let _hyper;
- if (V.arcologies[0].FSAssetExpansionistResearch == 1)
- _hyper = "hyper ";
- else
- _hyper = "";
if (rule.growth_boobs != "no default setting") {
if (slave.boobs < rule.growth_boobs) {
- if (slave.drugs != _hyper + "breast injections") {
- slave.drugs = _hyper + "breast injections";
+ if (slave.drugs != "hyper breast injections") {
+ slave.drugs = "hyper breast injections";
r += `<br>${slave.slaveName} has been put on ${slave.drugs}.`;
}
return;
@@ -1120,8 +1115,8 @@ window.DefaultRules = (function() {
}
if (rule.growth_butt != "no default setting") {
if (slave.butt < rule.growth_butt) {
- if (slave.drugs != _hyper + "butt injections") {
- slave.drugs = _hyper + "butt injections";
+ if (slave.drugs != "hyper butt injections") {
+ slave.drugs = "hyper butt injections";
r += `<br>${slave.slaveName} has been put on ${slave.drugs}.`;
}
return;
@@ -1138,8 +1133,8 @@ window.DefaultRules = (function() {
}
if (rule.growth_dick != "no default setting" && slave.dick) {
if (slave.dick < rule.growth_dick) {
- if (slave.drugs != _hyper + "penis enhancement") {
- slave.drugs = _hyper + "penis enhancement";
+ if (slave.drugs != "hyper penis enhancement") {
+ slave.drugs = "hyper penis enhancement";
r += `<br>${slave.slaveName} has been put on ${slave.drugs}.`;
}
return;
@@ -1147,8 +1142,8 @@ window.DefaultRules = (function() {
}
if (rule.growth_balls != "no default setting" && slave.balls) {
if (slave.balls < rule.growth_balls) {
- if (slave.drugs != _hyper + "testicle enhancement") {
- slave.drugs = _hyper + "testicle enhancement";
+ if (slave.drugs != "hyper testicle enhancement") {
+ slave.drugs = "hyper testicle enhancement";
r += `<br>${slave.slaveName} has been put on ${slave.drugs}.`;
}
return;
diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index 8401291b869..8705bc8e030 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -251,7 +251,7 @@ window.canGetPregnant = function(slave) {
return false;
} else if (!isFertile(slave)) { /* check other fertility factors */
return false;
- } else if ((slave.ovaries == 1) && (slave.eggType != "sterile") && (canDoVaginal(slave))) {
+ } else if ((slave.ovaries == 1) && (canDoVaginal(slave))) {
return true;
} else if ((slave.mpreg == 1) && (canDoAnal(slave))) { /* pregmod */
return true;
@@ -1025,7 +1025,6 @@ window.resetFSCredits = function() {
activeFS++;
}
}
- console.log(activeFS);
if (V.arcologies[0].FSNull > 0) { /* possibly recalculate for multiculturalism */
activeFS--;
if (V.FSCreditCount === 4) {
@@ -1038,6 +1037,5 @@ window.resetFSCredits = function() {
activeFS += V.arcologies[0].FSNull/20;
}
}
- console.log(activeFS);
V.FSCredits = Math.max(Math.trunc(V.FSGotRepCredits - activeFS), 0);
};
diff --git a/src/js/wombJS.tw b/src/js/wombJS.tw
index 27f9a4bd00f..82549be1521 100644
--- a/src/js/wombJS.tw
+++ b/src/js/wombJS.tw
@@ -1,7 +1,7 @@
:: wombJS [script]
/*
-This is womb processor/simulator script. It takes care about calculation of belly sizes based on individual fetus sizes, with full support of broodmothers implant random turning on and off possibility. Also this can be expanded to store more parents data in each individual fetus in future.
+This is a womb processor/simulator script. It takes care of calculation of belly sizes based on individual fetus sizes, with full support of broodmothers implant random turning on and off possibility. Also this can be expanded to store more parents data in each individual fetus in future.
Design limitations:
- Mother can't gestate children with different speeds at same time. All speed changes apply to all fetuses.
- Sizes of individual fetuses updated only on call of WombGetVolume - not every time as called WombProgress. This is for better overall code speed.
diff --git a/src/pregmod/fSlaveSlaveVag.tw b/src/pregmod/fSlaveSlaveVag.tw
index ae584a4152d..a2da70af1f7 100644
--- a/src/pregmod/fSlaveSlaveVag.tw
+++ b/src/pregmod/fSlaveSlaveVag.tw
@@ -1,6 +1,5 @@
:: FSlaveSlaveVag [nobr]
-
<<set $nextButton = "Back", $nextLink = "Slave Interact">>
<<set $slaverapistx = 0, $eligibility = 0>>
diff --git a/src/pregmod/widgets/playerDescriptionWidgets.tw b/src/pregmod/widgets/playerDescriptionWidgets.tw
index 188e708ad87..78f5d8d0644 100644
--- a/src/pregmod/widgets/playerDescriptionWidgets.tw
+++ b/src/pregmod/widgets/playerDescriptionWidgets.tw
@@ -376,7 +376,7 @@
<<set adjustFatherProperty(_babyDaddy, "PCKnockedUp", _adjust)>>
<</if>>
<<if def $slaveIndices[$PC.pregSource]>>
- <<setLocalpronouns _babyDaddy>>
+ <<setLocalPronouns _babyDaddy>>
Rumors spread among your slaves that your middle is swollen with _babyDaddy.slaveName's child. They're not wrong, though <<if _babyDaddy.devotion > 20>>_babyDaddy.slaveName is broken enough to not try and use it against you. In fact, it might even draw $him closer to you<<else>>you'd have liked it to have kept that from _babyDaddy.slaveName, lest the rebellious bitch uses it to remain defiant<</if>>.
<</if>>
<</if>>
@@ -449,7 +449,7 @@
<<set adjustFatherProperty(_babyDaddy, "PCKnockedUp", _adjust)>>
<</if>>
<<if def $slaveIndices[$PC.pregSource]>>
- <<setLocalpronouns _babyDaddy>>
+ <<setLocalPronouns _babyDaddy>>
Rumors spread among your slaves that your middle is swollen with _babyDaddy.slaveName's child. They're not wrong, though <<if _babyDaddy.devotion > 20>>_babyDaddy.slaveName is broken enough to not try and use it against you. In fact, it might even draw $him closer to you<<else>>you'd have liked it to have kept that from _babyDaddy.slaveName, lest the rebellious bitch uses it to remain defiant<</if>>.
<</if>>
<</if>>
@@ -522,7 +522,7 @@
<<set adjustFatherProperty(_babyDaddy, "PCKnockedUp", _adjust)>>
<</if>>
<<if def $slaveIndices[$PC.pregSource]>>
- <<setLocalpronouns _babyDaddy>>
+ <<setLocalPronouns _babyDaddy>>
Rumors spread among your slaves that your middle is swollen with _babyDaddy.slaveName's child. They're not wrong, though <<if _babyDaddy.devotion > 20>>_babyDaddy.slaveName is broken enough to not try and use it against you. In fact, it might even draw $him closer to you<<else>>you'd have liked it to have kept that from _babyDaddy.slaveName, lest the rebellious bitch uses it to remain defiant<</if>>.
<</if>>
<</if>>
--
GitLab