Commit Graph

185 Commits

Author SHA1 Message Date
Fabian Dill 5254b5588e fix two region rules 2020-04-10 20:53:19 +02:00
Fabian Dill 95d51d48bf Merge branch 'pull/23'
# Conflicts:
#	BaseClasses.py
#	EntranceShuffle.py
#	ItemList.py
#	Mystery.py
#	Rules.py
2020-04-08 15:07:19 +02:00
Fabian Dill 94e5b5962f Merge branch 'pull/58' into compilingERupdate
# Conflicts:
#	EntranceShuffle.py
#	Rom.py
#	Rules.py
2020-04-05 19:06:15 +02:00
compiling 11a91b96c6 Set inverted blacksmith to require light world access using the mirror or a portal (via starting in Link's House / Old Man Cave doesn't work).
Set the flag allowing the blacksmith to visit Link's House in simple inverted shuffle.
2020-04-05 21:12:26 +10:00
Fabian Dill 42f98da399 remove post-merge duplicate rules 2020-04-04 09:23:10 +02:00
Fabian Dill f89c28d5c2 Merge branch 'master' into pull/58
# Conflicts:
#	AdjusterMain.py
#	BaseClasses.py
#	EntranceShuffle.py
#	Gui.py
#	InvertedRegions.py
#	ItemList.py
#	Main.py
#	Plando.py
#	Rom.py
#	Rules.py
2020-04-04 09:16:39 +02:00
compiling 6003d40ce2 Update inverted big bomb rules.
Add checks that will not allow unexpected entrances to get east dark world logic.
2020-03-19 21:54:13 +11:00
compiling e8ee3de083 Mire key logic update - it is impossible to access the Map Chest key door without hitting a colour switch (or clipping through a rail). 2020-03-15 21:03:43 +11:00
compiling 5c0d34a65d Require a weapon for Castle Tower. 2020-03-15 11:04:08 +11:00
compiling 49e48eba1d Add warp between Waterfall Cave and Lake Hylia into inverted logic. 2020-03-14 13:37:21 +11:00
compiling 6197b915a5 Fix inverted rule for old man house. 2020-03-14 00:39:29 +11:00
compiling 583380cad6 Support vanilla key layout in GT (copy item rando logic - firesnake room needs 2 keys if it contains a small key). 2020-03-09 09:59:54 +11:00
qadan 52982a5e13 kings grave area, waterwalk regions 2020-02-26 15:18:49 -04:00
qadan ea4340b796 fixing mirror bunny stuff 2020-02-19 19:06:48 -04:00
qadan 3015133abd some copypasta goofs 2020-02-19 10:18:09 -04:00
qadan 2b2b97d18a fixing bunny revival and other bunny things 2020-02-18 20:28:33 -04:00
Fabian Dill 95aea8c4b4 rename ocarina to flute. 2020-02-17 10:08:03 +01:00
qadan 43801e8110 you goose 2020-02-12 19:50:23 -04:00
qadan 3d021356b8 hera and tr superbunny logic 2020-02-12 19:48:36 -04:00
qadan 3533f8cbb3 non required exits 2020-02-11 14:11:50 -04:00
qadan 720ce8c492 fixing dungeon bunny revive 2020-02-11 13:01:47 -04:00
qadan 722dfa2b69 fixing up inverted too 2020-02-11 01:14:57 -04:00
qadan aa569d1c3d rework as region connectors (inverted will be broken) 2020-02-10 23:54:35 -04:00
qadan 8db19e544e bomb jump rules, don't redo lamp rules 2020-02-10 09:55:06 -04:00
qadan 3ba3fcf2db dm room chest moved to global. ensuring base rules for owg 2020-02-10 01:02:27 -04:00
qadan ff3b879a02 more idiomatic, bugfix too 2020-02-10 00:38:55 -04:00
qadan 8d5fc3051e adding to inverted 2020-02-09 18:57:55 -04:00
qadan 50687131e8 oh yeah 2020-02-09 18:53:22 -04:00
qadan 36333b3a49 not sure where this went 2020-02-09 18:52:07 -04:00
qadan a5f585ce7c fix bunny logic 2020-02-09 18:43:15 -04:00
qadan 79339a5fdf thats not where that is 2020-02-09 15:14:15 -04:00
qadan 08d908b9fc fixing bunny dmd stuff 2020-02-09 15:06:55 -04:00
qadan a8a12d14ba wip stuff 2020-02-09 13:54:59 -04:00
qadan e4ab046027 ensure inverted runs 2020-02-08 19:00:21 -04:00
qadan c6cf8c1ebe fix bunny rules n stuff 2020-02-08 15:18:17 -04:00
qadan c20fe90c0f maybe broken stuff oh boy 2020-02-08 12:29:55 -04:00
qadan bcb509937a more dmd stuff 2020-02-07 15:15:30 -04:00
qadan fd4f91144b probably still missing things 2020-02-07 13:13:13 -04:00
qadan 96c07eccc2 expanding some rules 2020-02-06 17:17:13 -04:00
qadan 9521a0dbc9 cleaned up bunny dw, bunny revival 2020-02-06 14:46:15 -04:00
qadan d22ccdedb3 some changes 2020-02-06 12:20:50 -04:00
Fabian Dill 9659d01ed4 fix up some ohko stuff 2020-02-04 11:13:42 +01:00
qadan 4b7694b50f updates 2020-01-28 18:19:07 -04:00
qadan 348887ce92 merge conflicts 2020-01-15 19:37:39 -04:00
qadan 277d3ed713 wheee 2020-01-15 19:25:36 -04:00
qadan c677a875f2 accidentally another thing 2020-01-09 14:43:21 -05:00
qadan 62e84dfafd entrances and locations 2020-01-06 13:48:14 -05:00
qadan f151b05b49 accidentally a thing 2020-01-06 12:53:38 -04:00
qadan 12c5e3a390 first pass at superbunny rules 2020-01-03 18:43:50 -04:00
qadan acce83a8d8 accidentally moved a thing 2020-01-03 04:06:00 -04:00