From 2ed2a04012e1801367cbdb8980de77acbffc3757 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Sun, 10 Mar 2019 20:40:22 -0400
Subject: [PATCH] More cleanup
---
src/js/generateNewSlaveJS.js | 24 ++++++++++++++++++++----
src/js/storyJS.js | 26 --------------------------
2 files changed, 20 insertions(+), 30 deletions(-)
diff --git a/src/js/generateNewSlaveJS.js b/src/js/generateNewSlaveJS.js
index 1c66d62ab5e..42124482003 100644
--- a/src/js/generateNewSlaveJS.js
+++ b/src/js/generateNewSlaveJS.js
@@ -775,6 +775,22 @@ window.GenerateNewSlave = (function(){
}
function generateXXBoobs() {
+ function rollBreast(modif) {
+ const volume = [0, 300, 500, 650, 800, 1000, 1200, 1400, 1600, 1800, 2050, 2300, 2600, 2900, 3250, 3600, 3950, 4300, 4700, 5100, 5500, 5900];
+ const volume_dist = [90000, 470000, 720000, 840000, 908574, 947759, 970151, 982946, 990258, 994436, 996824, 998188, 998968, 999414, 999669, 999814, 999897, 999945, 999972, 999987, 999995, 1000000];
+ const randomRoll = Math.floor(Math.random() * 1000000) + 1;
+ let actualSize = 0;
+ let minorSizeAdjustment = 0;
+
+ while (randomRoll > volume_dist[actualSize]) {
+ actualSize = actualSize + 1;
+ }
+ if (Math.random() < 0.5) {
+ minorSizeAdjustment = (Math.floor(Math.random() * 2) + 1) * 50;
+ }
+ return Math.max(volume[actualSize] + minorSizeAdjustment + modif, 0);
+ }
+
if (slave.physicalAge <= 10) {
slave.boobs = 100;
} else if (slave.physicalAge === 11) {
@@ -790,16 +806,16 @@ window.GenerateNewSlave = (function(){
} else {
switch (slave.race) {
case "black":
- slave.boobs = BoobGenerator.rollBreast(150);
+ slave.boobs = rollBreast(150);
break;
case "white":
- slave.boobs = BoobGenerator.rollBreast(50);
+ slave.boobs = rollBreast(50);
break;
case "asian":
- slave.boobs = BoobGenerator.rollBreast(-100);
+ slave.boobs = rollBreast(-100);
break;
default:
- slave.boobs = BoobGenerator.rollBreast(0);
+ slave.boobs = rollBreast(0);
}
}
}
diff --git a/src/js/storyJS.js b/src/js/storyJS.js
index 2bb7350e8bd..4c472fac53b 100644
--- a/src/js/storyJS.js
+++ b/src/js/storyJS.js
@@ -47,32 +47,6 @@ window.isFullyPotent = /** @param {App.Entity.SlaveState} slave */ function (sla
}
};
-/**
- * BoobGenerator namespace.
- */
-if (typeof BoobGenerator === "undefined") {
- var BoobGenerator = {
- rollBreast: function (modif) {
- var volume = [0, 300, 500, 650, 800, 1000, 1200, 1400, 1600, 1800, 2050, 2300, 2600, 2900, 3250, 3600, 3950, 4300, 4700, 5100, 5500, 5900];
- var volume_dist = [90000, 470000, 720000, 840000, 908574, 947759, 970151, 982946, 990258, 994436, 996824, 998188, 998968, 999414, 999669, 999814, 999897, 999945, 999972, 999987, 999995, 1000000];
- var randomRoll = Math.floor(Math.random() * 1000000) + 1;
- var actualSize = 0;
- while (randomRoll > volume_dist[actualSize]) {
- actualSize = actualSize + 1;
- }
- var minorSizeAdjustment = 0;
- if (Math.random()<.5) {
- minorSizeAdjustment = (Math.floor(Math.random() * 2) + 1) * 50;
- }
- var volResult = volume[actualSize] + minorSizeAdjustment + modif;
- if (volResult < 0) { volResult = 0;}
- return volResult;
- }
- };
- // Raise namespace scope to Global.
- window.BoobGenerator = BoobGenerator;
-}
-
window.removeFromArray = function(arr, val) {
for (var i = 0; i < arr.length; i++) {
if (val === arr[i])
--
GitLab