From fb841ea99249fba1477f438140af7bf9fc30048d Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Fri, 25 Dec 2020 00:58:06 -0500
Subject: [PATCH] rename shoeHeelHeight to shoeHeelCategory since it no longer
returns a precise height
---
src/endWeek/saLongTermMentalEffects.js | 2 +-
src/endWeek/saLongTermPhysicalEffects.js | 4 ++--
src/events/RESS/muscles.js | 2 +-
src/js/birth/birth.js | 2 +-
src/js/eventSelectionJS.js | 4 ++--
src/js/slaveSummaryHelpers.js | 2 +-
src/js/statsChecker/statsChecker.js | 6 ++---
src/js/utilsAssessSlave.js | 2 +-
src/js/vignettes.js | 4 ++--
src/npc/descriptions/heels.js | 2 +-
src/npc/interaction/fAnus.tw | 2 +-
src/uncategorized/RESS.tw | 28 +++++++++++------------
src/uncategorized/reStandardPunishment.tw | 4 ++--
13 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/endWeek/saLongTermMentalEffects.js b/src/endWeek/saLongTermMentalEffects.js
index 2663995290f..ef0b21b9407 100644
--- a/src/endWeek/saLongTermMentalEffects.js
+++ b/src/endWeek/saLongTermMentalEffects.js
@@ -1861,7 +1861,7 @@ App.SlaveAssignment.longTermMentalEffects = (function() {
}
}
if (slave.heels === 1) {
- if (shoeHeelHeight(slave) === 0) {
+ if (shoeHeelCategory(slave) === 0) {
if (slave.fetish !== "submissive") {
if (slave.career === "a dairy cow" || slave.career === "a breeding bull") {
r.push(`${He} sees ${himself} as an animal, and as such, is perfectly content`);
diff --git a/src/endWeek/saLongTermPhysicalEffects.js b/src/endWeek/saLongTermPhysicalEffects.js
index 96393637040..65fbc8197b8 100644
--- a/src/endWeek/saLongTermPhysicalEffects.js
+++ b/src/endWeek/saLongTermPhysicalEffects.js
@@ -1527,7 +1527,7 @@ App.SlaveAssignment.longTermPhysicalEffects = (function() {
} else {
r.push(`or would be if ${he} had both legs,`);
}
- } else if (slave.heels === 1 && shoeHeelHeight(slave) === 0) {
+ } else if (slave.heels === 1 && shoeHeelCategory(slave) === 0) {
if (hindrances.length > 1) {
r.push(`but ultimately ${his} heels having been clipped,`);
} else {
@@ -1546,7 +1546,7 @@ App.SlaveAssignment.longTermPhysicalEffects = (function() {
r.push(`leglessness renders`);
} else if ((!hasBothLegs(slave))) {
r.push(`missing leg renders`);
- } else if (slave.heels === 1 && shoeHeelHeight(slave) === 0) {
+ } else if (slave.heels === 1 && shoeHeelCategory(slave) === 0) {
r.push(`clipped heels render`);
}
}
diff --git a/src/events/RESS/muscles.js b/src/events/RESS/muscles.js
index cfff88a4458..f63755302d1 100644
--- a/src/events/RESS/muscles.js
+++ b/src/events/RESS/muscles.js
@@ -31,7 +31,7 @@ App.Events.RESSMuscles = class RESSMuscles extends App.Events.BaseEvent {
t.push(App.UI.DOM.slaveDescriptionDialog(eventSlave));
if (!canWalk(eventSlave)) {
t.push(`crawls`);
- } else if (shoeHeelHeight(eventSlave) > 1) {
+ } else if (shoeHeelCategory(eventSlave) > 1) {
t.push(`totters`);
} else if (eventSlave.belly >= 10000) {
t.push(`waddles`);
diff --git a/src/js/birth/birth.js b/src/js/birth/birth.js
index d431a9c18a6..e0b021eb6f2 100644
--- a/src/js/birth/birth.js
+++ b/src/js/birth/birth.js
@@ -170,7 +170,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false} = {})
if (slave.balls >= 6) {
suddenBirth += 1;
}
- if (shoeHeelHeight(slave) > 2) {
+ if (shoeHeelCategory(slave) > 2) {
suddenBirth += 2;
}
if (slave.geneticQuirks.uterineHypersensitivity === 2) {
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index 26776515c28..69d25cc39e3 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -429,7 +429,7 @@ globalThis.generateRandomEventPoolStandard = function(eventSlave) {
if (V.slaves.length > 2) {
if (eventSlave.devotion >= -20) {
if (eventSlave.heels === 1) {
- if (shoeHeelHeight(eventSlave) > 0) {
+ if (shoeHeelCategory(eventSlave) > 0) {
V.RESSevent.push("tendon fall");
}
}
@@ -1657,7 +1657,7 @@ globalThis.generateRandomEventPoolServant = function(eventSlave) {
if (V.slaves.length > 2) {
if (eventSlave.devotion >= -20) {
if (eventSlave.heels === 1) {
- if (shoeHeelHeight(eventSlave) > 0) {
+ if (shoeHeelCategory(eventSlave) > 0) {
V.RESSevent.push("tendon fall");
}
}
diff --git a/src/js/slaveSummaryHelpers.js b/src/js/slaveSummaryHelpers.js
index 96b241039e9..67e8f38d135 100644
--- a/src/js/slaveSummaryHelpers.js
+++ b/src/js/slaveSummaryHelpers.js
@@ -1175,7 +1175,7 @@ App.UI.SlaveSummaryImpl = function() {
* @returns {void}
*/
function long_shoes(slave, c) {
- if (shoeHeelHeight(slave) > 0) {
+ if (shoeHeelCategory(slave) > 0) {
makeSpan(c, slave.shoes, undefined, true);
} else if (slave.heels === 1) {
makeSpan(c, "Crawling.", "yellow");
diff --git a/src/js/statsChecker/statsChecker.js b/src/js/statsChecker/statsChecker.js
index 9e122ad6ccd..7ccefb86d1c 100644
--- a/src/js/statsChecker/statsChecker.js
+++ b/src/js/statsChecker/statsChecker.js
@@ -437,7 +437,7 @@ globalThis.bimboScore = function(slave) {
if (modScore.tat > 3) {
degree++;
}
- degree += shoeHeelHeight(slave);
+ degree += shoeHeelCategory(slave);
if (slave.skin === "sun tanned" || slave.skin === "spray tanned") {
degree++;
}
@@ -786,7 +786,7 @@ globalThis.canWalk = function(slave) {
return false;
} else if (tooBigBelly(slave)) {
return false;
- } else if (slave.heels === 1 && shoeHeelHeight(slave) === 0) {
+ } else if (slave.heels === 1 && shoeHeelCategory(slave) === 0) {
return false;
}
return true;
@@ -803,7 +803,7 @@ globalThis.canStand = function(slave) {
return false;
} else if (!hasAnyLegs(slave)) {
return false;
- } else if (slave.heels === 1 && shoeHeelHeight(slave) === 0) {
+ } else if (slave.heels === 1 && shoeHeelCategory(slave) === 0) {
return false;
} else if (tooFatSlave(slave)) {
return false;
diff --git a/src/js/utilsAssessSlave.js b/src/js/utilsAssessSlave.js
index ac6caf62766..1d397eff3f2 100644
--- a/src/js/utilsAssessSlave.js
+++ b/src/js/utilsAssessSlave.js
@@ -246,7 +246,7 @@ globalThis.canMoveToRoom = function(slave) {
* @param {App.Entity.SlaveState} slave
* @returns {0|1|2|3} 0: No heel boost at all. 1: Pumps, slight boost. 2: High heels. 3: Painfully/extreme high heels
*/
-globalThis.shoeHeelHeight = function(slave) {
+globalThis.shoeHeelCategory = function(slave) {
const height = App.Data.shoes.get(slave.shoes) ? App.Data.shoes.get(slave.shoes).heelHeight : 0; // Height is in cm
if (height > 20) {
return 3;
diff --git a/src/js/vignettes.js b/src/js/vignettes.js
index 3c8941f6826..19d378fcf5e 100644
--- a/src/js/vignettes.js
+++ b/src/js/vignettes.js
@@ -1263,7 +1263,7 @@ globalThis.GetVignette = function(slave) {
effect: -1,
});
}
- if (slave.heels === 1 && shoeHeelHeight(slave) === 0) {
+ if (slave.heels === 1 && shoeHeelCategory(slave) === 0) {
vignettes.push({
text: `${he} enticed a new customer who had never really considered buttsex before they saw ${him} crawling along with ${his} asshole vulnerable,`,
type: "cash",
@@ -3255,7 +3255,7 @@ globalThis.GetVignette = function(slave) {
effect: -1,
});
}
- if (slave.heels === 1 && shoeHeelHeight(slave) === 0) {
+ if (slave.heels === 1 && shoeHeelCategory(slave) === 0) {
vignettes.push({
text: `${he} enticed a new patron who had never really considered buttsex before they saw ${him} crawling along with ${his} asshole vulnerable,`,
type: "rep",
diff --git a/src/npc/descriptions/heels.js b/src/npc/descriptions/heels.js
index 7bfc9e65f84..d9df2769aa8 100644
--- a/src/npc/descriptions/heels.js
+++ b/src/npc/descriptions/heels.js
@@ -19,7 +19,7 @@ App.Desc.heels = function(slave, {market, eventDescription} = {}) {
}
r.push(`so that ${he} must wear heels in order to walk.`);
if (V.showClothing === 1 && !market) {
- if (shoeHeelHeight(slave) > 0) {
+ if (shoeHeelCategory(slave) > 0) {
r.push(`${He} is, so ${he} can walk reasonably well.`);
} else {
r.push(`Since ${he} is without them, ${he}'s crawling on`);
diff --git a/src/npc/interaction/fAnus.tw b/src/npc/interaction/fAnus.tw
index d357dfc202e..3de75aa2798 100644
--- a/src/npc/interaction/fAnus.tw
+++ b/src/npc/interaction/fAnus.tw
@@ -31,7 +31,7 @@ You call $him over so you can
<</if>>
<<if (getSlave($AS).heels == 1)>>
- <<if shoeHeelHeight($activeSlave) > 0>>
+ <<if shoeHeelCategory($activeSlave) > 0>>
As $he went past your desk, $his high heels and surgically altered legs enforced a gait that presented $his butt enticingly.
<<else>>
As $he crawls along on <<if hasAllLimbs(getSlave($AS))>>all fours<<else>>the ground<</if>>, $his anus is readily available.
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 3a566b2ae65..d2ec7b2cbfa 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -746,9 +746,9 @@ The source of the many-voiced personal assistant becomes clear: probably on the
One night, you see <<= App.UI.slaveDescriptionDialog($activeSlave)>>
<<if (!hasAnyLegs($activeSlave))>>
scooting $himself from side to side uncomfortably,
-<<elseif ($activeSlave.heels == 1 && shoeHeelHeight($activeSlave) == 0))>>
+<<elseif ($activeSlave.heels == 1 && shoeHeelCategory($activeSlave) == 0))>>
crawling gingerly,
-<<elseif (shoeHeelHeight($activeSlave) > 1))>>
+<<elseif (shoeHeelCategory($activeSlave) > 1))>>
tottering along painfully,
<<else>>
walking a little funny,
@@ -969,9 +969,9 @@ $He sets $his jaw and <<if canSee($activeSlave)>>manages to meet your eyes witho
<<case "bondage gear">>
One day, you catch sight of <<= App.UI.slaveDescriptionDialog($activeSlave)>>
-<<if ($activeSlave.heels == 1 && shoeHeelHeight($activeSlave) == 0)>>
+<<if ($activeSlave.heels == 1 && shoeHeelCategory($activeSlave) == 0)>>
crawling
-<<elseif shoeHeelHeight($activeSlave) > 1>>
+<<elseif shoeHeelCategory($activeSlave) > 1>>
tottering
<<else>>
walking
@@ -1238,7 +1238,7 @@ $he is. You've been busy and haven't used $him for a while, and since $he's acce
One morning, you see <<= App.UI.slaveDescriptionDialog($activeSlave)>>
<<if !canWalk($activeSlave)>>
crawl
-<<elseif shoeHeelHeight($activeSlave) > 0>>
+<<elseif shoeHeelCategory($activeSlave) > 0>>
totter
<<elseif $activeSlave.belly >= 10000>>
waddle
@@ -1475,7 +1475,7 @@ It's time for $his routine inspection, and $he's standing before you, nude. $He
As you are retiring for the night, <<= App.UI.slaveDescriptionDialog($activeSlave)>>
<<if !canWalk($activeSlave)>>
crawls
-<<elseif shoeHeelHeight($activeSlave) > 1>>
+<<elseif shoeHeelCategory($activeSlave) > 1>>
totters
<<elseif $activeSlave.belly >= 10000>>
waddles
@@ -1483,9 +1483,9 @@ As you are retiring for the night, <<= App.UI.slaveDescriptionDialog($activeSlav
walks
<</if>>
into your bedroom. Since $he is not allowed to ask questions, $he says nothing, but $his reason for being here is obvious enough. $He's on a medically reckless dosage of aphrodisiacs, and $he's panting as $he
-<<if ($activeSlave.heels == 1 shoeHeelHeight($activeSlave) == 0)>>
+<<if ($activeSlave.heels == 1 shoeHeelCategory($activeSlave) == 0)>>
kneels
-<<elseif (shoeHeelHeight($activeSlave) > 0)>>
+<<elseif (shoeHeelCategory($activeSlave) > 0)>>
teeters
<<else>>
stands
@@ -1533,7 +1533,7 @@ Going about your day, you see <<= App.UI.slaveDescriptionDialog($activeSlave)>>
As you are retiring for the night, <<= App.UI.slaveDescriptionDialog($activeSlave)>>
<<if !canWalk($activeSlave)>>
crawls
-<<elseif shoeHeelHeight($activeSlave) > 1>>
+<<elseif shoeHeelCategory($activeSlave) > 1>>
totters
<<elseif $activeSlave.belly >= 10000>>
waddles
@@ -1768,7 +1768,7 @@ This is the result of not getting off for several days while on the slave diet p
$He constantly passes by your desk as you work, going back and forth between the milkers and $his other tasks. Even if you didn't know which was which, it would be easy to tell which way $he was going. One way, $he
<<if !canWalk($activeSlave)>>
crawls
-<<elseif shoeHeelHeight($activeSlave) > 1>>
+<<elseif shoeHeelCategory($activeSlave) > 1>>
totters
<<elseif $activeSlave.belly >= 10000>>
waddles
@@ -8856,9 +8856,9 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
<br><<link "See how rough you can be and still get $him to cum">>
<<replace "#result">>
The aphrodisiac dosage $he's on will let $him orgasm to almost anything. You spend a few minutes playing with $his nipples, skillfully edging $him away from climax, and $he's almost vibrating with discomfort. $He's so desperate that $he sobs with relief when you order $him to
- <<if ($activeSlave.heels == 1) && shoeHeelHeight($activeSlave) == 0>>
+ <<if ($activeSlave.heels == 1) && shoeHeelCategory($activeSlave) == 0>>
kneel
- <<elseif shoeHeelHeight($activeSlave) > 0>>
+ <<elseif shoeHeelCategory($activeSlave) > 0>>
totter up
<<else>>
stand
@@ -13010,9 +13010,9 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
<br> <<link "while in pain">>
<<replace "#result">>
You order $him to
- <<if ($activeSlave.heels == 1) && shoeHeelHeight($activeSlave) == 0>>
+ <<if ($activeSlave.heels == 1) && shoeHeelCategory($activeSlave) == 0>>
kneel
- <<elseif shoeHeelHeight($activeSlave) > 0>>
+ <<elseif shoeHeelCategory($activeSlave) > 0>>
teeter
<<else>>
stand
diff --git a/src/uncategorized/reStandardPunishment.tw b/src/uncategorized/reStandardPunishment.tw
index 459cd65f3d3..c74aaac4f0d 100644
--- a/src/uncategorized/reStandardPunishment.tw
+++ b/src/uncategorized/reStandardPunishment.tw
@@ -269,9 +269,9 @@
<<link "Make $him run">>
<<replace "#result">>
You tell $him that $he clearly needs practice being prompt. Your tone is conversational, but $he doesn't mistake it for kindness. It's the tone you use with slaves when imparting guidance which is to be accepted and followed on pain of terrible punishment. You make $him explain where $he was and what $he was doing previously, and require $him to walk you there. $He does, <<if $activeSlave.trust > 20>>trustingly<<elseif $activeSlave.trust >= -20>>rather fearfully<<else>>shaking with fear<</if>>, and when you get there you tell $him to run to $his next task. $He hesitates for an instant, until you <<if $PC.title == 1>>bellow<<else>>shriek<</if>> at $him to run! $He takes off,
- <<if shoeHeelHeight($activeSlave) == 3>>
+ <<if shoeHeelCategory($activeSlave) == 3>>
tottering agonizingly along in $his extreme heels. $He isn't running, not really, but $his slutty shoes are so ridiculous that $he can't. $He's going as fast as $he possibly can.
- <<elseif shoeHeelHeight($activeSlave) > 1>>
+ <<elseif shoeHeelCategory($activeSlave) > 1>>
running awkwardly in $his $activeSlave.shoes.
<<else>>
running as fast as $his legs can carry $him.
--
GitLab