From 71461d631301f83c7f63b99fb8b87c6cae1a3955 Mon Sep 17 00:00:00 2001
From: Tinydetoon <xor72000@yahoo.fr>
Date: Mon, 21 Aug 2017 19:09:24 +0200
Subject: [PATCH 1/3] Issue #156 : Profile XP Counter

---
 system/views/components/player/playerRoleplayProfil.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/system/views/components/player/playerRoleplayProfil.php b/system/views/components/player/playerRoleplayProfil.php
index af392e130..0a566355d 100755
--- a/system/views/components/player/playerRoleplayProfil.php
+++ b/system/views/components/player/playerRoleplayProfil.php
@@ -40,14 +40,9 @@
 			$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>';
-
 			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="label">Expérience / Expérience nécessaire pour le prochain niveau</span>';
+				echo '<span class="value">'. Format::numberFormat($exp) . ' / ' . Format::numberFormat($nlv) . '</span>';
 				echo '<span class="progress-bar">';
 					echo '<span style="width:' . $prc . '%;" class="content"></span>';
 				echo '</span>';

From d9beb001b1c8953b13d9a0bd8ee28aed36337b09 Mon Sep 17 00:00:00 2001
From: Tinydetoon <xor72000@yahoo.fr>
Date: Thu, 24 Aug 2017 00:30:24 +0200
Subject: [PATCH 2/3] Fix fleet moving in mess bug

---
 system/Modules/Ares/Manager/CommanderManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);

From f76cf29b0527eae37436a4dc0d759247ab16b8ae Mon Sep 17 00:00:00 2001
From: Tinydetoon <xor72000@yahoo.fr>
Date: Tue, 5 Sep 2017 08:43:52 +0200
Subject: [PATCH 3/3] Issue #156 : Profile XP Counter- Fix progress Bar

---
 .../views/components/player/playerRoleplayProfil.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/system/views/components/player/playerRoleplayProfil.php b/system/views/components/player/playerRoleplayProfil.php
index 0a566355d..a1475c07a 100755
--- a/system/views/components/player/playerRoleplayProfil.php
+++ b/system/views/components/player/playerRoleplayProfil.php
@@ -36,14 +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);
+			$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 / Expérience nécessaire pour le prochain niveau</span>';
-				echo '<span class="value">'. Format::numberFormat($exp) . ' / ' . 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>';