mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-17 07:18:37 +00:00
[Factions] Remove from shared memory and simplify (#3999)
* [Factions] Remove from shared memory and simplify - Removes factions from shared memory and moves to zone based storage of repositories and changes the NPC `faction_list` to also use repositories. - This affects NPC Factions and Faction Associations. * Bug fixes. * Update client.cpp * Update client.cpp * Update client.cpp * Cleanup * Update client.cpp * Update client.cpp * Update client.cpp * Final push * Update CMakeLists.txt * Consolidate reloading. * [Cleanup] PR # 3999 (#4039) * [Fixes for PR # 3999 * [Reload actual in game factions, not just the umbrella data. * syntax * Fix typo * Foix bug where primary_faction not filled in when no hits * Fix typos * Fix splash factions for kills. * Fix typo * Fix more variable names to be accurate * Fix Loads to load new ones as they come in. * Load npc_factions without primary (tasks) and support old task faction * Rename to make way for new LoadFactionAssocition (by faction_id) * Fix some review comments * Add code to load factions for splash tasks and quests. * Fix issue with sign and RewardFaction, fix Log Message --------- Co-authored-by: Paul Coene <noudess@gmail.com>
This commit is contained in:
@@ -1057,6 +1057,7 @@ void ClientTaskState::RewardTask(Client *c, const TaskInformation *ti, ClientTas
|
||||
|
||||
// just use normal NPC faction ID stuff
|
||||
if (ti->faction_reward && ti->faction_amount == 0) {
|
||||
zone->LoadNPCFaction(ti->faction_reward);
|
||||
c->SetFactionLevel(
|
||||
c->CharacterID(),
|
||||
ti->faction_reward,
|
||||
@@ -1065,6 +1066,8 @@ void ClientTaskState::RewardTask(Client *c, const TaskInformation *ti, ClientTas
|
||||
c->GetDeity()
|
||||
);
|
||||
} else if (ti->faction_reward != 0 && ti->faction_amount != 0) {
|
||||
// faction_reward is a faction ID
|
||||
zone->LoadFactionAssociation(ti->faction_reward);
|
||||
c->RewardFaction(
|
||||
ti->faction_reward,
|
||||
ti->faction_amount
|
||||
|
||||
Reference in New Issue
Block a user