From 9054ee28301629601246ad5ada92f022ab6df6fa Mon Sep 17 00:00:00 2001 From: Xheepey87 <40490528+Xheepey87@users.noreply.github.com> Date: Fri, 21 Jan 2022 08:37:57 +0800 Subject: [PATCH 1/8] Update zh_cn.lua --- descriptions/rep/zh_cn.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/descriptions/rep/zh_cn.lua b/descriptions/rep/zh_cn.lua index 92028c20..521b2965 100644 --- a/descriptions/rep/zh_cn.lua +++ b/descriptions/rep/zh_cn.lua @@ -244,7 +244,7 @@ local repCollectibles={ [591] = {"591", "金星", "↑ +1心之容器#治疗1红心#近距离内的敌人受到魅惑"}, -- Venus [592] = {"592", "地球", "↑ +1.0伤害#眼泪变为石头#每颗伤害不定#可摧毁障碍物#击退增强"}, -- Terra [593] = {"593", "火星", "双击移动方向键进行冲锋#冲锋时无敌，造成角色伤害x4的伤害#3秒冷却时间"}, -- Mars - [594] = {"594", "木星", "↑ +2心之容器#治疗半红心#↓ -0.3移速#不移动时累积至多0.5移速#移动时向后释放毒气#角色免疫中毒伤害"}, -- Jupiter + [594] = {"594", "木星", "↑ +2心之容器#治疗半红心#↓ -0.3移速#角色免疫中毒伤害#不移动时累积至多0.5移速#移动时向后释放毒气"}, -- Jupiter [595] = {"595", "土星", "生成1个轨道#进入房间时生成7颗眼泪在轨道上环绕#轨道有几率捕获敌人的弹幕"}, -- Saturnus [596] = {"596", "天王星", "发射冰冻眼泪，对敌人造成减速效果，击杀时使敌人冻结#冻结的敌人可以推开，撞碎时向四周发射6个冰锥"}, -- Uranus [597] = {"597", "海王星", "不发射眼泪时积攒眼泪，最多持续3秒##发射时射出大量眼泪#发射时积攒的眼泪逐渐减少"}, -- Neptunus @@ -970,13 +970,13 @@ EID.descriptions[languageCode].GlitchedItemText = { -- Attribute triggers chain = "然后：{{CR}}", active = "使用时：#", - pickup_collected = "捡到掉落物时：#", --chance to? + pickup_collected = "捡到掉落物时：#", enemy_kill = "击杀时，几率：#", - damage_taken = "受伤时：#", --chance to? + damage_taken = "受伤时：#", entity_spawned = "当生成{T1}时：#", tear_fire = "角色发射眼泪时，几率：#", enemy_hit = "击中敌人时，几率：#", - room_clear = "清理房间后：#", --chance to? + room_clear = "清理房间后：#", -- Attribute effects area_damage = "在角色周围造成{1}伤害", From 0e0187c47b5484a61789e572de33ec4c1542350b Mon Sep 17 00:00:00 2001 From: Xheepey87 <40490528+Xheepey87@users.noreply.github.com> Date: Fri, 21 Jan 2022 08:38:43 +0800 Subject: [PATCH 2/8] zh_cn : sync --- descriptions/rep/zh_cn.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/descriptions/rep/zh_cn.lua b/descriptions/rep/zh_cn.lua index 521b2965..5a68a5c8 100644 --- a/descriptions/rep/zh_cn.lua +++ b/descriptions/rep/zh_cn.lua @@ -2,7 +2,7 @@ ----- Basic Chinese descriptions --- -------------------------------------- --- Last Sync Revise: 2022.01.19 +-- Last Sync Revise: 2022.01.21 -- Last Full Check: N/A -- I will have a full check someday else. -- FORMAT: Item ID | Name | Description From a15018a13491b50118f0c6f2f78d086286cc0405 Mon Sep 17 00:00:00 2001 From: Xheepey87 <40490528+Xheepey87@users.noreply.github.com> Date: Fri, 21 Jan 2022 13:49:14 +0800 Subject: [PATCH 3/8] Fixed the description of Magic Skin and Everything Jar --- descriptions/rep/zh_cn.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/descriptions/rep/zh_cn.lua b/descriptions/rep/zh_cn.lua index 5a68a5c8..2886a3a6 100644 --- a/descriptions/rep/zh_cn.lua +++ b/descriptions/rep/zh_cn.lua @@ -292,7 +292,7 @@ local repCollectibles={ [639] = {"639", "难吃的心", "使用时获得1腐心"}, -- Yuck Heart [640] = {"640", "灵魂之瓮", "喷射火焰#敌人死亡时获得充能"}, -- Urn of Souls [641] = {"641", "血田", "战斗时，在身体后方生成一串眼泪#眼泪造成3.5伤害"}, -- Akeldama - [642] = {"642", "玄奇驴皮", "将1心之容器或2魂心变为1碎心#从当前房间道具池中生成1个道具#使用次数越多，若不再持有，则后续生成的道具被玄奇驴皮替换的几率越大#如果当前层的底座道具有玄奇驴皮则降低该几率#{{Warning}}游魂：一次性#{{Warning}}"}, -- Magic Skin + [642] = {"642", "玄奇驴皮", "将1心之容器或2魂心变为1碎心#从当前房间道具池中生成1个道具#使用次数越多，若不再持有，则后续生成的道具被玄奇驴皮替换的几率越大#如果当前层的底座道具有玄奇驴皮则降低该几率#{{Warning}} 游魂：一次性"}, -- Magic Skin [643] = {"643", "终末天启", "获得飞行能力和2魂心#连续发射眼泪2.5秒可蓄力发射神圣光线"}, -- Revelation [644] = {"644", "安慰奖", "提升最低的属性#根据持有数量最少的掉落物，生成3硬币，1钥匙或1炸弹"}, -- Consolation Prize [645] = {"645", "小畸胎瘤", "畸胎瘤环绕物#阻挡弹幕#造成接触伤害#被击中3次时分裂成小畸胎瘤#小畸胎瘤被摧毁时产生蓝蜘蛛#被完全摧毁后5秒复活"}, -- Tinytoma @@ -370,7 +370,7 @@ local repCollectibles={ [717] = {"717", "店主的亲友", "岩石和障碍物在被摧毁时生成2只蓝蜘蛛#岩石在有敌人的房间中偶尔会产生蓝蜘蛛"}, -- Keeper's Kin [718] = {"718", "", "<道具不存在>"}, -- Keepers Robe (Cut item) [719] = {"719", "店主的盒子", "生成1个商店出售的物品或掉落物"}, -- Keeper's Box - [720] = {"720", "百宝罐", "使用时生成掉落物，使用时的充能不同，效果不同#满充能时具有强力随机效果#充能：1:Poop 2:{{Coin}} 3:{{Bomb}} 4:{{Key}} 5:{{Heart}} 6:{{Pill}} 7:{{Card}} 8:{{SoulHeart}} 9:{{GoldenHeart}} 10:{{GoldenKey}} 11:{{GoldenBomb}}"}, -- Everything Jar + [720] = {"720", "百宝罐", "使用时生成掉落物，使用时的充能不同，效果不同#满充能时具有强力随机效果#充能：1:便便 2:{{Coin}} 3:{{Bomb}} 4:{{Key}} 5:{{Heart}} 6:{{Pill}} 7:{{Card}} 8:{{SoulHeart}} 9:{{GoldenHeart}} 10:{{GoldenKey}} 11:{{GoldenBomb}}"}, -- Everything Jar [721] = {"721", "错误技", "使未来获得的所有物品混乱#其效果完全随机"}, -- TMTRAINER [722] = {"722", "孤魂铁索", "禁锢离角色最近的敌人5秒"}, -- Anima Sola [723] = {"723", "计数二十面骰", "将房间内所有道具转变为内部ID减1的道具"}, -- Spindown Dice @@ -1019,7 +1019,7 @@ EID.descriptions[languageCode].CraftingHideKey = "隐藏：" EID.descriptions[languageCode].CraftingPreviewKey = "预览：" EID.descriptions[languageCode].CraftingPreviewBackup = "!!! 如果该道具锁定，则会变为" -EID.descriptions[languageCode].CraftingResults = "(滚动：按住 {{CONFIG_BoC_Toggle}} + {{ButtonY}} {{ButtonA}}，锁定：{{ButtonX}}，刷新：{{ButtonB}})，重置袋：按住 {{ButtonRB}}" +EID.descriptions[languageCode].CraftingResults = "(滚动：按住 {{CONFIG_BoC_Toggle}} + {{ButtonY}} {{ButtonA}}，锁定：{{ButtonX}}，刷新：{{ButtonB}}，重置袋：按住 {{ButtonRB}})" EID.descriptions[languageCode].BlankCardCharge = "空白卡牌充能：" EID.descriptions[languageCode].BlankCardQCard = "传送至错误房#空白卡牌和？卡牌会被摧毁" From 4e7c3cc99e4ed0f878f0c8e991e669620ec64eab Mon Sep 17 00:00:00 2001 From: Buurazu Date: Fri, 21 Jan 2022 16:48:19 -0500 Subject: [PATCH 4/8] 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 5/8] 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 6/8] 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 c1279363a24fee77c110fe37f5fd426e1d134e25 Mon Sep 17 00:00:00 2001 From: Xheepey87 <40490528+Xheepey87@users.noreply.github.com> Date: Sat, 22 Jan 2022 10:59:58 +0800 Subject: [PATCH 7/8] zh_cn : updated the descriptions of Mr. Boom and Empty Heart --- descriptions/rep/zh_cn.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/descriptions/rep/zh_cn.lua b/descriptions/rep/zh_cn.lua index 2886a3a6..d77edeaa 100644 --- a/descriptions/rep/zh_cn.lua +++ b/descriptions/rep/zh_cn.lua @@ -2,7 +2,7 @@ ----- Basic Chinese descriptions --- -------------------------------------- --- Last Sync Revise: 2022.01.21 +-- Last Sync Revise: 2022.01.22 -- Last Full Check: N/A -- I will have a full check someday else. -- FORMAT: Item ID | Name | Description @@ -29,6 +29,7 @@ local repCollectibles={ [29] = {"29", "老妈的内裤", "↑ +1.5射程#生成3-6只蓝苍蝇"}, -- Moms Underwear [30] = {"30", "老妈的高跟鞋", "↑ +1.5射程#能对敌人造成12接触伤害"}, -- Mom's Heels [31] = {"31", "老妈的口红", "↑ +2.25射程#生成1随机心"}, -- Mom's Lipstick + [37] = {"37", "炸弹先生", "在角色下方放置1个大炸弹，造成185伤害"}, -- Mr. Boom [40] = {"40", "神风！", "在角色位置造成1次大爆炸#造成185伤害"}, -- Kamikaze! [42] = {"42", "鲍勃的烂头", "可投掷的有毒炸弹#造成185+角色伤害#产生毒气"}, -- Bob's Rotten Head [44] = {"44", "传送！", "将角色传送到除错误房外的房间#向所需方向移动可稍微影响传送方向"}, -- Teleport @@ -326,7 +327,7 @@ local repCollectibles={ [673] = {"673", "赎罪", "进入恶魔房间但不捡任何物品时，下一层+1魂心，+1伤害"}, -- Redemption [674] = {"674", "灵魂枷锁", "死亡时，灵魂被锁链束缚在尸体上，可以继续战斗，血量为半个魂心#10 秒后复活#此效果捡起魂心后才能再次发动"}, -- Spirit Shackles [675] = {"675", "碎裂的宝珠", "受伤时，显示本层1个随机房间#并打开此房间需要钥匙的门#可以打开超级撒但房间#可显示终极隐藏房间"}, -- Cracked Orb - [676] = {"676", "空虚之心", "在开始新一层时，若拥有空的心之容器，获得1个空的心之容器#骨心不计"}, -- Empty Heart + [676] = {"676", "空虚之心", "在开始新一层时，若只有1红心或更少，获得1空的心之容器#对无法获得红心的角色无效"}, -- Empty Heart [677] = {"677", "灵魂出窍", "受伤时，暂停时间3秒#此时间内变为幽灵#幽灵具有飞行和幽灵眼泪，且免疫一次伤害"}, -- Astral Projection [678] = {"678", "剖腹产", "获得短延迟蓄力攻击，发射婴儿样式的跟踪幽灵眼泪"}, -- C Section [679] = {"679", "亚巴顿宝宝", "发射迷你{{Collectible399}}虚空之口进行攻击的跟班"}, -- Lil Abaddon @@ -1032,7 +1033,7 @@ EID.descriptions[languageCode].FalsePHDDamage = "+0.6伤害" EID.descriptions[languageCode].FalsePHDHorseDamage = "+1.2伤害" EID.descriptions[languageCode].AchievementWarningTitle = "{{ColorYellow}}!!! 警告 !!!" -EID.descriptions[languageCode].AchievementWarningText = "成就已禁用！#为了启用进度和成就，你需要击败老妈(深牢II)而不开启任何模组#(如果你打过了，那么这条警告的出现是bug，无视就好)#(这条警告可以在设置中禁用)" +EID.descriptions[languageCode].AchievementWarningText = "成就已禁用！#为了启用进度和成就，你需要击败老妈(深牢II)而不开启任何模组#(如果你打过了，那么这条警告的出现是bug，无视就好)#(这条警告可在设置中禁用)" EID.descriptions[languageCode].OldGameVersionWarningText = "你的忏悔版本不是最新的！#只有官方最新版才支持这一功能#(这条警告可以在设置中禁用)" From e4a0759bf07d8f13828b803a821d656cf0f41819 Mon Sep 17 00:00:00 2001 From: Buurazu Date: Sat, 22 Jan 2022 02:11:10 -0500 Subject: [PATCH 8/8] 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