fixed repaired things doesn't generate debris

lonphy · Jul 8, 2015 · ddf9c01 · ddf9c01
1 parent 0c519b8
commit ddf9c01
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/constants/battle_constants.php b/constants/battle_constants.php
@@ -56,6 +56,7 @@
 define('ONLY_FIRST_AND_LAST_ROUND', false); //This option is usefull to decrease RAM usage, but the battle report will not contain all rounds.
 
 /*** After-battle constants, default as Ogame ***/
+define('REPAIRED_DO_DEBRIS',true);
 define('SHIP_DEBRIS_FACTOR', 0.3); //Percentage of debris generated from destroyed defenses.
 define('DEFENSE_DEBRIS_FACTOR', 0.3); //Percentage of debris generated from destroyed ships.
 define('POINT_UNIT', 1000); //Ogame point = 1000 resources.

diff --git a/core/BattleReport.php b/core/BattleReport.php
@@ -184,19 +184,19 @@ public function getTotalDefendersLostUnits()
     {
         return Math::recursive_sum($this->getDefendersLostUnits());
     }
-    public function getAttackersLostUnits()
+    public function getAttackersLostUnits($repair = True)
     {
         $attackersBefore = $this->getRound('START')->getAfterBattleAttackers();
         $attackersAfter = $this->getRound('END')->getAfterBattleAttackers();
-        return $this->getPlayersLostUnits($attackersBefore, $attackersAfter);
+        return $this->getPlayersLostUnits($attackersBefore, $attackersAfter, $repair);
     }
-    public function getDefendersLostUnits()
+    public function getDefendersLostUnits($repair = True)
     {
         $defendersBefore = $this->getRound('START')->getAfterBattleDefenders();
         $defendersAfter = $this->getRound('END')->getAfterBattleDefenders();
-        return $this->getPlayersLostUnits($defendersBefore, $defendersAfter);
+        return $this->getPlayersLostUnits($defendersBefore, $defendersAfter, $repair);
     }
-    private function getPlayersLostUnits(PlayerGroup $playersBefore, PlayerGroup $playersAfter)
+    private function getPlayersLostUnits(PlayerGroup $playersBefore, PlayerGroup $playersAfter, $repair = True)
     {
         $lostShips = $this->getPlayersLostShips($playersBefore, $playersAfter);
         $defRepaired = $this->getPlayerRepaired($playersBefore, $playersAfter);
@@ -209,7 +209,7 @@ private function getPlayersLostUnits(PlayerGroup $playersBefore, PlayerGroup $pl
                 {
                     $cost = $shipType->getCost();
                     $repairedAmount = 0;
-                    if ($defRepaired->existPlayer($idPlayer) && $defRepaired->getPlayer($idPlayer)->existFleet($idFleet) && $defRepaired->getPlayer($idPlayer)->getFleet($idFleet)->existShipType($idShipType))
+                    if ($repair && $defRepaired->existPlayer($idPlayer) && $defRepaired->getPlayer($idPlayer)->existFleet($idFleet) && $defRepaired->getPlayer($idPlayer)->getFleet($idFleet)->existShipType($idShipType))
                     {
                         $repairedAmount = $defRepaired->getPlayer($idPlayer)->getFleet($idFleet)->getShipType($idShipType)->getCount();
                     }
@@ -241,7 +241,7 @@ public function getAttackerDebris()
     {
         $metal = 0;
         $crystal = 0;
-        foreach ($this->getAttackersLostUnits() as $idPlayer => $player)
+        foreach ($this->getAttackersLostUnits(!REPAIRED_DO_DEBRIS) as $idPlayer => $player)
         {
             foreach ($player as $idFleet => $fleet)
             {
@@ -264,7 +264,7 @@ public function getDefenderDebris()
     {
         $metal = 0;
         $crystal = 0;
-        foreach ($this->getDefendersLostUnits() as $idPlayer => $player)
+        foreach ($this->getDefendersLostUnits(!REPAIRED_DO_DEBRIS) as $idPlayer => $player)
         {
             foreach ($player as $idFleet => $fleet)
             {