From 74e26386e573508664e1ebe45fa7239af5586c6f Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sun, 15 Nov 2020 20:35:50 -0500
Subject: [PATCH] typing for actX
---
devTools/types/FC/misc.d.ts | 5 +++--
src/js/sexActsJS.js | 6 +++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/devTools/types/FC/misc.d.ts b/devTools/types/FC/misc.d.ts
index f87d71ab846..ffdc266b34a 100644
--- a/devTools/types/FC/misc.d.ts
+++ b/devTools/types/FC/misc.d.ts
@@ -2,9 +2,10 @@ declare namespace FC {
type SlaveSchoolName = "GRI" | "HA" | "NUL" | "SCP" | "TCR" | "TFS" | "TGA" | "TSS" | "LDE" | "TUO";
type LawlessMarkets = "generic" | "gangs and smugglers" | "heap" | "indentures" | "low tier criminals" | "military prison" | "neighbor" |
"wetware" | "white collar" | SlaveSchoolName;
- type SlaveMarketName = LawlessMarkets | "corporate";
+ type SlaveMarketName = LawlessMarkets | "corporate";
type Gingering = Zeroable<"antidepressant" | "depressant" | "stimulant" | "vasoconstrictor" | "vasodilator" | "aphrodisiac" | "ginger">;
type GingeringDetection = Zeroable<"slaver" | "mercenary" | "force">;
+ type SlaveActs = "PCChildrenFathered" | "PCKnockedUp" | "anal" | "births" | "birthsTotal" | "cum" | "laborCount" | "mammary" | "milk" | "oral" | "penetrative" | "pitKills" | "miscarriages" | "publicUse" | "slavesFathered" | "slavesKnockedUp" | "vaginal" | "abortions" | "birth";
namespace SlaveSummary {
interface SmartPiercing {
@@ -28,7 +29,7 @@ declare namespace FC {
women: string,
"anti-men": string,
"anti-women": string,
- }
+ };
}
}
}
diff --git a/src/js/sexActsJS.js b/src/js/sexActsJS.js
index b0b2ba35957..2ac83c9b51b 100644
--- a/src/js/sexActsJS.js
+++ b/src/js/sexActsJS.js
@@ -416,7 +416,7 @@ globalThis.SimpleSexAct = (function() {
/**
* Increments a slave's personal counter and the global counter for a particular action.
* @param {App.Entity.SlaveState | App.Entity.PlayerState} slave
- * @param {string} act oral, anal, etc
+ * @param {FC.SlaveActs} act oral, anal, etc
* @param {number} count
*/
globalThis.actX = function(slave, act, count = 1) {
@@ -481,9 +481,9 @@ globalThis.actX = function(slave, act, count = 1) {
/**
* Sex is between two. This is a handy wrapper for actX that emphasizes that.
* @param {App.Entity.SlaveState} slave1 always a slave
- * @param {string} act1 oral, anal, etc
+ * @param {FC.SlaveActs} act1 oral, anal, etc
* @param {FC.HumanState | "public" | "slaves"} slave2 slave or PC or "public"
- * @param {string} act2 oral, anal, etc
+ * @param {FC.SlaveActs} act2 oral, anal, etc
* @param {number} [count=1]
*/
globalThis.seX = function(slave1, act1, slave2, act2, count = 1) {
--
GitLab