Shared xp (#25)

* shared xp * restore cap on exp equal to 1/20th of exp needed for next level.
DakkJaniels · Sep 27, 2022 · 94107f5 · 94107f5
1 parent a44d86a
commit 94107f5
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 14 deletions.
diff --git a/Source/monster.cpp b/Source/monster.cpp
@@ -1042,6 +1042,8 @@ void StartMonsterDeath(int i, int pnum, bool sendmsg)
 	auto &monster = Monsters[i];
 	assert(monster.MType != nullptr);
 
+
+
 	if (pnum >= 0)
 		monster.mWhoHit |= 1 << pnum;
 	if (pnum < MAX_PLRS && i >= MAX_PLRS) /// BUGFIX: i >= MAX_PLRS (fixed)

diff --git a/Source/player.cpp b/Source/player.cpp
@@ -2758,14 +2758,14 @@ void AddPlrExperience(int pnum, int lvl, int exp)
 	// Adjust xp based on difference in level between player and monster
 	uint32_t clampedExp = std::max(static_cast<int>(exp * (1 + (lvl - player._pLevel) / 10.0)), 0);
 
-	// Prevent power leveling
-	// if (gbIsMultiplayer) {
-	//	const uint32_t clampedPlayerLevel = clamp(static_cast<int>(player._pLevel), 1, MAXCHARLEVEL);
+	// Prevent power leveling for low level characters
+	 if (gbIsMultiplayer) {
+		const uint32_t clampedPlayerLevel = clamp(static_cast<int>(player._pLevel), 1, MAXCHARLEVEL);
 
-	//	// for low level characters experience gain is capped to 1/20 of current levels xp
-	//	// for high level characters experience gain is capped to 200 * current level - this is a smaller value than 1/20 of the exp needed for the next level after level 5.
-	//	clampedExp = std::min({ clampedExp, /* level 0-5: */ ExpLvlsTbl[clampedPlayerLevel] / 20U, /* level 6-50: */ 200U * clampedPlayerLevel });
-	//}
+		// for low level characters experience gain is capped to 1/20 of current levels xp
+		// REMOVED - for high level characters experience gain is capped to 200 * current level - this is a smaller value than 1/20 of the exp needed for the next level after level 5.
+		clampedExp = std::min({ clampedExp, /* level 0-5: */ ExpLvlsTbl[clampedPlayerLevel] / 20U});
+	}
 
 	constexpr uint32_t MaxExperience = 2000000000U;
 
@@ -2795,19 +2795,29 @@ void AddPlrExperience(int pnum, int lvl, int exp)
 	NetSendCmdParam1(false, CMD_PLRLEVEL, player._pLevel);
 }
 
-void AddPlrMonstExper(int lvl, int exp, char pmask)
+int GetActivePlrsOnLevel()
 {
-	int totplrs = 0;
+	int activePlrs = 0;
 	for (int i = 0; i < MAX_PLRS; i++) {
-		if (((1 << i) & pmask) != 0) {
-			totplrs++;
-		}
+		auto &player = Players[i];
+		if (player.plractive && player.plrlevel == currlevel)
+			activePlrs++;
 	}
+	return activePlrs;
+}
+
+void AddPlrMonstExper(int lvl, int exp, char pmask)
+{
+	int totplrs = GetActivePlrsOnLevel();
+	// for (int i = 0; i < MAX_PLRS; i++) {
+	//	if (((1 << i) & pmask) != 0) {
+	//		totplrs++;
+	//	}
+	// }
 
 	if (totplrs != 0) {
 		int e = exp / totplrs;
-		if ((pmask & (1 << MyPlayerId)) != 0)
-			AddPlrExperience(MyPlayerId, lvl, e);
+		AddPlrExperience(MyPlayerId, lvl, e);
 	}
 }