Merge pull request #2 from tewtal/master

v9.2 - Casual spoiler fixes, small logic updates and a bunch of base …

app/Randomizer.php

@@ -13,7 +13,7 @@ class Randomizer {
 	 * This represents the logic for the Randmizer, if any locations logic gets changed this should change as well, so
 	 * one knows that if they got the same seed, items will probably not be in the same locations.
 	 */
-	const LOGIC = 9.1;
+	const LOGIC = 9.2;
 	protected $rng_seed;
 	protected $seed;
 	protected $world;
@@ -30,11 +30,11 @@ class Randomizer {
 		0x7C, 0x44, 0xA3, 0x60, 0x42, 0x5C, 0x84, 0x50,0xCE, 0x38, 0x6C, 0x03, 0xDF, 0xC9, 0x58, 0xD5,
 		0x7F, 0x55, 0x54, 0x33, 0x12, 0x0E, 0x59, 0xA1,0x7B, 0xCC, 0x3C, 0xAE, 0x90, 0x01, 0xAA, 0xA4,
 		0x76, 0xEE, 0xE9, 0x17, 0x4A, 0xB1, 0xFB, 0x77,0xE3, 0x16, 0xF7, 0x1E, 0x1D, 0xFC, 0x0B, 0x8A,
-		0x3A, 0x10, 0x24, 0x5A, 0xCB, 0x19, 0x2C, 0x11,0xB4, 0xF6, 0x8F, 0x70, 0xDD, 0xF2, 0xF1, 0x7E,
+		0x3A, 0x10, 0x24, 0x5A, 0xCC, 0x19, 0x2C, 0x11,0xB4, 0xF6, 0x8F, 0x70, 0xDD, 0xF2, 0xF1, 0x7E,
 		0x9B, 0x0F, 0x5D, 0x32, 0xBD, 0xC7, 0x08, 0x4E,0x20, 0x47, 0x69, 0x34, 0x74, 0x0A, 0x89, 0x92,
 		0x82, 0xE6, 0x9A, 0xD8, 0x06, 0xB0, 0xF4, 0x67,0xD0, 0x4D, 0x64, 0x6E, 0x83, 0x6A, 0x61, 0x09,
 		0x37, 0x71, 0x45, 0x49, 0xFF, 0x57, 0xA7, 0x91,0x97, 0xAB, 0x40, 0x08, 0x46, 0x00, 0xFA, 0xB5,
-		0x8D, 0x1B, 0x79, 0xD1, 0x30, 0x13, 0x68, 0xAC,0xE2, 0x21, 0x87, 0x02, 0xAD, 0x75, 0x14, 0x96,
+		0x8D, 0x1B, 0x79, 0xD1, 0x30, 0x13, 0x68, 0xAC,0xE2, 0x21, 0x87, 0x02, 0xAE, 0x75, 0x14, 0x96,
 		0xA6, 0x65, 0xDC, 0xD3, 0x28, 0x6D, 0x5F, 0x86,0x2D, 0xF5, 0x15, 0x3D, 0xB7, 0x99, 0xD6, 0x04,
 		0xBE, 0x73, 0x51, 0x35, 0xE7, 0x8C, 0xBB, 0x36,0x0C, 0x95, 0xC8, 0x25, 0xCF, 0x1C, 0xA0, 0xB3,
 		0x7D, 0x78, 0x4F, 0x18, 0x9D, 0x56, 0xA2, 0xCA,0xEB, 0xE8, 0x93, 0xC0, 0xDB, 0x81, 0x62, 0xED,

app/Region/SuperMetroid/Brinstar/Pink.php

@@ -84,8 +84,9 @@ public function initTournament() {
 		});
 
         $this->can_enter = function($locations, $items) {
-            return ($items->canDestroyBombWalls() || $items->has('SpeedBooster'))
-                && ($items->canOpenRedDoors() || ($items->canDestroyBombWalls() && $items->has('PowerBomb')));
+			return ($items->canOpenRedDoors() && ($items->canDestroyBombWalls() || $items->has('SpeedBooster')))
+				|| $items->canUsePowerBombs()
+				|| ($items->canAccessNorfairPortal() && $items->has('Morph') && ($items->has('IceBeam') || $items->has('HiJump') || $items->canFlySM()));                
 		};
 
 		return $this;
@@ -123,8 +124,9 @@ public function initCasual() {
 		});
 
         $this->can_enter = function($locations, $items) {
-            return ($items->canDestroyBombWalls() || $items->has('SpeedBooster'))
-                && ($items->canOpenRedDoors() || ($items->canDestroyBombWalls() && $items->has('PowerBomb')));
+			return ($items->canOpenRedDoors() && ($items->canDestroyBombWalls() || $items->has('SpeedBooster')))
+				|| $items->canUsePowerBombs()
+				|| ($items->canAccessNorfairPortal() && $items->has('Morph') && $items->has('WaveBeam') && ($items->has('IceBeam') || $items->has('HiJump') || $items->canFlySM()));
 		};
 
 		return $this;

app/Region/SuperMetroid/Norfair/West.php

@@ -90,7 +90,7 @@ public function initCasual() {
         });
 
         $this->locations["Missile (below Ice Beam)"]->setRequirements(function($location, $items) {
-			return ($items->canUsePowerBombs() && $items->has('Varia') && $items->has('SpeedBooster')) || ($items->has('Varia') && $items->has('SpeedBooster'));
+			return ($items->canUsePowerBombs() || $items->has('WaveBeam')) && $items->has('Varia') && $items->has('SpeedBooster');
         });
 
         $this->locations["Hi-Jump Boots"]->setRequirements(function($location, $items) {

app/Rom.php

@@ -9,8 +9,8 @@
  * Wrapper for ROM file
  */
 class Rom {
-	const BUILD = '2018-05-20';
-	const HASH = '0b3aadf863a65ce1e57935b96910cc68';
+	const BUILD = '2018-05-29';
+	const HASH = '36a2e4b8bfa424172de8c8b2418c349d';
 	const SIZE = 6291456;
 	static private $digit_gfx = [
 		0 => 0x30,

app/World.php

@@ -199,7 +199,7 @@ public function removePreCollectedItem(Item $item) : self {
 	 * @return static
 	 */
 	public function copy() {
-		$copy = new static($this->difficulty, $this->logic, $this->goal, $this->variation);
+		$copy = new static($this->difficulty, $this->logic, $this->goal, $this->variation, $this->sm_logic);
 		foreach ($this->locations as $name => $location) {
 			$copy->locations[$name]->setItem($location->getItem());
 		}
@@ -275,6 +275,8 @@ public function getPlayThrough($walkthrough = true) {
 			Item::get('ThreeHundredRupees'),
 			Item::get('Heart'),
 			Item::get('Rupoor'),
+			Item::get('XRay'),
+			Item::get('Spazer'),
 		];
 
 		$location_sphere = $shadow_world->getLocationSpheres();