heroesofabenez / combat

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/Weapon.php

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

@@ -33,7 +33,7 @@
     parent::configureOptions($resolver);
     $resolver->setAllowedTypes("type", ["string"]);
     $resolver->setAllowedValues("type", function(?string $value) {
-      return is_null($value) OR in_array($value, $this->getAllowedTypes(), true);
+      return is_null($value) or in_array($value, $this->getAllowedTypes(), true);
     });
   }
   

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 +6 added lines, -6 removed lines

@@ -237,7 +237,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:
@@ -290,7 +290,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);
         }
       }
@@ -352,7 +352,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++) {
@@ -434,7 +434,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);
@@ -599,7 +599,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,