Permalink
Browse files

Merge pull request #753 from Shoxxo/master

Added Battle for Gilneas / Recoded / Fixxed (Untested)
2 parents 52956e0 + f99e39b commit 7c3de28b2da9e3329457059a20593ed6d1a6a409 @SkyFire SkyFire committed on GitHub Feb 9, 2017
@@ -0,0 +1,16 @@
+INSERT INTO `trinity_string` (`entry`, `content_default`) VALUES
@AriDEV
AriDEV Feb 22, 2017 Member

DELETE before INSERT missing.

+(12015, 'The Battle for Gilneas begins in 2 minutes.'),
+(12016, 'The Battle for Gilneas begins in 1 minute.'),
+(12017, 'The Battle for Gilneas begins in 30 seconds. Prepare yourselves!'),
+(12018, 'The Battle for Gilneas has begun!'),
+(12019, 'Alliance'),
+(12020, 'Horde'),
+(12021, 'lighthouse'),
+(12022, 'waterworks'),
+(12023, 'mine'),
+(12024, 'The %s has taken the %s'),
+(12025, '$n has defended the %s'),
+(12026, '$n has assaulted the %s'),
+(12027, '$n claims the %s! If left unchallenged, the %s will control it in 1 minute!'),
+(12028, 'The Alliance has gathered $1776W resources, and is near victory!'),
+(12029, 'The Horde has gathered $1777W resources, and is near victory!');
@AriDEV
AriDEV Feb 22, 2017 Member

no newline

@Shoxxo
Shoxxo Feb 22, 2017 Member

These Strings not avaible lel but i try to change it if i have more time...

@@ -23,13 +23,17 @@
#include "Common.h"
#include "SharedDefines.h"
#include "DBCEnums.h"
+#include "WorldPacket.h"
+#include "Object.h"
+#include "GameObject.h"
#include "WorldStateBuilder.h"
class Creature;
class GameObject;
class Group;
class Player;
class Unit;
+class WorldObject;
class WorldPacket;
class BattlegroundMap;
@@ -128,7 +132,8 @@ enum BattlegroundTimeIntervals
RESPAWN_IMMEDIATELY = 0, // secs
BUFF_RESPAWN_TIME = 180, // secs
BATTLEGROUND_COUNTDOWN_MAX = 120, // secs
- ARENA_COUNTDOWN_MAX = 60 // secs
+ ARENA_COUNTDOWN_MAX = 60, // secs
+ PLAYER_POSITION_UPDATE_INTERVAL = 5 // secs
};
enum BattlegroundStartTimeIntervals
@@ -162,6 +167,7 @@ struct BattlegroundPlayer
{
time_t OfflineRemoveTime; // for tracking and removing offline players from queue after 5 minutes
uint32 Team; // Player's team
+ int32 ActiveSpec; // Player's active spec
};
struct BattlegroundObjectInfo
@@ -173,6 +179,13 @@ struct BattlegroundObjectInfo
uint32 spellid;
};
+enum ArenaType
+{
+ ARENA_TYPE_2v2 = 2,
+ ARENA_TYPE_3v3 = 3,
+ ARENA_TYPE_5v5 = 5
+};
+
enum ScoreType
{
SCORE_KILLING_BLOWS = 1,
@@ -201,12 +214,7 @@ enum ScoreType
SCORE_DESTROYED_WALL = 19
};
-enum ArenaType
-{
- ARENA_TYPE_2v2 = 2,
- ARENA_TYPE_3v3 = 3,
- ARENA_TYPE_5v5 = 5
-};
+
enum BattlegroundType
{
@@ -241,6 +249,13 @@ enum BattlegroundStartingEventsIds
};
#define BG_STARTING_EVENT_COUNT 4
+enum BGHonorMode
+{
+ BG_NORMAL = 0,
+ BG_HOLIDAY,
+ BG_HONOR_MODE_NUM
+};
+
struct BattlegroundScore
{
BattlegroundScore() : KillingBlows(0), Deaths(0), HonorableKills(0), BonusHonor(0),
@@ -257,13 +272,6 @@ struct BattlegroundScore
uint32 HealingDone;
};
-enum BGHonorMode
-{
- BG_NORMAL = 0,
- BG_HOLIDAY,
- BG_HONOR_MODE_NUM
-};
-
#define BG_AWARD_ARENA_POINTS_MIN_LEVEL 71
#define ARENA_TIMELIMIT_POINTS_LOSS -16
@@ -250,8 +250,6 @@ void BattlegroundAB::HandleAreaTrigger(Player* player, uint32 trigger)
}
}
-/* type: 0-neutral, 1-contested, 3-occupied
- teamIndex: 0-ally, 1-horde */
void BattlegroundAB::_CreateBanner(uint8 node, uint8 type, uint8 teamIndex, bool delay)
{
// Just put it into the queue
Oops, something went wrong.

5 comments on commit 7c3de28

@zamalaev
Contributor

credit? Old my path Darkpeninsula/Darkcore@a2a7283

@SkyFire
Member
SkyFire commented on 7c3de28 Feb 12, 2017 edited

@zamalaev
It's impossible to know where something comes from when you are cherry picking shit from other projects. The history isn't always available.
Hell a 5 year old commit. you have entirely too much time on your hands.
You should take up a different hobby and quit working on your epeen. It's not going to get any bigger.

@Shoxxo
Member
Shoxxo commented on 7c3de28 Feb 12, 2017 edited

You paid 500$? -> https://github.com/cooler-SAI/WS548-v4

Uninteresting fo me, i do not give copiright / credits for assholes.

BTW : #750

@AriDEV
Member
AriDEV commented on 7c3de28 Feb 18, 2017 edited

@Shoxxo fix the codestyle pls this looks very bad
@zamalaev did u shared your fix with us ? no? so why are u even askin for a credit ? credit is given only to people who share something with someone.

@Shoxxo
Member
Shoxxo commented on 7c3de28 Feb 22, 2017

Okay if you share your editor settings with me?!

Please sign in to comment.