heroesofabenez / combat

src/CombatBase.php

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

@@ -298,7 +298,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);
         }
       }
@@ -389,7 +389,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;
       }
@@ -441,7 +441,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);
@@ -628,7 +628,7 @@ 
     ];
     $this->results = $result;
     $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,