[1752] Add support for event 11225 at taxi arrival (ref. spell 31606 … · scriptdev2/scriptdev2-tbc@a388ffd · 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 a388ffd

Browse filesBrowse the repository at this point in the historyBrowse files

NoFantasy

committed

[1752] Add support for event 11225 at taxi arrival (ref. spell 31606 and Mangos rev 10302)

Add support for event 11225 at taxi arrival (ref. spell 31606 and Mangos rev 10302) git-svn-id: https://scriptdev2.svn.sourceforge.net/svnroot/scriptdev2@1752 5f9c896b-1e26-0410-94da-f77f675e2462

1 parent 1930732 commit a388ffd
Copy full SHA for a388ffd

5 files changed

+31-5Lines changed: 31 additions & 5 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• ScriptMgr.cpp
• scripts/outland
  • zangarmarsh.cpp
• sql
  • Updates
    • Makefile.am
    • r1752_mangos.sql
  • mangos_scriptname_full.sql

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎ScriptMgr.cpp‎

Copy file name to clipboardExpand all lines: ScriptMgr.cpp

+3-3Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -472,14 +472,14 @@ bool AreaTrigger(Player* pPlayer, AreaTriggerEntry * atEntry)
472	472	}
473	473
474	474	MANGOS_DLL_EXPORT
475		- bool ProcessEventId(uint32 uiEventId, Object* pSource, Object* pTarget, bool bData)
	475	+ bool ProcessEventId(uint32 uiEventId, Object* pSource, Object* pTarget, bool bIsStart)
476	476	{
477	477	Script *tmpscript = m_scripts[GetEventIdScriptId(uiEventId)];
478	478	if (!tmpscript || !tmpscript->pProcessEventId)
479	479	return false;
480	480
481		- // bData may be true, when event is from taxi node events (arrival=false, departure=true)
482		- return tmpscript->pProcessEventId(uiEventId, pSource, pTarget, bData);
	481	+ // bIsStart may be false, when event is from taxi node events (arrival=false, departure=true)
	482	+ return tmpscript->pProcessEventId(uiEventId, pSource, pTarget, bIsStart);
483	483	}
484	484
485	485	MANGOS_DLL_EXPORT

Collapse file

‎scripts/outland/zangarmarsh.cpp‎

Copy file name to clipboardExpand all lines: scripts/outland/zangarmarsh.cpp

+22-1Lines changed: 22 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -28,6 +28,7 @@ npc_elder_kuruti
28	28	npc_kayra_longmane
29	29	npc_mortog_steamhead
30	30	npc_timothy_daniels
	31	+ event_stormcrow
31	32	EndContentData */
32	33
33	34	#include "precompiled.h"
@@ -364,9 +365,24 @@ bool GossipSelect_npc_timothy_daniels(Player* pPlayer, Creature* pCreature, uint
364	365	}
365	366
366	367	/*######
367		- ## AddSC
	368	+ ## event_stormcrow
368	369	######*/
369	370
	371	+ enum
	372	+ {
	373	+ EVENT_ID_STORMCROW = 11225,
	374	+ };
	375	+
	376	+ bool ProcessEventId_event_taxi_stormcrow(uint32 uiEventId, Object* pSource, Object* pTarget, bool bIsStart)
	377	+ {
	378	+ if (uiEventId == EVENT_ID_STORMCROW && !bIsStart && pSource->GetTypeId() == TYPEID_PLAYER)
	379	+ {
	380	+ ((Player*)pSource)->SetDisplayId(((Player*)pSource)->GetNativeDisplayId());
	381	+ return true;
	382	+ }
	383	+ return false;
	384	+ }
	385	+
370	386	void AddSC_zangarmarsh()
371	387	{
372	388	Script *newscript;
@@ -407,4 +423,9 @@ void AddSC_zangarmarsh()
407	423	newscript->pGossipHello = &GossipHello_npc_timothy_daniels;
408	424	newscript->pGossipSelect = &GossipSelect_npc_timothy_daniels;
409	425	newscript->RegisterSelf();
	426	+
	427	+ newscript = new Script;
	428	+ newscript->Name = "event_taxi_stormcrow";
	429	+ newscript->pProcessEventId = &ProcessEventId_event_taxi_stormcrow;
	430	+ newscript->RegisterSelf();
410	431	}

Collapse file

‎sql/Updates/Makefile.am‎

Copy file name to clipboardExpand all lines: sql/Updates/Makefile.am

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -122,4 +122,5 @@ pkgdata_DATA = \
122	122	r1737_scriptdev2.sql \
123	123	r1741_mangos.sql \
124	124	r1750_scriptdev2.sql \
125		- r1751_scriptdev2.sql
	125	+ r1751_scriptdev2.sql \
	126	+ r1752_mangos.sql

Collapse file

‎sql/Updates/r1752_mangos.sql‎

Copy file name to clipboard

+2Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -0,0 +1,2 @@
	1	+ DELETE FROM event_id_scripts WHERE id=11225;
	2	+ INSERT INTO event_id_scripts VALUES (11225,'event_taxi_stormcrow');

Collapse file

‎sql/mangos_scriptname_full.sql‎

Copy file name to clipboardExpand all lines: sql/mangos_scriptname_full.sql

+2Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -1193,6 +1193,8 @@ UPDATE creature_template SET ScriptName='npc_rivern_frostwind' WHERE entry=10618
1193	1193	UPDATE creature_template SET ScriptName='npc_witch_doctor_mauari' WHERE entry=10307;
1194	1194
1195	1195	/* ZANGARMARSH */
	1196	+ DELETE FROM event_id_scripts WHERE id=11225;
	1197	+ INSERT INTO event_id_scripts VALUES (11225,'event_taxi_stormcrow');
1196	1198	UPDATE creature_template SET ScriptName='npcs_ashyen_and_keleth' WHERE entry IN (17900,17901);
1197	1199	UPDATE creature_template SET ScriptName='npc_cooshcoosh' WHERE entry=18586;
1198	1200	UPDATE creature_template SET ScriptName='npc_elder_kuruti' WHERE entry=18197;

0 commit comments

Comments

0 (0)