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

Add spaces after commas

Browse Source
This commit is contained in:
leak
2011-04-29 20:47:02 +02:00
parent 01a79947d5
commit 1003f30448
645 changed files with 9439 additions and 9439 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
+64 -64
View File
@@ -31,8 +31,8 @@
OPvPCapturePointEP_EWT::OPvPCapturePointEP_EWT(OutdoorPvP *pvp)
: OPvPCapturePoint(pvp), m_TowerState(EP_TS_N), m_UnitsSummonedSide(0)
{
SetCapturePointData(EPCapturePoints[EP_EWT].entry,EPCapturePoints[EP_EWT].map,EPCapturePoints[EP_EWT].x,EPCapturePoints[EP_EWT].y,EPCapturePoints[EP_EWT].z,EPCapturePoints[EP_EWT].o,EPCapturePoints[EP_EWT].rot0,EPCapturePoints[EP_EWT].rot1,EPCapturePoints[EP_EWT].rot2,EPCapturePoints[EP_EWT].rot3);
AddObject(EP_EWT_FLAGS,EPTowerFlags[EP_EWT].entry,EPTowerFlags[EP_EWT].map,EPTowerFlags[EP_EWT].x,EPTowerFlags[EP_EWT].y,EPTowerFlags[EP_EWT].z,EPTowerFlags[EP_EWT].o,EPTowerFlags[EP_EWT].rot0,EPTowerFlags[EP_EWT].rot1,EPTowerFlags[EP_EWT].rot2,EPTowerFlags[EP_EWT].rot3);
SetCapturePointData(EPCapturePoints[EP_EWT].entry, EPCapturePoints[EP_EWT].map, EPCapturePoints[EP_EWT].x, EPCapturePoints[EP_EWT].y, EPCapturePoints[EP_EWT].z, EPCapturePoints[EP_EWT].o, EPCapturePoints[EP_EWT].rot0, EPCapturePoints[EP_EWT].rot1, EPCapturePoints[EP_EWT].rot2, EPCapturePoints[EP_EWT].rot3);
AddObject(EP_EWT_FLAGS, EPTowerFlags[EP_EWT].entry, EPTowerFlags[EP_EWT].map, EPTowerFlags[EP_EWT].x, EPTowerFlags[EP_EWT].y, EPTowerFlags[EP_EWT].z, EPTowerFlags[EP_EWT].o, EPTowerFlags[EP_EWT].rot0, EPTowerFlags[EP_EWT].rot1, EPTowerFlags[EP_EWT].rot2, EPTowerFlags[EP_EWT].rot3);
}
void OPvPCapturePointEP_EWT::ChangeState()
@@ -40,12 +40,12 @@ void OPvPCapturePointEP_EWT::ChangeState()
// if changing from controlling alliance to horde or vice versa
if ( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State )
{
sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_EWT_A));
sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_EWT_A));
((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_EWT] = 0;
}
else if ( m_OldState == OBJECTIVESTATE_HORDE && m_OldState != m_State )
{
sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_EWT_H));
sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_EWT_H));
((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_EWT] = 0;
}
@@ -58,14 +58,14 @@ void OPvPCapturePointEP_EWT::ChangeState()
artkit = 2;
SummonSupportUnitAtNorthpassTower(ALLIANCE);
((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_EWT] = ALLIANCE;
if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_EWT_A));
if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_EWT_A));
break;
case OBJECTIVESTATE_HORDE:
m_TowerState = EP_TS_H;
artkit = 1;
SummonSupportUnitAtNorthpassTower(HORDE);
((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_EWT] = HORDE;
if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_EWT_H));
if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_EWT_H));
break;
case OBJECTIVESTATE_NEUTRAL:
m_TowerState = EP_TS_N;
@@ -160,7 +160,7 @@ void OPvPCapturePointEP_EWT::SummonSupportUnitAtNorthpassTower(uint32 team)
for (uint8 i = 0; i < EP_EWT_NUM_CREATURES; ++i)
{
DelCreature(i);
AddCreature(i,ct[i].entry,ct[i].teamval,ct[i].map,ct[i].x,ct[i].y,ct[i].z,ct[i].o,1000000);
AddCreature(i, ct[i].entry, ct[i].teamval, ct[i].map, ct[i].x, ct[i].y, ct[i].z, ct[i].o, 1000000);
}
}
}
@@ -169,8 +169,8 @@ void OPvPCapturePointEP_EWT::SummonSupportUnitAtNorthpassTower(uint32 team)
OPvPCapturePointEP_NPT::OPvPCapturePointEP_NPT(OutdoorPvP *pvp)
: OPvPCapturePoint(pvp), m_TowerState(EP_TS_N), m_SummonedGOSide(0)
{
SetCapturePointData(EPCapturePoints[EP_NPT].entry,EPCapturePoints[EP_NPT].map,EPCapturePoints[EP_NPT].x,EPCapturePoints[EP_NPT].y,EPCapturePoints[EP_NPT].z,EPCapturePoints[EP_NPT].o,EPCapturePoints[EP_NPT].rot0,EPCapturePoints[EP_NPT].rot1,EPCapturePoints[EP_NPT].rot2,EPCapturePoints[EP_NPT].rot3);
AddObject(EP_NPT_FLAGS,EPTowerFlags[EP_NPT].entry,EPTowerFlags[EP_NPT].map,EPTowerFlags[EP_NPT].x,EPTowerFlags[EP_NPT].y,EPTowerFlags[EP_NPT].z,EPTowerFlags[EP_NPT].o,EPTowerFlags[EP_NPT].rot0,EPTowerFlags[EP_NPT].rot1,EPTowerFlags[EP_NPT].rot2,EPTowerFlags[EP_NPT].rot3);
SetCapturePointData(EPCapturePoints[EP_NPT].entry, EPCapturePoints[EP_NPT].map, EPCapturePoints[EP_NPT].x, EPCapturePoints[EP_NPT].y, EPCapturePoints[EP_NPT].z, EPCapturePoints[EP_NPT].o, EPCapturePoints[EP_NPT].rot0, EPCapturePoints[EP_NPT].rot1, EPCapturePoints[EP_NPT].rot2, EPCapturePoints[EP_NPT].rot3);
AddObject(EP_NPT_FLAGS, EPTowerFlags[EP_NPT].entry, EPTowerFlags[EP_NPT].map, EPTowerFlags[EP_NPT].x, EPTowerFlags[EP_NPT].y, EPTowerFlags[EP_NPT].z, EPTowerFlags[EP_NPT].o, EPTowerFlags[EP_NPT].rot0, EPTowerFlags[EP_NPT].rot1, EPTowerFlags[EP_NPT].rot2, EPTowerFlags[EP_NPT].rot3);
}
void OPvPCapturePointEP_NPT::ChangeState()
@@ -178,12 +178,12 @@ void OPvPCapturePointEP_NPT::ChangeState()
// if changing from controlling alliance to horde or vice versa
if ( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State )
{
sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_NPT_A));
sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_NPT_A));
((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_NPT] = 0;
}
else if ( m_OldState == OBJECTIVESTATE_HORDE && m_OldState != m_State )
{
sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_NPT_H));
sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_NPT_H));
((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_NPT] = 0;
}
@@ -196,14 +196,14 @@ void OPvPCapturePointEP_NPT::ChangeState()
artkit = 2;
SummonGO(ALLIANCE);
((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_NPT] = ALLIANCE;
if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_NPT_A));
if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_NPT_A));
break;
case OBJECTIVESTATE_HORDE:
m_TowerState = EP_TS_H;
artkit = 1;
SummonGO(HORDE);
((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_NPT] = HORDE;
if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_NPT_H));
if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_NPT_H));
break;
case OBJECTIVESTATE_NEUTRAL:
m_TowerState = EP_TS_N;
@@ -301,10 +301,10 @@ void OPvPCapturePointEP_NPT::SummonGO(uint32 team)
{
m_SummonedGOSide = team;
DelObject(EP_NPT_BUFF);
AddObject(EP_NPT_BUFF,EP_NPT_LordaeronShrine.entry,EP_NPT_LordaeronShrine.map,EP_NPT_LordaeronShrine.x,EP_NPT_LordaeronShrine.y,EP_NPT_LordaeronShrine.z,EP_NPT_LordaeronShrine.o,EP_NPT_LordaeronShrine.rot0,EP_NPT_LordaeronShrine.rot1,EP_NPT_LordaeronShrine.rot2,EP_NPT_LordaeronShrine.rot3);
AddObject(EP_NPT_BUFF, EP_NPT_LordaeronShrine.entry, EP_NPT_LordaeronShrine.map, EP_NPT_LordaeronShrine.x, EP_NPT_LordaeronShrine.y, EP_NPT_LordaeronShrine.z, EP_NPT_LordaeronShrine.o, EP_NPT_LordaeronShrine.rot0, EP_NPT_LordaeronShrine.rot1, EP_NPT_LordaeronShrine.rot2, EP_NPT_LordaeronShrine.rot3);
GameObject * go = HashMapHolder<GameObject>::Find(m_Objects[EP_NPT_BUFF]);
if (go)
go->SetUInt32Value(GAMEOBJECT_FACTION,(team == ALLIANCE ? 84 : 83));
go->SetUInt32Value(GAMEOBJECT_FACTION, (team == ALLIANCE ? 84 : 83));
}
}
@@ -312,8 +312,8 @@ void OPvPCapturePointEP_NPT::SummonGO(uint32 team)
OPvPCapturePointEP_CGT::OPvPCapturePointEP_CGT(OutdoorPvP *pvp)
: OPvPCapturePoint(pvp), m_TowerState(EP_TS_N), m_GraveyardSide(0)
{
SetCapturePointData(EPCapturePoints[EP_CGT].entry,EPCapturePoints[EP_CGT].map,EPCapturePoints[EP_CGT].x,EPCapturePoints[EP_CGT].y,EPCapturePoints[EP_CGT].z,EPCapturePoints[EP_CGT].o,EPCapturePoints[EP_CGT].rot0,EPCapturePoints[EP_CGT].rot1,EPCapturePoints[EP_CGT].rot2,EPCapturePoints[EP_CGT].rot3);
AddObject(EP_CGT_FLAGS,EPTowerFlags[EP_CGT].entry,EPTowerFlags[EP_CGT].map,EPTowerFlags[EP_CGT].x,EPTowerFlags[EP_CGT].y,EPTowerFlags[EP_CGT].z,EPTowerFlags[EP_CGT].o,EPTowerFlags[EP_CGT].rot0,EPTowerFlags[EP_CGT].rot1,EPTowerFlags[EP_CGT].rot2,EPTowerFlags[EP_CGT].rot3);
SetCapturePointData(EPCapturePoints[EP_CGT].entry, EPCapturePoints[EP_CGT].map, EPCapturePoints[EP_CGT].x, EPCapturePoints[EP_CGT].y, EPCapturePoints[EP_CGT].z, EPCapturePoints[EP_CGT].o, EPCapturePoints[EP_CGT].rot0, EPCapturePoints[EP_CGT].rot1, EPCapturePoints[EP_CGT].rot2, EPCapturePoints[EP_CGT].rot3);
AddObject(EP_CGT_FLAGS, EPTowerFlags[EP_CGT].entry, EPTowerFlags[EP_CGT].map, EPTowerFlags[EP_CGT].x, EPTowerFlags[EP_CGT].y, EPTowerFlags[EP_CGT].z, EPTowerFlags[EP_CGT].o, EPTowerFlags[EP_CGT].rot0, EPTowerFlags[EP_CGT].rot1, EPTowerFlags[EP_CGT].rot2, EPTowerFlags[EP_CGT].rot3);
}
void OPvPCapturePointEP_CGT::ChangeState()
@@ -321,12 +321,12 @@ void OPvPCapturePointEP_CGT::ChangeState()
// if changing from controlling alliance to horde or vice versa
if( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State )
{
sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_A));
sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_A));
((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_CGT] = 0;
}
else if ( m_OldState == OBJECTIVESTATE_HORDE && m_OldState != m_State )
{
sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_H));
sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_H));
((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_CGT] = 0;
}
@@ -339,14 +339,14 @@ void OPvPCapturePointEP_CGT::ChangeState()
artkit = 2;
LinkGraveYard(ALLIANCE);
((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_CGT] = ALLIANCE;
if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_CGT_A));
if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_CGT_A));
break;
case OBJECTIVESTATE_HORDE:
m_TowerState = EP_TS_H;
artkit = 1;
LinkGraveYard(HORDE);
((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_CGT] = HORDE;
if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_CGT_H));
if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_CGT_H));
break;
case OBJECTIVESTATE_NEUTRAL:
m_TowerState = EP_TS_N;
@@ -432,8 +432,8 @@ void OPvPCapturePointEP_CGT::LinkGraveYard(uint32 team)
if (m_GraveyardSide != team)
{
m_GraveyardSide = team;
sObjectMgr->RemoveGraveYardLink(EP_GraveYardId,EP_GraveYardZone,team,false);
sObjectMgr->AddGraveYardLink(EP_GraveYardId,EP_GraveYardZone,team,false);
sObjectMgr->RemoveGraveYardLink(EP_GraveYardId, EP_GraveYardZone, team, false);
sObjectMgr->AddGraveYardLink(EP_GraveYardId, EP_GraveYardZone, team, false);
}
}
@@ -441,8 +441,8 @@ void OPvPCapturePointEP_CGT::LinkGraveYard(uint32 team)
OPvPCapturePointEP_PWT::OPvPCapturePointEP_PWT(OutdoorPvP *pvp)
: OPvPCapturePoint(pvp), m_FlightMasterSpawned(0), m_TowerState(EP_TS_N)
{
SetCapturePointData(EPCapturePoints[EP_PWT].entry,EPCapturePoints[EP_PWT].map,EPCapturePoints[EP_PWT].x,EPCapturePoints[EP_PWT].y,EPCapturePoints[EP_PWT].z,EPCapturePoints[EP_PWT].o,EPCapturePoints[EP_PWT].rot0,EPCapturePoints[EP_PWT].rot1,EPCapturePoints[EP_PWT].rot2,EPCapturePoints[EP_PWT].rot3);
AddObject(EP_PWT_FLAGS,EPTowerFlags[EP_PWT].entry,EPTowerFlags[EP_PWT].map,EPTowerFlags[EP_PWT].x,EPTowerFlags[EP_PWT].y,EPTowerFlags[EP_PWT].z,EPTowerFlags[EP_PWT].o,EPTowerFlags[EP_PWT].rot0,EPTowerFlags[EP_PWT].rot1,EPTowerFlags[EP_PWT].rot2,EPTowerFlags[EP_PWT].rot3);
SetCapturePointData(EPCapturePoints[EP_PWT].entry, EPCapturePoints[EP_PWT].map, EPCapturePoints[EP_PWT].x, EPCapturePoints[EP_PWT].y, EPCapturePoints[EP_PWT].z, EPCapturePoints[EP_PWT].o, EPCapturePoints[EP_PWT].rot0, EPCapturePoints[EP_PWT].rot1, EPCapturePoints[EP_PWT].rot2, EPCapturePoints[EP_PWT].rot3);
AddObject(EP_PWT_FLAGS, EPTowerFlags[EP_PWT].entry, EPTowerFlags[EP_PWT].map, EPTowerFlags[EP_PWT].x, EPTowerFlags[EP_PWT].y, EPTowerFlags[EP_PWT].z, EPTowerFlags[EP_PWT].o, EPTowerFlags[EP_PWT].rot0, EPTowerFlags[EP_PWT].rot1, EPTowerFlags[EP_PWT].rot2, EPTowerFlags[EP_PWT].rot3);
}
void OPvPCapturePointEP_PWT::ChangeState()
@@ -450,12 +450,12 @@ void OPvPCapturePointEP_PWT::ChangeState()
// if changing from controlling alliance to horde or vice versa
if ( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State )
{
sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_PWT_A));
sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_PWT_A));
((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_PWT] = 0;
}
else if ( m_OldState == OBJECTIVESTATE_HORDE && m_OldState != m_State )
{
sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_PWT_H));
sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_PWT_H));
((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_PWT] = 0;
}
@@ -468,14 +468,14 @@ void OPvPCapturePointEP_PWT::ChangeState()
SummonFlightMaster(ALLIANCE);
artkit = 2;
((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_PWT] = ALLIANCE;
if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_PWT_A));
if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_PWT_A));
break;
case OBJECTIVESTATE_HORDE:
m_TowerState = EP_TS_H;
SummonFlightMaster(HORDE);
artkit = 1;
((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_PWT] = HORDE;
if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_PWT_H));
if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_PWT_H));
break;
case OBJECTIVESTATE_NEUTRAL:
m_TowerState = EP_TS_N;
@@ -572,13 +572,13 @@ void OPvPCapturePointEP_PWT::SummonFlightMaster(uint32 team)
{
m_FlightMasterSpawned = team;
DelCreature(EP_PWT_FLIGHTMASTER);
AddCreature(EP_PWT_FLIGHTMASTER,EP_PWT_FlightMaster.entry,team,EP_PWT_FlightMaster.map,EP_PWT_FlightMaster.x,EP_PWT_FlightMaster.y,EP_PWT_FlightMaster.z,EP_PWT_FlightMaster.o);
AddCreature(EP_PWT_FLIGHTMASTER, EP_PWT_FlightMaster.entry, team, EP_PWT_FlightMaster.map, EP_PWT_FlightMaster.x, EP_PWT_FlightMaster.y, EP_PWT_FlightMaster.z, EP_PWT_FlightMaster.o);
/*
// sky - we need update gso code
Creature * c = HashMapHolder<Creature>::Find(m_Creatures[EP_PWT_FLIGHTMASTER]);
//Spawn flight master as friendly to capturing team
c->SetUInt32Value(GAMEOBJECT_FACTION,(team == ALLIANCE ? 55 : 68));
c->SetUInt32Value(GAMEOBJECT_FACTION, (team == ALLIANCE ? 55 : 68));
if(c)
{
GossipOption gso;
@@ -620,7 +620,7 @@ void OPvPCapturePointEP_PWT::SummonFlightMaster(uint32 team)
OutdoorPvPEP::OutdoorPvPEP()
{
m_TypeId = OUTDOOR_PVP_EP;
memset(EP_Controls,0,sizeof(EP_Controls));
memset(EP_Controls, 0, sizeof(EP_Controls));
m_AllianceTowersControlled = 0;
m_HordeTowersControlled = 0;
}
@@ -649,8 +649,8 @@ bool OutdoorPvPEP::Update(uint32 diff)
++m_AllianceTowersControlled;
else if (EP_Controls[i] == HORDE)
++m_HordeTowersControlled;
SendUpdateWorldState(EP_UI_TOWER_COUNT_A,m_AllianceTowersControlled);
SendUpdateWorldState(EP_UI_TOWER_COUNT_H,m_HordeTowersControlled);
SendUpdateWorldState(EP_UI_TOWER_COUNT_A, m_AllianceTowersControlled);
SendUpdateWorldState(EP_UI_TOWER_COUNT_H, m_HordeTowersControlled);
BuffTeams();
}
return true;
@@ -664,14 +664,14 @@ void OutdoorPvPEP::HandlePlayerEnterZone(Player * plr, uint32 zone)
if (plr->GetTeam() == ALLIANCE)
{
if (m_AllianceTowersControlled && m_AllianceTowersControlled < 5)
plr->CastSpell(plr,EP_AllianceBuffs[m_AllianceTowersControlled-1],true);
plr->CastSpell(plr, EP_AllianceBuffs[m_AllianceTowersControlled-1], true);
}
else
{
if (m_HordeTowersControlled && m_HordeTowersControlled < 5)
plr->CastSpell(plr,EP_HordeBuffs[m_HordeTowersControlled-1],true);
plr->CastSpell(plr, EP_HordeBuffs[m_HordeTowersControlled-1], true);
}
OutdoorPvP::HandlePlayerEnterZone(plr,zone);
OutdoorPvP::HandlePlayerEnterZone(plr, zone);
}
void OutdoorPvPEP::HandlePlayerLeaveZone(Player * plr, uint32 zone)
@@ -699,7 +699,7 @@ void OutdoorPvPEP::BuffTeams()
for (int i = 0; i < 4; ++i)
plr->RemoveAurasDueToSpell(EP_AllianceBuffs[i]);
if (m_AllianceTowersControlled && m_AllianceTowersControlled < 5)
plr->CastSpell(plr,EP_AllianceBuffs[m_AllianceTowersControlled-1],true);
plr->CastSpell(plr, EP_AllianceBuffs[m_AllianceTowersControlled-1], true);
}
}
for (PlayerSet::iterator itr = m_players[1].begin(); itr != m_players[1].end(); ++itr)
@@ -709,7 +709,7 @@ void OutdoorPvPEP::BuffTeams()
for (int i = 0; i < 4; ++i)
plr->RemoveAurasDueToSpell(EP_HordeBuffs[i]);
if (m_HordeTowersControlled && m_HordeTowersControlled < 5)
plr->CastSpell(plr,EP_HordeBuffs[m_HordeTowersControlled-1],true);
plr->CastSpell(plr, EP_HordeBuffs[m_HordeTowersControlled-1], true);
}
}
}
@@ -729,35 +729,35 @@ void OutdoorPvPEP::FillInitialWorldStates(WorldPacket & data)
void OutdoorPvPEP::SendRemoveWorldStates(Player *plr)
{
plr->SendUpdateWorldState(EP_UI_TOWER_COUNT_A,0);
plr->SendUpdateWorldState(EP_UI_TOWER_COUNT_H,0);
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY,0);
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_POS,0);
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_N,0);
plr->SendUpdateWorldState(EP_UI_TOWER_COUNT_A, 0);
plr->SendUpdateWorldState(EP_UI_TOWER_COUNT_H, 0);
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 0);
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_POS, 0);
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_N, 0);
plr->SendUpdateWorldState(EP_EWT_A,0);
plr->SendUpdateWorldState(EP_EWT_H,0);
plr->SendUpdateWorldState(EP_EWT_N,0);
plr->SendUpdateWorldState(EP_EWT_N_A,0);
plr->SendUpdateWorldState(EP_EWT_N_H,0);
plr->SendUpdateWorldState(EP_EWT_A, 0);
plr->SendUpdateWorldState(EP_EWT_H, 0);
plr->SendUpdateWorldState(EP_EWT_N, 0);
plr->SendUpdateWorldState(EP_EWT_N_A, 0);
plr->SendUpdateWorldState(EP_EWT_N_H, 0);
plr->SendUpdateWorldState(EP_PWT_A,0);
plr->SendUpdateWorldState(EP_PWT_H,0);
plr->SendUpdateWorldState(EP_PWT_N,0);
plr->SendUpdateWorldState(EP_PWT_N_A,0);
plr->SendUpdateWorldState(EP_PWT_N_H,0);
plr->SendUpdateWorldState(EP_PWT_A, 0);
plr->SendUpdateWorldState(EP_PWT_H, 0);
plr->SendUpdateWorldState(EP_PWT_N, 0);
plr->SendUpdateWorldState(EP_PWT_N_A, 0);
plr->SendUpdateWorldState(EP_PWT_N_H, 0);
plr->SendUpdateWorldState(EP_NPT_A,0);
plr->SendUpdateWorldState(EP_NPT_H,0);
plr->SendUpdateWorldState(EP_NPT_N,0);
plr->SendUpdateWorldState(EP_NPT_N_A,0);
plr->SendUpdateWorldState(EP_NPT_N_H,0);
plr->SendUpdateWorldState(EP_NPT_A, 0);
plr->SendUpdateWorldState(EP_NPT_H, 0);
plr->SendUpdateWorldState(EP_NPT_N, 0);
plr->SendUpdateWorldState(EP_NPT_N_A, 0);
plr->SendUpdateWorldState(EP_NPT_N_H, 0);
plr->SendUpdateWorldState(EP_CGT_A,0);
plr->SendUpdateWorldState(EP_CGT_H,0);
plr->SendUpdateWorldState(EP_CGT_N,0);
plr->SendUpdateWorldState(EP_CGT_N_A,0);
plr->SendUpdateWorldState(EP_CGT_N_H,0);
plr->SendUpdateWorldState(EP_CGT_A, 0);
plr->SendUpdateWorldState(EP_CGT_H, 0);
plr->SendUpdateWorldState(EP_CGT_N, 0);
plr->SendUpdateWorldState(EP_CGT_N_A, 0);
plr->SendUpdateWorldState(EP_CGT_N_H, 0);
}
class OutdoorPvP_eastern_plaguelands : public OutdoorPvPScript
src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
+25 -25
View File
@@ -114,31 +114,31 @@ enum EP_GoSummons
enum EP_Towers
{
EP_EWT = 0, // plaguelands 03
EP_NPT,// plaguelands 01
EP_PWT,// plaguelands 04
EP_CGT,// plaguelands 02
EP_NPT, // plaguelands 01
EP_PWT, // plaguelands 04
EP_CGT, // plaguelands 02
EP_TOWER_NUM
};
const go_type EPCapturePoints[EP_TOWER_NUM] =
{
{182097,0,2574.51f,-4794.89f,144.704f,-1.45003f,-0.097056f,0.095578f,-0.656229f,0.742165f},
{181899,0,3181.08f,-4379.36f,174.123f,-2.03472f,-0.065392f,0.119494f,-0.842275f,0.521553f},
{182098,0,2962.71f,-3042.31f,154.789f,2.08426f,-0.074807f,-0.113837f,0.855928f,0.49883f},
{182096,0,1860.85f,-3731.23f,196.716f,-2.53214f,0.033967f,-0.131914f,0.944741f,-0.298177f}
{182097, 0, 2574.51f, -4794.89f, 144.704f, -1.45003f, -0.097056f, 0.095578f, -0.656229f, 0.742165f},
{181899, 0, 3181.08f, -4379.36f, 174.123f, -2.03472f, -0.065392f, 0.119494f, -0.842275f, 0.521553f},
{182098, 0, 2962.71f, -3042.31f, 154.789f, 2.08426f, -0.074807f, -0.113837f, 0.855928f, 0.49883f},
{182096, 0, 1860.85f, -3731.23f, 196.716f, -2.53214f, 0.033967f, -0.131914f, 0.944741f, -0.298177f}
};
const go_type EPTowerFlags[EP_TOWER_NUM] =
{
{182106,0,2569.60f,-4772.93f,115.399f,2.72271f,0.0f,0.0f,0.978148f,0.207912f},
{182106,0,3148.17f,-4365.51f,145.029f,1.53589f,0.0f,0.0f,0.694658f,0.71934f},
{182106,0,2992.63f,-3022.95f,125.593f,3.03687f,0.0f,0.0f,0.99863f,0.052336f},
{182106,0,1838.42f,-3703.56f,167.713f,0.890118f,0.0f,0.0f,0.430511f,0.902585f}
{182106, 0, 2569.60f, -4772.93f, 115.399f, 2.72271f, 0.0f, 0.0f, 0.978148f, 0.207912f},
{182106, 0, 3148.17f, -4365.51f, 145.029f, 1.53589f, 0.0f, 0.0f, 0.694658f, 0.71934f},
{182106, 0, 2992.63f, -3022.95f, 125.593f, 3.03687f, 0.0f, 0.0f, 0.99863f, 0.052336f},
{182106, 0, 1838.42f, -3703.56f, 167.713f, 0.890118f, 0.0f, 0.0f, 0.430511f, 0.902585f}
};
const uint32 EPTowerPlayerEnterEvents[EP_TOWER_NUM] = {10691,10699,10701,10705};
const uint32 EPTowerPlayerEnterEvents[EP_TOWER_NUM] = {10691, 10699, 10701, 10705};
const uint32 EPTowerPlayerLeaveEvents[EP_TOWER_NUM] = {10692,10698,10700,10704};
const uint32 EPTowerPlayerLeaveEvents[EP_TOWER_NUM] = {10692, 10698, 10700, 10704};
const uint8 EP_NUM_CREATURES = 6;
const uint8 EP_EWT_NUM_CREATURES = 5;
@@ -147,20 +147,20 @@ const uint8 EP_EWT_NUM_CREATURES = 5;
// should be spawned at EWT and follow a path, but trans-grid pathing isn't safe, so summon them directly at NPT
const creature_type EP_EWT_Summons_A[EP_EWT_NUM_CREATURES] =
{
{17635,469,0, 3167.61f,-4352.09f,138.20f,4.5811f},
{17647,469,0, 3172.74f,-4352.99f,139.14f,4.9873f},
{17647,469,0, 3165.89f,-4354.46f,138.67f,3.7244f},
{17647,469,0, 3164.65f,-4350.26f,138.22f,2.4794f},
{17647,469,0, 3169.91f,-4349.68f,138.37f,0.7444f}
{17635, 469, 0, 3167.61f, -4352.09f, 138.20f, 4.5811f},
{17647, 469, 0, 3172.74f, -4352.99f, 139.14f, 4.9873f},
{17647, 469, 0, 3165.89f, -4354.46f, 138.67f, 3.7244f},
{17647, 469, 0, 3164.65f, -4350.26f, 138.22f, 2.4794f},
{17647, 469, 0, 3169.91f, -4349.68f, 138.37f, 0.7444f}
};
const creature_type EP_EWT_Summons_H[EP_EWT_NUM_CREATURES] =
{
{17995,67,0, 3167.61f,-4352.09f,138.20f,4.5811f},
{17996,67,0, 3172.74f,-4352.99f,139.14f,4.9873f},
{17996,67,0, 3165.89f,-4354.46f,138.67f,3.7244f},
{17996,67,0, 3164.65f,-4350.26f,138.22f,2.4794f},
{17996,67,0, 3169.91f,-4349.68f,138.37f,0.7444f}
{17995, 67, 0, 3167.61f, -4352.09f, 138.20f, 4.5811f},
{17996, 67, 0, 3172.74f, -4352.99f, 139.14f, 4.9873f},
{17996, 67, 0, 3165.89f, -4354.46f, 138.67f, 3.7244f},
{17996, 67, 0, 3164.65f, -4350.26f, 138.22f, 2.4794f},
{17996, 67, 0, 3169.91f, -4349.68f, 138.37f, 0.7444f}
};
enum EP_TowerStates
@@ -175,10 +175,10 @@ enum EP_TowerStates
};
// when spawning, pay attention at setting the faction manually!
const creature_type EP_PWT_FlightMaster = {17209,0,0,2987.5f,-3049.11f,120.126f,5.75959f};
const creature_type EP_PWT_FlightMaster = {17209, 0, 0, 2987.5f, -3049.11f, 120.126f, 5.75959f};
// after spawning, modify the faction so that only the controller will be able to use it with SetUInt32Value(GAMEOBJECT_FACTION, faction_id);
const go_type EP_NPT_LordaeronShrine = {181682,0,3167.72f,-4355.91f,138.785f,1.69297f,0.0f,0.0f,0.748956f,0.66262f};
const go_type EP_NPT_LordaeronShrine = {181682, 0, 3167.72f, -4355.91f, 138.785f, 1.69297f, 0.0f, 0.0f, 0.748956f, 0.66262f};
class OutdoorPvPEP;
src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp
+27 -27
View File
@@ -25,15 +25,15 @@
#include "Language.h"
#include "ScriptPCH.h"
const uint32 HP_LANG_LOSE_A[HP_TOWER_NUM] = {LANG_OPVP_HP_LOSE_BROKENHILL_A,LANG_OPVP_HP_LOSE_OVERLOOK_A,LANG_OPVP_HP_LOSE_STADIUM_A};
const uint32 HP_LANG_LOSE_A[HP_TOWER_NUM] = {LANG_OPVP_HP_LOSE_BROKENHILL_A, LANG_OPVP_HP_LOSE_OVERLOOK_A, LANG_OPVP_HP_LOSE_STADIUM_A};
const uint32 HP_LANG_LOSE_H[HP_TOWER_NUM] = {LANG_OPVP_HP_LOSE_BROKENHILL_H,LANG_OPVP_HP_LOSE_OVERLOOK_H,LANG_OPVP_HP_LOSE_STADIUM_H};
const uint32 HP_LANG_LOSE_H[HP_TOWER_NUM] = {LANG_OPVP_HP_LOSE_BROKENHILL_H, LANG_OPVP_HP_LOSE_OVERLOOK_H, LANG_OPVP_HP_LOSE_STADIUM_H};
const uint32 HP_LANG_CAPTURE_A[HP_TOWER_NUM] = {LANG_OPVP_HP_CAPTURE_BROKENHILL_A,LANG_OPVP_HP_CAPTURE_OVERLOOK_A,LANG_OPVP_HP_CAPTURE_STADIUM_A};
const uint32 HP_LANG_CAPTURE_A[HP_TOWER_NUM] = {LANG_OPVP_HP_CAPTURE_BROKENHILL_A, LANG_OPVP_HP_CAPTURE_OVERLOOK_A, LANG_OPVP_HP_CAPTURE_STADIUM_A};
const uint32 HP_LANG_CAPTURE_H[HP_TOWER_NUM] = {LANG_OPVP_HP_CAPTURE_BROKENHILL_H,LANG_OPVP_HP_CAPTURE_OVERLOOK_H,LANG_OPVP_HP_CAPTURE_STADIUM_H};
const uint32 HP_LANG_CAPTURE_H[HP_TOWER_NUM] = {LANG_OPVP_HP_CAPTURE_BROKENHILL_H, LANG_OPVP_HP_CAPTURE_OVERLOOK_H, LANG_OPVP_HP_CAPTURE_STADIUM_H};
OPvPCapturePointHP::OPvPCapturePointHP(OutdoorPvP *pvp,OutdoorPvPHPTowerType type)
OPvPCapturePointHP::OPvPCapturePointHP(OutdoorPvP *pvp, OutdoorPvPHPTowerType type)
: OPvPCapturePoint(pvp), m_TowerType(type)
{
SetCapturePointData(HPCapturePoints[type].entry,
@@ -72,11 +72,11 @@ bool OutdoorPvPHP::SetupOutdoorPvP()
for (int i = 0; i < OutdoorPvPHPBuffZonesNum; ++i)
RegisterZone(OutdoorPvPHPBuffZones[i]);
AddCapturePoint(new OPvPCapturePointHP(this,HP_TOWER_BROKEN_HILL));
AddCapturePoint(new OPvPCapturePointHP(this, HP_TOWER_BROKEN_HILL));
AddCapturePoint(new OPvPCapturePointHP(this,HP_TOWER_OVERLOOK));
AddCapturePoint(new OPvPCapturePointHP(this, HP_TOWER_OVERLOOK));
AddCapturePoint(new OPvPCapturePointHP(this,HP_TOWER_STADIUM));
AddCapturePoint(new OPvPCapturePointHP(this, HP_TOWER_STADIUM));
return true;
}
@@ -87,14 +87,14 @@ void OutdoorPvPHP::HandlePlayerEnterZone(Player * plr, uint32 zone)
if (plr->GetTeam() == ALLIANCE)
{
if (m_AllianceTowersControlled >=3)
plr->CastSpell(plr,AllianceBuff,true);
plr->CastSpell(plr, AllianceBuff, true);
}
else
{
if (m_HordeTowersControlled >=3)
plr->CastSpell(plr,HordeBuff,true);
plr->CastSpell(plr, HordeBuff, true);
}
OutdoorPvP::HandlePlayerEnterZone(plr,zone);
OutdoorPvP::HandlePlayerEnterZone(plr, zone);
}
void OutdoorPvPHP::HandlePlayerLeaveZone(Player * plr, uint32 zone)
@@ -133,18 +133,18 @@ bool OutdoorPvPHP::Update(uint32 diff)
void OutdoorPvPHP::SendRemoveWorldStates(Player *plr)
{
plr->SendUpdateWorldState(HP_UI_TOWER_DISPLAY_A,0);
plr->SendUpdateWorldState(HP_UI_TOWER_DISPLAY_H,0);
plr->SendUpdateWorldState(HP_UI_TOWER_COUNT_H,0);
plr->SendUpdateWorldState(HP_UI_TOWER_COUNT_A,0);
plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_N,0);
plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_POS,0);
plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_DISPLAY,0);
plr->SendUpdateWorldState(HP_UI_TOWER_DISPLAY_A, 0);
plr->SendUpdateWorldState(HP_UI_TOWER_DISPLAY_H, 0);
plr->SendUpdateWorldState(HP_UI_TOWER_COUNT_H, 0);
plr->SendUpdateWorldState(HP_UI_TOWER_COUNT_A, 0);
plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_N, 0);
plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_POS, 0);
plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_DISPLAY, 0);
for (int i = 0; i < HP_TOWER_NUM; ++i)
{
plr->SendUpdateWorldState(HP_MAP_N[i],0);
plr->SendUpdateWorldState(HP_MAP_A[i],0);
plr->SendUpdateWorldState(HP_MAP_H[i],0);
plr->SendUpdateWorldState(HP_MAP_N[i], 0);
plr->SendUpdateWorldState(HP_MAP_A[i], 0);
plr->SendUpdateWorldState(HP_MAP_H[i], 0);
}
}
@@ -175,13 +175,13 @@ void OPvPCapturePointHP::ChangeState()
field = HP_MAP_A[m_TowerType];
if (((OutdoorPvPHP*)m_PvP)->m_AllianceTowersControlled)
((OutdoorPvPHP*)m_PvP)->m_AllianceTowersControlled--;
sWorld->SendZoneText(OutdoorPvPHPBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_LOSE_A[m_TowerType]));
sWorld->SendZoneText(OutdoorPvPHPBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_LOSE_A[m_TowerType]));
break;
case OBJECTIVESTATE_HORDE:
field = HP_MAP_H[m_TowerType];
if (((OutdoorPvPHP*)m_PvP)->m_HordeTowersControlled)
((OutdoorPvPHP*)m_PvP)->m_HordeTowersControlled--;
sWorld->SendZoneText(OutdoorPvPHPBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_LOSE_H[m_TowerType]));
sWorld->SendZoneText(OutdoorPvPHPBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_LOSE_H[m_TowerType]));
break;
case OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE:
field = HP_MAP_N[m_TowerType];
@@ -216,7 +216,7 @@ void OPvPCapturePointHP::ChangeState()
artkit2 = HP_TowerArtKit_A[m_TowerType];
if (((OutdoorPvPHP*)m_PvP)->m_AllianceTowersControlled<3)
((OutdoorPvPHP*)m_PvP)->m_AllianceTowersControlled++;
sWorld->SendZoneText(OutdoorPvPHPBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_CAPTURE_A[m_TowerType]));
sWorld->SendZoneText(OutdoorPvPHPBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_CAPTURE_A[m_TowerType]));
break;
case OBJECTIVESTATE_HORDE:
field = HP_MAP_H[m_TowerType];
@@ -224,7 +224,7 @@ void OPvPCapturePointHP::ChangeState()
artkit2 = HP_TowerArtKit_H[m_TowerType];
if (((OutdoorPvPHP*)m_PvP)->m_HordeTowersControlled<3)
((OutdoorPvPHP*)m_PvP)->m_HordeTowersControlled++;
sWorld->SendZoneText(OutdoorPvPHPBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_CAPTURE_H[m_TowerType]));
sWorld->SendZoneText(OutdoorPvPHPBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_CAPTURE_H[m_TowerType]));
break;
case OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE:
field = HP_MAP_N[m_TowerType];
@@ -326,9 +326,9 @@ void OutdoorPvPHP::HandleKillImpl(Player *plr, Unit * killed)
return;
if (plr->GetTeam() == ALLIANCE && killed->ToPlayer()->GetTeam() != ALLIANCE)
plr->CastSpell(plr,AlliancePlayerKillReward,true);
plr->CastSpell(plr, AlliancePlayerKillReward, true);
else if (plr->GetTeam() == HORDE && killed->ToPlayer()->GetTeam() != HORDE)
plr->CastSpell(plr,HordePlayerKillReward,true);
plr->CastSpell(plr, HordePlayerKillReward, true);
}
class OutdoorPvP_hellfire_peninsula : public OutdoorPvPScript
src/server/scripts/OutdoorPvP/OutdoorPvPHP.h
+15 -15
View File
@@ -40,11 +40,11 @@ enum OutdoorPvPHPTowerType
HP_TOWER_NUM = 3
};
const uint32 HP_CREDITMARKER[HP_TOWER_NUM] = {19032,19028,19029};
const uint32 HP_CREDITMARKER[HP_TOWER_NUM] = {19032, 19028, 19029};
const uint32 HP_CapturePointEvent_Enter[HP_TOWER_NUM] = {11404,11396,11388};
const uint32 HP_CapturePointEvent_Enter[HP_TOWER_NUM] = {11404, 11396, 11388};
const uint32 HP_CapturePointEvent_Leave[HP_TOWER_NUM] = {11403,11395,11387};
const uint32 HP_CapturePointEvent_Leave[HP_TOWER_NUM] = {11403, 11395, 11387};
enum OutdoorPvPHPWorldStates
{
@@ -59,30 +59,30 @@ enum OutdoorPvPHPWorldStates
HP_UI_TOWER_SLIDER_DISPLAY = 2473
};
const uint32 HP_MAP_N[HP_TOWER_NUM] = {0x9b5,0x9b2,0x9a8};
const uint32 HP_MAP_N[HP_TOWER_NUM] = {0x9b5, 0x9b2, 0x9a8};
const uint32 HP_MAP_A[HP_TOWER_NUM] = {0x9b3,0x9b0,0x9a7};
const uint32 HP_MAP_A[HP_TOWER_NUM] = {0x9b3, 0x9b0, 0x9a7};
const uint32 HP_MAP_H[HP_TOWER_NUM] = {0x9b4,0x9b1,0x9a6};
const uint32 HP_MAP_H[HP_TOWER_NUM] = {0x9b4, 0x9b1, 0x9a6};
const uint32 HP_TowerArtKit_A[HP_TOWER_NUM] = {65,62,67};
const uint32 HP_TowerArtKit_A[HP_TOWER_NUM] = {65, 62, 67};
const uint32 HP_TowerArtKit_H[HP_TOWER_NUM] = {64,61,68};
const uint32 HP_TowerArtKit_H[HP_TOWER_NUM] = {64, 61, 68};
const uint32 HP_TowerArtKit_N[HP_TOWER_NUM] = {66,63,69};
const uint32 HP_TowerArtKit_N[HP_TOWER_NUM] = {66, 63, 69};
const go_type HPCapturePoints[HP_TOWER_NUM] =
{
{182175,530,-471.462f,3451.09f,34.6432f,0.174533f,0.0f,0.0f,0.087156f,0.996195f}, // 0 - Broken Hill
{182174,530,-184.889f,3476.93f,38.205f,-0.017453f,0.0f,0.0f,0.008727f,-0.999962f}, // 1 - Overlook
{182173,530,-290.016f,3702.42f,56.6729f,0.034907f,0.0f,0.0f,0.017452f,0.999848f} // 2 - Stadium
{182175, 530, -471.462f, 3451.09f, 34.6432f, 0.174533f, 0.0f, 0.0f, 0.087156f, 0.996195f}, // 0 - Broken Hill
{182174, 530, -184.889f, 3476.93f, 38.205f, -0.017453f, 0.0f, 0.0f, 0.008727f, -0.999962f}, // 1 - Overlook
{182173, 530, -290.016f, 3702.42f, 56.6729f, 0.034907f, 0.0f, 0.0f, 0.017452f, 0.999848f} // 2 - Stadium
};
const go_type HPTowerFlags[HP_TOWER_NUM] =
{
{183514,530,-467.078f,3528.17f,64.7121f,3.14159f,0.0f,0.0f,1.0f,0.0f}, // 0 broken hill
{182525,530,-187.887f,3459.38f,60.0403f,-3.12414f,0.0f,0.0f,0.999962f,-0.008727f}, // 1 overlook
{183515,530,-289.610f,3696.83f,75.9447f,3.12414f,0.0f,0.0f,0.999962f,0.008727f} // 2 stadium
{183514, 530, -467.078f, 3528.17f, 64.7121f, 3.14159f, 0.0f, 0.0f, 1.0f, 0.0f}, // 0 broken hill
{182525, 530, -187.887f, 3459.38f, 60.0403f, -3.12414f, 0.0f, 0.0f, 0.999962f, -0.008727f}, // 1 overlook
{183515, 530, -289.610f, 3696.83f, 75.9447f, 3.12414f, 0.0f, 0.0f, 0.999962f, 0.008727f} // 2 stadium
};
class OPvPCapturePointHP : public OPvPCapturePoint
src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
+71 -71
View File
@@ -33,11 +33,11 @@ void OutdoorPvPNA::HandleKillImpl(Player *plr, Unit * killed)
{
if (killed->GetTypeId() == TYPEID_PLAYER && plr->GetTeam() != killed->ToPlayer()->GetTeam())
{
plr->KilledMonsterCredit(NA_CREDIT_MARKER,0); // 0 guid, btw it isn't even used in killedmonster function :S
plr->KilledMonsterCredit(NA_CREDIT_MARKER, 0); // 0 guid, btw it isn't even used in killedmonster function :S
if (plr->GetTeam() == ALLIANCE)
plr->CastSpell(plr,NA_KILL_TOKEN_ALLIANCE,true);
plr->CastSpell(plr, NA_KILL_TOKEN_ALLIANCE, true);
else
plr->CastSpell(plr,NA_KILL_TOKEN_HORDE,true);
plr->CastSpell(plr, NA_KILL_TOKEN_HORDE, true);
}
}
@@ -93,7 +93,7 @@ void OPvPCapturePointNA::SpawnNPCsForTeam(uint32 team)
else
return;
for (int i = 0; i < NA_CONTROL_NPC_NUM; ++i)
AddCreature(i,creatures[i].entry,creatures[i].teamval,creatures[i].map,creatures[i].x,creatures[i].y,creatures[i].z,creatures[i].o,1000000);
AddCreature(i, creatures[i].entry, creatures[i].teamval, creatures[i].map, creatures[i].x, creatures[i].y, creatures[i].z, creatures[i].o, 1000000);
}
void OPvPCapturePointNA::DeSpawnNPCs()
@@ -122,7 +122,7 @@ void OPvPCapturePointNA::SpawnGOsForTeam(uint32 team)
i == NA_BOMB_WAGON_N ||
i == NA_BOMB_WAGON_E)
continue; // roosts and bomb wagons are spawned when someone uses the matching destroyed roost
AddObject(i,gos[i].entry,gos[i].map,gos[i].x,gos[i].y,gos[i].z,gos[i].o,gos[i].rot0,gos[i].rot1,gos[i].rot2,gos[i].rot3);
AddObject(i, gos[i].entry, gos[i].map, gos[i].x, gos[i].y, gos[i].z, gos[i].o, gos[i].rot0, gos[i].rot1, gos[i].rot2, gos[i].rot3);
}
}
@@ -137,15 +137,15 @@ void OPvPCapturePointNA::DeSpawnGOs()
void OPvPCapturePointNA::FactionTakeOver(uint32 team)
{
if (m_ControllingFaction)
sObjectMgr->RemoveGraveYardLink(NA_HALAA_GRAVEYARD,NA_HALAA_GRAVEYARD_ZONE,m_ControllingFaction,false);
sObjectMgr->RemoveGraveYardLink(NA_HALAA_GRAVEYARD, NA_HALAA_GRAVEYARD_ZONE, m_ControllingFaction, false);
if (m_ControllingFaction == ALLIANCE)
sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_LOSE_A));
sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_LOSE_A));
else if (m_ControllingFaction == HORDE)
sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_LOSE_H));
sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_LOSE_H));
m_ControllingFaction = team;
if (m_ControllingFaction)
sObjectMgr->AddGraveYardLink(NA_HALAA_GRAVEYARD,NA_HALAA_GRAVEYARD_ZONE,m_ControllingFaction,false);
sObjectMgr->AddGraveYardLink(NA_HALAA_GRAVEYARD, NA_HALAA_GRAVEYARD_ZONE, m_ControllingFaction, false);
DeSpawnGOs();
DeSpawnNPCs();
SpawnGOsForTeam(team);
@@ -163,7 +163,7 @@ void OPvPCapturePointNA::FactionTakeOver(uint32 team)
m_PvP->SendUpdateWorldState(NA_UI_HORDE_GUARDS_SHOW, 0);
m_PvP->SendUpdateWorldState(NA_UI_ALLIANCE_GUARDS_SHOW, 1);
m_PvP->SendUpdateWorldState(NA_UI_GUARDS_LEFT, m_GuardsAlive);
sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_CAPTURE_A));
sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_CAPTURE_A));
}
else
{
@@ -175,7 +175,7 @@ void OPvPCapturePointNA::FactionTakeOver(uint32 team)
m_PvP->SendUpdateWorldState(NA_UI_HORDE_GUARDS_SHOW, 1);
m_PvP->SendUpdateWorldState(NA_UI_ALLIANCE_GUARDS_SHOW, 0);
m_PvP->SendUpdateWorldState(NA_UI_GUARDS_LEFT, m_GuardsAlive);
sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_CAPTURE_H));
sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_CAPTURE_H));
}
UpdateWyvernRoostWorldState(NA_ROOST_S);
UpdateWyvernRoostWorldState(NA_ROOST_N);
@@ -207,7 +207,7 @@ OPvPCapturePoint(pvp), m_capturable(true), m_GuardsAlive(0), m_ControllingFactio
m_WyvernStateNorth(0), m_WyvernStateSouth(0), m_WyvernStateEast(0), m_WyvernStateWest(0),
m_HalaaState(HALAA_N), m_RespawnTimer(NA_RESPAWN_TIME), m_GuardCheckTimer(NA_GUARD_CHECK_TIME)
{
SetCapturePointData(182210,530,-1572.57f,7945.3f,-22.475f,2.05949f,0.0f,0.0f,0.857167f,0.515038f);
SetCapturePointData(182210, 530, -1572.57f, 7945.3f, -22.475f, 2.05949f, 0.0f, 0.0f, 0.857167f, 0.515038f);
}
bool OutdoorPvPNA::SetupOutdoorPvP()
@@ -229,8 +229,8 @@ void OutdoorPvPNA::HandlePlayerEnterZone(Player * plr, uint32 zone)
{
// add buffs
if (plr->GetTeam() == m_obj->m_ControllingFaction)
plr->CastSpell(plr,NA_CAPTURE_BUFF,true);
OutdoorPvP::HandlePlayerEnterZone(plr,zone);
plr->CastSpell(plr, NA_CAPTURE_BUFF, true);
OutdoorPvP::HandlePlayerEnterZone(plr, zone);
}
void OutdoorPvPNA::HandlePlayerLeaveZone(Player * plr, uint32 zone)
@@ -299,34 +299,34 @@ void OPvPCapturePointNA::FillInitialWorldStates(WorldPacket &data)
void OutdoorPvPNA::SendRemoveWorldStates(Player *plr)
{
plr->SendUpdateWorldState(NA_UI_HORDE_GUARDS_SHOW,0);
plr->SendUpdateWorldState(NA_UI_ALLIANCE_GUARDS_SHOW,0);
plr->SendUpdateWorldState(NA_UI_GUARDS_MAX,0);
plr->SendUpdateWorldState(NA_UI_GUARDS_LEFT,0);
plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_DISPLAY,0);
plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_POS,0);
plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_N,0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_H,0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_A,0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_H,0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_A,0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_H,0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_A,0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_H,0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_A,0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_H,0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_A,0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_H,0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_A,0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_H,0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_A,0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_H,0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_A,0);
plr->SendUpdateWorldState(NA_MAP_HALAA_NEUTRAL,0);
plr->SendUpdateWorldState(NA_MAP_HALAA_NEU_A,0);
plr->SendUpdateWorldState(NA_MAP_HALAA_NEU_H,0);
plr->SendUpdateWorldState(NA_MAP_HALAA_HORDE,0);
plr->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE,0);
plr->SendUpdateWorldState(NA_UI_HORDE_GUARDS_SHOW, 0);
plr->SendUpdateWorldState(NA_UI_ALLIANCE_GUARDS_SHOW, 0);
plr->SendUpdateWorldState(NA_UI_GUARDS_MAX, 0);
plr->SendUpdateWorldState(NA_UI_GUARDS_LEFT, 0);
plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_DISPLAY, 0);
plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_POS, 0);
plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_N, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_H, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_A, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_H, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_A, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_H, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_A, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_H, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_A, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_H, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_A, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_H, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_A, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_H, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_A, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_H, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_A, 0);
plr->SendUpdateWorldState(NA_MAP_HALAA_NEUTRAL, 0);
plr->SendUpdateWorldState(NA_MAP_HALAA_NEU_A, 0);
plr->SendUpdateWorldState(NA_MAP_HALAA_NEU_H, 0);
plr->SendUpdateWorldState(NA_MAP_HALAA_HORDE, 0);
plr->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE, 0);
}
bool OutdoorPvPNA::Update(uint32 diff)
@@ -346,7 +346,7 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player * plr, uint32 spellId, GameObj
nodes[1] = FlightPathEndNodes[NA_ROOST_N];
plr->ActivateTaxiPathTo(nodes);
plr->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP);
plr->UpdatePvP(true,true);
plr->UpdatePvP(true, true);
retval = true;
break;
case NA_SPELL_FLY_SOUTH:
@@ -354,7 +354,7 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player * plr, uint32 spellId, GameObj
nodes[1] = FlightPathEndNodes[NA_ROOST_S];
plr->ActivateTaxiPathTo(nodes);
plr->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP);
plr->UpdatePvP(true,true);
plr->UpdatePvP(true, true);
retval = true;
break;
case NA_SPELL_FLY_WEST:
@@ -362,7 +362,7 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player * plr, uint32 spellId, GameObj
nodes[1] = FlightPathEndNodes[NA_ROOST_W];
plr->ActivateTaxiPathTo(nodes);
plr->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP);
plr->UpdatePvP(true,true);
plr->UpdatePvP(true, true);
retval = true;
break;
case NA_SPELL_FLY_EAST:
@@ -370,7 +370,7 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player * plr, uint32 spellId, GameObj
nodes[1] = FlightPathEndNodes[NA_ROOST_E];
plr->ActivateTaxiPathTo(nodes);
plr->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP);
plr->UpdatePvP(true,true);
plr->UpdatePvP(true, true);
retval = true;
break;
default:
@@ -401,7 +401,7 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player * plr, uint32 spellId, GameObj
if (count > 0 && item)
{
plr->SendNewItem(item,count,true,false);
plr->SendNewItem(item, count, true, false);
}
return true;
@@ -521,10 +521,10 @@ int32 OPvPCapturePointNA::HandleOpenGo(Player *plr, uint64 guid)
DelObject(del2);
if (add>-1)
AddObject(add,gos[add].entry,gos[add].map,gos[add].x,gos[add].y,gos[add].z,gos[add].o,gos[add].rot0,gos[add].rot1,gos[add].rot2,gos[add].rot3);
AddObject(add, gos[add].entry, gos[add].map, gos[add].x, gos[add].y, gos[add].z, gos[add].o, gos[add].rot0, gos[add].rot1, gos[add].rot2, gos[add].rot3);
if (add2>-1)
AddObject(add2,gos[add2].entry,gos[add2].map,gos[add2].x,gos[add2].y,gos[add2].z,gos[add2].o,gos[add2].rot0,gos[add2].rot1,gos[add2].rot2,gos[add2].rot3);
AddObject(add2, gos[add2].entry, gos[add2].map, gos[add2].x, gos[add2].y, gos[add2].z, gos[add2].o, gos[add2].rot0, gos[add2].rot1, gos[add2].rot2, gos[add2].rot3);
return retval;
}
@@ -550,7 +550,7 @@ bool OPvPCapturePointNA::Update(uint32 diff)
if (m_GuardsAlive == 0)
m_capturable = true;
// update the guard count for the players in zone
m_PvP->SendUpdateWorldState(NA_UI_GUARDS_LEFT,m_GuardsAlive);
m_PvP->SendUpdateWorldState(NA_UI_GUARDS_LEFT, m_GuardsAlive);
}
} else m_GuardCheckTimer -= diff;
@@ -625,11 +625,11 @@ void OPvPCapturePointNA::SendChangePhase()
void OPvPCapturePointNA::UpdateHalaaWorldState()
{
m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEUTRAL ,uint32(bool(m_HalaaState & HALAA_N)));
m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_A ,uint32(bool(m_HalaaState & HALAA_N_A)));
m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_H ,uint32(bool(m_HalaaState & HALAA_N_H)));
m_PvP->SendUpdateWorldState(NA_MAP_HALAA_HORDE ,uint32(bool(m_HalaaState & HALAA_H)));
m_PvP->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE ,uint32(bool(m_HalaaState & HALAA_A)));
m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEUTRAL , uint32(bool(m_HalaaState & HALAA_N)));
m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_A , uint32(bool(m_HalaaState & HALAA_N_A)));
m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_H , uint32(bool(m_HalaaState & HALAA_N_H)));
m_PvP->SendUpdateWorldState(NA_MAP_HALAA_HORDE , uint32(bool(m_HalaaState & HALAA_H)));
m_PvP->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE , uint32(bool(m_HalaaState & HALAA_A)));
}
void OPvPCapturePointNA::UpdateWyvernRoostWorldState(uint32 roost)
@@ -637,28 +637,28 @@ void OPvPCapturePointNA::UpdateWyvernRoostWorldState(uint32 roost)
switch(roost)
{
case NA_ROOST_S:
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_H,uint32(bool(m_WyvernStateSouth & WYVERN_NEU_HORDE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_A,uint32(bool(m_WyvernStateSouth & WYVERN_NEU_ALLIANCE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_H,uint32(bool(m_WyvernStateSouth & WYVERN_HORDE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_A,uint32(bool(m_WyvernStateSouth & WYVERN_ALLIANCE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_H, uint32(bool(m_WyvernStateSouth & WYVERN_NEU_HORDE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_A, uint32(bool(m_WyvernStateSouth & WYVERN_NEU_ALLIANCE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_H, uint32(bool(m_WyvernStateSouth & WYVERN_HORDE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_A, uint32(bool(m_WyvernStateSouth & WYVERN_ALLIANCE)));
break;
case NA_ROOST_N:
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_H,uint32(bool(m_WyvernStateNorth & WYVERN_NEU_HORDE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_A,uint32(bool(m_WyvernStateNorth & WYVERN_NEU_ALLIANCE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_H,uint32(bool(m_WyvernStateNorth & WYVERN_HORDE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_A,uint32(bool(m_WyvernStateNorth & WYVERN_ALLIANCE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_H, uint32(bool(m_WyvernStateNorth & WYVERN_NEU_HORDE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_A, uint32(bool(m_WyvernStateNorth & WYVERN_NEU_ALLIANCE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_H, uint32(bool(m_WyvernStateNorth & WYVERN_HORDE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_A, uint32(bool(m_WyvernStateNorth & WYVERN_ALLIANCE)));
break;
case NA_ROOST_W:
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_H,uint32(bool(m_WyvernStateWest & WYVERN_NEU_HORDE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_A,uint32(bool(m_WyvernStateWest & WYVERN_NEU_ALLIANCE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_H,uint32(bool(m_WyvernStateWest & WYVERN_HORDE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_A,uint32(bool(m_WyvernStateWest & WYVERN_ALLIANCE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_H, uint32(bool(m_WyvernStateWest & WYVERN_NEU_HORDE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_A, uint32(bool(m_WyvernStateWest & WYVERN_NEU_ALLIANCE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_H, uint32(bool(m_WyvernStateWest & WYVERN_HORDE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_A, uint32(bool(m_WyvernStateWest & WYVERN_ALLIANCE)));
break;
case NA_ROOST_E:
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_H,uint32(bool(m_WyvernStateEast & WYVERN_NEU_HORDE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_A,uint32(bool(m_WyvernStateEast & WYVERN_NEU_ALLIANCE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_H,uint32(bool(m_WyvernStateEast & WYVERN_HORDE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_A,uint32(bool(m_WyvernStateEast & WYVERN_ALLIANCE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_H, uint32(bool(m_WyvernStateEast & WYVERN_NEU_HORDE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_A, uint32(bool(m_WyvernStateEast & WYVERN_NEU_ALLIANCE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_H, uint32(bool(m_WyvernStateEast & WYVERN_HORDE)));
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_A, uint32(bool(m_WyvernStateEast & WYVERN_ALLIANCE)));
break;
}
}
src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
+66 -66
View File
@@ -105,8 +105,8 @@ enum ControlGOTypes
NA_CONTROL_GO_NUM = 12
};
const uint32 FlightPathStartNodes[FLIGHT_NODES_NUM] = {103,105,107,109};
const uint32 FlightPathEndNodes[FLIGHT_NODES_NUM] = {104,106,108,110};
const uint32 FlightPathStartNodes[FLIGHT_NODES_NUM] = {103, 105, 107, 109};
const uint32 FlightPathEndNodes[FLIGHT_NODES_NUM] = {104, 106, 108, 110};
enum FlightSpellsNA
{
@@ -119,39 +119,39 @@ enum FlightSpellsNA
// spawned when the alliance is attacking, horde is in control
const go_type HordeControlGOs[NA_CONTROL_GO_NUM] =
{
{182267,530,-1815.8f,8036.51f,-26.2354f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //ALLY_ROOST_SOUTH
{182280,530,-1507.95f,8132.1f,-19.5585f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //ALLY_ROOST_WEST
{182281,530,-1384.52f,7779.33f,-11.1663f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //ALLY_ROOST_NORTH
{182282,530,-1650.11f,7732.56f,-15.4505f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f}, //ALLY_ROOST_EAST
{182267, 530, -1815.8f, 8036.51f, -26.2354f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //ALLY_ROOST_SOUTH
{182280, 530, -1507.95f, 8132.1f, -19.5585f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //ALLY_ROOST_WEST
{182281, 530, -1384.52f, 7779.33f, -11.1663f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //ALLY_ROOST_NORTH
{182282, 530, -1650.11f, 7732.56f, -15.4505f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //ALLY_ROOST_EAST
{182222,530,-1825.4022f,8039.2602f,-26.08f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //HORDE_BOMB_WAGON_SOUTH
{182272,530,-1515.37f,8136.91f,-20.42f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //HORDE_BOMB_WAGON_WEST
{182273,530,-1377.95f,7773.44f,-10.31f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //HORDE_BOMB_WAGON_NORTH
{182274,530,-1659.87f,7733.15f,-15.75f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f}, //HORDE_BOMB_WAGON_EAST
{182222, 530, -1825.4022f, 8039.2602f, -26.08f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //HORDE_BOMB_WAGON_SOUTH
{182272, 530, -1515.37f, 8136.91f, -20.42f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //HORDE_BOMB_WAGON_WEST
{182273, 530, -1377.95f, 7773.44f, -10.31f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //HORDE_BOMB_WAGON_NORTH
{182274, 530, -1659.87f, 7733.15f, -15.75f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //HORDE_BOMB_WAGON_EAST
{182266,530,-1815.8f,8036.51f,-26.2354f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //DESTROYED_ALLY_ROOST_SOUTH
{182275,530,-1507.95f,8132.1f,-19.5585f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //DESTROYED_ALLY_ROOST_WEST
{182276,530,-1384.52f,7779.33f,-11.1663f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //DESTROYED_ALLY_ROOST_NORTH
{182277,530,-1650.11f,7732.56f,-15.4505f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f} //DESTROYED_ALLY_ROOST_EAST
{182266, 530, -1815.8f, 8036.51f, -26.2354f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //DESTROYED_ALLY_ROOST_SOUTH
{182275, 530, -1507.95f, 8132.1f, -19.5585f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //DESTROYED_ALLY_ROOST_WEST
{182276, 530, -1384.52f, 7779.33f, -11.1663f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //DESTROYED_ALLY_ROOST_NORTH
{182277, 530, -1650.11f, 7732.56f, -15.4505f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f} //DESTROYED_ALLY_ROOST_EAST
};
// spawned when the horde is attacking, alliance is in control
const go_type AllianceControlGOs[NA_CONTROL_GO_NUM] =
{
{182301,530,-1815.8f,8036.51f,-26.2354f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //HORDE_ROOST_SOUTH
{182302,530,-1507.95f,8132.1f,-19.5585f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //HORDE_ROOST_WEST
{182303,530,-1384.52f,7779.33f,-11.1663f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //HORDE_ROOST_NORTH
{182304,530,-1650.11f,7732.56f,-15.4505f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f}, //HORDE_ROOST_EAST
{182301, 530, -1815.8f, 8036.51f, -26.2354f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //HORDE_ROOST_SOUTH
{182302, 530, -1507.95f, 8132.1f, -19.5585f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //HORDE_ROOST_WEST
{182303, 530, -1384.52f, 7779.33f, -11.1663f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //HORDE_ROOST_NORTH
{182304, 530, -1650.11f, 7732.56f, -15.4505f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //HORDE_ROOST_EAST
{182305,530,-1825.4022f,8039.2602f,-26.08f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //ALLY_BOMB_WAGON_SOUTH
{182306,530,-1515.37f,8136.91f,-20.42f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //ALLY_BOMB_WAGON_WEST
{182307,530,-1377.95f,7773.44f,-10.31f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //ALLY_BOMB_WAGON_NORTH
{182308,530,-1659.87f,7733.15f,-15.75f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f}, //ALLY_BOMB_WAGON_EAST
{182305, 530, -1825.4022f, 8039.2602f, -26.08f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //ALLY_BOMB_WAGON_SOUTH
{182306, 530, -1515.37f, 8136.91f, -20.42f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //ALLY_BOMB_WAGON_WEST
{182307, 530, -1377.95f, 7773.44f, -10.31f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //ALLY_BOMB_WAGON_NORTH
{182308, 530, -1659.87f, 7733.15f, -15.75f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //ALLY_BOMB_WAGON_EAST
{182297,530,-1815.8f,8036.51f,-26.2354f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //DESTROYED_HORDE_ROOST_SOUTH
{182298,530,-1507.95f,8132.1f,-19.5585f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //DESTROYED_HORDE_ROOST_WEST
{182299,530,-1384.52f,7779.33f,-11.1663f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //DESTROYED_HORDE_ROOST_NORTH
{182300,530,-1650.11f,7732.56f,-15.4505f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f} //DESTROYED_HORDE_ROOST_EAST
{182297, 530, -1815.8f, 8036.51f, -26.2354f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //DESTROYED_HORDE_ROOST_SOUTH
{182298, 530, -1507.95f, 8132.1f, -19.5585f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //DESTROYED_HORDE_ROOST_WEST
{182299, 530, -1384.52f, 7779.33f, -11.1663f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //DESTROYED_HORDE_ROOST_NORTH
{182300, 530, -1650.11f, 7732.56f, -15.4505f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f} //DESTROYED_HORDE_ROOST_EAST
};
enum ControlNPCTypes
@@ -183,50 +183,50 @@ enum ControlNPCTypes
const creature_type HordeControlNPCs[NA_CONTROL_NPC_NUM] =
{
{18816,67,530,-1523.92f,7951.76f,-17.6942f,3.51172f},
{18821,67,530,-1527.75f,7952.46f,-17.6948f,3.99317f},
{21474,67,530,-1520.14f,7927.11f,-20.2527f,3.39389f},
{21484,67,530,-1524.84f,7930.34f,-20.182f,3.6405f},
{21483,67,530,-1570.01f,7993.8f,-22.4505f,5.02655f},
{18192,67,530,-1654.06f,8000.46f,-26.59f,3.37f},
{18192,67,530,-1487.18f,7899.1f,-19.53f,0.954f},
{18192,67,530,-1480.88f,7908.79f,-19.19f,4.485f},
{18192,67,530,-1540.56f,7995.44f,-20.45f,0.947f},
{18192,67,530,-1546.95f,8000.85f,-20.72f,6.035f},
{18192,67,530,-1595.31f,7860.53f,-21.51f,3.747f},
{18192,67,530,-1642.31f,7995.59f,-25.8f,3.317f},
{18192,67,530,-1545.46f,7995.35f,-20.63f,1.094f},
{18192,67,530,-1487.58f,7907.99f,-19.27f,5.567f},
{18192,67,530,-1651.54f,7988.56f,-26.5289f,2.98451f},
{18192,67,530,-1602.46f,7866.43f,-22.1177f,4.74729f},
{18192,67,530,-1591.22f,7875.29f,-22.3536f,4.34587f},
{18192,67,530,-1550.6f,7944.45f,-21.63f,3.559f},
{18192,67,530,-1545.57f,7935.83f,-21.13f,3.448f},
{18192,67,530,-1550.86f,7937.56f,-21.7f,3.801f}
{18816, 67, 530, -1523.92f, 7951.76f, -17.6942f, 3.51172f},
{18821, 67, 530, -1527.75f, 7952.46f, -17.6948f, 3.99317f},
{21474, 67, 530, -1520.14f, 7927.11f, -20.2527f, 3.39389f},
{21484, 67, 530, -1524.84f, 7930.34f, -20.182f, 3.6405f},
{21483, 67, 530, -1570.01f, 7993.8f, -22.4505f, 5.02655f},
{18192, 67, 530, -1654.06f, 8000.46f, -26.59f, 3.37f},
{18192, 67, 530, -1487.18f, 7899.1f, -19.53f, 0.954f},
{18192, 67, 530, -1480.88f, 7908.79f, -19.19f, 4.485f},
{18192, 67, 530, -1540.56f, 7995.44f, -20.45f, 0.947f},
{18192, 67, 530, -1546.95f, 8000.85f, -20.72f, 6.035f},
{18192, 67, 530, -1595.31f, 7860.53f, -21.51f, 3.747f},
{18192, 67, 530, -1642.31f, 7995.59f, -25.8f, 3.317f},
{18192, 67, 530, -1545.46f, 7995.35f, -20.63f, 1.094f},
{18192, 67, 530, -1487.58f, 7907.99f, -19.27f, 5.567f},
{18192, 67, 530, -1651.54f, 7988.56f, -26.5289f, 2.98451f},
{18192, 67, 530, -1602.46f, 7866.43f, -22.1177f, 4.74729f},
{18192, 67, 530, -1591.22f, 7875.29f, -22.3536f, 4.34587f},
{18192, 67, 530, -1550.6f, 7944.45f, -21.63f, 3.559f},
{18192, 67, 530, -1545.57f, 7935.83f, -21.13f, 3.448f},
{18192, 67, 530, -1550.86f, 7937.56f, -21.7f, 3.801f}
};
const creature_type AllianceControlNPCs[NA_CONTROL_NPC_NUM] =
{
{18817,469,530,-1591.18f,8020.39f,-22.2042f,4.59022f},
{18822,469,530,-1588.0f,8019.0f,-22.2042f,4.06662f},
{21485,469,530,-1521.93f,7927.37f,-20.2299f,3.24631f},
{21487,469,530,-1540.33f,7971.95f,-20.7186f,3.07178f},
{21488,469,530,-1570.01f,7993.8f,-22.4505f,5.02655f},
{18256,469,530,-1654.06f,8000.46f,-26.59f,3.37f},
{18256,469,530,-1487.18f,7899.1f,-19.53f,0.954f},
{18256,469,530,-1480.88f,7908.79f,-19.19f,4.485f},
{18256,469,530,-1540.56f,7995.44f,-20.45f,0.947f},
{18256,469,530,-1546.95f,8000.85f,-20.72f,6.035f},
{18256,469,530,-1595.31f,7860.53f,-21.51f,3.747f},
{18256,469,530,-1642.31f,7995.59f,-25.8f,3.317f},
{18256,469,530,-1545.46f,7995.35f,-20.63f,1.094f},
{18256,469,530,-1487.58f,7907.99f,-19.27f,5.567f},
{18256,469,530,-1651.54f,7988.56f,-26.5289f,2.98451f},
{18256,469,530,-1602.46f,7866.43f,-22.1177f,4.74729f},
{18256,469,530,-1591.22f,7875.29f,-22.3536f,4.34587f},
{18256,469,530,-1603.75f,8000.36f,-24.18f,4.516f},
{18256,469,530,-1585.73f,7994.68f,-23.29f,4.439f},
{18256,469,530,-1595.5f,7991.27f,-23.53f,4.738f}
{18817, 469, 530, -1591.18f, 8020.39f, -22.2042f, 4.59022f},
{18822, 469, 530, -1588.0f, 8019.0f, -22.2042f, 4.06662f},
{21485, 469, 530, -1521.93f, 7927.37f, -20.2299f, 3.24631f},
{21487, 469, 530, -1540.33f, 7971.95f, -20.7186f, 3.07178f},
{21488, 469, 530, -1570.01f, 7993.8f, -22.4505f, 5.02655f},
{18256, 469, 530, -1654.06f, 8000.46f, -26.59f, 3.37f},
{18256, 469, 530, -1487.18f, 7899.1f, -19.53f, 0.954f},
{18256, 469, 530, -1480.88f, 7908.79f, -19.19f, 4.485f},
{18256, 469, 530, -1540.56f, 7995.44f, -20.45f, 0.947f},
{18256, 469, 530, -1546.95f, 8000.85f, -20.72f, 6.035f},
{18256, 469, 530, -1595.31f, 7860.53f, -21.51f, 3.747f},
{18256, 469, 530, -1642.31f, 7995.59f, -25.8f, 3.317f},
{18256, 469, 530, -1545.46f, 7995.35f, -20.63f, 1.094f},
{18256, 469, 530, -1487.58f, 7907.99f, -19.27f, 5.567f},
{18256, 469, 530, -1651.54f, 7988.56f, -26.5289f, 2.98451f},
{18256, 469, 530, -1602.46f, 7866.43f, -22.1177f, 4.74729f},
{18256, 469, 530, -1591.22f, 7875.29f, -22.3536f, 4.34587f},
{18256, 469, 530, -1603.75f, 8000.36f, -24.18f, 4.516f},
{18256, 469, 530, -1585.73f, 7994.68f, -23.29f, 4.439f},
{18256, 469, 530, -1595.5f, 7991.27f, -23.53f, 4.738f}
};
enum WyvernStates
src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
+23 -23
View File
@@ -43,16 +43,16 @@ void OutdoorPvPSI::FillInitialWorldStates(WorldPacket &data)
void OutdoorPvPSI::SendRemoveWorldStates(Player *plr)
{
plr->SendUpdateWorldState(SI_GATHERED_A,0);
plr->SendUpdateWorldState(SI_GATHERED_H,0);
plr->SendUpdateWorldState(SI_SILITHYST_MAX,0);
plr->SendUpdateWorldState(SI_GATHERED_A, 0);
plr->SendUpdateWorldState(SI_GATHERED_H, 0);
plr->SendUpdateWorldState(SI_SILITHYST_MAX, 0);
}
void OutdoorPvPSI::UpdateWorldState()
{
SendUpdateWorldState(SI_GATHERED_A,m_Gathered_A);
SendUpdateWorldState(SI_GATHERED_H,m_Gathered_H);
SendUpdateWorldState(SI_SILITHYST_MAX,SI_MAX_RESOURCES);
SendUpdateWorldState(SI_GATHERED_A, m_Gathered_A);
SendUpdateWorldState(SI_GATHERED_H, m_Gathered_H);
SendUpdateWorldState(SI_SILITHYST_MAX, SI_MAX_RESOURCES);
}
bool OutdoorPvPSI::SetupOutdoorPvP()
@@ -70,8 +70,8 @@ bool OutdoorPvPSI::Update(uint32 /*diff*/)
void OutdoorPvPSI::HandlePlayerEnterZone(Player * plr, uint32 zone)
{
if (plr->GetTeam() == m_LastController)
plr->CastSpell(plr,SI_CENARION_FAVOR,true);
OutdoorPvP::HandlePlayerEnterZone(plr,zone);
plr->CastSpell(plr, SI_CENARION_FAVOR, true);
OutdoorPvP::HandlePlayerEnterZone(plr, zone);
}
void OutdoorPvPSI::HandlePlayerLeaveZone(Player * plr, uint32 zone)
@@ -94,20 +94,20 @@ bool OutdoorPvPSI::HandleAreaTrigger(Player *plr, uint32 trigger)
if (m_Gathered_A >= SI_MAX_RESOURCES)
{
TeamApplyBuff(TEAM_ALLIANCE, SI_CENARION_FAVOR);
sWorld->SendZoneText(OutdoorPvPSIBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_SI_CAPTURE_A));
sWorld->SendZoneText(OutdoorPvPSIBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_SI_CAPTURE_A));
m_LastController = ALLIANCE;
m_Gathered_A = 0;
m_Gathered_H = 0;
}
UpdateWorldState();
// reward player
plr->CastSpell(plr,SI_TRACES_OF_SILITHYST,true);
plr->CastSpell(plr, SI_TRACES_OF_SILITHYST, true);
// add 19 honor
plr->RewardHonor(NULL,1,19);
plr->RewardHonor(NULL, 1, 19);
// add 20 cenarion circle repu
plr->GetReputationMgr().ModifyReputation(sFactionStore.LookupEntry(609),20);
plr->GetReputationMgr().ModifyReputation(sFactionStore.LookupEntry(609), 20);
// complete quest
plr->KilledMonsterCredit(SI_TURNIN_QUEST_CM_A,0);
plr->KilledMonsterCredit(SI_TURNIN_QUEST_CM_A, 0);
}
return true;
case SI_AREATRIGGER_H:
@@ -119,20 +119,20 @@ bool OutdoorPvPSI::HandleAreaTrigger(Player *plr, uint32 trigger)
if (m_Gathered_H >= SI_MAX_RESOURCES)
{
TeamApplyBuff(TEAM_HORDE, SI_CENARION_FAVOR);
sWorld->SendZoneText(OutdoorPvPSIBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_SI_CAPTURE_H));
sWorld->SendZoneText(OutdoorPvPSIBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_SI_CAPTURE_H));
m_LastController = HORDE;
m_Gathered_A = 0;
m_Gathered_H = 0;
}
UpdateWorldState();
// reward player
plr->CastSpell(plr,SI_TRACES_OF_SILITHYST,true);
plr->CastSpell(plr, SI_TRACES_OF_SILITHYST, true);
// add 19 honor
plr->RewardHonor(NULL,1,19);
plr->RewardHonor(NULL, 1, 19);
// add 20 cenarion circle repu
plr->GetReputationMgr().ModifyReputation(sFactionStore.LookupEntry(609),20);
plr->GetReputationMgr().ModifyReputation(sFactionStore.LookupEntry(609), 20);
// complete quest
plr->KilledMonsterCredit(SI_TURNIN_QUEST_CM_H,0);
plr->KilledMonsterCredit(SI_TURNIN_QUEST_CM_H, 0);
}
return true;
}
@@ -152,7 +152,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId)
if (atEntry)
{
// 5.0f is safe-distance
if (plr->GetDistance(atEntry->x,atEntry->y,atEntry->z) > 5.0f + atEntry->radius)
if (plr->GetDistance(atEntry->x, atEntry->y, atEntry->z) > 5.0f + atEntry->radius)
{
// he dropped it further, summon mound
GameObject * go = new GameObject;
@@ -163,7 +163,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId)
return true;
}
if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT),SI_SILITHYST_MOUND, map, plr->GetPhaseMask(), plr->GetPositionX(),plr->GetPositionY(),plr->GetPositionZ(),plr->GetOrientation(),0,0,0,0,100,GO_STATE_READY))
if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), SI_SILITHYST_MOUND, map, plr->GetPhaseMask(), plr->GetPositionX(), plr->GetPositionY(), plr->GetPositionZ(), plr->GetOrientation(), 0, 0, 0, 0, 100, GO_STATE_READY))
{
delete go;
}
@@ -182,7 +182,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId)
if (atEntry)
{
// 5.0f is safe-distance
if (plr->GetDistance(atEntry->x,atEntry->y,atEntry->z) > 5.0f + atEntry->radius)
if (plr->GetDistance(atEntry->x, atEntry->y, atEntry->z) > 5.0f + atEntry->radius)
{
// he dropped it further, summon mound
GameObject * go = new GameObject;
@@ -192,7 +192,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId)
delete go;
return true;
}
if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT),SI_SILITHYST_MOUND, map, plr->GetPhaseMask() ,plr->GetPositionX(),plr->GetPositionY(),plr->GetPositionZ(),plr->GetOrientation(),0,0,0,0,100,GO_STATE_READY))
if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), SI_SILITHYST_MOUND, map, plr->GetPhaseMask() , plr->GetPositionX(), plr->GetPositionY(), plr->GetPositionZ(), plr->GetOrientation(), 0, 0, 0, 0, 100, GO_STATE_READY))
{
delete go;
}
@@ -215,7 +215,7 @@ bool OutdoorPvPSI::HandleCustomSpell(Player *plr, uint32 spellId, GameObject *go
{
if (!go || spellId != SI_SILITHYST_FLAG_GO_SPELL)
return false;
plr->CastSpell(plr,SI_SILITHYST_FLAG,true);
plr->CastSpell(plr, SI_SILITHYST_FLAG, true);
if (go->GetGOInfo()->entry == SI_SILITHYST_MOUND)
{
// despawn go
src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp
+43 -43
View File
@@ -33,7 +33,7 @@ OutdoorPvPTF::OutdoorPvPTF()
OPvPCapturePointTF::OPvPCapturePointTF(OutdoorPvP *pvp, OutdoorPvPTF_TowerType type)
: OPvPCapturePoint(pvp), m_TowerType(type), m_TowerState(TF_TOWERSTATE_N)
{
SetCapturePointData(TFCapturePoints[type].entry,TFCapturePoints[type].map,TFCapturePoints[type].x,TFCapturePoints[type].y,TFCapturePoints[type].z,TFCapturePoints[type].o,TFCapturePoints[type].rot0,TFCapturePoints[type].rot1,TFCapturePoints[type].rot2,TFCapturePoints[type].rot3);
SetCapturePointData(TFCapturePoints[type].entry, TFCapturePoints[type].map, TFCapturePoints[type].x, TFCapturePoints[type].y, TFCapturePoints[type].z, TFCapturePoints[type].o, TFCapturePoints[type].rot0, TFCapturePoints[type].rot1, TFCapturePoints[type].rot2, TFCapturePoints[type].rot3);
}
void OPvPCapturePointTF::FillInitialWorldStates(WorldPacket &data)
@@ -69,35 +69,35 @@ void OutdoorPvPTF::FillInitialWorldStates(WorldPacket &data)
void OutdoorPvPTF::SendRemoveWorldStates(Player * plr)
{
plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_POS,uint32(0));
plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_N,uint32(0));
plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_DISPLAY,uint32(0));
plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_POS, uint32(0));
plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_N, uint32(0));
plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_DISPLAY, uint32(0));
plr->SendUpdateWorldState(TF_UI_TOWER_COUNT_H,uint32(0));
plr->SendUpdateWorldState(TF_UI_TOWER_COUNT_A,uint32(0));
plr->SendUpdateWorldState(TF_UI_TOWERS_CONTROLLED_DISPLAY,uint32(0));
plr->SendUpdateWorldState(TF_UI_TOWER_COUNT_H, uint32(0));
plr->SendUpdateWorldState(TF_UI_TOWER_COUNT_A, uint32(0));
plr->SendUpdateWorldState(TF_UI_TOWERS_CONTROLLED_DISPLAY, uint32(0));
plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_FIRST_DIGIT,uint32(0));
plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_SECOND_DIGIT,uint32(0));
plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_HOURS,uint32(0));
plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_FIRST_DIGIT, uint32(0));
plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_SECOND_DIGIT, uint32(0));
plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_HOURS, uint32(0));
plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL,uint32(0));
plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE,uint32(0));
plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE,uint32(0));
plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL, uint32(0));
plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE, uint32(0));
plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE, uint32(0));
for (int i = 0; i < TF_TOWER_NUM; ++i)
{
plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].n),uint32(0));
plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].h),uint32(0));
plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].a),uint32(0));
plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].n), uint32(0));
plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].h), uint32(0));
plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].a), uint32(0));
}
}
void OPvPCapturePointTF::UpdateTowerState()
{
m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].n),uint32(bool(m_TowerState & TF_TOWERSTATE_N)));
m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].h),uint32(bool(m_TowerState & TF_TOWERSTATE_H)));
m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].a),uint32(bool(m_TowerState & TF_TOWERSTATE_A)));
m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].n), uint32(bool(m_TowerState & TF_TOWERSTATE_N)));
m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].h), uint32(bool(m_TowerState & TF_TOWERSTATE_H)));
m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].a), uint32(bool(m_TowerState & TF_TOWERSTATE_A)));
}
bool OPvPCapturePointTF::HandlePlayerEnter(Player *plr)
@@ -129,18 +129,18 @@ bool OutdoorPvPTF::Update(uint32 diff)
{
TeamApplyBuff(TEAM_ALLIANCE, TF_CAPTURE_BUFF);
m_IsLocked = true;
SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL,uint32(0));
SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE,uint32(0));
SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE,uint32(1));
SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL, uint32(0));
SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE, uint32(0));
SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE, uint32(1));
SendUpdateWorldState(TF_UI_TOWERS_CONTROLLED_DISPLAY, uint32(0));
}
else if (m_HordeTowersControlled == TF_TOWER_NUM)
{
TeamApplyBuff(TEAM_HORDE, TF_CAPTURE_BUFF);
m_IsLocked = true;
SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL,uint32(0));
SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE,uint32(1));
SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE,uint32(0));
SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL, uint32(0));
SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE, uint32(1));
SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE, uint32(0));
SendUpdateWorldState(TF_UI_TOWERS_CONTROLLED_DISPLAY, uint32(0));
}
else
@@ -160,9 +160,9 @@ bool OutdoorPvPTF::Update(uint32 diff)
m_LockTimerUpdate = 0;
m_IsLocked = false;
SendUpdateWorldState(TF_UI_TOWERS_CONTROLLED_DISPLAY, uint32(1));
SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL,uint32(0));
SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE,uint32(0));
SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE,uint32(0));
SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL, uint32(0));
SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE, uint32(0));
SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE, uint32(0));
}
else
{
@@ -176,9 +176,9 @@ bool OutdoorPvPTF::Update(uint32 diff)
second_digit = minutes_left % 10;
first_digit = minutes_left / 10;
SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_FIRST_DIGIT,first_digit);
SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_SECOND_DIGIT,second_digit);
SendUpdateWorldState(TF_UI_LOCKED_TIME_HOURS,hours_left);
SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_FIRST_DIGIT, first_digit);
SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_SECOND_DIGIT, second_digit);
SendUpdateWorldState(TF_UI_LOCKED_TIME_HOURS, hours_left);
} else m_LockTimerUpdate -= diff;
m_LockTimer -= diff;
}
@@ -191,14 +191,14 @@ void OutdoorPvPTF::HandlePlayerEnterZone(Player * plr, uint32 zone)
if (plr->GetTeam() == ALLIANCE)
{
if (m_AllianceTowersControlled >= TF_TOWER_NUM)
plr->CastSpell(plr,TF_CAPTURE_BUFF,true);
plr->CastSpell(plr, TF_CAPTURE_BUFF, true);
}
else
{
if (m_HordeTowersControlled >= TF_TOWER_NUM)
plr->CastSpell(plr,TF_CAPTURE_BUFF,true);
plr->CastSpell(plr, TF_CAPTURE_BUFF, true);
}
OutdoorPvP::HandlePlayerEnterZone(plr,zone);
OutdoorPvP::HandlePlayerEnterZone(plr, zone);
}
void OutdoorPvPTF::HandlePlayerLeaveZone(Player * plr, uint32 zone)
@@ -224,11 +224,11 @@ bool OutdoorPvPTF::SetupOutdoorPvP()
for (uint8 i = 0; i < OutdoorPvPTFBuffZonesNum; ++i)
RegisterZone(OutdoorPvPTFBuffZones[i]);
AddCapturePoint(new OPvPCapturePointTF(this,TF_TOWER_NW));
AddCapturePoint(new OPvPCapturePointTF(this,TF_TOWER_N));
AddCapturePoint(new OPvPCapturePointTF(this,TF_TOWER_NE));
AddCapturePoint(new OPvPCapturePointTF(this,TF_TOWER_SE));
AddCapturePoint(new OPvPCapturePointTF(this,TF_TOWER_S));
AddCapturePoint(new OPvPCapturePointTF(this, TF_TOWER_NW));
AddCapturePoint(new OPvPCapturePointTF(this, TF_TOWER_N));
AddCapturePoint(new OPvPCapturePointTF(this, TF_TOWER_NE));
AddCapturePoint(new OPvPCapturePointTF(this, TF_TOWER_SE));
AddCapturePoint(new OPvPCapturePointTF(this, TF_TOWER_S));
return true;
}
@@ -250,14 +250,14 @@ void OPvPCapturePointTF::ChangeState()
{
if (((OutdoorPvPTF*)m_PvP)->m_AllianceTowersControlled)
((OutdoorPvPTF*)m_PvP)->m_AllianceTowersControlled--;
sWorld->SendZoneText(OutdoorPvPTFBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_LOSE_A));
sWorld->SendZoneText(OutdoorPvPTFBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_LOSE_A));
}
// if changing from controlling horde to alliance
else if (m_OldState == OBJECTIVESTATE_HORDE)
{
if (((OutdoorPvPTF*)m_PvP)->m_HordeTowersControlled)
((OutdoorPvPTF*)m_PvP)->m_HordeTowersControlled--;
sWorld->SendZoneText(OutdoorPvPTFBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_LOSE_H));
sWorld->SendZoneText(OutdoorPvPTFBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_LOSE_H));
}
uint32 artkit = 21;
@@ -269,7 +269,7 @@ void OPvPCapturePointTF::ChangeState()
artkit = 2;
if (((OutdoorPvPTF*)m_PvP)->m_AllianceTowersControlled<TF_TOWER_NUM)
((OutdoorPvPTF*)m_PvP)->m_AllianceTowersControlled++;
sWorld->SendZoneText(OutdoorPvPTFBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_CAPTURE_A));
sWorld->SendZoneText(OutdoorPvPTFBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_CAPTURE_A));
for (PlayerSet::iterator itr = m_activePlayers[0].begin(); itr != m_activePlayers[0].end(); ++itr)
(*itr)->AreaExploredOrEventHappens(TF_ALLY_QUEST);
break;
@@ -278,7 +278,7 @@ void OPvPCapturePointTF::ChangeState()
artkit = 1;
if (((OutdoorPvPTF*)m_PvP)->m_HordeTowersControlled<TF_TOWER_NUM)
((OutdoorPvPTF*)m_PvP)->m_HordeTowersControlled++;
sWorld->SendZoneText(OutdoorPvPTFBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_CAPTURE_H));
sWorld->SendZoneText(OutdoorPvPTFBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_CAPTURE_H));
for (PlayerSet::iterator itr = m_activePlayers[1].begin(); itr != m_activePlayers[1].end(); ++itr)
(*itr)->AreaExploredOrEventHappens(TF_HORDE_QUEST);
break;
src/server/scripts/OutdoorPvP/OutdoorPvPTF.h
+10 -10
View File
@@ -55,11 +55,11 @@ enum OutdoorPvPTF_TowerType
const go_type TFCapturePoints[TF_TOWER_NUM] =
{
{183104,530,-3081.65f,5335.03f,17.1853f,-2.14675f,0.0f,0.0f,0.878817f,-0.477159f},
{183411,530,-2939.9f,4788.73f,18.987f,2.77507f,0.0f,0.0f,0.983255f,0.182236f},
{183412,530,-3174.94f,4440.97f,16.2281f,1.86750f,0.0f,0.0f,0.803857f,0.594823f},
{183413,530,-3603.31f,4529.15f,20.9077f,0.994838f,0.0f,0.0f,0.477159f,0.878817f},
{183414,530,-3812.37f,4899.3f,17.7249f,0.087266f,0.0f,0.0f,0.043619f,0.999048f}
{183104, 530, -3081.65f, 5335.03f, 17.1853f, -2.14675f, 0.0f, 0.0f, 0.878817f, -0.477159f},
{183411, 530, -2939.9f, 4788.73f, 18.987f, 2.77507f, 0.0f, 0.0f, 0.983255f, 0.182236f},
{183412, 530, -3174.94f, 4440.97f, 16.2281f, 1.86750f, 0.0f, 0.0f, 0.803857f, 0.594823f},
{183413, 530, -3603.31f, 4529.15f, 20.9077f, 0.994838f, 0.0f, 0.0f, 0.477159f, 0.878817f},
{183414, 530, -3812.37f, 4899.3f, 17.7249f, 0.087266f, 0.0f, 0.0f, 0.043619f, 0.999048f}
};
struct tf_tower_world_state
@@ -71,11 +71,11 @@ struct tf_tower_world_state
const tf_tower_world_state TFTowerWorldStates[TF_TOWER_NUM] =
{
{0xa79,0xa7a,0xa7b},
{0xa7e,0xa7d,0xa7c},
{0xa82,0xa81,0xa80},
{0xa88,0xa87,0xa86},
{0xa85,0xa84,0xa83}
{0xa79, 0xa7a, 0xa7b},
{0xa7e, 0xa7d, 0xa7c},
{0xa82, 0xa81, 0xa80},
{0xa88, 0xa87, 0xa86},
{0xa85, 0xa84, 0xa83}
};
const uint32 TFTowerPlayerEnterEvents[TF_TOWER_NUM] =
src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
+64 -64
View File
@@ -29,7 +29,7 @@
OPvPCapturePointZM_Beacon::OPvPCapturePointZM_Beacon(OutdoorPvP *pvp, ZM_BeaconType type)
: OPvPCapturePoint(pvp), m_TowerType(type), m_TowerState(ZM_TOWERSTATE_N)
{
SetCapturePointData(ZMCapturePoints[type].entry,ZMCapturePoints[type].map,ZMCapturePoints[type].x,ZMCapturePoints[type].y,ZMCapturePoints[type].z,ZMCapturePoints[type].o,ZMCapturePoints[type].rot0,ZMCapturePoints[type].rot1,ZMCapturePoints[type].rot2,ZMCapturePoints[type].rot3);
SetCapturePointData(ZMCapturePoints[type].entry, ZMCapturePoints[type].map, ZMCapturePoints[type].x, ZMCapturePoints[type].y, ZMCapturePoints[type].z, ZMCapturePoints[type].o, ZMCapturePoints[type].rot0, ZMCapturePoints[type].rot1, ZMCapturePoints[type].rot2, ZMCapturePoints[type].rot3);
}
void OPvPCapturePointZM_Beacon::FillInitialWorldStates(WorldPacket &data)
@@ -44,12 +44,12 @@ void OPvPCapturePointZM_Beacon::FillInitialWorldStates(WorldPacket &data)
void OPvPCapturePointZM_Beacon::UpdateTowerState()
{
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_n),uint32(bool(m_TowerState & ZM_TOWERSTATE_N)));
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_n),uint32(bool(m_TowerState & ZM_TOWERSTATE_N)));
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_a),uint32(bool(m_TowerState & ZM_TOWERSTATE_A)));
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_a),uint32(bool(m_TowerState & ZM_TOWERSTATE_A)));
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_h),uint32(bool(m_TowerState & ZM_TOWERSTATE_H)));
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_h),uint32(bool(m_TowerState & ZM_TOWERSTATE_H)));
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_n), uint32(bool(m_TowerState & ZM_TOWERSTATE_N)));
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_n), uint32(bool(m_TowerState & ZM_TOWERSTATE_N)));
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_a), uint32(bool(m_TowerState & ZM_TOWERSTATE_A)));
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_a), uint32(bool(m_TowerState & ZM_TOWERSTATE_A)));
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_h), uint32(bool(m_TowerState & ZM_TOWERSTATE_H)));
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_h), uint32(bool(m_TowerState & ZM_TOWERSTATE_H)));
}
bool OPvPCapturePointZM_Beacon::HandlePlayerEnter(Player *plr)
@@ -78,14 +78,14 @@ void OPvPCapturePointZM_Beacon::ChangeState()
{
if (((OutdoorPvPZM*)m_PvP)->m_AllianceTowersControlled)
((OutdoorPvPZM*)m_PvP)->m_AllianceTowersControlled--;
sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconLoseA[m_TowerType]));
sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconLoseA[m_TowerType]));
}
// if changing from controlling horde to alliance
else if (m_OldState == OBJECTIVESTATE_HORDE)
{
if (((OutdoorPvPZM*)m_PvP)->m_HordeTowersControlled)
((OutdoorPvPZM*)m_PvP)->m_HordeTowersControlled--;
sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconLoseH[m_TowerType]));
sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconLoseH[m_TowerType]));
}
switch(m_State)
@@ -94,13 +94,13 @@ void OPvPCapturePointZM_Beacon::ChangeState()
m_TowerState = ZM_TOWERSTATE_A;
if (((OutdoorPvPZM*)m_PvP)->m_AllianceTowersControlled<ZM_NUM_BEACONS)
((OutdoorPvPZM*)m_PvP)->m_AllianceTowersControlled++;
sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconCaptureA[m_TowerType]));
sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconCaptureA[m_TowerType]));
break;
case OBJECTIVESTATE_HORDE:
m_TowerState = ZM_TOWERSTATE_H;
if (((OutdoorPvPZM*)m_PvP)->m_HordeTowersControlled<ZM_NUM_BEACONS)
((OutdoorPvPZM*)m_PvP)->m_HordeTowersControlled++;
sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconCaptureH[m_TowerType]));
sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconCaptureH[m_TowerType]));
break;
case OBJECTIVESTATE_NEUTRAL:
case OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE:
@@ -144,14 +144,14 @@ void OutdoorPvPZM::HandlePlayerEnterZone(Player * plr, uint32 zone)
if (plr->GetTeam() == ALLIANCE)
{
if (m_GraveYard->m_GraveYardState & ZM_GRAVEYARD_A)
plr->CastSpell(plr,ZM_CAPTURE_BUFF,true);
plr->CastSpell(plr, ZM_CAPTURE_BUFF, true);
}
else
{
if (m_GraveYard->m_GraveYardState & ZM_GRAVEYARD_H)
plr->CastSpell(plr,ZM_CAPTURE_BUFF,true);
plr->CastSpell(plr, ZM_CAPTURE_BUFF, true);
}
OutdoorPvP::HandlePlayerEnterZone(plr,zone);
OutdoorPvP::HandlePlayerEnterZone(plr, zone);
}
void OutdoorPvPZM::HandlePlayerLeaveZone(Player * plr, uint32 zone)
@@ -182,8 +182,8 @@ bool OutdoorPvPZM::SetupOutdoorPvP()
for (uint8 i = 0; i < OutdoorPvPZMBuffZonesNum; ++i)
RegisterZone(OutdoorPvPZMBuffZones[i]);
AddCapturePoint(new OPvPCapturePointZM_Beacon(this,ZM_BEACON_WEST));
AddCapturePoint(new OPvPCapturePointZM_Beacon(this,ZM_BEACON_EAST));
AddCapturePoint(new OPvPCapturePointZM_Beacon(this, ZM_BEACON_WEST));
AddCapturePoint(new OPvPCapturePointZM_Beacon(this, ZM_BEACON_EAST));
m_GraveYard = new OPvPCapturePointZM_GraveYard(this);
AddCapturePoint(m_GraveYard); // though the update function isn't used, the handleusego is!
@@ -196,9 +196,9 @@ void OutdoorPvPZM::HandleKillImpl(Player *plr, Unit * killed)
return;
if (plr->GetTeam() == ALLIANCE && killed->ToPlayer()->GetTeam() != ALLIANCE)
plr->CastSpell(plr,ZM_AlliancePlayerKillReward,true);
plr->CastSpell(plr, ZM_AlliancePlayerKillReward, true);
else if (plr->GetTeam() == HORDE && killed->ToPlayer()->GetTeam() != HORDE)
plr->CastSpell(plr,ZM_HordePlayerKillReward,true);
plr->CastSpell(plr, ZM_HordePlayerKillReward, true);
}
bool OPvPCapturePointZM_GraveYard::Update(uint32 /*diff*/)
@@ -216,28 +216,28 @@ int32 OPvPCapturePointZM_GraveYard::HandleOpenGo(Player *plr, uint64 guid)
if (plr->HasAura(ZM_BATTLE_STANDARD_A) && m_GraveYardState != ZM_GRAVEYARD_A)
{
if (m_GraveYardState == ZM_GRAVEYARD_H)
sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_LOSE_GY_H));
sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_LOSE_GY_H));
m_GraveYardState = ZM_GRAVEYARD_A;
DelObject(0); // only one gotype is used in the whole outdoor pvp, no need to call it a constant
AddObject(0,ZM_Banner_A.entry,ZM_Banner_A.map,ZM_Banner_A.x,ZM_Banner_A.y,ZM_Banner_A.z,ZM_Banner_A.o,ZM_Banner_A.rot0,ZM_Banner_A.rot1,ZM_Banner_A.rot2,ZM_Banner_A.rot3);
AddObject(0, ZM_Banner_A.entry, ZM_Banner_A.map, ZM_Banner_A.x, ZM_Banner_A.y, ZM_Banner_A.z, ZM_Banner_A.o, ZM_Banner_A.rot0, ZM_Banner_A.rot1, ZM_Banner_A.rot2, ZM_Banner_A.rot3);
sObjectMgr->RemoveGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, HORDE); // rem gy
sObjectMgr->AddGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, ALLIANCE, false); // add gy
m_PvP->TeamApplyBuff(TEAM_ALLIANCE, ZM_CAPTURE_BUFF);
plr->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_A);
sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_CAPTURE_GY_A));
sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_CAPTURE_GY_A));
}
else if (plr->HasAura(ZM_BATTLE_STANDARD_H) && m_GraveYardState != ZM_GRAVEYARD_H)
{
if (m_GraveYardState == ZM_GRAVEYARD_A)
sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_LOSE_GY_A));
sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_LOSE_GY_A));
m_GraveYardState = ZM_GRAVEYARD_H;
DelObject(0); // only one gotype is used in the whole outdoor pvp, no need to call it a constant
AddObject(0,ZM_Banner_H.entry,ZM_Banner_H.map,ZM_Banner_H.x,ZM_Banner_H.y,ZM_Banner_H.z,ZM_Banner_H.o,ZM_Banner_H.rot0,ZM_Banner_H.rot1,ZM_Banner_H.rot2,ZM_Banner_H.rot3);
AddObject(0, ZM_Banner_H.entry, ZM_Banner_H.map, ZM_Banner_H.x, ZM_Banner_H.y, ZM_Banner_H.z, ZM_Banner_H.o, ZM_Banner_H.rot0, ZM_Banner_H.rot1, ZM_Banner_H.rot2, ZM_Banner_H.rot3);
sObjectMgr->RemoveGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, ALLIANCE); // rem gy
sObjectMgr->AddGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, HORDE, false); // add gy
m_PvP->TeamApplyBuff(TEAM_HORDE, ZM_CAPTURE_BUFF);
plr->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_H);
sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_CAPTURE_GY_H));
sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_CAPTURE_GY_H));
}
UpdateTowerState();
}
@@ -251,22 +251,22 @@ OPvPCapturePointZM_GraveYard::OPvPCapturePointZM_GraveYard(OutdoorPvP *pvp)
m_GraveYardState = ZM_GRAVEYARD_N;
m_FlagCarrierGUID = 0;
// add field scouts here
AddCreature(ZM_ALLIANCE_FIELD_SCOUT,ZM_AllianceFieldScout.entry,ZM_AllianceFieldScout.teamval,ZM_AllianceFieldScout.map,ZM_AllianceFieldScout.x,ZM_AllianceFieldScout.y,ZM_AllianceFieldScout.z,ZM_AllianceFieldScout.o);
AddCreature(ZM_HORDE_FIELD_SCOUT,ZM_HordeFieldScout.entry,ZM_HordeFieldScout.teamval,ZM_HordeFieldScout.map,ZM_HordeFieldScout.x,ZM_HordeFieldScout.y,ZM_HordeFieldScout.z,ZM_HordeFieldScout.o);
AddCreature(ZM_ALLIANCE_FIELD_SCOUT, ZM_AllianceFieldScout.entry, ZM_AllianceFieldScout.teamval, ZM_AllianceFieldScout.map, ZM_AllianceFieldScout.x, ZM_AllianceFieldScout.y, ZM_AllianceFieldScout.z, ZM_AllianceFieldScout.o);
AddCreature(ZM_HORDE_FIELD_SCOUT, ZM_HordeFieldScout.entry, ZM_HordeFieldScout.teamval, ZM_HordeFieldScout.map, ZM_HordeFieldScout.x, ZM_HordeFieldScout.y, ZM_HordeFieldScout.z, ZM_HordeFieldScout.o);
// add neutral banner
AddObject(0,ZM_Banner_N.entry,ZM_Banner_N.map,ZM_Banner_N.x,ZM_Banner_N.y,ZM_Banner_N.z,ZM_Banner_N.o,ZM_Banner_N.rot0,ZM_Banner_N.rot1,ZM_Banner_N.rot2,ZM_Banner_N.rot3);
AddObject(0, ZM_Banner_N.entry, ZM_Banner_N.map, ZM_Banner_N.x, ZM_Banner_N.y, ZM_Banner_N.z, ZM_Banner_N.o, ZM_Banner_N.rot0, ZM_Banner_N.rot1, ZM_Banner_N.rot2, ZM_Banner_N.rot3);
}
void OPvPCapturePointZM_GraveYard::UpdateTowerState()
{
m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_N,uint32(bool(m_GraveYardState & ZM_GRAVEYARD_N)));
m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_H,uint32(bool(m_GraveYardState & ZM_GRAVEYARD_H)));
m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_A,uint32(bool(m_GraveYardState & ZM_GRAVEYARD_A)));
m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_N, uint32(bool(m_GraveYardState & ZM_GRAVEYARD_N)));
m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_H, uint32(bool(m_GraveYardState & ZM_GRAVEYARD_H)));
m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_A, uint32(bool(m_GraveYardState & ZM_GRAVEYARD_A)));
m_PvP->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_READY,uint32(m_BothControllingFaction == ALLIANCE));
m_PvP->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_NOT_READY,uint32(m_BothControllingFaction != ALLIANCE));
m_PvP->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_READY,uint32(m_BothControllingFaction == HORDE));
m_PvP->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_NOT_READY,uint32(m_BothControllingFaction != HORDE));
m_PvP->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_READY, uint32(m_BothControllingFaction == ALLIANCE));
m_PvP->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_NOT_READY, uint32(m_BothControllingFaction != ALLIANCE));
m_PvP->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_READY, uint32(m_BothControllingFaction == HORDE));
m_PvP->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_NOT_READY, uint32(m_BothControllingFaction != HORDE));
}
void OPvPCapturePointZM_GraveYard::FillInitialWorldStates(WorldPacket &data)
@@ -329,7 +329,7 @@ void OPvPCapturePointZM_GraveYard::SetBeaconState(uint32 controlling_faction)
bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player * plr, Creature * c, GossipMenuItems /*gso*/)
{
uint64 guid = c->GetGUID();
std::map<uint64,uint32>::iterator itr = m_CreatureTypes.find(guid);
std::map<uint64, uint32>::iterator itr = m_CreatureTypes.find(guid);
if (itr != m_CreatureTypes.end())
{
if (itr->second == ZM_ALLIANCE_FIELD_SCOUT && plr->GetTeam() == ALLIANCE && m_BothControllingFaction == ALLIANCE && !m_FlagCarrierGUID && m_GraveYardState != ZM_GRAVEYARD_A)
@@ -342,7 +342,7 @@ bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player * plr, Creature * c, GossipM
bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player *plr, uint64 guid, uint32 /*gossipid*/)
{
std::map<uint64,uint32>::iterator itr = m_CreatureTypes.find(guid);
std::map<uint64, uint32>::iterator itr = m_CreatureTypes.find(guid);
if (itr != m_CreatureTypes.end())
{
Creature * cr = HashMapHolder<Creature>::Find(guid);
@@ -353,12 +353,12 @@ bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player *plr, uint64 guid,
return true;
if (itr->second == ZM_ALLIANCE_FIELD_SCOUT)
{
cr->CastSpell(plr,ZM_BATTLE_STANDARD_A,true);
cr->CastSpell(plr, ZM_BATTLE_STANDARD_A, true);
m_FlagCarrierGUID = plr->GetGUID();
}
else if (itr->second == ZM_HORDE_FIELD_SCOUT)
{
cr->CastSpell(plr,ZM_BATTLE_STANDARD_H,true);
cr->CastSpell(plr, ZM_BATTLE_STANDARD_H, true);
m_FlagCarrierGUID = plr->GetGUID();
}
UpdateTowerState();
@@ -393,32 +393,32 @@ void OutdoorPvPZM::FillInitialWorldStates(WorldPacket &data)
void OutdoorPvPZM::SendRemoveWorldStates(Player *plr)
{
plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_N_W,0);
plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_POS_W,0);
plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_DISPLAY_W,0);
plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_N_E,0);
plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_POS_E,0);
plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_DISPLAY_E,0);
plr->SendUpdateWorldState(ZM_WORLDSTATE_UNK_1,1);
plr->SendUpdateWorldState(ZM_UI_TOWER_EAST_N,0);
plr->SendUpdateWorldState(ZM_UI_TOWER_EAST_H,0);
plr->SendUpdateWorldState(ZM_UI_TOWER_EAST_A,0);
plr->SendUpdateWorldState(ZM_UI_TOWER_WEST_N,0);
plr->SendUpdateWorldState(ZM_UI_TOWER_WEST_H,0);
plr->SendUpdateWorldState(ZM_UI_TOWER_WEST_A,0);
plr->SendUpdateWorldState(ZM_MAP_TOWER_EAST_N,0);
plr->SendUpdateWorldState(ZM_MAP_TOWER_EAST_H,0);
plr->SendUpdateWorldState(ZM_MAP_TOWER_EAST_A,0);
plr->SendUpdateWorldState(ZM_MAP_GRAVEYARD_H,0);
plr->SendUpdateWorldState(ZM_MAP_GRAVEYARD_A,0);
plr->SendUpdateWorldState(ZM_MAP_GRAVEYARD_N,0);
plr->SendUpdateWorldState(ZM_MAP_TOWER_WEST_N,0);
plr->SendUpdateWorldState(ZM_MAP_TOWER_WEST_H,0);
plr->SendUpdateWorldState(ZM_MAP_TOWER_WEST_A,0);
plr->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_READY,0);
plr->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_NOT_READY,0);
plr->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_NOT_READY,0);
plr->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_READY,0);
plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_N_W, 0);
plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_POS_W, 0);
plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_DISPLAY_W, 0);
plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_N_E, 0);
plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_POS_E, 0);
plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_DISPLAY_E, 0);
plr->SendUpdateWorldState(ZM_WORLDSTATE_UNK_1, 1);
plr->SendUpdateWorldState(ZM_UI_TOWER_EAST_N, 0);
plr->SendUpdateWorldState(ZM_UI_TOWER_EAST_H, 0);
plr->SendUpdateWorldState(ZM_UI_TOWER_EAST_A, 0);
plr->SendUpdateWorldState(ZM_UI_TOWER_WEST_N, 0);
plr->SendUpdateWorldState(ZM_UI_TOWER_WEST_H, 0);
plr->SendUpdateWorldState(ZM_UI_TOWER_WEST_A, 0);
plr->SendUpdateWorldState(ZM_MAP_TOWER_EAST_N, 0);
plr->SendUpdateWorldState(ZM_MAP_TOWER_EAST_H, 0);
plr->SendUpdateWorldState(ZM_MAP_TOWER_EAST_A, 0);
plr->SendUpdateWorldState(ZM_MAP_GRAVEYARD_H, 0);
plr->SendUpdateWorldState(ZM_MAP_GRAVEYARD_A, 0);
plr->SendUpdateWorldState(ZM_MAP_GRAVEYARD_N, 0);
plr->SendUpdateWorldState(ZM_MAP_TOWER_WEST_N, 0);
plr->SendUpdateWorldState(ZM_MAP_TOWER_WEST_H, 0);
plr->SendUpdateWorldState(ZM_MAP_TOWER_WEST_A, 0);
plr->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_READY, 0);
plr->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_NOT_READY, 0);
plr->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_NOT_READY, 0);
plr->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_READY, 0);
}
class OutdoorPvP_zangarmarsh : public OutdoorPvPScript
src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
+10 -10
View File
@@ -24,7 +24,7 @@
const uint8 OutdoorPvPZMBuffZonesNum = 5;
// the buff is cast in these zones
const uint32 OutdoorPvPZMBuffZones[OutdoorPvPZMBuffZonesNum] = {3521,3607,3717,3715,3716};
const uint32 OutdoorPvPZMBuffZones[OutdoorPvPZMBuffZonesNum] = {3521, 3607, 3717, 3715, 3716};
// linked when the central tower is controlled
const uint32 ZM_GRAVEYARD_ZONE = 3521;
@@ -47,15 +47,15 @@ enum OutdoorPvPZMSpells
};
// banners 182527, 182528, 182529, gotta check them ingame
const go_type ZM_Banner_A = { 182527,530,253.54f,7083.81f,36.7728f,-0.017453f,0.0f,0.0f,0.008727f,-0.999962f };
const go_type ZM_Banner_H = { 182528,530,253.54f,7083.81f,36.7728f,-0.017453f,0.0f,0.0f,0.008727f,-0.999962f };
const go_type ZM_Banner_N = { 182529,530,253.54f,7083.81f,36.7728f,-0.017453f,0.0f,0.0f,0.008727f,-0.999962f };
const go_type ZM_Banner_A = { 182527, 530, 253.54f, 7083.81f, 36.7728f, -0.017453f, 0.0f, 0.0f, 0.008727f, -0.999962f };
const go_type ZM_Banner_H = { 182528, 530, 253.54f, 7083.81f, 36.7728f, -0.017453f, 0.0f, 0.0f, 0.008727f, -0.999962f };
const go_type ZM_Banner_N = { 182529, 530, 253.54f, 7083.81f, 36.7728f, -0.017453f, 0.0f, 0.0f, 0.008727f, -0.999962f };
// horde field scout spawn data
const creature_type ZM_HordeFieldScout = {18564,67,530,296.625f,7818.4f,42.6294f,5.18363f};
const creature_type ZM_HordeFieldScout = {18564, 67, 530, 296.625f, 7818.4f, 42.6294f, 5.18363f};
// alliance field scout spawn data
const creature_type ZM_AllianceFieldScout = {18581,469,530,374.395f,6230.08f,22.8351f,0.593412f};
const creature_type ZM_AllianceFieldScout = {18581, 469, 530, 374.395f, 6230.08f, 22.8351f, 0.593412f};
enum ZMCreatureTypes
{
@@ -88,8 +88,8 @@ enum ZM_BeaconType
const zm_beacon ZMBeaconInfo[ZM_NUM_BEACONS] =
{
{2533,2535,2534,2560,2559,2558,2652,2651,2650,11807,11806},
{2527,2529,2528,2557,2556,2555,2646,2645,2644,11805,11804}
{2533, 2535, 2534, 2560, 2559, 2558, 2652, 2651, 2650, 11807, 11806},
{2527, 2529, 2528, 2557, 2556, 2555, 2646, 2645, 2644, 11805, 11804}
};
const uint32 ZMBeaconCaptureA[ZM_NUM_BEACONS] =
@@ -118,8 +118,8 @@ const uint32 ZMBeaconLoseH[ZM_NUM_BEACONS] =
const go_type ZMCapturePoints[ZM_NUM_BEACONS] =
{
{182523,530,303.243f,6841.36f,40.1245f,-1.58825f,0.0f,0.0f,0.71325f,-0.700909f},
{182522,530,336.466f,7340.26f,41.4984f,-1.58825f,0.0f,0.0f,0.71325f,-0.700909f}
{182523, 530, 303.243f, 6841.36f, 40.1245f, -1.58825f, 0.0f, 0.0f, 0.71325f, -0.700909f},
{182522, 530, 336.466f, 7340.26f, 41.4984f, -1.58825f, 0.0f, 0.0f, 0.71325f, -0.700909f}
};
enum OutdoorPvPZMWorldStates