From d3ba9eea44d10c3e17e679e18e44021c955378e6 Mon Sep 17 00:00:00 2001 From: maximius Date: Sat, 19 Sep 2009 12:50:58 -0700 Subject: *Missed changes! >< --HG-- branch : trunk --- .../scripts/scripts/northrend/borean_tundra.cpp | 6 ++-- src/bindings/scripts/scripts/world/go_scripts.cpp | 32 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/bindings/scripts/scripts/northrend/borean_tundra.cpp b/src/bindings/scripts/scripts/northrend/borean_tundra.cpp index 543b10eb903..543f31157df 100644 --- a/src/bindings/scripts/scripts/northrend/borean_tundra.cpp +++ b/src/bindings/scripts/scripts/northrend/borean_tundra.cpp @@ -467,13 +467,13 @@ struct TRINITY_DLL_DECL mob_nerubar_victimAI : public ScriptedAI { if( CAST_PLR(Killer)->GetQuestStatus(11611) == QUEST_STATUS_INCOMPLETE) { - uint8 rand = rand()%100; - if(rand < 25) + uint8 uiRand = rand()%100; + if(uiRand < 25) { Killer->CastSpell(m_creature,45532,true); CAST_PLR(Killer)->KilledMonsterCredit(WARSONG_PEON, 0); } - else if(rand < 75) + else if(uiRand < 75) Killer->CastSpell(m_creature,nerubarVictims[rand()%3],true); } } diff --git a/src/bindings/scripts/scripts/world/go_scripts.cpp b/src/bindings/scripts/scripts/world/go_scripts.cpp index c10062782c4..e9107bec4dc 100644 --- a/src/bindings/scripts/scripts/world/go_scripts.cpp +++ b/src/bindings/scripts/scripts/world/go_scripts.cpp @@ -379,6 +379,38 @@ bool GOHello_go_tele_to_violet_stand(Player* pPlayer, GameObject* pGo) return true; } +/*###### +## go_fel_crystalforge +######*/ + +enum +{ + SPELL_CREATE_1_FLASK_OF_BEAST = 40964, + SPELL_CREATE_5_FLASK_OF_BEAST = 40965, +}; + +bool GOHello_go_fel_crystalforge(Player* pPlayer, GameObject* pGO) +{ + pPlayer->CastSpell(pPlayer,SPELL_CREATE_1_FLASK_OF_BEAST,false); + return false; +} + +/*###### +## go_bashir_crystalforge +######*/ + +enum +{ + SPELL_CREATE_1_FLASK_OF_SORCERER = 40968, + SPELL_CREATE_5_FLASK_OF_SORCERER = 40970, +}; + +bool GOHello_go_bashir_crystalforge(Player* pPlayer, GameObject* pGO) +{ + pPlayer->CastSpell(pPlayer,SPELL_CREATE_1_FLASK_OF_SORCERER,false); + return false; +} + void AddSC_go_scripts() { Script *newscript; -- cgit v1.2.3