heroesofabenez / combat

src/CombatBase.php

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);
@@ -475,7 +475,7 @@ 
           $combat->onHeal($character, $combat->selectHealingTarget($character));
           break;
         default:
-          throw new NotImplementedException("Action $action is not implemented.");
+          throw new NotImplementedException("action $action is not implemented.");
       }
     }
   }
@@ -586,7 +586,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,

src/CharacterEffect.php

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

@@ -57,7 +57,7 @@ 
     $resolver->setAllowedTypes("stat", "string");
     $resolver->setDefault("stat", "");
     $resolver->setAllowedValues("stat", function(string $value) {
-      return $value === "" OR in_array($value, $this->getAllowedStats(), true);
+      return $value === "" or in_array($value, $this->getAllowedStats(), true);
     });
     $resolver->setAllowedTypes("source", "string");
     $resolver->setAllowedValues("source", function(string $value) {
@@ -67,10 +67,10 @@ 
     $resolver->setDefault("value", 0);
     $resolver->setAllowedTypes("duration", ["string", "integer"]);
     $resolver->setAllowedValues("duration", function($value) {
-      return (in_array($value, $this->getDurations(), true)) OR ($value > 0);
+      return (in_array($value, $this->getDurations(), true)) or ($value > 0);
     });
     $effect = $resolver->resolve($effect);
-    if(!in_array($effect["type"], SkillSpecial::NO_STAT_TYPES, true) AND $effect["stat"] === "") {
+    if(!in_array($effect["type"], SkillSpecial::NO_STAT_TYPES, true) and $effect["stat"] === "") {
       throw new \InvalidArgumentException("The option stat with value '' is invalid.");
     }
     $this->id = $effect["id"];
@@ -152,7 +152,7 @@ 
    * @throws \InvalidArgumentException
    */
   public function setDuration($value): void {
-    if(!is_int($value) AND !in_array($value, $this->getDurations(), true)) {
+    if(!is_int($value) and !in_array($value, $this->getDurations(), true)) {
       throw new \InvalidArgumentException("Invalid value set to CharacterEffect::\$duration. Expected string or integer.");
     }
     $this->duration = $value;