heroesofabenez / combat

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

src/CharacterEffect.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
   }
 
   protected function configureOptions(OptionsResolver $resolver): void {
-    $allStats = ["id", "type", "value", "valueAbsolute", "duration", "stat",];
+    $allStats = ["id", "type", "value", "valueAbsolute", "duration", "stat", ];
     $resolver->setRequired($allStats);
     $resolver->setAllowedTypes("id", "string");
     $resolver->setAllowedTypes("type", "string");

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

Spacing +2 added lines, -2 removed lines

@@ -51,8 +51,8 @@
   }
 
   protected function configureOptions(OptionsResolver $resolver): void {
-    $requiredStats = ["action", "result", "character1", "character2",];
-    $resolver->setDefined(["amount", "name",]);
+    $requiredStats = ["action", "result", "character1", "character2", ];
+    $resolver->setDefined(["amount", "name", ]);
     $resolver->setRequired($requiredStats);
     $resolver->setAllowedTypes("action", "string");
     $resolver->setAllowedTypes("result", "bool");

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.");
     }
   }
   

Spacing +5 added lines, -5 removed lines

@@ -89,7 +89,7 @@ 
     $this->onCombatEnd[] = [$this, "resetInitiative"];
     $this->onRoundStart[] = [$this, "applyEffectProviders"];
     $this->onRoundStart[] = [$this, "decreaseEffectsDuration"];
-    $this->onRoundStart[] = [$this ,"recalculateStats"];
+    $this->onRoundStart[] = [$this, "recalculateStats"];
     $this->onRoundStart[] = [$this, "logRoundNumber"];
     $this->onRoundStart[] = [$this, "applyPoison"];
     $this->onRound[] = [$this, "mainStage"];
@@ -347,14 +347,14 @@ 
    */
   public function selectAttackTarget(Character $attacker): ?Character {
     $enemyTeam = $this->getEnemyTeam($attacker);
-    $rangedWeapon = ($attacker->equipment->hasItems(["%class%" => Weapon::class, "worn" => true, "ranged" => true,]));
+    $rangedWeapon = ($attacker->equipment->hasItems(["%class%" => Weapon::class, "worn" => true, "ranged" => true, ]));
     if(!$rangedWeapon) {
       $rowToAttack = $enemyTeam->rowToAttack;
       if(is_null($rowToAttack)) {
         return null;
       }
       /** @var Team $enemies */
-      $enemies = Team::fromArray($enemyTeam->getItems(["positionRow" => $rowToAttack, "hitpoints>" => 0,]), $enemyTeam->name);
+      $enemies = Team::fromArray($enemyTeam->getItems(["positionRow" => $rowToAttack, "hitpoints>" => 0, ]), $enemyTeam->name);
     } else {
       $enemies = $enemyTeam;
     }
@@ -423,8 +423,8 @@ 
   public function applyPoison(self $combat): void {
     /** @var Character[] $characters */
     $characters = array_merge(
-        $combat->team1->getItems(["hitpoints>" => 0, "poisoned!=" => false,]),
-        $combat->team2->getItems(["hitpoints>" => 0, "poisoned!=" => false,])
+        $combat->team1->getItems(["hitpoints>" => 0, "poisoned!=" => false, ]),
+        $combat->team2->getItems(["hitpoints>" => 0, "poisoned!=" => false, ])
     );
     foreach($characters as $character) {
       $poisonValue = $character->getStatus(Character::STATUS_POISONED);

src/Character.php

Spacing +3 added lines, -3 removed lines

@@ -201,10 +201,10 @@
   }
   
   protected function setStats(array $stats): void {
-    $requiredStats = array_merge(["id", "name", "level", "initiativeFormula",], static::BASE_STATS);
-    $allStats = array_merge($requiredStats, ["occupation", "race", "specialization", "gender",]);
+    $requiredStats = array_merge(["id", "name", "level", "initiativeFormula", ], static::BASE_STATS);
+    $allStats = array_merge($requiredStats, ["occupation", "race", "specialization", "gender", ]);
     $numberStats = static::BASE_STATS;
-    $textStats = ["name", "race", "occupation", "specialization", "initiativeFormula",];
+    $textStats = ["name", "race", "occupation", "specialization", "initiativeFormula", ];
     $resolver = new OptionsResolver();
     $resolver->setDefined($allStats);
     $resolver->setAllowedTypes("id", ["integer", "string"]);

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

Braces +3 added lines, -1 removed lines

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

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/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