isaacscript-common 7.16.2 → 7.17.1

package/dist/features/disableInputs.d.ts

@@ -8,6 +8,19 @@ export declare function disableInputsInit(mod: Mod): void;
  *            that multiple mod features can work in tandem.
  */
 export declare function enableAllInputs(key: string): void;
+/**
+ * Helper function to disable specific inputs, like opening the console.
+ *
+ * This function is variadic, meaning that you can pass as many inputs as you want to disable. (To
+ * disable all inputs, see the `disableAllInputs` function.
+ *
+ * Use the `enableAllInputs` helper function to set things back to normal.
+ *
+ * @param key The name of the mod feature that is requesting the enable/disable. This is needed so
+ *            that multiple mod features can work in tandem.
+ * @param buttonActions An array of the actions to action.
+ */
+export declare function disableInputs(key: string, ...buttonActions: ButtonAction[]): void;
 /**
  * Helper function to disable all inputs. This is useful because `EntityPlayer.ControlsEnabled` can
  * be changed by the game under certain conditions.

package/dist/features/disableInputs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"disableInputs.d.ts","sourceRoot":"","sources":["../../src/features/disableInputs.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,8BAA8B,CAAC;AAiBtC,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAoBhD;AA+CD;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAKjD;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAKlD;AAED;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,WAAW,CAAC,YAAY,CAAC,GACvD,IAAI,CAKN;AAED;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,WAAW,CAAC,YAAY,CAAC,GACvD,IAAI,CAKN;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAGvD;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAGvD"}
+{"version":3,"file":"disableInputs.d.ts","sourceRoot":"","sources":["../../src/features/disableInputs.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,8BAA8B,CAAC;AA0BtC,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAoBhD;AAqDD;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAKjD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAC3B,GAAG,EAAE,MAAM,EACX,GAAG,aAAa,EAAE,YAAY,EAAE,GAC/B,IAAI,CAKN;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAKlD;AAED;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,WAAW,CAAC,YAAY,CAAC,GACvD,IAAI,CAKN;AAED;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,WAAW,CAAC,YAAY,CAAC,GACvD,IAAI,CAKN;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAGvD;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAGvD"}

package/dist/features/disableInputs.lua

@@ -32,12 +32,17 @@ function getReturnValue(self, buttonAction, booleanCallback)
         ____booleanCallback_0 = 0
     end
     local disableValue = ____booleanCallback_0
-    for ____, whitelist in __TS__Iterator(v.run.disableInputsWithWhitelistMap:values()) do
+    for ____, blacklist in __TS__Iterator(v.run.disableInputs:values()) do
+        if blacklist:has(buttonAction) then
+            return disableValue
+        end
+    end
+    for ____, whitelist in __TS__Iterator(v.run.disableAllInputsWithWhitelistMap:values()) do
         if not whitelist:has(buttonAction) then
             return disableValue
         end
     end
-    for ____, blacklist in __TS__Iterator(v.run.enableInputsWithBlacklistMap:values()) do
+    for ____, blacklist in __TS__Iterator(v.run.enableAllInputsWithBlacklistMap:values()) do
         if blacklist:has(buttonAction) then
             return disableValue
         end
@@ -46,8 +51,9 @@ function getReturnValue(self, buttonAction, booleanCallback)
 end
 local FEATURE_NAME = "disableInputs"
 v = {run = {
-    disableInputsWithWhitelistMap = __TS__New(Map),
-    enableInputsWithBlacklistMap = __TS__New(Map)
+    disableInputs = __TS__New(Map),
+    enableAllInputsWithBlacklistMap = __TS__New(Map),
+    disableAllInputsWithWhitelistMap = __TS__New(Map)
 }}
 function ____exports.disableInputsInit(self, mod)
     saveDataManager(nil, FEATURE_NAME, v)
@@ -62,8 +68,24 @@ end
 -- that multiple mod features can work in tandem.
 function ____exports.enableAllInputs(self, key)
     errorIfFeaturesNotInitialized(nil, FEATURE_NAME)
-    v.run.disableInputsWithWhitelistMap:delete(key)
-    v.run.enableInputsWithBlacklistMap:delete(key)
+    v.run.disableAllInputsWithWhitelistMap:delete(key)
+    v.run.enableAllInputsWithBlacklistMap:delete(key)
+end
+--- Helper function to disable specific inputs, like opening the console.
+-- 
+-- This function is variadic, meaning that you can pass as many inputs as you want to disable. (To
+-- disable all inputs, see the `disableAllInputs` function.
+-- 
+-- Use the `enableAllInputs` helper function to set things back to normal.
+-- 
+-- @param key The name of the mod feature that is requesting the enable/disable. This is needed so
+-- that multiple mod features can work in tandem.
+-- @param buttonActions An array of the actions to action.
+function ____exports.disableInputs(self, key, ...)
+    local buttonActions = {...}
+    errorIfFeaturesNotInitialized(nil, FEATURE_NAME)
+    local buttonActionsSet = __TS__New(Set, buttonActions)
+    v.run.disableInputs:set(key, buttonActionsSet)
 end
 --- Helper function to disable all inputs. This is useful because `EntityPlayer.ControlsEnabled` can
 -- be changed by the game under certain conditions.
@@ -74,11 +96,11 @@ end
 -- that multiple mod features can work in tandem.
 function ____exports.disableAllInputs(self, key)
     errorIfFeaturesNotInitialized(nil, FEATURE_NAME)
-    v.run.disableInputsWithWhitelistMap:set(
+    v.run.disableAllInputsWithWhitelistMap:set(
         key,
         __TS__New(Set)
     )
-    v.run.enableInputsWithBlacklistMap:delete(key)
+    v.run.enableAllInputsWithBlacklistMap:delete(key)
 end
 --- Helper function to enable all inputs besides the ones provided. This is useful because
 -- `EntityPlayer.ControlsEnabled` can be changed by the game under certain conditions.
@@ -90,8 +112,8 @@ end
 -- @param blacklist A set of ButtonActions to disallow.
 function ____exports.enableAllInputsExceptFor(self, key, blacklist)
     errorIfFeaturesNotInitialized(nil, FEATURE_NAME)
-    v.run.disableInputsWithWhitelistMap:delete(key)
-    v.run.enableInputsWithBlacklistMap:set(key, blacklist)
+    v.run.disableAllInputsWithWhitelistMap:delete(key)
+    v.run.enableAllInputsWithBlacklistMap:set(key, blacklist)
 end
 --- Helper function to disable all inputs besides the ones provided. This is useful because
 -- `EntityPlayer.ControlsEnabled` can be changed by the game under certain conditions.
@@ -103,8 +125,8 @@ end
 -- @param whitelist A set of ButtonActions to allow.
 function ____exports.disableAllInputsExceptFor(self, key, whitelist)
     errorIfFeaturesNotInitialized(nil, FEATURE_NAME)
-    v.run.disableInputsWithWhitelistMap:set(key, whitelist)
-    v.run.enableInputsWithBlacklistMap:delete(key)
+    v.run.disableAllInputsWithWhitelistMap:set(key, whitelist)
+    v.run.enableAllInputsWithBlacklistMap:delete(key)
 end
 --- Helper function to disable only the inputs used for moving the character (or moving the cursor in
 -- the UI). This is useful because `EntityPlayer.ControlsEnabled` can be changed by the game under

package/dist/features/pause.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pause.d.ts","sourceRoot":"","sources":["../../src/features/pause.ts"],"names":[],"mappings":";AAuCA,wBAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAUxC;AA2DD;;;;;;;GAOG;AACH,wBAAgB,KAAK,IAAI,IAAI,CA8C5B;AAED,wFAAwF;AACxF,wBAAgB,OAAO,IAAI,IAAI,CAqB9B"}
+{"version":3,"file":"pause.d.ts","sourceRoot":"","sources":["../../src/features/pause.ts"],"names":[],"mappings":";AAuCA,wBAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAUxC;AA2DD;;;;;;;GAOG;AACH,wBAAgB,KAAK,IAAI,IAAI,CA8C5B;AAED,wFAAwF;AACxF,wBAAgB,OAAO,IAAI,IAAI,CAsB9B"}

package/dist/functions/utils.lua

@@ -19,12 +19,12 @@ function hexToRGB(self, hexString)
     if r == nil then
         error(("Failed to convert `0x" .. rString) .. "` to a number.")
     end
-    local gString = __TS__StringSubstring(hexString, 2, 2)
+    local gString = __TS__StringSubstring(hexString, 2, 4)
     local g = tonumber("0x" .. gString)
     if g == nil then
         error(("Failed to convert `0x" .. gString) .. "` to a number.")
     end
-    local bString = __TS__StringSubstring(hexString, 4, 2)
+    local bString = __TS__StringSubstring(hexString, 4, 6)
     local b = tonumber("0x" .. bString)
     if b == nil then
         error(("Failed to convert `0x" .. bString) .. "` to a number.")

package/dist/lualib_bundle.lua

@@ -1207,6 +1207,16 @@ local function __TS__InstanceOfObject(value)
     return valueType == "table" or valueType == "function"
 end
 
+local function __TS__LuaIteratorSpread(self, state, firstKey)
+    local results = {}
+    local key, value = self(state, firstKey)
+    while key do
+        results[#results + 1] = {key, value}
+        key, value = self(state, key)
+    end
+    return __TS__Unpack(results)
+end
+
 local Map
 do
     Map = __TS__Class()
@@ -2448,6 +2458,7 @@ return {
   __TS__InstanceOf = __TS__InstanceOf,
   __TS__InstanceOfObject = __TS__InstanceOfObject,
   __TS__Iterator = __TS__Iterator,
+  __TS__LuaIteratorSpread = __TS__LuaIteratorSpread,
   Map = Map,
   __TS__MathAtan2 = __TS__MathAtan2,
   __TS__MathSign = __TS__MathSign,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "7.16.2",
+  "version": "7.17.1",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",

package/src/features/disableInputs.ts

@@ -12,10 +12,19 @@ const FEATURE_NAME = "disableInputs";
 const v = {
   run: {
     /** Indexed by the requesting feature key. */
-    disableInputsWithWhitelistMap: new Map<string, ReadonlySet<ButtonAction>>(),
+    disableInputs: new Map<string, ReadonlySet<ButtonAction>>(),
 
     /** Indexed by the requesting feature key. */
-    enableInputsWithBlacklistMap: new Map<string, ReadonlySet<ButtonAction>>(),
+    enableAllInputsWithBlacklistMap: new Map<
+      string,
+      ReadonlySet<ButtonAction>
+    >(),
+
+    /** Indexed by the requesting feature key. */
+    disableAllInputsWithWhitelistMap: new Map<
+      string,
+      ReadonlySet<ButtonAction>
+    >(),
   },
 };
 
@@ -71,13 +80,19 @@ function getActionValue(
 function getReturnValue(buttonAction: ButtonAction, booleanCallback: boolean) {
   const disableValue = booleanCallback ? false : 0;
 
-  for (const whitelist of v.run.disableInputsWithWhitelistMap.values()) {
+  for (const blacklist of v.run.disableInputs.values()) {
+    if (blacklist.has(buttonAction)) {
+      return disableValue;
+    }
+  }
+
+  for (const whitelist of v.run.disableAllInputsWithWhitelistMap.values()) {
     if (!whitelist.has(buttonAction)) {
       return disableValue;
     }
   }
 
-  for (const blacklist of v.run.enableInputsWithBlacklistMap.values()) {
+  for (const blacklist of v.run.enableAllInputsWithBlacklistMap.values()) {
     if (blacklist.has(buttonAction)) {
       return disableValue;
     }
@@ -96,8 +111,30 @@ function getReturnValue(buttonAction: ButtonAction, booleanCallback: boolean) {
 export function enableAllInputs(key: string): void {
   errorIfFeaturesNotInitialized(FEATURE_NAME);
 
-  v.run.disableInputsWithWhitelistMap.delete(key);
-  v.run.enableInputsWithBlacklistMap.delete(key);
+  v.run.disableAllInputsWithWhitelistMap.delete(key);
+  v.run.enableAllInputsWithBlacklistMap.delete(key);
+}
+
+/**
+ * Helper function to disable specific inputs, like opening the console.
+ *
+ * This function is variadic, meaning that you can pass as many inputs as you want to disable. (To
+ * disable all inputs, see the `disableAllInputs` function.
+ *
+ * Use the `enableAllInputs` helper function to set things back to normal.
+ *
+ * @param key The name of the mod feature that is requesting the enable/disable. This is needed so
+ *            that multiple mod features can work in tandem.
+ * @param buttonActions An array of the actions to action.
+ */
+export function disableInputs(
+  key: string,
+  ...buttonActions: ButtonAction[]
+): void {
+  errorIfFeaturesNotInitialized(FEATURE_NAME);
+
+  const buttonActionsSet = new Set(buttonActions);
+  v.run.disableInputs.set(key, buttonActionsSet);
 }
 
 /**
@@ -112,8 +149,8 @@ export function enableAllInputs(key: string): void {
 export function disableAllInputs(key: string): void {
   errorIfFeaturesNotInitialized(FEATURE_NAME);
 
-  v.run.disableInputsWithWhitelistMap.set(key, new Set());
-  v.run.enableInputsWithBlacklistMap.delete(key);
+  v.run.disableAllInputsWithWhitelistMap.set(key, new Set());
+  v.run.enableAllInputsWithBlacklistMap.delete(key);
 }
 
 /**
@@ -132,8 +169,8 @@ export function enableAllInputsExceptFor(
 ): void {
   errorIfFeaturesNotInitialized(FEATURE_NAME);
 
-  v.run.disableInputsWithWhitelistMap.delete(key);
-  v.run.enableInputsWithBlacklistMap.set(key, blacklist);
+  v.run.disableAllInputsWithWhitelistMap.delete(key);
+  v.run.enableAllInputsWithBlacklistMap.set(key, blacklist);
 }
 
 /**
@@ -152,8 +189,8 @@ export function disableAllInputsExceptFor(
 ): void {
   errorIfFeaturesNotInitialized(FEATURE_NAME);
 
-  v.run.disableInputsWithWhitelistMap.set(key, whitelist);
-  v.run.enableInputsWithBlacklistMap.delete(key);
+  v.run.disableAllInputsWithWhitelistMap.set(key, whitelist);
+  v.run.enableAllInputsWithBlacklistMap.delete(key);
 }
 
 /**

package/src/features/pause.ts

@@ -181,7 +181,8 @@ export function unpause(): void {
   // After a vanilla pause, the tears will not resume their normal velocity and will "stick" to the
   // air. Even if we try to help the tears along by explicitly resetting all of the velocity-related
   // variables to their initial values, this will not make a difference. Thus, revert to removing
-  // all of the tears and projectiles in the room.
+  // all of the tears and projectiles in the room. (If a Ludovico tear is removed, it will
+  // automatically be respawned on the next frame.)
   removeAllTears();
   removeAllProjectiles();
 }

package/src/functions/utils.ts

@@ -82,13 +82,13 @@ function hexToRGB(hexString: string): [r: float, g: float, b: float] {
     error(`Failed to convert \`0x${rString}\` to a number.`);
   }
 
-  const gString = hexString.substring(2, 2);
+  const gString = hexString.substring(2, 4);
   const g = tonumber(`0x${gString}`);
   if (g === undefined) {
     error(`Failed to convert \`0x${gString}\` to a number.`);
   }
 
-  const bString = hexString.substring(4, 2);
+  const bString = hexString.substring(4, 6);
   const b = tonumber(`0x${bString}`);
   if (b === undefined) {
     error(`Failed to convert \`0x${bString}\` to a number.`);