From 4e7c3cc99e4ed0f878f0c8e991e669620ec64eab Mon Sep 17 00:00:00 2001 From: Buurazu Date: Fri, 21 Jan 2022 16:48:19 -0500 Subject: [PATCH 1/4] fix puberty markup icon --- descriptions/ab+/en_us.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/descriptions/ab+/en_us.lua b/descriptions/ab+/en_us.lua index e058cda6..f5f98c1e 100644 --- a/descriptions/ab+/en_us.lua +++ b/descriptions/ab+/en_us.lua @@ -777,7 +777,7 @@ EID.descriptions[languageCode].pills={ {"6", "Health Down", "↓ Health down"}, {"7", "Health Up", "↑ Health up"}, {"8", "I Found Pills", "No effect"}, - {"9", "Puberty", "Eating 3 will give you the {{}} Adult transformation (+1 Red Heart)"}, + {"9", "Puberty", "No effect#Eating 3 will give you the Adult transformation (+1 Red Heart)"}, {"10", "Pretty Fly", "Adds 1 fly orbital"}, {"11", "Range Down", "↓ -2 Range down"}, {"12", "Range Up", "↑ +2.5 Range up"}, From 6617748ac1ea66e930d317acb1ad94a565cf840b Mon Sep 17 00:00:00 2001 From: Buurazu Date: Fri, 21 Jan 2022 19:36:06 -0500 Subject: [PATCH 2/4] Fix Knife Piece 1 + Flip, change pathfinder entity --- main.lua | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/main.lua b/main.lua index 022fa646..0c56640e 100644 --- a/main.lua +++ b/main.lua @@ -290,12 +290,15 @@ if REPENTANCE then flipItemNext = false if entityType == 5 and (variant == 100 or variant == 150) then lastGetItemResult = {nil, Isaac.GetFrameCount(), gridIndex, nil} - initialItemNext = true + -- Pedestals in need of a random item will call GET_COLLECTIBLE; fixed pedestals (Knife Piece 1) will not + if subtype == 0 then initialItemNext = true + else lastGetItemResult[1] = subtype end end end EID:AddCallback(ModCallbacks.MC_PRE_ROOM_ENTITY_SPAWN, EID.preRoomEntitySpawn) function EID:postPickupInit(entity) + initialItemNext = false flipItemNext = true lastGetItemResult[4] = entity.InitSeed @@ -787,16 +790,6 @@ function EID:setPlayer() end end -if REPENTANCE then - function EID:removeWrongGuppyEyeInfo(effectEntity) - if EID.pathCheckerEntity ~= nil and effectEntity.Parent ~= nil then - if GetPtrHash(effectEntity.Parent) == GetPtrHash(EID.pathCheckerEntity) then - effectEntity:Remove() - end - end - end - EID:AddCallback(ModCallbacks.MC_POST_EFFECT_UPDATE, EID.removeWrongGuppyEyeInfo, EffectVariant.PICKUP_GHOST) -end --------------------------------------------------------------------------- ---------------------------On Update Function------------------------------ @@ -844,9 +837,8 @@ function EID:onGameUpdate() return end if EID.pathCheckerEntity == nil then - EID.pathCheckerEntity = game:Spawn(17, 3169, EID.player.Position, nullVector, EID.player ,0 , 4354) -- Spawns the EID Helper entity with seed that doesnt spawn rewards - -- Spawns an Ultra Greed Door and makes it invisible and intangible (not fully tested yet) - --EID.pathCheckerEntity = game:Spawn(294, 0, EID.player.Position, nullVector, EID.player, 0, 0) + -- Spawns an Ultra Greed Door and makes it invisible and intangible to act as a Pathfinding NPC that can't be rerolled and has no AI + EID.pathCheckerEntity = game:Spawn(294, 0, EID.player.Position, nullVector, EID.player, 0, 0) EID.pathCheckerEntity:ClearEntityFlags(EntityFlag.FLAG_APPEAR) EID.pathCheckerEntity:AddEntityFlags (EntityFlag.FLAG_PERSISTENT | EntityFlag.FLAG_NO_STATUS_EFFECTS | EntityFlag.FLAG_NO_SPRITE_UPDATE | EntityFlag.FLAG_HIDE_HP_BAR | EntityFlag.FLAG_NO_DEATH_TRIGGER | EntityFlag.FLAG_FRIENDLY) if REPENTANCE then EID.pathCheckerEntity:AddEntityFlags(EntityFlag.FLAG_NO_QUERY) end From a1bb206ac29f9a17c251fba546bc9ea650cfa232 Mon Sep 17 00:00:00 2001 From: Buurazu Date: Fri, 21 Jan 2022 19:36:15 -0500 Subject: [PATCH 3/4] Delete content directory --- content/entities2.xml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 content/entities2.xml diff --git a/content/entities2.xml b/content/entities2.xml deleted file mode 100644 index 36b384a6..00000000 --- a/content/entities2.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file From e4a0759bf07d8f13828b803a821d656cf0f41819 Mon Sep 17 00:00:00 2001 From: Buurazu Date: Sat, 22 Jan 2022 02:11:10 -0500 Subject: [PATCH 4/4] Save successful pathfinds --- main.lua | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/main.lua b/main.lua index 0c56640e..02733316 100644 --- a/main.lua +++ b/main.lua @@ -162,20 +162,18 @@ function EID:onNewFloor() end EID:AddCallback(ModCallbacks.MC_POST_NEW_LEVEL, EID.onNewFloor) -if EID.Config["DisplaySacrificeInfo"] then - function EID:onSacrificeDamage(_, _, flags, source) - if game:GetRoom():GetType() == RoomType.ROOM_SACRIFICE and source.Type == 0 and flags & DamageFlag.DAMAGE_SPIKES == DamageFlag.DAMAGE_SPIKES then - local curRoomIndex = game:GetLevel():GetCurrentRoomIndex() - if EID.sacrificeCounter[curRoomIndex] == nil then - EID.sacrificeCounter[curRoomIndex] = 1 - end - if EID.sacrificeCounter[curRoomIndex] < 12 then - EID.sacrificeCounter[curRoomIndex] = EID.sacrificeCounter[curRoomIndex] + 1 - end +function EID:onSacrificeDamage(_, _, flags, source) + if EID.Config["DisplaySacrificeInfo"] and game:GetRoom():GetType() == RoomType.ROOM_SACRIFICE and source.Type == 0 and flags & DamageFlag.DAMAGE_SPIKES == DamageFlag.DAMAGE_SPIKES then + local curRoomIndex = game:GetLevel():GetCurrentRoomIndex() + if EID.sacrificeCounter[curRoomIndex] == nil then + EID.sacrificeCounter[curRoomIndex] = 1 + end + if EID.sacrificeCounter[curRoomIndex] < 12 then + EID.sacrificeCounter[curRoomIndex] = EID.sacrificeCounter[curRoomIndex] + 1 end end - EID:AddCallback(ModCallbacks.MC_ENTITY_TAKE_DMG, EID.onSacrificeDamage, EntityType.ENTITY_PLAYER) end +EID:AddCallback(ModCallbacks.MC_ENTITY_TAKE_DMG, EID.onSacrificeDamage, EntityType.ENTITY_PLAYER) --------------------------------------------------------------------------- ------------------------Handle ALT FLOOR CHOICE---------------------------- @@ -576,7 +574,6 @@ function EID:printDescription(desc) end end EID:printBulletPoints(desc.Description, renderPos) - end function EID:printBulletPoints(description, renderPos) @@ -827,7 +824,7 @@ function EID:onGameUpdate() end if not EID.Config["DisplayObstructedCardInfo"] or not EID.Config["DisplayObstructedPillInfo"] or not EID.Config["DisplayObstructedSoulstoneInfo"] then - if EID.lastDescriptionEntity == nil or (EID.Config["DisableObstructionOnFlight"] and EID.player.CanFly) then + if EID.lastDescriptionEntity == nil or EID.lastDescriptionEntity:GetData()["EID_Pathfound"] or (EID.Config["DisableObstructionOnFlight"] and EID.player.CanFly) then if EID.pathCheckerEntity ~= nil then EID.pathCheckerEntity:Remove() EID.pathCheckerEntity = nil @@ -851,6 +848,7 @@ function EID:onGameUpdate() EID.pathCheckerEntity.Position = EID.player.Position EID.hasValidWalkingpath = EID.pathCheckerEntity:ToNPC().Pathfinder:HasPathToPos(EID.lastDescriptionEntity.Position, false) EID.pathfindingTo = EID.lastDescriptionEntity + EID.lastDescriptionEntity:GetData()["EID_Pathfound"] = EID.hasValidWalkingpath end end @@ -863,6 +861,7 @@ function EID:updatePathfinding() EID.pathCheckerEntity.Position = EID.player.Position EID.hasValidWalkingpath = EID.pathCheckerEntity:ToNPC().Pathfinder:HasPathToPos(EID.lastDescriptionEntity.Position, false) EID.pathfindingTo = EID.lastDescriptionEntity + EID.lastDescriptionEntity:GetData()["EID_Pathfound"] = EID.hasValidWalkingpath end local hasShownAchievementWarning = false