From c2bc365b86f959687b72979a069acbab1370e57c Mon Sep 17 00:00:00 2001
From: wierdwierdos <10471-wierdwierdos@users.noreply.gitgud.io>
Date: Fri, 17 Apr 2020 03:52:05 -0700
Subject: [PATCH] Update generateNewSlaveJS.js to have a separate function for
generating chromosomes
---
src/js/generateNewSlaveJS.js | 42 +++++++++++++++++++++---------------
1 file changed, 25 insertions(+), 17 deletions(-)
diff --git a/src/js/generateNewSlaveJS.js b/src/js/generateNewSlaveJS.js
index f796c2c1cc6..f7a6028e173 100644
--- a/src/js/generateNewSlaveJS.js
+++ b/src/js/generateNewSlaveJS.js
@@ -1,3 +1,23 @@
+window.GenerateChromosome = function() {
+ if (jsRandom(0, 99) < V.seeDicks) {
+ return "XY";
+ } else if (V.seeDicks > 0) {
+ let femaleSlaveGen = 80;
+ if (V.arcologies[0].FSGenderFundamentalistSMR === 1 || V.arcologies[0].FSRepopulationFocusSMR === 1) {
+ femaleSlaveGen = 90;
+ } else if (V.arcologies[0].FSGenderRadicalist !== "unset") {
+ femaleSlaveGen = 50;
+ }
+ if (jsRandom(1, 100) > femaleSlaveGen && jsRandom(0, 99) < V.seeDicks) {
+ return "XY";
+ } else {
+ return "XX";
+ }
+ } else {
+ return "XX";
+ }
+};
+
/* eslint-disable camelcase */
window.GenerateNewSlave = (function() {
"use strict";
@@ -34,23 +54,11 @@ window.GenerateNewSlave = (function() {
preGenCombinedStats();
if (!sex) {
- if (jsRandom(0, 99) < V.seeDicks) {
- GenerateXYSlave();
- } else if (V.seeDicks > 0) {
- let femaleSlaveGen = 80;
- if (V.arcologies[0].FSGenderFundamentalistSMR === 1 || V.arcologies[0].FSRepopulationFocusSMR === 1) {
- femaleSlaveGen = 90;
- } else if (V.arcologies[0].FSGenderRadicalist !== "unset") {
- femaleSlaveGen = 50;
- }
- if (jsRandom(1, 100) > femaleSlaveGen && jsRandom(0, 99) < V.seeDicks) {
- GenerateXYSlave();
- } else {
- GenerateXXSlave();
- }
- } else {
- GenerateXXSlave();
- }
+ if (GenerateChromosome() == "XY") {
+ GenerateXYSlave();
+ } else {
+ GenerateXXSlave();
+ }
} else if (sex === "XY") {
GenerateXYSlave();
} else {
--
GitLab