isaacscript-common 5.0.1 → 5.0.2

package/functions/charge.lua

@@ -1,5 +1,5 @@
 local ____exports = {}
-local getClampedChargesToAdd, getNumChargesWithAAAModifier, shouldPlayFullRechargeSound
+local getClampedChargesToAdd, getChargesToAddWithAAAModifier, shouldPlayFullRechargeSound
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local ActiveSlot = ____isaac_2Dtypescript_2Ddefinitions.ActiveSlot
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
@@ -40,7 +40,7 @@ function ____exports.addCharge(self, player, activeSlot, numCharges, playSoundEf
     end
     local hud = game:GetHUD()
     local chargesToAdd = getClampedChargesToAdd(nil, player, activeSlot, numCharges)
-    local modifiedChargesToAdd = getNumChargesWithAAAModifier(nil, player, activeSlot, chargesToAdd)
+    local modifiedChargesToAdd = getChargesToAddWithAAAModifier(nil, player, activeSlot, chargesToAdd)
     local totalCharge = ____exports.getTotalCharge(nil, player, activeSlot)
     local newCharge = totalCharge + modifiedChargesToAdd
     if newCharge == totalCharge then
@@ -105,7 +105,7 @@ function getClampedChargesToAdd(self, player, activeSlot, numCharges)
     end
     return numCharges
 end
-function getNumChargesWithAAAModifier(self, player, activeSlot, chargesToAdd)
+function getChargesToAddWithAAAModifier(self, player, activeSlot, chargesToAdd)
     local activeItem = player:GetActiveItem(activeSlot)
     local activeCharge = player:GetActiveCharge(activeSlot)
     local batteryCharge = player:GetBatteryCharge(activeSlot)
@@ -145,9 +145,9 @@ function shouldPlayFullRechargeSound(self, player, activeSlot)
     local hasBattery = player:HasCollectible(CollectibleType.BATTERY)
     local maxCharges = getCollectibleMaxCharges(nil, activeItem)
     if not hasBattery then
-        return not player:NeedsCharge(activeSlot)
+        return activeCharge == maxCharges
     end
-    return not player:NeedsCharge(activeSlot) or activeCharge == maxCharges and batteryCharge == 0
+    return batteryCharge == maxCharges or activeCharge == maxCharges and batteryCharge == 0
 end
 --- Helper function to add a charge to a player's active item(s), emulating what happens when a room
 -- is cleared.

package/objects/roomShapeToDoorSlotCoordinates.d.ts

@@ -1,4 +1,5 @@
-import { DoorSlot, RoomShape } from "isaac-typescript-definitions";
-export declare const ROOM_SHAPE_TO_DOOR_SLOT_COORDINATES: {
-    readonly [key in RoomShape]: ReadonlySet<DoorSlot>;
-};
+/**
+ * The coordinates correspond to the x and y values that are present in a room's XML file.
+ *
+ * e.g. `<door exists="False" x="-1" y="3" />`
+ */

package/objects/roomShapeToDoorSlotCoordinates.lua

@@ -1,46 +0,0 @@
-local ____lualib = require("lualib_bundle")
-local Set = ____lualib.Set
-local __TS__New = ____lualib.__TS__New
-local ____exports = {}
-local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
-local DoorSlot = ____isaac_2Dtypescript_2Ddefinitions.DoorSlot
-local RoomShape = ____isaac_2Dtypescript_2Ddefinitions.RoomShape
-local ALL_DOOR_SLOTS_SET = __TS__New(Set, {
-    DoorSlot.LEFT_0,
-    DoorSlot.UP_0,
-    DoorSlot.RIGHT_0,
-    DoorSlot.DOWN_0,
-    DoorSlot.LEFT_1,
-    DoorSlot.UP_1,
-    DoorSlot.RIGHT_1,
-    DoorSlot.DOWN_1
-})
-____exports.ROOM_SHAPE_TO_DOOR_SLOT_COORDINATES = {
-    [RoomShape.SHAPE_1x1] = __TS__New(Set, {DoorSlot.LEFT_0, DoorSlot.UP_0, DoorSlot.RIGHT_0, DoorSlot.DOWN_0}),
-    [RoomShape.IH] = __TS__New(Set, {DoorSlot.LEFT_0, DoorSlot.RIGHT_0}),
-    [RoomShape.IV] = __TS__New(Set, {DoorSlot.UP_0, DoorSlot.DOWN_0}),
-    [RoomShape.SHAPE_1x2] = __TS__New(Set, {
-        DoorSlot.LEFT_0,
-        DoorSlot.UP_0,
-        DoorSlot.RIGHT_0,
-        DoorSlot.DOWN_0,
-        DoorSlot.LEFT_1,
-        DoorSlot.RIGHT_1
-    }),
-    [RoomShape.IIV] = __TS__New(Set, {DoorSlot.UP_0, DoorSlot.DOWN_0}),
-    [RoomShape.SHAPE_2x1] = __TS__New(Set, {
-        DoorSlot.LEFT_0,
-        DoorSlot.UP_0,
-        DoorSlot.RIGHT_0,
-        DoorSlot.DOWN_0,
-        DoorSlot.UP_1,
-        DoorSlot.DOWN_1
-    }),
-    [RoomShape.IIH] = __TS__New(Set, {DoorSlot.LEFT_0, DoorSlot.RIGHT_0}),
-    [RoomShape.SHAPE_2x2] = ALL_DOOR_SLOTS_SET,
-    [RoomShape.LTL] = ALL_DOOR_SLOTS_SET,
-    [RoomShape.LTR] = ALL_DOOR_SLOTS_SET,
-    [RoomShape.LBL] = ALL_DOOR_SLOTS_SET,
-    [RoomShape.LBR] = ALL_DOOR_SLOTS_SET
-}
-return ____exports

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",
@@ -22,6 +22,6 @@
   "main": "index",
   "types": "index.d.ts",
   "dependencies": {
-    "isaac-typescript-definitions": "^3.0.17"
+    "isaac-typescript-definitions": "^3.0.18"
   }
 }