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) {

src/Equipment.php

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

@@ -61,7 +61,7 @@
     });
     $resolver->setAllowedTypes("type", ["string", "null"]);
     $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);
     });
     $resolver->setAllowedTypes("strength", "integer");
     $resolver->setAllowedValues("strength", function(int $value) {

src/CharacterEffect.php

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

@@ -52,7 +52,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) {
@@ -62,10 +62,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"];
@@ -135,7 +135,7 @@ 
    * @throws \InvalidArgumentException
    */
   public function setDuration($value) {
-    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;

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;

src/Character.php

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

@@ -497,7 +497,7 @@ 
   public function damageStat(): string {
     $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) {
@@ -556,7 +556,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/CombatLogger.php

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

@@ -75,7 +75,7 @@
    */
   public function setTemplate(string $template): void {
     if(!is_file($template)) {
-      throw new \RuntimeException("File $template does not exist.");
+      throw new \RuntimeException("file $template does not exist.");
     }
     $this->template = $template;
   }

src/Team.php

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

@@ -77,11 +77,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;

src/CombatBase.php

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

@@ -228,7 +228,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:
@@ -281,7 +281,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);
         }
       }
@@ -370,7 +370,7 @@ 
       $threshold = static::LOWEST_HP_THRESHOLD;
     }
     foreach($team->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;
       }
@@ -413,7 +413,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++) {
@@ -438,7 +438,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);
@@ -448,7 +448,7 @@ 
   protected function chooseAction(self $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);
@@ -631,7 +631,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,