Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 16:10:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge [SD2]

Browse Source 
r1146 Use ForcedDespawn() where possible and remove some not needed function calls. Code style applied. Requires Mangos 8040+
r1147 Make Millhouse have better movement, using distance for MoveChase
r1148 Added missing call sendGossipMenu
r1149 Correct mixed up emote and language in one script_texts
r1150 Update custom SD2 patch for Mangos 0.12 branch - skip

--HG--
branch : trunk
This commit is contained in:
Kudlaty
2009-08-07 18:07:40 +02:00
parent 4e07fd3a0f
commit be74be36f6
7 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/FULL/world_script_texts.sql
View File

@@ -346,7 +346,7 @@ INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc1`, `content
(-1000428, 'Ah...the wondrous sound of kodos. I love the way they make the ground shake... inspect the beast for me.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0,'kodo round SAY_SMEED_HOME_1'),
(-1000429, 'Hey, look out with that kodo! You had better inspect that beast before i give you credit!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0,'kodo round SAY_SMEED_HOME_2'),
(-1000430, 'That kodo sure is a beauty. Wait a minute, where are my bifocals? Perhaps you should inspect the beast for me.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'kodo round SAY_SMEED_HOME_3'),
(-1000431, 'Okay, okay... gimme a minute to rest now. You gone and beat me up good.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 14, 1, 'calvin SAY_COMPLETE');
(-1000431, 'Okay, okay... gimme a minute to rest now. You gone and beat me up good.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 1, 14, 'calvin SAY_COMPLETE');
-- -1 033 000 SHADOWFANG KEEP
INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`, `sound`, `type`, `language`, `emote`, `comment`) VALUES

1
sql/updates/4806_script_texts.sql Normal file
View File

@@ -0,0 +1 @@
UPDATE script_texts SET language=1, emote=14 WHERE entry=-1000431;

3
src/bindings/scripts/scripts/npc/npc_escortAI.cpp
View File

@@ -114,9 +114,6 @@ void npc_escortAI::UpdateAI(const uint32 diff)
debug_log("TSCR: EscortAI reached end of waypoints");
m_creature->setDeathState(JUST_DIED);
m_creature->SetHealth(0);
m_creature->CombatStop(true);
m_creature->DeleteThreatList();
m_creature->Respawn();
m_creature->GetMotionMaster()->Clear(true);

2
src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
View File

@@ -315,7 +315,7 @@ struct TRINITY_DLL_DECL mob_ethereal_beaconAI : public ScriptedAI
m_creature->InterruptNonMeleeSpells(true);
m_creature->CastSpell(m_creature,SPELL_ETHEREAL_APPRENTICE,true);
KillSelf();
m_creature->ForcedDespawn();
return;
}else Apprentice_Timer -= diff;
}

13
src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp
View File

@@ -153,16 +153,9 @@ struct TRINITY_DLL_DECL npc_draenei_survivorAI : public ScriptedAI
if (RunAwayTimer)
{
if (RunAwayTimer <= diff)
{
m_creature->RemoveAllAuras();
m_creature->GetMotionMaster()->Clear();
m_creature->GetMotionMaster()->MoveIdle();
m_creature->setDeathState(JUST_DIED);
m_creature->SetHealth(0);
m_creature->CombatStop(true);
m_creature->DeleteThreatList();
m_creature->RemoveCorpse();
}else RunAwayTimer -= diff;
m_creature->ForcedDespawn();
else
RunAwayTimer -= diff;
return;
}

1
src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp
View File

@@ -436,6 +436,7 @@ bool GossipHello_boss_gloomrel(Player *player, Creature *_Creature)
if (player->GetQuestRewardStatus(4083) == 0 && player->GetSkillValue(SKILL_MINING) >= 230)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TRIBUTE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true;
}

11
src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp
View File

@@ -98,12 +98,15 @@ struct TRINITY_DLL_DECL npc_millhouse_manastormAI : public ScriptedAI
}
}
void AttackStart(Unit* who)
void AttackStart(Unit* pWho)
{
if (m_creature->Attack(who, true))
if (m_creature->Attack(pWho, true))
{
//TODO: Make it so he moves when target out of range
DoStartNoMovement(who);
m_creature->AddThreat(pWho, 0.0f);
m_creature->SetInCombatWith(pWho);
pWho->SetInCombatWith(m_creature);
m_creature->GetMotionMaster()->MoveChase(pWho, 25.0f);
}
}