isaacscript-common 1.0.556 → 1.0.560

package/dist/callbacks/postTrinketBreak.lua

@@ -32,12 +32,20 @@ function entityTakeDmgPlayer(self, tookDamage, _damageAmount, _damageFlags, _dam
     end
     local trinketMap = getTrinketMap(nil, player)
     for ____, trinketType in ipairs(TRINKETS_THAT_CAN_BREAK) do
-        local numTrinkets = player:GetTrinketMultiplier(trinketType)
-        local oldNumTrinkets = trinketMap:get(trinketType)
-        if (oldNumTrinkets ~= nil) and (numTrinkets < oldNumTrinkets) then
-            trinketMap:set(trinketType, numTrinkets)
+        do
+            local numTrinketsHeld = player:GetTrinketMultiplier(trinketType)
+            local oldNumTrinketsHeld = trinketMap:get(trinketType)
+            if (oldNumTrinketsHeld == nil) or (numTrinketsHeld >= oldNumTrinketsHeld) then
+                goto __continue10
+            end
+            trinketMap:set(trinketType, numTrinketsHeld)
+            local numTrinketsOnGround = Isaac.CountEntities(nil, EntityType.ENTITY_PICKUP, PickupVariant.PICKUP_TRINKET, trinketType)
+            if numTrinketsOnGround > 0 then
+                goto __continue10
+            end
             postTrinketBreakFire(nil, player, trinketType)
         end
+        ::__continue10::
     end
 end
 function getTrinketMap(self, player)

package/dist/functions/challenges.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="isaac-typescript-definitions" />
+/** Get the proper name for a `Challenge` enum. This will only work for vanilla challenges. */
+export declare function getChallengeName(challenge: Challenge): string;

package/dist/functions/challenges.lua

@@ -0,0 +1,9 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____exports = {}
+local ____challengeNameMap = require("maps.challengeNameMap")
+local CHALLENGE_NAME_MAP = ____challengeNameMap.CHALLENGE_NAME_MAP
+function ____exports.getChallengeName(self, challenge)
+    local challengeName = CHALLENGE_NAME_MAP:get(challenge)
+    return ((challengeName == nil) and "Unknown") or challengeName
+end
+return ____exports

package/dist/functions/player.d.ts

@@ -209,9 +209,12 @@ export declare function removeTrinketCostume(player: EntityPlayer, trinketType:
  */
 export declare function setActiveItem(player: EntityPlayer, collectibleType: CollectibleType, activeSlot: ActiveSlot, charge?: int, keepInPools?: boolean): void;
 /**
- * If you want to stop the player from shooting without the blindfold costume, then simply call
- * `player.TryRemoveNullCostume(NullItemID.ID_BLINDFOLD)` after invoking this function.
+ * Helper function to blindfold the player by using a hack with the challenge variable.
  *
- * This function was originally created by im_tem.
+ * The method used in this function was discovered by im_tem.
+ *
+ * @param player The player to apply or remove the blindfold state from.
+ * @param enabled Whether or not to apply or remove the blindfold.
+ * @param modifyCostume Optional. Whether to add or remove the blindfold costume. True by default.
  */
-export declare function setBlindfold(player: EntityPlayer, enabled: boolean): void;
+export declare function setBlindfold(player: EntityPlayer, enabled: boolean, modifyCostume?: boolean): void;

package/dist/functions/player.lua

@@ -472,7 +472,10 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
         end
     until true
 end
-function ____exports.setBlindfold(self, player, enabled)
+function ____exports.setBlindfold(self, player, enabled, modifyCostume)
+    if modifyCostume == nil then
+        modifyCostume = true
+    end
     local game = Game()
     local character = player:GetPlayerType()
     local challenge = Isaac.GetChallenge()
@@ -480,11 +483,16 @@ function ____exports.setBlindfold(self, player, enabled)
         game.Challenge = Challenge.CHALLENGE_SOLAR_SYSTEM
         player:ChangePlayerType(character)
         game.Challenge = challenge
+        if not modifyCostume then
+            player:TryRemoveNullCostume(NullItemID.ID_BLINDFOLD)
+        end
     else
         game.Challenge = Challenge.CHALLENGE_NULL
         player:ChangePlayerType(character)
         game.Challenge = challenge
-        player:TryRemoveNullCostume(NullItemID.ID_BLINDFOLD)
+        if modifyCostume then
+            player:TryRemoveNullCostume(NullItemID.ID_BLINDFOLD)
+        end
     end
 end
 return ____exports

package/dist/functions/pocketItems.lua

@@ -1,6 +1,8 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 require("lualib_bundle");
 local ____exports = {}
+local ____constants = require("constants")
+local MAX_PLAYER_POCKET_ITEM_SLOTS = ____constants.MAX_PLAYER_POCKET_ITEM_SLOTS
 local ____PocketItemType = require("types.PocketItemType")
 local PocketItemType = ____PocketItemType.PocketItemType
 function ____exports.getPocketItems(self, player)
@@ -14,7 +16,7 @@ function ____exports.getPocketItems(self, player)
     local pocketItem2Identified = false
     do
         local slot = 0
-        while slot < 4 do
+        while slot < MAX_PLAYER_POCKET_ITEM_SLOTS do
             local card = player:GetCard(slot)
             local pill = player:GetPill(slot)
             if card ~= Card.CARD_NULL then

package/dist/index.d.ts

@@ -11,6 +11,7 @@ export { hasSirenStolenFamiliar, setFamiliarNoSirenSteal, } from "./features/sir
 export * from "./functions/array";
 export * from "./functions/bitwise";
 export * from "./functions/cards";
+export * from "./functions/challenges";
 export * from "./functions/charge";
 export * from "./functions/collectibles";
 export * from "./functions/collectibleSet";

package/dist/index.lua

@@ -100,6 +100,14 @@ do
         end
     end
 end
+do
+    local ____export = require("functions.challenges")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
 do
     local ____export = require("functions.charge")
     for ____exportKey, ____exportValue in pairs(____export) do

package/dist/maps/challengeNameMap.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="isaac-typescript-definitions" />
+export declare const CHALLENGE_NAME_MAP: Map<Challenge, string>;

package/dist/maps/challengeNameMap.lua

@@ -0,0 +1,5 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+require("lualib_bundle");
+local ____exports = {}
+____exports.CHALLENGE_NAME_MAP = __TS__New(Map, {{Challenge.CHALLENGE_PITCH_BLACK, "Pitch Black"}, {Challenge.CHALLENGE_HIGH_BROW, "High Brow"}, {Challenge.CHALLENGE_HEAD_TRAUMA, "Head Trauma"}, {Challenge.CHALLENGE_DARKNESS_FALLS, "Darkness Falls"}, {Challenge.CHALLENGE_THE_TANK, "The Tank"}, {Challenge.CHALLENGE_SOLAR_SYSTEM, "Solar System"}, {Challenge.CHALLENGE_SUICIDE_KING, "Suicide King"}, {Challenge.CHALLENGE_CAT_GOT_YOUR_TONGUE, "Cat Got Your Tongue"}, {Challenge.CHALLENGE_DEMO_MAN, "Demo Man"}, {Challenge.CHALLENGE_CURSED, "Cursed!"}, {Challenge.CHALLENGE_GLASS_CANNON, "Glass Cannon"}, {Challenge.CHALLENGE_WHEN_LIFE_GIVES_LEMONS, "When Life Gives You Lemons"}, {Challenge.CHALLENGE_BEANS, "Beans!"}, {Challenge.CHALLENGE_ITS_IN_THE_CARDS, "It's In The Cards"}, {Challenge.CHALLENGE_SLOW_ROLL, "Slow Roll"}, {Challenge.CHALLENGE_COMPUTER_SAVY, "Computer Savvy"}, {Challenge.CHALLENGE_WAKA_WAKA, "Waka Waka"}, {Challenge.CHALLENGE_THE_HOST, "The Host"}, {Challenge.CHALLENGE_THE_FAMILY_MAN, "The Family Man"}, {Challenge.CHALLENGE_PURIST, "Purist"}, {Challenge.CHALLENGE_XXXXXXXXL, "XXXXXXXXL"}, {Challenge.CHALLENGE_SPEED, "SPEED!"}, {Challenge.CHALLENGE_BLUE_BOMBER, "Blue Bomber"}, {Challenge.CHALLENGE_PAY_TO_PLAY, "PAY TO PLAY"}, {Challenge.CHALLENGE_HAVE_A_HEART, "Have a Heart"}, {Challenge.CHALLENGE_I_RULE, "I RULE!"}, {Challenge.CHALLENGE_BRAINS, "BRAINS!"}, {Challenge.CHALLENGE_PRIDE_DAY, "PRIDE DAY!"}, {Challenge.CHALLENGE_ONANS_STREAK, "Onan's Streak"}, {Challenge.CHALLENGE_GUARDIAN, "The Guardian"}, {Challenge.CHALLENGE_BACKASSWARDS, "Backasswards"}, {Challenge.CHALLENGE_APRILS_FOOL, "Aprils Fool"}, {Challenge.CHALLENGE_POKEY_MANS, "Pokey Mans"}, {Challenge.CHALLENGE_ULTRA_HARD, "Ultra Hard"}, {Challenge.CHALLENGE_PONG, "Pong"}, {Challenge.CHALLENGE_SCAT_MAN, "Scat Man"}, {Challenge.CHALLENGE_BLOODY_MARY, "Bloody Mary"}, {Challenge.CHALLENGE_BAPTISM_BY_FIRE, "Baptism By Fire"}, {Challenge.CHALLENGE_ISAACS_AWAKENING, "Isaac's Awakening"}, {Challenge.CHALLENGE_SEEING_DOUBLE, "Seeing Double"}, {Challenge.CHALLENGE_PICA_RUN, "Pica Run"}, {Challenge.CHALLENGE_HOT_POTATO, "Hot Potato"}, {Challenge.CHALLENGE_CANTRIPPED, "Cantripped!"}, {Challenge.CHALLENGE_RED_REDEMPTION, "Red Redemption"}, {Challenge.CHALLENGE_DELETE_THIS, "DELETE THIS"}})
+return ____exports

package/dist/types/CallbackParametersCustom.d.ts

@@ -166,7 +166,8 @@ export interface CallbackParametersCustom {
         callback: PostCursedTeleportCallbackType
     ];
     [ModCallbacksCustom.MC_POST_TRINKET_BREAK]: [
-        callback: PostTrinketBreakCallbackType
+        callback: PostTrinketBreakCallbackType,
+        trinketType?: TrinketType
     ];
     [ModCallbacksCustom.MC_POST_SLOT_INIT]: [
         callback: PostSlotInitCallbackType,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.0.556",
+  "version": "1.0.560",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -25,8 +25,8 @@
     "dist/**/*.d.ts"
   ],
   "devDependencies": {
-    "isaac-typescript-definitions": "^1.0.307",
-    "isaacscript-lint": "^1.0.73",
+    "isaac-typescript-definitions": "^1.0.310",
+    "isaacscript-lint": "^1.0.74",
     "typedoc": "^0.22.10",
     "typescript": "4.4.4",
     "typescript-to-lua": "1.1.1"