From 3514ff0bc637bd66f4cb674eb7dc90afacabcb26 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Mon, 6 Jul 2020 18:15:37 -0700
Subject: [PATCH] Fix coursing association policy display, a missing sigil, and
some jsdoc.
---
js/003-data/policiesData.js | 16 ++++++----------
src/js/utilsDOM.js | 2 +-
src/npc/surgery/organFarm.js | 2 +-
src/personalAssistant/assistantOptions.tw | 2 +-
4 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/js/003-data/policiesData.js b/js/003-data/policiesData.js
index 48afb0e2643..a16a4b8da04 100644
--- a/js/003-data/policiesData.js
+++ b/js/003-data/policiesData.js
@@ -480,24 +480,20 @@ App.Data.Policies.Selection = {
title: "Coursing Association",
text: "you will sponsor a Coursing Association that will hold monthly races.",
get activatedText() {
- const el = new DocumentFragment;
+ const el = new DocumentFragment();
el.append(`you are sponsoring a `);
- el.append(App.UI.DOM.link(
- "Coursing Association",
- () => { },
- [],
- "Coursing Association"
- ));
+ el.append(App.UI.DOM.passageLink("Coursing Association", "Coursing Association"));
el.append(` that will hold monthly races.`);
return el;
},
get note() { return `Will cost ${cashFormat(1000)} weekly to maintain`; },
get activatedNote() {
+ const el = new DocumentFragment();
if (V.LurcherID !== 0) {
- return `Your current lurcher is ${App.UI.slaveDescriptionDialog(getSlave(V.LurcherID))}`;
- } else {
- return ``;
+ el.append(`Your current lurcher is `);
+ el.append(App.UI.DOM.slaveDescriptionDialog(getSlave(V.LurcherID)));
}
+ return el;
}
}
],
diff --git a/src/js/utilsDOM.js b/src/js/utilsDOM.js
index bb016cc5a2f..27531125aa8 100644
--- a/src/js/utilsDOM.js
+++ b/src/js/utilsDOM.js
@@ -188,7 +188,7 @@ App.Utils.passageElement = function(passage) {
};
/**
- * @param {Node|string} content
+ * @param {(Node|string)[]} content
* @returns {DocumentFragment}
*/
App.UI.DOM.combineNodes = function(...content) {
diff --git a/src/npc/surgery/organFarm.js b/src/npc/surgery/organFarm.js
index ec09f300f84..20454e84b15 100644
--- a/src/npc/surgery/organFarm.js
+++ b/src/npc/surgery/organFarm.js
@@ -172,7 +172,7 @@ App.Medicine.OrganFarm.removeOrgan = function(slave, type) {
* Organs the that can be implanted on the slave, sorted by dependencies first
*
* @param {App.Entity.SlaveState} slave
- * @returns {[string]}
+ * @returns {string[]}
*/
App.Medicine.OrganFarm.getSortedOrgans = function(slave) {
const F = App.Medicine.OrganFarm;
diff --git a/src/personalAssistant/assistantOptions.tw b/src/personalAssistant/assistantOptions.tw
index 67e449706bf..ef4550e6d13 100644
--- a/src/personalAssistant/assistantOptions.tw
+++ b/src/personalAssistant/assistantOptions.tw
@@ -938,7 +938,7 @@ Seated at your desk, you glance at the visual representation of
<<link _text "Personal assistant options">>
<<set $assistant.Extra2 = 1>>
<<if $PC.skill.hacking < 75>>
- <<run cashX(Math.trunc(-price), "capEx")>>
+ <<run cashX(Math.trunc(-_price), "capEx")>>
<</if>>
<<goto "Assistant Appearance Pack Two">>
<</link>> //<<if $PC.skill.hacking < 75>> Costs <<= num(_price)>> <<else>> Unencrypted files, ripe for the taking<</if>>//
--
GitLab