Commit Graph

302 Commits

Author SHA1 Message Date
codemann8
4dd334f66e Fix SP key placement/removal issue in HMG 2024-03-22 05:19:10 -05:00
codemann8
4423a33fee Merged in DR v1.4.1.7 2024-03-16 01:34:39 -05:00
aerinon
49b190c489 fix: more enemy bans
fix: custom item pool aborts if player is missing
2024-02-26 16:02:35 -07:00
codemann8
21a1706657 Merged in DR v1.4.1.6 2024-02-23 11:48:04 -06:00
aerinon
d70c9c87f5 fix (hmg): remove the two placed swamp palace keys from the pool 2024-01-31 11:31:59 -07:00
codemann8
744c2ef527 Fix for HMG SP keys in pool 2024-01-29 14:20:50 -06:00
codemann8
2bec50b26b Implemented District ER 2024-01-10 05:57:39 -06:00
codemann8
0b7b82d027 Split overworld model up by screen 2024-01-05 12:58:35 -07:00
aerinon
b5795e4bf2 Merge branch 'KrisDavie-hmg_logic' into DoorDevVolatile 2024-01-05 09:47:57 -06:00
aerinon
2b505df429 fix: typo 2024-01-04 11:50:09 -07:00
aerinon
6ed937971d fix(vanilla_fill): make uncle weapon non-random, make medallions vanilla
fix(enemizer): enemy bans
2023-12-27 15:56:25 -06:00
aerinon
bd7ce54dd3 fix: minor fix for take_anys
fix: money balancing - initialization in a good case
2023-12-27 15:45:01 -06:00
KrisDavie
9352067d69 Fix swamp smalls in pottery to get out of swamp 2023-12-22 22:48:42 +01:00
KrisDavie
dad1ee8336 Implement basic HMG logic
* Ice Palace Lobby Clip
* Kikiskip to Pod
* Mire -> Hera -> Swamp
  - Mire small door to rupee room is removed
  - Hera and Swamp keys are placed without logic
  - Swamp locked by vanilla rules or having all mire smalls
* Above as connectors in ER
2023-12-22 22:48:42 +01:00
aerinon
c4ebbe5421 fix(vanilla_fill): make uncle weapon non-random, make medallions vanilla
fix(enemizer): enemy bans
2023-12-22 14:41:05 -07:00
aerinon
4b888b3c48 feat: swapped ER 2023-12-19 16:31:29 -07:00
aerinon
c4ec28da76 fix: minor fix for take_anys
fix: money balancing - initialization in a good case
2023-12-13 13:59:34 -07:00
codemann8
a6f244cd01 Implement Return Old Man already in starting inventory 2023-12-07 13:06:49 -06:00
Paul Wendelboe
c849f8202c Update ItemList.py
Fix iteration on item instead of name when using a custom pool in some cases.
2023-10-09 00:39:54 +00:00
aerinon
26c26acd6e Fix item duping and disappearing
Fix mutliworld crash
Fix assured sword + start inventory
New bans on enemy placement
2023-09-14 08:51:29 -06:00
aerinon
9e6bcf8a99 Various enemizer adjustments and fixes
Fix for retro location counting
Baserom update
2023-09-12 08:40:24 -06:00
codemann8
9bb29d32d8 Changing TakeAny sword to count towards item collection 2023-09-10 14:44:46 -05:00
aerinon
90f1629f0e Merge branch 'DoorDevUnstable' into DoorDevVolatile
# Conflicts:
#	Main.py
#	MultiClient.py
#	Rom.py
#	data/base2current.bps
#	resources/app/gui/lang/en.json
#	resources/app/gui/randomize/item/widgets.json
#	source/gui/bottom.py
#	source/gui/widgets.py
2023-08-04 11:33:31 -06:00
codemann8
d79c8c1fd1 Merged in DR v1.2.0.19 2023-07-29 05:03:37 -05:00
codemann8
551638e00c Merged in DR v1.2.0.18 2023-07-19 16:12:09 -05:00
aerinon
213d3d3aa0 Fixed an issue where certain vanilla door types would not allow other types to be placed.
Customizer: fixed an issue where last ditch placements would move customized items. Those are now locked and the generation will fail instead if no alternatives are found.
2023-07-19 12:31:50 -06:00
codemann8
a987e58fc9 Adding Flute Activation only if an activated flute cannot be found elsewhere 2023-07-17 02:13:16 -05:00
codemann8
4f5d268401 Adding new Swapped ER mode option 2023-07-16 01:07:17 -05:00
aerinon
1b81151941 Customizer: Fixed issue with Assured sword and start inventory 2023-07-12 09:50:53 -06:00
aerinon
d135405ed3 Customizer: Exception raised for placements of items that are not in pool 2023-07-12 09:16:00 -06:00
aerinon
5d2ceaf75c Updated baserom for crystal custscene and hera music fix
Updated a couple of error messages and when they are displayed
Updated Ganonhunt goal text to be more consistent across randomizers
2023-07-10 13:56:05 -06:00
codemann8
a842939e92 Various region/rule reorganization to match DR 2023-06-13 18:36:16 -05:00
codemann8
d606a84c35 ROM Updates
- Fix Bonk count capping at 99 in credits
- Fix Hera boss music still plays after boss defeated
- Fixed Murahdahla in Rainstate
2023-05-12 21:31:24 -05:00
codemann8
793f3b30b0 Merged in DR v1.2.0.14 (2nd) 2023-04-07 12:04:12 -05:00
aerinon
187478eb24 Merge branch 'DoorDevUnstable' into Sandbox
# Conflicts:
#	Gui.py
#	Main.py
#	Rom.py
#	Rules.py
#	data/base2current.bps
#	resources/app/gui/lang/en.json
#	resources/app/gui/randomize/dungeon/widgets.json
2023-04-05 16:26:26 -06:00
aerinon
3e65deda14 Minor fixes 2023-04-03 16:37:29 -06:00
codemann8
3eeeda363b Fixed various Flute logic issues and improved logic efficiency 2023-04-01 07:59:13 -05:00
aerinon
41a0751009 Merge branch 'WorldModelRefactor' into DoorDevUnstable 2023-03-31 16:07:31 -06:00
aerinon
a4f3afdf5d Reduce retro keys slightly 2023-03-31 16:00:15 -06:00
aerinon
a0b781521f Big enemizer updates
Fix sheets
Health + damage rando
Logical kill rooms
2023-03-30 16:12:46 -06:00
aerinon
4aae603462 Merge branch 'DoorDevUnstable' into Sandbox
# Conflicts:
#	ItemList.py
#	Items.py
#	Main.py
#	Rom.py
#	data/base2current.bps
2023-03-10 13:43:38 -07:00
aerinon
1a1c60f84a Merge branch 'SynthesisOWRMerge' of github.com:codemann8/ALttPDoorRandomizer into codemann8-SynthesisOWRMerge
# Conflicts:
#	Rules.py
#	source/overworld/EntranceShuffle2.py
2023-03-09 11:29:03 -07:00
codemann8
252f9ba1a7 Remove 5 Arrow items from bonk drop locations 2023-03-08 20:41:16 -06:00
codemann8
e6a1476244 Merged in DR v1.2.0.11 2023-03-07 18:58:08 -06:00
aerinon
9aab5a2c95 Beemizer fix for shopsanity, pottery, etc. 2023-03-03 16:53:23 -07:00
codemann8
d1b4d9e044 Merged in DR v1.2.0.10 2023-03-02 19:07:04 -06:00
aerinon
d23d2d8323 Better support for customized start_inverntory with dungeon items (can be mixed with item pool) 2023-02-24 15:45:37 -07:00
codemann8
ab5f348f77 Merged in DR v1.2.0.8 2023-02-18 19:33:15 -06:00
aerinon
d7c15ae22c Strict and Partial key logic implementations with new test suite utility 2023-02-17 10:07:43 -07:00
codemann8
96806f2b5e Merged DR v1.2.0.5 2023-01-19 08:18:22 -06:00