FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[2124] Cleanup instance gruuls lair · AwkwardDev/scriptdev2@e73d787 · GitHub

/ scriptdev2 Public
forked from insider42/scriptdev2

Commit e73d787

Browse files
Schmoozerd
committed
[2124] Cleanup instance gruuls lair
1 parent 490ff67 commit e73d787

4 files changed

Lines changed: 147 additions & 128 deletions

File tree

‎scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,10 @@ struct MANGOS_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI
165165
return;
166166

167167
//get council member's guid to respawn them if needed
168-
m_auiCouncil[0] = m_pInstance->GetData64(DATA_KIGGLER);
169-
m_auiCouncil[1] = m_pInstance->GetData64(DATA_BLINDEYE);
170-
m_auiCouncil[2] = m_pInstance->GetData64(DATA_OLM);
171-
m_auiCouncil[3] = m_pInstance->GetData64(DATA_KROSH);
168+
m_auiCouncil[0] = m_pInstance->GetData64(NPC_KIGGLER);
169+
m_auiCouncil[1] = m_pInstance->GetData64(NPC_BLINDEYE);
170+
m_auiCouncil[2] = m_pInstance->GetData64(NPC_OLM);
171+
m_auiCouncil[3] = m_pInstance->GetData64(NPC_KROSH);
172172
}
173173

174174
void EventCouncilDeath()
@@ -286,7 +286,7 @@ struct MANGOS_DLL_DECL Council_Base_AI : public ScriptedAI
286286
if (!m_pInstance)
287287
return;
288288

289-
Creature* pMaulgar = m_creature->GetMap()->GetCreature(m_pInstance->GetData64(DATA_MAULGAR));
289+
Creature* pMaulgar = m_creature->GetMap()->GetCreature(m_pInstance->GetData64(NPC_MAULGAR));
290290

291291
if (pMaulgar->isAlive())
292292
{

‎scripts/outland/gruuls_lair/gruuls_lair.h‎

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,42 @@ enum
1717
GO_PORT_GRONN_2 = 184662,
1818

1919
// NPC GUIDs
20-
DATA_MAULGAR = 3,
21-
DATA_BLINDEYE = 4,
22-
DATA_KIGGLER = 5,
23-
DATA_KROSH = 6,
24-
DATA_OLM = 7
20+
NPC_MAULGAR = 18831,
21+
NPC_BLINDEYE = 18836,
22+
NPC_KIGGLER = 18835,
23+
NPC_KROSH = 18832,
24+
NPC_OLM = 18834,
25+
};
26+
27+
struct MANGOS_DLL_DECL instance_gruuls_lair : public ScriptedInstance
28+
{
29+
public:
30+
instance_gruuls_lair(Map *pMap);
31+
32+
void Initialize();
33+
bool IsEncounterInProgress() const;
34+
35+
void OnCreatureCreate(Creature* pCreature);
36+
void OnObjectCreate(GameObject* pGo);
37+
38+
void SetData(uint32 uiType, uint32 uiData);
39+
uint32 GetData(uint32 uiType);
40+
uint64 GetData64(uint32 uiData);
41+
42+
const char* Save() { return m_strSaveData.c_str(); }
43+
void Load(const char* chrIn);
44+
45+
private:
46+
uint32 m_auiEncounter[MAX_ENCOUNTER];
47+
std::string m_strSaveData;
48+
49+
uint64 m_uiMaulgarGUID;
50+
uint64 m_uiKigglerGUID;
51+
uint64 m_uiBlindeyeGUID;
52+
uint64 m_uiOlmGUID;
53+
uint64 m_uiKroshGUID;
54+
uint64 m_uiMaulgarDoorGUID;
55+
uint64 m_uiGruulEncounterDoorGUID;
2556
};
2657

2758
#endif

‎scripts/outland/gruuls_lair/instance_gruuls_lair.cpp‎

Lines changed: 105 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -29,149 +29,136 @@ EndScriptData */
2929
2 - Gruul event
3030
*/
3131

32-
struct MANGOS_DLL_DECL instance_gruuls_lair : public ScriptedInstance
32+
instance_gruuls_lair::instance_gruuls_lair(Map *pMap) : ScriptedInstance(pMap),
33+
m_uiMaulgarGUID(0),
34+
m_uiKigglerGUID(0),
35+
m_uiBlindeyeGUID(0),
36+
m_uiOlmGUID(0),
37+
m_uiKroshGUID(0),
38+
39+
m_uiMaulgarDoorGUID(0),
40+
m_uiGruulEncounterDoorGUID(0)
3341
{
34-
instance_gruuls_lair(Map *pMap) : ScriptedInstance(pMap) {Initialize();}
35-
36-
uint32 m_auiEncounter[MAX_ENCOUNTER];
37-
std::string strSaveData;
38-
39-
uint64 m_uiMaulgarGUID;
40-
uint64 m_uiKigglerGUID;
41-
uint64 m_uiBlindeyeGUID;
42-
uint64 m_uiOlmGUID;
43-
uint64 m_uiKroshGUID;
44-
uint64 m_uiMaulgarDoorGUID;
45-
uint64 m_uiGruulEncounterDoorGUID;
42+
Initialize();
43+
}
4644

47-
void Initialize()
48-
{
49-
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
45+
void instance_gruuls_lair::Initialize()
46+
{
47+
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
48+
}
5049

51-
m_uiMaulgarGUID = 0;
52-
m_uiKigglerGUID = 0;
53-
m_uiBlindeyeGUID = 0;
54-
m_uiOlmGUID = 0;
55-
m_uiKroshGUID = 0;
50+
bool instance_gruuls_lair::IsEncounterInProgress() const
51+
{
52+
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
53+
if (m_auiEncounter[i] == IN_PROGRESS)
54+
return true;
5655

57-
m_uiMaulgarDoorGUID = 0;
58-
m_uiGruulEncounterDoorGUID = 0;
59-
}
56+
return false;
57+
}
6058

61-
bool IsEncounterInProgress() const
59+
void instance_gruuls_lair::OnCreatureCreate(Creature* pCreature)
60+
{
61+
switch (pCreature->GetEntry())
6262
{
63-
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
64-
if (m_auiEncounter[i] == IN_PROGRESS)
65-
return true;
66-
67-
return false;
63+
case NPC_MAULGAR: m_uiMaulgarGUID = pCreature->GetGUID(); break;
64+
case NPC_KROSH: m_uiKroshGUID = pCreature->GetGUID(); break;
65+
case NPC_OLM: m_uiOlmGUID = pCreature->GetGUID(); break;
66+
case NPC_KIGGLER: m_uiKigglerGUID = pCreature->GetGUID(); break;
67+
case NPC_BLINDEYE: m_uiBlindeyeGUID = pCreature->GetGUID(); break;
6868
}
69+
}
6970

70-
void OnCreatureCreate(Creature* pCreature)
71+
void instance_gruuls_lair::OnObjectCreate(GameObject* pGo)
72+
{
73+
switch (pGo->GetEntry())
7174
{
72-
switch (pCreature->GetEntry())
73-
{
74-
case 18831: m_uiMaulgarGUID = pCreature->GetGUID(); break;
75-
case 18832: m_uiKroshGUID = pCreature->GetGUID(); break;
76-
case 18834: m_uiOlmGUID = pCreature->GetGUID(); break;
77-
case 18835: m_uiKigglerGUID = pCreature->GetGUID(); break;
78-
case 18836: m_uiBlindeyeGUID = pCreature->GetGUID(); break;
79-
}
75+
case GO_PORT_GRONN_1:
76+
m_uiMaulgarDoorGUID = pGo->GetGUID();
77+
if (m_auiEncounter[0] == DONE)
78+
pGo->SetGoState(GO_STATE_ACTIVE);
79+
break;
80+
case GO_PORT_GRONN_2:
81+
m_uiGruulEncounterDoorGUID = pGo->GetGUID();
82+
break;
8083
}
84+
}
8185

82-
void OnObjectCreate(GameObject* pGo)
86+
void instance_gruuls_lair::SetData(uint32 uiType, uint32 uiData)
87+
{
88+
switch (uiType)
8389
{
84-
switch (pGo->GetEntry())
85-
{
86-
case GO_PORT_GRONN_1:
87-
m_uiMaulgarDoorGUID = pGo->GetGUID();
88-
if (m_auiEncounter[0] == DONE)
89-
pGo->SetGoState(GO_STATE_ACTIVE);
90-
break;
91-
case GO_PORT_GRONN_2:
92-
m_uiGruulEncounterDoorGUID = pGo->GetGUID();
93-
break;
94-
}
90+
case TYPE_MAULGAR_EVENT:
91+
if (uiData == DONE)
92+
DoUseDoorOrButton(m_uiMaulgarDoorGUID);
93+
m_auiEncounter[0] = uiData;
94+
break;
95+
case TYPE_GRUUL_EVENT:
96+
DoUseDoorOrButton(m_uiGruulEncounterDoorGUID);
97+
m_auiEncounter[1] = uiData;
98+
break;
9599
}
96100

97-
void SetData(uint32 uiType, uint32 uiData)
101+
if (uiData == DONE)
98102
{
99-
switch (uiType)
100-
{
101-
case TYPE_MAULGAR_EVENT:
102-
if (uiData == DONE)
103-
DoUseDoorOrButton(m_uiMaulgarDoorGUID);
104-
m_auiEncounter[0] = uiData;
105-
break;
106-
case TYPE_GRUUL_EVENT:
107-
DoUseDoorOrButton(m_uiGruulEncounterDoorGUID);
108-
m_auiEncounter[1] = uiData;
109-
break;
110-
}
111-
112-
if (uiData == DONE)
113-
{
114-
OUT_SAVE_INST_DATA;
115-
116-
std::ostringstream saveStream;
117-
saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1];
118-
119-
strSaveData = saveStream.str();
120-
121-
SaveToDB();
122-
OUT_SAVE_INST_DATA_COMPLETE;
123-
}
124-
}
103+
OUT_SAVE_INST_DATA;
125104

126-
const char* Save()
127-
{
128-
return strSaveData.c_str();
105+
std::ostringstream saveStream;
106+
saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1];
107+
108+
m_strSaveData = saveStream.str();
109+
110+
SaveToDB();
111+
OUT_SAVE_INST_DATA_COMPLETE;
129112
}
113+
}
130114

131-
uint32 GetData(uint32 uiType)
115+
uint32 instance_gruuls_lair::GetData(uint32 uiType)
116+
{
117+
switch (uiType)
132118
{
133-
switch (uiType)
134-
{
135-
case TYPE_MAULGAR_EVENT: return m_auiEncounter[0];
136-
case TYPE_GRUUL_EVENT: return m_auiEncounter[1];
137-
}
119+
case TYPE_MAULGAR_EVENT: return m_auiEncounter[0];
120+
case TYPE_GRUUL_EVENT: return m_auiEncounter[1];
121+
122+
default:
138123
return 0;
139124
}
125+
}
140126

141-
uint64 GetData64(uint32 uiData)
127+
uint64 instance_gruuls_lair::GetData64(uint32 uiData)
128+
{
129+
switch (uiData)
142130
{
143-
switch (uiData)
144-
{
145-
case DATA_MAULGAR: return m_uiMaulgarGUID;
146-
case DATA_BLINDEYE: return m_uiBlindeyeGUID;
147-
case DATA_KIGGLER: return m_uiKigglerGUID;
148-
case DATA_KROSH: return m_uiKroshGUID;
149-
case DATA_OLM: return m_uiOlmGUID;
150-
}
151-
return 0;
131+
case NPC_MAULGAR: return m_uiMaulgarGUID;
132+
case NPC_BLINDEYE: return m_uiBlindeyeGUID;
133+
case NPC_KIGGLER: return m_uiKigglerGUID;
134+
case NPC_KROSH: return m_uiKroshGUID;
135+
case NPC_OLM: return m_uiOlmGUID;
136+
137+
default:
138+
return 0;
152139
}
140+
}
153141

154-
void Load(const char* chrIn)
142+
void instance_gruuls_lair::Load(const char* chrIn)
143+
{
144+
if (!chrIn)
155145
{
156-
if (!chrIn)
157-
{
158-
OUT_LOAD_INST_DATA_FAIL;
159-
return;
160-
}
146+
OUT_LOAD_INST_DATA_FAIL;
147+
return;
148+
}
161149

162-
OUT_LOAD_INST_DATA(chrIn);
150+
OUT_LOAD_INST_DATA(chrIn);
163151

164-
std::istringstream loadStream(chrIn);
152+
std::istringstream loadStream(chrIn);
165153

166-
loadStream >> m_auiEncounter[0] >> m_auiEncounter[1];
154+
loadStream >> m_auiEncounter[0] >> m_auiEncounter[1];
167155

168-
for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
169-
if (m_auiEncounter[i] == IN_PROGRESS)
170-
m_auiEncounter[i] = NOT_STARTED;
156+
for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
157+
if (m_auiEncounter[i] == IN_PROGRESS)
158+
m_auiEncounter[i] = NOT_STARTED;
171159

172-
OUT_LOAD_INST_DATA_COMPLETE;
173-
}
174-
};
160+
OUT_LOAD_INST_DATA_COMPLETE;
161+
}
175162

176163
InstanceData* GetInstanceData_instance_gruuls_lair(Map* pMap)
177164
{
@@ -180,9 +167,10 @@ InstanceData* GetInstanceData_instance_gruuls_lair(Map* pMap)
180167

181168
void AddSC_instance_gruuls_lair()
182169
{
183-
Script *newscript;
184-
newscript = new Script;
185-
newscript->Name = "instance_gruuls_lair";
186-
newscript->GetInstanceData = &GetInstanceData_instance_gruuls_lair;
187-
newscript->RegisterSelf();
170+
Script* pNewScript;
171+
172+
pNewScript = new Script;
173+
pNewScript->Name = "instance_gruuls_lair";
174+
pNewScript->GetInstanceData = &GetInstanceData_instance_gruuls_lair;
175+
pNewScript->RegisterSelf();
188176
}

‎sd2_revision_nr.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#ifndef __SD2_REVISION_NR_H__
22
#define __SD2_REVISION_NR_H__
3-
#define SD2_REVISION_NR "2123"
3+
#define SD2_REVISION_NR "2124"
44
#endif // __SD2_REVISION_NR_H__

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL