josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[svn] Merge SD2 Rev 735. Patch provided by neo0608.

Browse Source 
Fix 171_world.sql.

--HG--
branch : trunk
This commit is contained in:
megamage
2008-11-04 15:37:18 -06:00
parent 31cebde085
commit e91816937b
7 changed files with 197 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/updates/171_world.sql
+1 -1
View File
@@ -2,7 +2,7 @@ DELETE FROM trinity_string WHERE entry IN (57,58,5009);
INSERT INTO trinity_string VALUES
(57,'Using World DB: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(58,'Using script library: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
(58,'Using script library: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(5009,'Sound %u Played to server',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
src/bindings/scripts/Makefile.am
+1
View File
@@ -367,6 +367,7 @@ scripts/zone/uldaman/uldaman.cpp \
scripts/zone/undercity/undercity.cpp \
scripts/zone/wailing_caverns/instance_wailing_caverns.cpp \
scripts/zone/western_plaguelands/western_plaguelands.cpp \
scripts/zone/westfall/westfall.cpp \
scripts/zone/winterspring/winterspring.cpp \
scripts/zone/zangarmarsh/zangarmarsh.cpp \
scripts/zone/zulaman/boss_akilzon.cpp \
src/bindings/scripts/ScriptMgr.cpp
+4
View File
@@ -549,6 +549,8 @@ extern void AddSC_undercity();
extern void AddSC_western_plaguelands();
//Westfall
extern void AddSC_westfall();
//Wetlands
//Winterspring
extern void AddSC_winterspring();
@@ -1729,6 +1731,8 @@ void ScriptsInit()
AddSC_western_plaguelands();
//Westfall
AddSC_westfall();
//Wetlands
//Winterspring
AddSC_winterspring();
src/bindings/scripts/VC71/71ScriptDev2.vcproj
+4
View File
@@ -1045,6 +1045,10 @@
<Filter
Name="Westfall"
>
<File
RelativePath="..\scripts\zone\westfall\westfall.cpp"
>
</File>
</Filter>
<Filter
Name="Wetlands"
src/bindings/scripts/VC80/80ScriptDev2.vcproj
+4
View File
@@ -1290,6 +1290,10 @@
<Filter
Name="Westfall"
>
<File
RelativePath="..\scripts\zone\westfall\westfall.cpp"
>
</File>
</Filter>
<Filter
Name="Wetlands"
src/bindings/scripts/VC90/90ScriptDev2.vcproj
+4
View File
@@ -1276,6 +1276,10 @@
<Filter
Name="Westfall"
>
<File
RelativePath="..\scripts\zone\westfall\westfall.cpp"
>
</File>
</Filter>
<Filter
Name="Wetlands"
src/bindings/scripts/scripts/zone/westfall/westfall.cpp
+179
View File
@@ -0,0 +1,179 @@
/* Copyright (C) 2006 - 2008 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/* ScriptData
SDName: Westfall
SD%Complete: 90
SDComment: Quest support: 155
SDCategory: Westfall
EndScriptData */
/* ContentData
npc_defias_traitor
EndContentData */
#include "precompiled.h"
#include "../../npc/npc_escortAI.h"
#define SAY_START -1000101
#define SAY_PROGRESS -1000102
#define SAY_END -1000103
#define SAY_AGGRO_1 -1000104
#define SAY_AGGRO_2 -1000105
#define QUEST_DEFIAS_BROTHERHOOD 155
struct TRINITY_DLL_DECL npc_defias_traitorAI : public npc_escortAI
{
npc_defias_traitorAI(Creature *c) : npc_escortAI(c) {Reset();}
bool IsWalking;
void WaypointReached(uint32 i)
{
Unit* player = Unit::GetUnit((*m_creature), PlayerGUID);
if (!player)
return;
if (IsWalking && !m_creature->HasUnitMovementFlag(MOVEMENTFLAG_WALK_MODE))
m_creature->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
switch (i)
{
case 35:
IsWalking = true;
break;
case 36:
DoScriptText(SAY_PROGRESS, m_creature, player);
break;
case 44:
DoScriptText(SAY_END, m_creature, player);
{
if (player && player->GetTypeId() == TYPEID_PLAYER)
((Player*)player)->GroupEventHappens(QUEST_DEFIAS_BROTHERHOOD,m_creature);
}
break;
}
}
void Aggro(Unit* who)
{
switch(rand()%2)
{
case 0: DoScriptText(SAY_AGGRO_1, m_creature, who); break;
case 1: DoScriptText(SAY_AGGRO_2, m_creature, who); break;
}
}
void Reset()
{
if (IsWalking && !m_creature->HasUnitMovementFlag(MOVEMENTFLAG_WALK_MODE))
{
m_creature->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
return;
}
IsWalking = false;
}
void JustDied(Unit* killer)
{
if (PlayerGUID)
{
if (Unit* player = Unit::GetUnit((*m_creature), PlayerGUID))
((Player*)player)->FailQuest(QUEST_DEFIAS_BROTHERHOOD);
}
}
void UpdateAI(const uint32 diff)
{
npc_escortAI::UpdateAI(diff);
}
};
bool QuestAccept_npc_defias_traitor(Player* player, Creature* creature, Quest const* quest)
{
if (quest->GetQuestId() == QUEST_DEFIAS_BROTHERHOOD)
{
((npc_escortAI*)(creature->AI()))->Start(true, true, true, player->GetGUID());
DoScriptText(SAY_START, creature, player);
}
return true;
}
CreatureAI* GetAI_npc_defias_traitor(Creature *_Creature)
{
npc_defias_traitorAI* thisAI = new npc_defias_traitorAI(_Creature);
thisAI->AddWaypoint(0, -10508.40, 1068.00, 55.21);
thisAI->AddWaypoint(1, -10518.30, 1074.84, 53.96);
thisAI->AddWaypoint(2, -10534.82, 1081.92, 49.88);
thisAI->AddWaypoint(3, -10546.51, 1084.88, 50.13);
thisAI->AddWaypoint(4, -10555.29, 1084.45, 45.75);
thisAI->AddWaypoint(5, -10566.57, 1083.53, 42.10);
thisAI->AddWaypoint(6, -10575.83, 1082.34, 39.46);
thisAI->AddWaypoint(7, -10585.67, 1081.08, 37.77);
thisAI->AddWaypoint(8, -10600.08, 1078.19, 36.23);
thisAI->AddWaypoint(9, -10608.69, 1076.08, 35.88);
thisAI->AddWaypoint(10, -10621.26, 1073.00, 35.40);
thisAI->AddWaypoint(11, -10638.12, 1060.18, 33.61);
thisAI->AddWaypoint(12, -10655.87, 1038.99, 33.48);
thisAI->AddWaypoint(13, -10664.68, 1030.54, 32.70);
thisAI->AddWaypoint(14, -10708.68, 1033.86, 33.32);
thisAI->AddWaypoint(15, -10754.43, 1017.93, 32.79);
thisAI->AddWaypoint(16, -10802.26, 1018.01, 32.16);
thisAI->AddWaypoint(17, -10832.60, 1009.04, 32.71);
thisAI->AddWaypoint(18, -10866.56, 1006.51, 31.71); // Fix waypoints from roughly this point, test first to get proper one
thisAI->AddWaypoint(19, -10879.98, 1005.10, 32.84);
thisAI->AddWaypoint(20, -10892.45, 1001.32, 34.46);
thisAI->AddWaypoint(21, -10906.14, 997.11, 36.15);
thisAI->AddWaypoint(22, -10922.26, 1002.23, 35.74);
thisAI->AddWaypoint(23, -10936.32, 1023.38, 36.52);
thisAI->AddWaypoint(24, -10933.35, 1052.61, 35.85);
thisAI->AddWaypoint(25, -10940.25, 1077.66, 36.49);
thisAI->AddWaypoint(26, -10957.09, 1099.33, 36.83);
thisAI->AddWaypoint(27, -10956.53, 1119.90, 36.73);
thisAI->AddWaypoint(28, -10939.30, 1150.75, 37.42);
thisAI->AddWaypoint(29, -10915.14, 1202.09, 36.55);
thisAI->AddWaypoint(30, -10892.59, 1257.03, 33.37);
thisAI->AddWaypoint(31, -10891.93, 1306.66, 35.45);
thisAI->AddWaypoint(32, -10896.17, 1327.86, 37.77);
thisAI->AddWaypoint(33, -10906.03, 1368.05, 40.91);
thisAI->AddWaypoint(34, -10910.18, 1389.33, 42.62);
thisAI->AddWaypoint(35, -10915.42, 1417.72, 42.93);
thisAI->AddWaypoint(36, -10926.37, 1421.18, 43.04); // walk here and say
thisAI->AddWaypoint(37, -10952.31, 1421.74, 43.40);
thisAI->AddWaypoint(38, -10980.04, 1411.38, 42.79);
thisAI->AddWaypoint(39, -11006.06, 1420.47, 43.26);
thisAI->AddWaypoint(40, -11021.98, 1450.59, 43.09);
thisAI->AddWaypoint(41, -11025.36, 1491.59, 43.15);
thisAI->AddWaypoint(42, -11036.09, 1508.32, 43.28);
thisAI->AddWaypoint(43, -11060.68, 1526.72, 43.19);
thisAI->AddWaypoint(44, -11072.75, 1527.77, 43.20, 5000);// say and quest credit
return (CreatureAI*)thisAI;
}
void AddSC_westfall()
{
Script *newscript;
newscript = new Script;
newscript->Name="npc_defias_traitor";
newscript->GetAI = &GetAI_npc_defias_traitor;
newscript->pQuestAccept = &QuestAccept_npc_defias_traitor;
m_scripts[nrscripts++] = newscript;
}