isaacscript-common 1.2.105 → 1.2.106

package/dist/functions/player.lua

@@ -17,7 +17,6 @@ local CHARACTERS_WITH_FREE_DEVIL_DEALS = ____constants.CHARACTERS_WITH_FREE_DEVI
 local CHARACTERS_WITH_NO_RED_HEARTS = ____constants.CHARACTERS_WITH_NO_RED_HEARTS
 local CHARACTERS_WITH_NO_SOUL_HEARTS = ____constants.CHARACTERS_WITH_NO_SOUL_HEARTS
 local LOST_STYLE_PLAYER_TYPES = ____constants.LOST_STYLE_PLAYER_TYPES
-local MAX_PLAYER_HEART_CONTAINERS = ____constants.MAX_PLAYER_HEART_CONTAINERS
 local MAX_VANILLA_CHARACTER = ____constants.MAX_VANILLA_CHARACTER
 local ____HealthType = require("types.HealthType")
 local HealthType = ____HealthType.HealthType
@@ -56,6 +55,12 @@ function ____exports.getCharacterMaxHeartContainers(self, character)
     if character == PlayerType.PLAYER_KEEPER then
         return 3
     end
+    if character == PlayerType.PLAYER_THEFORGOTTEN then
+        return 6
+    end
+    if character == PlayerType.PLAYER_THESOUL then
+        return 6
+    end
     if character == PlayerType.PLAYER_KEEPER_B then
         return 2
     end
@@ -91,15 +96,15 @@ end
 function getPlayerIndexCollectibleType(self, player, differentiateForgottenAndSoul)
     local character = player:GetPlayerType()
     repeat
-        local ____switch66 = character
-        local ____cond66 = ____switch66 == PlayerType.PLAYER_THESOUL
-        if ____cond66 then
+        local ____switch68 = character
+        local ____cond68 = ____switch68 == PlayerType.PLAYER_THESOUL
+        if ____cond68 then
             do
                 return differentiateForgottenAndSoul and CollectibleType.COLLECTIBLE_SPOON_BENDER or DEFAULT_COLLECTIBLE_TYPE
             end
         end
-        ____cond66 = ____cond66 or ____switch66 == PlayerType.PLAYER_LAZARUS2_B
-        if ____cond66 then
+        ____cond68 = ____cond68 or ____switch68 == PlayerType.PLAYER_LAZARUS2_B
+        if ____cond68 then
             do
                 return CollectibleType.COLLECTIBLE_INNER_EYE
             end
@@ -113,53 +118,56 @@ function getPlayerIndexCollectibleType(self, player, differentiateForgottenAndSo
 end
 function ____exports.getPlayerMaxHeartContainers(self, player)
     local character = player:GetPlayerType()
-    local maxHeartContainers = ____exports.getCharacterMaxHeartContainers(nil, character)
+    local characterMaxHeartContainers = ____exports.getCharacterMaxHeartContainers(nil, character)
     if character == PlayerType.PLAYER_MAGDALENE and player:HasCollectible(CollectibleType.COLLECTIBLE_BIRTHRIGHT) then
-        maxHeartContainers = maxHeartContainers + 6
+        local extraMaxHeartContainersFromBirthright = 6
+        return characterMaxHeartContainers + extraMaxHeartContainersFromBirthright
     end
-    local numMothersKisses = player:GetTrinketMultiplier(TrinketType.TRINKET_MOTHERS_KISS)
-    maxHeartContainers = maxHeartContainers + numMothersKisses
-    if maxHeartContainers > MAX_PLAYER_HEART_CONTAINERS then
-        maxHeartContainers = MAX_PLAYER_HEART_CONTAINERS
+    if ____exports.isKeeper(nil, player) then
+        local numMothersKisses = player:GetTrinketMultiplier(TrinketType.TRINKET_MOTHERS_KISS)
+        local hasGreedsGullet = player:HasCollectible(CollectibleType.COLLECTIBLE_GREEDS_GULLET)
+        local coins = player:GetNumCoins()
+        local greedsGulletCoinContainers = hasGreedsGullet and math.floor(coins / 25) or 0
+        return characterMaxHeartContainers + numMothersKisses + greedsGulletCoinContainers
     end
-    return maxHeartContainers
+    return characterMaxHeartContainers
 end
 function getAdjustedPlayerName(self, player)
     local character = player:GetPlayerType()
     repeat
-        local ____switch79 = character
-        local ____cond79 = ____switch79 == PlayerType.PLAYER_BLUEBABY or ____switch79 == PlayerType.PLAYER_BLUEBABY_B
-        if ____cond79 then
+        local ____switch81 = character
+        local ____cond81 = ____switch81 == PlayerType.PLAYER_BLUEBABY or ____switch81 == PlayerType.PLAYER_BLUEBABY_B
+        if ____cond81 then
             do
                 return "Blue Baby"
             end
         end
-        ____cond79 = ____cond79 or ____switch79 == PlayerType.PLAYER_LAZARUS2
-        if ____cond79 then
+        ____cond81 = ____cond81 or ____switch81 == PlayerType.PLAYER_LAZARUS2
+        if ____cond81 then
             do
                 return "Lazarus II"
             end
         end
-        ____cond79 = ____cond79 or ____switch79 == PlayerType.PLAYER_BLACKJUDAS
-        if ____cond79 then
+        ____cond81 = ____cond81 or ____switch81 == PlayerType.PLAYER_BLACKJUDAS
+        if ____cond81 then
             do
                 return "Dark Judas"
             end
         end
-        ____cond79 = ____cond79 or ____switch79 == PlayerType.PLAYER_JACOB
-        if ____cond79 then
+        ____cond81 = ____cond81 or ____switch81 == PlayerType.PLAYER_JACOB
+        if ____cond81 then
             do
                 return "Jacob & Esau"
             end
         end
-        ____cond79 = ____cond79 or ____switch79 == PlayerType.PLAYER_LAZARUS2_B
-        if ____cond79 then
+        ____cond81 = ____cond81 or ____switch81 == PlayerType.PLAYER_LAZARUS2_B
+        if ____cond81 then
             do
                 return "Dead Tainted Lazarus"
             end
         end
-        ____cond79 = ____cond79 or ____switch79 == PlayerType.PLAYER_JACOB2_B
-        if ____cond79 then
+        ____cond81 = ____cond81 or ____switch81 == PlayerType.PLAYER_JACOB2_B
+        if ____cond81 then
             do
                 return "Dead Tainted Jacob"
             end
@@ -207,6 +215,10 @@ end
 function ____exports.isChildPlayer(self, player)
     return player.Parent ~= nil
 end
+function ____exports.isKeeper(self, player)
+    local character = player:GetPlayerType()
+    return character == PlayerType.PLAYER_KEEPER or character == PlayerType.PLAYER_KEEPER_B
+end
 function ____exports.isTainted(self, player)
     local character = player:GetPlayerType()
     local ____isVanillaCharacter_result_1
@@ -532,10 +544,6 @@ function ____exports.isJacobOrEsau(self, player)
     local character = player:GetPlayerType()
     return character == PlayerType.PLAYER_JACOB or character == PlayerType.PLAYER_ESAU
 end
-function ____exports.isKeeper(self, player)
-    local character = player:GetPlayerType()
-    return character == PlayerType.PLAYER_KEEPER or character == PlayerType.PLAYER_KEEPER_B
-end
 function ____exports.isLost(self, player)
     local character = player:GetPlayerType()
     return character == PlayerType.PLAYER_THELOST or character == PlayerType.PLAYER_THELOST_B
@@ -589,9 +597,9 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
         itemPool:RemoveCollectible(collectibleType)
     end
     repeat
-        local ____switch125 = activeSlot
-        local ____cond125 = ____switch125 == ActiveSlot.SLOT_PRIMARY
-        if ____cond125 then
+        local ____switch127 = activeSlot
+        local ____cond127 = ____switch127 == ActiveSlot.SLOT_PRIMARY
+        if ____cond127 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -600,8 +608,8 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond125 = ____cond125 or ____switch125 == ActiveSlot.SLOT_SECONDARY
-        if ____cond125 then
+        ____cond127 = ____cond127 or ____switch127 == ActiveSlot.SLOT_SECONDARY
+        if ____cond127 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -616,16 +624,16 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond125 = ____cond125 or ____switch125 == ActiveSlot.SLOT_POCKET
-        if ____cond125 then
+        ____cond127 = ____cond127 or ____switch127 == ActiveSlot.SLOT_POCKET
+        if ____cond127 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 player:SetActiveCharge(charge, activeSlot)
                 break
             end
         end
-        ____cond125 = ____cond125 or ____switch125 == ActiveSlot.SLOT_POCKET2
-        if ____cond125 then
+        ____cond127 = ____cond127 or ____switch127 == ActiveSlot.SLOT_POCKET2
+        if ____cond127 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 break

package/dist/functions/rooms.d.ts

@@ -178,9 +178,9 @@ export declare function inMegaSatanRoom(): boolean;
  */
 export declare function inMinibossRoomOf(minibossID: MinibossID): boolean;
 /**
- * Helper function for checking if the room room is a secret shop from the Member Card collectible.
+ * Helper function for checking if the room is a secret shop (from the Member Card collectible).
  *
- * Secret shops are simply copies of normal shops but with the backdrop of a secret room. In other
+ * Secret shops are simply copies of normal shops, but with the backdrop of a secret room. In other
  * words, they will have the same room type, room variant, and room sub-type of a normal shop. Thus,
  * the only way to detect them is by using the grid index.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.105",
+  "version": "1.2.106",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",