Merge pull request #167 from tinydetoon/dev

Issue #156 : Profile XP Counter
rtfmcorp · Oct 5, 2017 · b762290 · b762290
2 parents 5c5e755 + f76cf29
commit b762290
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git 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
@@ -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 '<div class="number-box">';
-				echo '<span class="label">expérience</span>';
-				echo '<span class="value">' . Format::numberFormat($exp) . '</span>';
-			echo '</div>';
+			$nextlvl = $baseLevelPlayer * (pow(2, ($player_playerRoleplayProfil->getLevel() - 1)));
+			$currentlvl = $baseLevelPlayer * (pow(2, ($player_playerRoleplayProfil->getLevel() - 2)));
+			$prc = round(($exp -$currentlvl) / ($nextlvl -$currentlvl) * 100)  ;
 
 			echo '<div class="number-box grey">';
-				echo '<span class="label">expérience nécessaire pour le prochain niveau</span>';
-				echo '<span class="value">' . Format::numberFormat($nlv) . '</span>';
-				echo '<span class="progress-bar">';
+				echo '<span class="label">Expérience</span>';
+				echo '<span class="value">'. Format::numberFormat($exp).' / ' . Format::numberFormat($nextlvl) . '</span>';
+				echo '<span title="' . $prc . ' %" class="progress-bar hb bl">';
 					echo '<span style="width:' . $prc . '%;" class="content"></span>';
 				echo '</span>';
 			echo '</div>';