Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into mmaps

Browse Source
This commit is contained in:
Subv
2012-10-19 17:57:30 -05:00
parent 972b418103 38ca1531d8
commit 9dc2b7ecd5
77 changed files with 2991 additions and 2223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/Commands/cs_character.cpp
View File

@@ -224,7 +224,7 @@ public:
stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_NAME_DATA);
stmt->setUInt32(0, delInfo.lowGuid);
if (PreparedQueryResult result = CharacterDatabase.Query(stmt))
sWorld->AddCharacterNameData(delInfo.lowGuid, delInfo.name, (*result)[2].GetUInt8(), (*result)[0].GetUInt8(), (*result)[1].GetUInt8());
sWorld->AddCharacterNameData(delInfo.lowGuid, delInfo.name, (*result)[2].GetUInt8(), (*result)[0].GetUInt8(), (*result)[1].GetUInt8(), (*result)[3].GetUInt8());
}
static void HandleCharacterLevel(Player* player, uint64 playerGuid, uint32 oldLevel, uint32 newLevel, ChatHandler* handler)

28
src/server/scripts/Commands/cs_modify.cpp
View File

@@ -1002,15 +1002,19 @@ public:
if (handler->HasLowerSecurity(target, 0))
return false;
int32 addmoney = atoi((char*)args);
int32 moneyToAdd = 0;
if (strchr(args, 'g') || strchr(args, 's') || strchr(args, 'c'))
moneyToAdd = MoneyStringToMoney(std::string(args));
else
moneyToAdd = atoi(args);
uint32 moneyuser = target->GetMoney();
uint32 targetMoney = target->GetMoney();
if (addmoney < 0)
if (moneyToAdd < 0)
{
int32 newmoney = int32(moneyuser) + addmoney;
int32 newmoney = int32(targetMoney) + moneyToAdd;
sLog->outDebug(LOG_FILTER_GENERAL, handler->GetTrinityString(LANG_CURRENT_MONEY), moneyuser, addmoney, newmoney);
sLog->outDebug(LOG_FILTER_GENERAL, handler->GetTrinityString(LANG_CURRENT_MONEY), targetMoney, moneyToAdd, newmoney);
if (newmoney <= 0)
{
handler->PSendSysMessage(LANG_YOU_TAKE_ALL_MONEY, handler->GetNameLink(target).c_str());
@@ -1024,25 +1028,25 @@ public:
if (newmoney > MAX_MONEY_AMOUNT)
newmoney = MAX_MONEY_AMOUNT;
handler->PSendSysMessage(LANG_YOU_TAKE_MONEY, abs(addmoney), handler->GetNameLink(target).c_str());
handler->PSendSysMessage(LANG_YOU_TAKE_MONEY, abs(moneyToAdd), handler->GetNameLink(target).c_str());
if (handler->needReportToTarget(target))
(ChatHandler(target)).PSendSysMessage(LANG_YOURS_MONEY_TAKEN, handler->GetNameLink().c_str(), abs(addmoney));
(ChatHandler(target)).PSendSysMessage(LANG_YOURS_MONEY_TAKEN, handler->GetNameLink().c_str(), abs(moneyToAdd));
target->SetMoney(newmoney);
}
}
else
{
handler->PSendSysMessage(LANG_YOU_GIVE_MONEY, addmoney, handler->GetNameLink(target).c_str());
handler->PSendSysMessage(LANG_YOU_GIVE_MONEY, moneyToAdd, handler->GetNameLink(target).c_str());
if (handler->needReportToTarget(target))
(ChatHandler(target)).PSendSysMessage(LANG_YOURS_MONEY_GIVEN, handler->GetNameLink().c_str(), addmoney);
(ChatHandler(target)).PSendSysMessage(LANG_YOURS_MONEY_GIVEN, handler->GetNameLink().c_str(), moneyToAdd);
if (addmoney >=MAX_MONEY_AMOUNT)
if (moneyToAdd >= MAX_MONEY_AMOUNT)
target->SetMoney(MAX_MONEY_AMOUNT);
else
target->ModifyMoney(addmoney);
target->ModifyMoney(moneyToAdd);
}
sLog->outDebug(LOG_FILTER_GENERAL, handler->GetTrinityString(LANG_NEW_MONEY), moneyuser, addmoney, target->GetMoney());
sLog->outDebug(LOG_FILTER_GENERAL, handler->GetTrinityString(LANG_NEW_MONEY), targetMoney, moneyToAdd, target->GetMoney());
return true;
}

128
src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
View File

@@ -30,40 +30,41 @@ Script Data End */
#define GOSSIP_START_EVENT "I am ready to being"
enum eBlastmasterEmiShortfuse
enum BlastmasterEmi
{
GOSSIP_TEXT_EMI = 1693,
SAY_BLASTMASTER_0 = -1090000,
SAY_BLASTMASTER_1 = -1090001,
SAY_BLASTMASTER_2 = -1090002,
SAY_BLASTMASTER_3 = -1090003,
SAY_BLASTMASTER_4 = -1090004,
SAY_BLASTMASTER_5 = -1090005,
SAY_BLASTMASTER_6 = -1090006,
SAY_BLASTMASTER_7 = -1090007,
SAY_BLASTMASTER_8 = -1090008,
SAY_BLASTMASTER_9 = -1090009,
SAY_BLASTMASTER_10 = -1090010,
SAY_BLASTMASTER_11 = -1090011,
SAY_BLASTMASTER_12 = -1090012,
SAY_BLASTMASTER_13 = -1090013,
SAY_BLASTMASTER_14 = -1090014,
SAY_BLASTMASTER_15 = -1090015,
SAY_BLASTMASTER_16 = -1090016,
SAY_BLASTMASTER_17 = -1090017,
SAY_BLASTMASTER_18 = -1090018,
SAY_BLASTMASTER_19 = -1090019,
SAY_BLASTMASTER_20 = -1090020,
SAY_BLASTMASTER_21 = -1090021,
SAY_BLASTMASTER_22 = -1090022,
SAY_BLASTMASTER_23 = -1090023,
SAY_BLASTMASTER_24 = -1090024,
SAY_BLASTMASTER_25 = -1090025,
SAY_BLASTMASTER_26 = -1090026,
SAY_BLASTMASTER_27 = -1090027,
SAY_BLASTMASTER_0 = 0,
SAY_BLASTMASTER_1 = 1,
SAY_BLASTMASTER_2 = 2,
SAY_BLASTMASTER_3 = 3,
SAY_BLASTMASTER_4 = 4,
SAY_BLASTMASTER_5 = 5,
SAY_BLASTMASTER_6 = 6,
SAY_BLASTMASTER_7 = 7,
SAY_BLASTMASTER_8 = 8,
SAY_BLASTMASTER_9 = 9,
SAY_BLASTMASTER_10 = 10,
SAY_BLASTMASTER_11 = 11,
SAY_BLASTMASTER_12 = 12,
SAY_BLASTMASTER_13 = 13,
SAY_BLASTMASTER_14 = 14,
SAY_BLASTMASTER_15 = 15,
SAY_BLASTMASTER_16 = 16,
SAY_BLASTMASTER_17 = 17,
SAY_BLASTMASTER_18 = 18,
SAY_BLASTMASTER_19 = 19,
SAY_BLASTMASTER_20 = 20,
SAY_BLASTMASTER_21 = 21,
SAY_BLASTMASTER_22 = 22,
SAY_BLASTMASTER_23 = 23,
SAY_BLASTMASTER_24 = 24,
SAY_BLASTMASTER_25 = 25,
SAY_BLASTMASTER_26 = 26,
SAY_BLASTMASTER_27 = 27,
SAY_BLASTMASTER_28 = 28,
SAY_GRUBBIS = -1090028
SAY_GRUBBIS = 0
};
const Position SpawnPosition[] =
@@ -78,13 +79,16 @@ const Position SpawnPosition[] =
{-552.534f, -110.012f, -153.577f, 0.747f},
{-550.708f, -116.436f, -153.103f, 0.679f},
{-554.030f, -115.983f, -152.635f, 0.695f},
{-494.595f, -87.516f, 149.116f, 3.344f},
{-494.595f, -87.516f, -149.116f, 3.344f},
{-493.349f, -90.845f, -148.882f, 3.717f},
{-491.995f, -87.619f, -148.197f, 3.230f},
{-490.732f, -90.739f, -148.091f, 3.230f},
{-490.554f, -89.114f, -148.055f, 3.230f},
{-495.240f, -90.808f, -149.493f, 3.238f},
{-494.195f, -89.553f, -149.131f, 3.254f}
{-494.195f, -89.553f, -149.131f, 3.254f},
{-511.3304f, -139.9622f, -152.4761f, 0.7504908f},
{-510.6754f, -139.4371f, -152.6167f, 3.33359f},
{-511.8976f, -139.3562f, -152.4785f, 3.961899f}
};
class npc_blastmaster_emi_shortfuse : public CreatureScript
@@ -305,7 +309,7 @@ public:
break;
case 14:
SetInFace(false);
DoScriptText(SAY_BLASTMASTER_26, me);
Talk(SAY_BLASTMASTER_26);
SetEscortPaused(true);
NextStep(5000, false, 20);
break;
@@ -318,8 +322,8 @@ public:
{
case 1:
SetEscortPaused(true);
DoScriptText(SAY_BLASTMASTER_0, me);
NextStep(1500, true);
Talk(SAY_BLASTMASTER_0);
NextStep(2000, true);
break;
case 2:
if (!instance)
@@ -368,7 +372,7 @@ public:
me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[1], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000);
me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000);
me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000);
DoScriptText(SAY_BLASTMASTER_19, me);
Talk(SAY_BLASTMASTER_19);
break;
case 4:
if (GameObject* go = me->SummonGameObject(183410, -542.199f, -96.854f, -155.790f, 0, 0, 0, 0, 0, 1000))
@@ -381,7 +385,7 @@ public:
me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000);
me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[1], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000);
me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000);
DoScriptText(SAY_BLASTMASTER_15, me);
Talk(SAY_BLASTMASTER_15);
break;
case 6:
me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[10], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000);
@@ -406,10 +410,15 @@ public:
}
break;
case 9:
if (Creature* pGrubbis = me->SummonCreature(NPC_GRUBBIS, SpawnPosition[15], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000))
DoScriptText(SAY_GRUBBIS, pGrubbis);
if (Creature* grubbis = me->SummonCreature(NPC_GRUBBIS, SpawnPosition[15], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000))
grubbis->AI()->Talk(SAY_GRUBBIS);
me->SummonCreature(NPC_CHOMPER, SpawnPosition[16], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000);
break;
case 10:
me->SummonGameObject(GO_RED_ROCKET, SpawnPosition[17].GetPositionX(), SpawnPosition[17].GetPositionY(), SpawnPosition[17].GetPositionZ(), SpawnPosition[17].GetOrientation(), 0, 0, 0, 0, 7200);
me->SummonGameObject(GO_RED_ROCKET, SpawnPosition[18].GetPositionX(), SpawnPosition[18].GetPositionY(), SpawnPosition[18].GetPositionZ(), SpawnPosition[18].GetOrientation(), 0, 0, 0, 0, 7200);
me->SummonGameObject(GO_RED_ROCKET, SpawnPosition[19].GetPositionX(), SpawnPosition[19].GetPositionY(), SpawnPosition[19].GetPositionZ(), SpawnPosition[19].GetOrientation(), 0, 0, 0, 0, 7200);
break;
}
}
@@ -422,29 +431,29 @@ public:
switch (uiPhase)
{
case 1:
DoScriptText(SAY_BLASTMASTER_1, me);
NextStep(1500, true);
Talk(SAY_BLASTMASTER_1);
NextStep(2000, true);
break;
case 2:
SetEscortPaused(false);
NextStep(0, false, 0);
break;
case 3:
DoScriptText(SAY_BLASTMASTER_2, me);
Talk(SAY_BLASTMASTER_2);
SetEscortPaused(false);
NextStep(0, false, 0);
break;
case 4:
DoScriptText(SAY_BLASTMASTER_3, me);
Talk(SAY_BLASTMASTER_3);
NextStep(3000, true);
break;
case 5:
DoScriptText(SAY_BLASTMASTER_4, me);
Talk(SAY_BLASTMASTER_4);
NextStep(3000, true);
break;
case 6:
SetInFace(true);
DoScriptText(SAY_BLASTMASTER_5, me);
Talk(SAY_BLASTMASTER_5);
Summon(1);
if (instance)
if (GameObject* go = GameObject::GetGameObject(*me, instance->GetData64(DATA_GO_CAVE_IN_RIGHT)))
@@ -452,12 +461,12 @@ public:
NextStep(3000, true);
break;
case 7:
DoScriptText(SAY_BLASTMASTER_6, me);
Talk(SAY_BLASTMASTER_6);
SetEscortPaused(false);
NextStep(0, false, 0);
break;
case 8:
me->HandleEmoteCommand(EMOTE_STATE_WORK);
me->HandleEmoteCommand(EMOTE_STATE_USE_STANDING);
NextStep(25000, true);
break;
case 9:
@@ -469,28 +478,28 @@ public:
NextStep(0, false);
break;
case 11:
DoScriptText(SAY_BLASTMASTER_17, me);
Talk(SAY_BLASTMASTER_17);
NextStep(5000, true);
break;
case 12:
DoScriptText(SAY_BLASTMASTER_18, me);
Talk(SAY_BLASTMASTER_18);
NextStep(5000, true);
break;
case 13:
DoScriptText(SAY_BLASTMASTER_20, me);
Talk(SAY_BLASTMASTER_20);
CaveDestruction(true);
NextStep(8000, true);
break;
case 14:
DoScriptText(SAY_BLASTMASTER_21, me);
Talk(SAY_BLASTMASTER_21);
NextStep(8500, true);
break;
case 15:
DoScriptText(SAY_BLASTMASTER_22, me);
Talk(SAY_BLASTMASTER_22);
NextStep(2000, true);
break;
case 16:
DoScriptText(SAY_BLASTMASTER_23, me);
Talk(SAY_BLASTMASTER_23);
SetInFace(false);
if (instance)
if (GameObject* go = GameObject::GetGameObject(*me, instance->GetData64(DATA_GO_CAVE_IN_LEFT)))
@@ -499,7 +508,7 @@ public:
break;
case 17:
SetEscortPaused(false);
DoScriptText(SAY_BLASTMASTER_24, me);
Talk(SAY_BLASTMASTER_24);
Summon(6);
NextStep(0, false);
break;
@@ -510,11 +519,11 @@ public:
case 19:
SetInFace(false);
Summon(8);
DoScriptText(SAY_BLASTMASTER_25, me);
Talk(SAY_BLASTMASTER_25);
NextStep(0, false);
break;
case 20:
DoScriptText(SAY_BLASTMASTER_27, me);
Talk(SAY_BLASTMASTER_27);
NextStep(2000, true);
break;
case 21:
@@ -523,7 +532,12 @@ public:
break;
case 22:
CaveDestruction(false);
DoScriptText(SAY_BLASTMASTER_20, me);
Talk(SAY_BLASTMASTER_20);
NextStep(2000, true);
break;
case 23:
Summon(10);
Talk(SAY_BLASTMASTER_28);
NextStep(0, false);
break;
}

3
src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h
View File

@@ -21,7 +21,8 @@
enum eGameObjects
{
GO_CAVE_IN_LEFT = 146085,
GO_CAVE_IN_RIGHT = 146086
GO_CAVE_IN_RIGHT = 146086,
GO_RED_ROCKET = 103820
};
enum eCreatures

2
src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
View File

@@ -168,7 +168,7 @@ public:
void Reset()
{
uiDarkOffering = urand(290, 10);
uiDarkOffering = urand(200, 1000);
}
void UpdateAI(uint32 const uiDiff)

4
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
View File

@@ -696,7 +696,7 @@ class npc_halion_controller : public CreatureScript
halion->AI()->Talk(SAY_INTRO);
break;
case EVENT_TWILIGHT_MENDING:
if (Creature* halion = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_HALION)))
if (ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_HALION))) // Just check if physical Halion is spawned
if (Creature* twilightHalion = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_TWILIGHT_HALION)))
twilightHalion->CastSpell((Unit*)NULL, SPELL_TWILIGHT_MENDING, true);
break;
@@ -1115,7 +1115,7 @@ class npc_combustion_consumption : public CreatureScript
struct npc_combustion_consumptionAI : public Scripted_NoMovementAI
{
npc_combustion_consumptionAI(Creature* creature) : Scripted_NoMovementAI(creature),
_summonerGuid(0), _instance(creature->GetInstanceScript())
_instance(creature->GetInstanceScript()), _summonerGuid(0)
{
switch (me->GetEntry())
{

2
src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
View File

@@ -86,7 +86,7 @@ public:
uiConsumeTimer = 15*IN_MILLISECONDS;
uiAuraCountTimer = 15500;
uiCrushTimer = urand(1*IN_MILLISECONDS, 5*IN_MILLISECONDS);
uiInfectedWoundTimer = urand(60*IN_MILLISECONDS, 10*IN_MILLISECONDS);
uiInfectedWoundTimer = urand(10*IN_MILLISECONDS, 60*IN_MILLISECONDS);
uiExplodeCorpseTimer = 3*IN_MILLISECONDS;
uiSpawnTimer = urand(30*IN_MILLISECONDS, 40*IN_MILLISECONDS);

2
src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
View File

@@ -232,7 +232,7 @@ public:
{
npc_verdisa_beglaristrasz_eternosAI(Creature* creature) : ScriptedAI(creature) { }
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 /*type*/, uint32 id)
{
// When Belgaristraz finish his moving say grateful text
if (me->GetEntry() == NPC_BELGARISTRASZ)

4
src/server/scripts/Spells/spell_generic.cpp
View File

@@ -1581,12 +1581,12 @@ class spell_gen_luck_of_the_draw : public SpellScriptLoader
}
LFGDungeonEntry const* randomDungeon = sLFGDungeonStore.LookupEntry(*itr);
LFGDungeonData const* randomDungeon = sLFGMgr->GetLFGDungeon(*itr);
if (Group* group = owner->GetGroup())
if (Map const* map = owner->GetMap())
if (group->isLFGGroup())
if (uint32 dungeonId = sLFGMgr->GetDungeon(group->GetGUID(), true))
if (LFGDungeonEntry const* dungeon = sLFGDungeonStore.LookupEntry(dungeonId))
if (LFGDungeonData const* dungeon = sLFGMgr->GetLFGDungeon(dungeonId))
if (uint32(dungeon->map) == map->GetId() && dungeon->difficulty == uint32(map->GetDifficulty()))
if (randomDungeon && randomDungeon->type == LFG_TYPE_RANDOM)
return; // in correct dungeon

2
src/server/scripts/Spells/spell_hunter.cpp
View File

@@ -32,6 +32,7 @@
enum HunterSpells
{
HUNTER_SPELL_READINESS = 23989,
DRAENEI_SPELL_GIFT_OF_THE_NAARU = 59543,
HUNTER_SPELL_BESTIAL_WRATH = 19574,
HUNTER_PET_SPELL_LAST_STAND_TRIGGERED = 53479,
HUNTER_PET_HEART_OF_THE_PHOENIX = 55709,
@@ -340,6 +341,7 @@ class spell_hun_readiness : public SpellScriptLoader
spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER &&
spellInfo->Id != HUNTER_SPELL_READINESS &&
spellInfo->Id != HUNTER_SPELL_BESTIAL_WRATH &&
spellInfo->Id != DRAENEI_SPELL_GIFT_OF_THE_NAARU &&
spellInfo->GetRecoveryTime() > 0)
caster->RemoveSpellCooldown((itr++)->first, true);
else

2
src/server/scripts/Spells/spell_item.cpp
View File

@@ -1844,7 +1844,7 @@ class spell_item_unusual_compass : public SpellScriptLoader
{
Unit* caster = GetCaster();
caster->SetOrientation(frand(0.0f, 62832.0f) / 10000.0f);
caster->SendMovementFlagUpdate();
caster->SendMovementFlagUpdate(true);
}
void Register()

4
src/server/scripts/World/npcs_special.cpp
View File

@@ -2115,14 +2115,12 @@ class npc_shadowfiend : public CreatureScript
{
npc_shadowfiendAI(Creature* creature) : PetAI(creature) {}
void JustDied(Unit* killer)
void JustDied(Unit* /*killer*/)
{
if (me->isSummon())
if (Unit* owner = me->ToTempSummon()->GetSummoner())
if (owner->HasAura(GLYPH_OF_SHADOWFIEND))
owner->CastSpell(owner, GLYPH_OF_SHADOWFIEND_MANA, true);
PetAI::JustDied(killer);
}
};