mirror of
https://github.com/mangosfour/server.git
synced 2025-12-13 04:37:00 +00:00
[12160] Fix honor / reputation gains in AB and EY
Also fixes a typo of recent EY commit Thanks Nay
This commit is contained in:
parent
061ca54cb0
commit
578c440902
5 changed files with 12 additions and 12 deletions
|
|
@ -177,7 +177,7 @@ void BattleGroundAB::StartingEventOpenDoors()
|
||||||
OpenDoorEvent(BG_EVENT_DOOR);
|
OpenDoorEvent(BG_EVENT_DOOR);
|
||||||
|
|
||||||
// Players that join battleground after start are not eligible to get achievement.
|
// Players that join battleground after start are not eligible to get achievement.
|
||||||
StartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_WIN_BG, BG_AB_EVENT_START_BATTLE);
|
StartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_WIN_BG, AB_EVENT_START_BATTLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
void BattleGroundAB::AddPlayer(Player* plr)
|
void BattleGroundAB::AddPlayer(Player* plr)
|
||||||
|
|
@ -472,8 +472,8 @@ void BattleGroundAB::Reset()
|
||||||
|
|
||||||
m_IsInformedNearVictory = false;
|
m_IsInformedNearVictory = false;
|
||||||
bool isBGWeekend = BattleGroundMgr::IsBGWeekend(GetTypeID());
|
bool isBGWeekend = BattleGroundMgr::IsBGWeekend(GetTypeID());
|
||||||
m_honorTicks = (isBGWeekend) ? BG_AB_ABBGWeekendHonorTicks : BG_AB_NotABBGWeekendHonorTicks;
|
m_honorTicks = isBGWeekend ? AB_WEEKEND_HONOR_INTERVAL : AB_NORMAL_HONOR_INTERVAL;
|
||||||
m_ReputationTics = (isBGWeekend) ? BG_AB_ABBGWeekendReputationTicks : BG_AB_NotABBGWeekendReputationTicks;
|
m_ReputationTics = isBGWeekend ? AB_WEEKEND_REPUTATION_INTERVAL : AB_NORMAL_REPUTATION_INTERVAL;
|
||||||
|
|
||||||
for (uint8 i = 0; i < BG_AB_NODES_MAX; ++i)
|
for (uint8 i = 0; i < BG_AB_NODES_MAX; ++i)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -135,11 +135,11 @@ enum BG_AB_Sounds
|
||||||
BG_AB_SOUND_NEAR_VICTORY = 8456
|
BG_AB_SOUND_NEAR_VICTORY = 8456
|
||||||
};
|
};
|
||||||
|
|
||||||
#define BG_AB_NotABBGWeekendHonorTicks 330
|
#define AB_NORMAL_HONOR_INTERVAL 260
|
||||||
#define BG_AB_ABBGWeekendHonorTicks 200
|
#define AB_WEEKEND_HONOR_INTERVAL 160
|
||||||
#define BG_AB_NotABBGWeekendReputationTicks 200
|
#define AB_NORMAL_REPUTATION_INTERVAL 160
|
||||||
#define BG_AB_ABBGWeekendReputationTicks 150
|
#define AB_WEEKEND_REPUTATION_INTERVAL 120
|
||||||
#define BG_AB_EVENT_START_BATTLE 9158
|
#define AB_EVENT_START_BATTLE 9158
|
||||||
|
|
||||||
// Tick intervals and given points: case 0,1,2,3,4,5 captured nodes
|
// Tick intervals and given points: case 0,1,2,3,4,5 captured nodes
|
||||||
const uint32 BG_AB_TickIntervals[6] = {0, 12000, 9000, 6000, 3000, 1000};
|
const uint32 BG_AB_TickIntervals[6] = {0, 12000, 9000, 6000, 3000, 1000};
|
||||||
|
|
|
||||||
|
|
@ -348,7 +348,7 @@ void BattleGroundEY::Reset()
|
||||||
m_towersAlliance = 0;
|
m_towersAlliance = 0;
|
||||||
m_towersHorde = 0;
|
m_towersHorde = 0;
|
||||||
|
|
||||||
m_honorTicks = BattleGroundMgr::IsBGWeekend(GetTypeID()) ? EY_WEEKEND_HONOR_TICKS : EY_NORMAL_HONOR_TICKS;
|
m_honorTicks = BattleGroundMgr::IsBGWeekend(GetTypeID()) ? EY_WEEKEND_HONOR_INTERVAL : EY_NORMAL_HONOR_INTERVAL;
|
||||||
m_honorScoreTicks[BG_TEAM_ALLIANCE] = 0;
|
m_honorScoreTicks[BG_TEAM_ALLIANCE] = 0;
|
||||||
m_honorScoreTicks[BG_TEAM_HORDE] = 0;
|
m_honorScoreTicks[BG_TEAM_HORDE] = 0;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -180,8 +180,8 @@ enum EYBuffs
|
||||||
EY_OBJECT_MAX = 13
|
EY_OBJECT_MAX = 13
|
||||||
};
|
};
|
||||||
|
|
||||||
#define EY_NORMAL_HONOR_TICKS 30
|
#define EY_NORMAL_HONOR_INTERVAL 260
|
||||||
#define EY_WEEKEND_HONOR_TICKS 200
|
#define EY_WEEKEND_HONOR_INTERVAL 160
|
||||||
#define EY_EVENT_START_BATTLE 13180
|
#define EY_EVENT_START_BATTLE 13180
|
||||||
|
|
||||||
enum EYScore
|
enum EYScore
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "12159"
|
#define REVISION_NR "12160"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue