1 files changed, 72 insertions, 3 deletions

diff --git a/source/Entities/Player.cpp b/source/Entities/Player.cpp
index 2e4199629..a39eda1ba 100644
--- a/source/Entities/Player.cpp
+++ b/source/Entities/Player.cpp
@@ -1,4 +1,4 @@
-
+
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Player.h"
@@ -33,6 +33,7 @@
 
 
 
+
 cPlayer::cPlayer(cClientHandle* a_Client, const AString & a_PlayerName)
 	: super(etPlayer, 0.6, 1.8)
 	, m_GameMode(eGameMode_NotSet)
@@ -65,6 +66,10 @@ cPlayer::cPlayer(cClientHandle* a_Client, const AString & a_PlayerName)
 	, m_EatingFinishTick(-1)
 	, m_IsChargingBow(false)
 	, m_BowCharge(0)
+	, m_XpLevel(0)
+	, m_XpP(0.f)
+	, m_XpTotal(0)
+	, m_XpNextLevelTotal(0)
 {
 	LOGD("Created a player object for \"%s\" @ \"%s\" at %p, ID %d", 
 		a_PlayerName.c_str(), a_Client->GetIPString().c_str(),
@@ -260,6 +265,67 @@ void cPlayer::Tick(float a_Dt, cChunk & a_Chunk)
 
 
 
+bool cPlayer::SetExperience(int a_XpTotal)
+{
+	if(!(a_XpTotal >= 0) || (a_XpTotal > (INT_MAX - m_XpTotal)))
+	{
+		LOGWARNING("Tried to update experiece with an invalid Xp value: %d", a_XpTotal);
+		return false; //oops, they gave us a dodgey number
+	}
+
+
+	m_XpTotal = a_XpTotal;
+
+	//now calculate XpP and XpLevel
+	//First Calc current level using quadratic eqn
+	m_XpLevel = CalcLevelFromXp(m_XpTotal);
+
+	//calculate total Xp for next level
+	m_XpNextLevelTotal = XpAtLevel(m_XpLevel+1);
+
+	//calulate Xp Percentage
+	m_XpP = (float)m_XpLevel / (float)m_XpNextLevelTotal;
+
+	return true;//aka happy :)
+}
+
+
+
+
+
+bool cPlayer::AddExperience(int a_Xp_delta)
+{
+	if(a_Xp_delta > MAX_EXPERIENCE_ORB_SIZE || a_Xp_delta < 0)
+	{
+		//value was too large or negative, abort and report
+		LOGWARNING("Attempt was made to increment Xp by %d, max is %d and must be positive",
+			a_Xp_delta, MAX_EXPERIENCE_ORB_SIZE);
+		return false;
+	}
+	
+	LOGD("Player \"%s\" earnt %d experience", m_PlayerName.c_str(), a_Xp_delta);
+
+	//update Xp, note there is no min
+	m_XpTotal += a_Xp_delta;
+
+	//update Xp percentage
+	if(m_XpTotal >= m_XpNextLevelTotal)
+	{
+		//oh actually, update their level first
+
+		m_XpLevel++;
+		m_XpNextLevelTotal = XpAtLevel(m_XpLevel+1);
+	}
+
+	m_XpP = (float)m_XpLevel / (float)m_XpNextLevelTotal;
+
+	return true;
+}
+
+
+
+
+
 void cPlayer::StartChargingBow(void)
 {
 	LOGD("Player \"%s\" started charging their bow", m_PlayerName.c_str());
@@ -1268,7 +1334,7 @@ bool cPlayer::LoadFromDisk()
 	cFile f;
 	if (!f.Open(SourceFile, cFile::fmRead))
 	{
-		// This is a new player whom we haven't seen yet, bail out, let them have the defaults
+		// This is a new player whom we haven't seen yet, bail, let them have the defaults
 		return false;
 	}
 
@@ -1278,7 +1344,7 @@ bool cPlayer::LoadFromDisk()
 		LOGWARNING("Cannot read player data from file \"%s\"", SourceFile.c_str()); 
 		return false;
 	}
-	f.Close();
+	f.Close(); //cool kids play nice
 
 	Json::Value root;
 	Json::Reader reader;
@@ -1314,6 +1380,8 @@ bool cPlayer::LoadFromDisk()
 	m_FoodTickTimer       = root.get("foodTickTimer",  0).asInt();
 	m_FoodExhaustionLevel = root.get("foodExhaustion", 0).asDouble();
 
+	SetExperience(root.get("experience", 0).asInt());
+
 	m_GameMode = (eGameMode) root.get("gamemode", eGameMode_NotSet).asInt();
 	
 	m_Inventory.LoadFromJson(root["inventory"]);
@@ -1354,6 +1422,7 @@ bool cPlayer::SaveToDisk()
 	root["rotation"]       = JSON_PlayerRotation;
 	root["inventory"]      = JSON_Inventory;
 	root["health"]         = m_Health;
+	root["experience"]     = m_XpTotal;
 	root["air"]            = m_AirLevel;
 	root["food"]           = m_FoodLevel;
 	root["foodSaturation"] = m_FoodSaturationLevel;