From 064172bf9ff102b204869f49bc3f8ad70865b5d5 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 14 Dec 2020 10:24:43 -0500
Subject: [PATCH] Allow display and removal of belly tat even for unfit
surfaces
---
.../bodyModification/bodyModification.js | 36 +++++++++----------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/facilities/bodyModification/bodyModification.js b/src/facilities/bodyModification/bodyModification.js
index e767b43b542..31dbd261393 100644
--- a/src/facilities/bodyModification/bodyModification.js
+++ b/src/facilities/bodyModification/bodyModification.js
@@ -529,18 +529,30 @@ App.UI.bodyModification = function(slave, cheat = false) {
const el = new DocumentFragment();
let linkArray = [];
let r = [];
+
+ // Has tat, display option to remove
+ if (slave.bellyTat !== 0) {
+ r.push(`${His} navel is tattooed with ${slave.bellyTat}.`);
+ linkArray.push(
+ App.UI.DOM.link(
+ "Remove tattoos",
+ () => {
+ tattooChoice = 0;
+ modReaction += App.Medicine.Modification.setTattoo(slave, "belly", tattooChoice);
+ refresh();
+ }
+ )
+ );
+ }
+
if (slave.belly >= 10000 && slave.bellyPreg < 450000 && slave.bellyFluid < 5000) {
- if (slave.bellyTat === 0) {
- r.push(`${He} has no navel tattoos.`);
- } else {
- r.push(`${His} navel is tattooed with ${slave.bellyTat}.`);
- }
if (slave.bellyTat === 0) {
const bellyTats = new Map([
["Heart", "a heart"],
["Star", "a star"],
["Butterfly", "a butterfly"],
]);
+ r.push(`${He} has no navel tattoos.`);
for (const [title, value] of bellyTats) {
linkArray.push(
App.UI.DOM.link(
@@ -554,19 +566,6 @@ App.UI.bodyModification = function(slave, cheat = false) {
);
}
}
- if (slave.bellyTat !== 0) {
- linkArray.push(
- App.UI.DOM.link(
- "Remove tattoos",
- () => {
- tattooChoice = 0;
- modReaction += App.Medicine.Modification.setTattoo(slave, "belly", tattooChoice);
- refresh();
- }
- )
- );
- }
- r.push(App.UI.DOM.generateLinksStrip(linkArray));
} else if (slave.bellyPreg >= 450000) {
r.push(`${His} middle is large and taut enough to be a suitable canvas for a navel focused tattoo, but ${his} brood is too active to permit the needle to do its work.`);
} else if (slave.bellyFluid >= 10000) {
@@ -574,6 +573,7 @@ App.UI.bodyModification = function(slave, cheat = false) {
} else {
r.push(`${His} middle isn't large enough to be a suitable canvas for a navel focused tattoo.`);
}
+ r.push(App.UI.DOM.generateLinksStrip(linkArray));
App.Events.addNode(el, r, "div");
r = [];
--
GitLab