From 8d6559d2c782cc94346091f67b48d0b8cbbee673 Mon Sep 17 00:00:00 2001 From: lowercase-donkey <lowercasedonkey@gmail.com> Date: Fri, 12 Jul 2019 23:16:37 -0400 Subject: [PATCH] fixes --- slave variables documentation - Pregmod.txt | 2 +- src/init/storyInit.tw | 1 - src/js/rulesAutosurgery.js | 2 +- src/uncategorized/reRelativeRecruiter.tw | 2 +- src/uncategorized/slaveStats.tw | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt index 0a08be6d6fb..11c9c225747 100644 --- a/slave variables documentation - Pregmod.txt +++ b/slave variables documentation - Pregmod.txt @@ -3528,7 +3528,7 @@ Has the slave gone through male puberty. scar: is an object -keys include any place on a slave body that can receive a brand, values are a string for the brand. Values can be int or string. +keys include any place on a slave body that can receive a scar, values are a string for the scar. Values can be int or string. 1 - light scarring 2 - heavy scarring diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index ab3616afe58..d8ea86c8b8c 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -1027,7 +1027,6 @@ You should have received a copy of the GNU General Public License along with thi <<set $scarTarget = {primary: "left cheek", secondary: "left cheek", local: "left cheek"}>> <<set $scarDesign = {primary: 1, local: 1}>> - <<set $oralTotal = 0>> <<set $vaginalTotal = 0>> <<set $analTotal = 0>> diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js index 3d35ca67bb0..e9934f6f8fe 100644 --- a/src/js/rulesAutosurgery.js +++ b/src/js/rulesAutosurgery.js @@ -360,7 +360,7 @@ window.rulesAutosurgery = (function() { } }); } else if (slave.scar["belly"] === 7 && thisSurgery.cosmetic > 0) { - commitProcedure("surgery to remove a c-section scar", s => { s.scar["belly"] = 0; }); + commitProcedure("surgery to remove a c-section scar", s => { delete s.scar["belly"]; }); } else if (slave.faceImplant <= 45 && slave.face <= 95 && thisSurgery.cosmetic === 2) { commitProcedure("a nicer face", slave => { if (slave.faceShape === "masculine") { slave.faceShape = "androgynous"; } diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw index 091b42cf987..d898ae05625 100644 --- a/src/uncategorized/reRelativeRecruiter.tw +++ b/src/uncategorized/reRelativeRecruiter.tw @@ -109,7 +109,7 @@ <<set $activeSlave.lipsPiercing = 0>> <<set $activeSlave.tonguePiercing = 0>> <<set $activeSlave.vaginaPiercing = 0>> - <<set $activeSlave.scar["belly"] = 0>> + <<run delete $activeSlave.scar["belly"]>> <<set $activeSlave.clitPiercing = 0>> <<set $activeSlave.dick = 0>> <<set $activeSlave.anus = 0>> diff --git a/src/uncategorized/slaveStats.tw b/src/uncategorized/slaveStats.tw index 7ab7480f941..506b32c9d3c 100644 --- a/src/uncategorized/slaveStats.tw +++ b/src/uncategorized/slaveStats.tw @@ -323,7 +323,6 @@ slaveName: $activeSlave.slaveName /* TODO: figure out why this is being inden <br>birthsTotal: $activeSlave.counter.birthsTotal <br>pubertyAgeXX: $activeSlave.pubertyAgeXX <br>pubertyAgeXY: $activeSlave.pubertyAgeXY -<br>scars: $activeSlave.scars <br>breedingMark: $activeSlave.breedingMark <br>bodySwap: $activeSlave.bodySwap <br>HGExclude: $activeSlave.HGExclude -- GitLab