Rework expire.js to use no link tooltips

src/endWeek/events/expire.js

@@ -79,16 +79,13 @@ App.Events.SEExpiration = class SEExpiration extends App.Events.BaseEvent {
 				r.push(`${He} ${hasAnyLegs(slave) ? 'stands' : 'sits'} before you dumbly, betraying no reaction to the prospect of becoming free from sexual slavery. In situations like this, it is perfectly acceptable to subject ${him} to another indenture for ${his} own good.`);
 
 				if (V.cash > 1000) {
-					App.UI.DOM.appendNewElement("div", result, App.UI.DOM.link(
-						`Plead necessity and reactivate ${his} indenture`,
-						() => {
-							keepSlave(-1000);
-							jQuery(result).empty().append(`You plead necessity and place ${him} under another indenture, paying the trivial fees left over once ${he} has been charged for ${his} own forecasted upkeep. Naturally, ${he} offers no response at all to any of this.`);
-						},
-						[],
-						"",
-						`This costs ${cashFormat(1000)}`
-					));
+					const div = document.createElement("div");
+					div.append(App.UI.DOM.link(`Plead necessity and reactivate ${his} indenture`, () => {
+						keepSlave(-1000);
+						jQuery(result).empty().append(`You plead necessity and place ${him} under another indenture, paying the trivial fees left over once ${he} has been charged for ${his} own forecasted upkeep. Naturally, ${he} offers no response at all to any of this.`);
+					}));
+					App.UI.DOM.appendNewElement("span", div, ` This costs ${cashFormat(1000)}`, ["note"]);
+					result.append(div);
 				} else {
 					App.UI.DOM.appendNewElement("div", result, `You cannot afford to do this`, ["note"]);
 				}
@@ -109,33 +106,30 @@ App.Events.SEExpiration = class SEExpiration extends App.Events.BaseEvent {
 				}
 
 				if (V.cash > 1000) {
-					App.UI.DOM.appendNewElement("div", result, App.UI.DOM.link(
-						`Enslave ${him}`,
-						() => {
-							const el = new DocumentFragment();
-							const r = [];
-							r.push(`${He}'s beside ${himself} with joy when you accept ${his} plea and enslave ${him}. ${He}'s given you the finest proof of loyalty a slave possibly can, having tasted a moment of freedom under the law, and thrown it away with utter contempt.`);
-							if (hasAnyEyes(slave)) {
-								r.push(`${His} ${App.Desc.eyesColor(slave)}`);
-								if (canSee(slave)) {
-									r.push(`${hasBothEyes(slave) ? 'watch' : 'watches'} you with`);
-								} else {
-									r.push(`${hasBothEyes(slave) ? 'are' :'is'} wide with`);
-								}
+					const div = document.createElement("div");
+					div.append(App.UI.DOM.link(`Enslave ${him}`, () => {
+						const el = new DocumentFragment();
+						const r = [];
+						r.push(`${He}'s beside ${himself} with joy when you accept ${his} plea and enslave ${him}. ${He}'s given you the finest proof of loyalty a slave possibly can, having tasted a moment of freedom under the law, and thrown it away with utter contempt.`);
+						if (hasAnyEyes(slave)) {
+							r.push(`${His} ${App.Desc.eyesColor(slave)}`);
+							if (canSee(slave)) {
+								r.push(`${hasBothEyes(slave) ? 'watch' : 'watches'} you with`);
 							} else {
-								r.push(`${His} face shows`);
+								r.push(`${hasBothEyes(slave) ? 'are' : 'is'} wide with`);
 							}
-							r.push(`eager anticipation, radiating gladness that the prospect of separation from you has gone.`);
-							App.Events.addNode(el, r);
-							slave.indenture = -1;
-							slave.indentureRestrictions = 0;
-							keepSlave(-1000);
-							jQuery(result).empty().append(el);
-						},
-						[],
-						"",
-						`This costs ${cashFormat(1000)}`
-					));
+						} else {
+							r.push(`${His} face shows`);
+						}
+						r.push(`eager anticipation, radiating gladness that the prospect of separation from you has gone.`);
+						App.Events.addNode(el, r);
+						slave.indenture = -1;
+						slave.indentureRestrictions = 0;
+						keepSlave(-1000);
+						jQuery(result).empty().append(el);
+					}));
+					App.UI.DOM.appendNewElement("span", div, ` This costs ${cashFormat(1000)}`, ["note"]);
+					result.append(div);
 				} else {
 					App.UI.DOM.appendNewElement("div", result, `You cannot afford to do this`, ["note"]);
 				}
@@ -154,16 +148,13 @@ App.Events.SEExpiration = class SEExpiration extends App.Events.BaseEvent {
 				}
 
 				if (V.cash > cost) {
-					App.UI.DOM.appendNewElement("div", result, App.UI.DOM.link(
-						`Offer ${him} a one year supplementary indenture`,
-						() => {
-							keepSlave(cost);
-							jQuery(result).empty().append(`${He} smiles almost shyly when you offer ${him} a one year supplementary indenture. The price is reasonable, but definitely favorable to you. ${He} accepts it anyway, and you transfer the money into an escrow account to be held for ${him} until ${his} new indenture is done. Your sex slave once again, ${he} awaits your pleasure without a hint of fear.`);
-						},
-						[],
-						"",
-						`This costs ${cashFormat(cost)}`
-					));
+					const div = document.createElement("div");
+					div.append(App.UI.DOM.link(`Offer ${him} a one year supplementary indenture`, () => {
+						keepSlave(cost);
+						jQuery(result).empty().append(`${He} smiles almost shyly when you offer ${him} a one year supplementary indenture. The price is reasonable, but definitely favorable to you. ${He} accepts it anyway, and you transfer the money into an escrow account to be held for ${him} until ${his} new indenture is done. Your sex slave once again, ${he} awaits your pleasure without a hint of fear.`);
+					}));
+					App.UI.DOM.appendNewElement("span", div, ` This costs ${cashFormat(cost)}`, ["note"]);
+					result.append(div);
 				} else {
 					App.UI.DOM.appendNewElement("div", result, `You cannot afford to do this`, ["note"]);
 				}
@@ -172,16 +163,13 @@ App.Events.SEExpiration = class SEExpiration extends App.Events.BaseEvent {
 				r.push(`${!hasAnyLegs(slave) ? 'Propped up' : 'Standing before you'} at the moment of ${his} scheduled emancipation, ${he} seems willing to consider a short term continuation of service.`);
 
 				if (V.cash > cost) {
-					App.UI.DOM.appendNewElement("div", result, App.UI.DOM.link(
-						`Offer ${him} a one year supplementary indenture`,
-						() => {
-							keepSlave(cost);
-							jQuery(result).empty().append(`${He} looks pensive when you offer ${him} a one year supplementary indenture. The price reflects the market, and is a reasonable compensation for a year of sexual slavery. ${He} accepts it after some consideration, and you transfer the money into an escrow account to be held for ${him} until ${his} new indenture is done. Your sex slave once again, ${he} awaits orders with complacency.`);
-						},
-						[],
-						"",
-						`This costs ${cashFormat(cost)}`
-					));
+					const div = document.createElement("div");
+					div.append(App.UI.DOM.link(`Offer ${him} a one year supplementary indenture`, () => {
+						keepSlave(cost);
+						jQuery(result).empty().append(`${He} looks pensive when you offer ${him} a one year supplementary indenture. The price reflects the market, and is a reasonable compensation for a year of sexual slavery. ${He} accepts it after some consideration, and you transfer the money into an escrow account to be held for ${him} until ${his} new indenture is done. Your sex slave once again, ${he} awaits orders with complacency.`);
+					}));
+					App.UI.DOM.appendNewElement("span", div, ` This costs ${cashFormat(cost)}`, ["note"]);
+					result.append(div);
 				} else {
 					App.UI.DOM.appendNewElement("div", result, `You cannot afford to do this`, ["note"]);
 				}