From 10fc1e1a8d7efb930138bbf81657cbda8da90131 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 27 May 2019 16:38:37 -0400
Subject: [PATCH] fixes
tweak
---
Changelog.txt | 8 ++++++
src/js/datatypeCleanupJS.js | 40 ++++-----------------------
src/js/pregJS.js | 2 +-
src/pregmod/analyzePlayerPregnancy.tw | 4 +--
src/pregmod/analyzePregnancy.tw | 4 +--
5 files changed, 19 insertions(+), 39 deletions(-)
diff --git a/Changelog.txt b/Changelog.txt
index d5241bc0bbf..4aab10f0d72 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,13 @@
Pregmod
+0.10.7.1-2.5.x
+
+ 0
+ -RA refactoring
+ -superfetation tweaks
+ -preg analysis can now identify genetic quirks in fetuses
+ -fixes
+
0.10.7.1-2.4.x
05/25/2019
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index 923ee857afa..c2bf058f812 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -171,40 +171,12 @@ App.Entity.Utils.SlaveDataSchemeCleanup = (function() {
* @param {App.Entity.SlaveState} slave
*/
function migrateBrand(slave) {
- if (!slave.hasOwnProperty("brand")) {
- const V = State.variables;
- slave.brand = new App.Entity.SlaveBrandState();
- let c = slave.brand;
- const nameMap = { // old => new
- brandlocation: c,
- ["ear"]:
- ["cheek"]:
- ["shoulder"]:
- ["breast"]:
- ["upper arm"]:
- ["lower arm"]:
- ["wrist"]:
- ["hand"]:
- ["buttock"]:
- ["thigh"]:
- ["calve"]:
- ["ankle"]:
- ["foot"]:
- ["neck"]:
- ["chest"]:
- ["belly"]:
- ["pubic mound"]:
- ["penis"]:
- ["testicle"]:
- ["back"]:
- ["lower back"]:
- };
- for (let prop in slave) {
- if (nameMap.hasOwnProperty(prop)) {
- c[nameMap[prop]] = slave[prop];
- delete slave[prop];
- }
- }
+ if (typeof slave.brand != "object") {
+ const brand = new App.Entity.SlaveBrandState();
+ brand[slave.brandLocation] = slave.brand; // not sure here. Probably you need to replace `\s([a-z])' with uppercased `$1`
+ /*delete slave.brandLocation;*/
+ /*delete slave.brand;*/
+ slave.brands = brand;
}
}
})();
diff --git a/src/js/pregJS.js b/src/js/pregJS.js
index c7e0f29bc83..b9d43c50ef6 100644
--- a/src/js/pregJS.js
+++ b/src/js/pregJS.js
@@ -122,7 +122,7 @@ window.setPregType = function(actor) {
}
}
ovum = Math.clamp(ovum, 0, 8);
- } else if (actor.preg === 0 || (actor.geneticQuirks.superfetation > 1 && actor.preg >= 0)) {
+ } else {
if (actor.eggType === "horse" || actor.eggType === "cow") {
if (actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
ovum += jsEither([0, 0, 0, 0, 0, 0, 1]);
diff --git a/src/pregmod/analyzePlayerPregnancy.tw b/src/pregmod/analyzePlayerPregnancy.tw
index 7aa01d5dd7b..2effd81e333 100644
--- a/src/pregmod/analyzePlayerPregnancy.tw
+++ b/src/pregmod/analyzePlayerPregnancy.tw
@@ -161,12 +161,12 @@
<<elseif $PC.womb[_ap].genetics.geneticQuirks.superfetation == 1 && $geneticMappingUpgrade >= 2>>
@@.yellow;supfet@@
<</if>>
- <<if $PC.womb[_ap].genetics.geneticQuirks.macromastia == 2>>
+ <<if $PC.womb[_ap].genetics.geneticQuirks.macromastia >= 2>>
@@.red;mmast@@
<<elseif $PC.womb[_ap].genetics.geneticQuirks.macromastia == 1 && $geneticMappingUpgrade >= 2>>
@@.yellow;mast@@
<</if>>
- <<if $PC.womb[_ap].genetics.geneticQuirks.gigantomastia == 2>>
+ <<if $PC.womb[_ap].genetics.geneticQuirks.gigantomastia >= 2>>
@@.red;gmast@@
<<elseif $PC.womb[_ap].genetics.geneticQuirks.gigantomastia == 1 && $geneticMappingUpgrade >= 2>>
@@.yellow;gmast@@
diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw
index 1ca847d73e9..42ea3adf4ff 100644
--- a/src/pregmod/analyzePregnancy.tw
+++ b/src/pregmod/analyzePregnancy.tw
@@ -172,12 +172,12 @@
<<elseif $activeSlave.womb[_ap].genetics.geneticQuirks.superfetation == 1 && $geneticMappingUpgrade >= 2>>
@@.yellow;supfet@@
<</if>>
- <<if $activeSlave.womb[_ap].genetics.geneticQuirks.macromastia == 2>>
+ <<if $activeSlave.womb[_ap].genetics.geneticQuirks.macromastia >= 2>>
@@.red;mmast@@
<<elseif $activeSlave.womb[_ap].genetics.geneticQuirks.macromastia == 1 && $geneticMappingUpgrade >= 2>>
@@.yellow;mast@@
<</if>>
- <<if $activeSlave.womb[_ap].genetics.geneticQuirks.gigantomastia == 2>>
+ <<if $activeSlave.womb[_ap].genetics.geneticQuirks.gigantomastia >= 2>>
@@.red;gmast@@
<<elseif $activeSlave.womb[_ap].genetics.geneticQuirks.gigantomastia == 1 && $geneticMappingUpgrade >= 2>>
@@.yellow;gmast@@
--
GitLab