From 2856f86ee3122b23f8be42a1524735bf1f38be35 Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Sun, 18 Sep 2022 23:20:42 -0700 Subject: [PATCH] Update base rom, and maybe fix multiworld? --- Main.py | 7 ++++--- Rom.py | 2 +- data/base2current.bps | Bin 107173 -> 107163 bytes 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Main.py b/Main.py index 8cf913cd..4698693c 100644 --- a/Main.py +++ b/Main.py @@ -685,9 +685,10 @@ def copy_world_limited(world): ret.push_precollected(ItemFactory(item.name, item.player)) for edge in world.owedges: - copiededge = ret.check_for_owedge(edge.name, edge.player) - if copiededge is not None: - copiededge.dest = ret.check_for_owedge(edge.dest.name, edge.dest.player) + if edge.dest is not None: + copiededge = ret.check_for_owedge(edge.name, edge.player) + if copiededge is not None: + copiededge.dest = ret.check_for_owedge(edge.dest.name, edge.dest.player) for door in world.doors: entrance = ret.check_for_entrance(door.name, door.player) diff --git a/Rom.py b/Rom.py index 265734f1..b94e1f7e 100644 --- a/Rom.py +++ b/Rom.py @@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '8a117bc7b099d7e7ec8b44b97a8fcb37' +RANDOMIZERBASEHASH = '220df7b206fcba399fc84be4e6bc2aee' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 0342be9a11f5b3e0ec5c71dbce0386690f6b1d2c..8ea63f10c23144cb7371c51c596a9ab40e092baa 100644 GIT binary patch delta 499 zcmV}Oe2`DMSw6V43}(zg{dL8Q-X`0k>nPQBp0KhBY={L1|Tw*3Q&Nn;iFZB)hXJF zN~+>8zo76ZIRC)(ejpy1!Z4+ydWD6h2bYnF`hW|UgoVh+pH6|F1%aQ0&6JlYdirbH zzdM*Gsvv8a`fJ*XN|P*tlRKB$G65+8RhI)Z0X`8(1)7N#C}5Atks@8*q}rD)mr^qU zKq3s1i3qRskA|tx5#lhZ7lmE!-~yL%0-J@xFdvh41A>=Hx3n_>g9-sempDEFLJ%V$ ph>>VIYoMU7Z+noNTpYKGJ^=y&0$E?Tjz0kpV+iQsmd)xM)r1rN*x~>H delta 486 zcmV z7Rbn{^(2`@7NZk6@SzAGkC)pq0VNsUf##f{UJ!B3<63+Lu+ANHYOIA~ceT2(R>yhN;jI z;xMTfg6f|nt;sxtwD3IS}FEAOn|vbB*8l(j