From 93db789a0fea6ce754ffc28bd3a05847a8d51bd1 Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Wed, 6 Nov 2019 23:21:12 -0600 Subject: [PATCH] testing --- app/Http/Controllers/Moons/MoonsController.php | 4 +++- app/Library/Moons/MoonCalc.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Moons/MoonsController.php b/app/Http/Controllers/Moons/MoonsController.php index fd2c45d70..b44718a3a 100644 --- a/app/Http/Controllers/Moons/MoonsController.php +++ b/app/Http/Controllers/Moons/MoonsController.php @@ -167,9 +167,11 @@ class MoonsController extends Controller //Get the composition for the first ore if it is not None. //Add the first ore composition to the final composition if($firstOre != 'None') { + dd($firstOre); + $firstComp = $moonCalc->GetOreComposition($firstOre); $rUnits = $moonCalc->CalcReprocessingUnits($firstOre, $firstQuantity); - dd($rUnits); + foreach($firstComp as $key => $value) { $composition[$key] += floor(($firstComp[$key] * $rUnits) * $reprocessing); diff --git a/app/Library/Moons/MoonCalc.php b/app/Library/Moons/MoonCalc.php index 6307a2d8a..6a919b208 100644 --- a/app/Library/Moons/MoonCalc.php +++ b/app/Library/Moons/MoonCalc.php @@ -26,7 +26,7 @@ class MoonCalc { public function GetOreComposition($ore) { $composition = ItemComposition::where([ 'Name' => $ore, - ])->first()->toArray(); + ])->first(); return $composition; }