diff --git a/app/Libraries/BattleEngine/CombatObject/PhysicShot.php b/app/Libraries/BattleEngine/CombatObject/PhysicShot.php index 779dd16de..556663871 100755 --- a/app/Libraries/BattleEngine/CombatObject/PhysicShot.php +++ b/app/Libraries/BattleEngine/CombatObject/PhysicShot.php @@ -40,6 +40,7 @@ class PhysicShot private $bouncedDamage = 0; private $hullDamage = 0; private $cellDestroyed = 0; + private $fighters; /** * PhysicShot::__construct() diff --git a/app/Libraries/BattleEngine/Core/BattleReport.php b/app/Libraries/BattleEngine/Core/BattleReport.php index 137671e1c..3a82a1b3f 100755 --- a/app/Libraries/BattleEngine/Core/BattleReport.php +++ b/app/Libraries/BattleEngine/Core/BattleReport.php @@ -5,6 +5,7 @@ use App\Libraries\BattleEngine\Models\PlayerGroup; use App\Libraries\BattleEngine\Utils\Events; use App\Libraries\BattleEngine\Utils\Math; +use App\Libraries\Functions; use Exception; /** @@ -256,7 +257,7 @@ public function getAttackerDebris() $metal += $lost[0]; $crystal += $lost[1]; } - $factor = constant(strtoupper($role) . '_DEBRIS_FACTOR'); + $factor = Functions::readConfig('fleet_cdr') / 100; $sendMetal += $metal * $factor; $sendCrystal += $crystal * $factor; } @@ -278,7 +279,7 @@ public function getDefenderDebris() $metal += $lost[0]; $crystal += $lost[1]; } - $factor = constant(strtoupper($role) . '_DEBRIS_FACTOR'); + $factor = Functions::readConfig('defs_cdr') / 100; $sendMetal += $metal * $factor; $sendCrystal += $crystal * $factor; } @@ -302,7 +303,8 @@ public function getAttackersTech() $techs[$player->getId()] = [ $player->getWeaponsTech(), $player->getShieldsTech(), - $player->getArmourTech()]; + $player->getArmourTech() + ]; } return $techs; } @@ -315,7 +317,8 @@ public function getDefendersTech() $techs[$player->getId()] = [ $player->getWeaponsTech(), $player->getShieldsTech(), - $player->getArmourTech()]; + $player->getArmourTech() + ]; } return $techs; }