heroesofabenez / combat

src/CharacterEffect.php

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

@@ -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"];
@@ -129,7 +129,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/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/Team.php

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

@@ -70,7 +70,7 @@ 
    */
   public function getActiveMembers(): array {
     return array_values(array_filter($this->items, function(Character $value) {
-      return (!$value->stunned AND $value->hitpoints > 0);
+      return (!$value->stunned and $value->hitpoints > 0);
     }));
   }
   
@@ -92,7 +92,7 @@ 
    */
   public function getUsableMembers(): array {
     return array_values(array_filter($this->items, function(Character $value) {
-      return (!$value->stunned AND $value->hitpoints > 0);
+      return (!$value->stunned and $value->hitpoints > 0);
     }));
   }
   

src/CombatBase.php

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

@@ -297,7 +297,7 @@ 
     $characters = array_merge($combat->team1->items, $combat->team2->items);
     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);
         }
       }
@@ -388,7 +388,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;
       }
@@ -440,7 +440,7 @@ 
   protected function chooseAction(CombatBase $combat, Character $character): ?string {
     if($character->hitpoints < 1) {
       return NULL;
-    } elseif(in_array($character, $combat->findHealers()->items, true) AND !is_null($combat->selectHealingTarget($character))) {
+    } elseif(in_array($character, $combat->findHealers()->items, true) and !is_null($combat->selectHealingTarget($character))) {
       return CombatAction::ACTION_HEALING;
     }
     $attackTarget = $combat->selectAttackTarget($character);
@@ -635,7 +635,7 @@ 
     ];
     $this->results = $result;
     $effect = [
-      "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/Character.php

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

@@ -429,7 +429,7 @@ 
    * @throws \OutOfBoundsException
    */
   public function getPet(int $petId): Pet {
-    if(isset($this->pets[$petId]) AND $this->pets[$petId] instanceof Pet) {
+    if(isset($this->pets[$petId]) and $this->pets[$petId] instanceof Pet) {
       return $this->pets[$petId];
     }
     throw new \OutOfBoundsException("Pet was not found.");
@@ -489,7 +489,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) {
@@ -542,7 +542,7 @@ 
       $stat = $effect->stat;
       $type = $effect->type;
       $duration = $effect->duration;
-      if(is_int($duration) AND $duration < 0) {
+      if(is_int($duration) and $duration < 0) {
         unset($this->effects[$i]);
         continue;
       }