From 0ce0ba05a1a86efa1ca7e61bd8e9ec11781629b0 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Wed, 27 Mar 2019 14:34:27 -0400
Subject: [PATCH] All of my changes didn't stage for some reason
---
src/facilities/nursery/longChildDescription.tw | 8 ++++----
src/js/descriptionWidgets.js | 6 +++---
src/uncategorized/bodyModification.tw | 2 +-
src/uncategorized/longSlaveDescription.tw | 8 ++++----
src/uncategorized/wardrobeUse.tw | 2 +-
src/utility/descriptionWidgetsFlesh.tw | 4 ++--
src/utility/descriptionWidgetsTattoos.tw | 2 +-
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index 6444d8f1a27..1724ae0256c 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -676,7 +676,7 @@ is
<<if $activeChild.fuckdoll == 0>>
<<if $showBodyMods == 1>>
<<if ["cheeks", "ears", "left cheek", "left ears", "neck", "right cheek", "right ears"].includes($activeChild.brandLocation)>>
- <<= App.Desc.Brand($activeChild)>>
+ <<= App.Desc.brand($activeChild)>>
<</if>>
<</if>>
<</if>>
@@ -886,7 +886,7 @@ is
<br>
<<if $activeChild.amp != 0>>
- <<= App.Desc.Amputee($activeChild)>>
+ <<= App.Desc.amputee($activeChild)>>
<</if>>
<<ClothingDescription>>
@@ -968,7 +968,7 @@ and
$His hips are unrealistically wide; it is obvious they have been artificially widened.
<</if>>
-<<= App.Desc.Waist($activeChild)>>
+<<= App.Desc.waist($activeChild)>>
<<if $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderRadicalistLawBeauty > 0>>
<<if $arcologies[0].FSHedonisticDecadence == "unset" && $arcologies[0].FSPhysicalIdealistStrongFat == 0>>
@@ -1160,7 +1160,7 @@ $He is
<<if $showBodyMods == 1>>
/* Check it's not a facial brand: */
<<if ["ankles", "back", "calves", "chest", "feet", "hands", "left ankle", "left calf", "left foot", "left hand", "left lower arm", "left shoulder", "left upper arm", "left wrist", "lower arms", "lower back", "right ankle", "right calf", "right foot", "right hand", "right lower arm", "right shoulder", "right upper arm", "right wrist", "shoulders", "upper arms", "wrists"].includes($activeChild.brandLocation)>>
- <<= App.Desc.Brand($activeChild)>>
+ <<= App.Desc.brand($activeChild)>>
<</if>>
<</if>>
<</if>>
diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js
index 74982640091..b7c724c13a4 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -628,7 +628,7 @@ App.Desc.ageAndHealth = /** @param {App.Entity.SlaveState} slave */ function (sl
return r;
}
-App.Desc.Brand = /** @param {App.Entity.SlaveState} slave */ function (slave) {
+App.Desc.brand = /** @param {App.Entity.SlaveState} slave */ function (slave) {
"use strict";
const V = State.variables;
let r = ``;
@@ -653,7 +653,7 @@ App.Desc.Brand = /** @param {App.Entity.SlaveState} slave */ function (slave) {
return r;
}
-App.Desc.Amputee = /**@param {App.Entity.SlaveState} slave */ function (slave) {
+App.Desc.amputee = /**@param {App.Entity.SlaveState} slave */ function (slave) {
"use strict";
const V = State.variables;
let r = ``;
@@ -687,7 +687,7 @@ App.Desc.Amputee = /**@param {App.Entity.SlaveState} slave */ function (slave) {
return r;
}
-App.Desc.Waist = /**@param {App.Entity.SlaveState} slave */ function (slave) {
+App.Desc.waist = /**@param {App.Entity.SlaveState} slave */ function (slave) {
"use strict";
const V = State.variables;
let r = ``;
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index aa78823eafe..d2edd8fd75e 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -866,7 +866,7 @@ Custom Tats:
Branding:
<<if $activeSlave.brand != 0>>
- <<= App.Desc.Brand($activeSlave)>>
+ <<= App.Desc.brand($activeSlave)>>
[[Remove Brand|Body Modification][$brandApplied = 0, $activeSlave.brand = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation -= 10]]
<<else>>
$His skin is unmarked.
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 80f880f00d2..9d999e7fbb1 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1143,7 +1143,7 @@ is
<<if $activeSlave.fuckdoll == 0>>
<<if $showBodyMods == 1>>
<<if ["cheeks", "ears", "left cheek", "left ears", "neck", "right cheek", "right ears"].includes($activeSlave.brandLocation)>>
- <<= App.Desc.Brand($activeSlave)>>
+ <<= App.Desc.brand($activeSlave)>>
<</if>>
<</if>>
<</if>>
@@ -1689,7 +1689,7 @@ is
<br>
<<if $activeSlave.amp != 0>>
- <<= App.Desc.Amputee($activeSlave)>>
+ <<= App.Desc.amputee($activeSlave)>>
<</if>>
<<ClothingDescription>>
@@ -1771,7 +1771,7 @@ and
$His hips are unrealistically wide, it is obvious they have been artificially widened.
<</if>>
-<<= App.Desc.Waist($activeSlave)>>
+<<= App.Desc.waist($activeSlave)>>
<<if $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderRadicalistLawBeauty > 0>>
<<if $arcologies[0].FSHedonisticDecadence == "unset" && $arcologies[0].FSPhysicalIdealistStrongFat == 0>>
@@ -1963,7 +1963,7 @@ $He is
<<if $showBodyMods == 1>>
/* Check it's not a facial brand: */
<<if ["ankles", "back", "calves", "chest", "feet", "hands", "left ankle", "left calf", "left foot", "left hand", "left lower arm", "left shoulder", "left upper arm", "left wrist", "lower arms", "lower back", "right ankle", "right calf", "right foot", "right hand", "right lower arm", "right shoulder", "right upper arm", "right wrist", "shoulders", "upper arms", "wrists"].includes($activeSlave.brandLocation)>>
- <<= App.Desc.Brand($activeSlave)>>
+ <<= App.Desc.brand($activeSlave)>>
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/wardrobeUse.tw b/src/uncategorized/wardrobeUse.tw
index 14fd11c4ad3..9e68a08e4ad 100644
--- a/src/uncategorized/wardrobeUse.tw
+++ b/src/uncategorized/wardrobeUse.tw
@@ -389,7 +389,7 @@ Collar: ''$activeSlave.collar.''
Torso accessory: ''$activeSlave.bellyAccessory.''
<br>
-//<<= App.Desc.Waist($activeSlave)>><<pregnancyDescription>><<clothingCorsetDescription>><<CorsetPiercingDescription>>//
+//<<= App.Desc.waist($activeSlave)>><<pregnancyDescription>><<clothingCorsetDescription>><<CorsetPiercingDescription>>//
<<options $activeSlave.bellyAccessory>>
<<option "none" "None">>
<<option "a corset" "Tight corset">>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index a7f320d3edd..7c9cf6858ef 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -1269,7 +1269,7 @@ $His
<<if $showBodyMods == 1>>
<<if $activeSlave.fuckdoll == 0>>
<<if ($activeSlave.brand != 0) && ["breasts", "left breast", "right breast"].includes($activeSlave.brandLocation)>>
- <<= App.Desc.Brand($activeSlave)>>
+ <<= App.Desc.brand($activeSlave)>>
<</if>>
<</if>>
<</if>>
@@ -5003,7 +5003,7 @@ $He's got a
<<if $showBodyMods == 1>>
<<if ($activeSlave.brand != 0)>>
<<if ($activeSlave.brandLocation == "pubic mound")>>
- <<= App.Desc.Brand($activeSlave)>>
+ <<= App.Desc.brand($activeSlave)>>
<</if>>
<</if>>
<</if>>
diff --git a/src/utility/descriptionWidgetsTattoos.tw b/src/utility/descriptionWidgetsTattoos.tw
index a99c85faa81..6df50ddb2ae 100644
--- a/src/utility/descriptionWidgetsTattoos.tw
+++ b/src/utility/descriptionWidgetsTattoos.tw
@@ -405,7 +405,7 @@
<</switch>>
<</if>>
<<if ($activeSlave.brand != 0) && ["buttocks", "left buttock", "left thigh", "right buttock", "right thigh", "thighs"].includes($activeSlave.brandLocation)>>
- <<= App.Desc.Brand($activeSlave)>>
+ <<= App.Desc.brand($activeSlave)>>
<</if>>
<</widget>>
--
GitLab