heroesofabenez / combat

src/SkillSpecial.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
     });
     $resolver->setAllowedTypes("stat", ["string", "null"]);
     $resolver->setAllowedValues("stat", function(?string $value) {
-      return is_null($value) OR in_array($value, $this->getAllowedStats(), true);
+      return is_null($value) or in_array($value, $this->getAllowedStats(), true);
     });
     $resolver->setAllowedTypes("value", "integer");
     $resolver->setAllowedValues("value", function(int $value) {

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,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,];
+  public const NO_STAT_TYPES = [self::TYPE_STUN, self::TYPE_POISON, ];
   
   /** @var string */
   protected $type;
@@ -60,7 +60,7 @@ 
   
   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) {

src/CharacterAttackSkill.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
   }
   
   public function getHitRate(): int {
-    if(is_string($this->skill->hitRate) AND substr($this->skill->hitRate, -1) === "%") {
+    if(is_string($this->skill->hitRate) and substr($this->skill->hitRate, -1) === "%") {
       return (int) $this->skill->hitRate;
     }
     return 100;

tests/bootstrap.php

Spacing +2 added lines, -2 removed lines

@@ -2,8 +2,8 @@
 declare(strict_types=1);
 
 require __DIR__ . "/../vendor/autoload.php";
-Testbench\Bootstrap::setup(__DIR__ . '/_temp', function (\Nette\Configurator $configurator) {
-  $configurator->addParameters(["appDir" => __DIR__,]);
+Testbench\Bootstrap::setup(__DIR__ . '/_temp', function(\Nette\Configurator $configurator) {
+  $configurator->addParameters(["appDir" => __DIR__, ]);
   $configurator->addConfig(__DIR__ . "/tests.neon");
 });
 ?>
\ No newline at end of file

src/SkillAttack.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
   
   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");

src/Character.php

Spacing +3 added lines, -3 removed lines

@@ -190,10 +190,10 @@
   }
   
   protected function setStats(array $stats): void {
-    $requiredStats = array_merge(["id", "name", "level", "initiativeFormula",], static::BASE_STATS);
-    $allStats = array_merge($requiredStats, ["occupation", "race", "specialization", "gender", "experience",]);
+    $requiredStats = array_merge(["id", "name", "level", "initiativeFormula", ], static::BASE_STATS);
+    $allStats = array_merge($requiredStats, ["occupation", "race", "specialization", "gender", "experience", ]);
     $numberStats = static::BASE_STATS;
-    $textStats = ["name", "race", "occupation", "initiativeFormula",];
+    $textStats = ["name", "race", "occupation", "initiativeFormula", ];
     $resolver = new OptionsResolver();
     $resolver->setDefined($allStats);
     $resolver->setAllowedTypes("id", ["integer", "string"]);

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -520,7 +520,7 @@ 
   public function damageStat(): string {
     $stat = static::STAT_STRENGTH;
     foreach($this->equipment as $item) {
-      if(!$item->worn OR $item->slot != Equipment::SLOT_WEAPON) {
+      if(!$item->worn or $item->slot != Equipment::SLOT_WEAPON) {
         continue;
       }
       switch($item->type) {
@@ -579,7 +579,7 @@ 
       $stat = $effect->stat;
       $type = $effect->type;
       $duration = $effect->duration;
-      if(is_int($duration) AND $duration < 1) {
+      if(is_int($duration) and $duration < 1) {
         $this->removeEffect($effect->id);
         continue;
       }

src/CombatActionSelector.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
   public function chooseAction(CombatBase $combat, Character $character): ?string {
     if($character->hitpoints < 1) {
       return null;
-    } elseif(in_array($character, $combat->findHealers()->toArray(), true) AND !is_null($combat->selectHealingTarget($character))) {
+    } elseif(in_array($character, $combat->findHealers()->toArray(), true) and !is_null($combat->selectHealingTarget($character))) {
       return CombatAction::ACTION_HEALING;
     }
     $attackTarget = $combat->selectAttackTarget($character);

src/Team.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
    * @return Character[]
    */
   public function getAliveMembers(): array {
-    return $this->getItems(["hitpoints>" => 0,]);
+    return $this->getItems(["hitpoints>" => 0, ]);
   }
   
   /**
@@ -128,7 +128,7 @@ 
       return null;
     }
     for($i = 1; $i <= PHP_INT_MAX; $i++) {
-      if($this->hasItems(["positionRow" => $i, "hitpoints>" => 0,])) {
+      if($this->hasItems(["positionRow" => $i, "hitpoints>" => 0, ])) {
         return $i;
       }
     }

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -80,11 +80,11 @@ 
    */
   public function setCharacterPosition($id, int $row, int $column): void {
     if(!$this->hasItems(["id" => $id])) {
-      throw new \OutOfBoundsException("Character $id is not in the team");
+      throw new \OutOfBoundsException("character $id is not in the team");
     } elseif(count($this->getItems(["positionRow" => $row])) >= $this->maxRowSize) {
-      throw new InvalidCharacterPositionException("Row $row is full.", InvalidCharacterPositionException::ROW_FULL);
+      throw new InvalidCharacterPositionException("row $row is full.", InvalidCharacterPositionException::ROW_FULL);
     } elseif($this->hasItems(["positionRow" => $row, "positionColumn" => $column])) {
-      throw new InvalidCharacterPositionException("Row $row column $column is occupied.", InvalidCharacterPositionException::POSITION_OCCUPIED);
+      throw new InvalidCharacterPositionException("row $row column $column is occupied.", InvalidCharacterPositionException::POSITION_OCCUPIED);
     }
     $character = $this->getItems(["id" => $id])[0];
     $character->positionRow = $row;
@@ -112,7 +112,7 @@ 
       return null;
     }
     foreach($this->aliveMembers as $index => $member) {
-      if($member->hitpoints <= $member->maxHitpoints * $threshold AND $member->hitpoints < $lowestHp) {
+      if($member->hitpoints <= $member->maxHitpoints * $threshold and $member->hitpoints < $lowestHp) {
         $lowestHp = $member->hitpoints;
         $lowestIndex = $index;
       }

src/Equipment.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
   }
   
   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");

src/CombatBase.php

Spacing +2 added lines, -2 removed lines

@@ -82,7 +82,7 @@ 
     $this->onCombatEnd[] = [$this, "logCombatResult"];
     $this->onCombatEnd[] = [$this, "resetInitiative"];
     $this->onRoundStart[] = [$this, "decreaseEffectsDuration"];
-    $this->onRoundStart[] = [$this ,"recalculateStats"];
+    $this->onRoundStart[] = [$this, "recalculateStats"];
     $this->onRoundStart[] = [$this, "logRoundNumber"];
     $this->onRoundStart[] = [$this, "applyPoison"];
     $this->onRound[] = [$this, "mainStage"];
@@ -363,7 +363,7 @@ 
         return null;
       }
       /** @var Team $enemies */
-      $enemies = Team::fromArray($enemyTeam->getItems(["positionRow" => $rowToAttack, "hitpoints>" => 0,]), $enemyTeam->name);
+      $enemies = Team::fromArray($enemyTeam->getItems(["positionRow" => $rowToAttack, "hitpoints>" => 0, ]), $enemyTeam->name);
     } else {
       $enemies = $enemyTeam;
     }

Upper-Lower-Casing +7 added lines, -7 removed lines

@@ -232,7 +232,7 @@ 
       foreach($team as $character) {
         try {
           $column++;
-          if($character->positionRow > 0 AND $character->positionColumn > 0) {
+          if($character->positionRow > 0 and $character->positionColumn > 0) {
             continue;
           }
           setPosition:
@@ -287,7 +287,7 @@ 
     $characters = array_merge($combat->team1->toArray(), $combat->team2->toArray());
     foreach($characters as $character) {
       foreach($character->effects as $effect) {
-        if($effect->duration === CharacterEffect::DURATION_COMBAT OR is_int($effect->duration)) {
+        if($effect->duration === CharacterEffect::DURATION_COMBAT or is_int($effect->duration)) {
           $character->removeEffect($effect->id);
         }
       }
@@ -349,7 +349,7 @@ 
     $enemyTeam = $this->getEnemyTeam($attacker);
     $rangedWeapon = false;
     foreach($attacker->equipment as $equipment) {
-      if($equipment instanceof Weapon AND $equipment->isWorn() AND $equipment->ranged) {
+      if($equipment instanceof Weapon and $equipment->isWorn() and $equipment->ranged) {
         $rangedWeapon = true;
         break;
       }
@@ -409,7 +409,7 @@ 
         $targets = $this->getTeam($primaryTarget)->getItems(["positionColumn" => $primaryTarget->positionColumn]);
         break;
       default:
-        throw new NotImplementedException("Target {$skill->skill->target} for attack skills is not implemented.");
+        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++) {
@@ -437,7 +437,7 @@ 
         $targets = $this->getEnemyTeam($character)->toArray();
         break;
       default:
-        throw new NotImplementedException("Target {$skill->skill->target} for special skills is not implemented.");
+        throw new NotImplementedException("target {$skill->skill->target} for special skills is not implemented.");
     }
     foreach($targets as $target) {
       $this->onSkillSpecial($character, $target, $skill);
@@ -477,7 +477,7 @@ 
         case null:
           break;
         default:
-          throw new NotImplementedException("Action $action is not implemented.");
+          throw new NotImplementedException("action $action is not implemented.");
       }
     }
   }
@@ -588,7 +588,7 @@ 
       "character1" => $character1, "character2" => $target,
     ];
     $effect = new CharacterEffect([
-      "id" => "skill{$skill->skill->id}Effect",
+      "id" => "skill{$skill->skill->id}effect",
       "type" => $skill->skill->type,
       "stat" => ((in_array($skill->skill->type, SkillSpecial::NO_STAT_TYPES, true)) ? null : $skill->skill->stat),
       "value" => $skill->value,