diff --git a/system/Modules/Ares/Manager/CommanderManager.php b/system/Modules/Ares/Manager/CommanderManager.php index 9bf15b8e1..b8c01a66c 100644 --- a/system/Modules/Ares/Manager/CommanderManager.php +++ b/system/Modules/Ares/Manager/CommanderManager.php @@ -480,7 +480,7 @@ public function getEventInfo(Commander $commander) { public function uChangeBase($commanderId) { $commander = $this->get($commanderId); $place = $this->placeManager->get($commander->rDestinationPlace); - $place->commanders = $this->getBaseCommanders($place->id); + $place->commanders = $this->getBaseCommanders($place->id,[Commander::AFFECTED,Commander::MOVING]); $commanderPlace = $this->placeManager->get($commander->rBase); $player = $this->playerManager->get($commander->rPlayer); $playerBonus = $this->playerBonusManager->getBonusByPlayer($player); diff --git a/system/views/components/player/playerRoleplayProfil.php b/system/views/components/player/playerRoleplayProfil.php index af392e130..a1475c07a 100755 --- a/system/views/components/player/playerRoleplayProfil.php +++ b/system/views/components/player/playerRoleplayProfil.php @@ -36,19 +36,14 @@ $baseLevelPlayer = $this->getContainer()->getParameter('zeus.player.base_level'); $exp = $player_playerRoleplayProfil->getExperience(); - $nlv = $baseLevelPlayer * (pow(2, ($player_playerRoleplayProfil->getLevel() - 1))); - $clv = $baseLevelPlayer * (pow(2, ($player_playerRoleplayProfil->getLevel() - 2))); - $prc = ((($exp - $clv) * 200) / $nlv); - - echo '
'; - echo 'expérience'; - echo '' . Format::numberFormat($exp) . ''; - echo '
'; + $nextlvl = $baseLevelPlayer * (pow(2, ($player_playerRoleplayProfil->getLevel() - 1))); + $currentlvl = $baseLevelPlayer * (pow(2, ($player_playerRoleplayProfil->getLevel() - 2))); + $prc = round(($exp -$currentlvl) / ($nextlvl -$currentlvl) * 100) ; echo '
'; - echo 'expérience nécessaire pour le prochain niveau'; - echo '' . Format::numberFormat($nlv) . ''; - echo ''; + echo 'Expérience'; + echo ''. Format::numberFormat($exp).' / ' . Format::numberFormat($nextlvl) . ''; + echo ''; echo ''; echo ''; echo '
';