Зимние правки. MVC/

Signed-off-by: lopar <lopar.4ever@gmail.com>
This commit is contained in:
lopar
2022-08-09 22:57:43 +03:00
parent 0f62ee20e7
commit b9b4c01cf0
104 changed files with 2254 additions and 2086 deletions
+7 -9
View File
@@ -3,6 +3,7 @@
namespace Battles;
use Battles\Database\Db;
use Battles\Models\User\Effects;
class Clan
{
@@ -34,14 +35,13 @@ class Clan
if (User::getInstance($login)->getLevel() < 1) {
$error .= '<br>Персонаж 0 уровня не может быть принят!';
}
if (User::getInstance()->getMoney() < GameConfigs::CLAN['add_member_cost']) {
if (!User::getInstance()->money()->spend(GameConfigs::CLAN['add_member_cost'])) {
$error .= '<br>Недостаточно денег!';
}
if ($error) {
return $error;
}
User::getInstance()->setMoney(User::getInstance()->getMoney() - GameConfigs::CLAN['add_member_cost']);
User::getInstance()->saveMoney();
User::getInstance($login)->setClan(User::getInstance()->getClan());
return "Персонаж «{$login}» успешно принят в клан.";
}
@@ -49,20 +49,18 @@ class Clan
public function removeMember(string $login): string
{
$error = null;
if (User::getInstance()->getMoney() < GameConfigs::CLAN['remove_member_cost']) {
$error .= '<br>Недостаточно денег!';
}
if (User::getInstance($login)->getId() === User::getInstance()->getId()) {
$error .= '<br>Себя выгонять нельзя!';
}
if (User::getInstance($login)->getClan() !== User::getInstance()->getClan()) {
$error .= '<br>Персонаж не состоит в этом клане!';
}
if (!User::getInstance()->money()->spend(GameConfigs::CLAN['remove_member_cost'])) {
$error .= '<br>Недостаточно денег!';
}
if ($error) {
return $error;
}
User::getInstance()->setMoney(User::getInstance()->getMoney() - GameConfigs::CLAN['remove_member_cost']);
User::getInstance()->saveMoney();
User::getInstance($login)->setClan(null);
return "Персонаж «{$login}» покинул клан.";
}
@@ -100,7 +98,7 @@ class Clan
private function getProverka($user_id)
{
return Db::getInstance()->fetchColumn('select count(*) from users_effects where type = 20 and owner_id = ?', $user_id);
return Effects::count($user_id, 20);
}
public function getClanOwnerId(): ?int