From 06ae4f25e1f54d2af8686d1d45e6a8195de6669b Mon Sep 17 00:00:00 2001 From: aerinon Date: Wed, 20 Sep 2023 13:11:44 -0600 Subject: [PATCH] Several rom fixes, multiworld keys/lamp, pendant count, collection rate Fix for castle barrier gfx in rain state Chainchomp placement in Spiral Cave generation issue A bunch of new bans, Mimics, Stal, Bumper issues mostly. A few others. --- Main.py | 2 +- RELEASENOTES.md | 20 +++- Rom.py | 2 +- data/base2current.bps | Bin 117381 -> 117403 bytes source/enemizer/Enemizer.py | 3 +- source/enemizer/SpriteSheets.py | 5 +- source/enemizer/enemy_deny.yaml | 195 +++++++++++++++++++++++++------- 7 files changed, 182 insertions(+), 45 deletions(-) diff --git a/Main.py b/Main.py index b159eac3..ce8e2516 100644 --- a/Main.py +++ b/Main.py @@ -37,7 +37,7 @@ from source.enemizer.DamageTables import DamageTable from source.enemizer.Enemizer import randomize_enemies from source.rom.DataTables import init_data_tables -version_number = '1.3.0.1' +version_number = '1.3.0.2' version_branch = '-v' __version__ = f'{version_number}{version_branch}' diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 60b9a8e5..77d7707d 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -141,12 +141,30 @@ These are now independent of retro mode and have three options: None, Random, an # Bug Fixes and Notes +* 1.3.0.2v + * Fix for multiworld received keys not counting correctly + * Fix for multiworld lamps incorrect graphics + * Fix for collection rate decreasing on item "pickup" + * Fix for pendants as prizes counting as items + * Fix for castle barrier gfx in rain state + * Enemizer fixes and bans: + * Fixed a generation issue where ChainChomp placement would cause a failure. (Invincible enemies banned in Sprial Cave for early game traversal for now) + * Skull Pot Prison should not be blocked by "impassable" enemies + * Bumpers banned in Ice Hookshot room + * Fixed issue in GT Spike Crystal room + * Fixed blockage issues in TT Ambush and Compass rooms + * Forbid Bumper in Fairy Ascension cave; needed to clip into wall weirdly to pass. + * Enemy Drop bans + * Forbid Stals in many places where they cannot be woken up. Behind rails and on top of blocks, for example. + * A couple minor wizzrobes bans because of despawns. + * Enemies over pits and on conveyors near pits have been issued standard bans for falling enemies. Mimics join the ranks here as they don't work well on pits or on conveyors. + * Mimics banned where conveyors touch walls and could clip out unintentionally * 1.3.0.1v * Fixed bugs with item duping and disappearing drops * Fixed multiworld crash * Fixed assured sword missing when using start inventory (via GUI/CLI) * Forbid extra statues in Swamp Push Statue room - * Forbid bumpers on OW waterr + * Forbid bumpers on OW water * Forbid Stal on pits * Text fix on sprite author (thanks Synack) * 1.2.0.19u diff --git a/Rom.py b/Rom.py index bcbadd1b..010e86d6 100644 --- a/Rom.py +++ b/Rom.py @@ -40,7 +40,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '3302050481ab0c324fb6da95c8f3f099' +RANDOMIZERBASEHASH = 'bc80079ef83a98f718be2a06c40546ce' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 54d6688c330e8e4f4a8baf3759a05ab02f77b1d3..aa06d0481365467b1975891c1bf8e84364e12aa3 100644 GIT binary patch delta 673 zcmV;S0$%-vl?R)Z2e7IE1&KeRKOnQM0Z{=2N^iB0lL7;R0aLSu12_i(U$edn@e&Wo zx2UTfWQ>i9gSP63iTbm?9eDu(A+tCi1O*FhwW#XqnmJP8m6DT3Bq14(x2UiO>gww1 z>VOF%+P0_~A|;ropp_!XvwbQ*}NwZrie63lk6*H5XbQOz* z0HvG1kKMOrHu9HnHu8yy02QOVffbV$fuE_DrKc+d-l>5Ai2wlr0RW`{rK?;7-j`*8 z4}mCx{|$hFLF*2HkNvkdGzfs3YAUEVfJ6u1vmw_B0Rv-hjk7J-_Yn|}&zV5*1R}t; zpp!R%O@cm?HR?b%`e4Ek`Z!?1Fuef6@FIl^rwh;=<_qQvrwh;&#tX&^uRipChYRKl z<_oVt^nQm6;vis?T7i?R>Sh6Uvl8o@cL7Ydu3`cG0u{|@Vt*tG&@TlFpJ-x#;t(M4 zvce#jzGVSh6;6wjWmJ&IJX4T?8LNVguObJ2pCOknW&vjeIx&Pzmzib(DmiMnsAy{< zf&ZRJzn7$$y?_qMB+wm`!hs5tg6RaQB!CTQOZ33D^b~+xI?{$~BEPt($pg>|NT(r} z_+|k%0d-#<#0rAmFzmUG|+Y0c)iV z$q3LZt#Sjo2!eQ!Hp&Y;xPJa07M`}z(i0^;7+4FW1q7(W|e^z zw}P3%AgO)1fD^ZbvBDs!EtlA60XhL#mlJ6LA|7Q@6@Zca|Ns9&y8=@cfQtcuvjBjB z<-3A`?yKKRw^L~WFIWvWNSdBc0hPi`0hPNUmyf{#T?aLBwZ@LO1h@0S0g4C+;|ge( HG#p95Gd(2X delta 632 zcmV-;0*C#Zl?R2D2e7IE1A#v%v#$YB0R+8tLW`3G1A+lcvxfsX2LV>IzzXpa55Tvm zs~u#Fjf#V|>WGQ)v%npB0RbPgIv)fD3u?8f>gt*~QsI@5lSw2Y8HTs0um|eu>gwu% z2_n(9s2U6_XZ$pQ)Fnrz-^BiGcu#qih4-r{I@mfe(Qwg8vPGfkEpI zfWJ|Jl4oU~M}XF|GS>+K1AbVDvp(4O5fPJpfPqPmB!C%#K=1@2z_y^1Me0B{k0yZ0 z`Z!?1Fuef6@FIl^rwh;=<_qSJLV&>(#tX&^uRipChYRKl<_oVtkDiUSh6Ivm)!8cL7SbzG4CW0u#k(Vt*tG&@BZDpJ-x#;t(M4vX{_h0b3PHi<4ngkjFSv zkbxPif{m{t2Y#O&mq2C#X9PAegk_hjW&tWSVYsMhYa)UFo=Clb4#_0Y9h35b3X_8A z1gRu|4QNaBx3=^YfLuD#hHE0WxTwhk&F^Iqs+iqgm#}96ZX3O~t6(74w<2BkoiG7wr47jl&?~KS1JEItS(iCz0f7Omm%C^I z85$~MpR*-qm4Owvf|