From fc848c0da8ea41589dc5a86085deaa74e8d02b42 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sun, 14 Jun 2020 00:59:42 -0400
Subject: [PATCH] origin function
---
src/js/assayJS.js | 9 +++++++++
src/npc/descriptions/longSlave.js | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 3e4d8688912..7a2ca939872 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -410,6 +410,15 @@ globalThis.getNonlocalPronouns = function(dickRatio) {
return getPronouns(slave);
};
+/** Get the origin for a given slave, with the correct pronouns.
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string}
+ */
+globalThis.getSlaveOrigins = function(slave) {
+ const pronouns = getPronouns(slave);
+ return slave.origin.replace(/\$([A-Z]?[a-z]+)/g, (match, cap1) => pronouns[cap1] || match);
+};
+
/** Get the written title for a given slave, without messing with global state.
* @param {App.Entity.SlaveState} slave
* @returns {string}
diff --git a/src/npc/descriptions/longSlave.js b/src/npc/descriptions/longSlave.js
index 48ad254048e..bd2be161078 100644
--- a/src/npc/descriptions/longSlave.js
+++ b/src/npc/descriptions/longSlave.js
@@ -169,7 +169,7 @@ App.Desc.longSlave = function({slave = V.activeSlave, saleDescription = V.saleDe
if (saleDescription === 0) {
if (slave.origin !== 0) {
- r.push(`${slave.origin}`);
+ r.push(getSlaveOrigins(slave));
}
}
--
GitLab