heroesofabenez / combat

src/CombatBase.php

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

@@ -234,7 +234,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:
@@ -289,7 +289,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);
         }
       }
@@ -351,7 +351,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;
       }
@@ -416,7 +416,7 @@ 
           break 2;
         }
       }
-      throw new NotImplementedException("Action $action is not implemented.");
+      throw new NotImplementedException("action $action is not implemented.");
     }
   }
   

src/CombatActions/SkillSpecial.php

Braces +3 added lines, -1 removed lines

@@ -52,9 +52,11 @@
   /**
    * @throws NotImplementedException
    */
-  public function do(CombatBase $combat, Character $character): void {
+  public function do {
+    (CombatBase $combat, Character $character): void {
     /** @var CharacterSpecialSkill $skill */
     $skill = $character->usableSkills[0];
+  }
     $targets = [];
     switch($skill->skill->target) {
       case Skill::TARGET_ENEMY:

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

Braces +3 added lines, -1 removed lines

@@ -21,8 +21,10 @@
     return (in_array($character, $combat->findHealers()->toArray(), true) AND !is_null($combat->selectHealingTarget($character)));
   }
 
-  public function do(CombatBase $combat, Character $character): void {
+  public function do {
+    (CombatBase $combat, Character $character): void {
     $result = [];
+  }
     /** @var Character $patient */
     $patient = $combat->selectHealingTarget($character);
     $result["result"] = $combat->successCalculator->hasHealed($character);

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

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

src/CombatActions/SkillAttack.php

Braces +3 added lines, -1 removed lines

@@ -54,9 +54,11 @@
   /**
    * @throws NotImplementedException
    */
-  public function do(CombatBase $combat, Character $character): void {
+  public function do {
+    (CombatBase $combat, Character $character): void {
     /** @var CharacterAttackSkill $skill */
     $skill = $character->usableSkills[0];
+  }
     $targets = [];
     /** @var Character $primaryTarget */
     $primaryTarget = $combat->selectAttackTarget($character);

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

@@ -71,7 +71,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.");
     }
     foreach($targets as $target) {
       for($i = 1; $i <= $skill->skill->strikes; $i++) {

src/CombatActions/ICombatAction.php

Braces +4 added lines, -2 removed lines

@@ -10,6 +10,8 @@
   public function getName(): string;
   public function getPriority(): int;
   public function shouldUse(CombatBase $combat, Character $character): bool;
-  public function do(CombatBase $combat, Character $character): void;
-}
+  public function do {
+    (CombatBase $combat, Character $character): void;
+  }
+  }
 ?>
\ No newline at end of file

src/CombatActions/Attack.php

Braces +3 added lines, -1 removed lines

@@ -26,8 +26,10 @@
    * Hit chance = Attacker's hit - Defender's dodge, but at least 15%
    * Damage = Attacker's damage - defender's defense
    */
-  public function do(CombatBase $combat, Character $character): void {
+  public function do {
+    (CombatBase $combat, Character $character): void {
     $result = [];
+  }
     /** @var Character $defender */
     $defender = $combat->selectAttackTarget($character);
     $result["result"] = $combat->successCalculator->hasHit($character, $defender);