isaacscript-common 9.17.0 → 9.18.1

package/dist/callbacks/subscriptions/postPurchase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postPurchase.d.ts","sourceRoot":"","sources":["../../../src/callbacks/subscriptions/postPurchase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,oBAAY,8BAA8B,GAAG;IAC3C,QAAQ,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,KAAK,IAAI;IAC9D,aAAa,CAAC,EAAE,aAAa;IAC7B,aAAa,CAAC,EAAE,GAAG;CACpB,CAAC;AAIF,wBAAgB,4BAA4B,IAAI,OAAO,CAEtD;AAED,wBAAgB,oBAAoB,CAClC,GAAG,IAAI,EAAE,8BAA8B,GACtC,IAAI,CAEN;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,YAAY,GACnB,IAAI,CAIN"}
+{"version":3,"file":"postPurchase.d.ts","sourceRoot":"","sources":["../../../src/callbacks/subscriptions/postPurchase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,oBAAY,8BAA8B,GAAG;IAC3C,QAAQ,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,KAAK,IAAI;IAC9D,aAAa,CAAC,EAAE,aAAa;IAC7B,aAAa,CAAC,EAAE,GAAG;CACpB,CAAC;AAIF,wBAAgB,4BAA4B,IAAI,OAAO,CAEtD;AAED,wBAAgB,oBAAoB,CAClC,GAAG,IAAI,EAAE,8BAA8B,GACtC,IAAI,CAEN;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,YAAY,GACnB,IAAI,CAwBN"}

package/dist/callbacks/subscriptions/postPurchase.lua

@@ -10,7 +10,18 @@ end
 function ____exports.postPurchaseFire(self, player, pickup)
     for ____, ____value in ipairs(subscriptions) do
         local callback = ____value[1]
-        callback(nil, player, pickup)
+        local callbackPickupVariant = ____value[2]
+        local callbackPickupSubType = ____value[3]
+        do
+            if callbackPickupVariant ~= nil and callbackPickupVariant ~= pickup.Variant then
+                goto __continue5
+            end
+            if callbackPickupSubType ~= nil and callbackPickupSubType ~= pickup.SubType then
+                goto __continue5
+            end
+            callback(nil, player, pickup)
+        end
+        ::__continue5::
     end
 end
 return ____exports

package/dist/functions/charge.d.ts

@@ -27,6 +27,7 @@ export declare function addCharge(player: EntityPlayer, activeSlot: ActiveSlot,
  * - 2x2 rooms and L rooms granting a double charge
  * - The Battery
  * - AAA Battery
+ * - Not charging active items with `chargetype="special"`
  *
  * @param player The player to grant the charges to.
  * @param bigRoomDoubleCharge Optional. If set to false, it will treat the current room as a 1x1
@@ -43,6 +44,7 @@ export declare function addRoomClearCharge(player: EntityPlayer, bigRoomDoubleCh
  * - L rooms and 2x2 rooms granting a double charge
  * - The Battery
  * - AAA Battery
+ * - Not charging active items with `chargetype="special"`
  *
  * @param player The player to grant the charges to.
  * @param activeSlot The active item slot to grant the charges to.

package/dist/functions/charge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"charge.d.ts","sourceRoot":"","sources":["../../src/functions/charge.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAIX,MAAM,8BAA8B,CAAC;AAMtC;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,SAAS,CACvB,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,UAAU,EACtB,UAAU,SAAI,EACd,eAAe,UAAO,GACrB,GAAG,CA2BL;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,YAAY,EACpB,mBAAmB,UAAO,EAC1B,eAAe,UAAO,GACrB,IAAI,CAaN;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,UAAU,EACtB,mBAAmB,UAAO,EAC1B,eAAe,UAAO,GACrB,IAAI,CAMN;AAuED;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CAAC,mBAAmB,UAAO,GAAG,IAAI,CAIpE;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,UAAU,GACrB,GAAG,CAKL;AAED,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,UAAU,GACrB,OAAO,CAMT;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,UAAU,GACrB,IAAI,CAYN"}
+{"version":3,"file":"charge.d.ts","sourceRoot":"","sources":["../../src/functions/charge.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAKX,MAAM,8BAA8B,CAAC;AAStC;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,SAAS,CACvB,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,UAAU,EACtB,UAAU,SAAI,EACd,eAAe,UAAO,GACrB,GAAG,CA2BL;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,YAAY,EACpB,mBAAmB,UAAO,EAC1B,eAAe,UAAO,GACrB,IAAI,CAaN;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,UAAU,EACtB,mBAAmB,UAAO,EAC1B,eAAe,UAAO,GACrB,IAAI,CAkBN;AAuED;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CAAC,mBAAmB,UAAO,GAAG,IAAI,CAIpE;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,UAAU,GACrB,GAAG,CAKL;AAED,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,UAAU,GACrB,OAAO,CAMT;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,UAAU,GACrB,IAAI,CAYN"}

package/dist/functions/charge.lua

@@ -3,12 +3,14 @@ local getClampedChargesToAdd, getChargesToAddWithAAAModifier, shouldPlayFullRech
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local ActiveSlot = ____isaac_2Dtypescript_2Ddefinitions.ActiveSlot
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
+local ItemConfigChargeType = ____isaac_2Dtypescript_2Ddefinitions.ItemConfigChargeType
 local SoundEffect = ____isaac_2Dtypescript_2Ddefinitions.SoundEffect
 local TrinketType = ____isaac_2Dtypescript_2Ddefinitions.TrinketType
 local ____cachedClasses = require("core.cachedClasses")
 local game = ____cachedClasses.game
 local sfxManager = ____cachedClasses.sfxManager
 local ____collectibles = require("functions.collectibles")
+local getCollectibleChargeType = ____collectibles.getCollectibleChargeType
 local getCollectibleMaxCharges = ____collectibles.getCollectibleMaxCharges
 local ____playerIndex = require("functions.playerIndex")
 local getPlayers = ____playerIndex.getPlayers
@@ -60,6 +62,7 @@ end
 -- - L rooms and 2x2 rooms granting a double charge
 -- - The Battery
 -- - AAA Battery
+-- - Not charging active items with `chargetype="special"`
 -- 
 -- @param player The player to grant the charges to.
 -- @param activeSlot The active item slot to grant the charges to.
@@ -74,6 +77,14 @@ function ____exports.addRoomClearChargeToSlot(self, player, activeSlot, bigRoomD
     if playSoundEffect == nil then
         playSoundEffect = true
     end
+    local activeItem = player:GetActiveItem(activeSlot)
+    if activeItem == CollectibleType.NULL then
+        return
+    end
+    local chargeType = getCollectibleChargeType(nil, activeItem)
+    if chargeType == ItemConfigChargeType.SPECIAL then
+        return
+    end
     local room = game:GetRoom()
     local roomShape = room:GetRoomShape()
     local numCharges = bigRoomDoubleCharge and getRoomShapeCharges(nil, roomShape) or 1
@@ -156,6 +167,7 @@ end
 -- - 2x2 rooms and L rooms granting a double charge
 -- - The Battery
 -- - AAA Battery
+-- - Not charging active items with `chargetype="special"`
 -- 
 -- @param player The player to grant the charges to.
 -- @param bigRoomDoubleCharge Optional. If set to false, it will treat the current room as a 1x1

package/dist/functions/collectibles.d.ts

@@ -1,8 +1,13 @@
-import { CollectiblePedestalType, CollectibleType, ItemConfigTag, ItemType, PickupPrice } from "isaac-typescript-definitions";
+import { CollectiblePedestalType, CollectibleType, ItemConfigChargeType, ItemConfigTag, ItemType, PickupPrice } from "isaac-typescript-definitions";
 import { CollectibleIndex } from "../types/CollectibleIndex";
 export declare function clearCollectibleSprite(collectible: EntityPickup): void;
 /** Helper function to check if two collectible sprites have the same sprite sheet loaded. */
 export declare function collectibleSpriteEquals(sprite1: Sprite, sprite2: Sprite): boolean;
+/**
+ * Helper function to get the charge type that a collectible has. Returns
+ * `ItemConfigChargeType.NORMAL` if the provided collectible type was not valid.
+ */
+export declare function getCollectibleChargeType(collectibleType: CollectibleType): ItemConfigChargeType;
 /**
  * Helper function to get the in-game description for a collectible. Returns "Unknown" if the
  * provided collectible type was not valid.

package/dist/functions/collectibles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collectibles.d.ts","sourceRoot":"","sources":["../../src/functions/collectibles.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"collectibles.d.ts","sourceRoot":"","sources":["../../src/functions/collectibles.ts"],"names":[],"mappings":"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"}

package/dist/functions/collectibles.lua

@@ -1,8 +1,10 @@
 local ____exports = {}
-local initQuestionMarkSprite, COLLECTIBLE_SPRITE_LAYER, COLLECTIBLE_SHADOW_LAYER
+local initQuestionMarkSprite
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local CollectibleSpriteLayer = ____isaac_2Dtypescript_2Ddefinitions.CollectibleSpriteLayer
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
 local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
+local ItemConfigChargeType = ____isaac_2Dtypescript_2Ddefinitions.ItemConfigChargeType
 local ItemConfigTagZero = ____isaac_2Dtypescript_2Ddefinitions.ItemConfigTagZero
 local ItemType = ____isaac_2Dtypescript_2Ddefinitions.ItemType
 local PickupPrice = ____isaac_2Dtypescript_2Ddefinitions.PickupPrice
@@ -79,9 +81,9 @@ function ____exports.setCollectibleSprite(self, collectible, pngPath)
     end
     local sprite = collectible:GetSprite()
     if pngPath == nil then
-        clearSprite(nil, sprite, COLLECTIBLE_SPRITE_LAYER, COLLECTIBLE_SHADOW_LAYER)
+        clearSprite(nil, sprite, CollectibleSpriteLayer.HEAD, CollectibleSpriteLayer.ITEM_SHADOW)
     else
-        sprite:ReplaceSpritesheet(COLLECTIBLE_SPRITE_LAYER, pngPath)
+        sprite:ReplaceSpritesheet(CollectibleSpriteLayer.HEAD, pngPath)
         sprite:LoadGraphics()
     end
 end
@@ -106,8 +108,6 @@ function ____exports.setCollectibleSubType(self, collectible, newCollectibleType
     )
 end
 local COLLECTIBLE_ANM2_PATH = "gfx/005.100_collectible.anm2"
-COLLECTIBLE_SPRITE_LAYER = 1
-COLLECTIBLE_SHADOW_LAYER = 4
 local GLITCHED_ITEM_THRESHOLD = 4000000000
 local questionMarkSprite = initQuestionMarkSprite(nil)
 --- Helper function to check if two collectible sprites have the same sprite sheet loaded.
@@ -122,7 +122,7 @@ function ____exports.collectibleSpriteEquals(self, sprite1, sprite2)
         nil,
         sprite1,
         sprite2,
-        COLLECTIBLE_SPRITE_LAYER,
+        CollectibleSpriteLayer.HEAD,
         xStart,
         xFinish,
         xIncrement,
@@ -131,6 +131,15 @@ function ____exports.collectibleSpriteEquals(self, sprite1, sprite2)
         yIncrement
     )
 end
+--- Helper function to get the charge type that a collectible has. Returns
+-- `ItemConfigChargeType.NORMAL` if the provided collectible type was not valid.
+function ____exports.getCollectibleChargeType(self, collectibleType)
+    local itemConfigItem = itemConfig:GetCollectible(collectibleType)
+    if itemConfigItem == nil then
+        return ItemConfigChargeType.NORMAL
+    end
+    return itemConfigItem.ChargeType
+end
 --- Helper function to get the in-game description for a collectible. Returns "Unknown" if the
 -- provided collectible type was not valid.
 function ____exports.getCollectibleDescription(self, collectibleType)
@@ -393,7 +402,7 @@ function ____exports.newCollectibleSprite(self, collectibleType)
     sprite:Load(COLLECTIBLE_ANM2_PATH, false)
     clearSprite(nil, sprite)
     local gfxFileName = ____exports.getCollectibleGfxFilename(nil, collectibleType)
-    sprite:ReplaceSpritesheet(COLLECTIBLE_SPRITE_LAYER, gfxFileName)
+    sprite:ReplaceSpritesheet(CollectibleSpriteLayer.HEAD, gfxFileName)
     sprite:LoadGraphics()
     return sprite
 end

package/dist/index.d.ts

@@ -35,6 +35,7 @@ import { GridEntityType } from 'isaac-typescript-definitions';
 import { GridEntityXMLType } from 'isaac-typescript-definitions';
 import { HeartSubType } from 'isaac-typescript-definitions';
 import { ItemConfigCardType } from 'isaac-typescript-definitions';
+import { ItemConfigChargeType } from 'isaac-typescript-definitions';
 import { ItemConfigPillEffectClass } from 'isaac-typescript-definitions';
 import { ItemConfigPillEffectType } from 'isaac-typescript-definitions';
 import { ItemConfigTag } from 'isaac-typescript-definitions';
@@ -245,6 +246,7 @@ export declare function addPlayerHealthType(player: EntityPlayer, healthType: He
  * - 2x2 rooms and L rooms granting a double charge
  * - The Battery
  * - AAA Battery
+ * - Not charging active items with `chargetype="special"`
  *
  * @param player The player to grant the charges to.
  * @param bigRoomDoubleCharge Optional. If set to false, it will treat the current room as a 1x1
@@ -277,6 +279,7 @@ export declare function addRoomClearCharges(bigRoomDoubleCharge?: boolean): void
  * - L rooms and 2x2 rooms granting a double charge
  * - The Battery
  * - AAA Battery
+ * - Not charging active items with `chargetype="special"`
  *
  * @param player The player to grant the charges to.
  * @param activeSlot The active item slot to grant the charges to.
@@ -2622,6 +2625,12 @@ export declare function getCoinValue(coinSubType: CoinSubType): int;
  */
 export declare function getCollectibleArray(): readonly CollectibleType[];
 
+/**
+ * Helper function to get the charge type that a collectible has. Returns
+ * `ItemConfigChargeType.NORMAL` if the provided collectible type was not valid.
+ */
+export declare function getCollectibleChargeType(collectibleType: CollectibleType): ItemConfigChargeType;
+
 /**
  * Helper function to get the in-game description for a collectible. Returns "Unknown" if the
  * provided collectible type was not valid.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "9.17.0",
+  "version": "9.18.1",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",
@@ -22,6 +22,6 @@
   "main": "dist/index",
   "types": "dist/index.d.ts",
   "dependencies": {
-    "isaac-typescript-definitions": "^4.0.7"
+    "isaac-typescript-definitions": "^4.1.1"
   }
 }

package/src/callbacks/subscriptions/postPurchase.ts

@@ -22,7 +22,27 @@ export function postPurchaseFire(
   player: EntityPlayer,
   pickup: EntityPickup,
 ): void {
-  for (const [callback] of subscriptions) {
+  for (const [
+    callback,
+    callbackPickupVariant,
+    callbackPickupSubType,
+  ] of subscriptions) {
+    // Handle the optional 2nd callback argument.
+    if (
+      callbackPickupVariant !== undefined &&
+      callbackPickupVariant !== pickup.Variant
+    ) {
+      continue;
+    }
+
+    // Handle the optional 3rd callback argument.
+    if (
+      callbackPickupSubType !== undefined &&
+      callbackPickupSubType !== pickup.SubType
+    ) {
+      continue;
+    }
+
     callback(player, pickup);
   }
 }

package/src/functions/charge.ts

@@ -1,11 +1,15 @@
 import {
   ActiveSlot,
   CollectibleType,
+  ItemConfigChargeType,
   SoundEffect,
   TrinketType,
 } from "isaac-typescript-definitions";
 import { game, sfxManager } from "../core/cachedClasses";
-import { getCollectibleMaxCharges } from "./collectibles";
+import {
+  getCollectibleChargeType,
+  getCollectibleMaxCharges,
+} from "./collectibles";
 import { getPlayers } from "./playerIndex";
 import { getRoomShapeCharges } from "./roomShape";
 
@@ -70,6 +74,7 @@ export function addCharge(
  * - 2x2 rooms and L rooms granting a double charge
  * - The Battery
  * - AAA Battery
+ * - Not charging active items with `chargetype="special"`
  *
  * @param player The player to grant the charges to.
  * @param bigRoomDoubleCharge Optional. If set to false, it will treat the current room as a 1x1
@@ -104,6 +109,7 @@ export function addRoomClearCharge(
  * - L rooms and 2x2 rooms granting a double charge
  * - The Battery
  * - AAA Battery
+ * - Not charging active items with `chargetype="special"`
  *
  * @param player The player to grant the charges to.
  * @param activeSlot The active item slot to grant the charges to.
@@ -118,6 +124,18 @@ export function addRoomClearChargeToSlot(
   bigRoomDoubleCharge = true,
   playSoundEffect = true,
 ): void {
+  const activeItem = player.GetActiveItem(activeSlot);
+  if (activeItem === CollectibleType.NULL) {
+    return;
+  }
+
+  // Certain collectibles have special charge mechanisms and are not charged upon a room being
+  // cleared.
+  const chargeType = getCollectibleChargeType(activeItem);
+  if (chargeType === ItemConfigChargeType.SPECIAL) {
+    return;
+  }
+
   const room = game.GetRoom();
   const roomShape = room.GetRoomShape();
 

package/src/functions/collectibles.ts

@@ -1,7 +1,9 @@
 import {
   CollectiblePedestalType,
+  CollectibleSpriteLayer,
   CollectibleType,
   EntityType,
+  ItemConfigChargeType,
   ItemConfigTag,
   ItemConfigTagZero,
   ItemType,
@@ -32,8 +34,6 @@ import { clearSprite, spriteEquals } from "./sprites";
 import { irange } from "./utils";
 
 const COLLECTIBLE_ANM2_PATH = "gfx/005.100_collectible.anm2";
-const COLLECTIBLE_SPRITE_LAYER = 1;
-const COLLECTIBLE_SHADOW_LAYER = 4;
 
 // Glitched items start at id 4294967295 (the final 32-bit integer) and increment backwards.
 const GLITCHED_ITEM_THRESHOLD = 4000000000;
@@ -72,7 +72,7 @@ export function collectibleSpriteEquals(
   return spriteEquals(
     sprite1,
     sprite2,
-    COLLECTIBLE_SPRITE_LAYER,
+    CollectibleSpriteLayer.HEAD,
     xStart,
     xFinish,
     xIncrement,
@@ -82,6 +82,21 @@ export function collectibleSpriteEquals(
   );
 }
 
+/**
+ * Helper function to get the charge type that a collectible has. Returns
+ * `ItemConfigChargeType.NORMAL` if the provided collectible type was not valid.
+ */
+export function getCollectibleChargeType(
+  collectibleType: CollectibleType,
+): ItemConfigChargeType {
+  const itemConfigItem = itemConfig.GetCollectible(collectibleType);
+  if (itemConfigItem === undefined) {
+    return ItemConfigChargeType.NORMAL;
+  }
+
+  return itemConfigItem.ChargeType;
+}
+
 /**
  * Helper function to get the in-game description for a collectible. Returns "Unknown" if the
  * provided collectible type was not valid.
@@ -482,7 +497,7 @@ export function newCollectibleSprite(collectibleType: CollectibleType): Sprite {
   clearSprite(sprite);
 
   const gfxFileName = getCollectibleGfxFilename(collectibleType);
-  sprite.ReplaceSpritesheet(COLLECTIBLE_SPRITE_LAYER, gfxFileName);
+  sprite.ReplaceSpritesheet(CollectibleSpriteLayer.HEAD, gfxFileName);
   sprite.LoadGraphics();
 
   return sprite;
@@ -615,9 +630,15 @@ export function setCollectibleSprite(
 
   const sprite = collectible.GetSprite();
   if (pngPath === undefined) {
-    clearSprite(sprite, COLLECTIBLE_SPRITE_LAYER, COLLECTIBLE_SHADOW_LAYER);
+    // We want to remove the little circle that appears on top of the pedestal, which is why we also
+    // clear `CollectibleSpriteLayer.ITEM_SHADOW`.
+    clearSprite(
+      sprite,
+      CollectibleSpriteLayer.HEAD,
+      CollectibleSpriteLayer.ITEM_SHADOW,
+    );
   } else {
-    sprite.ReplaceSpritesheet(COLLECTIBLE_SPRITE_LAYER, pngPath);
+    sprite.ReplaceSpritesheet(CollectibleSpriteLayer.HEAD, pngPath);
     sprite.LoadGraphics();
   }
 }