New Ganonhunt goal

app/Filler/RandomAssumed.php

@@ -66,7 +66,10 @@ protected function fillItemsInLocations($fill_items, $locations, $base_assumed_i
  ));
 
  if ($remaining_fill_items->count() > $locations->getEmptyLocations()->count()) {
- throw new \Exception("Trying to fill more items than available locations.");
+ throw new \Exception(
+ "Trying to fill more items than available locations." .
+ $remaining_fill_items->count() . ' ' . $locations->getEmptyLocations()->count()
+ );
  }
 
  $worlds = new WorldCollection($this->worlds);

app/Http/Controllers/CustomizerController.php

@@ -131,7 +131,7 @@ protected function prepSeed(Request $request, bool $save = false)
  // some simple validation
  // @TODO: move to validator type classes later
  if (
- $request->input('goal', 'ganon') === 'triforce-hunt'
+ in_array($request->input('goal', 'ganon'), ['triforce-hunt', 'ganonhunt'])
  && ($custom_data['item.Goal.Required'] ?? 0)
  > ($custom_data['item.count.TriforcePiece'] ?? 0) + ($placed_item_count['TriforcePiece:1'] ?? 0)
  ) {

app/Randomizer.php

@@ -103,6 +103,7 @@ public function prepareWorld(World $world): void
  case 'ganon':
  case 'fast_ganon':
  case 'dungeons':
+ case 'ganonhunt':
  $world->getLocation("Ganon")->setItem(Item::get('Triforce', $world));
  break;
  }
@@ -982,12 +983,12 @@ public function setTexts(World $world)
 
  switch ($world->config('goal')) {
  case 'ganon':
- $ganon_crystals_singular = 'To beat Ganon you must collect %d crystal and defeat his minion at the top of his tower.';
- $ganon_crystals_plural = 'To beat Ganon you must collect %d crystals and defeat his minion at the top of his tower.';
+ $ganon_crystals_singular = 'To beat Ganon you must collect %d Crystal and defeat his minion at the top of his tower.';
+ $ganon_crystals_plural = 'To beat Ganon you must collect %d Crystals and defeat his minion at the top of his tower.';
  break;
  default:
- $ganon_crystals_singular = 'You need %d crystal to beat Ganon.';
- $ganon_crystals_plural = 'You need %d crystals to beat Ganon.';
+ $ganon_crystals_singular = 'You need %d Crystal to beat Ganon.';
+ $ganon_crystals_plural = 'You need %d Crystals to beat Ganon.';
  break;
  }
 
@@ -1005,6 +1006,12 @@ public function setTexts(World $world)
  $world->setText('sign_ganon', $ganon_require);
  $world->setText('ganon_fall_in_alt', "You think you\nare ready to\nface me?\n\nI will not die\n\nunless you\ncomplete your\ngoals. Dingus!");
 
+ break;
+ case 'ganonhunt':
+ $ganon_require = sprintf('To beat Ganon you must collect %d Triforce Pieces.', $world->config('item.Goal.Required'));
+ $world->setText('sign_ganon', $ganon_require);
+ $world->setText('ganon_fall_in_alt', "You think you\nare ready to\nface me?\n\nI will not die\n\nunless you\ncomplete your\ngoals. Dingus!");
+
  break;
  case 'pedestal':
  $world->setText('ganon_fall_in_alt', "You cannot\nkill me. You\nshould go for\nyour real goal\nIt's on the\npedestal.\n\nYou dingus!\n");

app/Region/Standard/DarkWorld/NorthEast.php

@@ -183,6 +183,13 @@ public function initalize()
  };
 
  $this->prize_location->setRequirements(function ($locations, $items) {
+ if (
+ $this->world->config('goal') == 'ganonhunt'
+ && (!$items->has('TriforcePiece', $this->world->config('item.Goal.Required')))
+ ) {
+ return false;
+ }
+
  if (
  $this->world->config('goal') == 'dungeons'
  && (!$items->has('PendantOfCourage')

app/Rom.php

@@ -581,9 +581,26 @@ public function setGanonInvincible(string $setting = 'no'): self
  case 'yes':
  $byte = pack('C*', 0x01);
  break;
- case 'custom':
+ case 'crystals_only':
  $byte = pack('C', 0x04);
  break;
+ case 'ganonhunt':
+ $byte = pack('C', 0x05);
+ break;
+ case 'lightspeed':
+ // light world only, pull ped, kill aga 1
+ $byte = pack('C', 0x06);
+ break;
+ case 'crystals_bosses':
+ $byte = pack('C', 0x07);
+ break;
+ case 'bosses_only':
+ $byte = pack('C', 0x08);
+ break;
+ case 'dungeons_no_agahnim':
+ // all dungeons, aga 1 not required
+ $byte = pack('C', 0x09);
+ break;
  case 'no':
  default:
  $byte = pack('C*', 0x00);

app/World.php

@@ -102,7 +102,7 @@ public function __construct(int $id = 0, array $config = [])
  $collected_items->setChecksForWorld($this->id);
  return $collected_items->has('Triforce')
  || ($this->regions['North East Light World']->canEnter($this->locations, $collected_items) &&
- $collected_items->has('TriforcePiece', $this->config('item.Goal.Required')));
+ ($this->config('goal', 'ganon') == 'triforce-hunt' && $collected_items->has('TriforcePiece', $this->config('item.Goal.Required'))));
  };
 
  // Handle configuration options that map to switches.
@@ -375,7 +375,8 @@ public function copy()
  *
  * @return array
  */
- public function getConfig(): array {
+ public function getConfig(): array
+ {
  $config_copy = $this->config;
  return $config_copy;
  }
@@ -1180,12 +1181,16 @@ public function writeToRom(Rom $rom, bool $save = false): Rom
  case 'dungeons':
  $rom->setGanonInvincible('dungeons');
  break;
+ case 'ganonhunt':
+ $rom->initial_sram->preOpenPyramid();
+ $rom->setGanonInvincible('triforce_pieces');
+ break;
  case 'fast_ganon':
  $rom->initial_sram->preOpenPyramid();
 
  // no break
  default:
- $rom->setGanonInvincible('custom');
+ $rom->setGanonInvincible('crystals_only');
  }
 
  if ($this->config('rom.mapOnPickup', false)) {
@@ -1325,7 +1330,8 @@ public function writeToRom(Rom $rom, bool $save = false): Rom
  *
  * @return void
  */
- public function setEscapeFills(Rom $rom) {
+ public function setEscapeFills(Rom $rom)
+ {
  $uncle_items = new ItemCollection;
  $uncle_items->setChecksForWorld($this->id);
  $uncle_items = $uncle_items->addItem($this->getLocation("Link's Uncle")->getItem());
@@ -1343,9 +1349,11 @@ public function setEscapeFills(Rom $rom) {
  $rom->setUncleSpawnRefills(0, 0, 0);
  $rom->setZeldaSpawnRefills(0, 0, 0);
  $rom->setMantleSpawnRefills(0, 0, 0);
- } elseif ($uncle_items->has('FireRod')
+ } elseif (
+ $uncle_items->has('FireRod')
  || $uncle_items->has('CaneOfSomaria')
- || ($uncle_items->has('CaneOfByrna') && $this->config('enemizer.enemyHealth', 'default') == 'default')) {
+ || ($uncle_items->has('CaneOfByrna') && $this->config('enemizer.enemyHealth', 'default') == 'default')
+ ) {
  $rom->setEscapeFills(0b00000100);
  $rom->setUncleSpawnRefills(
  $this->config('rom.EscapeRefills.Uncle.Magic', 0x80),

config/alttp.php

@@ -39,6 +39,17 @@
  ],
  ],
  ],
+ 'ganonhunt' => [
+ 'item' => [
+ 'count' => [
+ 'TriforcePiece' => 60,
+ ],
+ 'Goal' => [
+ 'Required' => 40,
+ 'Icon' => 'triforce',
+ ],
+ ],
+ ],
  ],
  'randomizer' => [
  'item' => [
@@ -206,6 +217,7 @@
  'dungeons' => 'All Dungeons',
  'pedestal' => 'Master Sword Pedestal',
  'triforce-hunt' => 'Triforce Pieces',
+ 'ganonhunt' => 'Ganonhunt',
  ],
  'tower_open' => [
  '0' => 'none',
@@ -326,6 +338,7 @@
  'dungeons' => 10,
  'pedestal' => 10,
  'triforce-hunt' => 10,
+ 'ganonhunt' => 0,
  ],
  'tower_open' => [
  '0' => 5,

resources/js/store/modules/randomizer.js

@@ -186,6 +186,9 @@ export default {
  if (state.goal.value === "dungeons") {
  commit("setGanonOpen", "7");
  }
+ if (state.goal.value === "ganonhunt") {
+ commit("setEntranceShuffle", "none");
+ }
  },
  setGanonOpen({ commit, state }, value) {
  commit("setGanonOpen", value);
@@ -216,6 +219,12 @@ export default {
  if (["full", "standard"].indexOf(state.dungeon_items.value) === -1) {
  commit("setDungeonItems", "standard");
  }
+
+ // ER doesn't currently support Ganonhunt
+ if (state.goal.value === "ganonhunt") {
+ commit("setGoal", "fast_ganon");
+ }
+
  if (state.item_pool.value === "crowd_control") {
  commit("setItemPool", "expert");
  }

resources/lang/de/options.php

@@ -116,6 +116,12 @@
  'Karten, Kompasse, kleine Schlüssel und große Schlüssel sind nicht mehr an ihren Palast gebunden (könnten trotzdem noch drin landen).',
  ],
  ],
+ [
+ 'header' => __('randomizer.goal.options.ganonhunt'),
+ 'content' => [
+ 'The Triforce has been shattered into 60 pieces and scattered throughout Hyrule! You must first collect 40 of the 60 pieces, and only then will Ganon be vulnerable to your attacks! Like Fast Ganon, the hole leading to Ganon has been made permanently accessible. This goal is not available if entrances are randomized.',
+ ],
+ ],
  ],
  ],
  'accessibility' => [

resources/lang/de/randomizer.php

@@ -61,6 +61,7 @@
  'dungeons' => 'Alle Dungeons',
  'pedestal' => 'Master-Schwert Sockel',
  'triforce-hunt' => 'Triforce-Splitter',
+ 'ganonhunt' => 'Ganonhunt',
  ],
  ],
  'tower_open' => [

resources/lang/en/options.php

@@ -168,6 +168,12 @@
  'The Triforce has been shattered into 30 pieces and scattered throughout Hyrule! You must collect 20 of the 30 pieces and take them to Murahdahla to receive the Triforce. Who is Murahdahla I hear you ask? Why, he is obviously the younger brother of Sahasrahla and Aginah! Back from his vacation in Lorule you can find him hanging out around Hyrule Castle courtyard.',
  ],
  ],
+ [
+ 'header' => __('randomizer.goal.options.ganonhunt'),
+ 'content' => [
+ 'The Triforce has been shattered into 60 pieces and scattered throughout Hyrule! You must first collect 40 of the 60 pieces, and only then will Ganon be vulnerable to your attacks! Like Fast Ganon, the hole leading to Ganon has been made permanently accessible. This goal is not available if entrances are randomized.',
+ ],
+ ],
  ],
  ],
  'tower_open' => [

resources/lang/en/randomizer.php

@@ -61,6 +61,7 @@
  'dungeons' => 'All Dungeons',
  'pedestal' => 'Master Sword Pedestal',
  'triforce-hunt' => 'Triforce Pieces',
+ 'ganonhunt' => 'Ganonhunt',
  ],
  ],
  'tower_open' => [

resources/lang/es/options.php

@@ -175,6 +175,12 @@
  '¡La Trifuerza se ha roto en 30 fragmentos esparcidos por todo Hyrule! Tienes que encontrar 20 de las 30 piezas y llevárselas a Murahdahla para recibir la Trifuerza. ¿Que preguntas quién es Murahdahala? ¡Pues obviamente es el hermano menor de Sahasrahla y Aginah! Ha vuelto de sus vacaciones en Lorule y puedes encontrarle pasando el rato en el patio del Castillo de Hyrule.',
  ],
  ],
+ [
+ 'header' => __('randomizer.goal.options.ganonhunt'),
+ 'content' => [
+ 'The Triforce has been shattered into 60 pieces and scattered throughout Hyrule! You must first collect 40 of the 60 pieces, and only then will Ganon be vulnerable to your attacks! Like Fast Ganon, the hole leading to Ganon has been made permanently accessible. This goal is not available if entrances are randomized.',
+ ],
+ ],
  ],
  ],
  'tower_open' => [

resources/lang/es/randomizer.php

@@ -61,6 +61,7 @@
  'dungeons' => 'Todas las mazmorras',
  'pedestal' => 'Pedestal de la Espada Maestra',
  'triforce-hunt' => 'Piezas de la Trifuerza',
+ 'ganonhunt' => 'Ganonhunt',
  ],
  ],
  'tower_open' => [

resources/lang/fr/options.php

@@ -174,6 +174,12 @@
  'La Triforce a été brisée en 30 morceaux, éparpillés à travers Hyrule! Vous devez retrouver 20 des 30 pièces, et les emmener à Murahdhala pour recevoir la Triforce. Qui est ce Murahdahla, me direz-vous? Mais enfin, il est évidemment le petit frère de Sahasrahla et Aginah! De retour de ses vacances à Lorule, vous le trouverez dans la cour du Château d’Hyrule.',
  ],
  ],
+ [
+ 'header' => __('randomizer.goal.options.ganonhunt'),
+ 'content' => [
+ 'The Triforce has been shattered into 60 pieces and scattered throughout Hyrule! You must first collect 40 of the 60 pieces, and only then will Ganon be vulnerable to your attacks! Like Fast Ganon, the hole leading to Ganon has been made permanently accessible. This goal is not available if entrances are randomized.',
+ ],
+ ],
  ],
  ],
  'tower_open' => [

resources/lang/fr/randomizer.php

@@ -61,6 +61,7 @@
  'dungeons' => 'Tous les Donjons',
  'pedestal' => 'Piédestal de la Master Sword',
  'triforce-hunt' => 'Morceaux de Triforce ',
+ 'ganonhunt' => 'Ganonhunt',
  ],
  ],
  'tower_open' => [

resources/views/updates.blade.php

@@ -7,6 +7,7 @@
  <li>New Features</li>
  <ul>
  <li>The randomizer now uses a new font that is more compact and contains lowercase characters! Thank you to total, kan, kara, Aerinon, and cassidymoen for the work on this feature.</li>
+ <li>A new goal called "Ganonhunt" has been added! This goal is similar to the "Triforce Pieces" goal, but requires the player to defeat Ganon after collecting the triforce pieces instead of turning them into Murahdahla.</li>
  <li>Players may now include lowercase letters and numbers in their file name.</li>
  <li>Winners of the 2022 Main Tournament, and 2022 No Logic tournaments have been added to their respective in-game signs.</li>
  <li>Hybrid Major Glitches is now a fully supported logic option.</li>

tests/RomTest.php

@@ -679,9 +679,16 @@ public function testSetGanonInvincibleYes()
  $this->assertEquals(0x01, $this->rom->read(0x18003E));
  }
 
- public function testSetGanonInvincibleCustom()
+ public function testSetGanonInvincibleTriforcePieces()
  {
- $this->rom->setGanonInvincible('custom');
+ $this->rom->setGanonInvincible('triforce_pieces');
+
+ $this->assertEquals(0x05, $this->rom->read(0x18003E));
+ }
+
+ public function testSetGanonInvincibleCrystalsOnly()
+ {
+ $this->rom->setGanonInvincible('crystals_only');
 
  $this->assertEquals(0x04, $this->rom->read(0x18003E));
  }
@@ -762,7 +769,7 @@ private function assertHeartColorSetting($expectedColor)
  $this->assertEquals($expectedByte, $this->rom->read(0x6FA2C));
  $this->assertEquals($expectedByte, $this->rom->read(0x6FA2E));
  $this->assertEquals($expectedByte, $this->rom->read(0x6FA30));
- 
+
  $this->assertEquals($expectedFileByte, $this->rom->read(0x65561));
  }