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

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/CombatActions/SkillSpecial.php

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

@@ -37,7 +37,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, Skill::NO_STAT_TYPES, true)) ? null : $skill->skill->stat),
       "value" => $skill->value,
@@ -70,7 +70,7 @@ 
         $targets = $combat->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->doSingleTarget($character, $target, $skill, $combat);

src/CharacterEffect.php

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

@@ -46,7 +46,7 @@ 
     $resolver = new OptionsResolver();
     $this->configureOptions($resolver);
     $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"];
@@ -80,14 +80,14 @@ 
     $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("value", "integer");
     $resolver->setAllowedTypes("valueAbsolute", "bool");
     $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);
     });
   }
   
@@ -148,7 +148,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;

src/CombatBase.php

Upper-Lower-Casing +2 added lines, -2 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:
@@ -400,7 +400,7 @@ 
           continue 2;
         }
       }
-      throw new NotImplementedException("Action $action is not implemented.");
+      throw new NotImplementedException("action $action is not implemented.");
     }
   }
   

src/TextCombatLogRender.php

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

@@ -32,7 +32,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;
   }
@@ -55,14 +55,14 @@ 
       case CombatActions\Attack::ACTION_NAME:
         $message = ($item->result) ? "combat.log.attackHits" : "combat.log.attackFails";
         $text = $this->translator->translate($message, $item->amount, ["character1" => $character1, "character2" => $character2]);
-        if($item->result AND $item->character2->hitpoints < 1) {
+        if($item->result and $item->character2->hitpoints < 1) {
           $text .= $this->translator->translate("combat.log.characterFalls");
         }
         return $text;
       case CombatActions\SkillAttack::ACTION_NAME:
         $message = ($item->result) ? "combat.log.specialAttackHits" : "combat.log.specialAttackFails";
         $text = $this->translator->translate($message, $item->amount, ["character1" => $character1, "character2" => $character2, "name" => $item->name]);
-        if($item->result AND $item->character2->hitpoints < 1) {
+        if($item->result and $item->character2->hitpoints < 1) {
           $text .= $this->translator->translate("combat.log.characterFalls");
         }
         return $text;

src/CombatActions/Heal.php

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

@@ -22,7 +22,7 @@
   }
 
   public function shouldUse(CombatBase $combat, Character $character): bool {
-    return (in_array($character, $this->findHealers($combat)->toArray(), true) AND !is_null($this->selectHealingTarget($character, $combat)));
+    return (in_array($character, $this->findHealers($combat)->toArray(), true) and !is_null($this->selectHealingTarget($character, $combat)));
   }
 
   public function do(CombatBase $combat, Character $character): void {

src/CombatActions/SkillAttack.php

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

@@ -74,7 +74,7 @@
         $targets = $combat->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.");
     }
     /** @var Character $target */
     foreach($targets as $target) {