From b4b691419a74b57f8187afddc0a420f53b94b037 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Sun, 7 Mar 2021 21:00:20 -0800
Subject: [PATCH] Move remote surgery art from tab content to passage content
---
src/facilities/surgery/remoteSurgery.js | 3 ++-
src/facilities/surgery/surgeryPassageExotic.js | 2 +-
src/facilities/surgery/surgeryPassageExtreme.js | 2 +-
src/facilities/surgery/surgeryPassageFaceAndHair.js | 2 +-
src/facilities/surgery/surgeryPassageLower.js | 2 +-
src/facilities/surgery/surgeryPassageStructural.js | 2 +-
src/facilities/surgery/surgeryPassageUpper.js | 3 +--
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/facilities/surgery/remoteSurgery.js b/src/facilities/surgery/remoteSurgery.js
index 99e7fecd5b6..9e210afbed1 100644
--- a/src/facilities/surgery/remoteSurgery.js
+++ b/src/facilities/surgery/remoteSurgery.js
@@ -76,9 +76,10 @@ App.UI.SlaveInteract.remoteSurgery = function(slave) {
if (V.seeExtreme) {
tabBar.append(App.UI.tabBar.tabButton('extreme', tabCaptions.extreme));
}
+ App.Events.drawEventArt(el, slave);
el.append(App.UI.tabBar.makeTab('hair-and-face', makeSpanIded("content-hair-and-face", App.UI.surgeryPassageHairAndFace(slave))));
- el.append(App.UI.tabBar.makeTab('upper', makeSpanIded("content-upperr", App.UI.surgeryPassageUpper(slave))));
+ el.append(App.UI.tabBar.makeTab('upper', makeSpanIded("content-upper", App.UI.surgeryPassageUpper(slave))));
el.append(App.UI.tabBar.makeTab('lower', makeSpanIded("content-lower", App.UI.surgeryPassageLower(slave))));
el.append(App.UI.tabBar.makeTab('structural', makeSpanIded("content-structural", App.UI.surgeryPassageStructural(slave))));
el.append(App.UI.tabBar.makeTab('exotic', makeSpanIded("content-exotic", App.UI.surgeryPassageExotic(slave))));
diff --git a/src/facilities/surgery/surgeryPassageExotic.js b/src/facilities/surgery/surgeryPassageExotic.js
index d35d7da0bd8..378e7cbaa83 100644
--- a/src/facilities/surgery/surgeryPassageExotic.js
+++ b/src/facilities/surgery/surgeryPassageExotic.js
@@ -17,7 +17,6 @@ App.UI.surgeryPassageExotic = function(slave, cheat = false) {
his, him
} = getPronouns(slave);
- App.Events.drawEventArt(frag, slave);
frag.append(race());
if (V.geneticMappingUpgrade >= 1) {
App.UI.DOM.appendNewElement("h3", frag, `Retro-virus treatments:`);
@@ -313,6 +312,7 @@ App.UI.surgeryPassageExotic = function(slave, cheat = false) {
}
if (cheat) {
jQuery(container).empty().append(content());
+ App.Art.refreshSlaveArt(slave, 3, "art-frame");
} else {
V.surgeryType = surgeryType;
// TODO: pass if it affected health or not?
diff --git a/src/facilities/surgery/surgeryPassageExtreme.js b/src/facilities/surgery/surgeryPassageExtreme.js
index 451ab1c5c49..04e756b3da2 100644
--- a/src/facilities/surgery/surgeryPassageExtreme.js
+++ b/src/facilities/surgery/surgeryPassageExtreme.js
@@ -17,7 +17,6 @@ App.UI.surgeryPassageExtreme = function(slave, cheat = false) {
his, he, him
} = getPronouns(slave);
- App.Events.drawEventArt(frag, slave);
if (V.seeExtreme === 1) {
frag.append(fuckdoll(), chemLobotomy());
}
@@ -107,6 +106,7 @@ App.UI.surgeryPassageExtreme = function(slave, cheat = false) {
}
if (cheat) {
jQuery(container).empty().append(content());
+ App.Art.refreshSlaveArt(slave, 3, "art-frame");
} else {
V.surgeryType = surgeryType;
// TODO: pass if it affected health or not?
diff --git a/src/facilities/surgery/surgeryPassageFaceAndHair.js b/src/facilities/surgery/surgeryPassageFaceAndHair.js
index 95e71a71a82..c3d7e360f6d 100644
--- a/src/facilities/surgery/surgeryPassageFaceAndHair.js
+++ b/src/facilities/surgery/surgeryPassageFaceAndHair.js
@@ -19,7 +19,6 @@ App.UI.surgeryPassageHairAndFace = function(slave, cheat = false) {
} = getPronouns(slave);
const _artificiality = 25 - (5 * Math.trunc(V.PC.skill.medicine / 50)) - (5 * V.surgeryUpgrade);
- App.Events.drawEventArt(frag, slave);
App.UI.DOM.appendNewElement("h3", frag, `Hair:`);
frag.append(
mainHair(), eyebrows(), armpitHair()
@@ -1276,6 +1275,7 @@ App.UI.surgeryPassageHairAndFace = function(slave, cheat = false) {
}
if (cheat) {
jQuery(container).empty().append(content());
+ App.Art.refreshSlaveArt(slave, 3, "art-frame");
} else {
V.surgeryType = surgeryType;
// TODO: pass if it affected health or not?
diff --git a/src/facilities/surgery/surgeryPassageLower.js b/src/facilities/surgery/surgeryPassageLower.js
index 7392a8334bb..727d5ff865e 100644
--- a/src/facilities/surgery/surgeryPassageLower.js
+++ b/src/facilities/surgery/surgeryPassageLower.js
@@ -19,7 +19,6 @@ App.UI.surgeryPassageLower = function(slave, cheat = false) {
} = getPronouns(slave);
// const _artificiality = 25 - (5 * Math.trunc(V.PC.skill.medicine / 50)) - (5 * V.surgeryUpgrade);
- App.Events.drawEventArt(frag, slave);
App.UI.DOM.appendNewElement("h3", frag, `Butt:`);
frag.append(butt(), asshole());
@@ -947,6 +946,7 @@ App.UI.surgeryPassageLower = function(slave, cheat = false) {
}
if (cheat) {
jQuery(container).empty().append(content());
+ App.Art.refreshSlaveArt(slave, 3, "art-frame");
} else {
V.surgeryType = surgeryType;
// TODO: pass if it affected health or not?
diff --git a/src/facilities/surgery/surgeryPassageStructural.js b/src/facilities/surgery/surgeryPassageStructural.js
index deac6a2bf04..7fe48bc76dc 100644
--- a/src/facilities/surgery/surgeryPassageStructural.js
+++ b/src/facilities/surgery/surgeryPassageStructural.js
@@ -17,7 +17,6 @@ App.UI.surgeryPassageStructural = function(slave, cheat = false) {
he, him
} = getPronouns(slave);
- App.Events.drawEventArt(frag, slave);
frag.append(shoulders(), hips());
if (hasAllNaturalLimbs(slave)) {
frag.append(limbLength(), tendons());
@@ -585,6 +584,7 @@ App.UI.surgeryPassageStructural = function(slave, cheat = false) {
}
if (cheat) {
jQuery(container).empty().append(content());
+ App.Art.refreshSlaveArt(slave, 3, "art-frame");
} else {
V.surgeryType = surgeryType;
// TODO: pass if it affected health or not?
diff --git a/src/facilities/surgery/surgeryPassageUpper.js b/src/facilities/surgery/surgeryPassageUpper.js
index fca29297469..9b0f7338e72 100644
--- a/src/facilities/surgery/surgeryPassageUpper.js
+++ b/src/facilities/surgery/surgeryPassageUpper.js
@@ -18,8 +18,6 @@ App.UI.surgeryPassageUpper = function(slave, cheat = false) {
} = getPronouns(slave);
/** @type {HTMLAnchorElement[]} */
- App.Events.drawEventArt(frag, slave);
-
App.UI.DOM.appendNewElement("h3", frag, `Chest:`);
frag.append(
boobDesc(),
@@ -804,6 +802,7 @@ App.UI.surgeryPassageUpper = function(slave, cheat = false) {
}
if (cheat) {
jQuery(container).empty().append(content());
+ App.Art.refreshSlaveArt(slave, 3, "art-frame");
} else {
V.surgeryType = surgeryType;
// TODO: pass if it affected health or not?
--
GitLab