mirror of
https://github.com/MarioSpore/Grinch-AP.git
synced 2025-10-21 04:01:32 -06:00
Ocarina of Time: Itemlinks and bugfixes (#1157)
* OoT: ER improvements Include dungeon rewards in itempool to allow for ER improvement Better validate_world function by checking for multi-entrance incompatibility more efficiently Fix some generation failures by ensuring all entrances placed with logic Introduce bias to some interior entrance placement to improve generation rate * OoT: fix overworld ER spoiler information * OoT: rewrite dungeon item placement algorithm in particular, no longer assumes that exactly the number of vanilla keys is present, which lets it place more or fewer items. * OoT: auto-send more locations Now should autosend cows, DMT/DMC great fairies, medigoron, and bombchu salesman This should be every check autosending. these ones are super weird for some reason and didn't get fixed with the others * OoT: add items forced local by settings to AP's local_items * OoT: fast-fill shop junk items * OoT: ensure that Kokiri Shop is always reachable immediately in closed forest hence Deku Shield can be bought to leave the forest * OoT: randomize internal connect name Connect name is now a random 16-character string. This should prevent any issues with connecting to a room with the wrong ROM with probability almost 1. * OoT: introduce TrackRandomRange for trials hint and mq dungeon maps * OoT: enable proper itemlinking of songs and dungeon items, with restricted placements according to player settings * OoT: barren hint oversight fix * OoT: allow NL + ER to roll properly * OoT: 3.8 compatibility set and list builtins don't have proper typing support until 3.9, apparently * OoT: remove Gerudo Membership Card location from the pool if fortress open and card not randomized another long-standing bug squished * OoT: exclude locations in the itemlink song fill if they aren't also priority * OoT: prevent data bleed when client isn't closed between different game connections I don't understand why people keep doing this * OoT: linter appeasement it was a real error though * fixing merge conflicts is hard * oot merge update #2 * OoT: removed accidentally duplicated code
This commit is contained in:
@@ -77,12 +77,13 @@ local scrub_sanity_check = function(scene_offset, bit_to_check)
|
||||
return scene_check(scene_offset, bit_to_check, 0x10)
|
||||
end
|
||||
|
||||
-- Why is there an extra offset of 3 for temp context checks? Who knows.
|
||||
local cow_check = function(scene_offset, bit_to_check)
|
||||
return scene_check(scene_offset, bit_to_check, 0xC)
|
||||
or check_temp_context({scene_offset, 0x00, bit_to_check})
|
||||
or check_temp_context({scene_offset, 0x00, bit_to_check - 0x03})
|
||||
end
|
||||
|
||||
-- Haven't been able to get DMT and DMC fairy to send instantly
|
||||
-- DMT and DMC fairies are weird, their temp context check is special-coded for them
|
||||
local great_fairy_magic_check = function(scene_offset, bit_to_check)
|
||||
return scene_check(scene_offset, bit_to_check, 0x4)
|
||||
or check_temp_context({scene_offset, 0x05, bit_to_check})
|
||||
@@ -100,6 +101,18 @@ local bean_sale_check = function(scene_offset, bit_to_check)
|
||||
or check_temp_context({scene_offset, 0x00, 0x16})
|
||||
end
|
||||
|
||||
-- Medigoron reports 0x00620028 to 0x40002C
|
||||
local medigoron_check = function(scene_offset, bit_to_check)
|
||||
return scene_check(scene_offset, bit_to_check, 0xC)
|
||||
or check_temp_context({scene_offset, 0x00, 0x28})
|
||||
end
|
||||
|
||||
-- Bombchu salesman reports 0x005E0003 to 0x40002C
|
||||
local salesman_check = function(scene_offset, bit_to_check)
|
||||
return scene_check(scene_offset, bit_to_check, 0xC)
|
||||
or check_temp_context({scene_offset, 0x00, 0x03})
|
||||
end
|
||||
|
||||
--Helper method to resolve skulltula lookup location
|
||||
local function skulltula_scene_to_array_index(i)
|
||||
return (i + 3) - 2 * (i % 4)
|
||||
@@ -575,7 +588,7 @@ local read_death_mountain_trail_checks = function()
|
||||
checks["DMT Freestanding PoH"] = on_the_ground_check(0x60, 0x1E)
|
||||
checks["DMT Chest"] = chest_check(0x60, 0x01)
|
||||
checks["DMT Storms Grotto Chest"] = chest_check(0x3E, 0x17)
|
||||
checks["DMT Great Fairy Reward"] = great_fairy_magic_check(0x3B, 0x18)
|
||||
checks["DMT Great Fairy Reward"] = great_fairy_magic_check(0x3B, 0x18) or check_temp_context({0xFF, 0x05, 0x13})
|
||||
checks["DMT Biggoron"] = big_goron_sword_check()
|
||||
checks["DMT Cow Grotto Cow"] = cow_check(0x3E, 0x18)
|
||||
|
||||
@@ -592,7 +605,7 @@ local read_goron_city_checks = function()
|
||||
checks["GC Pot Freestanding PoH"] = on_the_ground_check(0x62, 0x1F)
|
||||
checks["GC Rolling Goron as Child"] = info_table_check(0x22, 0x6)
|
||||
checks["GC Rolling Goron as Adult"] = info_table_check(0x20, 0x1)
|
||||
checks["GC Medigoron"] = on_the_ground_check(0x62, 0x1)
|
||||
checks["GC Medigoron"] = medigoron_check(0x62, 0x1)
|
||||
checks["GC Maze Left Chest"] = chest_check(0x62, 0x00)
|
||||
checks["GC Maze Right Chest"] = chest_check(0x62, 0x01)
|
||||
checks["GC Maze Center Chest"] = chest_check(0x62, 0x02)
|
||||
@@ -614,7 +627,7 @@ local read_death_mountain_crater_checks = function()
|
||||
checks["DMC Volcano Freestanding PoH"] = on_the_ground_check(0x61, 0x08)
|
||||
checks["DMC Wall Freestanding PoH"] = on_the_ground_check(0x61, 0x02)
|
||||
checks["DMC Upper Grotto Chest"] = chest_check(0x3E, 0x1A)
|
||||
checks["DMC Great Fairy Reward"] = great_fairy_magic_check(0x3B, 0x10)
|
||||
checks["DMC Great Fairy Reward"] = great_fairy_magic_check(0x3B, 0x10) or check_temp_context({0xFF, 0x05, 0x14})
|
||||
|
||||
checks["DMC Deku Scrub"] = scrub_sanity_check(0x61, 0x6)
|
||||
checks["DMC Deku Scrub Grotto Left"] = scrub_sanity_check(0x23, 0x1)
|
||||
@@ -961,7 +974,7 @@ end
|
||||
|
||||
local read_haunted_wasteland_checks = function()
|
||||
local checks = {}
|
||||
checks["Wasteland Bombchu Salesman"] = on_the_ground_check(0x5E, 0x01)
|
||||
checks["Wasteland Bombchu Salesman"] = salesman_check(0x5E, 0x01)
|
||||
checks["Wasteland Chest"] = chest_check(0x5E, 0x00)
|
||||
checks["Wasteland GS"] = skulltula_check(0x15, 0x1)
|
||||
return checks
|
||||
|
Reference in New Issue
Block a user