Skip to content

Commit d84772b

Browse files
heyitsbenchheyitsbench
committed
Init.
1 parent e647e02 commit d84772b

File tree

2 files changed

+98
-29
lines changed

2 files changed

+98
-29
lines changed

‎src/ptr_template.cpp

+29-29
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,21 @@ class createTemplate : public PlayerScript {
4141

4242
uint8 itemRoutine = METHOD_BOOST;
4343

44-
if (sConfigMgr->GetOption<bool>("DeleteItems", true))
44+
if (templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::DELETE_ITEMS))
4545
itemRoutine = METHOD_DELETE;
4646

4747
scheduler.Schedule(Milliseconds(delayMultiplier * APPLY_DELAY), [player, index, itemRoutine](TaskContext context)
4848
{
4949
switch (context.GetRepeatCounter())
5050
{
5151
case 0:
52-
if (sConfigMgr->GetOption<bool>("TemplateDK", true))
52+
if (templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_DEATH_KNIGHT))
5353
{
54-
if (sConfigMgr->GetOption<bool>("TemplateEquipGear", true) && sConfigMgr->GetOption<bool>("TemplateBagGear", true))
54+
if (templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_EQUIP_GEAR) && templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_BAG_GEAR))
5555
TemplateHelperItemCleanup(player, SCOPE_ALL, itemRoutine);
56-
else if (sConfigMgr->GetOption<bool>("TemplateBagGear", true))
56+
else if (templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_BAG_GEAR))
5757
TemplateHelperItemCleanup(player, SCOPE_BAGS, itemRoutine);
58-
else if (sConfigMgr->GetOption<bool>("TemplateEquipGear", true))
58+
else if (templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_EQUIP_GEAR))
5959
TemplateHelperItemCleanup(player, SCOPE_EQUIPPED, itemRoutine);
6060

6161
AddTemplateDeathKnight(player);
@@ -64,63 +64,63 @@ class createTemplate : public PlayerScript {
6464
}
6565
break;
6666
case 1:
67-
if (sConfigMgr->GetOption<bool>("TemplateLevel", true))
67+
if (templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_LEVEL))
6868
{
6969
AddTemplateLevel(player, index);
7070
player->SaveToDB(false, false);
7171
LOG_DEBUG("module", "Finished applying level for template character {}.", player->GetGUID().ToString());
7272
}
7373
break;
7474
case 2:
75-
if (sConfigMgr->GetOption<bool>("TemplateTaximask", true))
75+
if (templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_TAXIMASK))
7676
{
7777
AddTemplateTaxi(player, index);
7878
player->SaveToDB(false, false);
7979
LOG_DEBUG("module", "Finished applying taximask for template character {}.", player->GetGUID().ToString());
8080
}
8181
break;
8282
case 3:
83-
if (sConfigMgr->GetOption<bool>("TemplateHomebind", true))
83+
if (templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_HOMEBIND))
8484
{
8585
AddTemplateHomebind(player, index);
8686
player->SaveToDB(false, false);
8787
LOG_DEBUG("module", "Finished applying homebind for template character {}.", player->GetGUID().ToString());
8888
}
8989
break;
9090
case 4:
91-
if (sConfigMgr->GetOption<bool>("TemplateAchievements", true))
91+
if (templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_ACHIEVEMENTS))
9292
{
9393
AddTemplateAchievements(player, index);
9494
player->SaveToDB(false, false);
9595
LOG_DEBUG("module", "Finished applying achievements for template character {}.", player->GetGUID().ToString());
9696
}
9797
break;
9898
case 5:
99-
if (sConfigMgr->GetOption<bool>("TemplateQuests", true))
99+
if (templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_QUESTS))
100100
{
101101
AddTemplateQuests(player, index);
102102
player->SaveToDB(false, false);
103103
LOG_DEBUG("module", "Finished applying quests for template character {}.", player->GetGUID().ToString());
104104
}
105105
break;
106106
case 6:
107-
if (sConfigMgr->GetOption<bool>("TemplateReputation", true))
107+
if (templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_REPUTATION))
108108
{
109109
AddTemplateReputation(player, index);
110110
player->SaveToDB(false, false);
111111
LOG_DEBUG("module", "Finished applying reputations for template character {}.", player->GetGUID().ToString());
112112
}
113113
break;
114114
case 7:
115-
if (sConfigMgr->GetOption<bool>("TemplateSkills", true))
115+
if (templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_SKILLS))
116116
{
117117
AddTemplateSkills(player, index);
118118
player->SaveToDB(false, false);
119119
LOG_DEBUG("module", "Finished applying skills for template character {}.", player->GetGUID().ToString());
120120
}
121121
break;
122122
case 8:
123-
if (sConfigMgr->GetOption<bool>("TemplateEquipGear", true))
123+
if (templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_EQUIP_GEAR))
124124
{
125125
TemplateHelperItemCleanup(player, SCOPE_EQUIPPED, itemRoutine);
126126
AddTemplateWornGear(player, index);
@@ -129,7 +129,7 @@ class createTemplate : public PlayerScript {
129129
}
130130
break;
131131
case 9:
132-
if (sConfigMgr->GetOption<bool>("TemplateBagGear", true))
132+
if (templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_BAG_GEAR))
133133
{
134134
TemplateHelperItemCleanup(player, SCOPE_BAGS, itemRoutine);
135135
AddTemplateBagGear(player, index);
@@ -138,31 +138,31 @@ class createTemplate : public PlayerScript {
138138
}
139139
break;
140140
case 10:
141-
if (sConfigMgr->GetOption<bool>("TemplateSpells", true))
141+
if (templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_SPELLS))
142142
{
143143
AddTemplateSpells(player, index);
144144
player->SaveToDB(false, false);
145145
LOG_DEBUG("module", "Finished applying spells for template character {}.", player->GetGUID().ToString());
146146
}
147147
break;
148148
case 11:
149-
if (sConfigMgr->GetOption<bool>("TemplateHotbar", true))
149+
if (templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_HOTBAR))
150150
{
151151
AddTemplateHotbar(player, index);
152152
player->SaveToDB(false, false);
153153
LOG_DEBUG("module", "Finished applying hotbar spells for template character {}.", player->GetGUID().ToString());
154154
}
155155
break;
156156
case 12:
157-
if (sConfigMgr->GetOption<bool>("TemplateTeleport", true))
157+
if (templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_TELEPORT))
158158
{
159159
AddTemplatePosition(player, index);
160160
player->SaveToDB(false, false);
161161
LOG_DEBUG("module", "Finished teleporting template character {}.", player->GetGUID().ToString());
162162
}
163163
break;
164164
case 13:
165-
if (sConfigMgr->GetOption<bool>("TemplateResources", true))
165+
if (templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_RESOURCES))
166166
{
167167
AddTemplateResources(player);
168168
player->SaveToDB(false, false);
@@ -204,12 +204,12 @@ class createTemplate : public PlayerScript {
204204
index, raceMask, classMask);
205205

206206
uint8 security = player->GetSession()->GetSecurity();
207-
if ((security < sConfigMgr->GetOption<int8>("EnableApplySecurity", true)) && (security < sConfigMgr->GetOption<int8>("DisableApplySecurity", true)))
207+
if ((security < templateConfigData.GetConfigValue<int8>(PTRTemplateConfig::ENABLE_APPLY_SECURITY)) && (security < templateConfigData.GetConfigValue<int8>(PTRTemplateConfig::DISABLE_APPLY_SECURITY)))
208208
{
209209
LOG_DEBUG("module", "Player {} tried to apply template {}, but does not meet security level.", player->GetGUID().ToString(), index);
210210
return INSUFFICIENT_SECURITY_LEVEL;
211211
}
212-
if ((security < sConfigMgr->GetOption<int8>("DisableApplySecurity", true)) && !enable)
212+
if ((security < templateConfigData.GetConfigValue<int8>(PTRTemplateConfig::DISABLE_APPLY_SECURITY)) && !enable)
213213
{
214214
LOG_DEBUG("module", "Player {} tried to apply template {}, but the template is disabled.", player->GetGUID().ToString(), index);
215215
return TEMPLATE_DISABLED_LOCAL;
@@ -221,12 +221,12 @@ class createTemplate : public PlayerScript {
221221
}
222222
if ((!(player->GetLevel() == (player->getClass() != CLASS_DEATH_KNIGHT
223223
? sWorld->getIntConfig(CONFIG_START_PLAYER_LEVEL)
224-
: sWorld->getIntConfig(CONFIG_START_HEROIC_PLAYER_LEVEL)))) && !(sConfigMgr->GetOption<bool>("LevelEnable", true)))
224+
: sWorld->getIntConfig(CONFIG_START_HEROIC_PLAYER_LEVEL)))) && !(templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::LEVEL_ENABLE)))
225225
{
226226
LOG_DEBUG("module", "Player {} is not initial level, cannot apply template {}. Current level: {}", player->GetGUID().ToString(), index, player->GetLevel());
227227
return NOT_INITIAL_LEVEL;
228228
}
229-
if (!sConfigMgr->GetOption<bool>("TemplateEnable", true))
229+
if (!templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_ENABLE))
230230
{
231231
LOG_DEBUG("module", "Player {} tried to apply template {}, but templates are disabled.", player->GetGUID().ToString(), index);
232232
return TEMPLATE_DISABLED_GLOBAL;
@@ -556,7 +556,7 @@ class createTemplate : public PlayerScript {
556556
int32 standingEntry = fields[1].Get<int32>();
557557
FactionEntry const* factionId = sFactionStore.LookupEntry(factionEntry);
558558

559-
if ((player->GetReputationMgr().GetReputation(factionEntry) >= standingEntry) && sConfigMgr->GetOption<bool>("MaintainImprovedValues", true))
559+
if ((player->GetReputationMgr().GetReputation(factionEntry) >= standingEntry) && templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::MAINTAIN_IMPROVED_VALUES))
560560
continue;
561561

562562
player->GetReputationMgr().SetOneFactionReputation(factionId, float(standingEntry), false); // This was ripped from the `.modify reputation` command from base AC.
@@ -588,7 +588,7 @@ class createTemplate : public PlayerScript {
588588
uint16 valueEntry = (*skillInfo)[1].Get<uint16>();
589589
uint16 maxEntry = (*skillInfo)[2].Get<uint16>();
590590

591-
if (((player->GetSkillValue(skillEntry) >= valueEntry) && (player->GetMaxSkillValue(skillEntry) >= maxEntry)) && sConfigMgr->GetOption<bool>("MaintainImprovedValues", true))
591+
if (((player->GetSkillValue(skillEntry) >= valueEntry) && (player->GetMaxSkillValue(skillEntry) >= maxEntry)) && templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::MAINTAIN_IMPROVED_VALUES))
592592
continue;
593593

594594
player->SetSkill(skillEntry, 0, valueEntry, maxEntry); // Don't know what step overload is used for, being zeroed here.
@@ -862,15 +862,15 @@ class announce : public PlayerScript {
862862
{
863863
static createTemplate templatevar;
864864

865-
if (!sConfigMgr->GetOption<bool>("TemplateEnable", true))
865+
if (!templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_ENABLE))
866866
{
867867
return;
868868
}
869869

870-
if (sConfigMgr->GetOption<bool>("AnnounceEnable", true))
870+
if (templateConfigData.GetConfigValue<bool>(PTRTemplateConfig::ANNOUNCE_ENABLE))
871871
ChatHandler(player->GetSession()).PSendModuleSysMessage(module_string, ALERT_MODULE_PRESENCE);
872872

873-
uint32 templateIndex = sConfigMgr->GetOption<uint32>("LoginTemplateIndex", 0);
873+
uint32 templateIndex = templateConfigData.GetConfigValue<uint32>(PTRTemplateConfig::LOGIN_TEMPLATE_INDEX);
874874
if (!templateIndex || !player->HasAtLoginFlag(AT_LOGIN_FIRST))
875875
return;
876876

@@ -1004,9 +1004,9 @@ class ptr_template_commandscript : public CommandScript
10041004
uint8 enableEntry = (*index)[1].Get<uint8>();
10051005
std::string templateName = GetTemplateName(handler, indexEntry);
10061006

1007-
if ((playerSecurity >= sConfigMgr->GetOption<int8>("EnableListSecurity", true) && enableEntry) || (playerSecurity >= sConfigMgr->GetOption<int8>("DisableListSecurity", true) && !enableEntry))
1007+
if ((playerSecurity >= templateConfigData.GetConfigValue<int8>(PTRTemplateConfig::ENABLE_LIST_SECURITY) && enableEntry) || (playerSecurity >= templateConfigData.GetConfigValue<int8>(PTRTemplateConfig::DISABLE_LIST_SECURITY) && !enableEntry))
10081008
{
1009-
if (playerSecurity >= sConfigMgr->GetOption<int8>("StatusSecurityText", true))
1009+
if (playerSecurity >= templateConfigData.GetConfigValue<int8>(PTRTemplateConfig::STATUS_SECURITY_TEXT))
10101010
{
10111011
std::string enableText = enableEntry
10121012
? handler->GetModuleString(module_string, DETAIL_ENABLE)[0]

‎src/ptr_template_loader.h

+69
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "Chat.h"
22
#include "Config.h"
3+
#include "ConfigData.h"
34
#include "Player.h"
45
#include "ReputationMgr.h"
56
#include "ScriptMgr.h"
@@ -72,6 +73,74 @@ enum TemplateEnums
7273
MAILED_ITEM_DELAY = 180
7374
};
7475

76+
enum class PTRTemplateConfig
77+
{
78+
ANNOUNCE_ENABLE,
79+
TEMPLATE_ENABLE,
80+
LEVEL_ENABLE,
81+
TEMPLATE_ACHIEVEMENTS,
82+
TEMPLATE_BAG_GEAR,
83+
TEMPLATE_DEATH_KNIGHT,
84+
TEMPLATE_EQUIP_GEAR,
85+
TEMPLATE_HOMEBIND,
86+
TEMPLATE_HOTBAR,
87+
TEMPLATE_LEVEL,
88+
TEMPLATE_QUESTS,
89+
TEMPLATE_REPUTATION,
90+
TEMPLATE_RESOURCES,
91+
TEMPLATE_SKILLS,
92+
TEMPLATE_SPELLS,
93+
TEMPLATE_TAXIMASK,
94+
TEMPLATE_TELEPORT,
95+
DELETE_ITEMS,
96+
LOGIN_TEMPLATE_INDEX,
97+
MAINTAIN_IMPROVED_VALUES,
98+
ENABLE_APPLY_SECURITY,
99+
DISABLE_APPLY_SECURITY,
100+
ENABLE_LIST_SECURITY,
101+
DISABLE_LIST_SECURITY,
102+
STATUS_SECURITY_TEXT,
103+
104+
NUM_CONFIGS,
105+
};
106+
107+
class PTRTemplateConfigData : public ConfigData<PTRTemplateConfig>
108+
{
109+
public:
110+
PTRTemplateConfigData() : ConfigData(PTRTemplateConfig::NUM_CONFIGS) { };
111+
112+
void BuildConfigCache() override
113+
{
114+
SetConfigValue<bool>(PTRTemplateConfig::ANNOUNCE_ENABLE, "AnnounceEnable", true);
115+
SetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_ENABLE, "TemplateEnable", true);
116+
SetConfigValue<bool>(PTRTemplateConfig::LEVEL_ENABLE, "LevelEnable", true);
117+
SetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_ACHIEVEMENTS, "TemplateAchievements", true);
118+
SetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_BAG_GEAR, "TemplateBagGear", true);
119+
SetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_DEATH_KNIGHT, "TemplateDK", true);
120+
SetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_EQUIP_GEAR, "TemplateEquipGear", true);
121+
SetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_HOMEBIND, "TemplateHomebind", true);
122+
SetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_HOTBAR, "TemplateHotbar", true);
123+
SetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_LEVEL, "TemplateLevel", true);
124+
SetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_QUESTS, "TemplateQuests", false);
125+
SetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_REPUTATION, "TemplateReputation", true);
126+
SetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_RESOURCES, "TemplateResources", true);
127+
SetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_SKILLS, "TemplateSkills", true);
128+
SetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_SPELLS, "TemplateSpells", true);
129+
SetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_TAXIMASK, "TemplateTaximask", true);
130+
SetConfigValue<bool>(PTRTemplateConfig::TEMPLATE_TELEPORT, "TemplateTeleport", true);
131+
SetConfigValue<bool>(PTRTemplateConfig::DELETE_ITEMS, "DeleteItems", true);
132+
SetConfigValue<uint32>(PTRTemplateConfig::LOGIN_TEMPLATE_INDEX, "LoginTemplateIndex", 0);
133+
SetConfigValue<bool>(PTRTemplateConfig::MAINTAIN_IMPROVED_VALUES, "MaintainImprovedValues", true);
134+
SetConfigValue<int8>(PTRTemplateConfig::ENABLE_APPLY_SECURITY, "EnableApplySecurity", 0);
135+
SetConfigValue<int8>(PTRTemplateConfig::DISABLE_APPLY_SECURITY, "DisableApplySecurity", 3);
136+
SetConfigValue<int8>(PTRTemplateConfig::ENABLE_LIST_SECURITY, "EnableListSecurity", 0);
137+
SetConfigValue<int8>(PTRTemplateConfig::DISABLE_LIST_SECURITY, "DisableListSecurity", 2);
138+
SetConfigValue<int8>(PTRTemplateConfig::STATUS_SECURITY_TEXT, "StatusSecurityText", 2);
139+
}
140+
};
141+
142+
static PTRTemplateConfigData templateConfigData;
143+
75144
void SendTalentReset(Player* player)
76145
{
77146
WorldPacket data(SMSG_TALENTS_INVOLUNTARILY_RESET, 1);

0 commit comments

Comments
 (0)