From 05e502335423f339f44a184a8ee98f2c37f52b69 Mon Sep 17 00:00:00 2001 From: gymnast86 Date: Tue, 28 Apr 2026 03:02:59 -0700 Subject: [PATCH] implement eldin rupee checks --- .../generator/data/actor_patches.yaml | 173 ++++++++++++++++++ .../randomizer/generator/data/locations.yaml | 69 ++++--- 2 files changed, 212 insertions(+), 30 deletions(-) diff --git a/src/dusk/randomizer/generator/data/actor_patches.yaml b/src/dusk/randomizer/generator/data/actor_patches.yaml index 5b446ee9d5..397a830ce2 100644 --- a/src/dusk/randomizer/generator/data/actor_patches.yaml +++ b/src/dusk/randomizer/generator/data/actor_patches.yaml @@ -435,6 +435,46 @@ F_SP121: - 6 - 8 + # Yellow Rupee under BoE Boulder 1 + - name: item + parameters: 0xF3778F03 + position: + x: 37400 + y: -39.2301330566406 + z: -40200 + angle: + x: 0x0000 + y: 0x0000 + z: 0x0005 + patch: + # Take away the unique flag from this rupee so it doesn't conflict + # with the one randomizer rupee nearby + parameters: 0xF377FF03 + layers: + - 0 + - 6 + - 8 + + # Yellow Rupee under BoE Boulder 2 + - name: item + parameters: 0xF3778F03 + position: + x: 37500 + y: -91.5920944213867 + z: -39900 + angle: + x: 0x0000 + y: 0x0000 + z: 0x0005 + patch: + # Take away the unique flag from this rupee so it doesn't conflict + # with the one randomizer rupee nearby + parameters: 0xF377FF03 + layers: + - 0 + - 6 + - 8 + # Room 3 - Kakariko Gorge 3: # Male Pill Bug @@ -475,6 +515,139 @@ F_SP121: - 0 - 6 + # Blue Rupee under Gorge Spire Boulder 1 + - name: item + parameters: 0xF37A8E02 + position: + x: -25742.5 + y: -5147.73876953125 + z: 55865.015625 + angle: + x: 0x0000 + y: 0x0000 + z: 0x0005 + patch: + # Take away the unique flag from this rupee so it doesn't conflict + # with the one randomizer rupee nearby + parameters: 0xF37AFF02 + layers: + - 0 + - 6 + + # Blue Rupee under Gorge Spire Boulder 2 + - name: item + parameters: 0xF37A8E02 + position: + x: -25811.0703125 + y: -5130.3076171875 + z: 56205.63671875 + angle: + x: 0x0000 + y: 0x0000 + z: 0x0005 + patch: + # Take away the unique flag from this rupee so it doesn't conflict + # with the one randomizer rupee nearby + parameters: 0xF37AFF02 + layers: + - 0 + - 6 + + # Green Rupee under Gorge Spire Boulder + - name: item + parameters: 0xF37A8E01 + position: + x: -25676.435546875 + y: -5174.85400390625 + z: 56052.64453125 + angle: + x: 0x0000 + y: 0x0000 + z: 0x0005 + patch: + # Take away the unique flag from this rupee so it doesn't conflict + # with the one randomizer rupee nearby + parameters: 0xF37AFF01 + layers: + - 0 + - 6 + + # Blue Rupee under Gorge Statue Boulder 1 + - name: item + parameters: 0xF3788D02 + position: + x: -14013.876953125 + y: -4640.60107421875 + z: 45103.53515625 + angle: + x: 0x0000 + y: 0x0000 + z: 0x0005 + patch: + # Take away the unique flag from this rupee so it doesn't conflict + # with the one randomizer rupee nearby + parameters: 0xF378FF02 + layers: + - 0 + - 6 + + # Blue Rupee under Gorge Statue Boulder 2 + - name: item + parameters: 0xF3788D02 + position: + x: -13793.6083984375 + y: -4736.62060546875 + z: 45056.8984375 + angle: + x: 0x0000 + y: 0x0000 + z: 0x0005 + patch: + # Take away the unique flag from this rupee so it doesn't conflict + # with the one randomizer rupee nearby + parameters: 0xF378FF02 + layers: + - 0 + - 6 + + # Blue Rupee under Gorge Statue Boulder 3 + - name: item + parameters: 0xF3788D02 + position: + x: -13833.4169921875 + y: -4700.61328125 + z: 45221.265625 + angle: + x: 0x0000 + y: 0x0000 + z: 0x0005 + patch: + # Take away the unique flag from this rupee so it doesn't conflict + # with the one randomizer rupee nearby + parameters: 0xF378FF02 + layers: + - 0 + - 6 + + # Blue Rupee under Gorge Statue Boulder 4 + - name: item + parameters: 0xF3788D02 + position: + x: -13939.875 + y: -4664.60595703125 + z: 45198.17578125 + angle: + x: 0x0000 + y: 0x0000 + z: 0x0005 + patch: + # Take away the unique flag from this rupee so it doesn't conflict + # with the one randomizer rupee nearby + parameters: 0xF378FF02 + layers: + - 0 + - 6 + # Room 6 - Faron Field 6: # Male Beetle diff --git a/src/dusk/randomizer/generator/data/locations.yaml b/src/dusk/randomizer/generator/data/locations.yaml index f8f7a32294..e6dce69fe0 100644 --- a/src/dusk/randomizer/generator/data/locations.yaml +++ b/src/dusk/randomizer/generator/data/locations.yaml @@ -1060,15 +1060,16 @@ - Stage: 56 Room: 3 -# TODO - Name: Kakariko Gorge Owl Statue Boulder Rupee Original Item: Yellow Rupee Categories: - Overworld - Hyrule Field - Eldin - Rupee - Hidden + - Freestanding Item Metadata: - - None + - Stage: 56 + Flag: 0x8D - Name: Kakariko Gorge Poe Original Item: Poe Soul @@ -1102,15 +1103,16 @@ - Tbox ID: 5 Stage: F_SP121 -# TODO - Name: Kakariko Gorge Spire Boulder Rupee Original Item: Yellow Rupee Categories: - Overworld - Hyrule Field - Eldin - Rupee - Hidden + - Freestanding Item Metadata: - - None + - Stage: 56 + Flag: 0x8E - Name: Eldin Lantern Cave First Chest Original Item: Red Rupee @@ -1176,15 +1178,16 @@ - Tbox ID: 21 Stage: F_SP109 -# TODO - Name: Eldin Spring Underwater Boulder Rupee Original Item: Orange Rupee Categories: - Overworld - Kakariko Village - Rupee - Hidden + - Freestanding Item Metadata: - - None + - Stage: 46 + Flag: 0x8D - Name: Kakariko Village Bomb Rock Spire Heart Piece Original Item: Piece of Heart @@ -1197,45 +1200,49 @@ - Stage: 46 Flag: 0x8C -# TODO - Name: Kakariko Village Bell Rupee Original Item: Silver Rupee Categories: - Overworld - Kakariko Village - Rupee - Hidden + - Freestanding Item Metadata: - - None + - Stage: 46 + Flag: 0x8A -# TODO - Name: Kakariko Village Hot Spring Ledge Box Rupee Original Item: Yellow Rupee Categories: - Overworld - Kakariko Village - Rupee - Hidden + - Freestanding Item Metadata: - - None + - Stage: 46 + Flag: 0x87 -# TODO - Name: Kakariko Village Spring Shortcut Box Rupee 1 Original Item: Blue Rupee Categories: - Overworld - Kakariko Village - Rupee - Hidden + - Freestanding Item Metadata: - - None + - Stage: 46 + Flag: 0x88 -# TODO - Name: Kakariko Village Spring Shortcut Box Rupee 2 Original Item: Yellow Rupee Categories: - Overworld - Kakariko Village - Rupee - Hidden + - Freestanding Item Metadata: - - None + - Stage: 46 + Flag: 0x89 # TODO - Name: Kakariko Village Malo Mart Hawkeye @@ -1304,15 +1311,16 @@ - Stage: 68 Flag: 0x90 -# TODO - Name: Kakariko Village Ant House Ledge Box Rupee Original Item: Red Rupee Categories: - Overworld - Kakariko Village - Rupee - Hidden + - Freestanding Item Metadata: - - None + - Stage: 46 + Flag: 0x85 - Name: Barnes Bomb Bag Original Item: Bomb Bag @@ -1451,8 +1459,10 @@ - Overworld - Kakariko Graveyard - Rupee - Hidden + - Freestanding Item Metadata: - - None + - Stage: 48 + Flag: 0x8E - Name: Kakariko Graveyard Golden Wolf Original Item: Progressive Hidden Skill @@ -1503,7 +1513,6 @@ - Tbox ID: 22 Stage: F_SP110 -# TODO - Name: Death Mountain Volcano Ledge Rupee 1 Original Item: Yellow Rupee Categories: @@ -1512,10 +1521,9 @@ - Rupee - Freestanding - Freestanding Item Metadata: - - Stage: 0xFF - Flag: 0xFF + - Stage: 47 + Flag: 0x81 -# TODO - Name: Death Mountain Volcano Ledge Rupee 2 Original Item: Yellow Rupee Categories: @@ -1524,10 +1532,9 @@ - Rupee - Freestanding - Freestanding Item Metadata: - - Stage: 0xFF - Flag: 0xFF + - Stage: 47 + Flag: 0x82 -# TODO - Name: Death Mountain Volcano Ledge Rupee 3 Original Item: Yellow Rupee Categories: @@ -1536,18 +1543,19 @@ - Rupee - Freestanding - Freestanding Item Metadata: - - Stage: 0xFF - Flag: 0xFF + - Stage: 47 + Flag: 0x83 -# TODO - Name: Death Mountain Volcano Pipe Ledge Rock Rupee Original Item: Yellow Rupee Categories: - Overworld - Death Mountain - Rupee - Hidden + - Freestanding Item Metadata: - - None + - Stage: 47 + Flag: 0x80 - Name: Death Mountain Trail Poe Original Item: Poe Soul @@ -1696,15 +1704,16 @@ - Stage: 56 Room: 0 -# TODO - Name: Bridge of Eldin Boulder Rupee Original Item: Red Rupee Categories: - Overworld - Hyrule Field - Eldin - Rupee - Hidden + - Freestanding Item Metadata: - - None + - Stage: 56 + Flag: 0x8F - Name: Eldin Stockcave Upper Chest Original Item: Red Rupee