Commit
Drop not required manual handling of BG-Objects Signed-off-by: Schmoozerd <schmoozerd@cmangos>
- Loading branch information
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -63,29 +63,6 @@ const uint32 BG_AB_OP_NODESTATES[5] = {1767, 1782, 1772, 1792, 1787}; | |
|
||
const uint32 BG_AB_OP_NODEICONS[5] = {1842, 1846, 1845, 1844, 1843}; | ||
|
||
enum BG_AB_ObjectType | ||
{ | ||
// TODO drop them (pool-system should be used for this) | ||
// buffs | ||
BG_AB_OBJECT_SPEEDBUFF_STABLES = 1, | ||
BG_AB_OBJECT_REGENBUFF_STABLES = 2, | ||
BG_AB_OBJECT_BERSERKBUFF_STABLES = 3, | ||
BG_AB_OBJECT_SPEEDBUFF_BLACKSMITH = 4, | ||
BG_AB_OBJECT_REGENBUFF_BLACKSMITH = 5, | ||
BG_AB_OBJECT_BERSERKBUFF_BLACKSMITH = 6, | ||
BG_AB_OBJECT_SPEEDBUFF_FARM = 7, | ||
BG_AB_OBJECT_REGENBUFF_FARM = 8, | ||
BG_AB_OBJECT_BERSERKBUFF_FARM = 9, | ||
BG_AB_OBJECT_SPEEDBUFF_LUMBER_MILL = 10, | ||
BG_AB_OBJECT_REGENBUFF_LUMBER_MILL = 11, | ||
BG_AB_OBJECT_BERSERKBUFF_LUMBER_MILL = 12, | ||
BG_AB_OBJECT_SPEEDBUFF_GOLD_MINE = 13, | ||
BG_AB_OBJECT_REGENBUFF_GOLD_MINE = 14, | ||
BG_AB_OBJECT_BERSERKBUFF_GOLD_MINE = 15, | ||
BG_AB_OBJECT_MAX = 16, | ||
}; | ||
|
||
|
||
This comment has been minimized.
Sorry, something went wrong. |
||
/* node events */ | ||
// node-events are just event1=BG_AB_Nodes, event2=BG_AB_NodeStatus | ||
// so we don't need to define the constants here :) | ||
|
@@ -184,11 +161,9 @@ class BattleGroundAB : public BattleGround | |
|
||
void Update(uint32 diff) override; | ||
void AddPlayer(Player* plr) override; | ||
virtual void StartingEventCloseDoors() override; | ||
This comment has been minimized.
Sorry, something went wrong.
DomGries
Contributor
|
||
virtual void StartingEventOpenDoors() override; | ||
void RemovePlayer(Player* plr, ObjectGuid guid) override; | ||
void HandleAreaTrigger(Player* source, uint32 trigger) override; | ||
virtual bool SetupBattleGround() override; | ||
virtual void Reset() override; | ||
void EndBattleGround(Team winner) override; | ||
virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override; | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
#ifndef __REVISION_NR_H__ | ||
#define __REVISION_NR_H__ | ||
#define REVISION_NR "12241" | ||
#define REVISION_NR "12242" | ||
#endif // __REVISION_NR_H__ |
2 comments
on commit cd9563c
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You need some SQL code similar to this:
NOTE: Use this only if you are able to revert these custom GUIDs and Pools !
-- Sql to create buff object pool for some BG
-- Arathi bassin
-- -------------
-- Stable
REPLACE INTO `gameobject` VALUES (150000, 179871, 529, 1, 1, 1185.71, 1185.24, -56.36, 2.56, 0, 0, 0.022338351, 0.999750467, 180, 100, 1);
REPLACE INTO `gameobject` VALUES (150001, 179904, 529, 1, 1, 1185.71, 1185.24, -56.36, 2.56, 0, 0, 0.022338351, 0.999750467, 180, 100, 1);
REPLACE INTO `gameobject` VALUES (150002, 179905, 529, 1, 1, 1185.71, 1185.24, -56.36, 2.56, 0, 0, 0.022338351, 0.999750467, 180, 100, 1);
-- Blacksmith
REPLACE INTO `gameobject` VALUES (150003, 179871, 529, 1, 1, 990.75, 1008.18, -42.60, 2.43, 0, 0, 0.021204161, 0.999775166, 180, 100, 1);
REPLACE INTO `gameobject` VALUES (150004, 179904, 529, 1, 1, 990.75, 1008.18, -42.60, 2.43, 0, 0, 0.021204161, 0.999775166, 180, 100, 1);
REPLACE INTO `gameobject` VALUES (150005, 179905, 529, 1, 1, 990.75, 1008.18, -42.60, 2.43, 0, 0, 0.021204161, 0.999775166, 180, 100, 1);
-- Farm
REPLACE INTO `gameobject` VALUES (150006, 179871, 529, 1, 1, 817.66, 843.34, -56.54, 3.01, 0, 0, 0.026264184, 0.999655036, 180, 100, 1);
REPLACE INTO `gameobject` VALUES (150007, 179904, 529, 1, 1, 817.66, 843.34, -56.54, 3.01, 0, 0, 0.026264184, 0.999655036, 180, 100, 1);
REPLACE INTO `gameobject` VALUES (150008, 179905, 529, 1, 1, 817.66, 843.34, -56.54, 3.01, 0, 0, 0.026264184, 0.999655036, 180, 100, 1);
-- Lumber Mill
REPLACE INTO `gameobject` VALUES (150009, 179871, 529, 1, 1, 807.46, 1189.16, 11.92, 5.44, 0, 0, 0.047455126, 0.998873370, 180, 100, 1);
REPLACE INTO `gameobject` VALUES (150010, 179904, 529, 1, 1, 807.46, 1189.16, 11.92, 5.44, 0, 0, 0.047455126, 0.998873370, 180, 100, 1);
REPLACE INTO `gameobject` VALUES (150011, 179905, 529, 1, 1, 807.46, 1189.16, 11.92, 5.44, 0, 0, 0.047455126, 0.998873370, 180, 100, 1);
-- Gold Mine
REPLACE INTO `gameobject` VALUES (150012, 179871, 529, 1, 1, 1146.62, 816.94, -98.49, 6.0, 0, 0, 0.053555973, 0.998564849, 180, 100, 1);
REPLACE INTO `gameobject` VALUES (150013, 179904, 529, 1, 1, 1146.62, 816.94, -98.49, 6.0, 0, 0, 0.053555973, 0.998564849, 180, 100, 1);
REPLACE INTO `gameobject` VALUES (150014, 179905, 529, 1, 1, 1146.62, 816.94, -98.49, 6.0, 0, 0, 0.053555973, 0.998564849, 180, 100, 1);
-- Add pool id
REPLACE INTO `pool_template` VALUES (15000, 1, "Stable power up buff");
REPLACE INTO `pool_template` VALUES (15001, 1, "Blacksmith power up buff");
REPLACE INTO `pool_template` VALUES (15002, 1, "Farm power up buff");
REPLACE INTO `pool_template` VALUES (15003, 1, "Lumber Mill power up buff");
REPLACE INTO `pool_template` VALUES (15004, 1, "Gold Mine power up buff");
-- Add Stable pool
REPLACE INTO `pool_gameobject` VALUES (150000, 15000, 0, "Stable : Speed buff");
REPLACE INTO `pool_gameobject` VALUES (150001, 15000, 0, "Stable : Regen buff");
REPLACE INTO `pool_gameobject` VALUES (150002, 15000, 0, "Stable : Berserker buff");
-- Add Blacksmith pool
REPLACE INTO `pool_gameobject` VALUES (150003, 15001, 0, "Blacksmith : Speed buff");
REPLACE INTO `pool_gameobject` VALUES (150004, 15001, 0, "Blacksmith : Regen buff");
REPLACE INTO `pool_gameobject` VALUES (150005, 15001, 0, "Blacksmith : Berserker buff");
-- Add Farm pool
REPLACE INTO `pool_gameobject` VALUES (150006, 15002, 0, "Farm : Speed buff");
REPLACE INTO `pool_gameobject` VALUES (150007, 15002, 0, "Farm : Regen buff");
REPLACE INTO `pool_gameobject` VALUES (150008, 15002, 0, "Farm : Berserker buff");
-- Add Lumber Mill pool
REPLACE INTO `pool_gameobject` VALUES (150009, 15003, 0, "Lumber Mill : Speed buff");
REPLACE INTO `pool_gameobject` VALUES (150010, 15003, 0, "Lumber Mill : Regen buff");
REPLACE INTO `pool_gameobject` VALUES (150011, 15003, 0, "Lumber Mill : Berserker buff");
-- Add Gold Mine pool
REPLACE INTO `pool_gameobject` VALUES (150012, 15004, 0, "Gold Mine : Speed buff");
REPLACE INTO `pool_gameobject` VALUES (150013, 15004, 0, "Gold Mine : Regen buff");
REPLACE INTO `pool_gameobject` VALUES (150014, 15004, 0, "Gold Mine : Berserker buff");
-- Eye of Storm
-- ------------
-- Blood Elf Tower
REPLACE INTO `gameobject` VALUES (150050, 179871, 566, 1, 1, 2050.4599609375, 1372.26000976563, 1194.56005859375, 0.907571, 0, 0, 0.438371, 0.898794, 180, 100, 1);
REPLACE INTO `gameobject` VALUES (150051, 179904, 566, 1, 1, 2050.4599609375, 1372.26000976563, 1194.56005859375, 0.907571, 0, 0, 0.438371, 0.898794, 180, 100, 1);
REPLACE INTO `gameobject` VALUES (150052, 179905, 566, 1, 1, 2050.4599609375, 1372.26000976563, 1194.56005859375, 0.907571, 0, 0, 0.438371, 0.898794, 180, 100, 1);
-- Fel REaver Ruins Tower
REPLACE INTO `gameobject` VALUES (150053, 179871, 566, 1, 1, 2046.32995605469, 1748.81005859375, 1190.03002929688, 0.907571, 0, 0, 0.438371, 0.898794, 180, 100, 1);
REPLACE INTO `gameobject` VALUES (150054, 179904, 566, 1, 1, 2046.32995605469, 1748.81005859375, 1190.03002929688, 0.907571, 0, 0, 0.438371, 0.898794, 180, 100, 1);
REPLACE INTO `gameobject` VALUES (150055, 179905, 566, 1, 1, 2046.32995605469, 1748.81005859375, 1190.03002929688, 0.907571, 0, 0, 0.438371, 0.898794, 180, 100, 1);
-- Mage Tower
REPLACE INTO `gameobject` VALUES (150056, 179871, 566, 1, 1, 2283.3798828125, 1748.81005859375, 1189.7099609375, 0.907571, 0, 0, 0.438371, 0.898794, 180, 100, 1);
REPLACE INTO `gameobject` VALUES (150057, 179904, 566, 1, 1, 2283.3798828125, 1748.81005859375, 1189.7099609375, 0.907571, 0, 0, 0.438371, 0.898794, 180, 100, 1);
REPLACE INTO `gameobject` VALUES (150058, 179905, 566, 1, 1, 2283.3798828125, 1748.81005859375, 1189.7099609375, 0.907571, 0, 0, 0.438371, 0.898794, 180, 100, 1);
-- Draenei Ruins Tower
REPLACE INTO `gameobject` VALUES (150059, 179871, 566, 1, 1, 2302.68994140625, 1391.27001953125, 1197.77001953125, 0.907571, 0, 0, 0.438371, 0.898794, 180, 100, 1);
REPLACE INTO `gameobject` VALUES (150060, 179904, 566, 1, 1, 2302.68994140625, 1391.27001953125, 1197.77001953125, 0.907571, 0, 0, 0.438371, 0.898794, 180, 100, 1);
REPLACE INTO `gameobject` VALUES (150061, 179905, 566, 1, 1, 2302.68994140625, 1391.27001953125, 1197.77001953125, 0.907571, 0, 0, 0.438371, 0.898794, 180, 100, 1);
-- Add pool id
REPLACE INTO `pool_template` VALUES (15010, 1, "Blood Elf Tower power up buff");
REPLACE INTO `pool_template` VALUES (15011, 1, "Fel Reaver Ruins Tower power up buff");
REPLACE INTO `pool_template` VALUES (15012, 1, "Mage Tower power up buff");
REPLACE INTO `pool_template` VALUES (15013, 1, "Dreanei Ruins Tower power up buff");
-- Add Blood Elf Tower pool
REPLACE INTO `pool_gameobject` VALUES (150050, 15010, 0, "Blood Elf Tower : Speed buff");
REPLACE INTO `pool_gameobject` VALUES (150051, 15010, 0, "Blood Elf Tower : Regen buff");
REPLACE INTO `pool_gameobject` VALUES (150052, 15010, 0, "Blood Elf Tower : Berserker buff");
-- Add Fel Reaver Ruins Tower pool
REPLACE INTO `pool_gameobject` VALUES (150053, 15011, 0, "Fel Reaver Ruins Tower : Speed buff");
REPLACE INTO `pool_gameobject` VALUES (150054, 15011, 0, "Fel Reaver Ruins Tower : Regen buff");
REPLACE INTO `pool_gameobject` VALUES (150055, 15011, 0, "Fel Reaver Ruins Tower : Berserker buff");
-- Add Mage Tower pool
REPLACE INTO `pool_gameobject` VALUES (150056, 15012, 0, "Mage Tower : Speed buff");
REPLACE INTO `pool_gameobject` VALUES (150057, 15012, 0, "Mage Tower : Regen buff");
REPLACE INTO `pool_gameobject` VALUES (150058, 15012, 0, "Mage Tower : Berserker buff");
-- Add Dreanei Ruins Tower pool
REPLACE INTO `pool_gameobject` VALUES (150059, 15013, 0, "Dreanei Ruins Tower : Speed buff");
REPLACE INTO `pool_gameobject` VALUES (150060, 15013, 0, "Dreanei Ruins Tower : Regen buff");
REPLACE INTO `pool_gameobject` VALUES (150061, 15013, 0, "Dreanei Ruins Tower : Berserker buff");
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sql above designed for UDB. Use that http://paste2.org/p/2392655 for YTDB.
Note to DB Dev : must correct rotation value of spawned buff.
A similar
enum EYBuffs
in EY.h might also be dropped ;)