diff --git a/src/endWeek/saGuardYou.js b/src/endWeek/saGuardYou.js
index c0934db4e7fba10b89674a0eb84fbbe8265fab5e..d6caec656fbc8236621e6d65d0a46a2d19cbab0d 100644
--- a/src/endWeek/saGuardYou.js
+++ b/src/endWeek/saGuardYou.js
@@ -28,7 +28,7 @@ App.SlaveAssignment.guardYou = (function() {
he, him, his, hers, himself, girl, He, His
} = getPronouns(slave));
- BGImpressiveness = Deadliness(slave);
+ BGImpressiveness = deadliness(slave);
updateBGState(slave);
jobPreface(slave);
diff --git a/src/events/RETS/reSiblingTussle.js b/src/events/RETS/reSiblingTussle.js
index 669a14e7972fdd9be95f58398f2e05f6ca6805fc..fef2421134b32538a517395ead0fb8babc6081bc 100644
--- a/src/events/RETS/reSiblingTussle.js
+++ b/src/events/RETS/reSiblingTussle.js
@@ -157,8 +157,8 @@ App.Events.RETSSiblingTussle = class RETSSiblingTussle extends App.Events.BaseEv
}
function watch() {
- const dead1 = Deadliness(sib1);
- const dead2 = Deadliness(sib2);
+ const dead1 = deadliness(sib1);
+ const dead2 = deadliness(sib2);
if (Math.abs(dead1 - dead2) <= 1) {
// fight between equals
t = [];
diff --git a/src/events/scheduled/murderAttempt.js b/src/events/scheduled/murderAttempt.js
index 434e4a885039b6441f7404c40df59497e4948fa4..4fba684c76d127771ecc27b97e31bcf0b55dc29d 100644
--- a/src/events/scheduled/murderAttempt.js
+++ b/src/events/scheduled/murderAttempt.js
@@ -221,7 +221,7 @@ App.Events.murderAttempt = function() {
if (S.Bodyguard.muscles > 95 || S.Bodyguard.muscles < -30 || S.Bodyguard.boobs > 4000 || S.Bodyguard.weight > 130 || S.Bodyguard.health.tired > 30 || S.Bodyguard.belly >= 100000) { // BG is too big or weak to draw fast enough to matter
paragraphStart.push("shoots you through the heart; having a bodyguard who cannot actually defend you might have been a poor choice in retrospect.");
paragraphStart.push(`With you dead, ${S.Bodyguard.slaveName} knows ${heBG} has to put this to rest.`);
- if (Deadliness(S.Bodyguard) > 1) {
+ if (deadliness(S.Bodyguard) > 1) {
paragraphStart.push(`Out of ammo, your murderer moves to grab ${himBG} by the head and introduce ${hisBG} skull to the corner of your table. ${S.Bodyguard.slaveName} may have been slow on the draw, but is not incompetent. ${HeBG} subdues ${him}, pinning ${him} down until security may collect ${him}, but it's all in vain when ${he} starts convulsing and quickly perishes to the contents of a false tooth. With nothing left, ${S.Bodyguard.slaveName} readies ${hisBG} weapon, puts it under ${hisBG} chin, and pulls the trigger.`);
} else {
paragraphStart.push(`Alas, ${heBG} is too incompetent to even do that. By the time ${heBG} manages to get a steady grip on ${hisBG} weapon, your murderer is already introducing ${hisBG} skull to the corner of your table. Sure ${he} is detained before ${he} makes it out of the building, but does that really matter when you're dead?`);
@@ -230,7 +230,7 @@ App.Events.murderAttempt = function() {
gameOver(fragment);
} else {
paragraphStart.push(paragraphStart.pop() + ",");
- if (Deadliness(S.Bodyguard) > 1) {
+ if (deadliness(S.Bodyguard) > 1) {
paragraphStart.push(`just a little quicker, ${S.Bodyguard.slaveName} draws ${hisBG} own, shooting ${him} in the shoulder. Screaming in pain, ${he} drops ${his} weapon and ${S.Bodyguard.slaveName} swiftly moves to secure ${him}.`);
App.Events.addParagraph(fragment, paragraphStart);
let r = [];
diff --git a/src/events/scheduled/pitFightLethal.js b/src/events/scheduled/pitFightLethal.js
index b5368d70120f4e6e61d145323d99d033e73f3a03..91b9d38813679776bb0600264916f7059da06a97 100644
--- a/src/events/scheduled/pitFightLethal.js
+++ b/src/events/scheduled/pitFightLethal.js
@@ -7,7 +7,7 @@ App.Facilities.Pit.fight.lethal = function(fighters) {
const loser = getSlave(getLoser());
- frag.append(intro(), deadliness(getSlave(fighters[0])), deadliness(getSlave(fighters[1])), fight(), postFight());
+ frag.append(intro(), fighterDeadliness(getSlave(fighters[0])), fighterDeadliness(getSlave(fighters[1])), fight(), postFight());
return frag;
@@ -69,11 +69,11 @@ App.Facilities.Pit.fight.lethal = function(fighters) {
}
/** @param {App.Entity.SlaveState} fighter */
- function deadliness(fighter) {
+ function fighterDeadliness(fighter) {
const deadlinessDiv = document.createElement("div");
const {he, his, him, himself, He, His} = getPronouns(fighter);
- const deadliness = Deadliness(fighter);
+ const fighterDeadliness = deadliness(fighter);
const r = [];
@@ -104,11 +104,11 @@ App.Facilities.Pit.fight.lethal = function(fighters) {
function confidence() {
if (fighter.fetish === "mindbroken") {
return `${fighter.slaveName} is too broken to care about whether ${he} lives or dies;`;
- } else if (deadliness > 5) {
+ } else if (fighterDeadliness > 5) {
return `${fighter.slaveName} seems very confident;`;
- } else if (deadliness > 3) {
+ } else if (fighterDeadliness > 3) {
return `${fighter.slaveName} seems nervous, but steels ${himself};`;
- } else if (deadliness > 1) {
+ } else if (fighterDeadliness > 1) {
return `${fighter.slaveName} seems hesitant and unsure;`;
} else {
return `${fighter.slaveName} is obviously terrified, and might flee if there were a way out of the pit;`;
@@ -293,8 +293,8 @@ App.Facilities.Pit.fight.lethal = function(fighters) {
function fight() {
const fightDiv = document.createElement("div");
- const winnerDeadliness = Deadliness(winner);
- const loserDeadliness = Deadliness(loser);
+ const winnerDeadliness = fighterDeadliness(winner);
+ const loserDeadliness = fighterDeadliness(loser);
const {he, his, him, himself, girl, He} = getPronouns(winner);
const {he: he2, his: his2, him: him2, girl: girl2} = getPronouns(loser);
@@ -646,9 +646,9 @@ App.Facilities.Pit.fight.lethal = function(fighters) {
*/
function getWinner() {
if (!animal) {
- if (Deadliness(getSlave(fighters[0])) > Deadliness(getSlave(fighters[1]))) {
+ if (fighterDeadliness(getSlave(fighters[0])) > fighterDeadliness(getSlave(fighters[1]))) {
return fighters[0];
- } else if (Deadliness(getSlave(fighters[0])) < Deadliness(getSlave(fighters[1]))) {
+ } else if (fighterDeadliness(getSlave(fighters[0])) < fighterDeadliness(getSlave(fighters[1]))) {
return fighters[1];
} else if (random(1, 100) > 50) {
return fighters[0];
diff --git a/src/events/scheduled/pitFightNonlethal.js b/src/events/scheduled/pitFightNonlethal.js
index e8221a2d432ecb7d510af4c9d073f23fc989ebbf..a420a8b8dee5a740dad8465246534f9854dc19a9 100644
--- a/src/events/scheduled/pitFightNonlethal.js
+++ b/src/events/scheduled/pitFightNonlethal.js
@@ -7,7 +7,8 @@ App.Facilities.Pit.fight.nonlethal = function(fighters) {
const loser = getSlave(getLoser());
- frag.append(intro(), deadliness(getSlave(fighters[0])), deadliness(getSlave(fighters[1])), fight(), postFight());
+
+ frag.append(intro(), fighterDeadliness(getSlave(fighters[0])), fighterDeadliness(getSlave(fighters[1])), fight(), postFight());
return frag;
@@ -78,11 +79,11 @@ App.Facilities.Pit.fight.nonlethal = function(fighters) {
}
/** @param {App.Entity.SlaveState} fighter */
- function deadliness(fighter) {
+ function fighterDeadliness(fighter) {
const deadlinessDiv = document.createElement("div");
const {he, his, him, himself, He, His} = getPronouns(fighter);
- const deadliness = Deadliness(fighter);
+ const fighterDeadliness = deadliness(fighter);
const r = [];
@@ -113,11 +114,11 @@ App.Facilities.Pit.fight.nonlethal = function(fighters) {
function confidence() {
if (fighter.fetish === "mindbroken") {
return `${fighter.slaveName} is too broken to care what happens to ${him}.`;
- } else if (deadliness > 5) {
+ } else if (fighterDeadliness > 5) {
return `${fighter.slaveName} seems very confident, even eager to win a break.`;
- } else if (deadliness > 3) {
+ } else if (fighterDeadliness > 3) {
return `${fighter.slaveName} seems nervous, but steels ${himself} to fight for time off.`;
- } else if (deadliness > 1) {
+ } else if (fighterDeadliness > 1) {
return `${fighter.slaveName} seems hesitant and unsure.`;
} else {
return `${fighter.slaveName} is obviously terrified, and might flee if there were a way out of the pit.`;
@@ -292,8 +293,8 @@ App.Facilities.Pit.fight.nonlethal = function(fighters) {
function fight() {
const fightDiv = document.createElement("div");
- const winnerDeadliness = Deadliness(winner);
- const loserDeadliness = Deadliness(loser);
+ const winnerDeadliness = deadliness(winner);
+ const loserDeadliness = deadliness(loser);
const {he, his, him, himself, girl, He} = getPronouns(winner);
const {he: he2, his: his2, him: him2, himself: himself2, girl: girl2, He: He2, His: His2} = getPronouns(loser);
@@ -1106,9 +1107,9 @@ App.Facilities.Pit.fight.nonlethal = function(fighters) {
*/
function getWinner() {
if (!animal) {
- if (Deadliness(getSlave(fighters[0])) > Deadliness(getSlave(fighters[1]))) {
+ if (fighterDeadliness(getSlave(fighters[0])) > fighterDeadliness(getSlave(fighters[1]))) {
return fighters[0];
- } else if (Deadliness(getSlave(fighters[0])) < Deadliness(getSlave(fighters[1]))) {
+ } else if (fighterDeadliness(getSlave(fighters[0])) < fighterDeadliness(getSlave(fighters[1]))) {
return fighters[1];
} else if (random(1, 100) > 50) {
return fighters[0];
diff --git a/src/interaction/killSlave.js b/src/interaction/killSlave.js
index 49e964e88725a70316bcd98ac34902585c51869f..6bdfbcbf389c5a9a6bb413dbb299ced62f5b5d8b 100644
--- a/src/interaction/killSlave.js
+++ b/src/interaction/killSlave.js
@@ -162,11 +162,11 @@ App.UI.SlaveInteract.killSlave = function(slave) {
}
if (disableReasons) {
+ links.push(App.UI.DOM.disabledLink(combatLinkText, disableReasons));
+ } else {
links.push(App.UI.DOM.link(combatLinkText, () => {
refresh(linksDiv, combat);
}));
- } else {
- links.push(App.UI.DOM.disabledLink(combatLinkText, disableReasons));
}
linksDiv.appendChild(App.UI.DOM.generateLinksStrip(links));
diff --git a/src/interaction/killSlave.tw b/src/interaction/killSlave.tw
index d516d55d7b0e87d0a8279259b62a96b6b0d8d8f6..7b1327b99eb466fdfcceb6cc6ed56cb6fe077e18 100644
--- a/src/interaction/killSlave.tw
+++ b/src/interaction/killSlave.tw
@@ -1,3 +1,3 @@
:: KillSlave [nobr]
-<<includeDOM App.Facilities.Pit.killSlave(getSlave($AS))>>
+<<includeDOM App.UI.SlaveInteract.killSlave(getSlave($AS))>>
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index e6116dfc594b6dec5f99cc12ec18b80ee6e100ba..1ea4e85c4fc779847f9dfbecd46ad1f5866c5b23 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -1387,7 +1387,7 @@ globalThis.faceIncrease = function(slave, amount) {
* @param {App.Entity.SlaveState} slave
* @returns {number}
*/
-globalThis.Deadliness = function(slave) {
+globalThis.deadliness = function(slave) {
let deadliness = 2;
if (slave.skill.combat > 0) {
diff --git a/src/npc/slaveStats.tw b/src/npc/slaveStats.tw
index 62779d506f7baaea3752121fe32e9e94b329b72a..dffd1e2393e911ca37710a21de21e72b79f3957e 100644
--- a/src/npc/slaveStats.tw
+++ b/src/npc/slaveStats.tw
@@ -514,7 +514,7 @@ Income: <<= num(_slave.lastWeeksRepIncome)>>
<div id="Misc" class="tab-content">
<div class="content">
- <br>Deadliness <<print Deadliness(_slave)>>
+ <br>Deadliness <<print deadliness(_slave)>>
<br>Count: Penetrative: _slave.counter.penetrative,
Public: _slave.counter.publicUse
<br>pitKills: _slave.counter.pitKills
diff --git a/src/uncategorized/pePitFight.tw b/src/uncategorized/pePitFight.tw
index 96a96f4989f0e8d4606c9000fe105257e1d04fe9..c3938f704a82c420370def036321092c1eef4399 100644
--- a/src/uncategorized/pePitFight.tw
+++ b/src/uncategorized/pePitFight.tw
@@ -5,7 +5,7 @@
<<set $activeSlave = _S.Bodyguard>>
<<run App.Utils.setLocalPronouns($activeSlave)>>
-<<set _deadliness = Deadliness($activeSlave)>>
+<<set _deadliness = deadliness($activeSlave)>>
<<set $eventResults.pit = 0>>
@@ -220,4 +220,4 @@ The umpire announces gravely that the fight is to the death and rings a bell.
<<UpdateNextButton>>
<</if>>
-<<set $pitFightsTotal++>>
\ No newline at end of file
+<<set $pitFightsTotal++>>