From 726494b189ec15f8d1cf7fc786fa001bb73e28ee Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Thu, 21 Oct 2021 14:19:04 -0700
Subject: [PATCH 1/3] Clean up old event stuff
---
devTools/types/FC/gameState.d.ts | 23 ++-----------
src/endWeek/nextWeek/nextWeek.js | 5 ++-
src/endWeek/nextWeek/resetGlobals.js | 27 ---------------
src/js/eventSelectionJS.js | 50 ----------------------------
4 files changed, 7 insertions(+), 98 deletions(-)
delete mode 100644 src/endWeek/nextWeek/resetGlobals.js
delete mode 100644 src/js/eventSelectionJS.js
diff --git a/devTools/types/FC/gameState.d.ts b/devTools/types/FC/gameState.d.ts
index 8422c6fa492..f2eda956125 100644
--- a/devTools/types/FC/gameState.d.ts
+++ b/devTools/types/FC/gameState.d.ts
@@ -26,23 +26,6 @@ declare namespace FC {
"expectant mothers" | "dissolute sissies" | "reassignment candidates" | "other arcologies";
interface DeprecatedGameVariables {
- /** @deprecated */
- events: string[];
- /** @deprecated */
- RESSevent: string[];
- /** @deprecated */
- RESSTRevent: string[];
- /** @deprecated */
- RETSevent: string[];
- /** @deprecated */
- RECIevent: string[];
- /** @deprecated */
- REFIevent: string[];
- /** @deprecated */
- PESSevent: string[];
- /** @deprecated */
- PETSevent: string[];
-
/** @deprecated */
surgeryType: string;
@@ -79,8 +62,6 @@ declare namespace FC {
slavesToImportMax?: number;
- degradation?: number;
-
activeArcologyIdx?: number;
passageSwitchHandler?: () => void;
@@ -110,8 +91,10 @@ declare namespace FC {
milkmaidTrustBonus?: number;
milkmaidHealthBonus?: number;
+ activeSlave: Zeroable<SlaveState>;
+ event?: InstanceType<typeof App.Events.BaseEvent>;
AS: number;
- seed?: number;
+ seed?: string;
applyCareerBonus?: Bool;
careerBonusNeeded?: number[];
prostheticsConfig?: string;
diff --git a/src/endWeek/nextWeek/nextWeek.js b/src/endWeek/nextWeek/nextWeek.js
index 8814ed472cb..7b04f74b1b5 100644
--- a/src/endWeek/nextWeek/nextWeek.js
+++ b/src/endWeek/nextWeek/nextWeek.js
@@ -341,7 +341,10 @@ App.EndWeek.nextWeek = function() {
V.pit.fought = false;
}
- App.EndWeek.resetGlobals();
+ V.activeSlave = 0;
+
+ // delete endweek flag
+ delete V.endweekFlag;
if (V.autosave !== 0) {
// @ts-ignore
diff --git a/src/endWeek/nextWeek/resetGlobals.js b/src/endWeek/nextWeek/resetGlobals.js
deleted file mode 100644
index 90baae6510c..00000000000
--- a/src/endWeek/nextWeek/resetGlobals.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * These are variables that either should be made into temp vars or should be Zeroed out once done with them instead of here. This can also interfere with debugging or hide NaN's as zeroing things out would clear a NaN. Also could stop from NaN's getting worse?
- */
-App.EndWeek.resetGlobals = function() {
- // Other arrays
- V.events = [];
- V.RESSevent = [];
- V.RESSTRevent = [];
- V.RETSevent = [];
- V.RECIevent = [];
- V.REFIevent = [];
- V.PESSevent = [];
- V.PETSevent = [];
-
- // Slave Objects using 0 instead of null. Second most memory eaten up.
- V.activeSlave = 0;
- V.eventSlave = 0;
-
- // Strings Memory varies.
- V.desc = "";
- V.event = "";
-
- // delete endweek flag
- delete V.endweekFlag;
-
- // Done with zeroing out, what should be for the most part Temps
-};
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
deleted file mode 100644
index be392c8eb97..00000000000
--- a/src/js/eventSelectionJS.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * STANDARD EVENTS
- * @param {App.Entity.SlaveState} eventSlave
- */
-globalThis.generateRandomEventPool = function(eventSlave) {
- if (eventSlave.fetish !== "mindbroken") {
- if (hasAnyArms(eventSlave) && hasAnyLegs(eventSlave)) {
- if (canTalk(eventSlave)) {
- if (eventSlave.assignment !== Job.QUARTER) {
- /*
-if(eventSlave.drugs === "breast injections") {
- if(eventSlave.anus > 0 || eventSlave.vagina > 0) {
- if(eventSlave.devotion <= 50) {
- if(eventSlave.devotion >= -20) {
- if(eventSlave.trust >= -50) {
- if(V.REReductionCheckinIDs.includes(eventSlave.ID)) {
- V.RECIevent.push("reduction");
- }
- }
- }
- }
- }
-}
-*/
- }
- } /* closes mute exempt */
- } /* closes amp/crawling exempt */
- } /* closes mindbreak exempt */
-};
-
-globalThis.populateEventArray = function(RESS = V.RESSevent.length, RESSTR = V.RESSTRevent.length, RETS = V.RETSevent.length, RECI = V.RECIevent.length) {
- /* EVENT RANDOMIZATION */
- let events = V.events;
- let i = 0;
-
- for (i = 0; i < RESS; i++) {
- events.push("RESS");
- }
- for (i = 0; i < RESSTR; i++) {
- events.push("RESSTR");
- }
- for (i = 0; i < RETS; i++) {
- events.push("RETS");
- }
- for (i = 0; i < RECI; i++) {
- events.push("RECI");
- }
-
- return events;
-};
--
GitLab
From f971a41fd3bf76492e81feb565547c112d94e33a Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Thu, 21 Oct 2021 14:22:56 -0700
Subject: [PATCH 2/3] endweek flag type
---
devTools/types/FC/gameState.d.ts | 1 +
1 file changed, 1 insertion(+)
diff --git a/devTools/types/FC/gameState.d.ts b/devTools/types/FC/gameState.d.ts
index f2eda956125..8ecaf5d2105 100644
--- a/devTools/types/FC/gameState.d.ts
+++ b/devTools/types/FC/gameState.d.ts
@@ -102,6 +102,7 @@ declare namespace FC {
oldLimbs: any;
heroSlaves: SlaveTemplate[];
+ endweekFlag?: boolean;
}
export interface GameVariables extends DefaultGameStateVariables, ResetOnNGPVariables,
--
GitLab
From b7abeea9b0f15add66cba7a6c8e1904c65e72242 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Thu, 21 Oct 2021 14:32:19 -0700
Subject: [PATCH 3/3] When redrawing reminders, leave links alive if we're
allowed to use them.
---
src/Mods/Reminder/reminder.js | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/Mods/Reminder/reminder.js b/src/Mods/Reminder/reminder.js
index 8482eaabb8a..ad3db63521f 100644
--- a/src/Mods/Reminder/reminder.js
+++ b/src/Mods/Reminder/reminder.js
@@ -53,10 +53,7 @@ App.Reminders = (function() {
const outerSpan = document.createElement("span");
function replace() {
- App.UI.DOM.replace(outerSpan, list({
- maxFuture: maxFuture,
- filter: filter
- }));
+ App.UI.DOM.replace(outerSpan, list({maxFuture, filter, link}));
App.Utils.scheduleSidebarRefresh();
}
--
GitLab