From 1b2983d376bda3560491af87b75b02883828c0e5 Mon Sep 17 00:00:00 2001 From: Emagi Date: Sun, 22 Sep 2024 18:07:00 -0400 Subject: [PATCH] ground spawn "max skill increase" rules changed --- source/WorldServer/GroundSpawn.cpp | 5 ++++- source/WorldServer/Rules/Rules.cpp | 3 ++- source/WorldServer/Rules/Rules.h | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/source/WorldServer/GroundSpawn.cpp b/source/WorldServer/GroundSpawn.cpp index 58dd626..88be140 100644 --- a/source/WorldServer/GroundSpawn.cpp +++ b/source/WorldServer/GroundSpawn.cpp @@ -138,7 +138,10 @@ void GroundSpawn::ProcessHarvest(Client* client) { int16 totalSkill = skill->current_val; int32 skillID = master_item_list.GetItemStatIDByName(collection_skill); - int16 max_skill_req_groundspawn = 10; + int16 max_skill_req_groundspawn = rule_manager.GetGlobalRule(R_Player, MinSkillMultiplierValue)->GetInt16(); + if(max_skill_req_groundspawn < 1) // can't be 0 + max_skill_req_groundspawn = 1; + if(skillID != 0xFFFFFFFF) { ((Entity*)client->GetPlayer())->MStats.lock(); diff --git a/source/WorldServer/Rules/Rules.cpp b/source/WorldServer/Rules/Rules.cpp index 066a3c2..9055da9 100644 --- a/source/WorldServer/Rules/Rules.cpp +++ b/source/WorldServer/Rules/Rules.cpp @@ -239,7 +239,8 @@ void RuleManager::Init() RULE_INIT(R_Player, StartPowerLevelMod, "2.1"); RULE_INIT(R_Player, AllowPlayerEquipCombat, "1"); RULE_INIT(R_Player, MaxTargetCommandDistance, "50.0"); // max distance allowed for /target command when target name is not in group - RULE_INIT(R_Player, HarvestSkillUpMultiplier, "1.5"); /* multiplier for node to take the "min skill" max and use a multiplier to offset the max skill allowed to skill up on node. + RULE_INIT(R_Player, MinSkillMultiplierValue, "30"); // min skill we use as a multiplier to note the max skill allowed by the node + RULE_INIT(R_Player, HarvestSkillUpMultiplier, "2.0"); /* multiplier for node to take the "min skill" max and use a multiplier to offset the max skill allowed to skill up on node. ** Eg. 50 min skill on node, 50*1.5=75, no one with higher than 75 skill gets a skill up */ /* PVP */ diff --git a/source/WorldServer/Rules/Rules.h b/source/WorldServer/Rules/Rules.h index 6fc4542..c13cc05 100644 --- a/source/WorldServer/Rules/Rules.h +++ b/source/WorldServer/Rules/Rules.h @@ -99,6 +99,7 @@ enum RuleType { StartPowerLevelMod, AllowPlayerEquipCombat, MaxTargetCommandDistance, + MinSkillMultiplierValue, HarvestSkillUpMultiplier, /* PVP */