heroesofabenez / combat

src/CombatAction.php

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace HeroesofAbenez\Combat;
 
@@ -46,8 +46,8 @@ 
   protected $message;
   
   public function __construct(ITranslator $translator, array $action) {
-    $requiredStats = ["action", "result", "character1", "character2",];
-    $allStats = array_merge($requiredStats, ["amount", "name",]);
+    $requiredStats = ["action", "result", "character1", "character2", ];
+    $allStats = array_merge($requiredStats, ["amount", "name", ]);
     $resolver = new OptionsResolver();
     $resolver->setDefined($allStats);
     $resolver->setRequired($requiredStats);
@@ -151,7 +151,7 @@ 
         $text = $this->translator->translate("combat.log.poison", $this->amount, ["character1" => $character1]);
         break;
     }
-    $this->message =  $text;
+    $this->message = $text;
   }
   
   public function __toString(): string {

src/SkillAttack.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace HeroesofAbenez\Combat;
 
@@ -48,7 +48,7 @@ 
   
   protected function configureOptions(OptionsResolver $resolver): void {
     parent::configureOptions($resolver);
-    $allStats = ["baseDamage", "damageGrowth", "strikes", "hitRate",];
+    $allStats = ["baseDamage", "damageGrowth", "strikes", "hitRate", ];
     $resolver->setRequired($allStats);
     $resolver->setAllowedTypes("baseDamage", "string");
     $resolver->setAllowedTypes("damageGrowth", "string");

src/CharacterEffect.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace HeroesofAbenez\Combat;
 
@@ -40,7 +40,7 @@ 
   protected $duration;
   
   public function __construct(array $effect) {
-    $allStats = ["id", "type", "source", "value", "duration", "stat",];
+    $allStats = ["id", "type", "source", "value", "duration", "stat", ];
     $resolver = new OptionsResolver();
     $resolver->setDefined($allStats);
     $resolver->setRequired($allStats);

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

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace HeroesofAbenez\Combat;
 

src/SkillSpecial.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace HeroesofAbenez\Combat;
 
@@ -32,7 +32,7 @@ 
   public const STAT_DODGE = "dodge";
   public const STAT_INITIATIVE = "initiative";
   /** @var string[] */
-  public const NO_STAT_TYPES = [self::TYPE_STUN, self::TYPE_POISON,];
+  public const NO_STAT_TYPES = [self::TYPE_STUN, self::TYPE_POISON, ];
   
   /** @var string */
   protected $type;
@@ -66,7 +66,7 @@ 
   
   protected function configureOptions(OptionsResolver $resolver): void {
     parent::configureOptions($resolver);
-    $allStats = ["type", "stat", "value", "valueGrowth", "duration",];
+    $allStats = ["type", "stat", "value", "valueGrowth", "duration", ];
     $resolver->setRequired($allStats);
     $resolver->setAllowedTypes("type", "string");
     $resolver->setAllowedValues("type", function(string $value) {

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

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace HeroesofAbenez\Combat;
 
@@ -35,7 +35,7 @@ 
   protected $bonusValue;
   
   public function __construct(array $data) {
-    $allStats = ["id", "deployed", "bonusStat", "bonusValue",];
+    $allStats = ["id", "deployed", "bonusStat", "bonusValue", ];
     $resolver = new OptionsResolver();
     $resolver->setDefined($allStats);
     $resolver->setRequired($allStats);

src/Equipment.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace HeroesofAbenez\Combat;
 
@@ -49,7 +49,7 @@ 
   protected $worn;
   
   public function __construct(array $data) {
-    $allStats = ["id", "name", "slot", "type", "strength", "worn",];
+    $allStats = ["id", "name", "slot", "type", "strength", "worn", ];
     $resolver = new OptionsResolver();
     $resolver->setDefined($allStats);
     $resolver->setRequired($allStats);

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

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace HeroesofAbenez\Combat;
 

src/CombatBase.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace HeroesofAbenez\Combat;
 
@@ -78,7 +78,7 @@ 
     $this->onCombatEnd[] = [$this, "removeCombatEffects"];
     $this->onCombatEnd[] = [$this, "logCombatResult"];
     $this->onCombatEnd[] = [$this, "resetInitiative"];
-    $this->onRoundStart[] = [$this ,"recalculateStats"];
+    $this->onRoundStart[] = [$this, "recalculateStats"];
     $this->onRoundStart[] = [$this, "logRoundNumber"];
     $this->onRoundStart[] = [$this, "applyPoison"];
     $this->onRound[] = [$this, "mainStage"];

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,