From c67db90e31e788b0ed22ab054af7a90019c1bf5c Mon Sep 17 00:00:00 2001
From: Skriv <skrivelese@gmail.com>
Date: Sat, 25 May 2019 15:36:55 +0200
Subject: [PATCH] blue eyes
---
src/js/generateGenetics.js | 4 ++--
src/js/physicalDevelopment.js | 14 +-------------
2 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index 8d36ee3e1e9..bf5f797eea7 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -342,13 +342,13 @@ window.generateGenetics = (function() {
eyeColor = mother.origEye;
} else if (mother.origEye === "red" || mother.origEye === "pale red" || mother.origEye === "light red" || mother.origEye === "pale gray" || mother.origEye === "milky white") {
eyeColor = fatherEye;
- } else if (fatherEye === "blue") {
+ } else if (mother.origEye === "blue") {
if (jsRandom(1, 4) === 2) {
eyeColor = mother.origEye;
} else {
eyeColor = fatherEye;
}
- } else if (mother.origEye === "blue") {
+ } else if (fatherEye === "blue") {
if (jsRandom(1, 4) === 2) {
eyeColor = fatherEye;
} else {
diff --git a/src/js/physicalDevelopment.js b/src/js/physicalDevelopment.js
index bda4e15f788..d6ee0341521 100644
--- a/src/js/physicalDevelopment.js
+++ b/src/js/physicalDevelopment.js
@@ -144,19 +144,7 @@ window.physicalDevelopment = (function physicalDevelopment() {
} else if (slave.height <= 173) {
slave.height += 3;
}
- } else if (slave.physicalAge === 15) {
- if (slave.height <= 174) {
- slave.height += jsEither([0, 0, 1, 1]);
- }
- } else if (slave.physicalAge === 16) {
- if (slave.height <= 174) {
- slave.height += jsEither([0, 0, 1, 1]);
- }
- } else if (slave.physicalAge === 17) {
- if (slave.height <= 174) {
- slave.height += jsEither([0, 0, 1, 1]);
- }
- } else if (slave.physicalAge === 18) {
+ } else if (slave.physicalAge <= 18) {
if (slave.height <= 174) {
slave.height += jsEither([0, 0, 1, 1]);
}
--
GitLab