*Merge.

--HG-- branch : trunk
2009-02-17 21:54:48 -06:00
parent be53cfe104 3931b802f1
commit 89ba43ef3e
2389 changed files with 3438 additions and 836 deletions
@@ -320,3 +320,4 @@ void ScriptedAI::DoGoHome()
        m_creature->GetMotionMaster()->MoveTargetedHome();
 }
 */
+
@@ -159,3 +159,4 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI
 };

 #endif
+
@@ -119,3 +119,4 @@ void AddSC_default()

    m_scripts[nrscripts++] = newscript;
 }
+
@@ -152,3 +152,4 @@ uint32 GetSkillLevel(Player *player,uint32 trskill)

    return TRADESKILL_LEVEL_NONE;
 }
+
@@ -96,3 +96,4 @@ extern uint32 GetSkillLevel(Player *player,uint32 skill);

 // -----------------------------------
 #endif
+
@@ -31,3 +31,4 @@
 #else
 #define TRINITY_DLL_EXPORT extern "C" export
 #endif
+
@@ -25,3 +25,4 @@ BOOL APIENTRY DllMain( HANDLE /*hModule*/, DWORD  /*ul_reason_for_call*/, LPVOID
    return true;
 }
 #endif
+
@@ -2115,3 +2115,4 @@ InstanceData* CreateInstanceData(Map *map)

    return tmpscript->GetInstanceData(map);
 }
+
@@ -82,3 +82,4 @@ void DoScriptText(int32 textEntry, WorldObject* pSource, Unit* target = NULL);
 #endif

 #endif
+
@@ -3,3 +3,4 @@
 * Please see the included DOCS/LICENSE.TXT for more information */

 #include "precompiled.h"
+
@@ -28,3 +28,4 @@ LPVOID lpReserved
 #endif

 #endif
+
@@ -857,3 +857,4 @@ void LoadOverridenDBCData()
    if(spellInfo)
        spellInfo->EffectApplyAuraName[0] = 4; // proc debuff, and summon infinite fiends
 }
+
@@ -205,3 +205,4 @@ struct TRINITY_DLL_DECL NullCreatureAI : public ScriptedAI
 };

 #endif
+
@@ -184,3 +184,4 @@ extern uint32 GetSkillLevel(Player *player,uint32 skill);

 #define QUEST_DIALOG_STATUS(a,b,c)   GetSession()->getDialogStatus(a,b,c)
 #endif
+
@@ -43,3 +43,4 @@ class TRINITY_DLL_DECL ScriptedInstance : public InstanceData
 };

 #endif
+
@@ -76,3 +76,4 @@ void AddSC_areatrigger_scripts()
    newscript->pAreaTrigger = &ATtest;
    newscript->RegisterSelf();
 }
+
@@ -154,3 +154,4 @@ void AddSC_boss_emeriss()
    newscript->GetAI = &GetAI_boss_emeriss;
    newscript->RegisterSelf();
 }
+
@@ -22,3 +22,4 @@ SDCategory: Bosses
 EndScriptData */

 #include "precompiled.h"
+
@@ -304,3 +304,4 @@ void AddSC_boss_taerar()
    newscript->GetAI = &GetAI_boss_shadeoftaerar;
    newscript->RegisterSelf();
 }
+
@@ -244,3 +244,4 @@ void AddSC_boss_ysondre()
    newscript->GetAI = &GetAI_mob_dementeddruids;
    newscript->RegisterSelf();
 }
+
@@ -1395,3 +1395,4 @@ void AddSC_mob_event()
    newscript->GetAI = &GetAI_Mob_EventAI;
    newscript->RegisterSelf();
 }
+
@@ -218,3 +218,4 @@ extern UNORDERED_MAP<uint32, EventAI_CreatureError> EventAI_CreatureErrorPrevent
 #define EVENTAI_EMPTY_EVENTLIST         "SD2: Eventlist for Creature %i is empty but creature is using Mob_EventAI. Preventing EventAI on this creature."
 */
 #endif
+
@@ -170,3 +170,4 @@ void AddSC_generic_creature()
    newscript->GetAI = &GetAI_generic_creature;
    newscript->RegisterSelf();
 }
+
@@ -292,3 +292,4 @@ void SimpleAI::UpdateAI(const uint32 diff)

    DoMeleeAttackIfReady();
 }
+
@@ -72,3 +72,4 @@ protected:
 };

 #endif
+
@@ -275,3 +275,4 @@ void AddSC_custom_example()
    newscript->pReceiveEmote = &ReceiveEmote_custom_example;
    newscript->RegisterSelf();
 }
+
@@ -79,3 +79,4 @@ void AddSC_custom_gossip_codebox()
    newscript->pGossipSelectWithCode =  &GossipSelectWithCode_custom_gossip_codebox;
    newscript->RegisterSelf();
 }
+
@@ -198,3 +198,4 @@ void AddSC_test()
    newscript->pGossipSelect         = &GossipSelect_npc_test;
    newscript->RegisterSelf();
 }
+
@@ -207,3 +207,4 @@ void AddSC_go_scripts()
    newscript->pGOHello =           &GOHello_go_teleporter;
    newscript->RegisterSelf();
 }
+
@@ -171,3 +171,4 @@ void guardAI::UpdateAI(const uint32 diff)
        }
    }
 }
+
@@ -23,3 +23,4 @@ struct TRINITY_DLL_DECL guardAI : public ScriptedAI
    void UpdateAI(const uint32 diff);
 };
 #endif
+
@@ -4071,3 +4071,4 @@ void AddSC_guards()
    newscript->GetAI = &GetAI_guard_undercity;
    newscript->RegisterSelf();
 }
+
@@ -593,3 +593,4 @@ void AddSC_item_scripts()
    newscript->pItemUse = &ItemUse_item_zezzak_shard;
    newscript->RegisterSelf();
 }
+
@@ -40,3 +40,4 @@ void AddSC_item_test()
    newscript->pItemUse = &ItemUse_item_test;
    newscript->RegisterSelf();
 }
+
@@ -300,3 +300,4 @@ void npc_escortAI::Start(bool bAttack, bool bDefend, bool bRun, uint64 pGUID)
    //Disable questgiver flag
    m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
 }
+
@@ -85,3 +85,4 @@ struct TRINITY_DLL_DECL npc_escortAI : public ScriptedAI
        bool Run;
 };
 #endif
+
@@ -142,3 +142,4 @@ void AddSC_npc_innkeeper()
    newscript->pGossipSelect = &GossipSelect_npc_innkeeper;
    newscript->RegisterSelf();
 }
+
@@ -1203,3 +1203,4 @@ void AddSC_npc_professions()
    //newscript->pGossipSelect = &GossipSelect_go_soothsaying_for_dummies;
    newscript->RegisterSelf();*/
 }
+
@@ -1207,3 +1207,4 @@ void AddSC_npcs_special()
    newscript->GetAI = &GetAI_npc_snake_trap_serpents;
    newscript->RegisterSelf();
 }
+
@@ -60,3 +60,4 @@ void AddSC_alterac_mountains()
    newscript->GetAI = &GetAI_npc_ravenholdt;
    newscript->RegisterSelf();
 }
+
@@ -162,3 +162,4 @@ void AddSC_arathi_highlands()
    newscript->pQuestAccept = &QuestAccept_npc_professor_phizzlethorpe;
    newscript->RegisterSelf();
 }
+
@@ -314,3 +314,4 @@ void AddSC_ashenvale()
    newscript->pQuestAccept = &QuestAccept_npc_ruul_snowhoof;
    newscript->RegisterSelf();
 }
+
@@ -356,3 +356,4 @@ void AddSC_boss_exarch_maladaar()
    newscript->GetAI = &GetAI_mob_stolen_soul;
    newscript->RegisterSelf();
 }
+
@@ -208,4 +208,5 @@ void AddSC_boss_shirrak_the_dead_watcher()
    newscript->Name="mob_focus_fire";
    newscript->GetAI = &GetAI_mob_focus_fire;
    newscript->RegisterSelf();
-}
+}
+
@@ -287,3 +287,4 @@ void AddSC_boss_nexusprince_shaffar()
    newscript->GetAI = &GetAI_mob_ethereal_beacon;
    newscript->RegisterSelf();
 }
+
@@ -136,3 +136,4 @@ void AddSC_boss_pandemonius()
    newscript->GetAI = &GetAI_boss_pandemonius;
    newscript->RegisterSelf();
 }
+
@@ -440,3 +440,4 @@ void AddSC_boss_darkweaver_syth()
    newscript->GetAI = &GetAI_mob_syth_shadow;
    newscript->RegisterSelf();
 }
+
@@ -219,3 +219,4 @@ void AddSC_boss_talon_king_ikiss()
    newscript->GetAI = &GetAI_boss_talon_king_ikiss;
    newscript->RegisterSelf();
 }
+
@@ -7,3 +7,4 @@

 #define DATA_IKISSDOOREVENT 1
 #endif
+
@@ -72,3 +72,4 @@ void AddSC_instance_sethekk_halls()
    newscript->GetInstanceData = &GetInstanceData_instance_sethekk_halls;
    newscript->RegisterSelf();
 }
+
@@ -203,3 +203,4 @@ void AddSC_boss_ambassador_hellmaw()
    newscript->GetAI = &GetAI_boss_ambassador_hellmaw;
    newscript->RegisterSelf();
 }
+
@@ -175,3 +175,4 @@ void AddSC_boss_blackheart_the_inciter()
    newscript->GetAI = &GetAI_boss_blackheart_the_inciter;
    newscript->RegisterSelf();
 }
+
@@ -321,3 +321,4 @@ void AddSC_boss_grandmaster_vorpil()
    newscript->GetAI = &GetAI_mob_voidtraveler;
    newscript->RegisterSelf();
 }
+
@@ -180,3 +180,4 @@ void AddSC_boss_murmur()
    newscript->GetAI = &GetAI_boss_murmur;
    newscript->RegisterSelf();
 }
+
@@ -12,3 +12,4 @@
 #define DATA_MURMUREVENT 5
 #define DATA_GRANDMASTERVORPIL 6
 #endif
+
@@ -244,3 +244,4 @@ void AddSC_instance_shadow_labyrinth()
    newscript->GetInstanceData = &GetInstanceData_instance_shadow_labyrinth;
    newscript->RegisterSelf();
 }
+
@@ -515,3 +515,4 @@ void AddSC_azshara()
    newscript->GetAI = &GetAI_mob_depth_charge;
    newscript->RegisterSelf();
 }
+
@@ -152,3 +152,4 @@ void AddSC_boss_azuregos()
    newscript->GetAI = &GetAI_boss_azuregos;
    newscript->RegisterSelf();
 }
+
@@ -698,3 +698,4 @@ void AddSC_azuremyst_isle()
    newscript->RegisterSelf();

 }
+
@@ -557,3 +557,4 @@ void AddSC_the_barrens()
    newscript->pQuestAccept = &QuestAccept_npc_wizzlecrank_shredder;
    newscript->RegisterSelf();
 }
+
@@ -66,3 +66,4 @@ void AddSC_black_temple()
    newscript->pGossipSelect = &GossipSelect_npc_spirit_of_olum;
    newscript->RegisterSelf();
 }
+
@@ -345,3 +345,4 @@ void AddSC_boss_gurtogg_bloodboil()
    newscript->GetAI = &GetAI_boss_gurtogg_bloodboil;
    newscript->RegisterSelf();
 }
+
@@ -2214,3 +2214,4 @@ void AddSC_boss_illidan()
    newscript->GetAI = &GetAI_parasitic_shadowfiend;
    newscript->RegisterSelf();
 }
+
@@ -313,3 +313,4 @@ void AddSC_boss_mother_shahraz()
    newscript->GetAI = &GetAI_boss_shahraz;
    newscript->RegisterSelf();
 }
+
@@ -685,3 +685,4 @@ void AddSC_boss_reliquary_of_souls()
    newscript->GetAI = &GetAI_npc_enslaved_soul;
    newscript->RegisterSelf();
 }
+
@@ -836,3 +836,4 @@ void AddSC_boss_shade_of_akama()
    newscript->pGossipSelect = &GossipSelect_npc_akama;
    newscript->RegisterSelf();
 }
+
@@ -311,3 +311,4 @@ void AddSC_boss_supremus()
    newscript->GetAI = &GetAI_npc_volcano;
    newscript->RegisterSelf();
 }
+
@@ -534,3 +534,4 @@ void AddSC_boss_teron_gorefiend()
    newscript->GetAI = &GetAI_boss_teron_gorefiend;
    newscript->RegisterSelf();
 }
+
@@ -223,3 +223,4 @@ void AddSC_boss_najentus()
    newscript->pGOHello = &GOHello_go_najentus_spine;
    newscript->RegisterSelf();
 }
+
@@ -32,3 +32,4 @@
 #define DATA_GAMEOBJECT_SUPREMUS_DOORS  25
 #define DATA_BLOOD_ELF_COUNCIL_VOICE    26
 #endif
+
@@ -865,3 +865,4 @@ void AddSC_boss_illidari_council()
    newscript->GetAI = &GetAI_boss_high_nethermancer_zerevor;
    newscript->RegisterSelf();
 }
+
@@ -349,3 +349,4 @@ void AddSC_instance_black_temple()
    newscript->GetInstanceData = &GetInstanceData_instance_black_temple;
    newscript->RegisterSelf();
 }
+
@@ -1322,3 +1322,4 @@ void AddSC_blackrock_depths()
     newscript->pChooseReward = &ChooseReward_npc_rocknot;
     newscript->RegisterSelf();
 }
+
@@ -104,3 +104,4 @@ void AddSC_boss_ambassador_flamelash()
    newscript->GetAI = &GetAI_boss_ambassador_flamelash;
    newscript->RegisterSelf();
 }
+
@@ -113,3 +113,4 @@ void AddSC_boss_anubshiah()
    newscript->GetAI = &GetAI_boss_anubshiah;
    newscript->RegisterSelf();
 }
+
@@ -102,3 +102,4 @@ void AddSC_boss_draganthaurissan()
    newscript->GetAI = &GetAI_boss_draganthaurissan;
    newscript->RegisterSelf();
 }
+
@@ -165,3 +165,4 @@ void AddSC_boss_general_angerforge()
    newscript->GetAI = &GetAI_boss_general_angerforge;
    newscript->RegisterSelf();
 }
+
@@ -79,3 +79,4 @@ void AddSC_boss_gorosh_the_dervish()
    newscript->GetAI = &GetAI_boss_gorosh_the_dervish;
    newscript->RegisterSelf();
 }
+
@@ -84,3 +84,4 @@ void AddSC_boss_grizzle()
    newscript->GetAI = &GetAI_boss_grizzle;
    newscript->RegisterSelf();
 }
+
@@ -103,3 +103,4 @@ void AddSC_boss_high_interrogator_gerstahn()
    newscript->GetAI = &GetAI_boss_high_interrogator_gerstahn;
    newscript->RegisterSelf();
 }
+
@@ -82,3 +82,4 @@ void AddSC_boss_magmus()
    newscript->GetAI = &GetAI_boss_magmus;
    newscript->RegisterSelf();
 }
+
@@ -97,3 +97,4 @@ void AddSC_boss_moira_bronzebeard()
    newscript->GetAI = &GetAI_boss_moira_bronzebeard;
    newscript->RegisterSelf();
 }
+
@@ -641,3 +641,4 @@ void AddSC_boss_tomb_of_seven()
    newscript->pGossipSelect = &GossipSelect_boss_doomrel;
    newscript->RegisterSelf();
 }
+
@@ -23,4 +23,5 @@
 #define DATA_GO_BAR_KEG         16
 #define DATA_GO_BAR_KEG_TRAP    17
 #define DATA_GO_BAR_DOOR        18
-#endif
+#endif
+
@@ -304,4 +304,5 @@ InstanceData* GetInstanceData_instance_blackrock_depths(Map* map)
       newscript->Name = "instance_blackrock_depths";
       newscript->GetInstanceData = &GetInstanceData_instance_blackrock_depths;
       newscript->RegisterSelf();
-   }
+   }
+
@@ -99,3 +99,4 @@ void AddSC_boss_drakkisath()
    newscript->GetAI = &GetAI_boss_drakkisath;
    newscript->RegisterSelf();
 }
+
@@ -203,3 +203,4 @@ void AddSC_boss_gyth()
    newscript->GetAI = &GetAI_boss_gyth;
    newscript->RegisterSelf();
 }
+
@@ -93,3 +93,4 @@ void AddSC_boss_halycon()
    newscript->GetAI = &GetAI_boss_halycon;
    newscript->RegisterSelf();
 }
+
@@ -129,3 +129,4 @@ void AddSC_boss_highlordomokk()
    newscript->GetAI = &GetAI_boss_highlordomokk;
    newscript->RegisterSelf();
 }
+
@@ -84,3 +84,4 @@ void AddSC_boss_mothersmolderweb()
    newscript->GetAI = &GetAI_boss_mothersmolderweb;
    newscript->RegisterSelf();
 }
+
@@ -125,3 +125,4 @@ void AddSC_boss_overlordwyrmthalak()
    newscript->GetAI = &GetAI_boss_overlordwyrmthalak;
    newscript->RegisterSelf();
 }
+
@@ -91,3 +91,4 @@ void AddSC_boss_pyroguard_emberseer()
    newscript->GetAI = &GetAI_boss_pyroguard_emberseer;
    newscript->RegisterSelf();
 }
+
@@ -83,3 +83,4 @@ void AddSC_boss_quatermasterzigris()
    newscript->GetAI = &GetAI_boss_quatermasterzigris;
    newscript->RegisterSelf();
 }
+
@@ -89,3 +89,4 @@ void AddSC_boss_rend_blackhand()
    newscript->GetAI = &GetAI_boss_rend_blackhand;
    newscript->RegisterSelf();
 }
+
@@ -93,3 +93,4 @@ void AddSC_boss_shadowvosh()
    newscript->GetAI = &GetAI_boss_shadowvosh;
    newscript->RegisterSelf();
 }
+
@@ -91,3 +91,4 @@ void AddSC_boss_thebeast()
    newscript->GetAI = &GetAI_boss_thebeast;
    newscript->RegisterSelf();
 }
+
@@ -119,3 +119,4 @@ void AddSC_boss_warmastervoone()
    newscript->GetAI = &GetAI_boss_warmastervoone;
    newscript->RegisterSelf();
 }
+
@@ -126,3 +126,4 @@ void AddSC_boss_broodlord()
    newscript->GetAI = &GetAI_boss_broodlord;
    newscript->RegisterSelf();
 }
+
@@ -312,3 +312,4 @@ void AddSC_boss_chromaggus()
    newscript->GetAI = &GetAI_boss_chromaggus;
    newscript->RegisterSelf();
 }
+
@@ -101,3 +101,4 @@ void AddSC_boss_ebonroc()
    newscript->GetAI = &GetAI_boss_ebonroc;
    newscript->RegisterSelf();
 }
+
--- a/Show More
+++ b/Show More