diff --git a/src/003-assets/CSS/tooltip.css b/src/003-assets/CSS/tooltip.css
index 8246aae0c3bc3309c15ea13f4ecfe92aac2b447f..719d9e6bd315955439b5c7480bf150a143fec72a 100644
--- a/src/003-assets/CSS/tooltip.css
+++ b/src/003-assets/CSS/tooltip.css
@@ -58,13 +58,13 @@
z-index: 999;
}
-body.tooltipsEnabled .exampleTooltip:hover:after, body.tooltipsEnabled .devotion:hover:after, body.tooltipsEnabled .trust:hover:after, body.tooltipsEnabled .defiant:hover:after {
+div.tooltipsEnabled .exampleTooltip:hover:after, div.tooltipsEnabled .devotion:hover:after, div.tooltipsEnabled .trust:hover:after, div.tooltipsEnabled .defiant:hover:after {
visibility: visible;
opacity: 1;
bottom: 20px;
}
-body.tooltipsEnabled .exampleTooltip:hover:before, body.tooltipsEnabled .devotion:hover:before, body.tooltipsEnabled .trust:hover:before, body.tooltipsEnabled .defiant:hover:before {
+div.tooltipsEnabled .exampleTooltip:hover:before, div.tooltipsEnabled .devotion:hover:before, div.tooltipsEnabled .trust:hover:before, div.tooltipsEnabled .defiant:hover:before {
visibility: visible;
opacity: 1;
bottom: 15px;
diff --git a/src/gui/css/mainStyleSheet.css b/src/gui/css/mainStyleSheet.css
index 7cd035141c268e0f39999968115699385fed4caf..ca8dc24c17aa2d6f3347892a3f440be41897ec44 100644
--- a/src/gui/css/mainStyleSheet.css
+++ b/src/gui/css/mainStyleSheet.css
@@ -210,7 +210,7 @@ span.zeroButton > a:hover { text-decoration: none; }
.mediumorchid, .mediumorchid a, .devotion.dec, .devotion.dec a, .devotion.resistant, .devotion.resistant a { color: mediumorchid }
.mediumseagreen, .mediumseagreen a, .trust.trusting, .trust.trusting a { color: mediumseagreen }
.orange, .orange a, .stupid, .stupid a, .change.negative, .change.negative a, .defiant.careful, .defiant.careful a, .intro.question { color: orange } /* generally between red and green, and a lot of other places */
-.orangered, .orangered a, .defiant.inc, .defiant.inc a, .defiant.bold, .defiant.bold, education.neg a { color: orangered }
+.orangered, .orangered a, .defiant.inc, .defiant.inc a, .defiant.bold, .defiant.bold, .education.neg a { color: orangered }
.orchid, .orchid a { color: orchid } /* used once (wrong? */
.pink, .pink a, .slave.name.simple { color: pink } /* also fetish start ??? , and a lot of other stuff */
.red, .red a, .health.dec, .health.dec a, .cash.dec, .cash.dec a, .flaw.gain, .flaw.gain a, .error, .error a, .elites.loss, .elites.loss a, .reputation.dec, .reputation.dec a, .warning, .warning a { color: red } /* also generally bad stuff */
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 13afca367d9fd99086bc6d027aabe43b4f9e5dfe..a989a807b5160389accaf5d9988b1a84c8c82f43 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -2092,9 +2092,9 @@ window.SectorCounts = function() {
const apartments = V.building.findCells(cell => cell instanceof App.Arcology.Cell.Apartment);
apartments.forEach(a => {
- if (a.type === "Apartments") {
+ if (a.type === 2) {
V.AProsperityCap += 10;
- } else if (a.type === "Luxury Apartments") {
+ } else if (a.type === 1) {
V.AProsperityCap += 15;
}
});
diff --git a/src/js/utilsDOM.js b/src/js/utilsDOM.js
index c55aefbe02fa7b743847538adb58a1021591d372..9a1469dfc5bf94eda201d03c1bdd1219fef8cdd4 100644
--- a/src/js/utilsDOM.js
+++ b/src/js/utilsDOM.js
@@ -172,15 +172,13 @@ App.Utils.passageElement = function(passage) {
};
/**
- * @param {Node[]} nodes
+ * @param {Node|string} content
* @returns {DocumentFragment}
*/
-App.UI.DOM.combineNodes = function(...nodes) {
- let res = document.createDocumentFragment();
- for (const n of nodes) {
- res.appendChild(n);
- }
- return res;
+App.UI.DOM.combineNodes = function(...content) {
+ let fragment = document.createDocumentFragment();
+ fragment.append(...content);
+ return fragment;
};
/**
@@ -198,8 +196,8 @@ App.Utils.htmlToElement = function(text) {
/*
* Shows tooltips if they are enabled. Must be called on every passage load, because <body> gets reset.
*/
-$(document).on(":passageend", () => {
+$(document).on(":passagestart", event => {
if (V.tooltipsEnabled === 1) {
- document.body.classList.add("tooltipsEnabled");
+ event.content.classList.add("tooltipsEnabled");
}
});
diff --git a/src/uncategorized/reAnalPunishment.tw b/src/uncategorized/reAnalPunishment.tw
index 5a27c5cd99235ece0304dcfd9f90395adeeb8240..5da9876058b7b27a1429f889efe319f375887dcd 100644
--- a/src/uncategorized/reAnalPunishment.tw
+++ b/src/uncategorized/reAnalPunishment.tw
@@ -1,6 +1,6 @@
:: RE anal punishment [nobr]
-<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "RIE Eligibility Check">>
+<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Next Week">>
<<set $activeSlave = $eventSlave>>
<<setLocalPronouns $activeSlave>>