xaoc-303 / battle-calc

src/views/views/log.blade.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
         <th width="100">HP</th>
         <th width="100">Cool</th>
     </tr>
-    <?php $count = count($units);?>
+    <?php $count = count($units); ?>
     @for($i = 0; $i < $count; $i++)
         <tr style="color: {{array_search($units[$i]['All']['Color'], ['black' => 0, 'red' => 1, 'blue' => 2])}};">
             <td>{{Lang::get('battle-calc::units.'.$units[$i]['Base']['ID'])}}</td>

src/routes.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@
 <?php
 
-Route::group(Config::get('battle-calc::routes.routing'), function () {
-    Route::get('/',                              ['uses' => 'Xaoc303\BattleCalc\BattleCalcController@getIndex', 'as' => 'bc.index']);
+Route::group(Config::get('battle-calc::routes.routing'), function() {
+    Route::get('/', ['uses' => 'Xaoc303\BattleCalc\BattleCalcController@getIndex', 'as' => 'bc.index']);
     Route::get('getArmyBase/{id_army?}/{race?}', ['uses' => 'Xaoc303\BattleCalc\BattleCalcController@getArmyBase', 'as' => 'bc.army_base']);
-    Route::get('calculation',                    ['uses' => 'Xaoc303\BattleCalc\BattleCalcController@getCalculation', 'as' => 'bc.calc']);
+    Route::get('calculation', ['uses' => 'Xaoc303\BattleCalc\BattleCalcController@getCalculation', 'as' => 'bc.calc']);
 });

src/Xaoc303/BattleCalc/Unit.php

Spacing +2 added lines, -2 removed lines

@@ -139,7 +139,7 @@ 
     private function findByField($field_key, $field_value)
     {
         $units = $this->getUnits();
-        return array_where($units, function ($key, $value) use ($field_key, $field_value) {
+        return array_where($units, function($key, $value) use ($field_key, $field_value) {
             return $value[$field_key] == $field_value;
         });
     }
@@ -166,7 +166,7 @@ 
 
         $unit = new Unit();
         foreach ($unit_params as $key => $value) {
-            if (! array_key_exists($key, $vars)) {
+            if (!array_key_exists($key, $vars)) {
                 return null;
             }
 

src/Xaoc303/BattleCalc/ArmyDamage.php

Spacing +6 added lines, -6 removed lines

@@ -37,7 +37,7 @@ 
      * @param Army $armyAtt
      * @param Army $armyDef
      */
-    public static function run(Army &$armyAtt, Army &$armyDef)
+    public static function run(Army&$armyAtt, Army&$armyDef)
     {
         $class = new ArmyDamage();
 
@@ -141,19 +141,19 @@ 
         $ManDamageHP     = 0;
         if ($unitsDef[$i]['All']['ManCountVisible'] > 0) {
             if ($unitsDef[$i]['All']['UT'] == 0) {
-                $ManDamageAll = ($this->ManDamageT-(($this->ManDamageT* $unitsDef[$i]['Base']['Armor'])/100))* $unitsDef[$i]['All']['ManCount'];
+                $ManDamageAll = ($this->ManDamageT - (($this->ManDamageT * $unitsDef[$i]['Base']['Armor']) / 100)) * $unitsDef[$i]['All']['ManCount'];
             } else {
-                $ManDamageAll = ($this->ManDamageA-(($this->ManDamageA* $unitsDef[$i]['Base']['Armor'])/100))* $unitsDef[$i]['All']['ManCount'];
+                $ManDamageAll = ($this->ManDamageA - (($this->ManDamageA * $unitsDef[$i]['Base']['Armor']) / 100)) * $unitsDef[$i]['All']['ManCount'];
             }
         }
         if ($this->DamageMagicAll > 0) {
-            $ManDamageAll    += $this->DamageMagicAll     -(($this->DamageMagicAll   * $unitsDef[$i]['Base']['Armor'])/100);
+            $ManDamageAll    += $this->DamageMagicAll - (($this->DamageMagicAll * $unitsDef[$i]['Base']['Armor']) / 100);
         }
         if ($this->DamageMagicShield > 0) {
-            $ManDamageShield += $this->DamageMagicShield  -(($this->DamageMagicShield* $unitsDef[$i]['Base']['Armor'])/100);
+            $ManDamageShield += $this->DamageMagicShield - (($this->DamageMagicShield * $unitsDef[$i]['Base']['Armor']) / 100);
         }
         if ($this->DamageMagicHP > 0) {
-            $ManDamageHP     += $this->DamageMagicHP      -(($this->DamageMagicHP    * $unitsDef[$i]['Base']['Armor'])/100);
+            $ManDamageHP     += $this->DamageMagicHP - (($this->DamageMagicHP * $unitsDef[$i]['Base']['Armor']) / 100);
         }
 
         $unitsDef[$i]['All']['Shield'] -= $ManDamageShield;

src/Xaoc303/BattleCalc/Config.php

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
         $pathToDirConfigs = self::getPathToDirConfigs();
         $fullPathToFileConfig = self::getPathToFileConfig($pathToDirConfigs, $keys);
 
-        if (!file_exists( $fullPathToFileConfig )) {
+        if (!file_exists($fullPathToFileConfig)) {
             return $default;
         }
 
@@ -23,12 +23,12 @@ 
 
     private static function getPathToDirConfigs()
     {
-        return __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR;
+        return __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR;
     }
 
     private static function getPathToFileConfig($pathToDirConfigs, $keys)
     {
-        return $pathToDirConfigs. $keys[0]. '.php';
+        return $pathToDirConfigs.$keys[0].'.php';
     }
 
     private static function getArrayFromFile($file, $keys)

src/Xaoc303/BattleCalc/ArmyAttack.php

Spacing +6 added lines, -6 removed lines

@@ -23,7 +23,7 @@ 
      * @param Army $armyDef
      * @param int $Inic
      */
-    public static function run(Army &$armyAtt, Army &$armyDef, $Inic)
+    public static function run(Army&$armyAtt, Army&$armyDef, $Inic)
     {
         $class = new ArmyAttack();
 
@@ -46,11 +46,11 @@ 
         $count = count($this->unitsAtt);
         for ($i = 0; $i < $count; $i++) {
             if ($this->unitsAtt[$i]['All']['Iniciative'] >= $Inic && $this->unitsAtt[$i]['All']['ManCount'] > 0) {
-                $Cool = 24.0 / $this->unitsAtt[$i]['Base']['AttackCool'];   // Атак в секунду
-                $Cool = round($Cool, 2);                                    // Округление до сотых
-                $Cool += $this->unitsAtt[$i]['All']['AttackCoolDouble'];    // + предыдущий остаток
-                $this->unitsAtt[$i]['All']['AttackCoolInt'] = (int) $Cool;  // int атак в секунду
-                $this->unitsAtt[$i]['All']['AttackCoolDouble'] = $Cool - $this->unitsAtt[$i]['All']['AttackCoolInt'];    // double остаток атак в секунду
+                $Cool = 24.0 / $this->unitsAtt[$i]['Base']['AttackCool']; // Атак в секунду
+                $Cool = round($Cool, 2); // Округление до сотых
+                $Cool += $this->unitsAtt[$i]['All']['AttackCoolDouble']; // + предыдущий остаток
+                $this->unitsAtt[$i]['All']['AttackCoolInt'] = (int) $Cool; // int атак в секунду
+                $this->unitsAtt[$i]['All']['AttackCoolDouble'] = $Cool - $this->unitsAtt[$i]['All']['AttackCoolInt']; // double остаток атак в секунду
                 if ($this->unitsAtt[$i]['All']['AttackCoolInt'] > 0) {
                     $this->attackAirOn($i);
                     $this->attackTerOn($i);

src/Xaoc303/BattleCalc/Squad.php

Spacing +19 added lines, -19 removed lines

@@ -38,47 +38,47 @@
         $masUnitTownDistruct = array(104, 204, 308);
 
         $base = array();
-        $base['ID']            = $unit->id;               // id
-        $base['ManCount']      = $units_count;            // Количество
-        $base['Iniciative']    = 0;                       // Инициатива
-        $base['ShieldUp']      = 1;                       // Щит
-        $base['ArmorUp']       = 1;                       // Броня
-        $base['AttackTerUp']   = 1;                       // атака земля
-        $base['AttackAirUp']   = 1;                       // атака воздух
-        $base['AttackMagicUp'] = 1;                       // Магия
-        $base['Magic'][0]      = $unit->magic1;           // Магия
-        $base['Magic'][1]      = $unit->magic2;           // Магия
-        $base['Magic'][2]      = $unit->magic3;           // Магия
+        $base['ID']            = $unit->id; // id
+        $base['ManCount']      = $units_count; // Количество
+        $base['Iniciative']    = 0; // Инициатива
+        $base['ShieldUp']      = 1; // Щит
+        $base['ArmorUp']       = 1; // Броня
+        $base['AttackTerUp']   = 1; // атака земля
+        $base['AttackAirUp']   = 1; // атака воздух
+        $base['AttackMagicUp'] = 1; // Магия
+        $base['Magic'][0]      = $unit->magic1; // Магия
+        $base['Magic'][1]      = $unit->magic2; // Магия
+        $base['Magic'][2]      = $unit->magic3; // Магия
 
 
         $battle = array();
         $base['TownDistruct'] = in_array($base['ID'], $masUnitTownDistruct);
         $battle['TownDistruct'] = $base['TownDistruct'];
 
-        $battle['Iniciative'] = $unit->init;    // Инициатива
-        $battle['UT'] = $unit->type;            // Тип
+        $battle['Iniciative'] = $unit->init; // Инициатива
+        $battle['UT'] = $unit->type; // Тип
 
-        $battle['Bio'] = $unit->bio;            // био-тип
+        $battle['Bio'] = $unit->bio; // био-тип
 
-        $base['Shield'] = $unit->shield;        // Щит
+        $base['Shield'] = $unit->shield; // Щит
         $battle['Shield'] = $base['Shield'] * $base['ManCount'];
 
-        $base['Armor'] = $unit->armor;          // Броня
+        $base['Armor'] = $unit->armor; // Броня
         $battle['Armor'] = $base['Armor'] * $base['ManCount'];
 
-        $base['HP'] = $unit->hp;                // Здоровье
+        $base['HP'] = $unit->hp; // Здоровье
         $battle['HP'] = $base['HP'] * $base['ManCount'];
 
         $battle['Magic'][0] = null;
         $battle['Magic'][1] = null;
         $battle['Magic'][2] = null;
 
-        $battle['MagicRound'] = $unit->mround;  // Магическая атака
+        $battle['MagicRound'] = $unit->mround; // Магическая атака
         $battle['AttackMagicAll'] = 0;
         $battle['AttackMagicShield'] = 0;
         $battle['AttackMagicHP'] = 0;
 
-        $base['AttackCool'] = $unit->cool;      // атака задержка
+        $base['AttackCool'] = $unit->cool; // атака задержка
         $battle['AttackCoolInt'] = 0;
         $battle['AttackCoolDouble'] = 0;
 

src/Xaoc303/BattleCalc/Army.php

Spacing +11 added lines, -11 removed lines

@@ -70,7 +70,7 @@ 
      * @param Army $ArmyDet
      * @param integer $Round
      */
-    public function shadow(Army &$ArmyDet, $Round)
+    public function shadow(Army&$ArmyDet, $Round)
     {
         $unitsSh = $this->getUnits();
         $unitsDet = $ArmyDet->getUnits();
@@ -309,18 +309,18 @@ 
                 }
 
                 if ($units[$i]['All']['ManLock'] > 0) {
-                    $units[$i]['All']['AttackAir']           = $units[$i]['All']['AttackAir']            / $units[$i]['All']['ManCount'] * ($units[$i]['All']['ManCount'] - $units[$i]['All']['ManLock']);
-                    $units[$i]['All']['AttackTer']           = $units[$i]['All']['AttackTer']            / $units[$i]['All']['ManCount'] * ($units[$i]['All']['ManCount'] - $units[$i]['All']['ManLock']);
-                    $units[$i]['All']['AttackMagicAll']      = $units[$i]['All']['AttackMagicAll']       / $units[$i]['All']['ManCount'] * ($units[$i]['All']['ManCount'] - $units[$i]['All']['ManLock']);
-                    $units[$i]['All']['AttackMagicShield']   = $units[$i]['All']['AttackMagicShield']    / $units[$i]['All']['ManCount'] * ($units[$i]['All']['ManCount'] - $units[$i]['All']['ManLock']);
-                    $units[$i]['All']['AttackMagicHP']       = $units[$i]['All']['AttackMagicHP']        / $units[$i]['All']['ManCount'] * ($units[$i]['All']['ManCount'] - $units[$i]['All']['ManLock']);
+                    $units[$i]['All']['AttackAir']           = $units[$i]['All']['AttackAir'] / $units[$i]['All']['ManCount'] * ($units[$i]['All']['ManCount'] - $units[$i]['All']['ManLock']);
+                    $units[$i]['All']['AttackTer']           = $units[$i]['All']['AttackTer'] / $units[$i]['All']['ManCount'] * ($units[$i]['All']['ManCount'] - $units[$i]['All']['ManLock']);
+                    $units[$i]['All']['AttackMagicAll']      = $units[$i]['All']['AttackMagicAll'] / $units[$i]['All']['ManCount'] * ($units[$i]['All']['ManCount'] - $units[$i]['All']['ManLock']);
+                    $units[$i]['All']['AttackMagicShield']   = $units[$i]['All']['AttackMagicShield'] / $units[$i]['All']['ManCount'] * ($units[$i]['All']['ManCount'] - $units[$i]['All']['ManLock']);
+                    $units[$i]['All']['AttackMagicHP']       = $units[$i]['All']['AttackMagicHP'] / $units[$i]['All']['ManCount'] * ($units[$i]['All']['ManCount'] - $units[$i]['All']['ManLock']);
                 }
                 if ($units[$i]['All']['ManPhantom'] > 0) {
-                    $units[$i]['All']['AttackAir']           = $units[$i]['All']['AttackAir']            / $units[$i]['All']['ManCount'] * ($units[$i]['All']['ManCount'] - $units[$i]['All']['ManPhantom']);
-                    $units[$i]['All']['AttackTer']           = $units[$i]['All']['AttackTer']            / $units[$i]['All']['ManCount'] * ($units[$i]['All']['ManCount'] - $units[$i]['All']['ManPhantom']);
-                    $units[$i]['All']['AttackMagicAll']      = $units[$i]['All']['AttackMagicAll']       / $units[$i]['All']['ManCount'] * ($units[$i]['All']['ManCount'] - $units[$i]['All']['ManPhantom']);
-                    $units[$i]['All']['AttackMagicShield']   = $units[$i]['All']['AttackMagicShield']    / $units[$i]['All']['ManCount'] * ($units[$i]['All']['ManCount'] - $units[$i]['All']['ManPhantom']);
-                    $units[$i]['All']['AttackMagicHP']       = $units[$i]['All']['AttackMagicHP']        / $units[$i]['All']['ManCount'] * ($units[$i]['All']['ManCount'] - $units[$i]['All']['ManPhantom']);
+                    $units[$i]['All']['AttackAir']           = $units[$i]['All']['AttackAir'] / $units[$i]['All']['ManCount'] * ($units[$i]['All']['ManCount'] - $units[$i]['All']['ManPhantom']);
+                    $units[$i]['All']['AttackTer']           = $units[$i]['All']['AttackTer'] / $units[$i]['All']['ManCount'] * ($units[$i]['All']['ManCount'] - $units[$i]['All']['ManPhantom']);
+                    $units[$i]['All']['AttackMagicAll']      = $units[$i]['All']['AttackMagicAll'] / $units[$i]['All']['ManCount'] * ($units[$i]['All']['ManCount'] - $units[$i]['All']['ManPhantom']);
+                    $units[$i]['All']['AttackMagicShield']   = $units[$i]['All']['AttackMagicShield'] / $units[$i]['All']['ManCount'] * ($units[$i]['All']['ManCount'] - $units[$i]['All']['ManPhantom']);
+                    $units[$i]['All']['AttackMagicHP']       = $units[$i]['All']['AttackMagicHP'] / $units[$i]['All']['ManCount'] * ($units[$i]['All']['ManCount'] - $units[$i]['All']['ManPhantom']);
                 }
             }
         }