diff --git a/app/Http/Controllers/MoonsController.php b/app/Http/Controllers/MoonsController.php index 43b214358..f46685896 100644 --- a/app/Http/Controllers/MoonsController.php +++ b/app/Http/Controllers/MoonsController.php @@ -33,9 +33,9 @@ class MoonsController extends Controller //Setup formats as needed $spm = $moon->System . ' - ' . $moon->Planet . ' - ' . $moon->Moon; $rentalEnd = date('m/d/Y', $moon->RentalEnd); - $price = $moonCalc->SpatialMoons($moon->FirstOre, $moon->FirstQuantity, $moon->SecondOre, $moon->SecondQuantity, + $price = $moonCalc->SpatialMoonsOnlyGoo($moon->FirstOre, $moon->FirstQuantity, $moon->SecondOre, $moon->SecondQuantity, $moon->ThirdOre, $moon->ThirdQuantity, $moon->FourthOre, $moon->FourthQuantity); - $allyPrice = $moonCalc->SpatialMoonsOutOfAlliance($moon->FirstOre, $moon->FirstQuantity, $moon->SecondOre, $moon->SecondQuantity, + $allyPrice = $moonCalc->SpatialMoonsOutOfAllianceOnlyGoo($moon->FirstOre, $moon->FirstQuantity, $moon->SecondOre, $moon->SecondQuantity, $moon->ThirdOre, $moon->ThirdQuantity, $moon->FourthOre, $moon->FourthQuantity); //Add the data to the html string to be passed to the view $html .= ''; diff --git a/app/Library/MoonCalc.php b/app/Library/MoonCalc.php index 65abfbac2..b88a6627d 100644 --- a/app/Library/MoonCalc.php +++ b/app/Library/MoonCalc.php @@ -21,6 +21,18 @@ class MoonCalc { private function IsRMoon($ore) { $ores = [ + 'Zeolites' => 'Gas', + 'Sylvite' => 'Gas', + 'Bitumens' => 'Gas', + 'Coesite' => 'Gas', + 'Cobaltite' => 'R8', + 'Euxenite' => 'R8', + 'Titanite' => 'R8', + 'Scheelite' => 'R8', + 'Otavite' => 'R16', + 'Sperrylite' => 'R16', + 'Vanadinite' => 'R16', + 'Chromite' => 'R16', 'Carnotite' => 'R32', 'Zircon' => 'R32', 'Pollucite' => 'R32', @@ -41,7 +53,7 @@ class MoonCalc { return false; } - public function SpatialMoonsOnlyRares($firstOre, $firstQuan, $secondOre, $secondQuan, $thirdOre, $thirdQuan, $fourthOre, $fourthQuan) { + public function SpatialMoonsOnlyGoo($firstOre, $firstQuan, $secondOre, $secondQuan, $thirdOre, $thirdQuan, $fourthOre, $fourthQuan) { //Always assume a 1 month pull which equates to 5.55m3 per second or 2,592,000 seconds //Total pull size is 14,385,600 m3 $totalPull = 5.55 * (3600.00 * 24.00 * 30.00); @@ -228,7 +240,7 @@ class MoonCalc { return $rentalPrice; } - public function SpatialMoonsOutOfAllianceOnlyRares($firstOre, $firstQuan, $secondOre, $secondQuan, $thirdOre, $thirdQuan, $fourthOre, $fourthQuan) { + public function SpatialMoonsOutOfAllianceOnlyGoo($firstOre, $firstQuan, $secondOre, $secondQuan, $thirdOre, $thirdQuan, $fourthOre, $fourthQuan) { //Always assume a 1 month pull which equates to 5.55m3 per second or 2,592,000 seconds //Total pull size is 14,385,600 m3 $totalPull = 5.55 * (3600.00 * 24.00 * 30.00);