From cbdfca18c66a221c594d7f7e56d8cce011397a85 Mon Sep 17 00:00:00 2001 From: Temirkhan Date: Thu, 31 Aug 2023 23:06:33 +0200 Subject: [PATCH 01/29] Removing empty entries from inventory simplified --- src/Player/Player.php | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/Player/Player.php b/src/Player/Player.php index f4af29b..6ff6ce9 100644 --- a/src/Player/Player.php +++ b/src/Player/Player.php @@ -7,7 +7,6 @@ use Game\Dungeon\Dungeon; use Game\Dungeon\TTKCalculator; use Game\Engine\DBConnection; -use Game\Engine\DbTimeFactory; use Game\Engine\Error; use Game\Item\Item; use Game\Item\ItemPrototype as ItemPrototype; @@ -20,17 +19,6 @@ class Player private readonly PlayerLog $logger; - /** - * @param string $name - * @param DBConnection $connection - * @return self - * @deprecated will be removed - */ - public static function loadPlayer(int $id, DBConnection $connection): self - { - return new self($id, $connection); - } - /** * @internal Should not be used outside the current module */ @@ -264,10 +252,7 @@ public function dropItem(ItemPrototype $item, int $quantity): Drop if ($remainingItemsQuantity < 0) { throw new \RuntimeException('Player does not have that many items'); } - - if ($remainingItemsQuantity === 0) { - $this->destroyItem($item); - } + $this->removeNonExistentItems(); }); return new Drop($item, $quantity); From 7b075f449f1474f8560fa3b43ab8a71773983ac0 Mon Sep 17 00:00:00 2001 From: Temirkhan Date: Thu, 31 Aug 2023 23:19:40 +0200 Subject: [PATCH 02/29] Perks are now applied to player stats respectively --- src/Player/CreateCharacter.php | 24 ++++++++++++++++++++-- src/Player/Player.php | 4 ++-- src/UI/Template/component/player-info.twig | 12 +++++------ tests/Player/CreateCharacterTest.php | 18 ++++++++++------ updates/20230831211107.sql | 1 + 5 files changed, 43 insertions(+), 16 deletions(-) create mode 100644 updates/20230831211107.sql diff --git a/src/Player/CreateCharacter.php b/src/Player/CreateCharacter.php index 1578750..e110efc 100644 --- a/src/Player/CreateCharacter.php +++ b/src/Player/CreateCharacter.php @@ -20,7 +20,21 @@ public function __construct( public function execute(string $characterName, Race $race, User $forUser): Player { $this->db->execute( - "INSERT INTO players(user_id, race, name, health, health_max, strength, defence) VALUE (?, ?, ?, ?, ?, ?, ?)", + "INSERT INTO players( + user_id, + race, + name, + health, + health_max, + strength, + defence, + woodcutting, + harvesting, + mining, + blacksmith, + gathering, + alchemy + ) VALUE (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", [ $forUser->id, $race->id, @@ -28,7 +42,13 @@ public function execute(string $characterName, Race $race, User $forUser): Playe $race->stats->maxHealth, $race->stats->maxHealth, $race->stats->strength, - $race->stats->defence + $race->stats->defence, + $race->perks->canWoodcut ? 1 : 0, + $race->perks->canHarvest ? 1 : 0, + $race->perks->canMine ? 1 : 0, + $race->perks->canCraft ? 1 : 0, + $race->perks->canGather ? 1 : 0, + $race->perks->canBrew ? 1 : 0, ] ); diff --git a/src/Player/Player.php b/src/Player/Player.php index 6ff6ce9..bf5e02d 100644 --- a/src/Player/Player.php +++ b/src/Player/Player.php @@ -208,9 +208,9 @@ public function getHarvesting(): int return (int) $this->getProperty('harvesting'); } - public function getHerbalism(): int + public function getAlchemy(): int { - return (int) $this->getProperty('herbalism'); + return (int) $this->getProperty('alchemy'); } public function getBlacksmith(): int diff --git a/src/UI/Template/component/player-info.twig b/src/UI/Template/component/player-info.twig index 07382a1..35438a6 100644 --- a/src/UI/Template/component/player-info.twig +++ b/src/UI/Template/component/player-info.twig @@ -26,12 +26,12 @@ 
Abilities
- Woodcutting: {{ player.woodcutting }}
- Mining: {{ player.mining }}
- Gathering: {{ player.gathering }}
- Harvesting: {{ player.harvesting }}
- Blacksmith: {{ player.blacksmith }}
- Herbalism: {{ player.herbalism }}
+ {% if player.woodcutting > 0 %}Lumberjack: {{ player.woodcutting }}
{% endif %} + {% if player.mining > 0 %}Miner: {{ player.mining }}
{% endif %} + {% if player.gathering > 0 %}Gatherer: {{ player.gathering }}
{% endif %} + {% if player.harvesting > 0 %}Farmer: {{ player.harvesting }}
{% endif %} + {% if player.blacksmith > 0 %}Craft: {{ player.blacksmith }}
{% endif %} + {% if player.alchemy > 0 %}Alchemist: {{ player.alchemy }}
{% endif %}
  • diff --git a/tests/Player/CreateCharacterTest.php b/tests/Player/CreateCharacterTest.php index 2a6a3d8..36a89b8 100644 --- a/tests/Player/CreateCharacterTest.php +++ b/tests/Player/CreateCharacterTest.php @@ -52,11 +52,17 @@ private function assertNewCharacterCreated(string $characterName, Race $expected self::assertEquals(10, $character->getGold()); self::assertFalse($character->isFighting()); self::assertTrue($character->isInProtectiveZone()); - self::assertEquals(0, $character->getWoodcutting()); - self::assertEquals(0, $character->getHerbalism()); - self::assertEquals(0, $character->getHarvesting()); - self::assertEquals(0, $character->getBlacksmith()); - self::assertEquals(0, $character->getMining()); - self::assertEquals(0, $character->getGathering()); + $lumberjackLvl = $expectedRace->perks->canWoodcut ? 1 : 0; + $minerLvl = $expectedRace->perks->canMine ? 1 : 0; + $craftsmanLvl = $expectedRace->perks->canCraft ? 1 : 0; + $gathererLvl = $expectedRace->perks->canGather ? 1 : 0; + $farmerLvl = $expectedRace->perks->canHarvest ? 1 : 0; + $alchemistLvl = $expectedRace->perks->canBrew ? 1 : 0; + self::assertEquals($lumberjackLvl, $character->getWoodcutting()); + self::assertEquals($alchemistLvl, $character->getAlchemy()); + self::assertEquals($farmerLvl, $character->getHarvesting()); + self::assertEquals($craftsmanLvl, $character->getBlacksmith()); + self::assertEquals($minerLvl, $character->getMining()); + self::assertEquals($gathererLvl, $character->getGathering()); } } diff --git a/updates/20230831211107.sql b/updates/20230831211107.sql new file mode 100644 index 0000000..7c3ca22 --- /dev/null +++ b/updates/20230831211107.sql @@ -0,0 +1 @@ +ALTER TABLE players RENAME COLUMN herbalism TO alchemy; From 3c4c3aa15062b0f88d35008e6570369fe1da6382 Mon Sep 17 00:00:00 2001 From: Temirkhan Date: Sat, 2 Sep 2023 01:59:50 +0200 Subject: [PATCH 03/29] Implemented raw luberjack(woodcutting) activity --- data/item.yaml | 8 ++ src/Dungeon/Reward.php | 17 +++- src/Player/Activity/ActivityInterface.php | 28 +++++++ src/Player/Activity/Lumberjack.php | 82 +++++++++++++++++++ src/Player/Player.php | 41 ++++++++++ src/Server.php | 44 ++++++++++ src/UI/Scene/Activity/Lumberjack.php | 69 ++++++++++++++++ src/UI/Template/activity/lumberjack.html.twig | 52 ++++++++++++ src/UI/Template/minimalistic.template.twig | 14 ++-- updates/20230831215628.sql | 12 +++ www/launcher.php | 4 + 11 files changed, 363 insertions(+), 8 deletions(-) create mode 100644 src/Player/Activity/ActivityInterface.php create mode 100644 src/Player/Activity/Lumberjack.php create mode 100644 src/UI/Scene/Activity/Lumberjack.php create mode 100644 src/UI/Template/activity/lumberjack.html.twig create mode 100644 updates/20230831215628.sql diff --git a/data/item.yaml b/data/item.yaml index 2538f6c..cd221f6 100644 --- a/data/item.yaml +++ b/data/item.yaml @@ -18,3 +18,11 @@ id: 5 name: Leather worth: 5 +- + id: 6 + name: Firewood + worth: 0 +- + id: 7 + name: Oka plank + worth: 1 diff --git a/src/Dungeon/Reward.php b/src/Dungeon/Reward.php index 8d668cf..a56bf98 100644 --- a/src/Dungeon/Reward.php +++ b/src/Dungeon/Reward.php @@ -36,7 +36,7 @@ public function isEmpty(): bool */ public function listDrop(): array { - return $this->drop; + return array_values($this->drop); } private function addDrop(Drop $drop): void @@ -49,4 +49,19 @@ private function addDrop(Drop $drop): void $this->drop[$itemId] = $drop; } } + + public function multiply(float $modifier): static + { + $newExp = (int) round($this->exp * $modifier); + $newDrops = []; + foreach ($this->drop as $drop) { + $newAmount = (int) round($drop->quantity * $modifier); + if ($newAmount === 0) { + continue; + } + $newDrops[] = new Drop($drop->item, $newAmount); + } + + return new self($newExp, $newDrops); + } } diff --git a/src/Player/Activity/ActivityInterface.php b/src/Player/Activity/ActivityInterface.php new file mode 100644 index 0000000..2c1db1c --- /dev/null +++ b/src/Player/Activity/ActivityInterface.php @@ -0,0 +1,28 @@ + [ + 'id' => 1, + 'name' => 'Hollow tree', + 'description' => 'Hollow tree. Can be sold as fuel for a coin or two.', + 'complexity' => 1, + 'rewardExp' => 5, + 'rewardItem' => 6, + ], + 2 => [ + 'id' => 2, + 'name' => 'Oak tree', + 'description' => 'Strong tree. They say hogs love hanging around it.', + 'complexity' => 3, + 'rewardExp' => 8, + 'rewardItem' => 7, + ], + ]; + + private int $optionId; + private string $optionName; + + public function __construct(int $option) + { + if (!isset(self::OPTIONS[$option])) { + throw new \RuntimeException('Unknown option passed'); + } + + $this->optionId = $option; + $this->optionName = self::OPTIONS[$option]['name']; + } + + public function getName(): string + { + return 'Lumberjack'; + } + + public function getOption(): int + { + return $this->optionId; + } + + public function getOptionName(): string + { + return $this->optionName; + } + + public function calculateReward(Player $for): Reward + { + $playerGeneralEfficiency = $for->getWoodcutting(); + if ($playerGeneralEfficiency === 0) { + return Reward::none(); + } + + $option = self::OPTIONS[$this->optionId]; + $efficiency = (int)round($playerGeneralEfficiency/$option['complexity']); + if ($efficiency === 0){ + return Reward::none(); + } + + $itemRepository = \DI::getService(ItemPrototypeRepository::class); + + return new Reward($option['rewardExp'], [new Drop($itemRepository->getById($option['rewardItem']), $efficiency)]); + } + + public function isSame(ActivityInterface $activity): bool + { + return $activity->getName() === $this->getName() && $activity->getOptionName() === $this->getOptionName(); + } +} diff --git a/src/Player/Player.php b/src/Player/Player.php index bf5e02d..13573af 100644 --- a/src/Player/Player.php +++ b/src/Player/Player.php @@ -10,6 +10,8 @@ use Game\Engine\Error; use Game\Item\Item; use Game\Item\ItemPrototype as ItemPrototype; +use Game\Player\Activity\ActivityInterface; +use Game\Player\Activity\Lumberjack; use Game\Skill\Effect\EffectApplier; use Game\Trade\Offer; @@ -137,6 +139,45 @@ public function addExp(int $amount): void $this->logger->add($this->id, "You gained $amount experience points."); } + public function startActivity(ActivityInterface $activity): ?Error + { + if (!$this->isInProtectiveZone()) { + return new Error('Can not go for activities when not in protective zone'); + } + + if ($this->getCurrentActivity() !== null) { + return new Error('Character is busy with another activity'); + } + + $this->connection->execute(" + INSERT INTO activity(character_id, name, selected_option) + VALUE (?, ?, ?) + ", [$this->id, $activity->getName(), $activity->getOption()]); + + return null; + } + + public function getCurrentActivity(): ?ActivityInterface + { + $data = $this->connection->fetchRow('SELECT name, selected_option FROM activity WHERE character_id=' . $this->id); + if ($data === []) { + return null; + } + + // TODO some inflector would be good to resolve the values + switch ($data['name']) { + case 'Lumberjack': + return new Lumberjack($data['selected_option']); + default: + throw new \RuntimeException('Unknown activity'); + } + } + + public function stopActivity(): void + { + $this->connection->execute('DELETE FROM activity WHERE character_id=' . $this->id); + } + public function getLevel(): int { return (int) $this->getProperty('level'); diff --git a/src/Server.php b/src/Server.php index 326c0c4..3a2f985 100644 --- a/src/Server.php +++ b/src/Server.php @@ -149,6 +149,50 @@ private function giveRewards(): void $this->logs[] = $rewardLog; } } + + $this->giveActivityRewards(); + } + + private function giveActivityRewards(): void + { + $lastCheckedAt = $this->currentTime->subMinute(); + + $activities = $this->db->fetchRows('SELECT character_id, last_reward_at, checked_at FROM activity WHERE checked_at < ?', [DbTimeFactory::createTimestamp($lastCheckedAt)]); + + foreach ($activities as $data) { + $character = $this->characterRepository->getById($data['character_id']); + $activity = $character->getCurrentActivity(); + + $lastCheckedAt = CarbonImmutable::create($data['checked_at']); + $lastRewardedAt = CarbonImmutable::create($data['last_reward_at']); + + $minutesSinceLastCheck = $lastCheckedAt->diffInMinutes($this->currentTime, false); + $minutesSinceLastReward = $lastRewardedAt->diffInMinutes($this->currentTime, false); + $remainingStamina = $character->getStamina(); + // If player spent in dungeon more time than stamina he has, decrease spent time according that amount + if ($remainingStamina < $minutesSinceLastCheck) { + $minutesSinceLastCheck = $remainingStamina; + $minutesSinceLastReward = $lastRewardedAt->diffInMinutes($lastCheckedAt, false) + $remainingStamina; + } + + $this->db->execute('UPDATE players SET stamina = GREATEST(stamina - ?, 0) WHERE id = ?', [$minutesSinceLastCheck, $character->getId()]); + $this->db->execute('UPDATE activity SET checked_at=? WHERE character_id=?', [DbTimeFactory::createTimestamp($this->currentTime), $character->getId()]); + + if ($minutesSinceLastReward < 60) { + continue; + } + + $fullHoursPassed = (int) ($minutesSinceLastReward/60); + $rewardPerHour = $activity->calculateReward($character); + $reward = $rewardPerHour->multiply($fullHoursPassed); + + $character->addExp($reward->exp); + foreach ($reward->listDrop() as $drop) { + $character->pickUp($drop); + } + + $this->db->execute('UPDATE activity SET last_reward_at=last_reward_at + INTERVAL ? HOUR WHERE character_id=?', [$fullHoursPassed, $character->getId()]); + } } /** diff --git a/src/UI/Scene/Activity/Lumberjack.php b/src/UI/Scene/Activity/Lumberjack.php new file mode 100644 index 0000000..2616725 --- /dev/null +++ b/src/UI/Scene/Activity/Lumberjack.php @@ -0,0 +1,69 @@ +getCurrentPlayer(); + // Player can not perform this activity + if ($player->getWoodcutting() < 1) { + return $this->switchToScene(MainMenu::class); + } + $errorMsg = ''; + $infoMsg = ''; + + $this->handleInput($input, $player); + + $currentActivity = $player->getCurrentActivity(); + $options = []; + foreach (\Game\Player\Activity\Lumberjack::OPTIONS as $option) { + $activity = new \Game\Player\Activity\Lumberjack($option['id']); + $option['isCurrent'] = $currentActivity !== null && $activity->isSame($currentActivity); + $reward = $activity->calculateReward($player); + if ($reward->isEmpty()) { + $option['gainPerHour'] = null; + } else { + $option['gainPerHour'] = [ + 'exp' => $reward->exp, + 'drop' => $reward->listDrop()[0], + ]; + } + $options[] = $option; + } + + return $this->renderTemplate('activity/lumberjack', [ + 'options' => $options, + 'errorMsg' => $errorMsg, + 'infoMsg' => $infoMsg, + ]); + } + + private function handleInput(InputInterface $input, Player $player): void + { + if ($input->getString('action') === 'stop') { + $player->stopActivity(); + + return; + } + + $selectedOption = $input->getInt('tree'); + if ($selectedOption > 0) { + foreach (\Game\Player\Activity\Lumberjack::OPTIONS as $option) { + // If option exists then start activity + if ($selectedOption === $option['id']) { + $player->startActivity(new \Game\Player\Activity\Lumberjack($option['id'])); + return; + } + } + } + } +} diff --git a/src/UI/Template/activity/lumberjack.html.twig b/src/UI/Template/activity/lumberjack.html.twig new file mode 100644 index 0000000..be833cb --- /dev/null +++ b/src/UI/Template/activity/lumberjack.html.twig @@ -0,0 +1,52 @@ +{% extends "minimalistic.template.twig" %} + +{% block content %} +
    +
    Lumberjack
    +
    +
    +
    + {% if errorMsg %} +
    {{ errorMsg }}

    + {% elseif infoMsg %} +
    {{ infoMsg }}

    + {% endif %} + {% set column = 0 %} + {% for option in options %} + {% set column = column + 1 %} + {% if column == 1 %} +
    + {% endif %} +
    +

    {{ option.name }}

    + {% if option.gainPerHour is not null %} + Per hour
    + Exp: {{ option.gainPerHour.exp }}
    + Resource: {{ option.gainPerHour.drop.quantity }} {{ option.gainPerHour.drop.item.name }}
    + {% else %} +
    +
    + Skill level is too low
    + {% endif %} + {% if option.isCurrent %} + + {% else %} + + {% endif %} +
    + {% if column == 2 %} + {% set column = 0 %} +
    +
    + {% endif %} + {% endfor %} + {# helps to close an unclosed div-row #} + {% if column == 1 %} +
    +
    + {% endif %} +
    +
    +
    + +{% endblock %} diff --git a/src/UI/Template/minimalistic.template.twig b/src/UI/Template/minimalistic.template.twig index 43017b3..743a51b 100644 --- a/src/UI/Template/minimalistic.template.twig +++ b/src/UI/Template/minimalistic.template.twig @@ -48,15 +48,15 @@
  • - Woodcutting - Mining - Gathering - Harvesting - Blacksmith - Herbalism + {% if player.woodcutting > 0 %}Lumberjack{% endif %} + {% if player.mining > 0 %}Miner{% endif %} + {% if player.gathering > 0 %}Gatherer{% endif %} + {% if player.harvesting > 0 %}Farmer{% endif %} + {% if player.blacksmith > 0 %}Crafter{% endif %} + {% if player.alchemy > 0 %}Alchemist{% endif %}
  • diff --git a/updates/20230831215628.sql b/updates/20230831215628.sql new file mode 100644 index 0000000..92a90e6 --- /dev/null +++ b/updates/20230831215628.sql @@ -0,0 +1,12 @@ +CREATE TABLE `activity` +( + `id` INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT, + `character_id` INT NOT NULL UNIQUE, + `name` VARCHAR(50) NOT NULL, + `selected_option` TINYINT UNSIGNED NOT NULL, + `started_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `checked_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `last_reward_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + FOREIGN KEY (character_id) REFERENCES players (id) ON DELETE CASCADE +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4; diff --git a/www/launcher.php b/www/launcher.php index 1304a6c..d16e80e 100644 --- a/www/launcher.php +++ b/www/launcher.php @@ -20,6 +20,8 @@ enum Navigation: string case SHOP = 'shop'; case CHARACTER_CREATION = 'charCreation'; + case ACTIVITY_LUMBERJACK = 'lumberjack'; + public function load(): void { $userInput = new HttpInput(); @@ -45,6 +47,8 @@ private function getScene(): Scene\SceneInterface return DI::getService(Scene\Shop::class); case self::CHARACTER_CREATION: return DI::getService(Scene\CharacterCreation::class); + case self::ACTIVITY_LUMBERJACK: + return DI::getService(Scene\Activity\Lumberjack::class); default: return DI::getService(Scene\Auth::class); } From ffb6ce70bb97f600e7411c0f299e4c804da950d9 Mon Sep 17 00:00:00 2001 From: Temirkhan Date: Sat, 2 Sep 2023 16:22:26 +0200 Subject: [PATCH 04/29] More relevant timecalculation --- src/Server.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Server.php b/src/Server.php index 3a2f985..b1828be 100644 --- a/src/Server.php +++ b/src/Server.php @@ -191,7 +191,8 @@ private function giveActivityRewards(): void $character->pickUp($drop); } - $this->db->execute('UPDATE activity SET last_reward_at=last_reward_at + INTERVAL ? HOUR WHERE character_id=?', [$fullHoursPassed, $character->getId()]); + $lastRewardedAt = $this->currentTime->addHours($fullHoursPassed); + $this->db->execute('UPDATE activity SET last_reward_at=? WHERE character_id=?', [DbTimeFactory::createTimestamp($lastRewardedAt), $character->getId()]); } } From ff2401f344c03b6b3ab966692dfe3b913a715ece Mon Sep 17 00:00:00 2001 From: Temirkhan Date: Sat, 2 Sep 2023 16:27:54 +0200 Subject: [PATCH 05/29] Reward model moved to player module --- src/Dungeon/RewardCalculator.php | 2 +- src/Player/Activity/ActivityInterface.php | 2 +- src/Player/Activity/Lumberjack.php | 2 +- src/{Dungeon => Player}/Reward.php | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) rename src/{Dungeon => Player}/Reward.php (96%) diff --git a/src/Dungeon/RewardCalculator.php b/src/Dungeon/RewardCalculator.php index 04cd72e..1200036 100644 --- a/src/Dungeon/RewardCalculator.php +++ b/src/Dungeon/RewardCalculator.php @@ -4,7 +4,7 @@ namespace Game\Dungeon; use Game\Player\Player; -use Game\Utils\TimeInterval; +use Game\Player\Reward; readonly class RewardCalculator { diff --git a/src/Player/Activity/ActivityInterface.php b/src/Player/Activity/ActivityInterface.php index 2c1db1c..a70ff96 100644 --- a/src/Player/Activity/ActivityInterface.php +++ b/src/Player/Activity/ActivityInterface.php @@ -3,8 +3,8 @@ namespace Game\Player\Activity; -use Game\Dungeon\Reward; use Game\Player\Player; +use Game\Player\Reward; interface ActivityInterface { diff --git a/src/Player/Activity/Lumberjack.php b/src/Player/Activity/Lumberjack.php index dc44278..16344e2 100644 --- a/src/Player/Activity/Lumberjack.php +++ b/src/Player/Activity/Lumberjack.php @@ -4,9 +4,9 @@ namespace Game\Player\Activity; use Game\Dungeon\Drop; -use Game\Dungeon\Reward; use Game\Item\ItemPrototypeRepository; use Game\Player\Player; +use Game\Player\Reward; readonly class Lumberjack implements ActivityInterface { diff --git a/src/Dungeon/Reward.php b/src/Player/Reward.php similarity index 96% rename from src/Dungeon/Reward.php rename to src/Player/Reward.php index a56bf98..f5fd918 100644 --- a/src/Dungeon/Reward.php +++ b/src/Player/Reward.php @@ -1,7 +1,9 @@ Date: Sat, 2 Sep 2023 18:47:38 +0200 Subject: [PATCH 06/29] Removed drop structure and replace with Item --- src/Dungeon/Drop.php | 14 ------ src/Dungeon/RewardCalculator.php | 7 +-- src/Player/Activity/Lumberjack.php | 7 +-- src/Player/CreateCharacter.php | 7 ++- src/Player/Player.php | 20 ++++----- src/Player/Reward.php | 66 ++++++++++++++++------------ src/Server.php | 10 ++--- src/UI/Scene/Activity/Lumberjack.php | 2 +- tests/Player/PlayerTest.php | 14 +++--- 9 files changed, 68 insertions(+), 79 deletions(-) delete mode 100644 src/Dungeon/Drop.php diff --git a/src/Dungeon/Drop.php b/src/Dungeon/Drop.php deleted file mode 100644 index 24fddc0..0000000 --- a/src/Dungeon/Drop.php +++ /dev/null @@ -1,14 +0,0 @@ -inhabitant->exp; - $drops = []; + $items = []; foreach ($this->dropRepository->getMonsterDrop($dungeon->inhabitant) as $dropChance) { $quantity = $dropChance->roll($unitsKilled); if ($quantity > 0) { - $drops[] = new Drop($dropChance->itemPrototype, $quantity); + $items[] = new Item($dropChance->itemPrototype->id, $quantity); } } - return new Reward($expEarned, $drops); + return new Reward($expEarned, $items); } } diff --git a/src/Player/Activity/Lumberjack.php b/src/Player/Activity/Lumberjack.php index 16344e2..29ed884 100644 --- a/src/Player/Activity/Lumberjack.php +++ b/src/Player/Activity/Lumberjack.php @@ -3,8 +3,7 @@ namespace Game\Player\Activity; -use Game\Dungeon\Drop; -use Game\Item\ItemPrototypeRepository; +use Game\Item\Item; use Game\Player\Player; use Game\Player\Reward; @@ -70,9 +69,7 @@ public function calculateReward(Player $for): Reward return Reward::none(); } - $itemRepository = \DI::getService(ItemPrototypeRepository::class); - - return new Reward($option['rewardExp'], [new Drop($itemRepository->getById($option['rewardItem']), $efficiency)]); + return new Reward($option['rewardExp'], [new Item($option['rewardItem'], $efficiency)]); } public function isSame(ActivityInterface $activity): bool diff --git a/src/Player/CreateCharacter.php b/src/Player/CreateCharacter.php index e110efc..05f2953 100644 --- a/src/Player/CreateCharacter.php +++ b/src/Player/CreateCharacter.php @@ -5,7 +5,7 @@ use Game\Chat\Chat; use Game\Engine\DBConnection; -use Game\Item\ItemPrototypeRepository; +use Game\Item\Item; use Game\User; readonly class CreateCharacter @@ -13,7 +13,6 @@ public function __construct( private DBConnection $db, private CharacterRepository $characterRepository, - private ItemPrototypeRepository $itemPrototypeRepository, private Chat $chat ) {} @@ -52,11 +51,11 @@ public function execute(string $characterName, Race $race, User $forUser): Playe ] ); - $gold = $this->itemPrototypeRepository->getById(1); + $goldId = 1; $character = $this->characterRepository->getByUser($forUser); - $character->obtainItem($gold, 10); + $character->obtainItem(new Item($goldId, 10)); $this->chat->addSystemMessage(sprintf('New character %s appears in the world', $characterName)); return $character; diff --git a/src/Player/Player.php b/src/Player/Player.php index 13573af..7f4e888 100644 --- a/src/Player/Player.php +++ b/src/Player/Player.php @@ -3,7 +3,6 @@ namespace Game\Player; -use Game\Dungeon\Drop; use Game\Dungeon\Dungeon; use Game\Dungeon\TTKCalculator; use Game\Engine\DBConnection; @@ -267,24 +266,25 @@ public function getLogs(int $amount): iterable return $this->logger->readLogs($this->id, $amount); } - public function pickUp(Drop $drop): void + public function pickUp(Item $item): void { - $this->obtainItem($drop->item, $drop->quantity); - $this->logger->add($this->id, sprintf("You picked up %d %s", $drop->quantity, $drop->item->name)); + $this->obtainItem($item); + + $this->logger->add($this->id, sprintf("You picked up %d %s", $item->quantity, $item->name)); } - public function obtainItem(ItemPrototype $item, int $quantity): void + public function obtainItem(Item $item): void { if ($this->getItemQuantity($item->id) === 0) { $this->connection - ->execute('INSERT INTO inventory (character_id, item_id, amount, worth) VALUES (?, ?, ?, ?)', [$this->id, $item->id, $quantity, $item->worth]); + ->execute('INSERT INTO inventory (character_id, item_id, amount, worth) VALUES (?, ?, ?, ?)', [$this->id, $item->id, $item->quantity, $item->worth]); } else { $this->connection - ->execute('UPDATE inventory SET amount = amount + ? WHERE item_id = ? AND character_id = ?', [$quantity, $item->id, $this->id]); + ->execute('UPDATE inventory SET amount = amount + ? WHERE item_id = ? AND character_id = ?', [$item->quantity, $item->id, $this->id]); } } - public function dropItem(ItemPrototype $item, int $quantity): Drop + public function dropItem(ItemPrototype $item, int $quantity): Item { $this->connection->transaction(function () use ($item, $quantity) { $this->connection->execute('UPDATE inventory SET amount = amount - ? WHERE item_id = ? AND character_id = ?', [$quantity, $item->id, $this->id]); @@ -296,7 +296,7 @@ public function dropItem(ItemPrototype $item, int $quantity): Drop $this->removeNonExistentItems(); }); - return new Drop($item, $quantity); + return new Item($item->id, $quantity); } public function destroyItem(ItemPrototype $item, int $quantity = null): void @@ -378,7 +378,7 @@ public function acceptOffer(Offer $offer): ?Error $this->connection->transaction(function () use ($offer) { // TODO drop returns actually dropped item which means that it can be used for actual trade player<=>seller $this->dropItem($offer->inExchange->prototype, $offer->inExchange->quantity); - $this->obtainItem($offer->item->prototype, $offer->item->quantity); + $this->obtainItem($offer->item); }); return null; diff --git a/src/Player/Reward.php b/src/Player/Reward.php index f5fd918..71c6d22 100644 --- a/src/Player/Reward.php +++ b/src/Player/Reward.php @@ -3,14 +3,14 @@ namespace Game\Player; -use Game\Dungeon\Drop; +use Game\Item\Item; -class Reward +readonly class Reward { /** - * @var Drop[] + * @var Item[] */ - private array $drop = []; + public array $items; public static function none(): self { @@ -19,51 +19,59 @@ public static function none(): self /** * @param int $exp - * @param Drop[] $drop + * @param Item[] $items */ - public function __construct(public readonly int $exp, array $drop) + public function __construct(public int $exp, array $items) { - foreach ($drop as $entry) { - $this->addDrop($entry); - } + $this->items = $this->groupItems($items); } public function isEmpty(): bool { - return $this->exp === 0 && $this->drop === []; + return $this->exp === 0 && $this->items === []; } /** - * @return Drop[] + * @param Item[] $items + * + * @return Item[] */ - public function listDrop(): array + private function groupItems(array $items): array { - return array_values($this->drop); - } - - private function addDrop(Drop $drop): void - { - $itemId = $drop->item->id; - if (isset($this->drop[$itemId])) { - $existingDrop = $this->drop[$itemId]; - $this->drop[$itemId] = new Drop($existingDrop->item, $existingDrop->quantity + $drop->quantity); - } else { - $this->drop[$itemId] = $drop; + $groupedItems = []; + foreach ($items as $item) { + $itemId = $item->id; + if (isset($groupedItems[$itemId])) { + $existingItem = $groupedItems[$itemId]; + $groupedItems[$itemId] = new Item($existingItem->item->id, $existingItem->quantity + $item->quantity); + } else { + $groupedItems[$itemId] = $item; + } } + + return array_values($groupedItems); } public function multiply(float $modifier): static { - $newExp = (int) round($this->exp * $modifier); - $newDrops = []; - foreach ($this->drop as $drop) { - $newAmount = (int) round($drop->quantity * $modifier); + if ($modifier < 0) { + throw new \RuntimeException('Negative modifier is not allowed'); + } + + if ($modifier == 0) { + return self::none(); + } + + $newExp = (int)round($this->exp * $modifier); + $newItems = []; + foreach ($this->items as $item) { + $newAmount = (int)round($item->quantity * $modifier); if ($newAmount === 0) { continue; } - $newDrops[] = new Drop($drop->item, $newAmount); + $newItems[] = new Item($item->id, $newAmount); } - return new self($newExp, $newDrops); + return new self($newExp, $newItems); } } diff --git a/src/Server.php b/src/Server.php index b1828be..bda668b 100644 --- a/src/Server.php +++ b/src/Server.php @@ -126,9 +126,9 @@ private function giveRewards(): void $hunter->addExp($reward->exp); $lootDetails = ''; - foreach ($reward->listDrop() as $drop) { - $hunter->pickUp($drop); - $lootDetails .= sprintf('', $drop->item->name, $drop->quantity); + foreach ($reward->items as $item) { + $hunter->pickUp($item); + $lootDetails .= sprintf('', $item->name, $item->quantity); } $rewardLogs[] = sprintf( @@ -187,8 +187,8 @@ private function giveActivityRewards(): void $reward = $rewardPerHour->multiply($fullHoursPassed); $character->addExp($reward->exp); - foreach ($reward->listDrop() as $drop) { - $character->pickUp($drop); + foreach ($reward->items as $item) { + $character->pickUp($item); } $lastRewardedAt = $this->currentTime->addHours($fullHoursPassed); diff --git a/src/UI/Scene/Activity/Lumberjack.php b/src/UI/Scene/Activity/Lumberjack.php index 2616725..0f37c44 100644 --- a/src/UI/Scene/Activity/Lumberjack.php +++ b/src/UI/Scene/Activity/Lumberjack.php @@ -34,7 +34,7 @@ public function run(InputInterface $input): string } else { $option['gainPerHour'] = [ 'exp' => $reward->exp, - 'drop' => $reward->listDrop()[0], + 'drop' => $reward->items[0], ]; } $options[] = $option; diff --git a/tests/Player/PlayerTest.php b/tests/Player/PlayerTest.php index ba787ae..abe582c 100644 --- a/tests/Player/PlayerTest.php +++ b/tests/Player/PlayerTest.php @@ -3,8 +3,6 @@ namespace Game\Player; -use Game\Auth\AuthService; -use Game\Dungeon\Drop; use Game\Dungeon\DungeonRepository; use Game\IntegrationTestCase; use Game\Item\Item; @@ -114,9 +112,9 @@ public function testObtainItem(): void $gold = $this->getService(ItemPrototypeRepository::class)->getById(1); $cheese = $this->getService(ItemPrototypeRepository::class)->getById(2); - $this->player->obtainItem($gold, 123); - $this->player->obtainItem($cheese, 3); - $this->player->obtainItem($gold, 15); + $this->player->obtainItem(new Item($gold->id, 123)); + $this->player->obtainItem(new Item($cheese->id, 3)); + $this->player->obtainItem(new Item($gold->id, 15)); self::assertEquals(123 + 15, $this->player->getGold()); @@ -140,9 +138,9 @@ public function testPickUp(): void $gold = $this->getService(ItemPrototypeRepository::class)->getById(1); $cheese = $this->getService(ItemPrototypeRepository::class)->getById(2); - $this->player->pickUp(new Drop($gold, 123)); - $this->player->pickUp(new Drop($cheese, 3)); - $this->player->pickUp(new Drop($gold, 15)); + $this->player->pickUp(new Item($gold->id, 123)); + $this->player->pickUp(new Item($cheese->id, 3)); + $this->player->pickUp(new Item($gold->id, 15)); self::assertEquals(123 + 15, $this->player->getGold()); From 275410edb7c4be3f552fdd2c758f782cd402613f Mon Sep 17 00:00:00 2001 From: Temirkhan Date: Sun, 3 Sep 2023 00:46:40 +0200 Subject: [PATCH 07/29] Player hunting calculation segregated. Now we can track kill count --- src/Dungeon/RewardCalculator.php | 29 +-------- src/Player/Player.php | 12 ++-- src/Server.php | 60 +++++++++++++++---- src/UI/Template/activity/lumberjack.html.twig | 2 +- tests/IntegrationTestCase.php | 2 +- tests/Player/PlayerTest.php | 6 +- tests/ServerTest.php | 18 ++---- 7 files changed, 71 insertions(+), 58 deletions(-) diff --git a/src/Dungeon/RewardCalculator.php b/src/Dungeon/RewardCalculator.php index 4c56f09..75e0459 100644 --- a/src/Dungeon/RewardCalculator.php +++ b/src/Dungeon/RewardCalculator.php @@ -4,43 +4,20 @@ namespace Game\Dungeon; use Game\Item\Item; -use Game\Player\Player; use Game\Player\Reward; readonly class RewardCalculator { - private readonly TTKCalculator $ttkCalculator; - public function __construct(private DropChanceRepository $dropRepository) { - $this->ttkCalculator = new TTKCalculator(); } - // TODO SRP is violated here. At the same time encapsulation is not fulfiled. Calculate ttk separately and issue them too. - public function calculate(Dungeon $dungeon, Player $hunter, int $minutesInDungeon): Reward + public function calculateForHuntedMonster(Monster $monster, int $unitsKilled): Reward { - $approximateSpentMinutes = $minutesInDungeon; - if ($approximateSpentMinutes === 0) { - return Reward::none(); - } - - $ttkMonster = $this->ttkCalculator->calculate($hunter, $dungeon->inhabitant); - $ttkPlayer = $this->ttkCalculator->calculateForMonster($dungeon->inhabitant, $hunter); - - $unitsKilled = (int)floor($approximateSpentMinutes / $ttkMonster->toMinutes()); - if ($unitsKilled === 0) { - return Reward::none(); - } - - // If player needs more time to kill monster than monsters needs to kill player, then issue no rewards - if ($ttkMonster->isGreaterThan($ttkPlayer)) { - return Reward::none(); - } - - $expEarned = $unitsKilled * $dungeon->inhabitant->exp; + $expEarned = $unitsKilled * $monster->exp; $items = []; - foreach ($this->dropRepository->getMonsterDrop($dungeon->inhabitant) as $dropChance) { + foreach ($this->dropRepository->getMonsterDrop($monster) as $dropChance) { $quantity = $dropChance->roll($unitsKilled); if ($quantity > 0) { $items[] = new Item($dropChance->itemPrototype->id, $quantity); diff --git a/src/Player/Player.php b/src/Player/Player.php index 7f4e888..4ced9e5 100644 --- a/src/Player/Player.php +++ b/src/Player/Player.php @@ -6,6 +6,7 @@ use Game\Dungeon\Dungeon; use Game\Dungeon\TTKCalculator; use Game\Engine\DBConnection; +use Game\Engine\DbTimeFactory; use Game\Engine\Error; use Game\Item\Item; use Game\Item\ItemPrototype as ItemPrototype; @@ -66,7 +67,8 @@ public function enterDungeon(Dungeon $dungeon): null|Error return new Error('You are already hunting in a dungeon'); } - $this->connection->execute('INSERT INTO hunting (character_id, dungeon_id) VALUES (?, ?)', [$this->id, $dungeon->id]); + $now = DbTimeFactory::createCurrentTimestamp(); + $this->connection->execute('INSERT INTO hunting (character_id, dungeon_id, checked_at, last_reward_at) VALUES (?, ?, ?, ?)', [$this->id, $dungeon->id, $now, $now]); $this->connection->execute('UPDATE players SET in_combat = 1 WHERE id = ?', [$this->id]); return null; @@ -148,10 +150,12 @@ public function startActivity(ActivityInterface $activity): ?Error return new Error('Character is busy with another activity'); } + $now = DbTimeFactory::createCurrentTimestamp(); + $this->connection->execute(" - INSERT INTO activity(character_id, name, selected_option) - VALUE (?, ?, ?) - ", [$this->id, $activity->getName(), $activity->getOption()]); + INSERT INTO activity(character_id, name, selected_option, checked_at, last_reward_at) + VALUE (?, ?, ?, ?, ?) + ", [$this->id, $activity->getName(), $activity->getOption(), $now, $now]); return null; } diff --git a/src/Server.php b/src/Server.php index bda668b..d76036e 100644 --- a/src/Server.php +++ b/src/Server.php @@ -5,11 +5,14 @@ use Carbon\CarbonImmutable; use Game\Dungeon\DungeonRepository; +use Game\Dungeon\Monster; use Game\Dungeon\RewardCalculator; +use Game\Dungeon\TTKCalculator; use Game\Engine\DBConnection; use Game\Engine\DbTimeFactory; use Game\Player\CharacterRepository; use Game\Player\Player; +use Game\Utils\TimeInterval; class Server { @@ -19,6 +22,7 @@ class Server public function __construct( private readonly DBConnection $db, + private readonly TTKCalculator $ttkCalculator, private readonly RewardCalculator $rewardCalculator, private readonly DungeonRepository $dungeonRepository, private readonly CharacterRepository $characterRepository @@ -60,7 +64,9 @@ private function regenerateStamina(): void return; } - $this->logs[] = sprintf('%d', $minutesPassed); + $this->logs[] = sprintf('%d', min($minutesPassed, Player::MAX_POSSIBLE_STAMINA)); + + // TODO stop regenerating stamina for players with activities. Introduce playerState instead of in_combat $this->db->execute( 'UPDATE players SET stamina = LEAST(stamina + ?, ?) WHERE in_combat = 0 AND stamina < ?', [$minutesPassed, Player::MAX_POSSIBLE_STAMINA, Player::MAX_POSSIBLE_STAMINA] @@ -75,15 +81,17 @@ private function stopExhaustedHunters(): void $playerNameWithNoStamina = $row['name']; $this->db->execute('DELETE from hunting WHERE character_id = ?', [$row['id']]); - $this->db->execute('UPDATE players SET in_combat = 0, stamina=0 WHERE id = ?', [$row['id']]); $this->logs[] = sprintf('', $playerNameWithNoStamina); } + + $this->db->execute('UPDATE players SET in_combat = 0, stamina = 0 WHERE stamina <= 0 AND in_combat = 1'); } private function giveRewards(): void { $logTemplate = << + %d %s %d %s %s @@ -91,7 +99,6 @@ private function giveRewards(): void XML; $rewardLogs[] = ''; - $now = CarbonImmutable::now(); foreach ($this->getHunters() as $row) { $hunter = $this->characterRepository->getById($row['character_id']); $huntingZone = $this->dungeonRepository->getById($row['dungeon_id']); @@ -99,12 +106,12 @@ private function giveRewards(): void $lastCheckedAt = CarbonImmutable::create($row['checked_at']); $lastRewardedAt = CarbonImmutable::create($row['last_reward_at']); - $minutesSinceLastCheck = $lastCheckedAt->diffInMinutes($now, false); + $minutesSinceLastCheck = $lastCheckedAt->diffInMinutes($this->currentTime, false); if ($minutesSinceLastCheck < 1) { continue; } - $minutesSinceLastReward = $lastRewardedAt->diffInMinutes($now, false); + $minutesSinceLastReward = $lastRewardedAt->diffInMinutes($this->currentTime, false); $remainingStamina = $hunter->getStamina(); // If player spent in dungeon more time than stamina he has, decrease spent time according that amount if ($remainingStamina < $minutesSinceLastCheck) { @@ -114,17 +121,21 @@ private function giveRewards(): void $this->db->execute('UPDATE players SET stamina = GREATEST(stamina - ?, 0) WHERE id = ?', [$minutesSinceLastCheck, $hunter->getId()]); - $reward = $this->rewardCalculator->calculate($huntingZone, $hunter, $minutesSinceLastReward); - if ($reward->isEmpty()) { - $this->db->execute('UPDATE hunting SET checked_at = ? WHERE character_id = ?', [DbTimeFactory::createTimestamp($now), $hunter->getId()]); + ['unitsKilled' => $unitsKilled, 'withinTime' => $timeSpent] = $this->calculateKillCount($hunter, $huntingZone->inhabitant, TimeInterval::fromMinutes($minutesSinceLastReward)); + + if ($unitsKilled < 1) { + $this->db->execute('UPDATE hunting SET checked_at = ? WHERE character_id = ?', [DbTimeFactory::createTimestamp($this->currentTime), $hunter->getId()]); continue; } - $this->db->execute('UPDATE hunting SET checked_at = ?, last_reward_at = ? WHERE character_id = ?', [DbTimeFactory::createTimestamp($now), DbTimeFactory::createTimestamp($now), $hunter->getId()]); + $reward = $this->rewardCalculator->calculateForHuntedMonster($huntingZone->inhabitant, $unitsKilled); - $hunter->addExp($reward->exp); + $rewardedAt = $lastRewardedAt->addSeconds($timeSpent->seconds); + + $this->db->execute('UPDATE hunting SET checked_at = ?, last_reward_at = ? WHERE character_id = ?', [DbTimeFactory::createTimestamp($this->currentTime), DbTimeFactory::createTimestamp($rewardedAt), $hunter->getId()]); + $hunter->addExp($reward->exp); $lootDetails = ''; foreach ($reward->items as $item) { $hunter->pickUp($item); @@ -136,6 +147,8 @@ private function giveRewards(): void $hunter->getName(), $huntingZone->name, $minutesSinceLastReward . 'minutes', + $unitsKilled, + $huntingZone->inhabitant->name, $reward->exp, $lootDetails, 'Stamina reduced by ' . $minutesSinceLastCheck @@ -209,4 +222,31 @@ private function getHunters(): iterable [DbTimeFactory::createTimestamp($lastCheckedAt)] ); } + + /** + * @param Player $hunter + * @param Monster $monster + * + * @return array{unitsKilled: int, withinTime: TimeInterval} + */ + private function calculateKillCount(Player $hunter, Monster $monster, TimeInterval $withinTime): array + { + $ttkMonster = $this->ttkCalculator->calculate($hunter, $monster); + $ttkPlayer = $this->ttkCalculator->calculateForMonster($monster, $hunter); + + // If player needs more time to kill monster than monsters needs to kill player + if ($ttkMonster->isGreaterThan($ttkPlayer)) { + return ['unitsKilled' => 0, 'withinTime' => $withinTime]; + } + + $unitsKilled = (int)floor($withinTime->toMinutes() / $ttkMonster->toMinutes()); + if ($unitsKilled === 0) { + return ['unitsKilled' => 0, 'withinTime' => $withinTime]; + } + + return [ + 'unitsKilled' => $unitsKilled, + 'withinTime' => new TimeInterval($ttkMonster->seconds * $unitsKilled), + ]; + } } diff --git a/src/UI/Template/activity/lumberjack.html.twig b/src/UI/Template/activity/lumberjack.html.twig index be833cb..436239b 100644 --- a/src/UI/Template/activity/lumberjack.html.twig +++ b/src/UI/Template/activity/lumberjack.html.twig @@ -22,7 +22,7 @@ {% if option.gainPerHour is not null %} Per hour
    Exp: {{ option.gainPerHour.exp }}
    - Resource: {{ option.gainPerHour.drop.quantity }} {{ option.gainPerHour.drop.item.name }}
    + Resource: {{ option.gainPerHour.drop.quantity }} {{ option.gainPerHour.drop.name }}
    {% else %}

    diff --git a/tests/IntegrationTestCase.php b/tests/IntegrationTestCase.php index 889d017..579bab2 100644 --- a/tests/IntegrationTestCase.php +++ b/tests/IntegrationTestCase.php @@ -93,7 +93,7 @@ protected function createCharacter(string $name, ?int $stamina = null): Player $user = $this->authService->getCurrentUser(); $this->db->execute("INSERT INTO players(user_id, name, experience, health, health_max, defence, strength) - VALUE ($user->id, '$name', '0', 120, 120, 5, 100)"); + VALUE ($user->id, '$name', 0, 500, 50, 5, 10)"); $character = $this->getService(CharacterRepository::class)->getByUser($user); diff --git a/tests/Player/PlayerTest.php b/tests/Player/PlayerTest.php index abe582c..e53af96 100644 --- a/tests/Player/PlayerTest.php +++ b/tests/Player/PlayerTest.php @@ -96,12 +96,12 @@ public static function dungeonDifficultyProvider(): iterable 'moderate(<50 mobs/h)', ]; - yield 'hard' => [ + yield 'impossible 1' => [ 4, - 'hard(<20 mobs/h)', + 'impossible(0 mobs/h)', ]; - yield 'impossible' => [ + yield 'impossible 2' => [ 3, 'impossible(0 mobs/h)', ]; diff --git a/tests/ServerTest.php b/tests/ServerTest.php index 763b378..e9cfa7c 100644 --- a/tests/ServerTest.php +++ b/tests/ServerTest.php @@ -53,7 +53,7 @@ public function testPerformTasks(): void $this->assertHuntersReceivedRewards(); $this->assertExhaustedPlayersRemovedTheDungeon(); - $this->assertContainsLogs(['47'], $logs); + $this->assertContainsLogs([''. self::MINUTES_SINCE_THE_LAST_EXECUTION . ''], $logs); } private function assertContainsLogs(array $logs, array $actualLogs): void @@ -86,18 +86,10 @@ private function assertStaminaRestoredForRestingPlayers(int $amount): void private function assertStaminaSpentForHuntingPlayers(int $amount): void { $player = $this->getCharacterByName(self::PLAYER1); - self::assertEqualsWithDelta( - max(100 - $amount, 0), - $player->getStamina(), - 2 - ); + self::assertEquals(max(100 - $amount, 0), $player->getStamina()); $player = $this->getCharacterByName(self::PLAYER2); - self::assertEqualsWithDelta( - max(40 - $amount, 0), - $player->getStamina(), - 2 - ); + self::assertEquals(max(40 - $amount, 0), $player->getStamina()); } /** @@ -106,10 +98,10 @@ private function assertStaminaSpentForHuntingPlayers(int $amount): void private function assertHuntersReceivedRewards(): void { $player = $this->getCharacterByName(self::PLAYER1); - self::assertEqualsWithDelta(235, $player->getExp(), 10); + self::assertEquals(75, $player->getExp()); $player = $this->getCharacterByName(self::PLAYER2); - self::assertEqualsWithDelta(1000, $player->getExp(), 10); + self::assertEquals(200, $player->getExp()); $player = $this->getCharacterByName(self::PLAYER3); self::assertEquals(0, $player->getExp()); From 3eaec71e1c854f26fdd5b8778722c7917d481467 Mon Sep 17 00:00:00 2001 From: Temirkhan Date: Sun, 3 Sep 2023 14:36:26 +0200 Subject: [PATCH 08/29] Static analyzer configured. Fixes according to analyzer --- .gitignore | 1 + bootstrap.php | 4 +- composer.json | 8 +++- composer.lock | 64 +++++++++++++++++++++++++++- phpstan.neon.dist | 14 ++++++ src/API/HttpApi.php | 6 ++- src/Dungeon/DropChanceRepository.php | 4 ++ src/Dungeon/DungeonRepository.php | 7 +++ src/Dungeon/MonsterRepository.php | 4 ++ src/Engine/DbTimeFactory.php | 10 +++++ src/Item/ItemPrototypeRepository.php | 6 ++- src/Player/CharacterRepository.php | 6 ++- src/Player/RaceRepository.php | 23 ++++++++++ src/Player/Reward.php | 5 ++- src/Server.php | 19 ++++++--- src/Skill/Effect.php | 2 +- src/Skill/Effect/EffectApplier.php | 1 + src/Skill/EffectRepository.php | 5 +++ src/Trade/ShopRepository.php | 1 + src/Trade/StockRepository.php | 8 ++++ src/UI/Scene/AbstractScene.php | 14 +++++- src/UI/Scene/CharacterCreation.php | 16 ++++++- src/UI/Scene/Dungeons.php | 2 +- src/UI/Template/inventory.html.twig | 2 +- src/Utils/AbstractDataAccessor.php | 11 ++++- utils.php | 15 +++++++ 26 files changed, 236 insertions(+), 22 deletions(-) create mode 100644 phpstan.neon.dist create mode 100644 utils.php diff --git a/.gitignore b/.gitignore index 7ceb938..dd1b9bf 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ log.txt .phpunit.result.cache var/** !var/.gitkeep +.phpstan diff --git a/bootstrap.php b/bootstrap.php index 3a9da4b..9aaeb29 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -50,7 +50,7 @@ public static function init(): void } /** - * @template T + * @template T of object * * @param class-string $id * @return T @@ -60,6 +60,8 @@ public static function getService(string $id): object if (self::$container === null) { self::init(); } + + // @phpstan-ignore-next-line return self::$container->get($id); } } diff --git a/composer.json b/composer.json index 1793f03..7eab844 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,10 @@ "autoload": { "psr-4": { "Game\\": "src/" - } + }, + "files": [ + "utils.php" + ] }, "autoload-dev": { "psr-4": { @@ -22,6 +25,7 @@ "symfony/http-foundation": "^6.3" }, "require-dev": { - "phpunit/phpunit": "^10.3" + "phpunit/phpunit": "^10.3", + "phpstan/phpstan": "^1.10" } } diff --git a/composer.lock b/composer.lock index 74293a4..6452454 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4a98a9cc6a310ab4fe341cc384bc4591", + "content-hash": "68583792e94fe62d1791aede65362bcb", "packages": [ { "name": "doctrine/cache", @@ -1822,6 +1822,68 @@ }, "time": "2022-02-21T01:04:05+00:00" }, + { + "name": "phpstan/phpstan", + "version": "1.10.32", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan.git", + "reference": "c47e47d3ab03137c0e121e77c4d2cb58672f6d44" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c47e47d3ab03137c0e121e77c4d2cb58672f6d44", + "reference": "c47e47d3ab03137c0e121e77c4d2cb58672f6d44", + "shasum": "" + }, + "require": { + "php": "^7.2|^8.0" + }, + "conflict": { + "phpstan/phpstan-shim": "*" + }, + "bin": [ + "phpstan", + "phpstan.phar" + ], + "type": "library", + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPStan - PHP Static Analysis Tool", + "keywords": [ + "dev", + "static analysis" + ], + "support": { + "docs": "https://phpstan.org/user-guide/getting-started", + "forum": "https://github.com/phpstan/phpstan/discussions", + "issues": "https://github.com/phpstan/phpstan/issues", + "security": "https://github.com/phpstan/phpstan/security/policy", + "source": "https://github.com/phpstan/phpstan-src" + }, + "funding": [ + { + "url": "https://github.com/ondrejmirtes", + "type": "github" + }, + { + "url": "https://github.com/phpstan", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", + "type": "tidelift" + } + ], + "time": "2023-08-24T21:54:50+00:00" + }, { "name": "phpunit/php-code-coverage", "version": "10.1.3", diff --git a/phpstan.neon.dist b/phpstan.neon.dist new file mode 100644 index 0000000..95276e4 --- /dev/null +++ b/phpstan.neon.dist @@ -0,0 +1,14 @@ +parameters: + level: 9 + tmpDir: '%currentWorkingDirectory%/.phpstan' + paths: + - src + - bootstrap.php + excludePaths: + - src/Engine/DBConnection.php + fileExtensions: + - php + parallel: + processTimeout: 60.0 + maximumNumberOfProcesses: 4 + reportUnmatchedIgnoredErrors: false diff --git a/src/API/HttpApi.php b/src/API/HttpApi.php index 6466be4..665d16f 100644 --- a/src/API/HttpApi.php +++ b/src/API/HttpApi.php @@ -161,11 +161,15 @@ private function useItem(Request $request): Response private function viewLogs(Request $request): Response { - $logs = iterator_to_array($this->player->getLogs(5)); + $logs = iterable_to_array($this->player->getLogs(5)); return $this->success(['logs' => $logs]); } + /** + * @param array $data + * @return Response + */ private function success(array $data = []): Response { return new JsonResponse([ diff --git a/src/Dungeon/DropChanceRepository.php b/src/Dungeon/DropChanceRepository.php index b396281..9b36860 100644 --- a/src/Dungeon/DropChanceRepository.php +++ b/src/Dungeon/DropChanceRepository.php @@ -7,6 +7,9 @@ use Game\Utils\Chance; use Game\Utils\AbstractDataAccessor; +/** + * @phpstan-type RawData array{monster_id: int, item_id: int, chance: float, quantity_min: int, quantity_max: int} + */ class DropChanceRepository extends AbstractDataAccessor { public function __construct(private readonly ItemPrototypeRepository $itemPrototypeRepository) @@ -22,6 +25,7 @@ public function getMonsterDrop(Monster $monster): iterable { $data = $this->getData(); + /** @var RawData $dropDetails */ foreach ($data as $dropDetails) { if ($dropDetails['monster_id'] == $monster->id) { yield new DropChance( diff --git a/src/Dungeon/DungeonRepository.php b/src/Dungeon/DungeonRepository.php index de11c59..ee4f2a3 100644 --- a/src/Dungeon/DungeonRepository.php +++ b/src/Dungeon/DungeonRepository.php @@ -5,6 +5,9 @@ use Game\Utils\AbstractDataAccessor; +/** + * @phpstan-type RawData array{id: int, name: string, description: string, monster_id: int} + */ class DungeonRepository extends AbstractDataAccessor { public function __construct(private readonly MonsterRepository $monsterRepository) {} @@ -30,8 +33,12 @@ public function getById(int $id): Dungeon return $dungeon; } + /** + * @return iterable + */ public function listDungeons(): iterable { + /** @var RawData $dungeon */ foreach ($this->getData() as $dungeon) { yield new Dungeon( $dungeon['id'], diff --git a/src/Dungeon/MonsterRepository.php b/src/Dungeon/MonsterRepository.php index 1ab98db..ce8cc5e 100644 --- a/src/Dungeon/MonsterRepository.php +++ b/src/Dungeon/MonsterRepository.php @@ -5,6 +5,9 @@ use Game\Utils\AbstractDataAccessor; +/** + * @phpstan-type RawData array{id: int, name: string, health: int, attack: int, defence: int, experience: int} + */ class MonsterRepository extends AbstractDataAccessor { public function getById(int $id): Monster @@ -23,6 +26,7 @@ public function getById(int $id): Monster */ public function listMonsters(): iterable { + /** @var RawData $monster */ foreach ($this->getData() as $monster) { yield new Monster( $monster['id'], diff --git a/src/Engine/DbTimeFactory.php b/src/Engine/DbTimeFactory.php index e01d73b..a205aa3 100644 --- a/src/Engine/DbTimeFactory.php +++ b/src/Engine/DbTimeFactory.php @@ -17,4 +17,14 @@ public static function createTimestamp(DateTimeInterface $from): string { return $from->format('Y-m-d H:i:s'); } + + public static function fromTimestamp(string $dbTimeStamp): CarbonImmutable + { + $timestamp = strtotime($dbTimeStamp); + if ($timestamp === false) { + throw new \RuntimeException('Could not parse time'); + } + + return CarbonImmutable::createFromTimestamp($timestamp); + } } diff --git a/src/Item/ItemPrototypeRepository.php b/src/Item/ItemPrototypeRepository.php index 15538e6..e9b658d 100644 --- a/src/Item/ItemPrototypeRepository.php +++ b/src/Item/ItemPrototypeRepository.php @@ -5,14 +5,18 @@ use Game\Utils\AbstractDataAccessor; -final class ItemPrototypeRepository extends AbstractDataAccessor +class ItemPrototypeRepository extends AbstractDataAccessor { + /** + * @var array + */ private array $cache = []; public function getById(int $id): ItemPrototype { if (!isset($this->cache[$id])) { $prototype = []; + /** @var array{id: int, name: string, worth: int} $itemData */ foreach ($this->getData() as $itemData) { if ($itemData['id'] === $id) { $prototype = $itemData; diff --git a/src/Player/CharacterRepository.php b/src/Player/CharacterRepository.php index e2d9b30..a4533ec 100644 --- a/src/Player/CharacterRepository.php +++ b/src/Player/CharacterRepository.php @@ -6,7 +6,7 @@ use Game\Engine\DBConnection; use Game\User; -class CharacterRepository +readonly class CharacterRepository { public function __construct(private DBConnection $db) {} @@ -50,6 +50,10 @@ public function getById(int $id): Player return new Player($id, $this->db); } + /** + * @param int $amount + * @return iterable + */ public function listTopCharacters(int $amount): iterable { $topCharacters = $this->db->fetchRows('SELECT id FROM players ORDER BY level DESC LIMIT ' . $amount); diff --git a/src/Player/RaceRepository.php b/src/Player/RaceRepository.php index 782d7da..dbb9e9b 100644 --- a/src/Player/RaceRepository.php +++ b/src/Player/RaceRepository.php @@ -5,10 +5,28 @@ use Game\Utils\AbstractDataAccessor; +/** + * @phpstan-type RawData array{ + * id: int, + * name: string, + * description: string, + * stats: array{maxHealth: int, strength: int, defence: int}, + * canCraft: bool, + * canMine: bool, + * canWoodcut: bool, + * canHarvest: bool, + * canGather: bool, + * canBrew: bool + * } + */ class RaceRepository extends AbstractDataAccessor { + /** + * @return iterable + */ public function listAll(): iterable { + /** @var RawData $race */ foreach ($this->getData() as $race) { yield new Race( $race['id'], @@ -31,6 +49,11 @@ public function listAll(): iterable } } + /** + * @param int $raceId + * + * @return Race + */ public function getById(int $raceId): Race { foreach ($this->listAll() as $race) { diff --git a/src/Player/Reward.php b/src/Player/Reward.php index 71c6d22..77c9e02 100644 --- a/src/Player/Reward.php +++ b/src/Player/Reward.php @@ -38,12 +38,13 @@ public function isEmpty(): bool */ private function groupItems(array $items): array { + /** @var Item[] $groupedItems */ $groupedItems = []; foreach ($items as $item) { $itemId = $item->id; if (isset($groupedItems[$itemId])) { $existingItem = $groupedItems[$itemId]; - $groupedItems[$itemId] = new Item($existingItem->item->id, $existingItem->quantity + $item->quantity); + $groupedItems[$itemId] = new Item($existingItem->id, $existingItem->quantity + $item->quantity); } else { $groupedItems[$itemId] = $item; } @@ -52,7 +53,7 @@ private function groupItems(array $items): array return array_values($groupedItems); } - public function multiply(float $modifier): static + public function multiply(float $modifier): self { if ($modifier < 0) { throw new \RuntimeException('Negative modifier is not allowed'); diff --git a/src/Server.php b/src/Server.php index d76036e..b2db85b 100644 --- a/src/Server.php +++ b/src/Server.php @@ -18,6 +18,9 @@ class Server { private CarbonImmutable $currentTime; + /** + * @var string[] + */ private array $logs = []; public function __construct( @@ -58,7 +61,7 @@ private function regenerateStamina(): void // Basically means timestamp when last action was applied. Implied that action is taken only by Engine $row = $this->db->fetchRow("SELECT tid FROM timetable WHERE name = 'stamina'"); - $lastUpdateAt = CarbonImmutable::create($row['tid']); + $lastUpdateAt = DbTimeFactory::fromTimestamp($row['tid']); $minutesPassed = $this->currentTime->diffInMinutes($lastUpdateAt); if ($minutesPassed === 0) { return; @@ -103,8 +106,8 @@ private function giveRewards(): void $hunter = $this->characterRepository->getById($row['character_id']); $huntingZone = $this->dungeonRepository->getById($row['dungeon_id']); - $lastCheckedAt = CarbonImmutable::create($row['checked_at']); - $lastRewardedAt = CarbonImmutable::create($row['last_reward_at']); + $lastCheckedAt = DbTimeFactory::fromTimestamp($row['checked_at']); + $lastRewardedAt = DbTimeFactory::fromTimestamp($row['last_reward_at']); $minutesSinceLastCheck = $lastCheckedAt->diffInMinutes($this->currentTime, false); if ($minutesSinceLastCheck < 1) { @@ -175,9 +178,13 @@ private function giveActivityRewards(): void foreach ($activities as $data) { $character = $this->characterRepository->getById($data['character_id']); $activity = $character->getCurrentActivity(); + if ($activity === null) { + $this->logs[] = sprintf('Character %s expected to have activity but it is missing', $character->getName()); + continue; + } - $lastCheckedAt = CarbonImmutable::create($data['checked_at']); - $lastRewardedAt = CarbonImmutable::create($data['last_reward_at']); + $lastCheckedAt = DbTimeFactory::fromTimestamp($data['checked_at']); + $lastRewardedAt = DbTimeFactory::fromTimestamp($data['last_reward_at']); $minutesSinceLastCheck = $lastCheckedAt->diffInMinutes($this->currentTime, false); $minutesSinceLastReward = $lastRewardedAt->diffInMinutes($this->currentTime, false); @@ -210,7 +217,7 @@ private function giveActivityRewards(): void } /** - * @return iterable + * @return iterable */ private function getHunters(): iterable { diff --git a/src/Skill/Effect.php b/src/Skill/Effect.php index a28c83c..92aaffd 100644 --- a/src/Skill/Effect.php +++ b/src/Skill/Effect.php @@ -7,7 +7,7 @@ readonly class Effect { - public function __construct(string $name, public EffectType $type, public int $power) + public function __construct(public string $name, public EffectType $type, public int $power) { } diff --git a/src/Skill/Effect/EffectApplier.php b/src/Skill/Effect/EffectApplier.php index 90dc494..f865780 100644 --- a/src/Skill/Effect/EffectApplier.php +++ b/src/Skill/Effect/EffectApplier.php @@ -17,6 +17,7 @@ public static function apply(Effect $effect, Player $player): ?Error return null; } + // @phpstan-ignore-next-line throw new \RuntimeException('Effect type is unknown'); } } diff --git a/src/Skill/EffectRepository.php b/src/Skill/EffectRepository.php index 74209c2..4a9e2f6 100644 --- a/src/Skill/EffectRepository.php +++ b/src/Skill/EffectRepository.php @@ -8,8 +8,13 @@ class EffectRepository extends AbstractDataAccessor { + /** + * @param int $itemId + * @return iterable + */ public function findByItem(int $itemId): iterable { + /** @var array{item_id: int, name: string, type: value-of, power:int} $effect */ foreach ($this->getData() as $effect) { if ($effect['item_id'] === $itemId) { yield new Effect($effect['name'], EffectType::from($effect['type']), $effect['power']); diff --git a/src/Trade/ShopRepository.php b/src/Trade/ShopRepository.php index 8f2f296..94153cf 100644 --- a/src/Trade/ShopRepository.php +++ b/src/Trade/ShopRepository.php @@ -23,6 +23,7 @@ public function findShopByName(string $name): ?Shop */ public function listShops(): iterable { + /** @var array{id: int, name: string, description: string} $shop */ foreach ($this->getData() as $shop) { yield new Shop($shop['id'], $shop['name'], $shop['description']); } diff --git a/src/Trade/StockRepository.php b/src/Trade/StockRepository.php index afc3c84..835c447 100644 --- a/src/Trade/StockRepository.php +++ b/src/Trade/StockRepository.php @@ -11,6 +11,10 @@ */ class StockRepository extends AbstractDataAccessor { + /** + * @param int $shopId + * @return iterable + */ public function listShopStock(int $shopId): iterable { $stock = $this->getData()[$shopId] ?? []; @@ -39,9 +43,13 @@ protected function getDataName(): string return 'shop_stock'; } + /** + * @return array + */ protected function getData(): array { $data = []; + /** @var array{shop_id: int, item_id: int, price_id: int, price_quantity: int} $entry */ foreach(parent::getData() as $entry) { $data[$entry['shop_id']][] = $entry; } diff --git a/src/UI/Scene/AbstractScene.php b/src/UI/Scene/AbstractScene.php index d02f3da..51189f5 100644 --- a/src/UI/Scene/AbstractScene.php +++ b/src/UI/Scene/AbstractScene.php @@ -20,6 +20,12 @@ public function __construct( } + /** + * @param string $templateName + * @param array $parameters + * + * @return string + */ protected function renderTemplate(string $templateName, array $parameters = []): string { $fullTemplateName = sprintf('%s.html.twig', $templateName); @@ -46,7 +52,13 @@ protected function switchToScene(string $sceneName): string protected function getCurrentPlayer(): Player { - return $this->client->getCurrentPlayer(); + $player = $this->client->getCurrentPlayer(); + + if ($player === null) { + throw new \RuntimeException('Unexpected access to the scene. Player expected to be present.'); + } + + return $player; } protected function getHuntingDungeon(): ?Dungeon diff --git a/src/UI/Scene/CharacterCreation.php b/src/UI/Scene/CharacterCreation.php index 7386ad3..fd607ab 100644 --- a/src/UI/Scene/CharacterCreation.php +++ b/src/UI/Scene/CharacterCreation.php @@ -9,6 +9,7 @@ use Game\Player\RaceRepository; use Game\UI\Scene\Input\HttpInput; use Game\UI\Scene\Input\InputInterface; +use Game\User; use Twig\Environment; readonly class CharacterCreation implements SceneInterface @@ -33,14 +34,14 @@ public function run(InputInterface $input): string $error = ''; $selectedRace = $input->getInt('race'); if ($selectedRace > 0) { - $user = $this->authService->getCurrentUser(); + $user = $this->getCurrentUser(); $race = $this->raceRepository->getById($selectedRace); $this->createCharacter->execute($user->name, $race, $user); return $this->switchToMainMenu(); } - $races = iterator_to_array($this->raceRepository->listAll()); + $races = iterable_to_array($this->raceRepository->listAll()); return $this->renderer->render('character-creation.html.twig', [ 'races' => $races, @@ -55,4 +56,15 @@ private function switchToMainMenu(): string return $scene->run(new HttpInput()); } + + private function getCurrentUser(): User + { + $user = $this->authService->getCurrentUser(); + + if ($user === null) { + throw new \RuntimeException('Unauthenticated access was not expected'); + } + + return $user; + } } diff --git a/src/UI/Scene/Dungeons.php b/src/UI/Scene/Dungeons.php index 9403e88..e0e8971 100644 --- a/src/UI/Scene/Dungeons.php +++ b/src/UI/Scene/Dungeons.php @@ -37,7 +37,7 @@ private function handleInteraction(InputInterface $input): void { $selectedDungeon = $input->getInt('hunt'); if ($selectedDungeon !== 0) { - $dungeon = $this->dungeonRepository->findById($selectedDungeon); + $dungeon = $this->dungeonRepository->getById($selectedDungeon); $result = $this->getCurrentPlayer()->enterDungeon($dungeon); if ($result instanceof Error) { diff --git a/src/UI/Template/inventory.html.twig b/src/UI/Template/inventory.html.twig index 191a79f..bc0f449 100644 --- a/src/UI/Template/inventory.html.twig +++ b/src/UI/Template/inventory.html.twig @@ -26,7 +26,7 @@ {% endif %} {% if item.isConsumable %} - + {% endif %} diff --git a/src/Utils/AbstractDataAccessor.php b/src/Utils/AbstractDataAccessor.php index 8e4e85a..573ef66 100644 --- a/src/Utils/AbstractDataAccessor.php +++ b/src/Utils/AbstractDataAccessor.php @@ -10,10 +10,19 @@ abstract class AbstractDataAccessor { abstract protected function getDataName(): string; + /** + * @return array + */ protected function getData(): array { $dataFile = sprintf('%s/data/%s.yaml', PROJECT_ROOT, $this->getDataName()); - return Yaml::parseFile($dataFile); + $result = Yaml::parseFile($dataFile); + + if (!is_array($result)) { + return []; + } + + return $result; } } diff --git a/utils.php b/utils.php new file mode 100644 index 0000000..2caedde --- /dev/null +++ b/utils.php @@ -0,0 +1,15 @@ + Date: Sun, 3 Sep 2023 15:33:43 +0200 Subject: [PATCH 09/29] Codestyle analyzer configured --- .gitignore | 1 + composer.json | 3 +- composer.lock | 94 ++++++++++++++++++++++- phpcs.xml.dist | 73 ++++++++++++++++++ src/API/HttpApi.php | 20 ++--- src/Auth/AuthService.php | 9 ++- src/Chat/Chat.php | 11 ++- src/Chat/ChatMessage.php | 3 +- src/Client.php | 4 +- src/Dungeon/DropChance.php | 6 +- src/Dungeon/DropChanceRepository.php | 3 +- src/Dungeon/Dungeon.php | 4 +- src/Dungeon/DungeonRepository.php | 5 +- src/Dungeon/Monster.php | 12 +-- src/Dungeon/MonsterRepository.php | 1 + src/Dungeon/RewardCalculator.php | 1 + src/Dungeon/TTKCalculator.php | 3 +- src/Engine/DBConnection.php | 11 +-- src/Engine/DbTimeFactory.php | 1 + src/Engine/Error.php | 5 +- src/Item/Item.php | 16 ++-- src/Item/ItemPrototype.php | 1 + src/Item/ItemPrototypeRepository.php | 1 + src/Player/Activity/ActivityInterface.php | 1 + src/Player/Activity/Lumberjack.php | 29 +++---- src/Player/CharacterRepository.php | 7 +- src/Player/CreateCharacter.php | 8 +- src/Player/LvlCalculator.php | 5 +- src/Player/Perks.php | 1 + src/Player/Player.php | 19 ++--- src/Player/PlayerLog.php | 9 ++- src/Player/Race.php | 4 +- src/Player/RaceRepository.php | 1 + src/Player/Reward.php | 9 ++- src/Player/Stats.php | 4 +- src/Server.php | 71 ++++++++++------- src/Skill/Effect.php | 2 +- src/Skill/Effect/EffectApplier.php | 1 + src/Skill/Effect/EffectType.php | 1 + src/Skill/EffectRepository.php | 3 +- src/Trade/Offer.php | 2 +- src/Trade/Shop.php | 2 +- src/Trade/ShopRepository.php | 3 +- src/Trade/StockRepository.php | 5 +- src/UI/Scene/AbstractScene.php | 14 ++-- src/UI/Scene/Activity/Lumberjack.php | 16 ++-- src/UI/Scene/Auth.php | 25 +++--- src/UI/Scene/CharacterCreation.php | 16 ++-- src/UI/Scene/Dungeons.php | 9 ++- src/UI/Scene/Highscore.php | 5 +- src/UI/Scene/Input/HttpInput.php | 2 +- src/UI/Scene/Input/InputInterface.php | 1 + src/UI/Scene/Inventory.php | 1 + src/UI/Scene/Library.php | 7 +- src/UI/Scene/MainMenu.php | 1 + src/UI/Scene/SceneInterface.php | 1 + src/UI/Scene/Shop.php | 3 +- src/UI/Scene/Shops.php | 3 +- src/User.php | 3 +- src/Utils/AbstractDataAccessor.php | 5 +- src/Utils/Chance.php | 2 +- src/Utils/TimeInterval.php | 3 +- 62 files changed, 422 insertions(+), 170 deletions(-) create mode 100644 phpcs.xml.dist diff --git a/.gitignore b/.gitignore index dd1b9bf..c42c078 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ log.txt var/** !var/.gitkeep .phpstan +.phpcs-cache diff --git a/composer.json b/composer.json index 7eab844..51c35c4 100644 --- a/composer.json +++ b/composer.json @@ -26,6 +26,7 @@ }, "require-dev": { "phpunit/phpunit": "^10.3", - "phpstan/phpstan": "^1.10" + "phpstan/phpstan": "^1.10", + "free2er/coding-standard": "^1.1" } } diff --git a/composer.lock b/composer.lock index 6452454..04f47f8 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "68583792e94fe62d1791aede65362bcb", + "content-hash": "afe60457861efaec673655cfdfb6cfef", "packages": [ { "name": "doctrine/cache", @@ -1596,6 +1596,41 @@ } ], "packages-dev": [ + { + "name": "free2er/coding-standard", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/free2er/coding-standard.git", + "reference": "6534210585a54c2ff42d4b817865cd1b0d23f246" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/free2er/coding-standard/zipball/6534210585a54c2ff42d4b817865cd1b0d23f246", + "reference": "6534210585a54c2ff42d4b817865cd1b0d23f246", + "shasum": "" + }, + "require": { + "squizlabs/php_codesniffer": "^3.5" + }, + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Max Pryakhin", + "email": "m.pryakhin@gmail.com" + } + ], + "description": "PHP CodeSniffer Coding Standard", + "support": { + "issues": "https://github.com/free2er/coding-standard/issues", + "source": "https://github.com/free2er/coding-standard/tree/1.1.1" + }, + "time": "2019-12-02T09:44:29+00:00" + }, { "name": "myclabs/deep-copy", "version": "1.11.1", @@ -3216,6 +3251,63 @@ ], "time": "2023-02-07T11:34:05+00:00" }, + { + "name": "squizlabs/php_codesniffer", + "version": "3.7.2", + "source": { + "type": "git", + "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879", + "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879", + "shasum": "" + }, + "require": { + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + }, + "bin": [ + "bin/phpcs", + "bin/phpcbf" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Greg Sherwood", + "role": "lead" + } + ], + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", + "keywords": [ + "phpcs", + "standards", + "static analysis" + ], + "support": { + "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", + "source": "https://github.com/squizlabs/PHP_CodeSniffer", + "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" + }, + "time": "2023-02-22T23:07:41+00:00" + }, { "name": "theseer/tokenizer", "version": "1.2.1", diff --git a/phpcs.xml.dist b/phpcs.xml.dist new file mode 100644 index 0000000..793b64f --- /dev/null +++ b/phpcs.xml.dist @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + 0 + +Squiz.Commenting.FunctionComment.MissingParamTag + src/ + + diff --git a/src/API/HttpApi.php b/src/API/HttpApi.php index 665d16f..ac59618 100644 --- a/src/API/HttpApi.php +++ b/src/API/HttpApi.php @@ -1,4 +1,5 @@ getLastMessages(10); + $messages = \DI::getService(Chat::class)->getLastMessages(10); $messagesData = []; foreach ($messages as $message) { $messagesData[] = [ 'isFromAdmin' => $message->isFromAdmin, - 'sender' => $message->sender, - 'message' => $message->content, - 'sentAt' => $message->sentAt->format(DATE_ATOM), + 'sender' => $message->sender, + 'message' => $message->content, + 'sentAt' => $message->sentAt->format(DATE_ATOM), ]; } @@ -101,7 +101,7 @@ private function banPlayer(Request $request): Response private function buyItem(Request $request): Response { - $itemId = $request->request->getInt('itemId'); + $itemId = $request->request->getInt('itemId'); $fromShop = $request->request->getString('shop'); $shop = \DI::getService(ShopRepository::class)->findShopByName($fromShop); @@ -124,7 +124,7 @@ private function buyItem(Request $request): Response private function sellItem(Request $request): Response { - $itemId = $request->request->getInt('itemId'); + $itemId = $request->request->getInt('itemId'); $quantity = 1; $sellingItem = new Item($itemId, $quantity); @@ -167,7 +167,7 @@ private function viewLogs(Request $request): Response } /** - * @param array $data + * @param array $data * @return Response */ private function success(array $data = []): Response @@ -175,7 +175,7 @@ private function success(array $data = []): Response return new JsonResponse([ 'success' => true, 'message' => '', - 'data' => $data, + 'data' => $data, ]); } @@ -184,7 +184,7 @@ private function failure(string $message): Response return new JsonResponse([ 'success' => false, 'message' => $message, - 'data' => [], + 'data' => [], ]); } } diff --git a/src/Auth/AuthService.php b/src/Auth/AuthService.php index ba753f1..9be0061 100644 --- a/src/Auth/AuthService.php +++ b/src/Auth/AuthService.php @@ -1,4 +1,5 @@ db->execute("UPDATE users set banned = 1 WHERE anv = ?", [$name]); + $this->db->execute('UPDATE users set banned = 1 WHERE anv = ?', [$name]); } public function register(string $playerName, string $password, ?string $ip = ''): null|Error @@ -58,7 +61,7 @@ public function login(string $playerName, string $password): null|Error return new Error('User is banned'); } - $this->currentUser = null; + $this->currentUser = null; $_SESSION['username'] = $user['anv']; return null; diff --git a/src/Chat/Chat.php b/src/Chat/Chat.php index 4a3bf17..a8fc53c 100644 --- a/src/Chat/Chat.php +++ b/src/Chat/Chat.php @@ -1,4 +1,5 @@ db->execute("INSERT INTO chat (username, messages) VALUES (?, ?)", [$player->getName(), $message]); + $this->db->execute('INSERT INTO chat (username, messages) VALUES (?, ?)', [$player->getName(), $message]); } public function addSystemMessage(string $message): void @@ -22,13 +25,13 @@ public function addSystemMessage(string $message): void } /** - * @param int $amount + * @param int $amount * @return iterable */ public function getLastMessages(int $amount): iterable { // TODO Need to filter out message from banned users? - $result = $this->db->fetchRows("SELECT * FROM chat ORDER BY id DESC LIMIT " . $amount); + $result = $this->db->fetchRows('SELECT * FROM chat ORDER BY id DESC LIMIT ' . $amount); foreach ($result as $message) { yield new ChatMessage( $message['username'], diff --git a/src/Chat/ChatMessage.php b/src/Chat/ChatMessage.php index 2960407..95127f8 100644 --- a/src/Chat/ChatMessage.php +++ b/src/Chat/ChatMessage.php @@ -1,4 +1,5 @@ sentAt = (new \DateTimeImmutable())->setTimestamp($timestamp); } -} \ No newline at end of file +} diff --git a/src/Client.php b/src/Client.php index c59f277..003e5d7 100644 --- a/src/Client.php +++ b/src/Client.php @@ -1,4 +1,5 @@ id) { yield new DropChance( - Chance::percentage((float)$dropDetails['chance']), + Chance::percentage((float) $dropDetails['chance']), $this->itemPrototypeRepository->getById($dropDetails['item_id']), $dropDetails['quantity_min'], $dropDetails['quantity_max'] diff --git a/src/Dungeon/Dungeon.php b/src/Dungeon/Dungeon.php index 9bce5a4..7ceb659 100644 --- a/src/Dungeon/Dungeon.php +++ b/src/Dungeon/Dungeon.php @@ -1,4 +1,5 @@ connection = DriverManager::getConnection([ - 'dbname' => $db, - 'driver' => 'pdo_mysql', - 'host' => $host, - 'user' => $user, + 'dbname' => $db, + 'driver' => 'pdo_mysql', + 'host' => $host, + 'user' => $user, 'password' => $pass, ]); } public function fetchRow(string $query, array $params = []): array { - $result = $this->connection->executeQuery($query, $params, $this->detectTypes($params)); + $result = $this->connection->executeQuery($query, $params, $this->detectTypes($params)); return $result->fetchAssociative() ?: []; } diff --git a/src/Engine/DbTimeFactory.php b/src/Engine/DbTimeFactory.php index a205aa3..c3a2a83 100644 --- a/src/Engine/DbTimeFactory.php +++ b/src/Engine/DbTimeFactory.php @@ -1,4 +1,5 @@ getById($itemId); - $this->prototype = $prototype; - $this->id = $prototype->id; - $this->name = $prototype->name; - $this->quantity = $quantity; - $this->worth = $prototype->worth; - $this->isSellable = $prototype->isSellable(); // todo replace with Type + $prototype = \DI::getService(ItemPrototypeRepository::class)->getById($itemId); + $this->prototype = $prototype; + $this->id = $prototype->id; + $this->name = $prototype->name; + $this->quantity = $quantity; + $this->worth = $prototype->worth; + $this->isSellable = $prototype->isSellable(); +// todo replace with Type } /** diff --git a/src/Item/ItemPrototype.php b/src/Item/ItemPrototype.php index 8fa3513..0f622c8 100644 --- a/src/Item/ItemPrototype.php +++ b/src/Item/ItemPrototype.php @@ -1,4 +1,5 @@ [ - 'id' => 1, - 'name' => 'Hollow tree', + 'id' => 1, + 'name' => 'Hollow tree', 'description' => 'Hollow tree. Can be sold as fuel for a coin or two.', - 'complexity' => 1, - 'rewardExp' => 5, - 'rewardItem' => 6, + 'complexity' => 1, + 'rewardExp' => 5, + 'rewardItem' => 6, ], 2 => [ - 'id' => 2, - 'name' => 'Oak tree', + 'id' => 2, + 'name' => 'Oak tree', 'description' => 'Strong tree. They say hogs love hanging around it.', - 'complexity' => 3, - 'rewardExp' => 8, - 'rewardItem' => 7, + 'complexity' => 3, + 'rewardExp' => 8, + 'rewardItem' => 7, ], ]; @@ -37,7 +38,7 @@ public function __construct(int $option) throw new \RuntimeException('Unknown option passed'); } - $this->optionId = $option; + $this->optionId = $option; $this->optionName = self::OPTIONS[$option]['name']; } @@ -63,9 +64,9 @@ public function calculateReward(Player $for): Reward return Reward::none(); } - $option = self::OPTIONS[$this->optionId]; - $efficiency = (int)round($playerGeneralEfficiency/$option['complexity']); - if ($efficiency === 0){ + $option = self::OPTIONS[$this->optionId]; + $efficiency = (int) round($playerGeneralEfficiency / $option['complexity']); + if ($efficiency === 0) { return Reward::none(); } diff --git a/src/Player/CharacterRepository.php b/src/Player/CharacterRepository.php index a4533ec..1d44c4a 100644 --- a/src/Player/CharacterRepository.php +++ b/src/Player/CharacterRepository.php @@ -1,4 +1,5 @@ */ public function listTopCharacters(int $amount): iterable diff --git a/src/Player/CreateCharacter.php b/src/Player/CreateCharacter.php index 05f2953..68ba2e1 100644 --- a/src/Player/CreateCharacter.php +++ b/src/Player/CreateCharacter.php @@ -1,4 +1,5 @@ db->execute( - "INSERT INTO players( + 'INSERT INTO players( user_id, race, name, @@ -33,7 +35,7 @@ public function execute(string $characterName, Race $race, User $forUser): Playe blacksmith, gathering, alchemy - ) VALUE (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", + ) VALUE (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', [ $forUser->id, $race->id, diff --git a/src/Player/LvlCalculator.php b/src/Player/LvlCalculator.php index b768ce5..4ff34ac 100644 --- a/src/Player/LvlCalculator.php +++ b/src/Player/LvlCalculator.php @@ -1,4 +1,5 @@ connection->fetchRow('SELECT dungeon_id FROM hunting WHERE character_id = ?',[$this->id]); + $hunt = $this->connection->fetchRow('SELECT dungeon_id FROM hunting WHERE character_id = ?', [$this->id]); if ($hunt === []) { return null; } @@ -76,12 +77,12 @@ public function enterDungeon(Dungeon $dungeon): null|Error public function measureDifficulty(Dungeon $dungeon): string { - $ttkCalculator = new TTKCalculator(); - $ttkMonster = $ttkCalculator->calculate($this, $dungeon->inhabitant)->seconds; - $ttkPlayer = $ttkCalculator->calculateForMonster($dungeon->inhabitant, $this)->seconds; + $ttkCalculator = new TTKCalculator(); + $ttkMonster = $ttkCalculator->calculate($this, $dungeon->inhabitant)->seconds; + $ttkPlayer = $ttkCalculator->calculateForMonster($dungeon->inhabitant, $this)->seconds; $difficultyRatio = $ttkPlayer / $ttkMonster; - switch(true) { + switch (true) { case $difficultyRatio > 50: return 'easy(>50 mobs/h)'; case $difficultyRatio > 20: @@ -133,7 +134,7 @@ public function addExp(int $amount): void // Update max hp $amountToAdd = 15; - $maxHealth = $level * $amountToAdd; + $maxHealth = $level * $amountToAdd; $db->execute("UPDATE players SET health_max = {$maxHealth} WHERE id = {$this->id}"); }); @@ -152,10 +153,10 @@ public function startActivity(ActivityInterface $activity): ?Error $now = DbTimeFactory::createCurrentTimestamp(); - $this->connection->execute(" + $this->connection->execute(' INSERT INTO activity(character_id, name, selected_option, checked_at, last_reward_at) VALUE (?, ?, ?, ?, ?) - ", [$this->id, $activity->getName(), $activity->getOption(), $now, $now]); + ', [$this->id, $activity->getName(), $activity->getOption(), $now, $now]); return null; } @@ -274,7 +275,7 @@ public function pickUp(Item $item): void { $this->obtainItem($item); - $this->logger->add($this->id, sprintf("You picked up %d %s", $item->quantity, $item->name)); + $this->logger->add($this->id, sprintf('You picked up %d %s', $item->quantity, $item->name)); } public function obtainItem(Item $item): void diff --git a/src/Player/PlayerLog.php b/src/Player/PlayerLog.php index bf00ce0..cb0d39e 100644 --- a/src/Player/PlayerLog.php +++ b/src/Player/PlayerLog.php @@ -1,4 +1,5 @@ db->execute("INSERT INTO log (character_id, message) VALUES (?, ?)", [$characterId, $log]); + $this->db->execute('INSERT INTO log (character_id, message) VALUES (?, ?)', [$characterId, $log]); } /** @@ -20,7 +23,7 @@ public function add(int $characterId, string $log): void public function readLogs(int $characterId, int $amount): iterable { $logs = $this->db - ->fetchRows("SELECT message FROM log WHERE id=? ORDER BY tid DESC LIMIT ?", [$characterId, $amount]); + ->fetchRows('SELECT message FROM log WHERE id=? ORDER BY tid DESC LIMIT ?', [$characterId, $amount]); foreach ($logs as $log) { yield $log['message']; diff --git a/src/Player/Race.php b/src/Player/Race.php index 640b222..313be8b 100644 --- a/src/Player/Race.php +++ b/src/Player/Race.php @@ -1,4 +1,5 @@ id; if (isset($groupedItems[$itemId])) { - $existingItem = $groupedItems[$itemId]; + $existingItem = $groupedItems[$itemId]; $groupedItems[$itemId] = new Item($existingItem->id, $existingItem->quantity + $item->quantity); } else { $groupedItems[$itemId] = $item; @@ -63,10 +64,10 @@ public function multiply(float $modifier): self return self::none(); } - $newExp = (int)round($this->exp * $modifier); + $newExp = (int) round($this->exp * $modifier); $newItems = []; foreach ($this->items as $item) { - $newAmount = (int)round($item->quantity * $modifier); + $newAmount = (int) round($item->quantity * $modifier); if ($newAmount === 0) { continue; } diff --git a/src/Player/Stats.php b/src/Player/Stats.php index b2139d8..e9125a6 100644 --- a/src/Player/Stats.php +++ b/src/Player/Stats.php @@ -1,4 +1,5 @@ currentTime = CarbonImmutable::now(); - $this->logs = []; - $this->logs[] = sprintf('%s', $this->currentTime->format("H:i:s d-m-Y")); + $this->logs = []; + $this->logs[] = sprintf('%s', $this->currentTime->format('H:i:s d-m-Y')); $this->db->transaction(function () { $this->regenerateStamina(); @@ -49,19 +51,21 @@ public function performTasks(): array $this->stopExhaustedHunters(); }); - $logs = $this->logs; + $logs = $this->logs; $this->logs = []; return $logs; } - // Regenerates resting hunters stamina + /** + * Regenerates resting hunters stamina + */ private function regenerateStamina(): void { // Basically means timestamp when last action was applied. Implied that action is taken only by Engine $row = $this->db->fetchRow("SELECT tid FROM timetable WHERE name = 'stamina'"); - $lastUpdateAt = DbTimeFactory::fromTimestamp($row['tid']); + $lastUpdateAt = DbTimeFactory::fromTimestamp($row['tid']); $minutesPassed = $this->currentTime->diffInMinutes($lastUpdateAt); if ($minutesPassed === 0) { return; @@ -72,14 +76,18 @@ private function regenerateStamina(): void // TODO stop regenerating stamina for players with activities. Introduce playerState instead of in_combat $this->db->execute( 'UPDATE players SET stamina = LEAST(stamina + ?, ?) WHERE in_combat = 0 AND stamina < ?', - [$minutesPassed, Player::MAX_POSSIBLE_STAMINA, Player::MAX_POSSIBLE_STAMINA] + [ + $minutesPassed, + Player::MAX_POSSIBLE_STAMINA, + Player::MAX_POSSIBLE_STAMINA, + ] ); $this->db->execute("UPDATE timetable SET tid = NOW() WHERE name='stamina'"); } private function stopExhaustedHunters(): void { - $huntingPlayers = $this->db->fetchRows("SELECT id, name, in_combat, stamina FROM players WHERE stamina <= 0 AND in_combat = 1"); + $huntingPlayers = $this->db->fetchRows('SELECT id, name, in_combat, stamina FROM players WHERE stamina <= 0 AND in_combat = 1'); foreach ($huntingPlayers as $row) { $playerNameWithNoStamina = $row['name']; @@ -103,10 +111,10 @@ private function giveRewards(): void $rewardLogs[] = ''; foreach ($this->getHunters() as $row) { - $hunter = $this->characterRepository->getById($row['character_id']); + $hunter = $this->characterRepository->getById($row['character_id']); $huntingZone = $this->dungeonRepository->getById($row['dungeon_id']); - $lastCheckedAt = DbTimeFactory::fromTimestamp($row['checked_at']); + $lastCheckedAt = DbTimeFactory::fromTimestamp($row['checked_at']); $lastRewardedAt = DbTimeFactory::fromTimestamp($row['last_reward_at']); $minutesSinceLastCheck = $lastCheckedAt->diffInMinutes($this->currentTime, false); @@ -115,16 +123,19 @@ private function giveRewards(): void } $minutesSinceLastReward = $lastRewardedAt->diffInMinutes($this->currentTime, false); - $remainingStamina = $hunter->getStamina(); + $remainingStamina = $hunter->getStamina(); // If player spent in dungeon more time than stamina he has, decrease spent time according that amount if ($remainingStamina < $minutesSinceLastCheck) { - $minutesSinceLastCheck = $remainingStamina; + $minutesSinceLastCheck = $remainingStamina; $minutesSinceLastReward = $lastRewardedAt->diffInMinutes($lastCheckedAt, false) + $remainingStamina; } $this->db->execute('UPDATE players SET stamina = GREATEST(stamina - ?, 0) WHERE id = ?', [$minutesSinceLastCheck, $hunter->getId()]); - ['unitsKilled' => $unitsKilled, 'withinTime' => $timeSpent] = $this->calculateKillCount($hunter, $huntingZone->inhabitant, TimeInterval::fromMinutes($minutesSinceLastReward)); + [ + 'unitsKilled' => $unitsKilled, + 'withinTime' => $timeSpent, + ] = $this->calculateKillCount($hunter, $huntingZone->inhabitant, TimeInterval::fromMinutes($minutesSinceLastReward)); if ($unitsKilled < 1) { $this->db->execute('UPDATE hunting SET checked_at = ? WHERE character_id = ?', [DbTimeFactory::createTimestamp($this->currentTime), $hunter->getId()]); @@ -177,21 +188,21 @@ private function giveActivityRewards(): void foreach ($activities as $data) { $character = $this->characterRepository->getById($data['character_id']); - $activity = $character->getCurrentActivity(); + $activity = $character->getCurrentActivity(); if ($activity === null) { $this->logs[] = sprintf('Character %s expected to have activity but it is missing', $character->getName()); continue; } - $lastCheckedAt = DbTimeFactory::fromTimestamp($data['checked_at']); + $lastCheckedAt = DbTimeFactory::fromTimestamp($data['checked_at']); $lastRewardedAt = DbTimeFactory::fromTimestamp($data['last_reward_at']); - $minutesSinceLastCheck = $lastCheckedAt->diffInMinutes($this->currentTime, false); + $minutesSinceLastCheck = $lastCheckedAt->diffInMinutes($this->currentTime, false); $minutesSinceLastReward = $lastRewardedAt->diffInMinutes($this->currentTime, false); - $remainingStamina = $character->getStamina(); + $remainingStamina = $character->getStamina(); // If player spent in dungeon more time than stamina he has, decrease spent time according that amount if ($remainingStamina < $minutesSinceLastCheck) { - $minutesSinceLastCheck = $remainingStamina; + $minutesSinceLastCheck = $remainingStamina; $minutesSinceLastReward = $lastRewardedAt->diffInMinutes($lastCheckedAt, false) + $remainingStamina; } @@ -202,9 +213,9 @@ private function giveActivityRewards(): void continue; } - $fullHoursPassed = (int) ($minutesSinceLastReward/60); - $rewardPerHour = $activity->calculateReward($character); - $reward = $rewardPerHour->multiply($fullHoursPassed); + $fullHoursPassed = (int) ($minutesSinceLastReward / 60); + $rewardPerHour = $activity->calculateReward($character); + $reward = $rewardPerHour->multiply($fullHoursPassed); $character->addExp($reward->exp); foreach ($reward->items as $item) { @@ -231,7 +242,7 @@ private function getHunters(): iterable } /** - * @param Player $hunter + * @param Player $hunter * @param Monster $monster * * @return array{unitsKilled: int, withinTime: TimeInterval} @@ -239,21 +250,27 @@ private function getHunters(): iterable private function calculateKillCount(Player $hunter, Monster $monster, TimeInterval $withinTime): array { $ttkMonster = $this->ttkCalculator->calculate($hunter, $monster); - $ttkPlayer = $this->ttkCalculator->calculateForMonster($monster, $hunter); + $ttkPlayer = $this->ttkCalculator->calculateForMonster($monster, $hunter); // If player needs more time to kill monster than monsters needs to kill player if ($ttkMonster->isGreaterThan($ttkPlayer)) { - return ['unitsKilled' => 0, 'withinTime' => $withinTime]; + return [ + 'unitsKilled' => 0, + 'withinTime' => $withinTime, + ]; } - $unitsKilled = (int)floor($withinTime->toMinutes() / $ttkMonster->toMinutes()); + $unitsKilled = (int) floor($withinTime->toMinutes() / $ttkMonster->toMinutes()); if ($unitsKilled === 0) { - return ['unitsKilled' => 0, 'withinTime' => $withinTime]; + return [ + 'unitsKilled' => 0, + 'withinTime' => $withinTime, + ]; } return [ 'unitsKilled' => $unitsKilled, - 'withinTime' => new TimeInterval($ttkMonster->seconds * $unitsKilled), + 'withinTime' => new TimeInterval($ttkMonster->seconds * $unitsKilled), ]; } } diff --git a/src/Skill/Effect.php b/src/Skill/Effect.php index 92aaffd..cae5e0c 100644 --- a/src/Skill/Effect.php +++ b/src/Skill/Effect.php @@ -1,4 +1,5 @@ */ public function findByItem(int $itemId): iterable diff --git a/src/Trade/Offer.php b/src/Trade/Offer.php index 5349a39..9aa8c46 100644 --- a/src/Trade/Offer.php +++ b/src/Trade/Offer.php @@ -1,4 +1,5 @@ */ public function listShopStock(int $shopId): iterable @@ -50,7 +51,7 @@ protected function getData(): array { $data = []; /** @var array{shop_id: int, item_id: int, price_id: int, price_quantity: int} $entry */ - foreach(parent::getData() as $entry) { + foreach (parent::getData() as $entry) { $data[$entry['shop_id']][] = $entry; } diff --git a/src/UI/Scene/AbstractScene.php b/src/UI/Scene/AbstractScene.php index 51189f5..2617aff 100644 --- a/src/UI/Scene/AbstractScene.php +++ b/src/UI/Scene/AbstractScene.php @@ -1,4 +1,5 @@ $parameters * * @return string @@ -31,7 +31,7 @@ protected function renderTemplate(string $templateName, array $parameters = []): $fullTemplateName = sprintf('%s.html.twig', $templateName); $parameters += [ - 'player' => $this->getCurrentPlayer(), + 'player' => $this->getCurrentPlayer(), 'huntingDungeon' => $this->getHuntingDungeon(), ]; @@ -39,13 +39,13 @@ protected function renderTemplate(string $templateName, array $parameters = []): } /** - * @param class-string $sceneName + * @param class-string $sceneName * @return string */ protected function switchToScene(string $sceneName): string { /** @var SceneInterface $scene */ - $scene =\DI::getService($sceneName); + $scene = \DI::getService($sceneName); return $scene->run(new HttpInput()); } diff --git a/src/UI/Scene/Activity/Lumberjack.php b/src/UI/Scene/Activity/Lumberjack.php index 0f37c44..7c075e8 100644 --- a/src/UI/Scene/Activity/Lumberjack.php +++ b/src/UI/Scene/Activity/Lumberjack.php @@ -1,4 +1,5 @@ getCurrentPlayer(); @@ -19,21 +19,21 @@ public function run(InputInterface $input): string return $this->switchToScene(MainMenu::class); } $errorMsg = ''; - $infoMsg = ''; + $infoMsg = ''; $this->handleInput($input, $player); $currentActivity = $player->getCurrentActivity(); - $options = []; + $options = []; foreach (\Game\Player\Activity\Lumberjack::OPTIONS as $option) { - $activity = new \Game\Player\Activity\Lumberjack($option['id']); + $activity = new \Game\Player\Activity\Lumberjack($option['id']); $option['isCurrent'] = $currentActivity !== null && $activity->isSame($currentActivity); - $reward = $activity->calculateReward($player); + $reward = $activity->calculateReward($player); if ($reward->isEmpty()) { $option['gainPerHour'] = null; } else { $option['gainPerHour'] = [ - 'exp' => $reward->exp, + 'exp' => $reward->exp, 'drop' => $reward->items[0], ]; } @@ -41,9 +41,9 @@ public function run(InputInterface $input): string } return $this->renderTemplate('activity/lumberjack', [ - 'options' => $options, + 'options' => $options, 'errorMsg' => $errorMsg, - 'infoMsg' => $infoMsg, + 'infoMsg' => $infoMsg, ]); } diff --git a/src/UI/Scene/Auth.php b/src/UI/Scene/Auth.php index dea0a9a..f6b0ffc 100644 --- a/src/UI/Scene/Auth.php +++ b/src/UI/Scene/Auth.php @@ -1,4 +1,5 @@ authService->logout(); - header("Location: /"); + header('Location: /'); return ''; } @@ -33,7 +34,7 @@ public function run(InputInterface $input): string private function loginTab(InputInterface $input): string { - $error = ''; + $error = ''; $username = ''; if ($input->getString('login') !== '') { $username = $input->getString('username'); @@ -45,7 +46,7 @@ private function loginTab(InputInterface $input): string $result = $this->authService->login($username, $password); if ($result === null) { // todo Kind of meh. Think of smother toggle between scenes - header("Location: /"); + header('Location: /'); return ''; } @@ -56,23 +57,23 @@ private function loginTab(InputInterface $input): string return $this->renderer->render('login.html.twig', [ 'username' => $username, - 'error' => $error, + 'error' => $error, ]); } private function registerTab(InputInterface $input): string { - $error = ''; + $error = ''; $username = ''; if ($input->getString('register') !== '') { - $username = $input->getString('username'); - $password = $input->getString('password'); + $username = $input->getString('username'); + $password = $input->getString('password'); $passwordConfirm = $input->getString('password_confirm'); if ($username === '' || $password === '' || $passwordConfirm === '') { - $error = "All fields are required"; - } else if ($password !== $passwordConfirm) { - $error = "Passwords do not match"; + $error = 'All fields are required'; + } elseif ($password !== $passwordConfirm) { + $error = 'Passwords do not match'; } else { $result = $this->authService->register($username, $password); if ($result === null) { @@ -80,7 +81,7 @@ private function registerTab(InputInterface $input): string $this->authService->login($username, $password); // todo Kind of meh. Think of smother toggle between scenes - header("Location: /"); + header('Location: /'); return ''; } @@ -91,7 +92,7 @@ private function registerTab(InputInterface $input): string return $this->renderer->render('register.html.twig', [ 'username' => $username, - 'error' => $error, + 'error' => $error, ]); } } diff --git a/src/UI/Scene/CharacterCreation.php b/src/UI/Scene/CharacterCreation.php index fd607ab..02652bd 100644 --- a/src/UI/Scene/CharacterCreation.php +++ b/src/UI/Scene/CharacterCreation.php @@ -1,4 +1,5 @@ switchToMainMenu(); } - $error = ''; + $error = ''; $selectedRace = $input->getInt('race'); if ($selectedRace > 0) { $user = $this->getCurrentUser(); @@ -52,7 +52,7 @@ public function run(InputInterface $input): string private function switchToMainMenu(): string { /** @var SceneInterface $scene */ - $scene =\DI::getService(MainMenu::class); + $scene = \DI::getService(MainMenu::class); return $scene->run(new HttpInput()); } diff --git a/src/UI/Scene/Dungeons.php b/src/UI/Scene/Dungeons.php index e0e8971..3aa2160 100644 --- a/src/UI/Scene/Dungeons.php +++ b/src/UI/Scene/Dungeons.php @@ -1,4 +1,5 @@ renderTemplate('dungeons', [ 'dungeons' => $this->dungeonRepository->listDungeons(), 'errorMsg' => $this->errorMsg, - 'infoMsg' => $this->infoMsg, + 'infoMsg' => $this->infoMsg, ]); } diff --git a/src/UI/Scene/Highscore.php b/src/UI/Scene/Highscore.php index 42426a4..50b0d8e 100644 --- a/src/UI/Scene/Highscore.php +++ b/src/UI/Scene/Highscore.php @@ -1,4 +1,5 @@ getCurrentPlayer(); + $player = $this->getCurrentPlayer(); $topPlayers = $this->characterRepository->listTopCharacters(100); return $this->renderTemplate('highscores', [ - 'player' => $player, + 'player' => $player, 'topPlayers' => $topPlayers, ]); } diff --git a/src/UI/Scene/Input/HttpInput.php b/src/UI/Scene/Input/HttpInput.php index c7bb525..4f491ab 100644 --- a/src/UI/Scene/Input/HttpInput.php +++ b/src/UI/Scene/Input/HttpInput.php @@ -1,4 +1,5 @@ renderTemplate('shop', [ 'playerGold' => $player->getGold(), - 'shop' => $shop, + 'shop' => $shop, ]); } } diff --git a/src/UI/Scene/Shops.php b/src/UI/Scene/Shops.php index 549fb09..d14e0eb 100644 --- a/src/UI/Scene/Shops.php +++ b/src/UI/Scene/Shops.php @@ -1,4 +1,5 @@ renderTemplate('shops', [ 'player' => $player, - 'shops' => $this->shopRepository->listShops(), + 'shops' => $this->shopRepository->listShops(), ]); } } diff --git a/src/User.php b/src/User.php index 2f5844b..21b1c93 100644 --- a/src/User.php +++ b/src/User.php @@ -1,4 +1,5 @@ seconds/60; + return $this->seconds / 60; } public function isGreaterThan(self $interval): bool From f6da095d10601c9a17277fd9e89be3263ccb785f Mon Sep 17 00:00:00 2001 From: Temirkhan Date: Sun, 3 Sep 2023 15:34:37 +0200 Subject: [PATCH 10/29] Added code analysis into CI --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ff6158..4cd1983 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI on: [ push ] jobs: - tests: + qa: runs-on: ubuntu-20.04 env: DB_HOST: 127.0.0.1 @@ -29,9 +29,9 @@ jobs: run: composer install --no-interaction - name: install project run: php install.php -# - name: codestyle -# run: ./vendor/bin/phpcs -# - name: static analyze -# run: ./vendor/bin/phpstan + - name: codestyle + run: ./vendor/bin/phpcs + - name: static analyze + run: ./vendor/bin/phpstan - name: tests run: ./vendor/bin/phpunit From 722dc2391e228a82a75a9cbbcda0db58a4349b79 Mon Sep 17 00:00:00 2001 From: Temirkhan Date: Sun, 3 Sep 2023 15:44:54 +0200 Subject: [PATCH 11/29] Fixed missing favicon complaints --- www/favicon.ico | Bin 0 -> 15086 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 www/favicon.ico diff --git a/www/favicon.ico b/www/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..d1d38438e87a26156444308c1d943bbf694fc6b5 GIT binary patch literal 15086 zcmeHO2UL_t*M7HAc3EJ7r7cwvMG-qN%qS8dbZivQiEFc0lEb#ny7BI$;D7wk{&VQWa!|c90@7(83z4y+@aXe1IwQR{z zZpCeG#Bq)s$5~m`eAnf;EA&j4a`t6#!wZQ-T z7T}SF3?GwJQOAeMA4)I&K!_v^BlIA&CYTen34f=XCjH)(u#m8b;7kw`{>`*jE|;TY z2PfFtHiDs{;d8NAT*Bw`uMmkWLSP+a7{{K3-2zQEE|vm}Ba;os6@ zHsgN1@Ek6mJc<*k$w=P10c(~mMNof#2!+C1#HAa7B|f18VY^UE`ozSiFWRq9f=6K) z>`s)UQG7Ctdh~-xDt$s_b`Uxd1cZMw4P)(o{c<6m+`fd;3&&A*F$0f&$;PcSnF#dn z2NHgs;6|9n7m4o5yL!NB(?0m#dWPO5fa|HdFig1v`ANV!w*t1S_d&ml2dL~ldMAQl zK=`MUx1n7AydXCRFP@a6{AM8@oI8pKXVdZU{4o^f9D%#53)A6&hOy}j`^Y8mzVr}& z4*-voS7AG84kWhr;9J>4eP|?f60gEA53tF6hz8RaLDNK0N$>6_Ff-wwNUg-0nkD;_ z_u$pDC#WbdRqDXFmtHug?2D5}_M&BTd&t^#gx7^T@Oucf-+CAl8#`Du;9=M}4#UQ9 z%FldDJ7|uNgY0k_%nE?Un=_%;z6&@WuaL;IIrDex!H4K)&g1c}tX&_u(q~_*=IvB=*DS$liU-drgGSw%R~M>9`a6e*mZ!z z;1CWnLlFcWdO>?#J`8D0*{0osNx%PqFBG!z^aVkcbAqjrnFE3XQS{p_8bgop^66vj zPTUSdxd9@=LU8}o5tJ3?U~|F>7#Nu%Fw6+K_xLzf!b8CW;{F>CCvrHP%;Iq3B!~Eo z9NIc@;F~spBw`cvvtGd_yA0;T!XQvne@OCz32ZG;RSFOY1h<0%`s3=QLM8u4CB=xE z6A67i*=rq2f6m5#qvt~3K!VB99P)~YdvOi_6U05E8hP~j;86|(zT}`T(}qUKeCQp0 zh6cG$VL5UN>7Z6Z#0RO0d`&%`l%IEZbH$m0d{n)BfoG2&A$oq4QioX+N1^n}X*~Mv zSIn3m4t+y4L?>{_uY*6+gY`uw=`lW>gH&G~>I1)lEd7a62lJuhz!wPakUTFH>(HO- zd)BID3miN86HxgI&!0WT{CV?WU|>M~F$+)bUB|6Y0%$+e66{SUZTvm!J*Rv73&KBE$qV~@Hef-q&ug!C7bdc(6Kyw7u zlUaqvhp$1$p*7QC1wj>S5?d3tS$y^tye{5{!hax`U9ocIO1yaSLW$_;`O1EXiHXLG zr;otqNFTp`2n*LjK>-J4d)Lf?TJEoN(qSyER~klgNLS~=;uK&S_$A}Nji9RaD4y8_ zenmist^2`OQ-eezLHM+3C@sE^XSB9f&uKld`A~fBIIf?`#i>&Xh+Qm2>VDE8v+jOi zx@DcEIla0kw3CZrd9o6QJ^C{K@dQ<+Xn9w6^t}BNUG`-|YAA(oAP2dT2t&Ubf;%^^ zDffpr*QJv4$8q7rF*GI{q<=pS$J72=hk{=@jJrGwI+^XrxTZPM?7$s+D- zFH=}1 zh@~YDeR^@w(wD-1?zga;Iu{~!0b~)Yp_fZG(eATQH;`8_nJVP(B-GL_@3J>bIfwN+ zd*VN#T(ynEYz3wR**oc%c?cN7ksYCnh0)O{ExJd09N86QYeY^Mf&A1Y*wK9EX-d#M z>N};KEqC>Xxt$iwHl$YbC%aT6)h;LQPAcTzjIXYK-)ZxH^tulidiRIlfEqiehCkCG zpLEE&#ly&HWNYeaV8XcZxOeNOQU_xrLwIy@gszcMHTT>rkh^%HG0mN&`xS7=zXZJ# zG=5g6KtQsHdovaCx8(5!*V?Sytn{lC1BSuPo8}_f2TEJ*O&!SY$tAmaMl1*GMjAM< zZyU-U6v3;TCpZnw*W3+VyVD%y!^?-mmR}m7QSNOR(D<>5{gK%~*ND5N3i%sSUFRKQ z;?SFX6zh;laO_O`4z=~${FUFC?M6E7$srw2cp_r@XlToSZ+Al%PYA4=L15pJ_H7Qc zQ(BRKS)%j_8qAIZ84b)YWinNjm@kmc=34Jk@|~v4N3#|jj$WZLQ^WObJ=pWy+ccI& zauCb3V9&-ojTu9iZsb!og<3bV)5JP7-#JW9c821_6Bv_!X*ppoTRXD}Os1-mI#qPA z;fM*!_HQ1&lEwyyLl^&oKXK0?--Y>MVm(@CqLwMS%U!y^=B}<~jLupkVWs8>y|#9c zCH?{h`IY9u6Bz%41SV5esm6vIqV&&OuiOF?3jy}z*Z5g)jDOY-tnDYxrS)A$L%Bw> zc4yqBmI`Qi22#6g6ZcV=WmbfdMn_>Rw1=RhH_Q&*Ma$KR&om5;$Eb?<8}-DS`1Vt- zKTewuK;KjyTge_^Ykys1XUq(;DRm@hGKG8u*B)p>{WWol7^YTY7#WgJujZuWKF7Qi z!wgfPFK7T=-yn3maPJrY=P-RkuBtwg4dm|dqXXIgRz_zfH&^a+M!^-1XF0D6ZXLef73Qgst0 z_i)8c*lYUHUZ(-Rz6o24_7hml`(u+6kI%nOc4(E=;Ng|tmr7p};B)Xvu7cOk z#pt*r4UHzuhF(Vxh)s+jqH)G=J{G=^qq6tq`nLSUt|rRRSvd3s++U^YoG#h9mcNy#2a^SRLKi_oVO?|j5~ zcRx!p#G*>&9_M@W89Jw5fWhVq6d!p8BjRgOP>Duqca%1cMJUBh96Li@Prri4SH=)G zQr)LGbxkFAz2h$+OD%)Qu^a1y?+L2#<*Az2iPhJI`or6xi~Bf%SW=>8)1=C*|9{Xj zb`9LfPwRHA0!{KM?!4y$8qQy%j1@{7HK`I(T$SF@Rgg;}@hC7&MHGU$AHN+fKsQgm#3w>;p@Bo+7Yp z0#Q4%_e5%pJBvO2n~AM?Y|Zc|{Fm@8fpKU+P$Rr6Sx^Bs-hUvlc31Vdp(@`yG1(s? zpS`2XIPQBB{#5W&3w&yUf3F3gOdR*VdDYCSnV=one(oxv%HE+=T+ydF7}<{ zX4d4+HMu3_^pDeFc?3CFEKjE(bIo_&-{rOCRG8Pw|3iMQh7aY8ELc9XCU>TsDaLXl zevLgxsZJ?aUN!T%GG{HxzQ14IgsQV5xDa07)1tdvpVI$)3otw3ea}Z&x%VymK8lOz z9!Zo$BHkeqiI&g{;|R<~Y53O5%!l(5Xlf>q&6q%+y$S5u$0h-t-)x^75sr1smLPK4 zBn%xqu*yuK$fb(y2+VeHBcCA2)VJT`mhszQy>uJ&z5So4>B^X2=1ySt{0Aqxf3kS} z+BJAtbRFe|*dtT9*I=h>}?lqKL%tXZGanQ4CUgehcGd%OIpg}-CIQNpEvyTK) zuRf42&w%;idoUS3rAkev$Kp)QKahie@X#TzoP!D0>$u5xG$i-ghP5|~GQ4^4%|X_C+G?$kFmRG6Bch>u%_ z3gU1mWgpzSbi&S6i*YkA4Fmf7;_I2!etg~?iY1x)K^z7-3h2PUT3&jy?&!JDU zvme5^NgQ-sJ)yVrDlC@n0QvSgRNve4=UtS9d`R=^V7(y-H2J0zyU ztnUB>`1i-n8#i!>+QHMq1Bdn{;p~Y_L@)Bhv7dy0I76-FFk+Gjy7M-|eEVtg(@YMN zeCEr&ZxV=f^%A@6%Yc34V%X4GLN7mOoH}`u;`Yfj9y(&znx*(9FBJoVEV2E^n!6;V zKWhsXliK^U8JcAM3dP#vP?O0LNpQW^NxCPu+G%qN9G0xZ&@hUn$8m7;XpSQX58(iv zrMY$Ogv3=#uy{@cx_L;je-Fu}I}{n|9Fli&*!im+Z1NvK@m(@RV)5$tRlK$w`Lzq% z#BWBMgxwerB2dQPmXe-bTrIF=b91l#cu&~<7Ld0H71;mg>$!_<1ntt}dAH!TXC_vgdSUx(uE)V?&| zSR8UE#T&c#79)J>G$d}>3U3cr^zrt9!fycDuGxVm?sn+EvNw$B+{R?=9I~3Y(ArAt zkq6m~npEk0tPoB;jd1*0&D|N|z+%$}&vOWwC_#3{dVD!(5R82Kq21aY&}!Wo_ANPt zWetH5-NiB*GJ&0$2Gv7uZBZ}FLBY@6bFZUS4{IDL{9Qh42X?NQeS^cOQ3kLH`U33| z5}`xqkNjpGU~Dcz-(3@6O!DOcL!VQHUbU6hBk!o_9r(!e^c^(qVULtkB%fr~#^kf< z3}?ht9;^Za(1zMvo8o%>=AF<~762FNDCm1q`yadm&} z5glY9&~<3DQ)sL&{s8$#I`%Ctc0YF;Ef%dnL(kT5?W>J3bU!O0iDKEmP=C-lXFAwGb8(d)Aw;vp}LlH&?XRS3qf5zi@Ye+t`FdsA#YSbzav31IK8fNpmmXpCA2{e8c|_((BydJI5oaS;4; z7D2IcDqmQv7m7i$$xJH;Y(s-Q`Grx$E%@=zjh_Tr)1g{<|%Z zMs9&@%O#i|DuVfz0_A#R(Cf3OVr$zoe2#yP$<~fbhjc*_coOYos`GtfZEwEF2dmxp6 zS7PQ5|A!NL+&gx7J3`dF&;UOf^UgIa{Q*8ukY?PqmWtL4(Q z%erwRh8^tT=@vzmnMrM%d6|7NX1o69V-m%-_C4NFkJ^NBWB1*=bOsqo8((_#^et$) zXxT%T*l=1`r$TSa@^T%oz@;>y{_>87PY>^?ysQlD-jskf-z`GuVt*uN2#~mo?ifWl z!6;&Rm2Ur#M5@EME(PeBdG~()r+*~7X?g5oI)7e(U1_$+qx+f}WV?=uvW7{-GU)hx zzJkiuwO{C1g-*!z7(EQ}D;DFsC9&APaTb2uV4(B^a_BrYaQj%uzK%Ib@9WgTL9^l5 z8EL*TL5NvyfQ1XDAUYxf;S&O|Doz72i!|W3F9x!abJOTu%{tx}S`DAH(`QLA(#R%? z-=TxqkwYya>#~E*-7u#Ig%^}k6P=ocpMIq4VV9b!`36(2%a_= z7GH+Js%vYs-I4&EpwVmVkga^A2>5Do*G1E@k8F^0<>dcv6vJUiKQ#4h180K~Xd1Yf z?9T8>fAzkxPrvZ?%T{2_w~es=h#EE=;A3922=hpHuYiH@GL40;u`g?Xi@NHNST*!< zh+clwaYOQNPO(d>ycUt2GbPQ^w~x4*VTqRscmD4qHlnM zsbA1!i;! Date: Sun, 3 Sep 2023 15:53:37 +0200 Subject: [PATCH 12/29] Temporarily adjusted codestyle --- phpcs.xml.dist | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 793b64f..e28018c 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -48,6 +48,14 @@ 0 + + Line is too long. This might be difficult to read. + 3 + + + Double check. This rule has to be re-enabled once phpcs fix the php8.2 readonly issue. + 3 + 0 From 6d4119f51a1837b43e85fb00ada3aaa78dce747d Mon Sep 17 00:00:00 2001 From: Temirkhan Date: Sun, 3 Sep 2023 17:45:01 +0200 Subject: [PATCH 13/29] Codesniffer applies to tests now --- phpcs.xml.dist | 1 + tests/Auth/AuthServiceTest.php | 3 +- tests/Dungeon/TTKCalculatorTest.php | 53 +- tests/IntegrationTestCase.php | 9 +- tests/Player/CharacterRepositoryTest.php | 21 +- tests/Player/CreateCharacterTest.php | 11 +- tests/Player/LvlCalculatorTest.php | 1496 +++++++++++++++++----- tests/Player/PlayerTest.php | 12 +- tests/ServerTest.php | 7 +- tests/bootstrap.php | 1 + 10 files changed, 1276 insertions(+), 338 deletions(-) diff --git a/phpcs.xml.dist b/phpcs.xml.dist index e28018c..368f366 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -77,5 +77,6 @@ Squiz.Commenting.FunctionComment.MissingParamTag src/ + tests/ diff --git a/tests/Auth/AuthServiceTest.php b/tests/Auth/AuthServiceTest.php index abf303f..64299f1 100644 --- a/tests/Auth/AuthServiceTest.php +++ b/tests/Auth/AuthServiceTest.php @@ -1,4 +1,5 @@ [ - [10, 5, 100], + [ + 10, + 5, + 100, + ], new Monster(123, 'SomeMonster', 50, 0, 10, 0), TimeInterval::fromMinutes(5), ]; yield 'monster has some defence' => [ - [10, 5, 100], + [ + 10, + 5, + 100, + ], new Monster(123, 'SomeMonster', 50, 0, 10, 4), TimeInterval::fromMinutes(9), ]; yield 'monster has too much defence' => [ - [10, 5, 100], + [ + 10, + 5, + 100, + ], new Monster(123, 'SomeMonster', 50, 0, 10, 100), TimeInterval::fromMinutes(50), ]; yield 'player has too much attack' => [ - [1000, 5, 100], + [ + 1000, + 5, + 100, + ], new Monster(123, 'SomeMonster', 50, 0, 10, 0), TimeInterval::fromMinutes(1), ]; @@ -49,25 +66,41 @@ public static function ttkMonsterProvider(): iterable public static function ttkPlayerProvider(): iterable { yield 'player without defence' => [ - [10, 0, 100], + [ + 10, + 0, + 100, + ], new Monster(123, 'SomeMonster', 50, 0, 10, 0), TimeInterval::fromMinutes(10), ]; yield 'player has some defence' => [ - [10, 4, 100], + [ + 10, + 4, + 100, + ], new Monster(123, 'SomeMonster', 50, 0, 10, 0), TimeInterval::fromMinutes(17), ]; yield 'player has too much defence' => [ - [2, 1000, 100], + [ + 2, + 1000, + 100, + ], new Monster(123, 'SomeMonster', 50, 0, 10, 0), TimeInterval::fromMinutes(100), ]; yield 'monster has too much attack' => [ - [2, 5, 100], + [ + 2, + 5, + 100, + ], new Monster(123, 'SomeMonster', 50, 0, 1000, 0), TimeInterval::fromMinutes(1), ]; @@ -85,7 +118,7 @@ public function testCalculateForPlayer(array $playerStats, Monster $prey, TimeIn #[DataProvider('ttkPlayerProvider')] public function testCalculateForMonster(array $playerStats, Monster $hunter, TimeInterval $expectedTTK): void { - $prey = $this->createCharacterWithStats(...$playerStats); + $prey = $this->createCharacterWithStats(...$playerStats); $result = $this->calculator->calculateForMonster($hunter, $prey); self::assertEquals($expectedTTK->seconds, $result->seconds); @@ -94,7 +127,7 @@ public function testCalculateForMonster(array $playerStats, Monster $hunter, Tim private function createCharacterWithStats(int $attack, int $defence, int $health): Player { $characterName = 'SomeRandomName' . uniqid(); - $character = $this->createCharacter($characterName); + $character = $this->createCharacter($characterName); $params = [ $attack, diff --git a/tests/IntegrationTestCase.php b/tests/IntegrationTestCase.php index 579bab2..fedc207 100644 --- a/tests/IntegrationTestCase.php +++ b/tests/IntegrationTestCase.php @@ -1,4 +1,5 @@ setCurrentTime(CarbonImmutable::now()); $this->authService = $this->getService(AuthService::class); - $this->db = $this->getService(DBConnection::class); + $this->db = $this->getService(DBConnection::class); $this->db->startTransaction(); - $this->db->execute("UPDATE timetable SET tid = ?", [DbTimeFactory::createTimestamp($this->currentTime)]); + $this->db->execute('UPDATE timetable SET tid = ?', [DbTimeFactory::createTimestamp($this->currentTime)]); } protected function tearDown(): void @@ -47,7 +48,7 @@ protected function tearDown(): void /** * @template T - * @param class-string $className + * @param class-string $className * * @return T */ @@ -106,6 +107,6 @@ protected function createCharacter(string $name, ?int $stamina = null): Player private function setStamina(Player $character, int $value): void { - $this->db->execute("UPDATE players SET stamina=? WHERE id = ?", [$value, $character->getId()]); + $this->db->execute('UPDATE players SET stamina=? WHERE id = ?', [$value, $character->getId()]); } } diff --git a/tests/Player/CharacterRepositoryTest.php b/tests/Player/CharacterRepositoryTest.php index 8517439..799922b 100644 --- a/tests/Player/CharacterRepositoryTest.php +++ b/tests/Player/CharacterRepositoryTest.php @@ -1,4 +1,5 @@ LvlCalculator::minExpRequired(10), - 'MisterTester2' => LvlCalculator::minExpRequired(5), - 'MisterTester3' => LvlCalculator::minExpRequired(3), - 'MisterTester4' => LvlCalculator::minExpRequired(4), - 'MisterTester5' => LvlCalculator::minExpRequired(7), - 'MisterTester6' => LvlCalculator::minExpRequired(2), - 'MisterTester7' => LvlCalculator::minExpRequired(12), - 'MisterTester8' => LvlCalculator::minExpRequired(9), - 'MisterTester9' => LvlCalculator::minExpRequired(1), + 'MisterTester1' => LvlCalculator::minExpRequired(10), + 'MisterTester2' => LvlCalculator::minExpRequired(5), + 'MisterTester3' => LvlCalculator::minExpRequired(3), + 'MisterTester4' => LvlCalculator::minExpRequired(4), + 'MisterTester5' => LvlCalculator::minExpRequired(7), + 'MisterTester6' => LvlCalculator::minExpRequired(2), + 'MisterTester7' => LvlCalculator::minExpRequired(12), + 'MisterTester8' => LvlCalculator::minExpRequired(9), + 'MisterTester9' => LvlCalculator::minExpRequired(1), 'MisterTester10' => LvlCalculator::minExpRequired(6), ]; - foreach($lvls as $newPlayerName => $exp) { + foreach ($lvls as $newPlayerName => $exp) { $character = $this->createCharacter($newPlayerName); $character->addExp($exp); } diff --git a/tests/Player/CreateCharacterTest.php b/tests/Player/CreateCharacterTest.php index 36a89b8..d147b57 100644 --- a/tests/Player/CreateCharacterTest.php +++ b/tests/Player/CreateCharacterTest.php @@ -1,4 +1,5 @@ isFighting()); self::assertTrue($character->isInProtectiveZone()); $lumberjackLvl = $expectedRace->perks->canWoodcut ? 1 : 0; - $minerLvl = $expectedRace->perks->canMine ? 1 : 0; - $craftsmanLvl = $expectedRace->perks->canCraft ? 1 : 0; - $gathererLvl = $expectedRace->perks->canGather ? 1 : 0; - $farmerLvl = $expectedRace->perks->canHarvest ? 1 : 0; - $alchemistLvl = $expectedRace->perks->canBrew ? 1 : 0; + $minerLvl = $expectedRace->perks->canMine ? 1 : 0; + $craftsmanLvl = $expectedRace->perks->canCraft ? 1 : 0; + $gathererLvl = $expectedRace->perks->canGather ? 1 : 0; + $farmerLvl = $expectedRace->perks->canHarvest ? 1 : 0; + $alchemistLvl = $expectedRace->perks->canBrew ? 1 : 0; self::assertEquals($lumberjackLvl, $character->getWoodcutting()); self::assertEquals($alchemistLvl, $character->getAlchemy()); self::assertEquals($farmerLvl, $character->getHarvesting()); diff --git a/tests/Player/LvlCalculatorTest.php b/tests/Player/LvlCalculatorTest.php index f05b76b..af5b83d 100644 --- a/tests/Player/LvlCalculatorTest.php +++ b/tests/Player/LvlCalculatorTest.php @@ -1,4 +1,5 @@ player = $this->createCharacter('Mick'); + $this->player = $this->createCharacter('Mick'); $this->dungeonRepository = $this->getService(DungeonRepository::class); } @@ -36,7 +37,7 @@ public function testExpGain(): void public function testStates(): void { - $dungeon = $this->dungeonRepository->findById(1); + $dungeon = $this->dungeonRepository->findById(1); $dungeon2 = $this->dungeonRepository->findById(2); self::assertFalse($this->player->isFighting()); @@ -60,7 +61,7 @@ public function testStates(): void public function testEnterDungeonWhileAlreadyInOne(): void { - $dungeon = $this->dungeonRepository->findById(1); + $dungeon = $this->dungeonRepository->findById(1); $dungeon2 = $this->dungeonRepository->findById(2); $firstEnter = $this->player->enterDungeon($dungeon); @@ -69,7 +70,6 @@ public function testEnterDungeonWhileAlreadyInOne(): void $this->setCurrentTime($this->currentTime->addMinutes(2)); // TODO check that attempt to enter the same dungeon twice doesn't modify anything - $secondEnter = $this->player->enterDungeon($dungeon2); self::assertErrorOccurred($secondEnter, 'You are already hunting in a dungeon'); } @@ -109,7 +109,7 @@ public static function dungeonDifficultyProvider(): iterable public function testObtainItem(): void { - $gold = $this->getService(ItemPrototypeRepository::class)->getById(1); + $gold = $this->getService(ItemPrototypeRepository::class)->getById(1); $cheese = $this->getService(ItemPrototypeRepository::class)->getById(2); $this->player->obtainItem(new Item($gold->id, 123)); @@ -135,7 +135,7 @@ public function testObtainItem(): void public function testPickUp(): void { - $gold = $this->getService(ItemPrototypeRepository::class)->getById(1); + $gold = $this->getService(ItemPrototypeRepository::class)->getById(1); $cheese = $this->getService(ItemPrototypeRepository::class)->getById(2); $this->player->pickUp(new Item($gold->id, 123)); diff --git a/tests/ServerTest.php b/tests/ServerTest.php index e9cfa7c..1184fab 100644 --- a/tests/ServerTest.php +++ b/tests/ServerTest.php @@ -1,4 +1,5 @@ server = $this->getService(Server::class); $dungeonRepository = $this->getService(DungeonRepository::class); - $dungeon1 = $dungeonRepository->getById(1); - $dungeon2 = $dungeonRepository->getById(2); + $dungeon1 = $dungeonRepository->getById(1); + $dungeon2 = $dungeonRepository->getById(2); $this->createCharacter(self::PLAYER1, 100)->enterDungeon($dungeon1); $this->createCharacter(self::PLAYER2, 40)->enterDungeon($dungeon2); @@ -53,7 +54,7 @@ public function testPerformTasks(): void $this->assertHuntersReceivedRewards(); $this->assertExhaustedPlayersRemovedTheDungeon(); - $this->assertContainsLogs([''. self::MINUTES_SINCE_THE_LAST_EXECUTION . ''], $logs); + $this->assertContainsLogs(['' . self::MINUTES_SINCE_THE_LAST_EXECUTION . ''], $logs); } private function assertContainsLogs(array $logs, array $actualLogs): void diff --git a/tests/bootstrap.php b/tests/bootstrap.php index b3c2587..1eb7bd8 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -1,4 +1,5 @@ Date: Sun, 3 Sep 2023 18:43:19 +0200 Subject: [PATCH 14/29] Implemented tests for activity handling. Stopped stamina regen for chars performing activity --- src/Player/Activity/ActivityInterface.php | 3 +- src/Player/Activity/Lumberjack.php | 7 ++- src/Player/CharacterActivity.php | 59 ++++++++++++++++++++ src/Player/Player.php | 23 ++++---- src/Server.php | 27 ++++++---- src/UI/Scene/Activity/Lumberjack.php | 3 +- src/Utils/TimeInterval.php | 10 ++++ tests/IntegrationTestCase.php | 14 +++++ tests/Player/PlayerTest.php | 29 ++++++++++ tests/ServerTest.php | 66 +++++++++++++++++------ 10 files changed, 199 insertions(+), 42 deletions(-) create mode 100644 src/Player/CharacterActivity.php diff --git a/src/Player/Activity/ActivityInterface.php b/src/Player/Activity/ActivityInterface.php index fe359bc..84f4cb4 100644 --- a/src/Player/Activity/ActivityInterface.php +++ b/src/Player/Activity/ActivityInterface.php @@ -6,6 +6,7 @@ use Game\Player\Player; use Game\Player\Reward; +use Game\Utils\TimeInterval; interface ActivityInterface { @@ -23,7 +24,7 @@ public function getOption(): int; public function getOptionName(): string; - public function calculateReward(Player $for): Reward; + public function calculateReward(Player $for, TimeInterval $duration): Reward; public function isSame(ActivityInterface $activity): bool; } diff --git a/src/Player/Activity/Lumberjack.php b/src/Player/Activity/Lumberjack.php index 3048772..8d8dbeb 100644 --- a/src/Player/Activity/Lumberjack.php +++ b/src/Player/Activity/Lumberjack.php @@ -7,6 +7,7 @@ use Game\Item\Item; use Game\Player\Player; use Game\Player\Reward; +use Game\Utils\TimeInterval; readonly class Lumberjack implements ActivityInterface { @@ -57,7 +58,7 @@ public function getOptionName(): string return $this->optionName; } - public function calculateReward(Player $for): Reward + public function calculateReward(Player $for, TimeInterval $duration): Reward { $playerGeneralEfficiency = $for->getWoodcutting(); if ($playerGeneralEfficiency === 0) { @@ -70,7 +71,9 @@ public function calculateReward(Player $for): Reward return Reward::none(); } - return new Reward($option['rewardExp'], [new Item($option['rewardItem'], $efficiency)]); + $rewardPerHour = new Reward($option['rewardExp'], [new Item($option['rewardItem'], $efficiency)]); + + return $rewardPerHour->multiply($duration->toHours()); } public function isSame(ActivityInterface $activity): bool diff --git a/src/Player/CharacterActivity.php b/src/Player/CharacterActivity.php new file mode 100644 index 0000000..c67cd3e --- /dev/null +++ b/src/Player/CharacterActivity.php @@ -0,0 +1,59 @@ +activity = $this->resolveActivity($name, $option); + } + + public function getName(): string + { + return $this->activity->getName(); + } + + public function getOption(): int + { + return $this->activity->getOption(); + } + + public function getOptionName(): string + { + return $this->activity->getOptionName(); + } + + public function calculateReward(Player $for, TimeInterval $duration): Reward + { + return $this->activity->calculateReward($for, $duration); + } + + public function isSame(ActivityInterface $activity): bool + { + return $this->activity->isSame($activity); + } + + private function resolveActivity(string $name, int $option): ActivityInterface + { + switch ($name) { + case 'Lumberjack': + return new Lumberjack($option); + default: + throw new \RuntimeException('Unknown activity'); + } + } +} diff --git a/src/Player/Player.php b/src/Player/Player.php index 517e218..bc00010 100644 --- a/src/Player/Player.php +++ b/src/Player/Player.php @@ -154,27 +154,26 @@ public function startActivity(ActivityInterface $activity): ?Error $now = DbTimeFactory::createCurrentTimestamp(); $this->connection->execute(' - INSERT INTO activity(character_id, name, selected_option, checked_at, last_reward_at) - VALUE (?, ?, ?, ?, ?) - ', [$this->id, $activity->getName(), $activity->getOption(), $now, $now]); + INSERT INTO activity(character_id, name, selected_option, started_at, checked_at, last_reward_at) + VALUE (?, ?, ?, ?, ?, ?) + ', [$this->id, $activity->getName(), $activity->getOption(), $now, $now, $now]); return null; } - public function getCurrentActivity(): ?ActivityInterface + public function getCurrentActivity(): ?CharacterActivity { - $data = $this->connection->fetchRow('SELECT name, selected_option FROM activity WHERE character_id=' . $this->id); + $data = $this->connection->fetchRow('SELECT name, selected_option, checked_at, last_reward_at FROM activity WHERE character_id=' . $this->id); if ($data === []) { return null; } - // TODO some inflector would be good to resolve the values - switch ($data['name']) { - case 'Lumberjack': - return new Lumberjack($data['selected_option']); - default: - throw new \RuntimeException('Unknown activity'); - } + return new CharacterActivity( + $data['name'], + $data['selected_option'], + DbTimeFactory::fromTimestamp($data['checked_at']), + DbTimeFactory::fromTimestamp($data['last_reward_at']) + ); } public function stopActivity(): void diff --git a/src/Server.php b/src/Server.php index f67c343..c14c4cb 100644 --- a/src/Server.php +++ b/src/Server.php @@ -48,7 +48,7 @@ public function performTasks(): array $this->db->transaction(function () { $this->regenerateStamina(); $this->giveRewards(); - $this->stopExhaustedHunters(); + $this->stopExhaustedCharacters(); }); $logs = $this->logs; @@ -73,9 +73,9 @@ private function regenerateStamina(): void $this->logs[] = sprintf('%d', min($minutesPassed, Player::MAX_POSSIBLE_STAMINA)); - // TODO stop regenerating stamina for players with activities. Introduce playerState instead of in_combat + // TODO Introduce playerState instead of in_combat $this->db->execute( - 'UPDATE players SET stamina = LEAST(stamina + ?, ?) WHERE in_combat = 0 AND stamina < ?', + 'UPDATE players p LEFT JOIN activity a ON a.character_id=p.id SET stamina = LEAST(stamina + ?, ?) WHERE in_combat = 0 AND stamina < ? AND a.id IS NULL', [ $minutesPassed, Player::MAX_POSSIBLE_STAMINA, @@ -85,10 +85,18 @@ private function regenerateStamina(): void $this->db->execute("UPDATE timetable SET tid = NOW() WHERE name='stamina'"); } - private function stopExhaustedHunters(): void + private function stopExhaustedCharacters(): void { - $huntingPlayers = $this->db->fetchRows('SELECT id, name, in_combat, stamina FROM players WHERE stamina <= 0 AND in_combat = 1'); - foreach ($huntingPlayers as $row) { + $labourers = $this->db->fetchRows('SELECT p.id, p.name, in_combat, stamina FROM players p INNER JOIN activity a ON p.id = a.character_id WHERE stamina <= 0 AND in_combat = 0'); + foreach ($labourers as $row) { + $playerNameWithNoStamina = $row['name']; + + $this->db->execute('DELETE from activity WHERE character_id = ?', [$row['id']]); + $this->logs[] = sprintf('', $playerNameWithNoStamina); + } + + $hunters = $this->db->fetchRows('SELECT id, name, in_combat, stamina FROM players WHERE stamina <= 0 AND in_combat = 1'); + foreach ($hunters as $row) { $playerNameWithNoStamina = $row['name']; $this->db->execute('DELETE from hunting WHERE character_id = ?', [$row['id']]); @@ -194,8 +202,8 @@ private function giveActivityRewards(): void continue; } - $lastCheckedAt = DbTimeFactory::fromTimestamp($data['checked_at']); - $lastRewardedAt = DbTimeFactory::fromTimestamp($data['last_reward_at']); + $lastCheckedAt = $activity->checkedAt; + $lastRewardedAt = $activity->rewardedAt; $minutesSinceLastCheck = $lastCheckedAt->diffInMinutes($this->currentTime, false); $minutesSinceLastReward = $lastRewardedAt->diffInMinutes($this->currentTime, false); @@ -214,9 +222,8 @@ private function giveActivityRewards(): void } $fullHoursPassed = (int) ($minutesSinceLastReward / 60); - $rewardPerHour = $activity->calculateReward($character); - $reward = $rewardPerHour->multiply($fullHoursPassed); + $reward = $activity->calculateReward($character, TimeInterval::fromHours($fullHoursPassed)); $character->addExp($reward->exp); foreach ($reward->items as $item) { $character->pickUp($item); diff --git a/src/UI/Scene/Activity/Lumberjack.php b/src/UI/Scene/Activity/Lumberjack.php index 7c075e8..e851baa 100644 --- a/src/UI/Scene/Activity/Lumberjack.php +++ b/src/UI/Scene/Activity/Lumberjack.php @@ -8,6 +8,7 @@ use Game\UI\Scene\AbstractScene; use Game\UI\Scene\Input\InputInterface; use Game\UI\Scene\MainMenu; +use Game\Utils\TimeInterval; class Lumberjack extends AbstractScene { @@ -28,7 +29,7 @@ public function run(InputInterface $input): string foreach (\Game\Player\Activity\Lumberjack::OPTIONS as $option) { $activity = new \Game\Player\Activity\Lumberjack($option['id']); $option['isCurrent'] = $currentActivity !== null && $activity->isSame($currentActivity); - $reward = $activity->calculateReward($player); + $reward = $activity->calculateReward($player, TimeInterval::fromHours(1)); if ($reward->isEmpty()) { $option['gainPerHour'] = null; } else { diff --git a/src/Utils/TimeInterval.php b/src/Utils/TimeInterval.php index a5b36fa..b370083 100644 --- a/src/Utils/TimeInterval.php +++ b/src/Utils/TimeInterval.php @@ -13,6 +13,11 @@ public static function fromMinutes(int $minutes): self return new self($minutes * 60); } + public static function fromHours(int $hours): self + { + return self::fromMinutes($hours * 60); + } + public static function between(DateTimeInterface $from, DateTimeInterface $to): self { return new self($to->getTimestamp() - $from->getTimestamp()); @@ -30,6 +35,11 @@ public function toMinutes(): float return $this->seconds / 60; } + public function toHours(): float + { + return $this->toMinutes() / 60; + } + public function isGreaterThan(self $interval): bool { return $this->seconds > $interval->seconds; diff --git a/tests/IntegrationTestCase.php b/tests/IntegrationTestCase.php index fedc207..fa2f1ef 100644 --- a/tests/IntegrationTestCase.php +++ b/tests/IntegrationTestCase.php @@ -11,6 +11,7 @@ use Game\Engine\DBConnection; use Game\Engine\DbTimeFactory; use Game\Engine\Error; +use Game\Player\Activity\ActivityInterface; use Game\Player\CharacterRepository; use Game\Player\Player; use PHPUnit\Framework\TestCase; @@ -105,6 +106,19 @@ protected function createCharacter(string $name, ?int $stamina = null): Player return $character; } + protected function characterCanNowPerformActivity(Player $character, ActivityInterface $activity): void + { + switch ($activity->getName()) { + case 'Lumberjack': + $activitySkill = 'woodcutting'; + break; + default: + throw new \RuntimeException('Unknown activity. Implement it.'); + } + + $this->db->execute("UPDATE players SET $activitySkill=1 WHERE id= {$character->getId()}"); + } + private function setStamina(Player $character, int $value): void { $this->db->execute('UPDATE players SET stamina=? WHERE id = ?', [$value, $character->getId()]); diff --git a/tests/Player/PlayerTest.php b/tests/Player/PlayerTest.php index 9e3e940..823fff6 100644 --- a/tests/Player/PlayerTest.php +++ b/tests/Player/PlayerTest.php @@ -8,6 +8,7 @@ use Game\IntegrationTestCase; use Game\Item\Item; use Game\Item\ItemPrototypeRepository; +use Game\Player\Activity\Lumberjack; use PHPUnit\Framework\Attributes\DataProvider; class PlayerTest extends IntegrationTestCase @@ -158,4 +159,32 @@ public function testPickUp(): void self::assertEquals($cheese->worth, $itemsInInventory[1]->worth); self::assertEquals($cheese->isSellable(), $itemsInInventory[1]->isSellable); } + + public function testStartActivity(): void + { + self::assertNull($this->player->getCurrentActivity()); + + $activity = new Lumberjack(1); + $result = $this->player->startActivity($activity); + $this->assertNoErrorOccurred($result); + + $currentActivity = $this->player->getCurrentActivity(); + self::assertNotNull($currentActivity); + + self::assertTrue($currentActivity->isSame($activity)); + } + + public function testStopActivity(): void + { + $activity = new Lumberjack(1); + $result = $this->player->startActivity($activity); + $this->assertNoErrorOccurred($result); + + $currentActivity = $this->player->getCurrentActivity(); + self::assertNotNull($currentActivity); + + $this->player->stopActivity(); + + self::assertNull($this->player->getCurrentActivity()); + } } diff --git a/tests/ServerTest.php b/tests/ServerTest.php index 1184fab..d6543da 100644 --- a/tests/ServerTest.php +++ b/tests/ServerTest.php @@ -5,16 +5,18 @@ namespace Game; use Game\Dungeon\DungeonRepository; +use Game\Player\Activity\Lumberjack; use Game\Player\Player; class ServerTest extends IntegrationTestCase { - private const MINUTES_SINCE_THE_LAST_EXECUTION = 47; + private const MINUTES_SINCE_THE_LAST_EXECUTION = 67; private const PLAYER1 = 'Mark'; private const PLAYER2 = 'Kyle'; private const PLAYER3 = 'Gamid'; private const PLAYER4 = 'Mila'; + private const PLAYER5 = 'Gi'; private Server $server; protected function setUp(): void @@ -31,6 +33,11 @@ protected function setUp(): void $this->createCharacter(self::PLAYER2, 40)->enterDungeon($dungeon2); $this->createCharacter(self::PLAYER3, 23); $this->createCharacter(self::PLAYER4, 61); + $character = $this->createCharacter(self::PLAYER5, 65); + + $activity = new Lumberjack(1); + $this->characterCanNowPerformActivity($character, $activity); + $character->startActivity($activity); } public function testPerformTasksWhenThereIsNothingToDo(): void @@ -38,7 +45,8 @@ public function testPerformTasksWhenThereIsNothingToDo(): void $result = $this->server->performTasks(); $this->assertStaminaRestoredForRestingPlayers(0); - $this->assertStaminaSpentForHuntingPlayers(0); + $this->assertStaminaSpentByHuntingCharacters(0); + $this->assertStaminaSpentByCharactersPerformingActivities(0); $this->assertContainsLogs([], $result); } @@ -50,9 +58,12 @@ public function testPerformTasks(): void $logs = $this->server->performTasks(); $this->assertStaminaRestoredForRestingPlayers(self::MINUTES_SINCE_THE_LAST_EXECUTION); - $this->assertStaminaSpentForHuntingPlayers(self::MINUTES_SINCE_THE_LAST_EXECUTION); + $this->assertStaminaSpentByHuntingCharacters(self::MINUTES_SINCE_THE_LAST_EXECUTION); + $this->assertStaminaSpentByCharactersPerformingActivities(self::MINUTES_SINCE_THE_LAST_EXECUTION); $this->assertHuntersReceivedRewards(); - $this->assertExhaustedPlayersRemovedTheDungeon(); + $this->assertLabourersReceivedRewards(); + $this->assertExhaustedCharactersLeftTheDungeon(); + $this->assertExhaustedCharactersStoppedActivities(); $this->assertContainsLogs(['' . self::MINUTES_SINCE_THE_LAST_EXECUTION . ''], $logs); } @@ -84,13 +95,19 @@ private function assertStaminaRestoredForRestingPlayers(int $amount): void ); } - private function assertStaminaSpentForHuntingPlayers(int $amount): void + private function assertStaminaSpentByHuntingCharacters(int $amountOfSpentStamina): void { - $player = $this->getCharacterByName(self::PLAYER1); - self::assertEquals(max(100 - $amount, 0), $player->getStamina()); + $character = $this->getCharacterByName(self::PLAYER1); + self::assertEquals(max(100 - $amountOfSpentStamina, 0), $character->getStamina()); - $player = $this->getCharacterByName(self::PLAYER2); - self::assertEquals(max(40 - $amount, 0), $player->getStamina()); + $character = $this->getCharacterByName(self::PLAYER2); + self::assertEquals(max(40 - $amountOfSpentStamina, 0), $character->getStamina()); + } + + private function assertStaminaSpentByCharactersPerformingActivities(int $amountOfSpentStamina): void + { + $character = $this->getCharacterByName(self::PLAYER5); + self::assertEquals(max(65 - $amountOfSpentStamina, 0), $character->getStamina()); } /** @@ -99,7 +116,7 @@ private function assertStaminaSpentForHuntingPlayers(int $amount): void private function assertHuntersReceivedRewards(): void { $player = $this->getCharacterByName(self::PLAYER1); - self::assertEquals(75, $player->getExp()); + self::assertEquals(110, $player->getExp()); $player = $this->getCharacterByName(self::PLAYER2); self::assertEquals(200, $player->getExp()); @@ -111,13 +128,30 @@ private function assertHuntersReceivedRewards(): void self::assertEquals(0, $player->getExp()); } - private function assertExhaustedPlayersRemovedTheDungeon(): void + private function assertLabourersReceivedRewards(): void { - $player = $this->getCharacterByName(self::PLAYER1); - self::assertTrue($player->isFighting()); - self::assertEquals(1, $player->getHuntingDungeonId(), 'Player had to stay in the same dungeon'); + $character = $this->getCharacterByName(self::PLAYER5); - $player = $this->getCharacterByName(self::PLAYER2); - self::assertTrue($player->isInProtectiveZone()); + self::assertEquals(Lumberjack::OPTIONS[1]['rewardExp'], $character->getExp()); + $item = $character->findInInventory(Lumberjack::OPTIONS[1]['rewardItem']); + self::assertNotNull($item); + self::assertEquals(1, $item->quantity); + } + + private function assertExhaustedCharactersLeftTheDungeon(): void + { + $character = $this->getCharacterByName(self::PLAYER1); + self::assertTrue($character->isFighting()); + self::assertEquals(1, $character->getHuntingDungeonId(), 'Player had to stay in the same dungeon'); + + $character = $this->getCharacterByName(self::PLAYER2); + self::assertTrue($character->isInProtectiveZone()); + } + + private function assertExhaustedCharactersStoppedActivities(): void + { + $character = $this->getCharacterByName(self::PLAYER5); + self::assertTrue($character->isInProtectiveZone()); + self::assertNull($character->getCurrentActivity()); } } From 994ddf5eb0adc6913ce67b9d1c7bce02adbeaad2 Mon Sep 17 00:00:00 2001 From: Temirkhan Date: Sun, 3 Sep 2023 19:09:46 +0200 Subject: [PATCH 15/29] Going for code coverage --- .github/workflows/ci.yml | 3 ++- phpunit.xml.dist | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4cd1983..7e1ccd8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,6 +25,7 @@ jobs: - uses: nanasess/setup-php@master with: php-version: '8.2' + extensions: xdebug - name: install vendors run: composer install --no-interaction - name: install project @@ -34,4 +35,4 @@ jobs: - name: static analyze run: ./vendor/bin/phpstan - name: tests - run: ./vendor/bin/phpunit + run: php -dxdebug.mode=coverage ./vendor/bin/phpunit --coverage-text diff --git a/phpunit.xml.dist b/phpunit.xml.dist index d828797..3ffec3b 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -20,7 +20,6 @@ tests - src From 639903f784794dc0d8452bfc1ab167707c1c23c1 Mon Sep 17 00:00:00 2001 From: Temirkhan Date: Sun, 3 Sep 2023 22:03:52 +0200 Subject: [PATCH 16/29] Checking another ci action --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e1ccd8..4004f87 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 steps: - uses: actions/checkout@v2 - - uses: nanasess/setup-php@master + - uses: shivammathur/setup-php@v2 with: php-version: '8.2' extensions: xdebug From a5ec319f54d3770c559b29f324c8517d785bbbe7 Mon Sep 17 00:00:00 2001 From: Temirkhan Date: Mon, 4 Sep 2023 22:38:25 +0200 Subject: [PATCH 17/29] Activities are generalized. They list is fixed though. Rewards should be configured in activity_option.yaml --- data/activity_option.yaml | 27 ++++++ data/item.yaml | 14 ++- src/Player/Activity/Activity.php | 89 +++++++++++++++++++ src/Player/Activity/ActivityInterface.php | 5 +- src/Player/Activity/ActivityRepository.php | 61 +++++++++++++ src/Player/Activity/Lumberjack.php | 83 ----------------- src/Player/Activity/OptionDetails.php | 18 ++++ src/Player/CharacterActivity.php | 14 +-- src/Player/Player.php | 27 +++++- src/Server.php | 2 +- src/UI/Scene/Activity.php | 88 ++++++++++++++++++ src/UI/Scene/Activity/Lumberjack.php | 70 --------------- ...umberjack.html.twig => activity.html.twig} | 6 +- src/UI/Template/minimalistic.template.twig | 12 +-- tests/Player/PlayerTest.php | 6 +- tests/ServerTest.php | 13 +-- www/launcher.php | 4 +- 17 files changed, 349 insertions(+), 190 deletions(-) create mode 100644 data/activity_option.yaml create mode 100644 src/Player/Activity/Activity.php create mode 100644 src/Player/Activity/ActivityRepository.php delete mode 100644 src/Player/Activity/Lumberjack.php create mode 100644 src/Player/Activity/OptionDetails.php create mode 100644 src/UI/Scene/Activity.php delete mode 100644 src/UI/Scene/Activity/Lumberjack.php rename src/UI/Template/{activity/lumberjack.html.twig => activity.html.twig} (85%) diff --git a/data/activity_option.yaml b/data/activity_option.yaml new file mode 100644 index 0000000..8ff808a --- /dev/null +++ b/data/activity_option.yaml @@ -0,0 +1,27 @@ +Lumberjack: + - id: 1 + name: 'Hollow tree' + description: 'Hollow tree. Can be sold as fuel for a coin or two.' + complexity: 1 + reward_exp: 5 + reward_item_id: 6 + + - id: 2 + name: 'Oak tree' + description: 'Strong tree. They say hogs love hanging around it.' + complexity: 3 + reward_exp: 8 + reward_item_id: 7 +Farmer: + - id: 1 + name: 'Hay field' + description: 'Dried grass that is usually used to feed cows.' + complexity: 1 + reward_exp: 5 + reward_item_id: 8 + - id: 2 + name: 'Potato field' + description: 'Grows underground. Does not need much and yields plenty of resource.' + complexity: 3 + reward_exp: 8 + reward_item_id: 9 diff --git a/data/item.yaml b/data/item.yaml index cd221f6..aea8fd3 100644 --- a/data/item.yaml +++ b/data/item.yaml @@ -20,9 +20,17 @@ worth: 5 - id: 6 - name: Firewood - worth: 0 + name: 'Firewood bundle' + worth: 1 - id: 7 - name: Oka plank + name: Oak plank + worth: 2 +- + id: 8 + name: 'Hay bale' worth: 1 +- + id: 9 + name: 'Potato' + worth: 2 diff --git a/src/Player/Activity/Activity.php b/src/Player/Activity/Activity.php new file mode 100644 index 0000000..9491b21 --- /dev/null +++ b/src/Player/Activity/Activity.php @@ -0,0 +1,89 @@ +exists($name)) { + throw new \RuntimeException(sprintf('Unknown activity "%s"', $name)); + } + + $optionDetails = \DI::getService(ActivityRepository::class)->findActivityOption($name, $option); + if ($optionDetails === null) { + throw new \RuntimeException(sprintf('Unknown option "%d" for activity "%s"', $option, $name)); + } + + $this->name = $name; + $this->option = $optionDetails; + } + + public static function lumberjack(int $option): self + { + return new self(self::NAME_LUMBERJACK, $option); + } + + public function getName(): string + { + return $this->name; + } + + public function getOption(): int + { + return $this->option->id; + } + + public function getOptionName(): string + { + return $this->option->name; + } + + public function calculateReward(Player $for, TimeInterval $duration): Reward + { + if (!$for->canPerformActivity($this->name)) { + return Reward::none(); + } + + $playerGeneralEfficiency = $for->getActivitySkillLevel($this->name); + + $efficiency = (int) round($playerGeneralEfficiency / $this->option->complexity); + if ($efficiency === 0) { + return Reward::none(); + } + + $rewardPerHour = new Reward($this->option->rewardExp, [new Item($this->option->rewardItemId, $efficiency)]); + + return $rewardPerHour->multiply($duration->toHours()); + } + + public function isSame(ActivityInterface $activity): bool + { + return $activity->getName() === $this->getName() && $activity->getOptionName() === $this->getOptionName(); + } + + private static function exists(string $name): bool + { + return in_array($name, [ + self::NAME_LUMBERJACK, + self::NAME_FARMER, + ]); + } +} diff --git a/src/Player/Activity/ActivityInterface.php b/src/Player/Activity/ActivityInterface.php index 84f4cb4..089abf8 100644 --- a/src/Player/Activity/ActivityInterface.php +++ b/src/Player/Activity/ActivityInterface.php @@ -16,7 +16,7 @@ interface ActivityInterface public function getName(): string; /** - * Returns the option identifier which basically means chopping OAK, or minining IRON + * Returns the option identifier which basically means chopping OAK, or mining IRON * * @return int */ @@ -24,6 +24,9 @@ public function getOption(): int; public function getOptionName(): string; + /** + * @TODO feels as if it is in the wrong place. Maybe Player is the right one. + */ public function calculateReward(Player $for, TimeInterval $duration): Reward; public function isSame(ActivityInterface $activity): bool; diff --git a/src/Player/Activity/ActivityRepository.php b/src/Player/Activity/ActivityRepository.php new file mode 100644 index 0000000..3e0aae5 --- /dev/null +++ b/src/Player/Activity/ActivityRepository.php @@ -0,0 +1,61 @@ +getData()[$activityName] ?? []); + + $entries = []; + /** @var array{id: int, name: string, description:string, complexity: int, reward_exp: int, reward_item_id: int} $entry */ + foreach ($raw as $entry) { + $entries[] = new OptionDetails( + $entry['id'], + $entry['name'], + $entry['description'], + $entry['complexity'], + $entry['reward_exp'], + $entry['reward_item_id'] + ); + } + + return $entries; + } + + public function findActivity(string $activity, int $optionId): ?Activity + { + $option = $this->findActivityOption($activity, $optionId); + if ($option === null) { + return null; + } + + return new Activity($activity, $optionId); + } + + public function findActivityOption(string $activity, int $optionId): ?OptionDetails + { + foreach ($this->getActivityOptions($activity) as $option) { + if ($option->id === $optionId) { + return $option; + } + } + + return null; + } + + protected function getDataName(): string + { + return 'activity_option'; + } +} diff --git a/src/Player/Activity/Lumberjack.php b/src/Player/Activity/Lumberjack.php deleted file mode 100644 index 8d8dbeb..0000000 --- a/src/Player/Activity/Lumberjack.php +++ /dev/null @@ -1,83 +0,0 @@ - [ - 'id' => 1, - 'name' => 'Hollow tree', - 'description' => 'Hollow tree. Can be sold as fuel for a coin or two.', - 'complexity' => 1, - 'rewardExp' => 5, - 'rewardItem' => 6, - ], - 2 => [ - 'id' => 2, - 'name' => 'Oak tree', - 'description' => 'Strong tree. They say hogs love hanging around it.', - 'complexity' => 3, - 'rewardExp' => 8, - 'rewardItem' => 7, - ], - ]; - - private int $optionId; - private string $optionName; - - public function __construct(int $option) - { - if (!isset(self::OPTIONS[$option])) { - throw new \RuntimeException('Unknown option passed'); - } - - $this->optionId = $option; - $this->optionName = self::OPTIONS[$option]['name']; - } - - public function getName(): string - { - return 'Lumberjack'; - } - - public function getOption(): int - { - return $this->optionId; - } - - public function getOptionName(): string - { - return $this->optionName; - } - - public function calculateReward(Player $for, TimeInterval $duration): Reward - { - $playerGeneralEfficiency = $for->getWoodcutting(); - if ($playerGeneralEfficiency === 0) { - return Reward::none(); - } - - $option = self::OPTIONS[$this->optionId]; - $efficiency = (int) round($playerGeneralEfficiency / $option['complexity']); - if ($efficiency === 0) { - return Reward::none(); - } - - $rewardPerHour = new Reward($option['rewardExp'], [new Item($option['rewardItem'], $efficiency)]); - - return $rewardPerHour->multiply($duration->toHours()); - } - - public function isSame(ActivityInterface $activity): bool - { - return $activity->getName() === $this->getName() && $activity->getOptionName() === $this->getOptionName(); - } -} diff --git a/src/Player/Activity/OptionDetails.php b/src/Player/Activity/OptionDetails.php new file mode 100644 index 0000000..944aa60 --- /dev/null +++ b/src/Player/Activity/OptionDetails.php @@ -0,0 +1,18 @@ +activity = $this->resolveActivity($name, $option); + $this->activity = new Activity($name, $option); } public function getName(): string @@ -46,14 +46,4 @@ public function isSame(ActivityInterface $activity): bool { return $this->activity->isSame($activity); } - - private function resolveActivity(string $name, int $option): ActivityInterface - { - switch ($name) { - case 'Lumberjack': - return new Lumberjack($option); - default: - throw new \RuntimeException('Unknown activity'); - } - } } diff --git a/src/Player/Player.php b/src/Player/Player.php index bc00010..1829679 100644 --- a/src/Player/Player.php +++ b/src/Player/Player.php @@ -11,8 +11,8 @@ use Game\Engine\Error; use Game\Item\Item; use Game\Item\ItemPrototype as ItemPrototype; +use Game\Player\Activity\Activity; use Game\Player\Activity\ActivityInterface; -use Game\Player\Activity\Lumberjack; use Game\Skill\Effect\EffectApplier; use Game\Trade\Offer; @@ -141,6 +141,31 @@ public function addExp(int $amount): void $this->logger->add($this->id, "You gained $amount experience points."); } + public function canPerformActivity(string $activity): bool + { + return $this->getActivitySkillLevel($activity) > 0; + } + + public function getActivitySkillLevel(string $activity): int + { + switch ($activity) { + case Activity::NAME_LUMBERJACK: + return $this->getWoodcutting(); + case Activity::NAME_FARMER: + return $this->getHarvesting(); + case Activity::NAME_MINER: + return $this->getMining(); + case Activity::NAME_GATHERER: + return $this->getGathering(); + case Activity::NAME_CRAFTER: + return $this->getBlacksmith(); + case Activity::NAME_ALCHEMIST: + return $this->getAlchemy(); + default: + return 0; + } + } + public function startActivity(ActivityInterface $activity): ?Error { if (!$this->isInProtectiveZone()) { diff --git a/src/Server.php b/src/Server.php index c14c4cb..c903387 100644 --- a/src/Server.php +++ b/src/Server.php @@ -229,7 +229,7 @@ private function giveActivityRewards(): void $character->pickUp($item); } - $lastRewardedAt = $this->currentTime->addHours($fullHoursPassed); + $lastRewardedAt = $lastRewardedAt->addHours($fullHoursPassed); $this->db->execute('UPDATE activity SET last_reward_at=? WHERE character_id=?', [DbTimeFactory::createTimestamp($lastRewardedAt), $character->getId()]); } } diff --git a/src/UI/Scene/Activity.php b/src/UI/Scene/Activity.php new file mode 100644 index 0000000..84c0218 --- /dev/null +++ b/src/UI/Scene/Activity.php @@ -0,0 +1,88 @@ +getString('activity'); + + // Player can not perform this activity + $player = $this->getCurrentPlayer(); + if (!$player->canPerformActivity($selectedActivity)) { + return $this->switchToScene(MainMenu::class); + } + $errorMsg = ''; + $infoMsg = ''; + + $this->handleInput($input, $player); + + $currentActivity = $player->getCurrentActivity(); + $options = []; + foreach ($this->activityOptionRepository->getActivityOptions($selectedActivity) as $opt) { + $option = [ + 'id' => $opt->id, + 'name' => $opt->name, + 'gainPerHour' => null, + ]; + + $activity = new ActivityModel($selectedActivity, $opt->id); + $option['isCurrent'] = $currentActivity !== null && $activity->isSame($currentActivity); + $reward = $activity->calculateReward($player, TimeInterval::fromHours(1)); + if (!$reward->isEmpty()) { + $option['gainPerHour'] = [ + 'exp' => $reward->exp, + 'drop' => $reward->items[0], + ]; + } + $options[] = $option; + } + + return $this->renderTemplate('activity', [ + 'options' => $options, + 'errorMsg' => $errorMsg, + 'infoMsg' => $infoMsg, + 'activityName' => $selectedActivity, + ]); + } + + private function handleInput(InputInterface $input, Player $player): void + { + if ($input->getString('action') === 'stop') { + $player->stopActivity(); + + return; + } + + $selectedActivity = $input->getString('activity'); + $selectedOption = $input->getInt('option'); + if ($selectedOption > 0) { + $activity = $this->activityOptionRepository->findActivity($selectedActivity, $selectedOption); + if ($activity !== null) { + $player->startActivity($activity); + return; + } + } + } +} diff --git a/src/UI/Scene/Activity/Lumberjack.php b/src/UI/Scene/Activity/Lumberjack.php deleted file mode 100644 index e851baa..0000000 --- a/src/UI/Scene/Activity/Lumberjack.php +++ /dev/null @@ -1,70 +0,0 @@ -getCurrentPlayer(); - // Player can not perform this activity - if ($player->getWoodcutting() < 1) { - return $this->switchToScene(MainMenu::class); - } - $errorMsg = ''; - $infoMsg = ''; - - $this->handleInput($input, $player); - - $currentActivity = $player->getCurrentActivity(); - $options = []; - foreach (\Game\Player\Activity\Lumberjack::OPTIONS as $option) { - $activity = new \Game\Player\Activity\Lumberjack($option['id']); - $option['isCurrent'] = $currentActivity !== null && $activity->isSame($currentActivity); - $reward = $activity->calculateReward($player, TimeInterval::fromHours(1)); - if ($reward->isEmpty()) { - $option['gainPerHour'] = null; - } else { - $option['gainPerHour'] = [ - 'exp' => $reward->exp, - 'drop' => $reward->items[0], - ]; - } - $options[] = $option; - } - - return $this->renderTemplate('activity/lumberjack', [ - 'options' => $options, - 'errorMsg' => $errorMsg, - 'infoMsg' => $infoMsg, - ]); - } - - private function handleInput(InputInterface $input, Player $player): void - { - if ($input->getString('action') === 'stop') { - $player->stopActivity(); - - return; - } - - $selectedOption = $input->getInt('tree'); - if ($selectedOption > 0) { - foreach (\Game\Player\Activity\Lumberjack::OPTIONS as $option) { - // If option exists then start activity - if ($selectedOption === $option['id']) { - $player->startActivity(new \Game\Player\Activity\Lumberjack($option['id'])); - return; - } - } - } - } -} diff --git a/src/UI/Template/activity/lumberjack.html.twig b/src/UI/Template/activity.html.twig similarity index 85% rename from src/UI/Template/activity/lumberjack.html.twig rename to src/UI/Template/activity.html.twig index 436239b..4b2dcfe 100644 --- a/src/UI/Template/activity/lumberjack.html.twig +++ b/src/UI/Template/activity.html.twig @@ -2,7 +2,7 @@ {% block content %}
    -
    Lumberjack
    +
    {{ activityName }}
    @@ -29,9 +29,9 @@ Skill level is too low
    {% endif %} {% if option.isCurrent %} - + {% else %} - + {% endif %}
    {% if column == 2 %} diff --git a/src/UI/Template/minimalistic.template.twig b/src/UI/Template/minimalistic.template.twig index 743a51b..4457887 100644 --- a/src/UI/Template/minimalistic.template.twig +++ b/src/UI/Template/minimalistic.template.twig @@ -51,12 +51,12 @@ Activity
    - {% if player.woodcutting > 0 %}Lumberjack{% endif %} - {% if player.mining > 0 %}Miner{% endif %} - {% if player.gathering > 0 %}Gatherer{% endif %} - {% if player.harvesting > 0 %}Farmer{% endif %} - {% if player.blacksmith > 0 %}Crafter{% endif %} - {% if player.alchemy > 0 %}Alchemist{% endif %} + {% if player.canPerformActivity('Lumberjack') %}Lumberjack{% endif %} + {% if player.canPerformActivity('Miner') %}Miner{% endif %} + {% if player.canPerformActivity('Gatherer') %}Gatherer{% endif %} + {% if player.canPerformActivity('Farmer') %}Farmer{% endif %} + {% if player.canPerformActivity('Crafter') %}Crafter{% endif %} + {% if player.canPerformActivity('Alchemist') %}Alchemist{% endif %}
  • diff --git a/tests/Player/PlayerTest.php b/tests/Player/PlayerTest.php index 823fff6..5923939 100644 --- a/tests/Player/PlayerTest.php +++ b/tests/Player/PlayerTest.php @@ -8,7 +8,7 @@ use Game\IntegrationTestCase; use Game\Item\Item; use Game\Item\ItemPrototypeRepository; -use Game\Player\Activity\Lumberjack; +use Game\Player\Activity\Activity; use PHPUnit\Framework\Attributes\DataProvider; class PlayerTest extends IntegrationTestCase @@ -164,7 +164,7 @@ public function testStartActivity(): void { self::assertNull($this->player->getCurrentActivity()); - $activity = new Lumberjack(1); + $activity = Activity::lumberjack(1); $result = $this->player->startActivity($activity); $this->assertNoErrorOccurred($result); @@ -176,7 +176,7 @@ public function testStartActivity(): void public function testStopActivity(): void { - $activity = new Lumberjack(1); + $activity = Activity::lumberjack(1); $result = $this->player->startActivity($activity); $this->assertNoErrorOccurred($result); diff --git a/tests/ServerTest.php b/tests/ServerTest.php index d6543da..f439869 100644 --- a/tests/ServerTest.php +++ b/tests/ServerTest.php @@ -5,7 +5,8 @@ namespace Game; use Game\Dungeon\DungeonRepository; -use Game\Player\Activity\Lumberjack; +use Game\Player\Activity\Activity; +use Game\Player\Activity\ActivityRepository; use Game\Player\Player; class ServerTest extends IntegrationTestCase @@ -35,7 +36,7 @@ protected function setUp(): void $this->createCharacter(self::PLAYER4, 61); $character = $this->createCharacter(self::PLAYER5, 65); - $activity = new Lumberjack(1); + $activity = Activity::lumberjack(1); $this->characterCanNowPerformActivity($character, $activity); $character->startActivity($activity); } @@ -130,10 +131,12 @@ private function assertHuntersReceivedRewards(): void private function assertLabourersReceivedRewards(): void { - $character = $this->getCharacterByName(self::PLAYER5); + $character = $this->getCharacterByName(self::PLAYER5); + $pickedOption = $this->getService(ActivityRepository::class)->findActivityOption(Activity::NAME_LUMBERJACK, 1); - self::assertEquals(Lumberjack::OPTIONS[1]['rewardExp'], $character->getExp()); - $item = $character->findInInventory(Lumberjack::OPTIONS[1]['rewardItem']); + self::assertNotNull($pickedOption); + self::assertEquals($pickedOption->rewardExp, $character->getExp()); + $item = $character->findInInventory($pickedOption->rewardItemId); self::assertNotNull($item); self::assertEquals(1, $item->quantity); } diff --git a/www/launcher.php b/www/launcher.php index d16e80e..91779f9 100644 --- a/www/launcher.php +++ b/www/launcher.php @@ -20,7 +20,7 @@ enum Navigation: string case SHOP = 'shop'; case CHARACTER_CREATION = 'charCreation'; - case ACTIVITY_LUMBERJACK = 'lumberjack'; + case ACTIVITY_LUMBERJACK = 'activity'; public function load(): void { @@ -48,7 +48,7 @@ private function getScene(): Scene\SceneInterface case self::CHARACTER_CREATION: return DI::getService(Scene\CharacterCreation::class); case self::ACTIVITY_LUMBERJACK: - return DI::getService(Scene\Activity\Lumberjack::class); + return DI::getService(Scene\Activity::class); default: return DI::getService(Scene\Auth::class); } From 3015bda8d6f868983e7de57a32d7fe63673d2e2c Mon Sep 17 00:00:00 2001 From: Temirkhan Date: Mon, 4 Sep 2023 22:53:03 +0200 Subject: [PATCH 18/29] Introduced item types --- data/item.yaml | 9 +++++++++ data/item_effect.yaml | 5 +++++ src/Item/Item.php | 15 ++++++--------- src/Item/ItemPrototype.php | 5 ++--- src/Item/ItemPrototypeRepository.php | 4 ++-- src/Item/ItemType.php | 14 ++++++++++++++ 6 files changed, 38 insertions(+), 14 deletions(-) create mode 100644 src/Item/ItemType.php diff --git a/data/item.yaml b/data/item.yaml index aea8fd3..5f327bd 100644 --- a/data/item.yaml +++ b/data/item.yaml @@ -2,35 +2,44 @@ id: 1 name: 'Gold Coins' worth: 1 + type: 'currency' - id: 2 name: Cheese worth: 2 + type: 'consumable' - id: 3 name: 'Short Sword' worth: 18 + type: 'weapon' - id: 4 name: 'Animal hide' worth: 2 + type: 'material' - id: 5 name: Leather worth: 5 + type: 'material' - id: 6 name: 'Firewood bundle' worth: 1 + type: 'material' - id: 7 name: Oak plank worth: 2 + type: 'material' - id: 8 name: 'Hay bale' worth: 1 + type: 'material' - id: 9 name: 'Potato' worth: 2 + type: 'consumable' diff --git a/data/item_effect.yaml b/data/item_effect.yaml index a9d11f2..90e43df 100644 --- a/data/item_effect.yaml +++ b/data/item_effect.yaml @@ -3,3 +3,8 @@ name: 'Restore stamina' type: 1 power: 5 +- + item_id: 9 + name: 'Restore stamina' + type: 1 + power: 3 diff --git a/src/Item/Item.php b/src/Item/Item.php index f9de7d9..72c6188 100644 --- a/src/Item/Item.php +++ b/src/Item/Item.php @@ -20,14 +20,12 @@ public function __construct(int $itemId, int $quantity) { - $prototype = \DI::getService(ItemPrototypeRepository::class)->getById($itemId); - $this->prototype = $prototype; - $this->id = $prototype->id; - $this->name = $prototype->name; + $this->prototype = \DI::getService(ItemPrototypeRepository::class)->getById($itemId); + $this->id = $this->prototype->id; + $this->name = $this->prototype->name; $this->quantity = $quantity; - $this->worth = $prototype->worth; - $this->isSellable = $prototype->isSellable(); -// todo replace with Type + $this->worth = $this->prototype->worth; + $this->isSellable = $this->prototype->isSellable(); } /** @@ -40,7 +38,6 @@ public function listEffects(): iterable public function isConsumable(): bool { - // TODO implement item types - return $this->id === 2; + return $this->prototype->type === ItemType::CONSUMABLE; } } diff --git a/src/Item/ItemPrototype.php b/src/Item/ItemPrototype.php index 0f622c8..4455724 100644 --- a/src/Item/ItemPrototype.php +++ b/src/Item/ItemPrototype.php @@ -6,13 +6,12 @@ readonly class ItemPrototype { - public function __construct(public int $id, public string $name, public int $worth) + public function __construct(public int $id, public string $name, public ItemType $type, public int $worth) { } public function isSellable(): bool { - // TODO add property is_sellable into db - return $this->id !== 1; + return $this->type !== ItemType::CURRENCY; } } diff --git a/src/Item/ItemPrototypeRepository.php b/src/Item/ItemPrototypeRepository.php index f46b229..2cdcb85 100644 --- a/src/Item/ItemPrototypeRepository.php +++ b/src/Item/ItemPrototypeRepository.php @@ -17,7 +17,7 @@ public function getById(int $id): ItemPrototype { if (!isset($this->cache[$id])) { $prototype = []; - /** @var array{id: int, name: string, worth: int} $itemData */ + /** @var array{id: int, name: string, worth: int, type: string} $itemData */ foreach ($this->getData() as $itemData) { if ($itemData['id'] === $id) { $prototype = $itemData; @@ -29,7 +29,7 @@ public function getById(int $id): ItemPrototype throw new \RuntimeException('Unknown item'); } - $this->cache[$id] = new ItemPrototype($id, $prototype['name'], (int) $prototype['worth']); + $this->cache[$id] = new ItemPrototype($id, $prototype['name'], ItemType::from($prototype['type']), (int) $prototype['worth']); } return $this->cache[$id]; diff --git a/src/Item/ItemType.php b/src/Item/ItemType.php new file mode 100644 index 0000000..52d8ead --- /dev/null +++ b/src/Item/ItemType.php @@ -0,0 +1,14 @@ + Date: Tue, 5 Sep 2023 19:32:08 +0200 Subject: [PATCH 19/29] Added data caching to avoid duplicate read+parse --- src/Utils/AbstractDataAccessor.php | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/Utils/AbstractDataAccessor.php b/src/Utils/AbstractDataAccessor.php index 1dd385b..a169507 100644 --- a/src/Utils/AbstractDataAccessor.php +++ b/src/Utils/AbstractDataAccessor.php @@ -6,11 +6,13 @@ use Symfony\Component\Yaml\Yaml; -/** - * TODO all this stuff should live in memcache/redis or other persistent caching mechanism. Index precompiled. To avoid iterating over data. - */ abstract class AbstractDataAccessor { + /** + * @var array + */ + private array $cache = []; + abstract protected function getDataName(): string; /** @@ -18,14 +20,16 @@ abstract protected function getDataName(): string; */ protected function getData(): array { - $dataFile = sprintf('%s/data/%s.yaml', PROJECT_ROOT, $this->getDataName()); - - $result = Yaml::parseFile($dataFile); - - if (!is_array($result)) { - return []; + if ($this->cache === []) { + $dataFile = sprintf('%s/data/%s.yaml', PROJECT_ROOT, $this->getDataName()); + $result = Yaml::parseFile($dataFile); + if (!is_array($result)) { + return []; + } + + $this->cache = $result; } - return $result; + return $this->cache; } } From e1d592aa1d8c3360c9f94d517a865cf3027eafec Mon Sep 17 00:00:00 2001 From: Temirkhan Date: Tue, 5 Sep 2023 19:52:51 +0200 Subject: [PATCH 20/29] Launcher is fully autonomous now --- src/Client.php | 51 ++++++++++++++++++++++++++++++++--- www/launcher.php | 69 ++---------------------------------------------- 2 files changed, 49 insertions(+), 71 deletions(-) diff --git a/src/Client.php b/src/Client.php index 003e5d7..9fc1e99 100644 --- a/src/Client.php +++ b/src/Client.php @@ -7,9 +7,37 @@ use Game\Auth\AuthService; use Game\Player\CharacterRepository; use Game\Player\Player; +use Game\UI\Scene; +use Game\UI\Scene\Input\HttpInput; readonly class Client { + private const SCENE_AUTH = 'auth'; + private const SCENE_DUNGEONS = 'dungeons'; + private const SCENE_HIGH_SCORE = 'highscores'; + private const SCENE_MAIN = 'main'; + private const SCENE_INVENTORY = 'inventory'; + private const SCENE_LIBRARY = 'library'; + private const SCENE_SHOPS = 'shops'; + + private const SCENE_SHOP = 'shop'; + private const SCENE_CHARACTER_CREATION = 'charCreation'; + + private const SCENE_ACTIVITY = 'activity'; + + private const CONTROLLERS = [ + self::SCENE_AUTH => Scene\Auth::class, + self::SCENE_CHARACTER_CREATION => Scene\CharacterCreation::class, + self::SCENE_MAIN => Scene\MainMenu::class, + self::SCENE_DUNGEONS => Scene\Dungeons::class, + self::SCENE_ACTIVITY => Scene\Activity::class, + self::SCENE_LIBRARY => Scene\Library::class, + self::SCENE_HIGH_SCORE => Scene\Highscore::class, + self::SCENE_INVENTORY => Scene\Inventory::class, + self::SCENE_SHOPS => Scene\Shops::class, + self::SCENE_SHOP => Scene\Shop::class, + ]; + public function __construct( private AuthService $authService, private CharacterRepository $characterRepository @@ -18,7 +46,18 @@ public function __construct( public function run(): void { - // TODO add self-sufficient front controller handling + $userInput = new HttpInput(); + if (!$this->isRunning()) { + $scene = $this->getScene(self::SCENE_AUTH); + } elseif ($this->getCurrentPlayer() === null) { + $scene = $this->getScene(self::SCENE_CHARACTER_CREATION); + } elseif (isset($_GET['scene']) && is_string($_GET['scene'])) { + $scene = $this->getScene($_GET['scene']); + } else { + $scene = $this->getScene(self::SCENE_MAIN); + } + + echo $scene->run($userInput); } public function getCurrentPlayer(): ?Player @@ -34,14 +73,18 @@ public function getCurrentPlayer(): ?Player /** * Basically pretends to say that client is not running unless user is signed in * - * @todo requires rethinking - * * @return bool + * @todo requires rethinking */ - public function isRunning(): bool + private function isRunning(): bool { $currentUser = $this->authService->getCurrentUser(); return $currentUser !== null; } + + private function getScene(string $scene): Scene\SceneInterface + { + return \DI::getService(self::CONTROLLERS[$scene]); + } } diff --git a/www/launcher.php b/www/launcher.php index 91779f9..39259c7 100644 --- a/www/launcher.php +++ b/www/launcher.php @@ -1,75 +1,10 @@ getScene()->run($userInput); - } - - private function getScene(): Scene\SceneInterface - { - switch ($this) { - case self::MAIN: - return DI::getService(Scene\MainMenu::class); - case self::DUNGEONS: - return DI::getService(Scene\Dungeons::class); - case self::LIBRARY: - return DI::getService(Scene\Library::class); - case self::HIGH_SCORE: - return DI::getService(Scene\Highscore::class); - case self::INVENTORY: - return DI::getService(Scene\Inventory::class); - case self::SHOPS: - return DI::getService(Scene\Shops::class); - case self::SHOP: - return DI::getService(Scene\Shop::class); - case self::CHARACTER_CREATION: - return DI::getService(Scene\CharacterCreation::class); - case self::ACTIVITY_LUMBERJACK: - return DI::getService(Scene\Activity::class); - default: - return DI::getService(Scene\Auth::class); - } - } -} - session_start(); $gameClient = DI::getService(\Game\Client::class); - -if (!$gameClient->isRunning()) { - $navigation = Navigation::AUTH; -} elseif ($gameClient->getCurrentPlayer() === null) { - $navigation = Navigation::CHARACTER_CREATION; -} else if (isset($_GET['scene']) && is_string($_GET['scene'])) { - $navigation = Navigation::tryFrom($_GET['scene']); - if ($navigation === null) { - exit('Unknown scene'); - } -} else { - $navigation = Navigation::MAIN; -} - -$navigation->load(); +$gameClient->run(); From 84b3212ae0ce5b3ae72d02ca2a5a3168e824b767 Mon Sep 17 00:00:00 2001 From: Temirkhan Date: Tue, 5 Sep 2023 19:53:08 +0200 Subject: [PATCH 21/29] Fixed bug when player could go to dungeon while performing activity --- src/Player/Player.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Player/Player.php b/src/Player/Player.php index 1829679..031bb44 100644 --- a/src/Player/Player.php +++ b/src/Player/Player.php @@ -68,6 +68,11 @@ public function enterDungeon(Dungeon $dungeon): null|Error return new Error('You are already hunting in a dungeon'); } + $currentActivity = $this->getCurrentActivity(); + if ($currentActivity !== null) { + return new Error(sprintf('Can not go to the dungeon while performing "%s" activity', $currentActivity->getName())); + } + $now = DbTimeFactory::createCurrentTimestamp(); $this->connection->execute('INSERT INTO hunting (character_id, dungeon_id, checked_at, last_reward_at) VALUES (?, ?, ?, ?)', [$this->id, $dungeon->id, $now, $now]); $this->connection->execute('UPDATE players SET in_combat = 1 WHERE id = ?', [$this->id]); From 954b18c50faaea8feb956d8bfac325c722ecbc99 Mon Sep 17 00:00:00 2001 From: Temirkhan Date: Tue, 5 Sep 2023 20:09:52 +0200 Subject: [PATCH 22/29] A bit dimmer interface colors --- src/UI/Template/minimalistic.template.twig | 4 +- www/style.css | 197 +++++++++++---------- 2 files changed, 106 insertions(+), 95 deletions(-) diff --git a/src/UI/Template/minimalistic.template.twig b/src/UI/Template/minimalistic.template.twig index 4457887..7328a9f 100644 --- a/src/UI/Template/minimalistic.template.twig +++ b/src/UI/Template/minimalistic.template.twig @@ -15,8 +15,8 @@ {% block head %} {% endblock %} - -
    • -
  • -
    - 
    Abilities
    -
    - - {% if player.woodcutting > 0 %}Lumberjack: {{ player.woodcutting }}
    {% endif %} - {% if player.mining > 0 %}Miner: {{ player.mining }}
    {% endif %} - {% if player.gathering > 0 %}Gatherer: {{ player.gathering }}
    {% endif %} - {% if player.harvesting > 0 %}Farmer: {{ player.harvesting }}
    {% endif %} - {% if player.blacksmith > 0 %}Craft: {{ player.blacksmith }}
    {% endif %} - {% if player.alchemy > 0 %}Alchemist: {{ player.alchemy }}
    {% endif %} -     - 
  • Bank
    diff --git a/src/UI/Template/component/player-quick-actions.twig b/src/UI/Template/component/player-quick-actions.twig new file mode 100644 index 0000000..ccb1d4a --- /dev/null +++ b/src/UI/Template/component/player-quick-actions.twig @@ -0,0 +1,17 @@ +
    + +
    +
    diff --git a/src/UI/Template/component/player-status.twig b/src/UI/Template/component/player-status.twig deleted file mode 100644 index c1c7a6e..0000000 --- a/src/UI/Template/component/player-status.twig +++ /dev/null @@ -1,27 +0,0 @@ -
    -
      -
    • -
      - 
      Status
      -
      - {% if player.isFighting %} -

      Combat:

      -

      Dungeon: {{ huntingDungeon.name }}

      - {% else %} -

      Combat:

      -

      Dungeon: In protective zone

      - {% endif %} -
      • -
    • - Inventory -
      • - -
    • - Shops -
      • -
    • Mining
      • -
    • Gathering
      • -
    • Harvesting
      • -
    -
    -
    diff --git a/src/UI/Template/minimalistic.template.twig b/src/UI/Template/minimalistic.template.twig index 167dfe8..48dbfec 100644 --- a/src/UI/Template/minimalistic.template.twig +++ b/src/UI/Template/minimalistic.template.twig @@ -80,7 +80,7 @@
    - {% include 'component/player-status.twig' %} + {% include 'component/player-quick-actions.twig' %} From 82b0b5aa4c0719cd8a1f690aadaf6f8f14b7343e Mon Sep 17 00:00:00 2001 From: Temirkhan Date: Tue, 5 Sep 2023 22:00:22 +0200 Subject: [PATCH 27/29] Introduced player states --- src/Player/Player.php | 51 +++++++++++++++++----- src/Server.php | 10 ++--- src/UI/Template/component/player-info.twig | 4 +- updates/20230905192025.sql | 6 +++ 4 files changed, 53 insertions(+), 18 deletions(-) create mode 100644 updates/20230905192025.sql diff --git a/src/Player/Player.php b/src/Player/Player.php index 031bb44..88fc647 100644 --- a/src/Player/Player.php +++ b/src/Player/Player.php @@ -18,6 +18,10 @@ class Player { + public const STATE_IDLE = 0; + public const STATE_IN_COMBAT = 1; + public const STATE_PERFORMING_ACTIVITY = 2; + public const MAX_POSSIBLE_STAMINA = 100; private readonly PlayerLog $logger; @@ -34,12 +38,12 @@ public function __construct( public function isFighting(): bool { - return 1 === (int) $this->getProperty('in_combat'); + return $this->isInState(self::STATE_IN_COMBAT); } public function isInProtectiveZone(): bool { - return !$this->isFighting(); + return $this->isInState(self::STATE_IDLE); } public function isInDungeon(Dungeon $dungeon): bool @@ -68,14 +72,13 @@ public function enterDungeon(Dungeon $dungeon): null|Error return new Error('You are already hunting in a dungeon'); } - $currentActivity = $this->getCurrentActivity(); - if ($currentActivity !== null) { - return new Error(sprintf('Can not go to the dungeon while performing "%s" activity', $currentActivity->getName())); + if (!$this->isInState(self::STATE_IDLE)) { + return new Error('Can not go to the dungeon if not idle'); } $now = DbTimeFactory::createCurrentTimestamp(); $this->connection->execute('INSERT INTO hunting (character_id, dungeon_id, checked_at, last_reward_at) VALUES (?, ?, ?, ?)', [$this->id, $dungeon->id, $now, $now]); - $this->connection->execute('UPDATE players SET in_combat = 1 WHERE id = ?', [$this->id]); + $this->moveToState(self::STATE_IN_COMBAT); return null; } @@ -101,8 +104,12 @@ public function measureDifficulty(Dungeon $dungeon): string public function leaveDungeon(): void { + if (!$this->isInState(self::STATE_IN_COMBAT)) { + return; + } + $this->connection->execute('DELETE from hunting WHERE character_id = ?', [$this->id]); - $this->connection->execute('UPDATE players SET in_combat = 0 WHERE id = ?', [$this->id]); + $this->moveToState(self::STATE_IDLE); } public function getId(): int @@ -173,14 +180,10 @@ public function getActivitySkillLevel(string $activity): int public function startActivity(ActivityInterface $activity): ?Error { - if (!$this->isInProtectiveZone()) { + if (!$this->isInState(self::STATE_IDLE)) { return new Error('Can not go for activities when not in protective zone'); } - if ($this->getCurrentActivity() !== null) { - return new Error('Character is busy with another activity'); - } - $now = DbTimeFactory::createCurrentTimestamp(); $this->connection->execute(' @@ -188,6 +191,8 @@ public function startActivity(ActivityInterface $activity): ?Error VALUE (?, ?, ?, ?, ?, ?) ', [$this->id, $activity->getName(), $activity->getOption(), $now, $now, $now]); + $this->moveToState(self::STATE_PERFORMING_ACTIVITY); + return null; } @@ -208,7 +213,12 @@ public function getCurrentActivity(): ?CharacterActivity public function stopActivity(): void { + if (!$this->isInState(self::STATE_PERFORMING_ACTIVITY)) { + return; + } + $this->connection->execute('DELETE FROM activity WHERE character_id=' . $this->id); + $this->moveToState(self::STATE_IDLE); } public function getLevel(): int @@ -428,6 +438,23 @@ private function getProperty(string $property): string|int|float|null return $result[$property]; } + private function isInState(int $state): bool + { + return (int) $this->getProperty('state') === $state; + } + + private function moveToState(int $state): void + { + // Dummy state-machine. Check transitions before applying new state + if ($state === self::STATE_IN_COMBAT || $state === self::STATE_PERFORMING_ACTIVITY) { + if (!$this->isInState(self::STATE_IDLE)) { + throw new \DomainException('Impossible transition'); + } + } + + $this->connection->execute('UPDATE players SET state = ? WHERE id = ?', [$state, $this->id]); + } + private function getItemQuantity(int $itemId): int { $result = $this->connection->fetchRow("SELECT amount FROM inventory WHERE item_id = $itemId AND character_id = ?", [$this->id]); diff --git a/src/Server.php b/src/Server.php index bcb1006..7a77778 100644 --- a/src/Server.php +++ b/src/Server.php @@ -73,12 +73,12 @@ private function regenerateStamina(): void $this->logs[] = sprintf('%d', min($minutesPassed, Player::MAX_POSSIBLE_STAMINA)); - // TODO Introduce playerState instead of in_combat $this->db->execute( - 'UPDATE players p LEFT JOIN activity a ON a.character_id=p.id SET stamina = LEAST(stamina + ?, ?) WHERE in_combat = 0 AND stamina < ? AND a.id IS NULL', + 'UPDATE players SET stamina = LEAST(stamina + ?, ?) WHERE state = ? AND stamina < ?', [ $minutesPassed, Player::MAX_POSSIBLE_STAMINA, + Player::STATE_IDLE, Player::MAX_POSSIBLE_STAMINA, ] ); @@ -87,7 +87,7 @@ private function regenerateStamina(): void private function stopExhaustedCharacters(): void { - $labourers = $this->db->fetchRows('SELECT p.id, p.name, in_combat, stamina FROM players p INNER JOIN activity a ON p.id = a.character_id WHERE stamina <= 0 AND in_combat = 0'); + $labourers = $this->db->fetchRows('SELECT id, name FROM players WHERE stamina <= 0 AND state = ' . Player::STATE_PERFORMING_ACTIVITY); foreach ($labourers as $row) { $playerNameWithNoStamina = $row['name']; @@ -95,7 +95,7 @@ private function stopExhaustedCharacters(): void $this->logs[] = sprintf('', $playerNameWithNoStamina); } - $hunters = $this->db->fetchRows('SELECT id, name, in_combat, stamina FROM players WHERE stamina <= 0 AND in_combat = 1'); + $hunters = $this->db->fetchRows('SELECT id, name, stamina FROM players WHERE stamina <= 0 AND state = ' . Player::STATE_IN_COMBAT); foreach ($hunters as $row) { $playerNameWithNoStamina = $row['name']; @@ -103,7 +103,7 @@ private function stopExhaustedCharacters(): void $this->logs[] = sprintf('', $playerNameWithNoStamina); } - $this->db->execute('UPDATE players SET in_combat = 0, stamina = 0 WHERE stamina <= 0 AND in_combat = 1'); + $this->db->execute('UPDATE players SET state = ?, stamina = 0 WHERE stamina <= 0 AND state IN (?, ?)', [Player::STATE_IDLE, Player::STATE_IN_COMBAT, Player::STATE_PERFORMING_ACTIVITY]); } private function giveRewards(): void diff --git a/src/UI/Template/component/player-info.twig b/src/UI/Template/component/player-info.twig index 1ade254..6ad9e9e 100644 --- a/src/UI/Template/component/player-info.twig +++ b/src/UI/Template/component/player-info.twig @@ -14,8 +14,10 @@ {% if player.isFighting %}

    Status:

    + {% elseif player.getCurrentActivity %} +

    Status:

    {% else %} -

    Status:

    +

    Status:

    {% endif %}
    diff --git a/updates/20230905192025.sql b/updates/20230905192025.sql new file mode 100644 index 0000000..db2adaf --- /dev/null +++ b/updates/20230905192025.sql @@ -0,0 +1,6 @@ +ALTER TABLE players + ADD state TINYINT(2) UNSIGNED NOT NULL DEFAULT 0 AFTER id; + +UPDATE players SET state=1 WHERE in_combat=1; + +ALTER TABLE players DROP in_combat; From 737abda40ac4c55e6d3a8b8b73bb51a1019be931 Mon Sep 17 00:00:00 2001 From: Temirkhan Date: Tue, 5 Sep 2023 22:07:58 +0200 Subject: [PATCH 28/29] Added perks details output --- src/UI/Template/character-creation.html.twig | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/UI/Template/character-creation.html.twig b/src/UI/Template/character-creation.html.twig index ee2ccc7..0be9ccf 100644 --- a/src/UI/Template/character-creation.html.twig +++ b/src/UI/Template/character-creation.html.twig @@ -54,7 +54,12 @@

    Perks

    -

    Not implemented yet

    + {% if race.perks.canCraft %}

    Can craft items

    {% endif %} + {% if race.perks.canMine %}

    Can mine ore

    {% endif %} + {% if race.perks.canGather %}

    Can gather herbs

    {% endif %} + {% if race.perks.canWoodcut %}

    Can chop wood

    {% endif %} + {% if race.perks.canHarvest %}

    Can grow crops and vegetables

    {% endif %} + {% if race.perks.canBrew %}

    Can brew potions and beverages

    {% endif %}
    {% endfor %} From f36fbae702cebf924318045db87be68937fd20fa Mon Sep 17 00:00:00 2001 From: Temirkhan Date: Tue, 5 Sep 2023 22:36:41 +0200 Subject: [PATCH 29/29] Fixed player log reading --- src/Player/PlayerLog.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Player/PlayerLog.php b/src/Player/PlayerLog.php index cb0d39e..59816c6 100644 --- a/src/Player/PlayerLog.php +++ b/src/Player/PlayerLog.php @@ -23,7 +23,7 @@ public function add(int $characterId, string $log): void public function readLogs(int $characterId, int $amount): iterable { $logs = $this->db - ->fetchRows('SELECT message FROM log WHERE id=? ORDER BY tid DESC LIMIT ?', [$characterId, $amount]); + ->fetchRows('SELECT message FROM log WHERE character_id=? ORDER BY tid DESC LIMIT ?', [$characterId, $amount]); foreach ($logs as $log) { yield $log['message'];