From 45ff574179a0463892d5cfe08657dd1d01cccde5 Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Sat, 29 Dec 2018 11:41:23 -0600 Subject: [PATCH] Volumes are treated as liters, not cubic meters. Made all fill rates volume based --- features.js | 30 ++++++++++++++++++------------ game.js | 23 +++++++++++++---------- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/features.js b/features.js index 937355c..8f33506 100644 --- a/features.js +++ b/features.js @@ -933,7 +933,8 @@ options = [ "name": "Passive cum production", "id": "baseCumProduction", "type": "float", - "default": "1" + "default": "0.01", + "unit": "volume", }, { "name": "Cum storage factor", @@ -1020,7 +1021,7 @@ options = [ "name": "Womb volume", "id": "baseWombVolume", "type": "float", - "default": "0.0001", + "default": "0.1", "unit": "volume" }, { @@ -1033,7 +1034,8 @@ options = [ "name": "Passive femcum production", "id": "baseFemcumProduction", "type": "float", - "default": "1" + "default": "0.01", + "unit": "volume" }, { "name": "Femcum storage factor", @@ -1104,9 +1106,10 @@ options = [ }, { "name": "Passive milk production", - "id": "lactationScale", + "id": "baseLactationProduction", "type": "float", - "default": "1" + "default": "0.001", + "unit": "volume" }, { "name": "Milk storage scale", @@ -1194,9 +1197,10 @@ options = [ }, { "name": "Passive gas production", - "id": "gasScale", + "id": "baseGasProduction", "type": "float", - "default": "3" + "default": "0.01", + "unit": "volume" }, { "name": "Gas storage scale", @@ -1254,9 +1258,10 @@ options = [ [ { "name": "Passive piss production", - "id": "pissScale", + "id": "basePissProduction", "type": "float", - "default": "0.3" + "default": "0.01", + "unit": "volume" }, { "name": "Piss storage scale", @@ -1318,9 +1323,10 @@ options = [ }, { "name": "Passive scat production", - "id": "scatScale", + "id": "baseScatProduction", "type": "float", - "default": "0.2" + "default": "0.001", + "unit": "volume" }, { "name": "Scat storage scale", @@ -1433,7 +1439,7 @@ options = [ "name": "Drool volume", "id": "droolBaseVolume", "type": "float", - "default": "0.0001", + "default": "0.01", "unit": "volume" } ] diff --git a/game.js b/game.js index ff46e7f..3b8296d 100644 --- a/game.js +++ b/game.js @@ -367,7 +367,7 @@ let macro = }, get cumVolume() { - let vol = this.scaling(this.baseCumVolume, this.scale, 3); + let vol = this.scaling(this.baseCumVolume / 1000, this.scale, 3); return this.scaling(vol, this.dickScale, 2); }, @@ -382,7 +382,7 @@ let macro = get wombVolume() { return this.scaling(this.baseWombVolume, this.wombScale * this.scale, 3); }, get femcumVolume() { - let vol = this.scaling(this.baseFemcumVolume, this.scale, 3); + let vol = this.scaling(this.baseFemcumVolume / 1000, this.scale, 3); return this.scaling(vol, this.vaginaScale, 2); }, @@ -409,7 +409,7 @@ let macro = }, get droolVolume() { - return this.scaling(this.droolBaseVolume, this.scale, 3); + return this.scaling(this.droolBaseVolume / 1000 , this.scale, 3); }, "digest": function(owner, organ, time=15) { @@ -1136,7 +1136,7 @@ let macro = }, "fillCum": function(self) { - self.cumStorage.amount += self.scaling(self.baseCumProduction / 10, self.scale * self.ballScale, 3); + self.cumStorage.amount += self.scaling(self.baseCumProduction / 10 / 1000, self.scale * self.ballScale, 3); if (self.cumStorage.amount > self.cumStorage.limit) self.arouse(1 * (self.cumStorage.amount / self.cumStorage.limit - 1)); setTimeout(function () { self.fillCum(self); }, 100); @@ -1144,7 +1144,7 @@ let macro = }, "fillFemcum": function(self) { - self.femcumStorage.amount += self.scaling(self.baseFemcumProduction / 10, self.scale * self.wombScale, 3); + self.femcumStorage.amount += self.scaling(self.baseFemcumProduction / 10 / 1000, self.scale * self.wombScale, 3); if (self.femcumStorage.amount > self.femcumStorage.limit) self.arouse(1 * (self.femcumStorage.amount / self.femcumStorage.limit - 1)); setTimeout(function () { self.fillFemcum(self); }, 100); @@ -1152,10 +1152,11 @@ let macro = }, "fillBreasts": function(self) { + self.milkStorage.amount += self.scaling(self.baseLactationProduction / 10 / 1000, self.scale * self.wombScale, 3); + if (self.milkStorage.amount > self.milkStorage.limit) { breast_milk(self.milkStorage.amount - self.milkStorage.limit); } - self.milkStorage.amount += self.lactationScale * self.milkStorage.limit / self.milkStorageScale / 1000; if (self.milkStorage.amount > self.milkStorage.limit) { self.milkStorage.amount = self.milkStorage.limit; @@ -1165,7 +1166,7 @@ let macro = }, "fillGas": function(self) { - self.gasStorage.amount += self.gasScale * self.gasStorage.limit / self.gasStorageScale / 1000; + self.gasStorage.amount += self.scaling(self.baseGasProduction / 10 / 1000, self.scale, 3); let ratio = self.gasStorage.amount / self.gasStorage.limit; @@ -1198,7 +1199,8 @@ let macro = }, "fillPiss": function(self) { - self.pissStorage.amount += self.pissScale * self.pissStorage.limit / self.pissStorageScale / 1000; + self.pissStorage.amount += self.scaling(self.basePissProduction / 10 / 1000, self.scale, 3); + if (self.pissStorage.amount > self.pissStorage.limit * 2) piss(self.pissStorage.amount, false); setTimeout(function () { self.fillPiss(self); }, 100); @@ -1206,7 +1208,8 @@ let macro = }, "fillScat": function(self) { - self.scatStorage.amount += self.scatScale * self.scatStorage.limit / self.scatStorageScale / 1000; + self.scatStorage.amount += self.scaling(self.baseScatProduction / 10 / 1000, self.scale, 3); + if (self.scatStorage.amount > self.scatStorage.limit * 2) scat(self.scatStorage.amount, false); setTimeout(function () { self.fillScat(self); }, 100); @@ -4776,7 +4779,7 @@ function updatePreview(name) { else if (unitType == "area") result = area(value * scale * scale, unit); else if (unitType == "volume") - result = volume(value * scale * scale * scale, unit); + result = volume(value * scale * scale * scale / 1000, unit); else if (unitType == "mass") result = mass(value * scale * scale * scale, unit);