From 889d27748e4ae79a8dc1b8d7a9820ebe31016d6f Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Sun, 27 Sep 2020 17:26:48 -0700
Subject: [PATCH] Small fixes and cleanup
---
devTools/javaSanityCheck/ignoredVariables | 10 +---------
src/endWeek/saStayConfined.js | 2 --
src/interaction/main/walkPast.js | 4 ++--
src/npc/generate/newSlaveIntro.js | 2 +-
4 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/devTools/javaSanityCheck/ignoredVariables b/devTools/javaSanityCheck/ignoredVariables
index a2f7623e777..ad5233f7fdd 100644
--- a/devTools/javaSanityCheck/ignoredVariables
+++ b/devTools/javaSanityCheck/ignoredVariables
@@ -6,15 +6,7 @@ cumSale
fluidSale
MIN
brokenSlaves
-DL
-dI
-Delete
-SpliceArray
-Copy
-CopyDate
self
-setBaseAndExtent
-opera
toString
toFixed
LivingRule
@@ -94,7 +86,7 @@ showAppraisal
IntroSummary
two
totalMerc
-hasFoughtOnce;hasFoughtMajorBattleOnce;hasRebelledOnce
+hasFoughtMajorBattleOnce
barren
RESSMuscles
# PC
diff --git a/src/endWeek/saStayConfined.js b/src/endWeek/saStayConfined.js
index 3612af99a8f..5583751bbe8 100644
--- a/src/endWeek/saStayConfined.js
+++ b/src/endWeek/saStayConfined.js
@@ -129,8 +129,6 @@ App.SlaveAssignment.stayConfined = function(slave) {
t += ` <span class="noteworthy">`;
if (slave.assignment === Job.CELLBLOCK) {
State.temporary.brokenSlaves++;
- State.temporary.DL--;
- State.temporary.dI--;
}
if (V.assignmentRecords[slave.ID]) {
let oldJob = V.assignmentRecords[slave.ID];
diff --git a/src/interaction/main/walkPast.js b/src/interaction/main/walkPast.js
index e4e00b9f4dc..7f5e994cc15 100644
--- a/src/interaction/main/walkPast.js
+++ b/src/interaction/main/walkPast.js
@@ -9236,8 +9236,8 @@ globalThis.walkPast = (function() {
t += `${His} armor demands attention for ${his} tightly clad backdoor.`;
break;
case "Imperial Plate":
- t += `${His} ultra-heavy armor somehow manages to draw attention to the plated curvature of ${his} tight, heavily-armored backdoor. You suppose you could retract just the back-plating.`;
- break;
+ t += `${His} ultra-heavy armor somehow manages to draw attention to the plated curvature of ${his} tight, heavily-armored backdoor. You suppose you could retract just the back-plating.`;
+ break;
case "a mounty outfit":
t += `${His} uniform slacks can be slipped off ${his} hips to bare ${his} butthole.`;
break;
diff --git a/src/npc/generate/newSlaveIntro.js b/src/npc/generate/newSlaveIntro.js
index 24379b8e938..cc86a9b09fa 100644
--- a/src/npc/generate/newSlaveIntro.js
+++ b/src/npc/generate/newSlaveIntro.js
@@ -902,7 +902,7 @@ App.UI.newSlaveIntro = function(slave, slave2 = V.eventSlave) {
linkName: `Brand ${him} on the ${brandTarget} to make it clear that ${his} life of luxury and prestige is over`,
result: function(slave) {
const r = [];
- r.push(`The former knight stands in front of you, glaring down as you casually annouce that you'll be branding ${his} ${brandtarget} to mark ${him} as property. ${He}'s an absolutely enormous mass of corded muscle, all of it on naked display, and the furious glint in ${his} eyes makes it look like ${he}'s thinking about snapping you in two at any moment. As the captive man tries ${his} best to silently intimidate you, you laugh, once, and bring your face up close to ${his}, making it disturbingly clear that ${his} muscle and strength is no use anymore. Escorted by your drones, you bring the ex-Knight to the body modification studio, strap ${him} down, and take your time to heat up the brand before bringing it to ${his} virgin flesh with a sudden ferocity that makes the huge man scream in agony. As ${he} writhes and thrashes under the straps, ${he} gets his first taste of <span class="gold">genuine pain,</span>, and ${he} <span class="mediumorchid">hates you</span> even more than ${he} did before as ${his} <span class="red">wound</span> heals.`);
+ r.push(`The former knight stands in front of you, glaring down as you casually annouce that you'll be branding ${his} ${brandTarget} to mark ${him} as property. ${He}'s an absolutely enormous mass of corded muscle, all of it on naked display, and the furious glint in ${his} eyes makes it look like ${he}'s thinking about snapping you in two at any moment. As the captive man tries ${his} best to silently intimidate you, you laugh, once, and bring your face up close to ${his}, making it disturbingly clear that ${his} muscle and strength is no use anymore. Escorted by your drones, you bring the ex-Knight to the body modification studio, strap ${him} down, and take your time to heat up the brand before bringing it to ${his} virgin flesh with a sudden ferocity that makes the huge man scream in agony. As ${he} writhes and thrashes under the straps, ${he} gets his first taste of <span class="gold">genuine pain,</span> and ${he} <span class="mediumorchid">hates you</span> even more than ${he} did before as ${his} <span class="red">wound</span> heals.`);
if (canDoAnal(slave)) {
r.push(VCheck.Anal(slave, 1));
}
--
GitLab