Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 02:25:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Gilneas:

Browse Source 
* added more sparring datas
* fixed Quests "Sacrifices" and "By Blood and Ash"
* added missing reward spells for quest "The Last Stand"
* killed some duplicate spawns
* added emote states to Tobias Mistmantle and Lord Darius Crowley
* gave the interior rebels a SAI script to look for enemies if not on combat
This commit is contained in:
Ovalord
2018-01-13 18:41:20 +01:00
parent dd2ab26731
commit 06aeeb59bd
3 changed files with 302 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
src/server/scripts/EasternKingdoms/Gilneas/chapter1.cpp
View File

@@ -508,9 +508,11 @@ class npc_greymanes_horse : public CreatureScript
case EVENT_ANNOUNCE_RESCUE:
me->SetControlled(true, UNIT_STATE_ROOT);
if (Unit* passenger = me->GetVehicleKit()->GetPassenger(0))
{
Talk(SAY_ANNOUNCE_RESCUE, passenger);
if (Creature* krennan = me->FindNearestCreature(NPC_TRAPPED_KRENNAN, 30.0f, true))
krennan->AI()->Talk(SAY_TRAPPED);
if (Creature* krennan = me->FindNearestCreature(NPC_TRAPPED_KRENNAN, 30.0f, true))
krennan->AI()->Talk(SAY_TRAPPED, passenger);
}
break;
case EVENT_START_PATH_2:
me->SetControlled(true, UNIT_STATE_ROOT);
@@ -547,10 +549,125 @@ class npc_greymanes_horse : public CreatureScript
}
};
/*######
## Quest 14212 - Sacrifices
######*/
enum CrowleysHorse
{
EVENT_JUMP_OVER_BARRICADES_1 = 1,
EVENT_JUMP_OVER_BARRICADES_2,
EVENT_MOVE_PATH_MAIN_1,
EVENT_MOVE_PATH_MAIN_2,
EVENT_MOVE_OFF_PATH = 6,
PATH_ID_CROWLEYS_HORSE_1 = 352310,
PATH_ID_CROWLEYS_HORSE_2 = 352311,
PATH_ID_CROWLEYS_HORSE_3 = 444280,
SPELL_THROW_TORCH = 67063,
NPC_CROWLEYS_HORSE_2 = 44428,
};
Position const crowleysHorseJumpPos = { -1714.762f, 1673.16f, 20.49182f };
Position const crowleysHorseJumpPos2 = { -1566.71f, 1708.04f, 20.4849f };
class npc_crowleys_horse : public CreatureScript
{
public:
npc_crowleys_horse() : CreatureScript("npc_crowleys_horse") { }
struct npc_crowleys_horseAI : public VehicleAI
{
npc_crowleys_horseAI(Creature* creature) : VehicleAI(creature)
{
Initialize();
}
void Initialize()
{
_currentPath = 0;
}
void PassengerBoarded(Unit* passenger, int8 /*seatId*/, bool apply) override
{
if (apply && passenger->GetTypeId() == TYPEID_PLAYER && me->GetEntry() != NPC_CROWLEYS_HORSE_2)
{
me->SetControlled(true, UNIT_STATE_ROOT);
_events.ScheduleEvent(EVENT_JUMP_OVER_BARRICADES_1, Seconds(2));
}
else if (apply && passenger->GetTypeId() == TYPEID_PLAYER)
{
me->SetControlled(true, UNIT_STATE_ROOT);
_events.ScheduleEvent(EVENT_MOVE_OFF_PATH, Seconds(2));
}
}
void MovementInform(uint32 type, uint32 pointId) override
{
if (type == WAYPOINT_MOTION_TYPE && pointId == 14 && _currentPath == PATH_ID_CROWLEYS_HORSE_1)
_events.ScheduleEvent(EVENT_JUMP_OVER_BARRICADES_2, Seconds(1));
else if (type == WAYPOINT_MOTION_TYPE && pointId == 15 && _currentPath == PATH_ID_CROWLEYS_HORSE_2)
_events.ScheduleEvent(EVENT_DISMOUNT_PLAYER, Milliseconds(1));
else if (type == WAYPOINT_MOTION_TYPE && pointId == 16 && _currentPath == PATH_ID_CROWLEYS_HORSE_3)
_events.ScheduleEvent(EVENT_DISMOUNT_PLAYER, Milliseconds(1));
}
void UpdateAI(uint32 diff) override
{
_events.Update(diff);
while (uint32 eventId = _events.ExecuteEvent())
{
switch (eventId)
{
case EVENT_JUMP_OVER_BARRICADES_1:
me->SetControlled(false, UNIT_STATE_ROOT);
me->GetMotionMaster()->MoveJump(crowleysHorseJumpPos, 16.0f, 18.56182f);
_events.ScheduleEvent(EVENT_MOVE_PATH_MAIN_1, Seconds(2));
break;
case EVENT_MOVE_PATH_MAIN_1:
me->GetMotionMaster()->MovePath(PATH_ID_CROWLEYS_HORSE_1, false);
_currentPath = PATH_ID_CROWLEYS_HORSE_1;
break;
case EVENT_JUMP_OVER_BARRICADES_2:
me->GetMotionMaster()->MoveJump(crowleysHorseJumpPos2, 16.0f, 18.56182f);
_events.ScheduleEvent(EVENT_MOVE_PATH_MAIN_2, Seconds(2));
break;
case EVENT_MOVE_PATH_MAIN_2:
_currentPath = PATH_ID_CROWLEYS_HORSE_2;
me->GetMotionMaster()->MovePath(PATH_ID_CROWLEYS_HORSE_2, false);
break;
case EVENT_DISMOUNT_PLAYER:
me->RemoveAurasDueToSpell(VEHICLE_SPELL_RIDE_HARDCODED);
me->DespawnOrUnsummon(Seconds(5));
break;
case EVENT_MOVE_OFF_PATH:
me->SetControlled(false, UNIT_STATE_ROOT);
_currentPath = PATH_ID_CROWLEYS_HORSE_3;
me->GetMotionMaster()->MovePath(PATH_ID_CROWLEYS_HORSE_3, false);
break;
default:
break;
}
}
}
private:
EventMap _events;
uint32 _currentPath;
};
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_crowleys_horseAI(creature);
}
};
void AddSC_gilneas_c1()
{
new npc_frightened_citizen();
new npc_worgen_runt();
new npc_josiah_avery();
new npc_greymanes_horse();
new npc_crowleys_horse();
}

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

@@ -4674,6 +4674,46 @@ class spell_gen_gilneas_prison_periodic_dummy : public SpellScriptLoader
}
};
enum Sacrifices
{
CREDIT_ROUND_UP_WORGEN = 35582,
SPELL_THROW_TORCH = 67063
};
class spell_gen_throw_torch : public SpellScriptLoader
{
public:
spell_gen_throw_torch() : SpellScriptLoader("spell_gen_throw_torch") { }
class spell_gen_throw_torch_SpellScript : public SpellScript
{
PrepareSpellScript(spell_gen_throw_torch_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo( { SPELL_THROW_TORCH });
}
void HandleEffect()
{
if (Player* player = GetCaster()->ToPlayer())
if (GetHitUnit() && !GetHitUnit()->HasAura(SPELL_THROW_TORCH))
player->KilledMonsterCredit(CREDIT_ROUND_UP_WORGEN);
}
void Register()
{
BeforeHit += SpellHitFn(spell_gen_throw_torch_SpellScript::HandleEffect);
}
};
SpellScript* GetSpellScript() const
{
return new spell_gen_throw_torch_SpellScript();
}
};
void AddSC_generic_spell_scripts()
{
new spell_gen_absorb0_hitlimit1();
@@ -4780,4 +4820,5 @@ void AddSC_generic_spell_scripts()
new spell_gen_projectile_goods();
new spell_gen_vengeance();
new spell_gen_gilneas_prison_periodic_dummy();
new spell_gen_throw_torch();
}