diff --git a/src/facilities/bodyModification/bodyModification.js b/src/facilities/bodyModification/bodyModification.js index 3027d2be6463945738bed93aae86af03932eef71..ed2442a706424a93f5a2ad0996628333af3a3b3c 100644 --- a/src/facilities/bodyModification/bodyModification.js +++ b/src/facilities/bodyModification/bodyModification.js @@ -433,7 +433,6 @@ App.UI.bodyModification = function(slave, cheat = false) { if (!hasAnyNaturalArms(slave)) { removeTattooLocation("upper arm"); } - if (!hasAnyNaturalArms(slave)) { removeTattooLocation("thigh"); } @@ -441,7 +440,10 @@ App.UI.bodyModification = function(slave, cheat = false) { if (slave.dick === 0 || tattooChoice === "scenes") { removeTattooLocation("dick"); } - if ((tattooChoice === "Asian art" || tattooChoice === "scenes") && slave.anusTat === "bleached") { // leave existing bleached anus alone + if (tattooChoice === "scenes") { + removeTattooLocation("lips"); + } + if ((tattooChoice === "Asian art" || tattooChoice === "scenes") || slave.anusTat === "bleached") { // leave existing bleached anus alone removeTattooLocation("anus"); } } @@ -469,7 +471,7 @@ App.UI.bodyModification = function(slave, cheat = false) { () => { for (const location of validTattooLocations) { if (slave[`${location}tattoo`] !== tattooChoice) { - applyTat(location); + applyTat(location, tattooChoice); } } refresh(); @@ -484,7 +486,7 @@ App.UI.bodyModification = function(slave, cheat = false) { App.UI.DOM.link( capFirstChar(location), () => { - applyTat(location); + applyTat(location, tattooChoice); refresh(); } ) @@ -515,10 +517,9 @@ App.UI.bodyModification = function(slave, cheat = false) { return el; - function applyTat(location) { - tattooChoice = (location === "lips" && tattooChoice === "scenes") ? "permanent makeup" : tattooChoice; - modReaction += App.Medicine.Modification.setTattoo(slave, tattooLocations.get(location), tattooChoice, cheat); - if (!["flowers", "paternalist", "tribal patterns", 0].includes(tattooChoice)) { + function applyTat(location, style) { + modReaction += App.Medicine.Modification.setTattoo(slave, tattooLocations.get(location), style, cheat); + if (!["flowers", "paternalist", "tribal patterns", 0].includes(style)) { degradation += 1; } }