diff --git a/app/config/config.local.example.neon b/app/config/config.local.example.neon index 9e0d899..4ff40c6 100644 --- a/app/config/config.local.example.neon +++ b/app/config/config.local.example.neon @@ -15,6 +15,7 @@ parameters: secret: 'secret_key' appUrl: 'https://global-collapse.com' webhookSecret: 'webhook_secret' + devMode: true darknetUpdate: hash: '2Rc9XqqWXa3ur4iiL5IKox782' confirm: 'aRXPKmm1Fgzyy6m4z2LZgii1q' diff --git a/app/config/config.neon b/app/config/config.neon index 5f8b21a..7e17bca 100755 --- a/app/config/config.neon +++ b/app/config/config.neon @@ -51,8 +51,6 @@ services: payment: App\Services\PaymentService(%psp%) nette.latteFactory: setup: - # - addFilter(NULL, 'App\Filter\StaticFilters::common') - # - addFilter('imageGenerator', '@App\Filter\ImageFilter') - addFilter('fromSnake', 'App\Filter\StaticFilters::fromSnake') - addFilter('firstLower', 'App\Filter\StaticFilters::firstLower') - addFilter('time', 'App\Filter\StaticFilters::time') diff --git a/app/model/UserRepository.php b/app/model/UserRepository.php index 6e98719..fecfd09 100755 --- a/app/model/UserRepository.php +++ b/app/model/UserRepository.php @@ -123,7 +123,7 @@ public static function getModifiedDuration($time, int $modifier = 100): int public static function getPremiumDuration($time, int $tier): int { - return self::getModifiedDuration($time, $tier === 3 ? 50 : ($tier === 2 ? 25 : 100)); + return self::getModifiedDuration($time, $tier === 3 ? 50 : 0); } public function findAllActions() @@ -357,6 +357,9 @@ public function addXp(int $id, $xp) { } $player = $this->getUser($id); + if ($player->tier > 1) { + $xp = (int) floor($xp * ($player->tier === 2 ? 1.25 : 1.5)); + } $xpNow = $player->player_stats->xp; $xpMax = $player->player_stats->xp_max; $level = $player->player_stats->level; diff --git a/app/modules/Front/components/Assault/AttackerCard.latte b/app/modules/Front/components/Assault/AttackerCard.latte index 027709d..32817d9 100644 --- a/app/modules/Front/components/Assault/AttackerCard.latte +++ b/app/modules/Front/components/Assault/AttackerCard.latte @@ -28,6 +28,17 @@ small => true, name => 'attackerHp' } +