Commit Graph

232 Commits

Author SHA1 Message Date
aerinon
c7a57d63fa feat: customizer options for prices in shops and money balance tuning 2025-01-15 14:34:46 -07:00
Kris Davie
6268a7e503 Fixed issue with 2 extra SP keys in pool for HMG (codemann) 2025-01-15 08:31:38 -07:00
aerinon
f83b6d03da fix: remove some restrictions from gui's custom item pool 2025-01-08 11:54:29 -07:00
Cody
fb6727c527 Fix NoneType object error when BK in starting inventory
ZenArcane has a mode that starts you with all the big keys, maps, compasses, and enough universal small keys to open all doors. The item pool is updated to remove them, but generation fails due to NoneType item variables.

This changes how current_amount is determined to prevent a NoneType variable access and allows for generation to continue.

I haven't noticed any adverse side-effects to this, so I decided to PR this upstream.
2024-12-17 15:17:23 -07:00
aerinon
a2075ec992 fix: inconsistent treatment of beemizer 2024-11-12 14:10:28 -07:00
KrisDavie
5d5aec0325 Fix SP smalls in HMG and remove bat screen wrap from logic 2024-08-12 08:31:13 +02:00
aerinon
54858500e5 fix: suppress warning for missing items if they are in start inventory 2024-05-30 14:02:52 -06:00
aerinon
28872c8d27 feat: skull woods er options 2024-05-28 14:52:24 -06:00
aerinon
8e1f2911cd feat: PreferredLocationGroup support updated 2024-05-11 07:28:07 -06:00
aerinon
bb5236d5d4 feat: promote new entrance shuffle algorithm out of experimental 2024-05-06 16:55:48 -06:00
aerinon
49b190c489 fix: more enemy bans
fix: custom item pool aborts if player is missing
2024-02-26 16:02:35 -07:00
aerinon
d70c9c87f5 fix (hmg): remove the two placed swamp palace keys from the pool 2024-01-31 11:31:59 -07:00
codemann8
0b7b82d027 Split overworld model up by screen 2024-01-05 12:58:35 -07:00
aerinon
2b505df429 fix: typo 2024-01-04 11:50:09 -07: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
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
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
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
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
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
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
aerinon
9aab5a2c95 Beemizer fix for shopsanity, pottery, etc. 2023-03-03 16:53:23 -07: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
aerinon
d7c15ae22c Strict and Partial key logic implementations with new test suite utility 2023-02-17 10:07:43 -07:00
aerinon
4547a0a43b Logic fix for sanc mirror route
Minor updates to customizer
Minor update to new ER (seed duplication issue)
2023-01-18 08:02:32 -07:00
aerinon
22dfeeecca Starting inventory updates
Logic fix for skull woods star tile logic
Standard logic improvement
2023-01-12 15:32:49 -07:00
aerinon
8839926a97 Race flag on GUI
Async Doors League presets
Take into account starting inventory with default item pool
2023-01-06 13:56:18 -07:00
codemann8
55a91f8d17 Merged in DRUnstable v1.2.0.1 2022-12-16 18:18:07 -06:00
codemann8
f8bba4176b Reorganized and renamed regions, rules, and lists 2022-12-14 04:12:17 -06:00
aerinon
becba348b9 New goals and rom update 2022-12-01 14:10:10 -07:00
aerinon
1134eb23e7 Added support for various avianart modes
Uncle boots hints
Some key logic re-working unsure if safe
2022-11-28 15:05:39 -07:00
aerinon
e2392ef237 Merge branch 'Customizer' into Synthesis 2022-10-28 08:56:15 -06:00
aerinon
b71c7aa2b4 Underworld dropshuffle 2022-09-30 15:38:35 -06:00
aerinon
037a9479d8 UW Enemizer Work 2022-09-26 14:07:41 -06:00
aerinon
4f5a41d040 Change customizer item pool to warn of missing items 2022-09-16 10:41:18 -06:00
aerinon
5850edfbe6 Couple minor issues - let a door not be dead in higher intensity, slightly better reporting 2022-09-07 16:49:47 -06:00
aerinon
87834986d4 Retro break up of various options 2022-09-02 13:09:39 -06:00