Core/Scripts: Clean-up of grizzley hills pvp scripts following a clea…

…n form of standardized coding... no-one likes working on someone elses messes that get left-over.
Bootz · Aug 6, 2011 · 5b45087 · 5b45087
1 parent 95595a1
commit 5b45087
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 73 deletions.
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp
@@ -1,7 +1,7 @@
 /*
 * Copyright (C) 2008-2010 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2010-2011 Project SkyFire <http://www.projectskyfire.org/>
-* 
+*
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the
 * Free Software Foundation; either version 2 of the License, or (at your
@@ -26,12 +26,12 @@
 #include "ScriptPCH.h"
 
 OPvPCapturePointGH::OPvPCapturePointGH(OutdoorPvP *pvp) :
-OPvPCapturePoint(pvp),
-m_capturable(true),
-m_ControllingFaction(0),
+OPvPCapturePoint(pvp), 
+m_capturable(true), 
+m_ControllingFaction(0), 
 m_VentureState(VENTURE_N)
 {
-    SetCapturePointData(189310,571,2483.68f,-1873.6f,10.68f,-0.1047f,0.0f,0.0f,0.0f,0.0f);
+    SetCapturePointData(189310, 571, 2483.68f, -1873.6f, 10.68f, -0.1047f, 0.0f, 0.0f, 0.0f, 0.0f);
 }
 
 void OPvPCapturePointGH::SpawnNPCsForTeam(uint32 team)
@@ -44,7 +44,7 @@ void OPvPCapturePointGH::SpawnNPCsForTeam(uint32 team)
     else
         return;
     for (int i = 0; i < GH_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 OPvPCapturePointGH::DeSpawnNPCs()
@@ -86,11 +86,11 @@ void OPvPCapturePointGH::FillInitialWorldStates(WorldPacket &data)
     data << GH_UI_TOWER_SLIDER_POS << uint32(50);
     data << GH_UI_TOWER_SLIDER_N << uint32(100);
 
-    m_PvP->SendUpdateWorldState(GH_MAP_VENTURE_NEUTRAL ,uint32(bool(m_VentureState & VENTURE_N)));
-    m_PvP->SendUpdateWorldState(GH_MAP_VENTURE_HORDE ,uint32(bool(m_VentureState & VENTURE_H)));
-    m_PvP->SendUpdateWorldState(GH_MAP_VENTURE_ALLIANCE ,uint32(bool(m_VentureState & VENTURE_A)));
-    m_PvP->SendUpdateWorldState(GH_MAP_VENTURE_NEU_A ,uint32(bool(m_VentureState & VENTURE_N_A)));
-    m_PvP->SendUpdateWorldState(GH_MAP_VENTURE_NEU_H ,uint32(bool(m_VentureState & VENTURE_N_H)));
+    m_PvP->SendUpdateWorldState(GH_MAP_VENTURE_NEUTRAL , uint32(bool(m_VentureState & VENTURE_N)));
+    m_PvP->SendUpdateWorldState(GH_MAP_VENTURE_HORDE , uint32(bool(m_VentureState & VENTURE_H)));
+    m_PvP->SendUpdateWorldState(GH_MAP_VENTURE_ALLIANCE , uint32(bool(m_VentureState & VENTURE_A)));
+    m_PvP->SendUpdateWorldState(GH_MAP_VENTURE_NEU_A , uint32(bool(m_VentureState & VENTURE_N_A)));
+    m_PvP->SendUpdateWorldState(GH_MAP_VENTURE_NEU_H , uint32(bool(m_VentureState & VENTURE_N_H)));
 }
 
 bool OPvPCapturePointGH::Update(uint32 diff)
@@ -109,11 +109,11 @@ void OPvPCapturePointGH::ChangeState()
     case OBJECTIVESTATE_NEUTRAL:
         break;
     case OBJECTIVESTATE_ALLIANCE:
-        sWorld->SendZoneText(GH_OUTDOORPVP_ZONE,sObjectMgr->GetSkyFireStringForDBCLocale(LANG_OPVP_GH_LOOSE_A));
+        sWorld->SendZoneText(GH_OUTDOORPVP_ZONE, sObjectMgr->GetSkyFireStringForDBCLocale(LANG_OPVP_GH_LOOSE_A));
         DeSpawnNPCs();
         break;
     case OBJECTIVESTATE_HORDE:
-        sWorld->SendZoneText(GH_OUTDOORPVP_ZONE,sObjectMgr->GetSkyFireStringForDBCLocale(LANG_OPVP_GH_LOOSE_H));
+        sWorld->SendZoneText(GH_OUTDOORPVP_ZONE, sObjectMgr->GetSkyFireStringForDBCLocale(LANG_OPVP_GH_LOOSE_H));
         DeSpawnNPCs();
         break;
     case OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE:
@@ -133,13 +133,13 @@ void OPvPCapturePointGH::ChangeState()
         m_VentureState = VENTURE_A;
         FactionTakeOver(ALLIANCE);
         artkit = 2;
-        sWorld->SendZoneText(GH_OUTDOORPVP_ZONE,sObjectMgr->GetSkyFireStringForDBCLocale(LANG_OPVP_GH_CAPTURE_A));
+        sWorld->SendZoneText(GH_OUTDOORPVP_ZONE, sObjectMgr->GetSkyFireStringForDBCLocale(LANG_OPVP_GH_CAPTURE_A));
         break;
     case OBJECTIVESTATE_HORDE:
         m_VentureState = VENTURE_H;
         FactionTakeOver(HORDE);
         artkit = 1;
-        sWorld->SendZoneText(GH_OUTDOORPVP_ZONE,sObjectMgr->GetSkyFireStringForDBCLocale(LANG_OPVP_GH_CAPTURE_H));
+        sWorld->SendZoneText(GH_OUTDOORPVP_ZONE, sObjectMgr->GetSkyFireStringForDBCLocale(LANG_OPVP_GH_CAPTURE_H));
         break;
     case OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE:
         m_VentureState = VENTURE_N_A;
@@ -168,19 +168,19 @@ void OPvPCapturePointGH::ChangeState()
 
 void OPvPCapturePointGH::UpdateVentureWorldState()
 {
-    m_PvP->SendUpdateWorldState(GH_MAP_VENTURE_NEUTRAL ,uint32(bool(m_VentureState & VENTURE_N)));
-    m_PvP->SendUpdateWorldState(GH_MAP_VENTURE_HORDE ,uint32(bool(m_VentureState & VENTURE_H)));
-    m_PvP->SendUpdateWorldState(GH_MAP_VENTURE_ALLIANCE ,uint32(bool(m_VentureState & VENTURE_A)));
-    m_PvP->SendUpdateWorldState(GH_MAP_VENTURE_NEU_A ,uint32(bool(m_VentureState & VENTURE_N_A)));
-    m_PvP->SendUpdateWorldState(GH_MAP_VENTURE_NEU_H ,uint32(bool(m_VentureState & VENTURE_N_H)));
+    m_PvP->SendUpdateWorldState(GH_MAP_VENTURE_NEUTRAL, uint32(bool(m_VentureState & VENTURE_N)));
+    m_PvP->SendUpdateWorldState(GH_MAP_VENTURE_HORDE, uint32(bool(m_VentureState & VENTURE_H)));
+    m_PvP->SendUpdateWorldState(GH_MAP_VENTURE_ALLIANCE, uint32(bool(m_VentureState & VENTURE_A)));
+    m_PvP->SendUpdateWorldState(GH_MAP_VENTURE_NEU_A, uint32(bool(m_VentureState & VENTURE_N_A)));
+    m_PvP->SendUpdateWorldState(GH_MAP_VENTURE_NEU_H, uint32(bool(m_VentureState & VENTURE_N_H)));
 }
 
 void OPvPCapturePointGH::SendChangePhase()
 {
     // send this too, sometimes the slider disappears, dunno why :(
     SendUpdateWorldState(GH_UI_TOWER_SLIDER_DISPLAY, 1);
     // send these updates to only the ones in this objective
-    uint32 phase = (uint32)ceil((m_value + m_maxValue) / (2 * m_maxValue) * 100.0f);
+    uint32 phase = (uint32)ceil((m_value + m_maxValue) / (2 * m_maxValue) *100.0f);
     SendUpdateWorldState(GH_UI_TOWER_SLIDER_POS, phase);
     SendUpdateWorldState(GH_UI_TOWER_SLIDER_N, m_neutralValuePct);
 }
@@ -193,14 +193,14 @@ OutdoorPvPGH::OutdoorPvPGH()
 void OutdoorPvPGH::HandleKillImpl(Player *plr, Unit * killed)
 {
     if (killed->GetTypeId() == TYPEID_PLAYER && plr->GetTeam() != killed->ToPlayer()->GetTeam())
-        plr->CastSpell(plr,GH_VENTURE_KILL_CREDIT,true);
+        plr->CastSpell(plr, GH_VENTURE_KILL_CREDIT, true);
 }
 
 void OutdoorPvPGH::SendRemoveWorldStates(Player *plr)
 {
-    plr->SendUpdateWorldState(GH_UI_TOWER_SLIDER_DISPLAY,0);
-    plr->SendUpdateWorldState(GH_UI_TOWER_SLIDER_POS,0);
-    plr->SendUpdateWorldState(GH_UI_TOWER_SLIDER_N,0);
+    plr->SendUpdateWorldState(GH_UI_TOWER_SLIDER_DISPLAY, 0);
+    plr->SendUpdateWorldState(GH_UI_TOWER_SLIDER_POS, 0);
+    plr->SendUpdateWorldState(GH_UI_TOWER_SLIDER_N, 0);
 }
 
 bool OutdoorPvPGH::Update(uint32 diff)
@@ -210,7 +210,7 @@ bool OutdoorPvPGH::Update(uint32 diff)
 
 void OutdoorPvPGH::HandlePlayerEnterZone(Player * plr, uint32 zone)
 {
-    OutdoorPvP::HandlePlayerEnterZone(plr,zone);
+    OutdoorPvP::HandlePlayerEnterZone(plr, zone);
 }
 
 void OutdoorPvPGH::HandlePlayerLeaveZone(Player * plr, uint32 zone)
@@ -238,9 +238,7 @@ class OutdoorPvP_grizzly : public OutdoorPvPScript
 public:
 
     OutdoorPvP_grizzly()
-        : OutdoorPvPScript("outdoorpvp_gh")
-    {
-    }
+        : OutdoorPvPScript("outdoorpvp_gh") {}
 
     OutdoorPvP* GetOutdoorPvP() const
     {

diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPGH.h b/src/server/scripts/OutdoorPvP/OutdoorPvPGH.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2008-2010 TrinityCore <http://www.trinitycore.org/>
  * Copyright (C) 2010-2011 Project SkyFire <http://www.projectskyfire.org/>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
  * Free Software Foundation; either version 2 of the License, or (at your
@@ -56,61 +56,61 @@ enum Misc
 const creature_type HordeControlNPCs[GH_CONTROL_NPC_NUM] =
 {
     // soldiers
-    {27748,67,571,2492.002930f,-1845.899414f,10.711608f,5.529358f},
-    {27748,67,571,2498.592773f,-1837.833740f,10.552654f,5.351072f},
-    {27748,67,571,2515.539307f,-1822.425171f,10.910775f,5.558418f},
-    {27748,67,571,2575.352051f,-1796.180420f,10.441980f,0.377932f},
-    {27748,67,571,2580.784180f,-1809.862549f,10.445493f,0.377932f},
-    {27748,67,571,2552.297363f,-1831.839966f,10.495550f,2.246392f},
-    {27748,67,571,2464.210693f,-1850.925415f,6.143895f,2.954036f},
-    {27748,67,571,2410.525391f,-1825.168335f,1.870843f,4.718826f},
-    {27748,67,571,2481.714355f,-1877.021362f,10.700072f,6.010807f},
-    {27748,67,571,2479.789551f,-1905.015259f,10.398465f,0.403849f},
-    {27748,67,571,2508.500244f,-1896.378784f,8.882201f,4.220098f},
-    {27748,67,571,2494.566895f,-1934.060181f,12.319469f,0.606482f},
-    {27748,67,571,2543.587646f,-1916.709961f,3.205774f,0.106969f},
-    {27748,67,571,2545.027100f,-1930.114868f,3.636569f,0.106969f},
-    {27748,67,571,2539.792236f,-1974.311035f,8.256695f,5.160220f},
-    {27748,67,571,2526.169189f,-1980.855347f,8.273070f,5.160220f},
-    {27748,67,571,2553.052734f,-1882.842896f,4.512696f,6.110557f},
+    {27748, 67, 571, 2492.002930f, -1845.899414f, 10.711608f, 5.529358f},
+    {27748, 67, 571, 2498.592773f, -1837.833740f, 10.552654f, 5.351072f},
+    {27748, 67, 571, 2515.539307f, -1822.425171f, 10.910775f, 5.558418f},
+    {27748, 67, 571, 2575.352051f, -1796.180420f, 10.441980f, 0.377932f},
+    {27748, 67, 571, 2580.784180f, -1809.862549f, 10.445493f, 0.377932f},
+    {27748, 67, 571, 2552.297363f, -1831.839966f, 10.495550f, 2.246392f},
+    {27748, 67, 571, 2464.210693f, -1850.925415f, 6.143895f, 2.954036f},
+    {27748, 67, 571, 2410.525391f, -1825.168335f, 1.870843f, 4.718826f},
+    {27748, 67, 571, 2481.714355f, -1877.021362f, 10.700072f, 6.010807f},
+    {27748, 67, 571, 2479.789551f, -1905.015259f, 10.398465f, 0.403849f},
+    {27748, 67, 571, 2508.500244f, -1896.378784f, 8.882201f, 4.220098f},
+    {27748, 67, 571, 2494.566895f, -1934.060181f, 12.319469f, 0.606482f},
+    {27748, 67, 571, 2543.587646f, -1916.709961f, 3.205774f, 0.106969f},
+    {27748, 67, 571, 2545.027100f, -1930.114868f, 3.636569f, 0.106969f},
+    {27748, 67, 571, 2539.792236f, -1974.311035f, 8.256695f, 5.160220f},
+    {27748, 67, 571, 2526.169189f, -1980.855347f, 8.273070f, 5.160220f},
+    {27748, 67, 571, 2553.052734f, -1882.842896f, 4.512696f, 6.110557f},
     // captain
-    {27708,67,571,2485.295898f,-1889.402344f,9.714134f,6.202426f},
+    {27708, 67, 571, 2485.295898f, -1889.402344f, 9.714134f, 6.202426f},
     // blacksmith
-    {29253,67,571,2476.218750f,-1953.859131f,10.883574f,1.297610f},
+    {29253, 67, 571, 2476.218750f, -1953.859131f, 10.883574f, 1.297610f},
     // vendor
-    {27730,67,571,2489.363770f,-1836.897095f,11.650964f,5.528555f},
+    {27730, 67, 571, 2489.363770f, -1836.897095f, 11.650964f, 5.528555f},
     // stable master
-    {29251,67,571,2551.742188f,-1835.743652f,10.553280f,2.068092f}
+    {29251, 67, 571, 2551.742188f, -1835.743652f, 10.553280f, 2.068092f}
 };
 
 const creature_type AllianceControlNPCs[GH_CONTROL_NPC_NUM] =
 {
     // soldiers
-    {27758,469,571,2492.002930f,-1845.899414f,10.711608f,5.529358f},
-    {27758,469,571,2498.592773f,-1837.833740f,10.552654f,5.351072f},
-    {27758,469,571,2515.539307f,-1822.425171f,10.910775f,5.558418f},
-    {27758,469,571,2575.352051f,-1796.180420f,10.441980f,0.377932f},
-    {27758,469,571,2580.784180f,-1809.862549f,10.445493f,0.377932f},
-    {27758,469,571,2552.297363f,-1831.839966f,10.495550f,2.246392f},
-    {27758,469,571,2464.210693f,-1850.925415f,6.143895f,2.954036f},
-    {27758,469,571,2410.525391f,-1825.168335f,1.870843f,4.718826f},
-    {27758,469,571,2481.714355f,-1877.021362f,10.700072f,6.010807f},
-    {27758,469,571,2479.789551f,-1905.015259f,10.398465f,0.403849f},
-    {27758,469,571,2508.500244f,-1896.378784f,8.882201f,4.220098f},
-    {27758,469,571,2494.566895f,-1934.060181f,12.319469f,0.606482f},
-    {27758,469,571,2543.587646f,-1916.709961f,3.205774f,0.106969f},
-    {27758,469,571,2545.027100f,-1930.114868f,3.636569f,0.106969f},
-    {27758,469,571,2539.792236f,-1974.311035f,8.256695f,5.160220f},
-    {27758,469,571,2526.169189f,-1980.855347f,8.273070f,5.160220f},
-    {27758,469,571,2553.052734f,-1882.842896f,4.512696f,6.110557f},
+    {27758, 469, 571, 2492.002930f, -1845.899414f, 10.711608f, 5.529358f},
+    {27758, 469, 571, 2498.592773f, -1837.833740f, 10.552654f, 5.351072f},
+    {27758, 469, 571, 2515.539307f, -1822.425171f, 10.910775f, 5.558418f},
+    {27758, 469, 571, 2575.352051f, -1796.180420f, 10.441980f, 0.377932f},
+    {27758, 469, 571, 2580.784180f, -1809.862549f, 10.445493f, 0.377932f},
+    {27758, 469, 571, 2552.297363f, -1831.839966f, 10.495550f, 2.246392f},
+    {27758, 469, 571, 2464.210693f, -1850.925415f, 6.143895f, 2.954036f},
+    {27758, 469, 571, 2410.525391f, -1825.168335f, 1.870843f, 4.718826f},
+    {27758, 469, 571, 2481.714355f, -1877.021362f, 10.700072f, 6.010807f},
+    {27758, 469, 571, 2479.789551f, -1905.015259f, 10.398465f, 0.403849f},
+    {27758, 469, 571, 2508.500244f, -1896.378784f, 8.882201f, 4.220098f},
+    {27758, 469, 571, 2494.566895f, -1934.060181f, 12.319469f, 0.606482f},
+    {27758, 469, 571, 2543.587646f, -1916.709961f, 3.205774f, 0.106969f},
+    {27758, 469, 571, 2545.027100f, -1930.114868f, 3.636569f, 0.106969f},
+    {27758, 469, 571, 2539.792236f, -1974.311035f, 8.256695f, 5.160220f},
+    {27758, 469, 571, 2526.169189f, -1980.855347f, 8.273070f, 5.160220f},
+    {27758, 469, 571, 2553.052734f, -1882.842896f, 4.512696f, 6.110557f},
     // captain
-    {27759,469,571,2485.295898f,-1889.402344f,9.714134f,6.202426f},
+    {27759, 469, 571, 2485.295898f, -1889.402344f, 9.714134f, 6.202426f},
     // blacksmith
-    {29252,469,571,2476.218750f,-1953.859131f,10.883574f,1.297610f},
+    {29252, 469, 571, 2476.218750f, -1953.859131f, 10.883574f, 1.297610f},
     // vendor
-    {27760,469,571,2489.363770f,-1836.897095f,11.650964f,5.528555f},
+    {27760, 469, 571, 2489.363770f, -1836.897095f, 11.650964f, 5.528555f},
     // stable master
-    {29250,469,571,2551.742188f,-1835.743652f,10.553280f,2.068092f}
+    {29250, 469, 571, 2551.742188f, -1835.743652f, 10.553280f, 2.068092f}
 };
 
 enum VentureStates
@@ -188,4 +188,4 @@ class OutdoorPvPGH : public OutdoorPvP
         OPvPCapturePointGH * m_obj;
 };
 
-#endif
+#endif