heroesofabenez / combat

src/CombatBase.php

Spacing +5 added lines, -5 removed lines

@@ -74,7 +74,7 @@ 
     $this->onCombatEnd[] = [$this, "resetInitiative"];
     $this->onRoundStart[] = [$this, "applyEffectProviders"];
     $this->onRoundStart[] = [$this, "decreaseEffectsDuration"];
-    $this->onRoundStart[] = [$this ,"recalculateStats"];
+    $this->onRoundStart[] = [$this, "recalculateStats"];
     $this->onRoundStart[] = [$this, "logRoundNumber"];
     $this->onRoundStart[] = [$this, "applyPoison"];
     $this->onRound[] = [$this, "mainStage"];
@@ -343,14 +343,14 @@ 
    */
   public function selectAttackTarget(Character $attacker): ?Character {
     $enemyTeam = $this->getEnemyTeam($attacker);
-    $rangedWeapon = ($attacker->equipment->hasItems(["%class%" => Weapon::class, "worn" => true, "ranged" => true,]));
+    $rangedWeapon = ($attacker->equipment->hasItems(["%class%" => Weapon::class, "worn" => true, "ranged" => true, ]));
     if(!$rangedWeapon) {
       $rowToAttack = $enemyTeam->rowToAttack;
       if(is_null($rowToAttack)) {
         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;
     }
@@ -419,8 +419,8 @@ 
   public function applyPoison(self $combat): void {
     /** @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) {
       $poisonValue = $character->status["poisoned"];

src/Character.php

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

@@ -462,7 +462,7 @@
   }
 
   public function hasStatus(string $status): bool {
-    return (array_key_exists($status, $this->status) AND $this->status[$status]);
+    return (array_key_exists($status, $this->status) and $this->status[$status]);
   }
   
   /**