morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

OoT: big poe count option returns

Browse Source
This commit is contained in:
espeon65536
2022-05-25 23:52:04 -05:00
committed by Fabian Dill
parent dc558f906c
commit dadd7d4693
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
data/lua/OOT/oot_connector.lua
View File

@@ -9,8 +9,7 @@ local script_version = 1
-- Heavily modified form of RiptideSage's tracker -- Heavily modified form of RiptideSage's tracker
-------------------------------------------------- --------------------------------------------------
-- TODO: read this from the ROM local NUM_BIG_POES_REQUIRED = 10
local NUM_BIG_POES_REQUIRED = 1
-- The offset constants are all from N64 RAM start. Offsets in the check statements are relative. -- The offset constants are all from N64 RAM start. Offsets in the check statements are relative.
local save_context_offset = 0x11A5D0 local save_context_offset = 0x11A5D0
@@ -1556,6 +1555,8 @@ local item_queue = {}
local first_connect = true local first_connect = true
local game_complete = false local game_complete = false
NUM_BIG_POES_REQUIRED = mainmemory.read_u8(rando_context + 0x0CEE)
local bytes_to_string = function(bytes) local bytes_to_string = function(bytes)
local string = '' local string = ''
for i=0,#(bytes) do for i=0,#(bytes) do

10
worlds/oot/Options.py
View File

@@ -532,6 +532,14 @@ class ChickenCount(Range):
default = 7 default = 7
class BigPoeCount(Range):
"""Number of Big Poes required for the Poe Collector's item."""
display_name = "Big Poe Count"
range_start = 1
range_end = 10
default = 1
timesavers_options: typing.Dict[str, type(Option)] = { timesavers_options: typing.Dict[str, type(Option)] = {
"skip_child_zelda": SkipChildZelda, "skip_child_zelda": SkipChildZelda,
"no_escape_sequence": SkipEscape, "no_escape_sequence": SkipEscape,
@@ -544,7 +552,7 @@ timesavers_options: typing.Dict[str, type(Option)] = {
"free_scarecrow": FreeScarecrow, "free_scarecrow": FreeScarecrow,
"fast_bunny_hood": FastBunny, "fast_bunny_hood": FastBunny,
"chicken_count": ChickenCount, "chicken_count": ChickenCount,
# "big_poe_count": make_range(1, 10, 1), "big_poe_count": BigPoeCount,
} }

1
worlds/oot/__init__.py
View File

@@ -208,7 +208,6 @@ class OOTWorld(World):
# Not implemented for now, but needed to placate the generator. Remove as they are implemented # Not implemented for now, but needed to placate the generator. Remove as they are implemented
self.mq_dungeons_random = False # this will be a deprecated option later self.mq_dungeons_random = False # this will be a deprecated option later
self.ocarina_songs = False # just need to pull in the OcarinaSongs module self.ocarina_songs = False # just need to pull in the OcarinaSongs module
self.big_poe_count = 1 # disabled due to client-side issues for now
self.mix_entrance_pools = False self.mix_entrance_pools = False
self.decouple_entrances = False self.decouple_entrances = False