From 98829f3d46ed5e89991b408ee1a436ecddbdb141 Mon Sep 17 00:00:00 2001 From: Revision Date: Wed, 16 Mar 2022 01:51:11 +0100 Subject: [PATCH] Float Fixed some issues I created by switching certain features to float. I did forget a few things. --- conf/mod_weekendbonus.conf.dist | 6 +++--- src/WeekendBonus.cpp | 32 ++++++++++++++++---------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/conf/mod_weekendbonus.conf.dist b/conf/mod_weekendbonus.conf.dist index 63a717e..f9dc787 100644 --- a/conf/mod_weekendbonus.conf.dist +++ b/conf/mod_weekendbonus.conf.dist @@ -1,16 +1,16 @@ [worldserver] # Multiplier for experience gains on weekends -WeekendBonus.Multiplier.Experience = 2 +WeekendBonus.Multiplier.Experience = 2.0 # Multiplier for money looted and rewarded from quests on weekends -WeekendBonus.Multiplier.Money = 2 +WeekendBonus.Multiplier.Money = 2.0 # Multiplier for profession skill ups on weekends WeekendBonus.Multiplier.Professions = 2 # Multiplier for reputation gains on weekends -WeekendBonus.Multiplier.Reputation = 2 +WeekendBonus.Multiplier.Reputation = 2.0 # Multiplier for weapons and defense skill ups on weekends WeekendBonus.Multiplier.Proficiencies = 2 diff --git a/src/WeekendBonus.cpp b/src/WeekendBonus.cpp index 01cc991..f87d943 100644 --- a/src/WeekendBonus.cpp +++ b/src/WeekendBonus.cpp @@ -56,11 +56,11 @@ class WeekendBonusWorld : WorldScript rateProficienciesWeapons = sWorld->getIntConfig(CONFIG_SKILL_GAIN_WEAPON); } - multiplierExperience = sConfigMgr->GetOption("WeekendBonus.Multiplier.Experience", 2.0f); - multiplierMoney = sConfigMgr->GetOption("WeekendBonus.Multiplier.Money", 2.0f); - multiplierProfessions = sConfigMgr->GetOption("WeekendBonus.Multiplier.Professions", 2.0f); - multiplierReputation = sConfigMgr->GetOption("WeekendBonus.Multiplier.Reputation", 2.0f); - multiplierProficiencies = sConfigMgr->GetOption("WeekendBonus.Multiplier.Proficiencies", 2.0f); + multiplierExperience = sConfigMgr->GetOption("WeekendBonus.Multiplier.Experience", 2.0f); + multiplierMoney = sConfigMgr->GetOption("WeekendBonus.Multiplier.Money", 2.0f); + multiplierProfessions = sConfigMgr->GetOption("WeekendBonus.Multiplier.Professions", 2); + multiplierReputation = sConfigMgr->GetOption("WeekendBonus.Multiplier.Reputation", 2.0f); + multiplierProficiencies = sConfigMgr->GetOption("WeekendBonus.Multiplier.Proficiencies", 2); if (reload) { @@ -99,23 +99,23 @@ class WeekendBonusWorld : WorldScript } private: - uint32 rateExperienceKill; - uint32 rateExperienceBgKill[6]; - uint32 rateExperienceQuest; - uint32 rateExperienceQuestDf; - uint32 rateExperienceExplore; - uint32 rateExperiencePet; - uint32 rateMoney; + float rateExperienceKill; + float rateExperienceBgKill[6]; + float rateExperienceQuest; + float rateExperienceQuestDf; + float rateExperienceExplore; + float rateExperiencePet; + float rateMoney; uint32 rateProfessionsCrafting; uint32 rateProfessionsGathering; - uint32 rateReputation; + float rateReputation; uint32 rateProficienciesDefense; uint32 rateProficienciesWeapons; - uint32 multiplierExperience; - uint32 multiplierMoney; + float multiplierExperience; + float multiplierMoney; uint32 multiplierProfessions; - uint32 multiplierReputation; + float multiplierReputation; uint32 multiplierProficiencies; bool triggered;