[HELP] C++ XP Rates command

Custom Code and Mods Custom Code and Requests
1

Greetings fellow Trinitycore people.

I’ve applied this patch : http://pastebin.com/QUdp9rJh manually since my GIT patching is broken.

But thats not the issue.

diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp
index f19f247…6d77802 100644
— a/src/server/game/Entities/Creature/GossipDef.cpp
+++ b/src/server/game/Entities/Creature/GossipDef.cpp
@@ -423,7 +423,7 @@ void PlayerMenu::SendQuestGiverQuestDetails(Quest const* quest, uint64 npcGUID,
}

data << uint32(quest->GetRewOrReqMoney());

  • data << uint32(quest->XPValue(_session->GetPlayer()) * sWorld->getRate(RATE_XP_QUEST));
  • data << uint32(quest->XPValue(_session->GetPlayer()) * sWorld->getRate(RATE_XP_QUEST) * _session->GetPlayer()->GetCustomXpRate());
    }

// rewarded honor points. Multiply with 10 to satisfy client
@@ -661,7 +661,7 @@ void PlayerMenu::SendQuestGiverOfferReward(Quest const* quest, uint64 npcGUID, b
}

data << uint32(quest->GetRewOrReqMoney());

  • data << uint32(quest->XPValue(_session->GetPlayer()) * sWorld->getRate(RATE_XP_QUEST));
  • data << uint32(quest->XPValue(_session->GetPlayer()) * sWorld->getRate(RATE_XP_QUEST) * _session->GetPlayer()->GetCustomXpRate());

// rewarded honor points. Multiply with 10 to satisfy client
data << uint32(10 * quest->CalculateHonorGain(_session->GetPlayer()->GetQuestLevel(quest)));
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index e12e5ee…835d9e7 100644
— a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -872,6 +872,9 @@ Player::Player(WorldSession* session): Unit(true)
_activeCheats = CHEAT_NONE;
m_achievementMgr = new AchievementMgr(this);
m_reputationMgr = new ReputationMgr(this);
+

  • m_CustomXpRate = 1;
  • m_CustomLootRate = 1;
    }

Player::~Player()
@@ -6887,6 +6890,7 @@ void Player::CheckAreaExploreAndOutdoor()
XP = uint32(sObjectMgr->GetBaseXP(areaEntry->area_level)*sWorld->getRate(RATE_XP_EXPLORE));
}

  • XP = GetCustomXpRate();
    GiveXP(XP, NULL);
    SendExplorationExperience(area, XP);
    }
    @@ -15222,7 +15226,7 @@ void Player::RewardQuest(Quest const     quest, uint32 reward, Object* questGiver,
    bool rewarded = (m_RewardedQuests.find(quest_id) != m_RewardedQuests.end());

// Not give XP in case already completed once repeatable quest

  • uint32 XP = rewarded ? 0 : uint32(quest->XPValue(this)*sWorld->getRate(RATE_XP_QUEST));
  • uint32 XP = rewarded ? 0 : uint32(quest->XPValue(this)*sWorld->getRate(RATE_XP_QUEST) * GetCustomXpRate());

// handle SPELL_AURA_MOD_XP_QUEST_PCT auras
Unit::AuraEffectList const& ModXPPctAuras = GetAuraEffectsByType(SPELL_AURA_MOD_XP_QUEST_PCT);
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 1c0fa4e…7c6ac4c 100644
— a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -2287,6 +2287,11 @@ class Player : public Unit, public GridObject
//! Return collision height sent to client
float GetCollisionHeight(bool mounted) const;

  • void SetCustomXpRate(uint32 rate) { m_CustomXpRate = rate; }
  • uint32 GetCustomXpRate() const { return m_CustomXpRate; }
  • void SetCustomLootRate(uint32 rate) { m_CustomLootRate = rate; }
  • uint32 GetCustomLootRate() const { return m_CustomLootRate; }
    protected:
    // Gamemaster whisper whitelist
    WhisperListContainer WhisperList;
    @@ -2614,6 +2619,9 @@ class Player : public Unit, public GridObject
    uint32 _pendingBindTimer;

uint32 _activeCheats;
+

  • uint32 m_CustomXpRate;
  • uint32 m_CustomLootRate;
    };

void AddItemsSetItem(Playerplayer, Item item);
diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp
index fcef203…2eb5634 100644
— a/src/server/game/Loot/LootMgr.cpp
+++ b/src/server/game/Loot/LootMgr.cpp
@@ -275,17 +275,17 @@ void LootStore::ReportNotExistedId(uint32 id) const

// Checks if the entry (quest, non-quest, reference) takes it’s chance (at loot generation)
// RATE_DROP_ITEMS is no longer used for all types of entries
-bool LootStoreItem::Roll(bool rate) const
+bool LootStoreItem::Roll(bool rate, uint32 customRate) const
{
if (chance >= 100.0f)
return true;

if (mincountOrRef < 0) // reference case

  • return roll_chance_f(chance* (rate ? sWorld->getRate(RATE_DROP_ITEM_REFERENCED) : 1.0f));
  • return roll_chance_f(chance* (rate ? sWorld->getRate(RATE_DROP_ITEM_REFERENCED) * customRate : 1.0f));

ItemTemplate const* pProto = sObjectMgr->GetItemTemplate(itemid);

  • float qualityModifier = pProto && rate ? sWorld->getRate(qualityToRate[pProto->Quality]) : 1.0f;
  • float qualityModifier = pProto && rate ? sWorld->getRate(qualityToRate[pProto->Quality]) * customRate : 1.0f;

return roll_chance_f(chancequalityModifier);
}
@@ -456,7 +456,7 @@ bool Loot::FillLoot(uint32 lootId, LootStore const& store, Player lootOwner, bo
items.reserve(MAX_NR_LOOT_ITEMS);
quest_items.reserve(MAX_NR_QUEST_ITEMS);

  • tab->Process(*this, store.IsRatesAllowed(), lootMode); // Processing is done there, callback via Loot::AddItem()
  • tab->Process(*this, store.IsRatesAllowed(), lootMode, 0, lootOwner->GetCustomLootRate()); // Processing is done there, callback via Loot::AddItem()

// Setting access rights for group loot case
Group* group = lootOwner->GetGroup();
@@ -1273,7 +1273,7 @@ void LootTemplate::CopyConditions(LootItem* li) const
}

// Rolls for every item in the template and adds the rolled items the the loot
-void LootTemplate::Process(Loot& loot, bool rate, uint16 lootMode, uint8 groupId) const
+void LootTemplate::Process(Loot& loot, bool rate, uint16 lootMode, uint8 groupId, uint32 customRate) const
{
if (groupId) // Group reference uses own processing of the group
{
@@ -1294,7 +1294,7 @@ void LootTemplate::Process(Loot& loot, bool rate, uint16 lootMode, uint8 groupId
if (!(item->lootmode & lootMode)) // Do not add if mode mismatch
continue;

  • if (!item->Roll(rate))
  • if (!item->Roll(rate, customRate))
    continue; // Bad luck for the entry

if (item->mincountOrRef < 0) // References processing
diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h
index d338f6f…5cdd77d 100644
— a/src/server/game/Loot/LootMgr.h
+++ b/src/server/game/Loot/LootMgr.h
@@ -119,7 +119,7 @@ struct LootStoreItem
group(_group), needs_quest(_chanceOrQuestChance < 0), maxcount(_maxcount)
{}

  • bool Roll(bool rate) const; // Checks if the entry takes it’s chance (at loot generation)
  • bool Roll(bool rate, uint32 customRate) const; // Checks if the entry takes it’s chance (at loot generation)
    bool IsValid(LootStore const& store, uint32 entry) const;
    // Checks correctness of values
    };
    @@ -227,7 +227,7 @@ class LootTemplate
    // Adds an entry to the group (at loading stage)
    void AddEntry(LootStoreItem* item);
    // Rolls for every item in the template and adds the rolled items the the loot
  • void Process(Loot& loot, bool rate, uint16 lootMode, uint8 groupId = 0) const;
  • void Process(Loot& loot, bool rate, uint16 lootMode, uint8 groupId = 0, uint32 customRate = 1) const;
    void CopyConditions(ConditionList conditions);
    void CopyConditions(LootItem* li) const;

diff --git a/src/server/game/Miscellaneous/Formulas.h b/src/server/game/Miscellaneous/Formulas.h
index 6579485…3d69960 100644
— a/src/server/game/Miscellaneous/Formulas.h
+++ b/src/server/game/Miscellaneous/Formulas.h
@@ -180,7 +180,7 @@ namespace Trinity
gain *= 2;
}

  • gain = uint32(gain * sWorld->getRate(RATE_XP_KILL));
  • gain = uint32(gain * sWorld->getRate(RATE_XP_KILL) * player->GetCustomXpRate());
    }

sScriptMgr->OnGainCalculation(gain, player, u);
diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp
index 845c3fa…3f56c57 100644
— a/src/server/game/Scripting/ScriptLoader.cpp
+++ b/src/server/game/Scripting/ScriptLoader.cpp
@@ -1290,13 +1290,13 @@ void AddBattlegroundScripts()

#ifdef SCRIPTS
/* This is where custom scripts’ loading functions should be declared. */

+void Add_SC_Custom_Rates();
#endif

void AddCustomScripts()
{
#ifdef SCRIPTS
/* This is where custom scripts should be added. */

  • Add_SC_Custom_Rates();
    #endif
    }
    diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
    index a786a21…eb4fb66 100644
    — a/src/server/game/World/World.cpp
    +++ b/src/server/game/World/World.cpp
    @@ -1221,6 +1221,48 @@ void World::LoadConfigSettings(bool reload)
    m_int_configs[CONFIG_WINTERGRASP_NOBATTLETIME] = ConfigMgr::GetIntDefault(“Wintergrasp.NoBattleTimer”, 150);
    m_int_configs[CONFIG_WINTERGRASP_RESTART_AFTER_CRASH] = ConfigMgr::GetIntDefault(“Wintergrasp.CrashRestartTimer”, 10);

  • // Individual XP/loot rates

  • int sec = ConfigMgr::GetIntDefault(“Player.XpRateSecurity”, 0);

  • if (sec < SEC_PLAYER || sec > SEC_ADMINISTRATOR)

  • {

  • sLog->outError(LOG_FILTER_SERVER_LOADING, “Player.XpRateSecurity has invalid security %i, must be between %i and %i`, defaulting to 0 …”,

  • sec, SEC_PLAYER, SEC_ADMINISTRATOR);

  • m_int_configs[CONFIG_PLAYER_INDIVIDUAL_XP_RATE_SECURITY] = 0;

  • }

  • else

  • m_int_configs[CONFIG_PLAYER_INDIVIDUAL_XP_RATE_SECURITY] = sec;

  • sec = ConfigMgr::GetIntDefault(“Player.LootRateSecurity”, 0);

  • if (sec < SEC_PLAYER || sec > SEC_ADMINISTRATOR)

  • {

  • sLog->outError(LOG_FILTER_SERVER_LOADING, “Player.LootRateSecurity has invalid security %i, must be between %i and %i`, defaulting to 0 …”,

  • sec, SEC_PLAYER, SEC_ADMINISTRATOR);

  • m_int_configs[CONFIG_PLAYER_INDIVIDUAL_LOOT_RATE_SECURITY] = 0;

  • }

  • else

  • m_int_configs[CONFIG_PLAYER_INDIVIDUAL_LOOT_RATE_SECURITY] = sec;

  • int maxXpRate = ConfigMgr::GetIntDefault(“Player.MaximumXpRate”, 1);

  • if (maxXpRate < 1)

  • {

  • sLog->outError(LOG_FILTER_SERVER_LOADING, “Player.MaximumXpRate has too low value %i, defaulting to 1 …”, maxXpRate);

  • m_int_configs[CONFIG_PLAYER_MAXIMUM_INDIVIDUAL_XP_RATE] = 1;

  • }

  • else

  • m_int_configs[CONFIG_PLAYER_MAXIMUM_INDIVIDUAL_XP_RATE] = maxXpRate;

  • maxXpRate = ConfigMgr::GetIntDefault(“Player.MaximumLootRate”, 1);

  • if (maxXpRate < 1)

  • {

  • sLog->outError(LOG_FILTER_SERVER_LOADING, “Player.MaximumLootRate has too low value %i, defaulting to 1 …”, maxXpRate);

  • m_int_configs[CONFIG_PLAYER_MAXIMUM_INDIVIDUAL_LOOT_RATE] = 1;

  • }

  • else

  • m_int_configs[CONFIG_PLAYER_MAXIMUM_INDIVIDUAL_LOOT_RATE] = maxXpRate;

  • m_bool_configs[CONFIG_PLAYER_INDIVIDUAL_XP_RATE_SHOW_ON_LOGIN] = ConfigMgr::GetBoolDefault(“Player.ShowXpRateOnLogin”, true);

  • m_bool_configs[CONFIG_PLAYER_INDIVIDUAL_LOOT_RATE_SHOW_ON_LOGIN] = ConfigMgr::GetBoolDefault(“Player.ShowLootRateOnLogin”, true);

// call ScriptMgr if we’re reloading the configuration
if (reload)
sScriptMgr->OnConfigLoad(reload);
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index 00bb9e7…8a9933d 100644
— a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -159,6 +159,8 @@ enum WorldBoolConfigs
CONFIG_WINTERGRASP_ENABLE,
CONFIG_UI_QUESTLEVELS_IN_DIALOGS, // Should we add quest levels to the title in the NPC dialogs?
CONFIG_EVENT_ANNOUNCE,

  • CONFIG_PLAYER_INDIVIDUAL_XP_RATE_SHOW_ON_LOGIN,
  • CONFIG_PLAYER_INDIVIDUAL_LOOT_RATE_SHOW_ON_LOGIN,
    BOOL_CONFIG_VALUE_COUNT
    };

@@ -320,6 +322,10 @@ enum WorldIntConfigs
CONFIG_WINTERGRASP_BATTLETIME,
CONFIG_WINTERGRASP_NOBATTLETIME,
CONFIG_WINTERGRASP_RESTART_AFTER_CRASH,

  • CONFIG_PLAYER_INDIVIDUAL_XP_RATE_SECURITY,
  • CONFIG_PLAYER_INDIVIDUAL_LOOT_RATE_SECURITY ,
  • CONFIG_PLAYER_MAXIMUM_INDIVIDUAL_XP_RATE,
  • CONFIG_PLAYER_MAXIMUM_INDIVIDUAL_LOOT_RATE,
    INT_CONFIG_VALUE_COUNT
    };

diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.cpp b/src/server/shared/Database/Implementation/CharacterDatabase.cpp
index 2b57693…ebcad53 100644
— a/src/server/shared/Database/Implementation/CharacterDatabase.cpp
+++ b/src/server/shared/Database/Implementation/CharacterDatabase.cpp
@@ -589,4 +589,12 @@ void CharacterDatabaseConnection::DoPrepareStatements()
PrepareStatement(CHAR_UPD_CHAR_PET_SLOT_BY_ID, “UPDATE character_pet SET slot = ? WHERE owner = ? AND id = ?”, CONNECTION_ASYNC);
PrepareStatement(CHAR_DEL_CHAR_PET_BY_ID, “DELETE FROM character_pet WHERE id = ?”, CONNECTION_ASYNC);
PrepareStatement(CHAR_DEL_CHAR_PET_BY_SLOT, “DELETE FROM character_pet WHERE owner = ? AND (slot = ? OR slot > ?)”, CONNECTION_ASYNC);

  • PrepareStatement(CHAR_INS_INDIVIDUAL_XP_RATE, “INSERT INTO character_xp_rate (guid, xp_rate) VALUES (?, ?)”, CONNECTION_ASYNC);

  • PrepareStatement(CHAR_DEL_INDIVIDUAL_XP_RATE, “DELETE FROM character_xp_rate WHERE guid = ?”, CONNECTION_ASYNC);

  • PrepareStatement(CHAR_SEL_INDIVIDUAL_XP_RATE, “SELECT xp_rate FROM character_xp_rate WHERE guid = ?”, CONNECTION_SYNCH);

  • PrepareStatement(CHAR_UPD_INDIVIDUAL_XP_RATE, “UPDATE character_xp_rate SET xp_rate = ? WHERE guid = ?”, CONNECTION_ASYNC);

  • PrepareStatement(CHAR_INS_INDIVIDUAL_LOOT_RATE, “INSERT INTO character_loot_rate (guid, loot_rate) VALUES (?, ?)”, CONNECTION_ASYNC);

  • PrepareStatement(CHAR_DEL_INDIVIDUAL_LOOT_RATE, “DELETE FROM character_loot_rate WHERE guid = ?”, CONNECTION_ASYNC);

  • PrepareStatement(CHAR_SEL_INDIVIDUAL_LOOT_RATE, “SELECT loot_rate FROM character_loot_rate WHERE guid = ?”, CONNECTION_SYNCH);

  • PrepareStatement(CHAR_UPD_INDIVIDUAL_LOOT_RATE, “UPDATE character_loot_rate SET loot_rate = ? WHERE guid = ?”, CONNECTION_ASYNC);
    }
    diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.h b/src/server/shared/Database/Implementation/CharacterDatabase.h
    index 3eb6a72…2ac3bab 100644
    — a/src/server/shared/Database/Implementation/CharacterDatabase.h
    +++ b/src/server/shared/Database/Implementation/CharacterDatabase.h
    @@ -524,6 +524,16 @@ enum CharacterDatabaseStatements
    CHAR_DEL_ITEMCONTAINER_MONEY,
    CHAR_INS_ITEMCONTAINER_MONEY,

  • CHAR_INS_INDIVIDUAL_XP_RATE,

  • CHAR_DEL_INDIVIDUAL_XP_RATE,

  • CHAR_SEL_INDIVIDUAL_XP_RATE,

  • CHAR_UPD_INDIVIDUAL_XP_RATE,

  • CHAR_INS_INDIVIDUAL_LOOT_RATE,

  • CHAR_DEL_INDIVIDUAL_LOOT_RATE,

  • CHAR_SEL_INDIVIDUAL_LOOT_RATE,

  • CHAR_UPD_INDIVIDUAL_LOOT_RATE,

MAX_CHARACTERDATABASE_STATEMENTS
};

diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index bf19240…2a2beb1 100644
— a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -2760,3 +2760,46 @@ Log.Async.Enable = 0

###################################################################################################
+
+###################################################################################################
+# INDIVIDUAL PLAYER XP RATES
+#
+# Player.XpRateSecurity
+# Player.LootRateSecurity
+# Description: Minimum security an account must have in order to
+# use .rate xp / .rate loot command
+# Values : 0 (player account)
+# 1 (moderator account)
+# 2 (gamemaster account)
+# 3 (administrator account)
+# Default : 0 (every player can use the commands)
+# Remarks : Higher security accounts may set xp/loot rate to
+# lower security level accounts.
+#
+
+Player.XpRateSecurity = 0
+Player.LootRateSecurity = 0
+
+# Player.MaximumXpRate
+# Player.MaximumLootRate
+# Description: Maximum individual XP / loot rate
+# Values : n (integer, may set xp / loot rate in range [1,n]
+# Default : 10
+#
+
+Player.MaximumXpRate = 10
+Player.MaximumLootRate = 10
+
+# Player.ShowXpRateOnLogin
+# Player.ShowLootRateOnLogin
+# Description: Shows current XP / loot rate to player on login
+# Values : 0 - don’t show
+# : 1 - show
+# Default : 1
+#
+
+Player.ShowXpRateOnLogin = 1
+Player.ShowLootRateOnLogin = 1
+
+#
+###################################################################################################

The error i get after applying this Patch is .

I’ve read a bit on the forums and they said something about logging changes?

Perhaps someone can help me out /emoticons/default_smile.png

http://i.gyazo.com/763514283cf386fbc68fddebc755a868.png

2

— Canned message start —

This thread is not related to the official Trinity codebase and was moved to the Custom Code section.

Please read the stickies next time.

— Canned message end —

3

Sorry i was looking around on the section but i didn’t find any sticky.

4

If you are looking to create, update, install a non-blizzlike patch posts your questions on Custom Code and Requests.

Repacks aren’t supported for help and support ask help to repacker.

subforum description.

5

Ohh okay my bad. Although applying a custom script doesn’t make it a repack now does it.

6

No, what +Aokromes was showing you was the forum description which explains that your request for help with custom code doesn’t belong in Help & Support.

As to your patch, it is far too old to apply to current sources. As you can see from the error messages, the config manager and logging system have both undergone significant changes (the logging system is much more complicated than the older version which your patch appears to use).

You need to rewrite the patch.

7

Ahh okay thanks.