diff --git a/src/dusk/randomizer/generator/data/actor_additions.yaml b/src/dusk/randomizer/generator/data/actor_additions.yaml index 99efaee9f4..ef84718b51 100644 --- a/src/dusk/randomizer/generator/data/actor_additions.yaml +++ b/src/dusk/randomizer/generator/data/actor_additions.yaml @@ -72,6 +72,27 @@ ACTR: # Objects which have the ACTR dzx type layers: - 2 + # Outside Arbiters Grounds + F_SP118: + # Room 1 - Bulblin Camp + 1: + # Spawn in the item for the Bulblin Guard Key on + # the layer where the camp is already beaten + - name: htPiece + parameters: 0x00FF9AD7 + position: + x: 4000 + y: 300 + z: -3500 + angle: + x: 0x0000 + y: 0x0000 + z: 0x0000 + layers: + - 1 + - 2 + - 3 + R_SP109: # Kakariko Interiors 3: # Kak Malo Mart # Spawn in a middle item Sold Out Sign diff --git a/src/dusk/randomizer/generator/data/actor_patches.yaml b/src/dusk/randomizer/generator/data/actor_patches.yaml index 485fba8dcd..30ef13f9ff 100644 --- a/src/dusk/randomizer/generator/data/actor_patches.yaml +++ b/src/dusk/randomizer/generator/data/actor_patches.yaml @@ -1317,6 +1317,71 @@ F_SP117: layers: - 2 +# Outside Arbiters Grounds +F_SP118: + # Room 1 - Bulblin Camp + 1: + # Small Key Actor + - name: Obj_key + parameters: 0xFFFFFFFF + position: + x: 4470 + y: 300 + z: -2950 + angle: + x: 0x0000 + y: 0x0000 + z: 0x0000 + patch: + # Turn this small key into the rando check + name: htPiece + parameters: 0x00FF9AD7 + position: + x: 4000 + z: -3500 + layers: + - 0 + + # Chest in front of bulblin camp + - name: tboxA0 + parameters: 0xFF0FFFC0 + position: + x: 4761.640625 + y: 0 + z: 1580.57019042969 + angle: + x: 0x0000 + y: 0xE000 + z: 0x0FFF + patch: + # Give this chest a unique tboxid + parameters: 0xFF0FF7C0 + layers: + - 0 + - 1 + - 2 + - 3 + + # Chest in back of bulblin camp + - name: tboxA0 + parameters: 0xFF0FFFC0 + position: + x: 2389.04541015625 + y: 260 + z: -1473.38720703125 + angle: + x: 0x0000 + y: 0x6000 + z: 0x05FF + patch: + # Give this chest a unique tboxid + parameters: 0xFF0FF780 + layers: + - 0 + - 1 + - 2 + - 3 + # Hyrule Field F_SP121: # Room 0 - Eldin Field / Bridge of Eldin diff --git a/src/dusk/randomizer/generator/data/locations.yaml b/src/dusk/randomizer/generator/data/locations.yaml index 6e74853768..7eee4cdf6e 100644 --- a/src/dusk/randomizer/generator/data/locations.yaml +++ b/src/dusk/randomizer/generator/data/locations.yaml @@ -4367,7 +4367,6 @@ - Tbox ID: 30 Stage: 55 -# TODO (Might work, haven't checked) - Name: Bulblin Camp Roasted Boar Original Item: Piece of Heart Categories: @@ -4379,7 +4378,6 @@ - Stage: 55 Flag: 0x9F -# TODO - Name: Bulblin Guard Key Original Item: Gerudo Desert Bulblin Camp Key Categories: @@ -4388,7 +4386,8 @@ - Small Key - DZX Metadata: - - None + - Stage: 55 + Flag: 0x9A - Name: Bulblin Camp Poe Original Item: Poe Soul