heroesofabenez / combat

tests/bootstrap.php

Spacing +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@
 declare(strict_types=1);
 
 require __DIR__ . "/../vendor/autoload.php";
-Testbench\Bootstrap::setup(__DIR__ . '/_temp', function (\Nette\Bootstrap\Configurator $configurator): void {
-    $configurator->addStaticParameters(["appDir" => __DIR__,]);
+Testbench\Bootstrap::setup(__DIR__ . '/_temp', function(\Nette\Bootstrap\Configurator $configurator): void {
+    $configurator->addStaticParameters(["appDir" => __DIR__, ]);
     $configurator->addConfig(__DIR__ . "/tests.neon");
 });

src/SkillAttack.php

Spacing +2 added lines, -2 removed lines

@@ -39,12 +39,12 @@
     protected function configureOptions(OptionsResolver $resolver): void
     {
         parent::configureOptions($resolver);
-        $allStats = ["baseDamage", "damageGrowth", "strikes", "hitRate",];
+        $allStats = ["baseDamage", "damageGrowth", "strikes", "hitRate", ];
         $resolver->setRequired($allStats);
         $resolver->setAllowedTypes("baseDamage", "string");
         $resolver->setAllowedTypes("damageGrowth", "string");
         $resolver->setAllowedTypes("strikes", "integer");
-        $resolver->setAllowedValues("strikes", function (int $value): bool {
+        $resolver->setAllowedValues("strikes", function(int $value): bool {
             return ($value > 0);
         });
         $resolver->setAllowedTypes("hitRate", ["string", "null"]);

src/CharacterSpecialSkill.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 
     protected function getValue(): int
     {
-        if ($this->skill->type === SkillSpecial::TYPE_STUN) {
+        if($this->skill->type === SkillSpecial::TYPE_STUN) {
             return 0;
         }
         $value = $this->skill->value;

src/Equipment.php

Spacing +10 added lines, -10 removed lines

@@ -52,27 +52,27 @@ 
 
     protected function configureOptions(OptionsResolver $resolver): void
     {
-        $allStats = ["id", "name", "slot", "type", "strength", "worn",];
+        $allStats = ["id", "name", "slot", "type", "strength", "worn", ];
         $resolver->setRequired($allStats);
         $resolver->setAllowedTypes("id", "integer");
         $resolver->setAllowedTypes("name", "string");
         $resolver->setAllowedTypes("slot", "string");
-        $resolver->setAllowedValues("slot", function (string $value): bool {
+        $resolver->setAllowedValues("slot", function(string $value): bool {
             return in_array($value, $this->getAllowedSlots(), true);
         });
         $resolver->setAllowedTypes("type", "null");
         $resolver->setDefault("type", null);
         $resolver->setAllowedTypes("strength", "integer");
-        $resolver->setAllowedValues("strength", function (int $value): bool {
+        $resolver->setAllowedValues("strength", function(int $value): bool {
             return ($value >= 0);
         });
         $resolver->setAllowedTypes("worn", "boolean");
         $resolver->setDefault("maxDurability", 0);
         $resolver->setAllowedTypes("maxDurability", "integer");
-        $resolver->setAllowedValues("maxDurability", function (int $value): bool {
+        $resolver->setAllowedValues("maxDurability", function(int $value): bool {
             return ($value >= 0);
         });
-        $resolver->setDefault("durability", function (Options $options) {
+        $resolver->setDefault("durability", function(Options $options) {
             return $options["maxDurability"];
         });
         $resolver->setAllowedTypes("durability", "integer");
@@ -85,13 +85,13 @@ 
 
     protected function getStrength(): int
     {
-        if ($this->durability >= $this->maxDurability * 0.7) {
+        if($this->durability >= $this->maxDurability * 0.7) {
             return $this->rawStrength;
-        } elseif ($this->durability >= $this->maxDurability / 2) {
+        } elseif($this->durability >= $this->maxDurability / 2) {
             return (int) ($this->rawStrength * 0.75);
-        } elseif ($this->durability >= $this->maxDurability / 4) {
+        } elseif($this->durability >= $this->maxDurability / 4) {
             return (int) ($this->rawStrength / 2);
-        } elseif ($this->durability >= $this->maxDurability / 10) {
+        } elseif($this->durability >= $this->maxDurability / 10) {
             return (int) ($this->rawStrength / 4);
         }
         return 0;
@@ -127,7 +127,7 @@ 
 
     public function getCombatEffects(): array
     {
-        if (!$this->worn) {
+        if(!$this->worn) {
             return [];
         }
         return [new CharacterEffect($this->getDeployParams())];

src/VictoryConditions.php

Spacing +12 added lines, -12 removed lines

@@ -20,13 +20,13 @@ 
     public static function moreDamage(CombatBase $combat): int
     {
         $result = 0;
-        if ($combat->round <= $combat->roundLimit) {
-            if (!$combat->team1->hasAliveMembers()) {
+        if($combat->round <= $combat->roundLimit) {
+            if(!$combat->team1->hasAliveMembers()) {
                 $result = 2;
-            } elseif (!$combat->team2->hasAliveMembers()) {
+            } elseif(!$combat->team2->hasAliveMembers()) {
                 $result = 1;
             }
-        } elseif ($combat->round > $combat->roundLimit) {
+        } elseif($combat->round > $combat->roundLimit) {
             $result = ($combat->team1Damage > $combat->team2Damage) ? 1 : 2;
         }
         return $result;
@@ -39,13 +39,13 @@ 
     public static function eliminateSecondTeam(CombatBase $combat): int
     {
         $result = 0;
-        if ($combat->round <= $combat->roundLimit) {
-            if (!$combat->team1->hasAliveMembers()) {
+        if($combat->round <= $combat->roundLimit) {
+            if(!$combat->team1->hasAliveMembers()) {
                 $result = 2;
-            } elseif (!$combat->team2->hasAliveMembers()) {
+            } elseif(!$combat->team2->hasAliveMembers()) {
                 $result = 1;
             }
-        } elseif ($combat->round > $combat->roundLimit) {
+        } elseif($combat->round > $combat->roundLimit) {
             $result = (!$combat->team2->hasAliveMembers()) ? 1 : 2;
         }
         return $result;
@@ -58,13 +58,13 @@ 
     public static function firstTeamSurvives(CombatBase $combat): int
     {
         $result = 0;
-        if ($combat->round <= $combat->roundLimit) {
-            if (!$combat->team1->hasAliveMembers()) {
+        if($combat->round <= $combat->roundLimit) {
+            if(!$combat->team1->hasAliveMembers()) {
                 $result = 2;
-            } elseif (!$combat->team2->hasAliveMembers()) {
+            } elseif(!$combat->team2->hasAliveMembers()) {
                 $result = 1;
             }
-        } elseif ($combat->round > $combat->roundLimit) {
+        } elseif($combat->round > $combat->roundLimit) {
             $result = ($combat->team1->hasAliveMembers()) ? 1 : 2;
         }
         return $result;

src/InitiativeFormulaParser.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         ];
         $formula = str_replace(array_keys($stats), array_values($stats), $formula);
         preg_match("/^([1-9]+)d([1-9]+)/", $formula, $dices);
-        for ($i = 1; $i <= (int) $dices[1]; $i++) {
+        for($i = 1; $i <= (int) $dices[1]; $i++) {
             $result += rand(1, (int) $dices[2]);
         }
         preg_match("/\+([0-9]+)\/([0-9]+)/", $formula, $ammendum);

src/SkillSpecial.php

Spacing +7 added lines, -7 removed lines

@@ -23,7 +23,7 @@ 
     public const TARGET_PARTY = "party";
     public const TARGET_ENEMY_PARTY = "enemy_party";
     /** @var string[] */
-    public const NO_STAT_TYPES = [self::TYPE_STUN, self::TYPE_POISON, self::TYPE_HIDE,];
+    public const NO_STAT_TYPES = [self::TYPE_STUN, self::TYPE_POISON, self::TYPE_HIDE, ];
 
     public readonly string $type;
     public readonly ?string $stat;
@@ -50,26 +50,26 @@ 
     protected function configureOptions(OptionsResolver $resolver): void
     {
         parent::configureOptions($resolver);
-        $allStats = ["type", "stat", "value", "valueGrowth", "duration",];
+        $allStats = ["type", "stat", "value", "valueGrowth", "duration", ];
         $resolver->setRequired($allStats);
         $resolver->setAllowedTypes("type", "string");
-        $resolver->setAllowedValues("type", function (string $value): bool {
+        $resolver->setAllowedValues("type", function(string $value): bool {
             return in_array($value, $this->getAllowedTypes(), true);
         });
         $resolver->setAllowedTypes("stat", ["string", "null"]);
-        $resolver->setAllowedValues("stat", function (?string $value): bool {
+        $resolver->setAllowedValues("stat", function(?string $value): bool {
             return $value === null || in_array($value, $this->getAllowedStats(), true);
         });
         $resolver->setAllowedTypes("value", "integer");
-        $resolver->setAllowedValues("value", function (int $value): bool {
+        $resolver->setAllowedValues("value", function(int $value): bool {
             return ($value >= 0);
         });
         $resolver->setAllowedTypes("valueGrowth", "integer");
-        $resolver->setAllowedValues("valueGrowth", function (int $value): bool {
+        $resolver->setAllowedValues("valueGrowth", function(int $value): bool {
             return ($value >= 0);
         });
         $resolver->setAllowedTypes("duration", "integer");
-        $resolver->setAllowedValues("duration", function (int $value): bool {
+        $resolver->setAllowedValues("duration", function(int $value): bool {
             return ($value >= 0);
         });
     }

src/CombatBase.php

Spacing +33 added lines, -33 removed lines

@@ -59,7 +59,7 @@ 
         public ICombatActionSelector $actionSelector = new CombatActionSelector()
     ) {
         $this->victoryCondition = [VictoryConditions::class, "moreDamage"];
-        $this->healers = function (): Team {
+        $this->healers = function(): Team {
             return new Team("healers");
         };
         $this->combatActions = new class extends Collection {
@@ -113,7 +113,7 @@ 
      */
     public function setTeams(Team $team1, Team $team2): void
     {
-        if (isset($this->team1)) {
+        if(isset($this->team1)) {
             throw new ImmutableException("Teams has already been set.");
         }
         $this->team1 = $team1;
@@ -191,7 +191,7 @@ 
     public function getWinner(): int
     {
         static $result = 0;
-        if ($result === 0) {
+        if($result === 0) {
             $result = call_user_func($this->victoryCondition, $this);
             $result = Numbers::range($result, 0, 2);
         }
@@ -218,30 +218,30 @@ 
     {
         /** @var Character[] $characters */
         $characters = array_merge($combat->team1->toArray(), $combat->team2->toArray());
-        foreach ($characters as $character) {
+        foreach($characters as $character) {
             $character->applyEffectProviders();
         }
     }
 
     public function assignPositions(self $combat): void
     {
-        $assignPositions = function (Team $team): void {
+        $assignPositions = function(Team $team): void {
             $row = 1;
             $column = 0;
             /** @var Character $character */
-            foreach ($team as $character) {
+            foreach($team as $character) {
                 try {
                     $column++;
-                    if ($character->positionRow > 0 && $character->positionColumn > 0) {
+                    if($character->positionRow > 0 && $character->positionColumn > 0) {
                         continue;
                     }
                     setPosition:
                     $team->setCharacterPosition($character->id, $row, $column);
-                } catch (InvalidCharacterPositionException $e) {
-                    if ($e->getCode() === InvalidCharacterPositionException::ROW_FULL) {
+                } catch(InvalidCharacterPositionException $e) {
+                    if($e->getCode() === InvalidCharacterPositionException::ROW_FULL) {
                         $row++;
                         $column = 1;
-                    } elseif ($e->getCode() === InvalidCharacterPositionException::POSITION_OCCUPIED) {
+                    } elseif($e->getCode() === InvalidCharacterPositionException::POSITION_OCCUPIED) {
                         $column++;
                     } else {
                         throw $e;
@@ -258,9 +258,9 @@ 
     {
         /** @var Character[] $characters */
         $characters = array_merge($combat->team1->toArray(), $combat->team2->toArray());
-        foreach ($characters as $character) {
-            foreach ($character->effects as $effect) {
-                if (is_int($effect->duration)) {
+        foreach($characters as $character) {
+            foreach($character->effects as $effect) {
+                if(is_int($effect->duration)) {
                     $effect->duration--;
                 }
             }
@@ -274,8 +274,8 @@ 
     {
         /** @var Character[] $characters */
         $characters = array_merge($combat->team1->toArray(), $combat->team2->toArray());
-        foreach ($characters as $character) {
-            foreach ($character->skills as $skill) {
+        foreach($characters as $character) {
+            foreach($character->skills as $skill) {
                 $skill->decreaseCooldown();
             }
         }
@@ -288,7 +288,7 @@ 
     {
         /** @var Character[] $characters */
         $characters = array_merge($combat->team1->toArray(), $combat->team2->toArray());
-        foreach ($characters as $character) {
+        foreach($characters as $character) {
             $character->effects->removeByFilter(["duration!=" => CharacterEffect::DURATION_FOREVER]);
         }
     }
@@ -322,7 +322,7 @@ 
     {
         /** @var Character[] $characters */
         $characters = array_merge($combat->team1->toArray(), $combat->team2->toArray());
-        foreach ($characters as $character) {
+        foreach($characters as $character) {
             $character->recalculateStats();
         }
     }
@@ -334,7 +334,7 @@ 
     {
         /** @var Character[] $characters */
         $characters = array_merge($combat->team1->toArray(), $combat->team2->toArray());
-        foreach ($characters as $character) {
+        foreach($characters as $character) {
             $character->resetInitiative();
         }
     }
@@ -347,21 +347,21 @@ 
     public function selectAttackTarget(Character $attacker): ?Character
     {
         $enemyTeam = $this->getEnemyTeam($attacker);
-        $rangedWeapon = ($attacker->equipment->hasItems(["%class%" => Weapon::class, "worn" => true, "ranged" => true,]));
-        if (!$rangedWeapon) {
+        $rangedWeapon = ($attacker->equipment->hasItems(["%class%" => Weapon::class, "worn" => true, "ranged" => true, ]));
+        if(!$rangedWeapon) {
             $rowToAttack = $enemyTeam->rowToAttack;
-            if ($rowToAttack === null) {
+            if($rowToAttack === null) {
                 return null;
             }
             $enemies = Team::fromArray(
-                $enemyTeam->getItems(["positionRow" => $rowToAttack, "hitpoints>" => 0, "hidden" => false,]),
+                $enemyTeam->getItems(["positionRow" => $rowToAttack, "hitpoints>" => 0, "hidden" => false, ]),
                 $enemyTeam->name
             );
         } else {
             $enemies = $enemyTeam;
         }
         $target = $enemies->getLowestHpCharacter();
-        if ($target !== null) {
+        if($target !== null) {
             return $target;
         }
         return $enemies->getRandomCharacter();
@@ -376,13 +376,13 @@ 
     {
         /** @var Character[] $characters */
         $characters = array_merge($combat->team1->usableMembers, $combat->team2->usableMembers);
-        usort($characters, function (Character $a, Character $b): int {
+        usort($characters, function(Character $a, Character $b): int {
             return -1 * strcmp((string) $a->initiative, (string) $b->initiative);
         });
-        foreach ($characters as $character) {
+        foreach($characters as $character) {
             /** @var ICombatAction|null $combatAction */
             $combatAction = $combat->actionSelector->chooseAction($combat, $character);
-            if ($combatAction === null) {
+            if($combatAction === null) {
                 break;
             }
             $combatAction->do($combat, $character);
@@ -396,18 +396,18 @@ 
      */
     public function execute(): int
     {
-        if (!isset($this->team1)) {
+        if(!isset($this->team1)) {
             throw new InvalidStateException("Teams are not set.");
         }
         $this->onCombatStart($this);
-        while ($this->round <= $this->roundLimit) {
+        while($this->round <= $this->roundLimit) {
             $this->onRoundStart($this);
-            if ($this->getWinner() > 0) {
+            if($this->getWinner() > 0) {
                 break;
             }
             $this->onRound($this);
             $this->onRoundEnd($this);
-            if ($this->getWinner() > 0) {
+            if($this->getWinner() > 0) {
                 break;
             }
         }
@@ -422,10 +422,10 @@ 
     {
         /** @var Character[] $characters */
         $characters = array_merge(
-            $combat->team1->getItems(["hitpoints>" => 0, "poisoned!=" => false,]),
-            $combat->team2->getItems(["hitpoints>" => 0, "poisoned!=" => false,])
+            $combat->team1->getItems(["hitpoints>" => 0, "poisoned!=" => false, ]),
+            $combat->team2->getItems(["hitpoints>" => 0, "poisoned!=" => false, ])
         );
-        foreach ($characters as $character) {
+        foreach($characters as $character) {
             $poisonValue = $character->getStatus(Character::STATUS_POISONED);
             $character->harm($poisonValue);
             $action = [

src/CombatActions/SkillAttack.php

Spacing +7 added lines, -7 removed lines

@@ -28,10 +28,10 @@ 
     public function shouldUse(CombatBase $combat, Character $character): bool
     {
         $attackTarget = $combat->selectAttackTarget($character);
-        if ($attackTarget === null) {
+        if($attackTarget === null) {
             return false;
         }
-        if (count($character->usableSkills) < 1) {
+        if(count($character->usableSkills) < 1) {
             return false;
         }
         return ($character->usableSkills[0] instanceof CharacterAttackSkill);
@@ -46,11 +46,11 @@ 
         $result = [];
         $result["result"] = $combat->successCalculator->hasHit($attacker, $defender, $skill);
         $result["amount"] = 0;
-        if ($result["result"]) {
+        if($result["result"]) {
             $amount = (int) (($attacker->damage - $defender->defense) / 100 * $skill->damage);
             $result["amount"] = Numbers::range($amount, 0, $defender->hitpoints);
         }
-        if ($result["amount"] > 0) {
+        if($result["amount"] > 0) {
             $defender->harm($result["amount"]);
         }
         $result["action"] = $this->getName();
@@ -77,9 +77,9 @@ 
             Skill::TARGET_COLUMN => $combat->getTeam($primaryTarget)->getItems(["positionColumn" => $primaryTarget->positionColumn]),
             default => throw new NotImplementedException("Target {$skill->skill->target} for attack skills is not implemented."),
         };
-        foreach ($targets as $target) {
-            for ($i = 1; $i <= $skill->skill->strikes; $i++) {
-                if ($target->hitpoints > 0) {
+        foreach($targets as $target) {
+            for($i = 1; $i <= $skill->skill->strikes; $i++) {
+                if($target->hitpoints > 0) {
                     $this->doSingleAttack($character, $target, $skill, $combat);
                 }
             }