From 65871549b0db1833c0e056bc947b8b1a84828ef4 Mon Sep 17 00:00:00 2001 From: Blank_Alt <12406-Blank_Alt@users.noreply.gitgud.io> Date: Wed, 27 Apr 2022 00:50:02 +1200 Subject: [PATCH] Remove unecessary zeros --- src/endWeek/saAgent.js | 2 +- src/endWeek/saLongTermPhysicalEffects.js | 2 +- src/events/PE/peHeadgirlConcubine.js | 2 +- src/events/RE/reNickname.js | 2 +- src/events/RE/rePregInventorInvite.js | 2 +- src/events/RE/rePregInventorShowOff.js | 6 +++--- src/events/REFI/reButtslut.js | 4 ++-- src/events/RESS/review/sleepingAmbivalent.js | 2 +- src/events/RETS/reIncestuousNursing.js | 2 +- src/events/RETS/reTopExhaustion.js | 2 +- src/js/slaveCostJS.js | 10 +++++----- src/js/utilsUnits.js | 2 +- src/npc/children/longChildDescription.js | 2 +- src/npc/descriptions/boobs/boobsShape.js | 4 ++-- src/npc/descriptions/mouth.js | 2 +- src/npc/interaction/fAssistedSex.js | 2 +- src/npc/interaction/fBellyFuck.js | 2 +- src/npc/interaction/fPoolSex.js | 4 ++-- 18 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/endWeek/saAgent.js b/src/endWeek/saAgent.js index 95e71422c02..e7fac6dc302 100644 --- a/src/endWeek/saAgent.js +++ b/src/endWeek/saAgent.js @@ -46,7 +46,7 @@ App.SlaveAssignment.agent = function(slave) { } } if (slave.breastMesh !== 1) { - if (slave.boobs - (slave.muscles * 30) > 5000 && slave.boobs <= 8000 && slave.boobsImplant / slave.boobs < 0.50) { + if (slave.boobs - (slave.muscles * 30) > 5000 && slave.boobs <= 8000 && slave.boobsImplant / slave.boobs < 0.5) { if (slave.physicalAge < random(10, 200)) { if (slave.boobShape === "perky") { slave.boobShape = "torpedo-shaped"; diff --git a/src/endWeek/saLongTermPhysicalEffects.js b/src/endWeek/saLongTermPhysicalEffects.js index 80b41b25bb2..ede1608f8cc 100644 --- a/src/endWeek/saLongTermPhysicalEffects.js +++ b/src/endWeek/saLongTermPhysicalEffects.js @@ -1131,7 +1131,7 @@ App.SlaveAssignment.longTermPhysicalEffects = function saLongTermPhysicalEffects } } if (slave.breastMesh !== 1) { - if (slave.boobs - (slave.muscles * 30) > 5000 && slave.boobs <= 8000 && slave.boobsImplant / slave.boobs < 0.50) { // Check now requires breasts to be less than half implant to sag. + if (slave.boobs - (slave.muscles * 30) > 5000 && slave.boobs <= 8000 && slave.boobsImplant / slave.boobs < 0.5) { // Check now requires breasts to be less than half implant to sag. if (slave.physicalAge < random(10, 200)) { if (slave.boobShape === "perky") { r.push(`${His} <span class="change negative">breasts lose their perkiness</span> under their own titanic weight. Their nipples now point forward and ${his} boobs rest more heavily against the chest beneath them.`); diff --git a/src/events/PE/peHeadgirlConcubine.js b/src/events/PE/peHeadgirlConcubine.js index b57aadac4e6..a642d8d42cd 100644 --- a/src/events/PE/peHeadgirlConcubine.js +++ b/src/events/PE/peHeadgirlConcubine.js @@ -364,7 +364,7 @@ App.Events.PEHeadgirlConcubine = class PEHeadgirlConcubine extends App.Events.Ba r.push(`Cupping your Head Girl's butt in your left hand and your Concubine's in your right, you give them a good squeeze as ${S.HeadGirl.slaveName} finishes ${his} question. ${His} voice rises cutely as your marauding hand moves over the`); if (S.HeadGirl.butt > 10) { r.push(`endless expanse of ${his} backside. ${He} manages to finish, but trails off into a groan, the`); - if (Math.floor(S.HeadGirl.buttImplant / S.HeadGirl.butt) > 0.60) { + if (Math.floor(S.HeadGirl.buttImplant / S.HeadGirl.butt) > 0.6) { r.push(`firm`); } else { r.push(`soft`); diff --git a/src/events/RE/reNickname.js b/src/events/RE/reNickname.js index ba81df19ab9..e8861e9b7c7 100644 --- a/src/events/RE/reNickname.js +++ b/src/events/RE/reNickname.js @@ -1076,7 +1076,7 @@ App.Events.RENickname = class RENickname extends App.Events.BaseEvent { notApplyDesc: `realizes that ${he} isn't special just because ${he}'s been fucked so much, and understands that ${he}'ll have to do ${his} best to fuck like a fresh teenager no matter how loose ${he} gets.`, }); } - if ((slave.boobsImplant / slave.boobs) >= 0.60 || (slave.buttImplant / slave.butt) > 0.60) { + if ((slave.boobsImplant / slave.boobs) >= 0.60 || (slave.buttImplant / slave.butt) > 0.6) { nickMap.set("implants", { nicknameArray: ["Balloons", "Blown Up", "Blowup Doll", "Bolted-On", "Enhanced", "Expanded", "Fake", "Implanted", "Implants", "Plastic", "Plastique", "Silicone"], situationDesc: `is full of breast implants. They're so large it's quite obvious they're fake, and the implications are clear: ${He}'s a plastic slut, and the other slaves never tire of letting ${him} know it.`, diff --git a/src/events/RE/rePregInventorInvite.js b/src/events/RE/rePregInventorInvite.js index 03edd7f08e4..c12f8e647ca 100644 --- a/src/events/RE/rePregInventorInvite.js +++ b/src/events/RE/rePregInventorInvite.js @@ -300,7 +300,7 @@ App.Events.rePregInventorInvite = class rePregInventorInvite extends App.Events. r.push(`sink face first into ${his} warm, room filling ass cleavage`); } else if (slave.butt > 5) { r.push(`grab generous handfuls of ${his} humongous ass`); - } else if ((slave.buttImplant / slave.butt) > 0.60) { + } else if ((slave.buttImplant / slave.butt) > 0.6) { r.push(`rest the weight of your upper body on ${his} implant inflated ass cheeks`); } else if (slave.butt > 2) { r.push(`slap ${his} generous ass`); diff --git a/src/events/RE/rePregInventorShowOff.js b/src/events/RE/rePregInventorShowOff.js index ac5dfe158a1..ba90fb3d8c3 100644 --- a/src/events/RE/rePregInventorShowOff.js +++ b/src/events/RE/rePregInventorShowOff.js @@ -106,7 +106,7 @@ App.Events.rePregInventorShowOff = class rePregInventorShowOff extends App.Event r.push(`debilitating, insanely enormous ass`); } else if (slave.butt > 5) { r.push(`huge ass`); - } else if ((slave.buttImplant / slave.butt) > 0.60) { + } else if ((slave.buttImplant / slave.butt) > 0.6) { r.push(`implant swollen ass cheeks`); } else if (slave.butt > 2) { r.push(`plump ass`); @@ -234,7 +234,7 @@ App.Events.rePregInventorShowOff = class rePregInventorShowOff extends App.Event r.push(`couch smothering ass cheeks.`); } else if (slave.butt > 5) { r.push(`enormous ass.`); - } else if ((slave.buttImplant / slave.butt) > 0.60) { + } else if ((slave.buttImplant / slave.butt) > 0.6) { r.push(`implant-filled ass.`); } else if (slave.butt > 2) { r.push(`delicious looking ass.`); @@ -486,7 +486,7 @@ App.Events.rePregInventorShowOff = class rePregInventorShowOff extends App.Event r.push(`enormous, gel-slicked ass,`); } else if (slave.butt > 4) { r.push(`plush, gel-slicked ass,`); - } else if ((slave.buttImplant / slave.butt) > 0.60) { + } else if ((slave.buttImplant / slave.butt) > 0.6) { r.push(`implant-filled, gel-slicked ass,`); } else if (slave.butt > 2) { r.push(`perfect, gel-slicked ass,`); diff --git a/src/events/REFI/reButtslut.js b/src/events/REFI/reButtslut.js index 1ec6d47bcf8..31cba3c4dea 100644 --- a/src/events/REFI/reButtslut.js +++ b/src/events/REFI/reButtslut.js @@ -191,7 +191,7 @@ App.Events.REFIButtslut = class REFIButtslut extends App.Events.BaseEvent { t.push(`absurdly massive`); } t.push(`ass around your cock. Deep within its quivering`); - if (eventSlave.buttImplant / eventSlave.butt > 0.60) { + if (eventSlave.buttImplant / eventSlave.butt > 0.6) { t.push(`firmness,`); } else { t.push(`softness,`); @@ -210,7 +210,7 @@ App.Events.REFIButtslut = class REFIButtslut extends App.Events.BaseEvent { } else if (eventSlave.butt <= 5) { t.push(`enormous`); } - if (eventSlave.buttImplant / eventSlave.butt > 0.60) { + if (eventSlave.buttImplant / eventSlave.butt > 0.6) { t.push(`firm`); } else { t.push(`soft`); diff --git a/src/events/RESS/review/sleepingAmbivalent.js b/src/events/RESS/review/sleepingAmbivalent.js index 293e23f7932..a1c8db1cd76 100644 --- a/src/events/RESS/review/sleepingAmbivalent.js +++ b/src/events/RESS/review/sleepingAmbivalent.js @@ -71,7 +71,7 @@ App.Events.RESSSleepingAmbivalent = class RESSSleepingAmbivalent extends App.Eve r.push(`You're mauling ${his} fake boob, squeezing it and making the skin of ${his} breast, which is already stretched rather taut by the implant, stretch a bit farther.`); } else if (eventSlave.boobs > 3000) { r.push(`You're hefting and massaging ${his} mass of breastflesh, playing with ${his}`); - if ((eventSlave.boobsImplant/eventSlave.boobs) < 0.60) { + if ((eventSlave.boobsImplant/eventSlave.boobs) < 0.6) { r.push(`mostly`); } r.push(`natural boob, making ${his} huge soft udder bounce and jiggle.`); diff --git a/src/events/RETS/reIncestuousNursing.js b/src/events/RETS/reIncestuousNursing.js index c037f08b7fd..3a8eea09582 100644 --- a/src/events/RETS/reIncestuousNursing.js +++ b/src/events/RETS/reIncestuousNursing.js @@ -18,7 +18,7 @@ App.Events.RETSIncestuousNursing = class RETSIncestuousNursing extends App.Event s => s.sexualQuirk === "perverted" || s.energy > 80, s => s.belly < 100000, s => s.lactation > 0, - s => s.boobsImplant / s.boobs < 0.60, + s => s.boobsImplant / s.boobs < 0.6, ], [ // and subslave s => s.fetish !== "mindbroken", diff --git a/src/events/RETS/reTopExhaustion.js b/src/events/RETS/reTopExhaustion.js index a8d62d9a220..ea26a10279d 100644 --- a/src/events/RETS/reTopExhaustion.js +++ b/src/events/RETS/reTopExhaustion.js @@ -177,7 +177,7 @@ App.Events.RETSTopExhaustion = class RETSTopExhaustion extends App.Events.BaseEv seX(subSlave, "vaginal", domSlave, "penetrative", 6); } t.push(`Being the ${subSlave.relationship > 4 ? `${wife}` : `lover`} of a lusty fucker like ${domSlave.slaveName} can be tiring, especially in addition to ${his} other duties. But despite the vigor, the sex looks quite loving. ${subSlave.slaveName} goes on smiling comfortably as ${his}`); - if (subSlave.buttImplant / subSlave.butt > 0.60) { + if (subSlave.buttImplant / subSlave.butt > 0.6) { t.push(`implant-filled butt wobbles slightly`); } else { if (subSlave.butt > 11) { diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js index fff3a3d306e..13c8e9a4e69 100644 --- a/src/js/slaveCostJS.js +++ b/src/js/slaveCostJS.js @@ -641,7 +641,7 @@ globalThis.BeautyArray = (function() { } } else { if (slave.butt >= 6) { - if (slave.buttImplant / slave.butt < 0.50) { + if (slave.buttImplant / slave.butt < 0.5) { adjustBeauty("Butt Implant: General", -((1.5 * slave.butt) + 6)); /* will get nasty at huge sizes */ } } @@ -771,7 +771,7 @@ globalThis.BeautyArray = (function() { adjustBeauty("Boob Implant: Slimness Enthusiast", -((0.05 * slave.boobs) + 10)); } } else if (slave.boobs >= 2000) { - if (slave.boobsImplant / slave.boobs < 0.50) { + if (slave.boobsImplant / slave.boobs < 0.5) { adjustBeauty("Boob Implant: Slimness Enthusiast", -((0.05 * slave.boobs) + 10)); } } else if (slave.boobs >= 1000) { @@ -779,7 +779,7 @@ globalThis.BeautyArray = (function() { adjustBeauty("Boob Implant: Slimness Enthusiast", -((0.05 * slave.boobs) + 10)); } } else { - if (slave.boobsImplant / slave.boobs < 0.10) { + if (slave.boobsImplant / slave.boobs < 0.1) { adjustBeauty("Boob Implant: Slimness Enthusiast", -((0.05 * slave.boobs) + 10)); } } @@ -791,7 +791,7 @@ globalThis.BeautyArray = (function() { adjustBeauty("Boob Implant: General", -(30 + (0.005 * slave.boobs))); /* will get nasty at huge sizes */ } } else if (slave.boobs >= 2000) { - if (slave.boobsImplant / slave.boobs < 0.50) { + if (slave.boobsImplant / slave.boobs < 0.5) { adjustBeauty("Boob Implant: General", -(30 + (0.005 * slave.boobs))); /* will get nasty at huge sizes */ } } else if (slave.boobs >= 1000) { @@ -799,7 +799,7 @@ globalThis.BeautyArray = (function() { adjustBeauty("Boob Implant: General", -(30 + (0.005 * slave.boobs))); /* will get nasty at huge sizes */ } } else { - if (slave.boobsImplant / slave.boobs < 0.10) { + if (slave.boobsImplant / slave.boobs < 0.1) { adjustBeauty("Boob Implant: General", -(30 + (0.005 * slave.boobs))); /* will get nasty at huge sizes */ } } diff --git a/src/js/utilsUnits.js b/src/js/utilsUnits.js index 32acbd89baa..e95b6820355 100644 --- a/src/js/utilsUnits.js +++ b/src/js/utilsUnits.js @@ -371,7 +371,7 @@ globalThis.repFormat = function(s = 0) { } else { /* In order to calculate just how much any one category matters so we can show a "fuzzy" symbolic value to the player, we need to know how "busy" reputation was this week. To calculate this, I ADD income to expenses. Why? 100 - 100 and 10000 - 10000 BOTH are 0, but a +50 event matters a lot more in the first case than the second. I exclude overflow and curving from the calculation because it's not a "real" expense for our purposes, and divide by half just to make percentages a bit easier. */ let weight = s / (((V.lastWeeksRepIncome.Total - V.lastWeeksRepExpenses.Total) + (V.lastWeeksRepExpenses.overflow + V.lastWeeksRepExpenses.curve)) / 2); - if (weight > 0.60) { + if (weight > 0.6) { return `<span class="green">+++++ rep</span>`; } else if (weight > 0.45) { return `<span class="green">++++ rep</span>`; diff --git a/src/npc/children/longChildDescription.js b/src/npc/children/longChildDescription.js index 5da9463d805..0da6e5e10ef 100644 --- a/src/npc/children/longChildDescription.js +++ b/src/npc/children/longChildDescription.js @@ -3900,7 +3900,7 @@ App.Facilities.Nursery.LongChildDescription = function(child, {market = 0, event } if (arcology.FSTransformationFetishist > 20) { if (child.lips > 70) { - if (child.lipsImplant / child.lips < 0.50) { + if (child.lipsImplant / child.lips < 0.5) { r += `${His} lips are huge and <span class="red">disgustingly natural</span> for their size. `; } else { r += `${His} lips are huge and <span class="green">obviously implants,</span> as they should be. `; diff --git a/src/npc/descriptions/boobs/boobsShape.js b/src/npc/descriptions/boobs/boobsShape.js index b8c93d60cee..173cd8b0a0f 100644 --- a/src/npc/descriptions/boobs/boobsShape.js +++ b/src/npc/descriptions/boobs/boobsShape.js @@ -224,7 +224,7 @@ App.Desc.boobsShape = function(slave) { r.push(`${His} breasts are <span class="green">obviously implants,</span> as they should be.`); } } else if (slave.boobs >= 2000) { - if (slave.boobsImplant / slave.boobs < 0.50) { + if (slave.boobsImplant / slave.boobs < 0.5) { r.push(`${His} breasts are <span class="red">disgustingly natural</span> for their size.`); } else { r.push(`${His} breasts are <span class="green">obviously implants,</span> as they should be.`); @@ -236,7 +236,7 @@ App.Desc.boobsShape = function(slave) { r.push(`${His} breasts are <span class="green">obviously implants,</span> as they should be.`); } } else { - if (slave.boobsImplant / slave.boobs < 0.10) { + if (slave.boobsImplant / slave.boobs < 0.1) { r.push(`${His} breasts are <span class="red">disgustingly natural</span> for their size.`); } else { r.push(`${His} breasts are <span class="green">obviously implants,</span> as they should be.`); diff --git a/src/npc/descriptions/mouth.js b/src/npc/descriptions/mouth.js index f23b912a052..4b9833168f3 100644 --- a/src/npc/descriptions/mouth.js +++ b/src/npc/descriptions/mouth.js @@ -35,7 +35,7 @@ App.Desc.mouth = function(slave) { } if (V.arcologies[0].FSTransformationFetishist > 20) { if (slave.lips > 70) { - if (slave.lipsImplant / slave.lips < 0.50) { + if (slave.lipsImplant / slave.lips < 0.5) { r.push(`${His} lips are huge and <span class="red">disgustingly natural</span> for their size.`); } else { r.push(`${His} lips are huge and <span class="green">obviously implants,</span> as they should be.`); diff --git a/src/npc/interaction/fAssistedSex.js b/src/npc/interaction/fAssistedSex.js index c18dbd043b4..b23397e0e5a 100644 --- a/src/npc/interaction/fAssistedSex.js +++ b/src/npc/interaction/fAssistedSex.js @@ -141,7 +141,7 @@ App.Interact.fAssistedSex = function(slave) { text.push(`${his} overgrown, wobbling ass cheeks`); } else if (slave.butt > 5) { text.push(`${his} huge, wobbling ass cheeks`); - } else if (Math.floor(slave.buttImplant/slave.butt) > 0.60) { + } else if (Math.floor(slave.buttImplant/slave.butt) > 0.6) { text.push(`${his} saline inflated ass cheeks`); } else if (slave.butt > 2) { text.push(`${his} wobbling ass cheeks`); diff --git a/src/npc/interaction/fBellyFuck.js b/src/npc/interaction/fBellyFuck.js index 7a0770e3339..12e8a5a124a 100644 --- a/src/npc/interaction/fBellyFuck.js +++ b/src/npc/interaction/fBellyFuck.js @@ -132,7 +132,7 @@ App.Interact.fBellyFuck = function(slave) { text.push(`insanely enormous ass,`); } else if (slave.butt > 5) { text.push(`huge ass,`); - } else if (Math.floor(slave.buttImplant/slave.butt) > 0.60) { + } else if (Math.floor(slave.buttImplant/slave.butt) > 0.6) { text.push(`jiggly, saline filled ass,`); } else if (slave.butt > 2) { text.push(`thick ass,`); diff --git a/src/npc/interaction/fPoolSex.js b/src/npc/interaction/fPoolSex.js index c306ec91b9a..bfaf3cf0afb 100644 --- a/src/npc/interaction/fPoolSex.js +++ b/src/npc/interaction/fPoolSex.js @@ -71,7 +71,7 @@ App.Interact.fPoolSex = function(slave) { r.push(`debilitatingly enormous, cushiony ass`); } else if (slave.butt > 5) { r.push(`massive, cushiony ass`); - } else if (Math.floor(slave.buttImplant / slave.butt) > 0.60) { + } else if (Math.floor(slave.buttImplant / slave.butt) > 0.6) { r.push(`implant swollen ass`); } else if (slave.butt > 2) { r.push(`plush ass`); @@ -148,7 +148,7 @@ App.Interact.fPoolSex = function(slave) { r.push(`debilitatingly enormous, cushiony ass`); } else if (slave.butt > 5) { r.push(`massive, cushiony ass`); - } else if (Math.floor(slave.buttImplant / slave.butt) > 0.60) { + } else if (Math.floor(slave.buttImplant / slave.butt) > 0.6) { r.push(`implant swollen ass`); } else if (slave.butt > 2) { r.push(`plush ass`); -- GitLab