Completed
Push — master ( fe9b11...feae1a )
by Jakub
02:34
created
src/SkillAttack.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-declare(strict_types=1);
2
+declare(strict_types = 1);
3 3
 
4 4
 namespace HeroesofAbenez\Combat;
5 5
 
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
   
49 49
   protected function configureOptions(OptionsResolver $resolver): void {
50 50
     parent::configureOptions($resolver);
51
-    $allStats = ["baseDamage", "damageGrowth", "strikes", "hitRate",];
51
+    $allStats = ["baseDamage", "damageGrowth", "strikes", "hitRate", ];
52 52
     $resolver->setRequired($allStats);
53 53
     $resolver->setAllowedTypes("baseDamage", "string");
54 54
     $resolver->setAllowedTypes("damageGrowth", "string");
Please login to merge, or discard this patch.
src/SkillSpecial.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-declare(strict_types=1);
2
+declare(strict_types = 1);
3 3
 
4 4
 namespace HeroesofAbenez\Combat;
5 5
 
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
   public const STAT_DODGE = "dodge";
33 33
   public const STAT_INITIATIVE = "initiative";
34 34
   /** @var string[] */
35
-  public const NO_STAT_TYPES = [self::TYPE_STUN, self::TYPE_POISON,];
35
+  public const NO_STAT_TYPES = [self::TYPE_STUN, self::TYPE_POISON, ];
36 36
   
37 37
   /** @var string */
38 38
   protected $type;
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
   
67 67
   protected function configureOptions(OptionsResolver $resolver): void {
68 68
     parent::configureOptions($resolver);
69
-    $allStats = ["type", "stat", "value", "valueGrowth", "duration",];
69
+    $allStats = ["type", "stat", "value", "valueGrowth", "duration", ];
70 70
     $resolver->setRequired($allStats);
71 71
     $resolver->setAllowedTypes("type", "string");
72 72
     $resolver->setAllowedValues("type", function(string $value) {
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
     });
75 75
     $resolver->setAllowedTypes("stat", ["string", "null"]);
76 76
     $resolver->setAllowedValues("stat", function(?string $value) {
77
-      return is_null($value) OR in_array($value, $this->getAllowedStats(), true);
77
+      return is_null($value) or in_array($value, $this->getAllowedStats(), true);
78 78
     });
79 79
     $resolver->setAllowedTypes("value", "integer");
80 80
     $resolver->setAllowedValues("value", function(int $value) {
Please login to merge, or discard this patch.
src/Equipment.php 2 patches
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
     });
62 62
     $resolver->setAllowedTypes("type", ["string", "null"]);
63 63
     $resolver->setAllowedValues("type", function(?string $value) {
64
-      return is_null($value) OR in_array($value, $this->getAllowedTypes(), true);
64
+      return is_null($value) or in_array($value, $this->getAllowedTypes(), true);
65 65
     });
66 66
     $resolver->setAllowedTypes("strength", "integer");
67 67
     $resolver->setAllowedValues("strength", function(int $value) {
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-declare(strict_types=1);
2
+declare(strict_types = 1);
3 3
 
4 4
 namespace HeroesofAbenez\Combat;
5 5
 
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
   protected $worn;
51 51
   
52 52
   public function __construct(array $data) {
53
-    $allStats = ["id", "name", "slot", "type", "strength", "worn",];
53
+    $allStats = ["id", "name", "slot", "type", "strength", "worn", ];
54 54
     $resolver = new OptionsResolver();
55 55
     $resolver->setRequired($allStats);
56 56
     $resolver->setAllowedTypes("id", "integer");
Please login to merge, or discard this patch.
src/CombatBase.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-declare(strict_types=1);
2
+declare(strict_types = 1);
3 3
 
4 4
 namespace HeroesofAbenez\Combat;
5 5
 
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
     $this->onCombatEnd[] = [$this, "removeCombatEffects"];
79 79
     $this->onCombatEnd[] = [$this, "logCombatResult"];
80 80
     $this->onCombatEnd[] = [$this, "resetInitiative"];
81
-    $this->onRoundStart[] = [$this ,"recalculateStats"];
81
+    $this->onRoundStart[] = [$this, "recalculateStats"];
82 82
     $this->onRoundStart[] = [$this, "logRoundNumber"];
83 83
     $this->onRoundStart[] = [$this, "applyPoison"];
84 84
     $this->onRound[] = [$this, "mainStage"];
Please login to merge, or discard this patch.
Upper-Lower-Casing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
       foreach($team as $character) {
229 229
         try {
230 230
           $column++;
231
-          if($character->positionRow > 0 AND $character->positionColumn > 0) {
231
+          if($character->positionRow > 0 and $character->positionColumn > 0) {
232 232
             continue;
233 233
           }
234 234
           setPosition:
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
     $characters = array_merge($combat->team1->toArray(), $combat->team2->toArray());
272 272
     foreach($characters as $character) {
273 273
       foreach($character->effects as $effect) {
274
-        if($effect->duration === CharacterEffect::DURATION_COMBAT OR is_int($effect->duration)) {
274
+        if($effect->duration === CharacterEffect::DURATION_COMBAT or is_int($effect->duration)) {
275 275
           $character->removeEffect($effect->id);
276 276
         }
277 277
       }
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
       $threshold = static::LOWEST_HP_THRESHOLD;
360 360
     }
361 361
     foreach($team->aliveMembers as $index => $member) {
362
-      if($member->hitpoints <= $member->maxHitpoints * $threshold AND $member->hitpoints < $lowestHp) {
362
+      if($member->hitpoints <= $member->maxHitpoints * $threshold and $member->hitpoints < $lowestHp) {
363 363
         $lowestHp = $member->hitpoints;
364 364
         $lowestIndex = $index;
365 365
       }
@@ -402,7 +402,7 @@  discard block
 block discarded – undo
402 402
         $targets = $this->getTeam($primaryTarget)->getMembers(["positionColumn" => $primaryTarget->positionColumn]);
403 403
         break;
404 404
       default:
405
-        throw new NotImplementedException("Target $skill->skill->target for attack skills is not implemented.");
405
+        throw new NotImplementedException("target $skill->skill->target for attack skills is not implemented.");
406 406
     }
407 407
     foreach($targets as $target) {
408 408
       for($i = 1; $i <= $skill->skill->strikes; $i++) {
@@ -427,7 +427,7 @@  discard block
 block discarded – undo
427 427
         $targets = $this->getEnemyTeam($character)->toArray();
428 428
         break;
429 429
       default:
430
-        throw new NotImplementedException("Target $skill->skill->target for special skills is not implemented.");
430
+        throw new NotImplementedException("target $skill->skill->target for special skills is not implemented.");
431 431
     }
432 432
     foreach($targets as $target) {
433 433
       $this->onSkillSpecial($character, $target, $skill);
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
437 437
   protected function chooseAction(CombatBase $combat, Character $character): ?string {
438 438
     if($character->hitpoints < 1) {
439 439
       return NULL;
440
-    } elseif(in_array($character, $combat->findHealers()->toArray(), true) AND !is_null($combat->selectHealingTarget($character))) {
440
+    } elseif(in_array($character, $combat->findHealers()->toArray(), true) and !is_null($combat->selectHealingTarget($character))) {
441 441
       return CombatAction::ACTION_HEALING;
442 442
     }
443 443
     $attackTarget = $combat->selectAttackTarget($character);
@@ -620,7 +620,7 @@  discard block
 block discarded – undo
620 620
       "character1" => $character1, "character2" => $target,
621 621
     ];
622 622
     $effect = new CharacterEffect([
623
-      "id" => "skill{$skill->skill->id}Effect",
623
+      "id" => "skill{$skill->skill->id}effect",
624 624
       "type" => $skill->skill->type,
625 625
       "stat" => ((in_array($skill->skill->type, SkillSpecial::NO_STAT_TYPES, true)) ? NULL : $skill->skill->stat),
626 626
       "value" => $skill->value,
Please login to merge, or discard this patch.
tests/bootstrap.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2
-declare(strict_types=1);
2
+declare(strict_types = 1);
3 3
 
4 4
 require __DIR__ . "/../vendor/autoload.php";
5
-Testbench\Bootstrap::setup(__DIR__ . '/_temp', function (\Nette\Configurator $configurator) {
6
-  $configurator->addParameters(["appDir" => __DIR__,]);
5
+Testbench\Bootstrap::setup(__DIR__ . '/_temp', function(\Nette\Configurator $configurator) {
6
+  $configurator->addParameters(["appDir" => __DIR__, ]);
7 7
   $configurator->addConfig(__DIR__ . "/tests.neon");
8 8
 });
9 9
 ?>
10 10
\ No newline at end of file
Please login to merge, or discard this patch.
src/InvalidStateException.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-declare(strict_types=1);
2
+declare(strict_types = 1);
3 3
 
4 4
 namespace HeroesofAbenez\Combat;
5 5
 
Please login to merge, or discard this patch.
src/CombatLogger.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-declare(strict_types=1);
2
+declare(strict_types = 1);
3 3
 
4 4
 namespace HeroesofAbenez\Combat;
5 5
 
Please login to merge, or discard this patch.
src/BaseCharacterSkill.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-declare(strict_types=1);
2
+declare(strict_types = 1);
3 3
 
4 4
 namespace HeroesofAbenez\Combat;
5 5
 
Please login to merge, or discard this patch.
src/Team.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-declare(strict_types=1);
2
+declare(strict_types = 1);
3 3
 
4 4
 namespace HeroesofAbenez\Combat;
5 5
 
Please login to merge, or discard this patch.
Upper-Lower-Casing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
    */
86 86
   public function getUsableMembers(): array {
87 87
     return array_values(array_filter($this->items, function(Character $value) {
88
-      return (!$value->stunned AND $value->hitpoints > 0);
88
+      return (!$value->stunned and $value->hitpoints > 0);
89 89
     }));
90 90
   }
91 91
   
@@ -105,11 +105,11 @@  discard block
 block discarded – undo
105 105
    */
106 106
   public function setCharacterPosition($id, int $row, int $column): void {
107 107
     if(!$this->hasMembers(["id" => $id])) {
108
-      throw new \OutOfBoundsException("Character $id is not in the team");
108
+      throw new \OutOfBoundsException("character $id is not in the team");
109 109
     } elseif(count($this->getMembers(["positionRow" => $row])) >= $this->maxRowSize) {
110
-      throw new InvalidCharacterPositionException("Row $row is full.", InvalidCharacterPositionException::ROW_FULL);
110
+      throw new InvalidCharacterPositionException("row $row is full.", InvalidCharacterPositionException::ROW_FULL);
111 111
     } elseif($this->hasMembers(["positionRow" => $row, "positionColumn" => $column])) {
112
-      throw new InvalidCharacterPositionException("Row $row column $column is occupied.", InvalidCharacterPositionException::POSITION_OCCUPIED);
112
+      throw new InvalidCharacterPositionException("row $row column $column is occupied.", InvalidCharacterPositionException::POSITION_OCCUPIED);
113 113
     }
114 114
     $character = $this->getMembers(["id" => $id])[0];
115 115
     $character->positionRow = $row;
Please login to merge, or discard this patch.