[s2843] Update Nazan - Hellfire Ramparts · scriptdev2/scriptdev2-tbc@02c3f8e · GitHub

scriptdev2 / scriptdev2-tbc Public

• Notifications You must be signed in to change notification settings
• Fork 26
• Star 28

• Code
• Issues 11
• Pull requests 1
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit 02c3f8e

Browse filesBrowse the repository at this point in the historyBrowse files

xfurry

committed

[s2843] Update Nazan - Hellfire Ramparts

This will fix the fireball behavior (based on commit SD2-TBC[3134] - 1e36357) Signed-off-by: xfurry <xfurry@scriptdev2.com>

1 parent 28ac219 commit 02c3f8e
Copy full SHA for 02c3f8e

2 files changed

+8-25Lines changed: 8 additions & 25 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• scripts/outland/hellfire_citadel/hellfire_ramparts
  • boss_nazan_and_vazruden.cpp
• sd2_revision_nr.h

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎scripts/outland/hellfire_citadel/hellfire_ramparts/boss_nazan_and_vazruden.cpp‎

Copy file name to clipboardExpand all lines: scripts/outland/hellfire_citadel/hellfire_ramparts/boss_nazan_and_vazruden.cpp

+7-24Lines changed: 7 additions & 24 deletions

Original file line number	Diff line number	Diff line change
@@ -43,13 +43,12 @@ enum
43	43	SPELL_REVENGE_H = 40392,
44	44
45	45	// nazan
46		- SPELL_FIREBALL = 30691, // This and the next while flying (dmg values will change in cata)
47		- SPELL_FIREBALL_B = 33793,
48		- SPELL_FIREBALL_H = 32491,
49		- SPELL_FIREBALL_B_H = 33794,
50		- SPELL_FIREBALL_LAND = 34653, // While landed
51		- SPELL_FIREBALL_LAND_H = 36920,
52		-
	46	+ //SPELL_FIREBALL_H = 32491, // purpose unk; not sure if they are related to this encounter
	47	+ //SPELL_FIREBALL_B_H = 33794,
	48	+ SPELL_FIREBALL = 34653,
	49	+ SPELL_FIREBALL_H = 36920,
	50	+ //SPELL_FIREBALL_LAND = 30691, // cast while on land?
	51	+ //SPELL_FIREBALL_LAND_H = 33793,
53	52	SPELL_CONE_OF_FIRE = 30926,
54	53	SPELL_CONE_OF_FIRE_H = 36921,
55	54
@@ -86,7 +85,6 @@ struct boss_vazruden_heraldAI : public ScriptedAI
86	85	bool m_bIsDescending;
87	86	uint32 m_uiMovementTimer;
88	87	uint32 m_uiFireballTimer;
89		- uint32 m_uiFireballBTimer;
90	88	uint32 m_uiConeOfFireTimer;
91	89	uint32 m_uiBellowingRoarTimer;
92	90
@@ -106,7 +104,6 @@ struct boss_vazruden_heraldAI : public ScriptedAI
106	104	m_lastSeenPlayerGuid.Clear();
107	105	m_vazrudenGuid.Clear();
108	106	m_uiFireballTimer = 0;
109		- m_uiFireballBTimer = 2100;
110	107	m_uiConeOfFireTimer = urand(8100, 19700);
111	108	m_uiBellowingRoarTimer = 100; // TODO Guesswork, though such an AoE fear soon after landing seems fitting
112	109
@@ -294,20 +291,6 @@ struct boss_vazruden_heraldAI : public ScriptedAI
294	291	}
295	292	else
296	293	m_uiFireballTimer -= uiDiff;
297		-
298		- if (m_uiFireballBTimer < uiDiff)
299		- {
300		- if (Creature* pVazruden = m_creature->GetMap()->GetCreature(m_vazrudenGuid))
301		- {
302		- if (Unit* pEnemy = pVazruden->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
303		- {
304		- if (DoCastSpellIfCan(pEnemy, m_bIsRegularMode ? SPELL_FIREBALL_B : SPELL_FIREBALL_B_H, 0, pVazruden->GetObjectGuid()) == CAST_OK)
305		- m_uiFireballBTimer = 15700;
306		- }
307		- }
308		- }
309		- else
310		- m_uiFireballBTimer -= uiDiff;
311	294	}
312	295
313	296	if (m_creature->GetHealthPercent() < 20.0f)
@@ -321,7 +304,7 @@ struct boss_vazruden_heraldAI : public ScriptedAI
321	304	{
322	305	if (Unit* pEnemy = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
323	306	{
324		- if (DoCastSpellIfCan(pEnemy, m_bIsRegularMode ? SPELL_FIREBALL_LAND : SPELL_FIREBALL_LAND_H) == CAST_OK)
	307	+ if (DoCastSpellIfCan(pEnemy, m_bIsRegularMode ? SPELL_FIREBALL : SPELL_FIREBALL_H) == CAST_OK)
325	308	m_uiFireballTimer = urand(7300, 13200);
326	309	}
327	310	}

Collapse file

‎sd2_revision_nr.h‎

Copy file name to clipboard

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -1,4 +1,4 @@
1	1	#ifndef __SD2_REVISION_NR_H__
2	2	#define __SD2_REVISION_NR_H__
3		- #define SD2_REVISION_NR "s2842"
	3	+ #define SD2_REVISION_NR "s2843"
4	4	#endif // __SD2_REVISION_NR_H__

0 commit comments

Comments

0 (0)