From 7867b7ac210e2a596b8e9cdbb48d9c97f898d7f9 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Tue, 10 Nov 2020 02:49:34 -0500
Subject: [PATCH] underscores
---
src/endWeek/reports/penthouseReport.js | 74 +++++++++++++-------------
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/src/endWeek/reports/penthouseReport.js b/src/endWeek/reports/penthouseReport.js
index 4b2d5827d3a..bebf12a846e 100644
--- a/src/endWeek/reports/penthouseReport.js
+++ b/src/endWeek/reports/penthouseReport.js
@@ -2,7 +2,7 @@ App.EndWeek.penthouseReport = function() {
const el = document.createElement("p");
let r;
- const _HGSuitSlaves = App.Utils.jobForAssignment(Job.HEADGIRLSUITE).employees();
+ const HGSuiteSlaves = App.Utils.jobForAssignment(Job.HEADGIRLSUITE).employees();
const HGTrainSlavesIDs = slavesToTrain();
for (const slave of V.slaves) {
@@ -16,9 +16,9 @@ App.EndWeek.penthouseReport = function() {
r.push(fullReport(slave));
App.Events.addNode(el, r, "p");
- if (slave.ID === V.HeadGirlID && _HGSuitSlaves.length > 0) {
+ if (slave.ID === V.HeadGirlID && HGSuiteSlaves.length > 0) {
/* We found the Head Girl, now let's find her slave */
- const hgSlave = getSlave(_HGSuitSlaves[0].ID);
+ const hgSlave = getSlave(HGSuiteSlaves[0].ID);
const {He2, he2} = getPronouns(hgSlave).appendSuffix("2");
r = [];
if (hgSlave.assignment !== "live with your Head Girl") {
@@ -55,8 +55,8 @@ App.EndWeek.penthouseReport = function() {
he, him
} = getPronouns(slave);
let r = [];
- let _milkResults;
- let _milkResult;
+ let milkResults;
+ let milkResult;
r.push(App.UI.DOM.makeElement("span", SlaveFullName(slave), "slave-name"));
if (slave.choosesOwnAssignment === 2) {
@@ -78,8 +78,8 @@ App.EndWeek.penthouseReport = function() {
r.push(App.SlaveAssignment.workAGloryHole(slave));
break;
case "get milked":
- _milkResults = App.SlaveAssignment.getMilked(slave);
- r.push(_milkResults.text);
+ milkResults = App.SlaveAssignment.getMilked(slave);
+ r.push(milkResults.text);
break;
case "take classes":
r.push(App.SlaveAssignment.takeClasses(slave));
@@ -125,7 +125,7 @@ App.EndWeek.penthouseReport = function() {
r.push(`is forced to use`);
}
r.push(`the penthouse milkers frequently,`);
- _milkResult = App.SlaveAssignment.getMilked(slave, 0.5);
+ milkResult = App.SlaveAssignment.getMilked(slave, 0.5);
} else {
r.push(`keeps ${him} busy, but ${he}`);
if (slave.devotion > 20) {
@@ -139,9 +139,9 @@ App.EndWeek.penthouseReport = function() {
r.push(`is forced to use`);
}
r.push(`the penthouse milkers whenever ${he} can,`);
- _milkResult = App.SlaveAssignment.getMilked(slave, 0.25);
+ milkResult = App.SlaveAssignment.getMilked(slave, 0.25);
}
- r.push(`and ${he} gives ${_milkResult.milk} liters of milk over the week, which is sold for <span class="yellowgreen">${cashFormat(_milkResult.milkSale)}.</span>`);
+ r.push(`and ${he} gives ${milkResult.milk} liters of milk over the week, which is sold for <span class="yellowgreen">${cashFormat(milkResult.milkSale)}.</span>`);
}
App.Events.addNode(el, r, "div");
@@ -187,12 +187,12 @@ App.EndWeek.penthouseReport = function() {
let r = [];
slave.training = Math.clamp(slave.training, 0, 150);
- let _effectiveness = S.HeadGirl.actualAge + ((S.HeadGirl.intelligence + S.HeadGirl.intelligenceImplant) / 3) - (S.HeadGirl.accent * 5) + (V.HGSeverity * 10) + ((slave.intelligence + slave.intelligenceImplant) / 4) - (slave.accent * 5);
+ let effectiveness = S.HeadGirl.actualAge + ((S.HeadGirl.intelligence + S.HeadGirl.intelligenceImplant) / 3) - (S.HeadGirl.accent * 5) + (V.HGSeverity * 10) + ((slave.intelligence + slave.intelligenceImplant) / 4) - (slave.accent * 5);
if (V.AgePenalty === 0) {
- _effectiveness += Math.max(0, (30 - S.HeadGirl.actualAge));
+ effectiveness += Math.max(0, (30 - S.HeadGirl.actualAge));
}
if (S.HeadGirl.sexualFlaw === "abusive" && V.HGSeverity >= 0) {
- _effectiveness += 10;
+ effectiveness += 10;
}
if (headGirlsTraining !== "health") {
slave.health.tired += 25;
@@ -239,13 +239,13 @@ App.EndWeek.penthouseReport = function() {
} else {
if (S.HeadGirl.career === "an arcology owner") {
r.push(`${He} was once an arcology owner ${himself}, making ${him} truly peerless as a Head Girl.`);
- _effectiveness += 50;
+ effectiveness += 50;
} else if (setup.HGCareers.includes(S.HeadGirl.career)) {
r.push(`${He} was used to giving commands and being obeyed in ${his} life before ${he} was a slave, experience ${he} can call on now.`);
- _effectiveness += 5;
+ effectiveness += 5;
} else if (S.HeadGirl.skill.headGirl >= V.masteredXP) {
r.push(`${He} is used to giving commands and being obeyed through experience, rendering ${him} more effective.`);
- _effectiveness += 5;
+ effectiveness += 5;
}
if (S.HeadGirl.actualAge > 30) {
@@ -353,11 +353,11 @@ App.EndWeek.penthouseReport = function() {
if (headGirlsTraining === "obedience") {
slave.training = 0;
- _effectiveness -= (slave.intelligence + slave.intelligenceImplant) / 3;
- if (_effectiveness <= 0) {
+ effectiveness -= (slave.intelligence + slave.intelligenceImplant) / 3;
+ if (effectiveness <= 0) {
r.push(`${slave.slaveName} is smart enough to complicate things; ${he2} manages to outwit ${him} this week and makes no progress.`);
} else {
- slave.devotion += Math.ceil(_effectiveness / 4);
+ slave.devotion += Math.ceil(effectiveness / 4);
if (slave.devotion < -50) {
r.push(`${He} helps watch and restrain the rebellious ${slave.slaveName}, helping wear ${him2} down, <span class="gold">breaking ${slave.slaveName}'s rebelliousness.</span>`);
} else if (slave.devotion < -20) {
@@ -367,8 +367,8 @@ App.EndWeek.penthouseReport = function() {
}
}
} else if (headGirlsTraining === "paraphilia") {
- _effectiveness -= (slave.intelligence + slave.intelligenceImplant) / 3;
- slave.training += _effectiveness;
+ effectiveness -= (slave.intelligence + slave.intelligenceImplant) / 3;
+ slave.training += effectiveness;
r.push(`${S.HeadGirl.slaveName} does ${his} best to get ${slave.slaveName} past it with punishments and rewards,`);
if (slave.training > 100) {
r.push(`and <span class="green">resolves ${slave.slaveName}'s paraphilia.</span>`);
@@ -378,8 +378,8 @@ App.EndWeek.penthouseReport = function() {
r.push(`and makes partial progress.`);
}
} else if (headGirlsTraining === "flaw") {
- _effectiveness -= (slave.intelligence + slave.intelligenceImplant) / 3;
- slave.training += _effectiveness;
+ effectiveness -= (slave.intelligence + slave.intelligenceImplant) / 3;
+ slave.training += effectiveness;
r.push(`${S.HeadGirl.slaveName} punishes ${slave.slaveName} whenever ${he} catches ${him2} indulging in ${his2} bad habits,`);
if (slave.training > 100) {
r.push(`and <span class="green">fixes ${slave.slaveName}'s flaw.</span>`);
@@ -393,8 +393,8 @@ App.EndWeek.penthouseReport = function() {
r.push(`and makes partial progress.`);
}
} else if (headGirlsTraining === "soften") {
- _effectiveness -= (slave.intelligence + slave.intelligenceImplant) / 3;
- slave.training += _effectiveness;
+ effectiveness -= (slave.intelligence + slave.intelligenceImplant) / 3;
+ slave.training += effectiveness;
r.push(`${He} punishes ${slave.slaveName} whenever ${he} sees ${him2} breaking the rules yet does ${his} best to retain what makes the slave special,`);
if (slave.training > 150) {
slave.training = 0;
@@ -421,7 +421,7 @@ App.EndWeek.penthouseReport = function() {
} else {
r.push(`In spare moments ${he} teaches ${slave.slaveName} how to suck cocks, cunts, and assholes. ${slave.slaveName}'s <span class="green">oral skills have improved.</span>`);
}
- slaveSkillIncrease('oral', slave, Math.ceil(_effectiveness / 10));
+ slaveSkillIncrease('oral', slave, Math.ceil(effectiveness / 10));
} else if (headGirlsTraining === "anal skill") {
slave.training = 0;
if (S.HeadGirl.fetish === "buttslut" && S.HeadGirl.fetishStrength > 60) {
@@ -436,7 +436,7 @@ App.EndWeek.penthouseReport = function() {
} else {
r.push(`In spare moments ${he} teaches ${slave.slaveName} how to take a dick up the butt. ${slave.slaveName}'s <span class="green">anal skills have improved.</span>`);
}
- slaveSkillIncrease('anal', slave, Math.ceil(_effectiveness / 10));
+ slaveSkillIncrease('anal', slave, Math.ceil(effectiveness / 10));
} else if (headGirlsTraining === "fuck skill") {
slave.training = 0;
if (S.HeadGirl.energy > 95) {
@@ -451,11 +451,11 @@ App.EndWeek.penthouseReport = function() {
} else {
r.push(`In spare moments ${he} teaches ${slave.slaveName} how to take a dick. ${slave.slaveName}'s <span class="green">vanilla sex skills have improved.</span>`);
}
- slaveSkillIncrease('vaginal', slave, Math.ceil(_effectiveness / 10));
+ slaveSkillIncrease('vaginal', slave, Math.ceil(effectiveness / 10));
} else if (headGirlsTraining === "whore skill") {
slave.training = 0;
r.push(`In spare moments ${he} teaches ${slave.slaveName} how to prostitute ${himself2}. ${slave.slaveName}'s <span class="green">whoring skills have improved.</span>`);
- slaveSkillIncrease('whoring', slave, Math.ceil(_effectiveness / 10));
+ slaveSkillIncrease('whoring', slave, Math.ceil(effectiveness / 10));
} else if (headGirlsTraining === "entertain skill") {
slave.training = 0;
if (S.HeadGirl.fetish === "humiliation" && S.HeadGirl.fetishStrength > 60) {
@@ -464,7 +464,7 @@ App.EndWeek.penthouseReport = function() {
} else {
r.push(`In spare moments ${he} teaches ${slave.slaveName} how to entertain. ${slave.slaveName}'s <span class="green">entertainment skills have improved.</span>`);
}
- slaveSkillIncrease('entertainment', slave, Math.ceil(_effectiveness / 10));
+ slaveSkillIncrease('entertainment', slave, Math.ceil(effectiveness / 10));
}
}
@@ -504,7 +504,7 @@ App.EndWeek.penthouseReport = function() {
return el;
function piercingCheck() {
- let _piercingForbidden = 0;
+ let piercingForbidden = 0;
if (slave.earPiercing === 0 && slave.earShape !== "none") {
if (V.arcologies[0].FSDegradationist !== "unset") {
slave.earPiercing = 2;
@@ -513,7 +513,7 @@ App.EndWeek.penthouseReport = function() {
}
RulesDeconfliction(slave);
if (slave.earPiercing !== V.slaveAfterRA.earPiercing) {
- _piercingForbidden = 1;
+ piercingForbidden = 1;
slave.earPiercing = 0;
} else {
if (V.arcologies[0].FSDegradationist !== "unset") {
@@ -533,7 +533,7 @@ App.EndWeek.penthouseReport = function() {
}
RulesDeconfliction(slave);
if (slave.nosePiercing !== V.slaveAfterRA.nosePiercing) {
- _piercingForbidden = 1;
+ piercingForbidden = 1;
slave.nosePiercing = 0;
} else {
if (V.arcologies[0].FSDegradationist !== "unset") {
@@ -553,7 +553,7 @@ App.EndWeek.penthouseReport = function() {
}
RulesDeconfliction(slave);
if (slave.eyebrowPiercing !== V.slaveAfterRA.eyebrowPiercing) {
- _piercingForbidden = 1;
+ piercingForbidden = 1;
slave.eyebrowPiercing = 0;
} else {
if (V.arcologies[0].FSDegradationist !== "unset") {
@@ -573,7 +573,7 @@ App.EndWeek.penthouseReport = function() {
}
RulesDeconfliction(slave);
if (slave.lipsPiercing !== V.slaveAfterRA.lipsPiercing) {
- _piercingForbidden = 1;
+ piercingForbidden = 1;
slave.lipsPiercing = 0;
} else {
if (V.arcologies[0].FSDegradationist !== "unset") {
@@ -593,7 +593,7 @@ App.EndWeek.penthouseReport = function() {
}
RulesDeconfliction(slave);
if (slave.navelPiercing !== V.slaveAfterRA.navelPiercing) {
- _piercingForbidden = 1;
+ piercingForbidden = 1;
slave.navelPiercing = 0;
} else {
if (V.arcologies[0].FSDegradationist !== "unset") {
@@ -605,7 +605,7 @@ App.EndWeek.penthouseReport = function() {
return;
}
}
- if (_piercingForbidden) {
+ if (piercingForbidden) {
if (V.arcologies[0].FSDegradationist !== "unset") {
r.push(`${S.HeadGirl.slaveName} thinks some piercings might push ${slave.slaveName} to adjust to life as a slave${girl2}, but ${he} also knows you have rules applied to this slave that forbid it.`);
} else {
--
GitLab