From 6d16b1780e9c5f5ac325f4166f6f58c1a49c2271 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 25 Nov 2018 19:05:15 -0500
Subject: [PATCH] notes
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 7 +++-
devNotes/twine JS.txt | 36 ++++++++++++++++----
2 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 1b78bb6c4aa..414aad21858 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,7 +2,12 @@
0.10.7.1-1.0.x
-11/24/2018
+11/25/2018
+
+ 2
+ -fixes
+ -more names and stuff (I think)
+ -citizen enslavements now respect subjugationist laws
1
-fixes
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 052784a3132..328ae073196 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -10153,12 +10153,36 @@ window.generateGenetics = (function() {
activeMother = V.PC;
mother = V.PC;
}
- father = (actor2 > 0) ? V.genePool.find(function(s) { return s.ID == actor2; })
- : (actor2 == -1) ? V.PC
- : 0;
- activeFather = (father !== 0 && father.ID > 0) ? V.slaves[V.slaveIndices[actor2]]
- : (father !== 0 && father.ID == -1) ? V.PC
- : 0;
+ if (actor2 > 0) {
+ father = V.genePool.find(function(s) { return s.ID == actor2.ID; });
+ activeFather = V.slaves[V.slaveIndices[actor2]];
+ if (father === undefined) {
+ father = V.slaves[V.slaveIndices[actor2]];
+ activeFather = V.slaves[V.slaveIndices[actor2]];
+ }
+ if (father === undefined) {
+ if (V.incubator > 0) {
+ father = V.tanks.find(function(s) { return s.ID == actor2.ID; });
+ activeFather = 0; // activeFather = father?
+ }
+ }
+ if (father === undefined) {
+ if (V.nursery > 0) {
+ father = V.cribs.find(function(s) { return s.ID == actor2.ID; });
+ activeFather = 0; // activeFather = father?
+ }
+ }
+ if (father === undefined) {
+ father = 0;
+ activeFather = 0;
+ }
+ } else if (actor2 == -1) {
+ father = V.PC;
+ activeFather = V.PC;
+ } else {
+ father = 0;
+ activeFather = 0;
+ }
genes.gender = setGender(father);
genes.name = setName(x);
--
GitLab