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

Scripts/Texts:

Browse Source 
* fix script texts in various locations (thanks TerrorBringer for the heads up). Closes issue #2055. Closes issue #3087.
* cleanup world_script_texts.sql file (remove spaces, order entries)
Scripts/Misc:
* remove obsolete random seed initialization from scripts
* fix some warnings in scripts
* some cleanup in chat_log.cpp

--HG--
branch : trunk
This commit is contained in:
azazel
2010-09-05 02:16:58 +06:00
parent 0f997162ee
commit f500ef201b
18 changed files with 455 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Kalimdor/azshara.cpp
+20 -26
View File
@@ -173,31 +173,32 @@ public:
return true;
}
};
/*####
# mob_rizzle_sprysprocket
####*/
#define MOB_DEPTH_CHARGE 23025
#define SPELL_RIZZLE_BLACKJACK 39865
#define SPELL_RIZZLE_ESCAPE 39871
#define SPELL_RIZZLE_FROST_GRENADE 40525
#define SPELL_DEPTH_CHARGE_TRAP 38576
#define SPELL_PERIODIC_DEPTH_CHARGE 39912
#define SPELL_GIVE_SOUTHFURY_MOONSTONE 39886
enum eRizzleSprysprocketData
{
MOB_DEPTH_CHARGE = 23025,
SPELL_RIZZLE_BLACKJACK = 39865,
SPELL_RIZZLE_ESCAPE = 39871,
SPELL_RIZZLE_FROST_GRENADE = 40525,
SPELL_DEPTH_CHARGE_TRAP = 38576,
SPELL_PERIODIC_DEPTH_CHARGE = 39912,
SPELL_GIVE_SOUTHFURY_MOONSTONE = 39886,
#define SAY_RIZZLE_START -1000245
#define SAY_RIZZLE_GRENADE -1000246
#define SAY_RIZZLE_FINAL -1000247
SAY_RIZZLE_START = -1000351,
MSG_ESCAPE_NOTICE = -1000352,
SAY_RIZZLE_GRENADE = -1000353,
SAY_RIZZLE_GRENADE_BACKFIRE = -1000354, // Not used
SAY_RIZZLE_FINAL = -1000355,
SAY_RIZZLE_FINAL2 = -1000356, // Not used
};
#define GOSSIP_GET_MOONSTONE "Hand over the Southfury moonstone and I'll let you go."
//next message must be send to player when Rizzle jump into river, not implemented
#define MSG_ESCAPE_NOTICE "Rizzle Sprysprocket takes the Southfury moonstone and escapes into the river. Follow her!"
float WPs[58][4] =
{
//pos_x pos_y pos_z orien
@@ -414,12 +415,11 @@ public:
}
void SendText(const char *text, Player* pPlayer)
void SendText(int32 iTextEntry, Player* pPlayer)
{
WorldPacket data(SMSG_SERVER_MESSAGE, 0); // guess size
data << text;
if (pPlayer)
pPlayer->GetSession()->SendPacket(&data);
int loc_idx = pPlayer->GetSession()->GetSessionDbLocaleIndex();
const char* text = sObjectMgr.GetTrinityString(iTextEntry, loc_idx);
sWorld.SendServerMessage(SERVER_MSG_STRING, text, pPlayer);
}
void AttackStart(Unit *who)
@@ -452,18 +452,12 @@ public:
++CurrWP;
ContinueWP = true;
}
};
};
/*####
# mob_depth_charge
####*/
class mob_depth_charge : public CreatureScript
{
public:
src/server/scripts/Kalimdor/azuremyst_isle.cpp
+8 -8
View File
@@ -420,15 +420,15 @@ enum eGeezle
SPELL_TREE_DISGUISE = 30298,
GEEZLE_SAY_1 = -1100259,
SPARK_SAY_2 = -1100260,
SPARK_SAY_3 = -1100261,
GEEZLE_SAY_4 = -1100262,
SPARK_SAY_5 = -1100263,
SPARK_SAY_6 = -1100264,
GEEZLE_SAY_7 = -1100265,
GEEZLE_SAY_1 = -1000629,
SPARK_SAY_2 = -1000630,
SPARK_SAY_3 = -1000631,
GEEZLE_SAY_4 = -1000632,
SPARK_SAY_5 = -1000633,
SPARK_SAY_6 = -1000634,
GEEZLE_SAY_7 = -1000635,
EMOTE_SPARK = -1100266,
EMOTE_SPARK = -1000636,
MOB_SPARK = 17243,
GO_NAGA_FLAG = 181694
src/server/scripts/Kalimdor/darkshore.cpp
+2 -2
View File
@@ -321,8 +321,8 @@ public:
enum eThreshwackonator
{
EMOTE_START = -1000413, //signed for 4966
SAY_AT_CLOSE = -1000414, //signed for 4966
EMOTE_START = -1000325, //signed for 4966
SAY_AT_CLOSE = -1000326, //signed for 4966
QUEST_GYROMAST_REV = 2078,
NPC_GELKAK = 6667,
FACTION_HOSTILE = 14
src/server/scripts/Kalimdor/durotar.cpp
+1 -1
View File
@@ -24,7 +24,7 @@
enum LazyPeonYells
{
SAY_SPELL_HIT = -1999900 //Ow! OK, I''ll get back to work, $N!'
SAY_SPELL_HIT = -1000600 //Ow! OK, I''ll get back to work, $N!'
};
enum LazyPeon
src/server/scripts/Kalimdor/silithus.cpp
-1
View File
@@ -975,7 +975,6 @@ public:
{
//uint8 count = WavesInfo[WaveCount].SpawnCount;
uint8 locIndex = WavesInfo[WaveCount].UsedSpawnPoint;
srand(time(NULL));//initializing random seed
//uint8 KaldoreiSoldierCount = 0;
//uint8 AnubisathConquerorCount = 0;
//uint8 QirajiWaspCount = 0;
src/server/scripts/Kalimdor/ungoro_crater.cpp
+33 -39
View File
@@ -32,19 +32,22 @@ EndContentData */
#include "ScriptedEscortAI.h"
#include "ScriptedFollowerAI.h"
#define SAY_READY -1100200
#define SAY_AGGRO1 -1100201
#define SAY_SEARCH -1100202
#define SAY_AGGRO2 -1100203
#define SAY_AGGRO3 -1100204
#define SAY_FINISH -1100205
enum eAMeData
{
SAY_READY = -1000517,
SAY_AGGRO1 = -1000518,
SAY_SEARCH = -1000519,
SAY_AGGRO2 = -1000520,
SAY_AGGRO3 = -1000521,
SAY_FINISH = -1000522,
#define SPELL_DEMORALIZINGSHOUT 13730
SPELL_DEMORALIZINGSHOUT = 13730,
#define QUEST_CHASING_AME 4245
#define ENTRY_TARLORD 6519
#define ENTRY_TARLORD1 6519
#define ENTRY_STOMPER 6513
QUEST_CHASING_AME = 4245,
ENTRY_TARLORD = 6519,
ENTRY_TARLORD1 = 6519,
ENTRY_STOMPER = 6513,
};
class npc_ame : public CreatureScript
{
@@ -57,7 +60,7 @@ public:
{
CAST_AI(npc_escortAI, (pCreature->AI()))->Start(false, false, pPlayer->GetGUID());
DoScriptText(SAY_READY, pCreature, pPlayer);
pCreature->SetUInt32Value(UNIT_FIELD_BYTES_1,0);
pCreature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
// Change faction so mobs attack
pCreature->setFaction(113);
}
@@ -84,34 +87,32 @@ public:
switch (i)
{
case 19:
me->SummonCreature(ENTRY_STOMPER, -6391.69f, -1730.49f, -272.83f, 4.96f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
DoScriptText(SAY_AGGRO1, me, pPlayer);
break;
case 19:
me->SummonCreature(ENTRY_STOMPER, -6391.69f, -1730.49f, -272.83f, 4.96f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
DoScriptText(SAY_AGGRO1, me, pPlayer);
break;
case 28:
DoScriptText(SAY_SEARCH, me, pPlayer);
break;
DoScriptText(SAY_SEARCH, me, pPlayer);
break;
case 38:
me->SummonCreature(ENTRY_TARLORD, -6370.75f, -1382.84f, -270.51f, 6.06f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
DoScriptText(SAY_AGGRO2, me, pPlayer);
break;
me->SummonCreature(ENTRY_TARLORD, -6370.75f, -1382.84f, -270.51f, 6.06f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
DoScriptText(SAY_AGGRO2, me, pPlayer);
break;
case 49:
me->SummonCreature(ENTRY_TARLORD1, -6324.44f, -1181.05f, -270.17f, 4.34f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
DoScriptText(SAY_AGGRO3, me, pPlayer);
break;
case 55:
DoScriptText(SAY_FINISH, me, pPlayer);
if (pPlayer)
pPlayer->GroupEventHappens(QUEST_CHASING_AME,me);
break;
me->SummonCreature(ENTRY_TARLORD1, -6324.44f, -1181.05f, -270.17f, 4.34f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
DoScriptText(SAY_AGGRO3, me, pPlayer);
break;
case 55:
DoScriptText(SAY_FINISH, me, pPlayer);
if (pPlayer)
pPlayer->GroupEventHappens(QUEST_CHASING_AME, me);
break;
}
}
void Reset()
{
DEMORALIZINGSHOUT_Timer = 5000;
DEMORALIZINGSHOUT_Timer = 5000;
}
void JustSummoned(Creature* summoned)
@@ -136,14 +137,10 @@ public:
DoCast(me->getVictim(), SPELL_DEMORALIZINGSHOUT);
DEMORALIZINGSHOUT_Timer = 70000;
} else DEMORALIZINGSHOUT_Timer -= diff;
}
};
};
/*####
# npc_ringo
####*/
@@ -352,11 +349,8 @@ public:
DoMeleeAttackIfReady();
}
};
};
void AddSC_ungoro_crater()
{
new npc_ame();