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

Scripts/Eastern Kingdoms: merged zone_goldshire into zone_elwynn_forest to follow standards

Browse Source
This commit is contained in:
acidmanifesto
2022-01-18 11:10:57 -05:00
committed by GitHub
parent e7f13602b6
commit 803bd2c79b
3 changed files with 257 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp
View File

@@ -230,7 +230,6 @@ void AddSC_duskwood();
//void AddSC_eastern_plaguelands();
void AddSC_elwynn_forest();
void AddSC_ghostlands();
void AddSC_goldshire();
void AddSC_hillsbrad_foothills();
void AddSC_hinterlands();
void AddSC_redridge_mountains();
@@ -463,7 +462,6 @@ void AddEasternKingdomsScripts()
//AddSC_eastern_plaguelands();
AddSC_elwynn_forest();
AddSC_ghostlands();
AddSC_goldshire();
AddSC_hillsbrad_foothills();
AddSC_hinterlands();
AddSC_redridge_mountains();

258
src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp
View File

@@ -15,14 +15,17 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "ScriptMgr.h"
#include "CellImpl.h"
#include "CreatureAIImpl.h"
#include "CreatureGroups.h"
#include "GameEventMgr.h"
#include "GameTime.h"
#include "GridNotifiersImpl.h"
#include "MotionMaster.h"
#include "ObjectAccessor.h"
#include "Player.h"
#include "ScriptedCreature.h"
#include "ScriptMgr.h"
#include "SpellScript.h"
enum Northshire
@@ -509,6 +512,258 @@ private:
EventMap _events;
};
enum COG_Paths
{
STORMWIND_PATH = 80500,
GOLDSHIRE_PATH = 80501,
WOODS_PATH = 80502,
HOUSE_PATH = 80503,
LISA_PATH = 80700
};
enum COG_Waypoints
{
STORMWIND_WAYPOINT = 57,
GOLDSHIRE_WAYPOINT = 32,
WOODS_WAYPOINT = 22,
HOUSE_WAYPOINT = 35,
LISA_WAYPOINT = 4
};
enum COG_Sounds
{
BANSHEE_DEATH = 1171,
BANSHEEPREAGGRO = 1172,
CTHUN_YOU_WILL_DIE = 8585,
CTHUN_DEATH_IS_CLOSE = 8580,
HUMAN_FEMALE_EMOTE_CRY = 6916,
GHOSTDEATH = 3416
};
enum COG_Creatures
{
NPC_DANA = 804,
NPC_CAMERON = 805,
NPC_JOHN = 806,
NPC_LISA = 807,
NPC_AARON = 810,
NPC_JOSE = 811
};
enum COG_Events
{
EVENT_WP_START_GOLDSHIRE = 1,
EVENT_WP_START_WOODS = 2,
EVENT_WP_START_HOUSE = 3,
EVENT_WP_START_LISA = 4,
EVENT_PLAY_SOUNDS = 5,
EVENT_BEGIN_EVENT = 6
};
enum COG_GameEvent
{
GAME_EVENT_CHILDREN_OF_GOLDSHIRE = 76
};
struct npc_cameron : public ScriptedAI
{
npc_cameron(Creature* creature) : ScriptedAI(creature)
{
_started = false;
}
static uint32 SoundPicker()
{
return RAND(
BANSHEE_DEATH,
BANSHEEPREAGGRO,
CTHUN_YOU_WILL_DIE,
CTHUN_DEATH_IS_CLOSE,
HUMAN_FEMALE_EMOTE_CRY,
GHOSTDEATH
);
}
void MoveTheChildren()
{
std::vector<Position> MovePosPositions =
{
{ -9373.521f, -67.71767f, 69.201965f, 1.117011f },
{ -9374.94f, -62.51654f, 69.201965f, 5.201081f },
{ -9371.013f, -71.20811f, 69.201965f, 1.937315f },
{ -9368.419f, -66.47543f, 69.201965f, 3.141593f },
{ -9372.376f, -65.49946f, 69.201965f, 4.206244f },
{ -9377.477f, -67.8297f, 69.201965f, 0.296706f }
};
Trinity::Containers::RandomShuffle(MovePosPositions);
// first we break formation because children will need to move on their own now
for (auto guid : _childrenGUIDs)
if (Creature* child = ObjectAccessor::GetCreature(*me, guid))
if (child->GetFormation())
child->GetFormation()->RemoveMember(child);
// Move each child to an random position
for (uint32 i = 0; i < _childrenGUIDs.size(); ++i)
{
if (Creature* children = ObjectAccessor::GetCreature(*me, _childrenGUIDs[i]))
{
children->SetWalk(true);
children->GetMotionMaster()->MovePoint(0, MovePosPositions.at(i));
me->SetHomePosition(MovePosPositions.at(i));
}
}
me->SetWalk(true);
me->GetMotionMaster()->MovePoint(0, MovePosPositions.back());
me->SetHomePosition(MovePosPositions.back());
}
void WaypointReached(uint32 waypointId, uint32 pathId) override
{
switch (pathId)
{
case STORMWIND_PATH:
{
if (waypointId == STORMWIND_WAYPOINT)
{
me->GetMotionMaster()->MoveRandom(10.f);
_events.ScheduleEvent(EVENT_WP_START_GOLDSHIRE, Minutes(11));
}
break;
}
case GOLDSHIRE_PATH:
{
if (waypointId == GOLDSHIRE_WAYPOINT)
{
me->GetMotionMaster()->MoveRandom(10.f);
_events.ScheduleEvent(EVENT_WP_START_WOODS, Minutes(15));
}
break;
}
case WOODS_PATH:
{
if (waypointId == WOODS_WAYPOINT)
{
me->GetMotionMaster()->MoveRandom(10.f);
_events.ScheduleEvent(EVENT_WP_START_HOUSE, Minutes(6));
_events.ScheduleEvent(EVENT_WP_START_LISA, Seconds(2));
}
break;
}
case HOUSE_PATH:
{
if (waypointId == HOUSE_WAYPOINT)
{
// Move childeren at last point
MoveTheChildren();
// After 30 seconds a random sound should play
_events.ScheduleEvent(EVENT_PLAY_SOUNDS, Seconds(30));
}
break;
}
}
}
void OnGameEvent(bool start, uint16 eventId) override
{
if (start && eventId == GAME_EVENT_CHILDREN_OF_GOLDSHIRE)
{
// Start event at 7 am
// Begin pathing
_events.ScheduleEvent(EVENT_BEGIN_EVENT, Seconds(2));
_started = true;
}
else if (!start && eventId == GAME_EVENT_CHILDREN_OF_GOLDSHIRE)
{
// Reset event at 8 am
_started = false;
_events.Reset();
}
}
void UpdateAI(uint32 diff) override
{
if (!_started)
return;
_events.Update(diff);
while (uint32 eventId = _events.ExecuteEvent())
{
switch (eventId)
{
case EVENT_WP_START_GOLDSHIRE:
me->GetMotionMaster()->MovePath(GOLDSHIRE_PATH, false);
break;
case EVENT_WP_START_WOODS:
me->GetMotionMaster()->MovePath(WOODS_PATH, false);
break;
case EVENT_WP_START_HOUSE:
me->GetMotionMaster()->MovePath(HOUSE_PATH, false);
break;
case EVENT_WP_START_LISA:
for (uint32 i = 0; i < _childrenGUIDs.size(); ++i)
{
if (Creature* lisa = ObjectAccessor::GetCreature(*me, _childrenGUIDs[i]))
{
if (lisa->GetEntry() == NPC_LISA)
{
lisa->GetMotionMaster()->MovePath(LISA_PATH, false);
break;
}
}
}
break;
case EVENT_PLAY_SOUNDS:
me->PlayDistanceSound(SoundPicker());
break;
case EVENT_BEGIN_EVENT:
{
_childrenGUIDs.clear();
// Get all childeren's guid's.
if (Creature* dana = me->FindNearestCreature(NPC_DANA, 25.0f))
_childrenGUIDs.push_back(dana->GetGUID());
if (Creature* john = me->FindNearestCreature(NPC_JOHN, 25.0f))
_childrenGUIDs.push_back(john->GetGUID());
if (Creature* lisa = me->FindNearestCreature(NPC_LISA, 25.0f))
_childrenGUIDs.push_back(lisa->GetGUID());
if (Creature* aaron = me->FindNearestCreature(NPC_AARON, 25.0f))
_childrenGUIDs.push_back(aaron->GetGUID());
if (Creature* jose = me->FindNearestCreature(NPC_JOSE, 25.0f))
_childrenGUIDs.push_back(jose->GetGUID());
// If Formation was disbanded, remake.
if (!me->GetFormation()->isFormed())
for (auto guid : _childrenGUIDs)
if (Creature* child = ObjectAccessor::GetCreature(*me, guid))
child->SearchFormation();
// Start movement
me->GetMotionMaster()->MovePath(STORMWIND_PATH, false);
break;
}
default:
break;
}
}
}
private:
EventMap _events;
bool _started;
GuidVector _childrenGUIDs;
};
void AddSC_elwynn_forest()
{
RegisterCreatureAI(npc_stormwind_infantry);
@@ -516,4 +771,5 @@ void AddSC_elwynn_forest()
RegisterCreatureAI(npc_injured_stormwind_infantry_dummy);
RegisterCreatureAI(npc_hogger);
RegisterCreatureAI(npc_elwynn_stormwind_charger);
RegisterCreatureAI(npc_cameron);
}

282
src/server/scripts/EasternKingdoms/zone_goldshire.cpp
View File

@@ -1,282 +0,0 @@
/*
* This file is part of the TrinityCore Project. See AUTHORS file for Copyright information
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "ScriptMgr.h"
#include "MotionMaster.h"
#include "ObjectAccessor.h"
#include "GameEventMgr.h"
#include "GameTime.h"
#include "CreatureGroups.h"
#include "ScriptedCreature.h"
#include "CreatureAIImpl.h"
enum COG_Paths
{
STORMWIND_PATH = 80500,
GOLDSHIRE_PATH = 80501,
WOODS_PATH = 80502,
HOUSE_PATH = 80503,
LISA_PATH = 80700
};
enum COG_Waypoints
{
STORMWIND_WAYPOINT = 57,
GOLDSHIRE_WAYPOINT = 32,
WOODS_WAYPOINT = 22,
HOUSE_WAYPOINT = 35,
LISA_WAYPOINT = 4
};
enum COG_Sounds
{
BANSHEE_DEATH = 1171,
BANSHEEPREAGGRO = 1172,
CTHUN_YOU_WILL_DIE = 8585,
CTHUN_DEATH_IS_CLOSE = 8580,
HUMAN_FEMALE_EMOTE_CRY = 6916,
GHOSTDEATH = 3416
};
enum COG_Creatures
{
NPC_DANA = 804,
NPC_CAMERON = 805,
NPC_JOHN = 806,
NPC_LISA = 807,
NPC_AARON = 810,
NPC_JOSE = 811
};
enum COG_Events
{
EVENT_WP_START_GOLDSHIRE = 1,
EVENT_WP_START_WOODS = 2,
EVENT_WP_START_HOUSE = 3,
EVENT_WP_START_LISA = 4,
EVENT_PLAY_SOUNDS = 5,
EVENT_BEGIN_EVENT = 6
};
enum COG_GameEvent
{
GAME_EVENT_CHILDEREN_OF_GOLDSHIRE = 76
};
struct npc_cameron : public ScriptedAI
{
npc_cameron(Creature* creature) : ScriptedAI(creature)
{
_started = false;
}
static uint32 SoundPicker()
{
return RAND(
BANSHEE_DEATH,
BANSHEEPREAGGRO,
CTHUN_YOU_WILL_DIE,
CTHUN_DEATH_IS_CLOSE,
HUMAN_FEMALE_EMOTE_CRY,
GHOSTDEATH
);
}
void MoveTheChildren()
{
std::vector<Position> MovePosPositions =
{
{ -9373.521f, -67.71767f, 69.201965f, 1.117011f },
{ -9374.94f, -62.51654f, 69.201965f, 5.201081f },
{ -9371.013f, -71.20811f, 69.201965f, 1.937315f },
{ -9368.419f, -66.47543f, 69.201965f, 3.141593f },
{ -9372.376f, -65.49946f, 69.201965f, 4.206244f },
{ -9377.477f, -67.8297f, 69.201965f, 0.296706f }
};
Trinity::Containers::RandomShuffle(MovePosPositions);
// first we break formation because children will need to move on their own now
for (auto guid : _childrenGUIDs)
if (Creature* child = ObjectAccessor::GetCreature(*me, guid))
if (child->GetFormation())
child->GetFormation()->RemoveMember(child);
// Move each child to an random position
for (uint32 i = 0; i < _childrenGUIDs.size(); ++i)
{
if (Creature* children = ObjectAccessor::GetCreature(*me, _childrenGUIDs[i]))
{
children->SetWalk(true);
children->GetMotionMaster()->MovePoint(0, MovePosPositions.at(i));
me->SetHomePosition(MovePosPositions.at(i));
}
}
me->SetWalk(true);
me->GetMotionMaster()->MovePoint(0, MovePosPositions.back());
me->SetHomePosition(MovePosPositions.back());
}
void WaypointReached(uint32 waypointId, uint32 pathId) override
{
switch (pathId)
{
case STORMWIND_PATH:
{
if (waypointId == STORMWIND_WAYPOINT)
{
me->GetMotionMaster()->MoveRandom(10.f);
_events.ScheduleEvent(EVENT_WP_START_GOLDSHIRE, Minutes(11));
}
break;
}
case GOLDSHIRE_PATH:
{
if (waypointId == GOLDSHIRE_WAYPOINT)
{
me->GetMotionMaster()->MoveRandom(10.f);
_events.ScheduleEvent(EVENT_WP_START_WOODS, Minutes(15));
}
break;
}
case WOODS_PATH:
{
if (waypointId == WOODS_WAYPOINT)
{
me->GetMotionMaster()->MoveRandom(10.f);
_events.ScheduleEvent(EVENT_WP_START_HOUSE, Minutes(6));
_events.ScheduleEvent(EVENT_WP_START_LISA, Seconds(2));
}
break;
}
case HOUSE_PATH:
{
if (waypointId == HOUSE_WAYPOINT)
{
// Move childeren at last point
MoveTheChildren();
// After 30 seconds a random sound should play
_events.ScheduleEvent(EVENT_PLAY_SOUNDS, Seconds(30));
}
break;
}
}
}
void OnGameEvent(bool start, uint16 eventId) override
{
if (start && eventId == GAME_EVENT_CHILDEREN_OF_GOLDSHIRE)
{
// Start event at 7 am
// Begin pathing
_events.ScheduleEvent(EVENT_BEGIN_EVENT, Seconds(2));
_started = true;
}
else if (!start && eventId == GAME_EVENT_CHILDEREN_OF_GOLDSHIRE)
{
// Reset event at 8 am
_started = false;
_events.Reset();
}
}
void UpdateAI(uint32 diff) override
{
if (!_started)
return;
_events.Update(diff);
while (uint32 eventId = _events.ExecuteEvent())
{
switch (eventId)
{
case EVENT_WP_START_GOLDSHIRE:
me->GetMotionMaster()->MovePath(GOLDSHIRE_PATH, false);
break;
case EVENT_WP_START_WOODS:
me->GetMotionMaster()->MovePath(WOODS_PATH, false);
break;
case EVENT_WP_START_HOUSE:
me->GetMotionMaster()->MovePath(HOUSE_PATH, false);
break;
case EVENT_WP_START_LISA:
for (uint32 i = 0; i < _childrenGUIDs.size(); ++i)
{
if (Creature* lisa = ObjectAccessor::GetCreature(*me, _childrenGUIDs[i]))
{
if (lisa->GetEntry() == NPC_LISA)
{
lisa->GetMotionMaster()->MovePath(LISA_PATH, false);
break;
}
}
}
break;
case EVENT_PLAY_SOUNDS:
me->PlayDistanceSound(SoundPicker());
break;
case EVENT_BEGIN_EVENT:
{
_childrenGUIDs.clear();
// Get all childeren's guid's.
if (Creature* dana = me->FindNearestCreature(NPC_DANA, 25.0f))
_childrenGUIDs.push_back(dana->GetGUID());
if (Creature* john = me->FindNearestCreature(NPC_JOHN, 25.0f))
_childrenGUIDs.push_back(john->GetGUID());
if (Creature* lisa = me->FindNearestCreature(NPC_LISA, 25.0f))
_childrenGUIDs.push_back(lisa->GetGUID());
if (Creature* aaron = me->FindNearestCreature(NPC_AARON, 25.0f))
_childrenGUIDs.push_back(aaron->GetGUID());
if (Creature* jose = me->FindNearestCreature(NPC_JOSE, 25.0f))
_childrenGUIDs.push_back(jose->GetGUID());
// If Formation was disbanded, remake.
if (!me->GetFormation()->isFormed())
for (auto guid : _childrenGUIDs)
if (Creature* child = ObjectAccessor::GetCreature(*me, guid))
child->SearchFormation();
// Start movement
me->GetMotionMaster()->MovePath(STORMWIND_PATH, false);
break;
}
default:
break;
}
}
}
private:
EventMap _events;
bool _started;
GuidVector _childrenGUIDs;
};
void AddSC_goldshire()
{
RegisterCreatureAI(npc_cameron);
}