drkthunder02/w4rpservices
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testing

Browse Source
This commit is contained in:
drkthunder02
2019-11-06 23:41:13 -06:00
parent b18b68d124
commit 66e52c52bd
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Moons/MoonsController.php
View File

@@ -168,9 +168,7 @@ class MoonsController extends Controller
//Add the first ore composition to the final composition
if($firstOre != 'None') {
$firstComp = $moonCalc->GetOreComposition($firstOre);
$rUnits = $moonCalc->CalcReprocessingUnits($firstOre, $firstQuantity);
dd($rUnits);
$rUnits = $moonCalc->CalcOreUnits($firstOre, $firstQuantity);
$composition['Tritanium'] += floor(($firstComp->Tritanium * $rUnits) * $reprocessing);
$composition['Pyerite'] += floor(($firstComp->Pyerite * $rUnits) * $reprocessing);

3
app/Library/Moons/MoonCalc.php
View File

@@ -537,7 +537,8 @@ class MoonCalc {
//Get the m3 size from the item composition
$m3Size = $item->m3Size;
//Calculate the actual m3 from the total pull amount in m3 using the percentage of the ingredient
$actualm3 = floor($percentage / $m3Size);
$actualm3 = floor($totalPull * ($percentage / 100));
dd($actualm3);
//Calculate the units from the m3 pulled from the moon
$units = floor($actualm3 / $m3Size);