From 829d63d7f6eaf62db3cf52a1527682d580bcbd64 Mon Sep 17 00:00:00 2001 From: Vassyli Date: Wed, 27 Sep 2017 11:59:14 +0200 Subject: [PATCH] Fixes BattleEvents to accept correct game --- src/Battle.php | 22 ++----------------- src/Models/BattleEvents/BattleEvent.php | 1 + src/Models/BattleEvents/BuffMessageEvent.php | 1 + src/Models/BattleEvents/CriticalHitEvent.php | 1 + src/Models/BattleEvents/DamageEvent.php | 1 + .../BattleEvents/DamageLifetapEvent.php | 1 + .../BattleEvents/DamageReflectionEvent.php | 1 + src/Models/BattleEvents/DeathEvent.php | 1 + src/Models/BattleEvents/MinionDamageEvent.php | 3 ++- .../BattleEvents/RegenerationBuffEvent.php | 3 ++- tests/BattleTest.php | 8 +++++++ 11 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/Battle.php b/src/Battle.php index c264e0e..d91bd60 100644 --- a/src/Battle.php +++ b/src/Battle.php @@ -16,11 +16,7 @@ use LotGD\Core\{ Models\FighterInterface }; use LotGD\Core\Models\{ - Buff, - BattleEvents\BuffMessageEvent, - BattleEvents\CriticalHitEvent, - BattleEvents\DamageEvent, - BattleEvents\DeathEvent + Buff, BattleEvents\BuffMessageEvent, BattleEvents\CriticalHitEvent, BattleEvents\DamageEvent, BattleEvents\DeathEvent, Scene }; /** @@ -102,23 +98,9 @@ class Battle return $battle; } - /** - * @ToDo Returns at some point battle actions - */ - public function getActions() - { - } - - /** - * @ToDo Do some action - */ - public function selectAction() - { - } - /** * Returns a list of all battle events - * @return \LotGD\Core\Collection + * @return Collection */ public function getEvents(): Collection { diff --git a/src/Models/BattleEvents/BattleEvent.php b/src/Models/BattleEvents/BattleEvent.php index 0b6b418..44e6a28 100644 --- a/src/Models/BattleEvents/BattleEvent.php +++ b/src/Models/BattleEvents/BattleEvent.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace LotGD\Core\Models\BattleEvents; use LotGD\Core\Exceptions\BattleEventException; +use LotGD\Core\Game; /** * A representation of something that happened in battle. diff --git a/src/Models/BattleEvents/BuffMessageEvent.php b/src/Models/BattleEvents/BuffMessageEvent.php index 0731643..6374a5b 100644 --- a/src/Models/BattleEvents/BuffMessageEvent.php +++ b/src/Models/BattleEvents/BuffMessageEvent.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace LotGD\Core\Models\BattleEvents; use LotGD\Core\Exceptions\BattleEventException; +use LotGD\Core\Game; /** * A battle event representing a message generated by a buff. diff --git a/src/Models/BattleEvents/CriticalHitEvent.php b/src/Models/BattleEvents/CriticalHitEvent.php index a8696a2..e54c9a5 100644 --- a/src/Models/BattleEvents/CriticalHitEvent.php +++ b/src/Models/BattleEvents/CriticalHitEvent.php @@ -3,6 +3,7 @@ declare(strict_types=1); namespace LotGD\Core\Models\BattleEvents; +use LotGD\Core\Game; use LotGD\Core\Models\FighterInterface; /** diff --git a/src/Models/BattleEvents/DamageEvent.php b/src/Models/BattleEvents/DamageEvent.php index 313c602..31f8fe4 100644 --- a/src/Models/BattleEvents/DamageEvent.php +++ b/src/Models/BattleEvents/DamageEvent.php @@ -3,6 +3,7 @@ declare(strict_types=1); namespace LotGD\Core\Models\BattleEvents; +use LotGD\Core\Game; use LotGD\Core\Models\FighterInterface; /** diff --git a/src/Models/BattleEvents/DamageLifetapEvent.php b/src/Models/BattleEvents/DamageLifetapEvent.php index 9b468e6..5467964 100644 --- a/src/Models/BattleEvents/DamageLifetapEvent.php +++ b/src/Models/BattleEvents/DamageLifetapEvent.php @@ -3,6 +3,7 @@ declare(strict_types=1); namespace LotGD\Core\Models\BattleEvents; +use LotGD\Core\Game; use LotGD\Core\Models\FighterInterface; /** diff --git a/src/Models/BattleEvents/DamageReflectionEvent.php b/src/Models/BattleEvents/DamageReflectionEvent.php index 6d9fbef..7e6389f 100644 --- a/src/Models/BattleEvents/DamageReflectionEvent.php +++ b/src/Models/BattleEvents/DamageReflectionEvent.php @@ -3,6 +3,7 @@ declare(strict_types=1); namespace LotGD\Core\Models\BattleEvents; +use LotGD\Core\Game; use LotGD\Core\Models\FighterInterface; /** diff --git a/src/Models/BattleEvents/DeathEvent.php b/src/Models/BattleEvents/DeathEvent.php index 3574920..c118d32 100644 --- a/src/Models/BattleEvents/DeathEvent.php +++ b/src/Models/BattleEvents/DeathEvent.php @@ -3,6 +3,7 @@ declare(strict_types=1); namespace LotGD\Core\Models\BattleEvents; +use LotGD\Core\Game; use LotGD\Core\Models\FighterInterface; /** diff --git a/src/Models/BattleEvents/MinionDamageEvent.php b/src/Models/BattleEvents/MinionDamageEvent.php index 86464cc..5679d1b 100644 --- a/src/Models/BattleEvents/MinionDamageEvent.php +++ b/src/Models/BattleEvents/MinionDamageEvent.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace LotGD\Core\Models\BattleEvents; use LotGD\Core\Exceptions\BattleEventException; +use LotGD\Core\Game; use LotGD\Core\Models\FighterInterface; /** @@ -39,7 +40,7 @@ class MinionDamageEvent extends BattleEvent */ public function decorate(Game $game): string { - parent::decorate(); + parent::decorate($game); return str_replace( [ diff --git a/src/Models/BattleEvents/RegenerationBuffEvent.php b/src/Models/BattleEvents/RegenerationBuffEvent.php index 308356e..ecd412f 100644 --- a/src/Models/BattleEvents/RegenerationBuffEvent.php +++ b/src/Models/BattleEvents/RegenerationBuffEvent.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace LotGD\Core\Models\BattleEvents; use LotGD\Core\Exceptions\BattleEventException; +use LotGD\Core\Game; use LotGD\Core\Models\FighterInterface; /** @@ -44,7 +45,7 @@ class RegenerationBuffEvent extends BattleEvent */ public function decorate(Game $game): string { - parent::decorate(); + parent::decorate($game); if ($this->regeneration === 0) { return str_replace( diff --git a/tests/BattleTest.php b/tests/BattleTest.php index 27225f8..06e1e77 100644 --- a/tests/BattleTest.php +++ b/tests/BattleTest.php @@ -85,6 +85,10 @@ class BattleTest extends CoreModelTestCase if ($battle->isOver()) { break; } + + foreach ($battle->getEvents() as $event) { + $this->assertNotNull($event->decorate($this->getMockGame($character))); + } } $this->assertTrue($battle->isOver()); @@ -113,6 +117,10 @@ class BattleTest extends CoreModelTestCase break; } + foreach ($battle->getEvents() as $event) { + $this->assertNotNull($event->decorate($this->getMockGame($character))); + } + $battle = $battle->serialize(); }