Merge pull request #895 from sporchia/v31.0.7

V31.0.7 Release

app/Console/Commands/UpdateBuildRecord.php

@@ -75,9 +75,28 @@ public function handle()
             }
         }
 
+        $build_date = $this->argument('build');
+
+        if (!$build_date) {
+            $git_log = new Process(
+                ['git', 'log', '-1','--format=%cd', '--date=short'],
+                base_path("vendor/z3/randomizer"));
+
+            $git_log->run();
+
+            if (!$git_log->isSuccessful()) {
+                $this->error($proc->getErrorOutput());
+
+                $this->error("Unable to retrieve last commit date.");
+
+                return 301;
+            }
+
+            $build_date = trim($git_log->getOutput());
+        }
 
         $build = Build::firstOrNew([
-            'build' => $this->argument('build') ?? date('Y-m-d'),
+            'build' => $build_date,
         ]);
         $build->hash =  hash_file('md5', $romFile);
         $build->patch = '[]';

app/Enemizer.php

@@ -67,7 +67,7 @@ public function randomize(int $rng_seed = null)
         $system = php_uname('s') == 'Darwin' ? 'osx' : 'linux';
 
         $proc = new Process([
-            base_path("bin/enemizer/$system/EnemizerCLI.Core"),
+            base_path("vendor/z3/enemizer_$system/EnemizerCLI.Core"),
             '--rom',
             config('enemizer.base'),
             '--seed',
@@ -80,7 +80,7 @@ public function randomize(int $rng_seed = null)
             $this->options_file,
             '--output',
             $this->patch_file,
-        ], base_path("bin/enemizer/$system"));
+        ], base_path("vendor/z3/enemizer_$system"));
 
         Log::debug($proc->getCommandLine());
 
@@ -94,7 +94,7 @@ public function randomize(int $rng_seed = null)
             throw new \Exception("Unable to generate");
         }
 
-        $file_contents = file_get_contents(base_path("bin/enemizer/$system/enemizerBasePatch.json"));
+        $file_contents = file_get_contents(base_path("vendor/z3/enemizer_$system/enemizerBasePatch.json"));
 
         if ($file_contents === false) {
             Log::error('enemizer base not readable');

app/Randomizer.php

@@ -795,7 +795,7 @@ public function randomizeCredits(World $world)
             "sandstorms", "sandwiched", "sauerkraut", "schipperke", "schismatic", "schizocarp", "schmalzier",
             "schmeering", "schmoosing", "shibboleth", "shovelnose", "sahananana", "sarararara", "salamander",
             "sharshalah", "shahabadoo", "sassafrass", "saddlebags", "sandalwood", "shagadelic", "sandcastle",
-            "saltpeters", "shabbiness", "shlrshlrsh", "sassyralph", "sallyacorn", "sahasrahbot"
+            "saltpeters", "shabbiness", "shlrshlrsh", "sassyralph", "sallyacorn", "sahasrahbot", "sasharalla",
         ]));
         $world->setCredit('kakariko', "$name's homecoming");
 

app/Rom.php

@@ -12,8 +12,8 @@
  */
 class Rom
 {
-    const BUILD = '2020-08-03';
-    const HASH = '11f68a2420b7ca44de97878582e6aa05';
+    const BUILD = '2020-09-25';
+    const HASH = '251976ea7cdaadf16742c4f86c571732';
     const SIZE = 2097152;
 
     private $tmp_file;
@@ -2664,6 +2664,31 @@ public function setMirrorlessSaveAndQuitToLightWorld(bool $enable = true): self
         return $this;
     }
 
+    /**
+     * Sets intro text and, in the future, other game elements to mask settings
+     * visible to the player prior to the start of a run.  This is used when
+     * spoilers is set to "mystery".  This text is currently what is used by
+     * the entrance randomizer.
+     *
+     * @param bool $enable switch on or off
+     *
+     * @return $this
+     */
+    public function setMysteryMasking(bool $enable = true): self
+    {
+        if ($enable) {
+            $this->text->setString('intro_main', "{INTRO}\n Episode  III\n{PAUSE3}\n A Link to\n   the Past\n"
+            . "{PAUSE3}\n  Randomizer\n{PAUSE3}\nAfter mostly disregarding what happened in the first two games.\n"
+            . "{PAUSE3}\nLink awakens to his uncle leaving the house.\n{PAUSE3}\nHe just runs out the door,\n"
+            . "{PAUSE3}\ninto the rainy night.\n{PAUSE3}\n{CHANGEPIC}\nGanon has moved around all the items in Hyrule.\n"
+            . "{PAUSE7}\nYou will have to find all the items necessary to beat Ganon.\n"
+            . "{PAUSE7}\nThis is your chance to be a hero.\n{PAUSE3}\n{CHANGEPIC}\n"
+            . "You must get the 7 crystals to beat Ganon.\n{PAUSE9}\n{CHANGEPIC}", false);
+        }
+
+        return $this;
+    }
+
     /**
      * Enable/Disable ability to Save and Quit from Boss room after item collection.
      *

app/World.php

@@ -884,7 +884,7 @@ public function getSpoiler(array $meta = []): array
             'crystals_ganon' => $this->config('crystals.ganon'),
             'crystals_tower' => $this->config('crystals.tower'),
             'tournament' => $this->config('tournament', false),
-            'size' => $this->isEnemized() ? 4 : 2,
+            'size' => 2,
             'hints' => $this->config('spoil.Hints'),
             'spoilers' => $this->config('spoilers', 'off'),
             'allow_quickswap' => $this->config('allow_quickswap'),
@@ -1151,6 +1151,8 @@ public function writeToRom(Rom $rom, bool $save = false): Rom
             $rom->setGameType('item');
         }
 
+        $rom->setMysteryMasking($this->config('spoilers', 'on') === 'mystery');
+
         $rom->writeCredits();
         $rom->writeText();
 

composer.json

@@ -27,7 +27,8 @@
     "martinlindhe/laravel-vue-i18n-generator": "^0.1.35",
     "sentry/sentry": "^2.0",
     "sentry/sentry-laravel": "^1.0",
-    "z3/enemizer": "6.0.29",
+    "z3/enemizer_linux": "6.1.0.180",
+    "z3/enemizer_osx": "6.1.0.180",
     "z3/entrancerandomizer": "^0.6.3",
     "z3/randomizer": "^31.0"
   },
@@ -46,23 +47,33 @@
       "type": "package",
       "package": {
         "name": "z3/randomizer",
-        "version": "31.0.5",
+        "version": "31.0.7",
         "source": {
           "url": "https://github.com/KatDevsGames/z3randomizer",
           "type": "git",
-          "reference": "tags/31.0.5"
+          "reference": "76f35b878696eea8ac869ef7c148a65e4e7825b5"
         }
       }
     },
     {
       "type": "package",
       "package": {
-        "name": "z3/enemizer",
-        "version": "6.0.29",
-        "source": {
-          "url": "https://github.com/Zarby89/Enemizer",
-          "type": "git",
-          "reference": "tags/6.0.29"
+        "name": "z3/enemizer_linux",
+        "version": "6.1.0.180",
+        "dist": {
+          "url": "https://github.com/tcprescott/Enimizer/releases/download/2mb-rom/ubuntu.16.04-x64.tar.gz",
+          "type": "tar"
+        }
+      }
+    },
+    {
+      "type": "package",
+      "package": {
+        "name": "z3/enemizer_osx",
+        "version": "6.1.0.180",
+        "dist": {
+          "url": "https://github.com/tcprescott/Enimizer/releases/download/2mb-rom/osx.10.12-x64.tar.gz",
+          "type": "tar"
         }
       }
     },