From d2d44cd4fa95a125a774d88771fe78b48a6a9457 Mon Sep 17 00:00:00 2001
From: Luan Santos <git@luan.sh>
Date: Wed, 17 Apr 2024 13:38:22 -0700
Subject: [PATCH] feat: configurable party share range (#2539)

Pretty small yet useful configuration feature to allow one to easily change party share ranges.

The configuration is a float, default to 1.5 which is the same as cipbia.
---
 config.lua.dist                          | 2 ++
 src/config/config_enums.hpp              | 1 +
 src/config/configmanager.cpp             | 1 +
 src/creatures/players/grouping/party.cpp | 9 ++++++---
 src/creatures/players/grouping/party.hpp | 1 +
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/config.lua.dist b/config.lua.dist
index a5bb3d73ca5..97dc347c8ee 100644
--- a/config.lua.dist
+++ b/config.lua.dist
@@ -212,6 +212,8 @@ wheelAtelierRevealGreaterCost = 6000000
 familiarTime = 30
 
 partyAutoShareExperience = true
+-- partyShareRangeMultiplier: the range of the party share experience, default 3/2 (1.5)
+partyShareRangeMultiplier = 1.5
 partyShareLootBoosts = false
 partyShareLootBoostsDimishingFactor = 0.7
 
diff --git a/src/config/config_enums.hpp b/src/config/config_enums.hpp
index b9b857f435c..dc3271daaf9 100644
--- a/src/config/config_enums.hpp
+++ b/src/config/config_enums.hpp
@@ -178,6 +178,7 @@ enum ConfigKey_t : uint16_t {
 	OWNER_NAME,
 	PARALLELISM,
 	PARTY_AUTO_SHARE_EXPERIENCE,
+	PARTY_SHARE_RANGE_MULTIPLIER,
 	PARTY_LIST_MAX_DISTANCE,
 	PARTY_SHARE_LOOT_BOOSTS_DIMINISHING_FACTOR,
 	PARTY_SHARE_LOOT_BOOSTS,
diff --git a/src/config/configmanager.cpp b/src/config/configmanager.cpp
index c1702672e71..ac78a2bbcfb 100644
--- a/src/config/configmanager.cpp
+++ b/src/config/configmanager.cpp
@@ -317,6 +317,7 @@ bool ConfigManager::load() {
 	loadIntConfig(L, STAMINA_PZ_GAIN, "staminaPzGain", 1);
 	loadIntConfig(L, STAMINA_TRAINER_DELAY, "staminaTrainerDelay", 5);
 	loadIntConfig(L, STAMINA_TRAINER_GAIN, "staminaTrainerGain", 1);
+	loadFloatConfig(L, PARTY_SHARE_RANGE_MULTIPLIER, "partyShareRangeMultiplier", 1.5f);
 	loadIntConfig(L, START_STREAK_LEVEL, "startStreakLevel", 0);
 	loadIntConfig(L, STATUSQUERY_TIMEOUT, "statusTimeout", 5000);
 	loadIntConfig(L, STORE_COIN_PACKET, "coinPacketSize", 25);
diff --git a/src/creatures/players/grouping/party.cpp b/src/creatures/players/grouping/party.cpp
index 880fc77594f..c7d6fd48363 100644
--- a/src/creatures/players/grouping/party.cpp
+++ b/src/creatures/players/grouping/party.cpp
@@ -491,6 +491,10 @@ SharedExpStatus_t Party::getMemberSharedExperienceStatus(std::shared_ptr<Player>
 	return SHAREDEXP_OK;
 }
 
+float Party::shareRangeMultiplier() const {
+	return g_configManager().getFloat(PARTY_SHARE_RANGE_MULTIPLIER, __FUNCTION__);
+}
+
 uint32_t Party::getHighestLevel() {
 	auto leader = getLeader();
 	if (!leader) {
@@ -507,7 +511,7 @@ uint32_t Party::getHighestLevel() {
 }
 
 uint32_t Party::getMinLevel() {
-	return static_cast<uint32_t>(std::ceil((static_cast<float>(getHighestLevel()) * 2) / 3));
+	return static_cast<uint32_t>(std::ceil(static_cast<float>(getHighestLevel()) / shareRangeMultiplier()));
 }
 
 uint32_t Party::getLowestLevel() {
@@ -525,7 +529,7 @@ uint32_t Party::getLowestLevel() {
 }
 
 uint32_t Party::getMaxLevel() {
-	return static_cast<uint32_t>(std::floor((static_cast<float>(getLowestLevel()) * 3) / 2));
+	return static_cast<uint32_t>(std::floor(static_cast<float>(getLowestLevel()) * shareRangeMultiplier()));
 }
 
 bool Party::isPlayerActive(std::shared_ptr<Player> player) {
@@ -533,7 +537,6 @@ bool Party::isPlayerActive(std::shared_ptr<Player> player) {
 	if (it == ticksMap.end()) {
 		return false;
 	}
-
 	uint64_t timeDiff = OTSYS_TIME() - it->second;
 	return timeDiff <= 2 * 60 * 1000;
 }
diff --git a/src/creatures/players/grouping/party.hpp b/src/creatures/players/grouping/party.hpp
index a356d1a032b..5da0f4e0647 100644
--- a/src/creatures/players/grouping/party.hpp
+++ b/src/creatures/players/grouping/party.hpp
@@ -133,6 +133,7 @@ class Party : public SharedObject {
 	uint32_t getLowestLevel();
 	uint32_t getMinLevel();
 	uint32_t getMaxLevel();
+	float shareRangeMultiplier() const;
 
 	std::map<uint32_t, int64_t> ticksMap;