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

*Merge

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2010-01-10 17:50:20 +01:00
parent 334de07dfb f636bf12b9
commit 2a5493a4bc
3 changed files with 59 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/FULL/world_scripts_full.sql
+1
View File
@@ -389,6 +389,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_beryl_sorcerer' WHERE `entry`=2
UPDATE `creature_template` SET `ScriptName`='npc_imprisoned_beryl_sorcerer' WHERE `entry` = 25478;
UPDATE `creature_template` SET `ScriptName`='npc_mootoo_the_younger' WHERE `entry`= 25504;
UPDATE `creature_template` SET `ScriptName`='npc_bonker_togglevolt' WHERE `entry`= 25589;
UPDATE `creature_template` SET `ScriptName`='npc_fezzix_geartwist' WHERE `entry`=25849;
/* BURNING STEPPES */
UPDATE `creature_template` SET `ScriptName`='npc_ragged_john' WHERE `entry`=9563;
sql/updates/6945_world_scriptnames.sql
+1
View File
@@ -0,0 +1 @@
UPDATE `creature_template` SET `ScriptName`='npc_fezzix_geartwist' WHERE `entry`=25849;
src/bindings/scripts/scripts/northrend/borean_tundra.cpp
+50 -17
View File
@@ -533,13 +533,13 @@ enum eJenny
struct TRINITY_DLL_DECL npc_jennyAI : public ScriptedAI
{
npc_jennyAI(Creature *c) : ScriptedAI(c) {}
npc_jennyAI(Creature* pCreature) : ScriptedAI(pCreature) {}
bool setCrateNumber;
void Reset()
{
if(!setCrateNumber == false)
if(!setCrateNumber)
setCrateNumber = true;
m_creature->SetReactState(REACT_PASSIVE);
@@ -561,19 +561,6 @@ struct TRINITY_DLL_DECL npc_jennyAI : public ScriptedAI
DoCast(m_creature, SPELL_DROP_CRATE, true);
}
void MoveInLineOfSight(Unit* pWho)
{
if(pWho->GetEntry() == NPC_FEZZIX_GEARTWIST)
{
if(CAST_PLR(m_creature->GetOwner())->GetQuestStatus(QUEST_LOADER_UP) == QUEST_STATUS_INCOMPLETE && m_creature->GetAura(SPELL_CRATES_CARRIED))
{
DoCast(CAST_PLR(m_creature->GetOwner()), SPELL_GIVE_JENNY_CREDIT, true); // Maybe is not working.
CAST_PLR(m_creature->GetOwner())->CompleteQuest(QUEST_LOADER_UP);
m_creature->DisappearAndDie();
}
}
}
void UpdateAI(const uint32 diff)
{
if(setCrateNumber)
@@ -582,8 +569,11 @@ struct TRINITY_DLL_DECL npc_jennyAI : public ScriptedAI
setCrateNumber = false;
}
if (setCrateNumber == false && !m_creature->HasAura(SPELL_CRATES_CARRIED))
if (!setCrateNumber && !m_creature->HasAura(SPELL_CRATES_CARRIED))
m_creature->DisappearAndDie();
if (!UpdateVictim())
return;
}
};
@@ -593,7 +583,45 @@ CreatureAI* GetAI_npc_jenny(Creature *pCreature)
}
/*######
## npc_npc_nesingwary_trapper
## npc_fezzix_geartwist
######*/
struct TRINITY_DLL_DECL npc_fezzix_geartwistAI : public ScriptedAI
{
npc_fezzix_geartwistAI(Creature* pCreature) : ScriptedAI(pCreature) {}
void MoveInLineOfSight(Unit* pWho)
{
ScriptedAI::MoveInLineOfSight(pWho);
if (pWho->GetTypeId() != TYPEID_UNIT)
return;
if (pWho->GetEntry() == NPC_JENNY && m_creature->IsWithinDistInMap(pWho, 10.0f))
{
if (Unit* pOwner = pWho->GetOwner())
{
if (pOwner->GetTypeId() == TYPEID_PLAYER)
{
if (pWho->HasAura(SPELL_CRATES_CARRIED))
{
pOwner->CastSpell(pOwner, SPELL_GIVE_JENNY_CREDIT, true); // Maybe is not working.
CAST_PLR(pOwner)->CompleteQuest(QUEST_LOADER_UP);
CAST_CRE(pWho)->DisappearAndDie();
}
}
}
}
}
};
CreatureAI* GetAI_npc_fezzix_geartwist(Creature* pCreature)
{
return new npc_fezzix_geartwistAI(pCreature);
}
/*######
## npc_nesingwary_trapper
######*/
enum eNesingwaryTrapper
@@ -2015,6 +2043,11 @@ void AddSC_borean_tundra()
newscript->GetAI = &GetAI_npc_jenny;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name = "npc_fezzix_geartwist";
newscript->GetAI = &GetAI_npc_fezzix_geartwist;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name = "npc_nesingwary_trapper";
newscript->GetAI = &GetAI_npc_nesingwary_trapper;