Changeset 50

Timestamp:

11/19/08 13:29:16 (17 years ago)

Author:

yumileroy

Message:

[svn] Enabled game events to change the honor and reputation gaining speed in battlegrounds. This is done by a new table in the world database, game_event_battleground_holiday. Structure is the following:
event - id of the game event
bgflag - bitmask, used to set which battleground(s) give extra honor/reputation when the event is active. To add extra honor on a battleground, use 2 ^{bgTypeId as mask. Multiple battlegrounds can be set by logical 'or' ('|') operation.
You will need database data for the table, please check trinitydatabase.org.}

Original author: w12x
Date: 2008-10-17 16:36:07-05:00

Location:

trunk

Files:

• sql/updates/54_world.sql (added)
• src/game/BattleGround.cpp (modified) (3 diffs)
• src/game/BattleGround.h (modified) (4 diffs)
• src/game/BattleGroundAB.cpp (modified) (2 diffs)
• src/game/BattleGroundEY.cpp (modified) (2 diffs)
• src/game/BattleGroundMgr.cpp (modified) (1 diff)
• src/game/BattleGroundMgr.h (modified) (1 diff)
• src/game/BattleGroundWS.cpp (modified) (4 diffs)
• src/game/GameEvent.cpp (modified) (5 diffs)
• src/game/GameEvent.h (modified) (3 diffs)

trunk/src/game/BattleGround.cpp

@@ -87 +87 @@
     m_PrematureCountDown = false;
     m_PrematureCountDown = 0;
+    m_HonorMode = BG_NORMAL;
 }
 
@@ -538 +539 @@
                 Source = plr;
             RewardMark(plr,ITEM_WINNER_COUNT);
-            UpdatePlayerScore(plr, SCORE_BONUS_HONOR, 20);
             RewardQuest(plr);
         }
@@ -1467 +1467 @@
     return count;
 }
+
+void BattleGround::SetHoliday(bool is_holiday)
+{
+    if(is_holiday)
+        m_HonorMode = BG_HOLIDAY;
+    else
+        m_HonorMode = BG_NORMAL;
+}

trunk/src/game/BattleGround.h

@@ -96 +96 @@
     RESPAWN_ONE_DAY                 = 86400,                // secs
     RESPAWN_IMMEDIATELY             = 0,                    // secs
-    BUFF_RESPAWN_TIME               = 180,                  // secs
-    BG_HONOR_SCORE_TICKS            = 330                   // points
+    BUFF_RESPAWN_TIME               = 180                  // secs
 };
 
@@ -240 +239 @@
 };
 
+enum BGHonorMode
+{
+    BG_NORMAL = 0,
+    BG_HOLIDAY,
+    BG_HONOR_MODE_NUM
+};
+
 /*
 This class is used to:
@@ -433 +439 @@
 
         void HandleTriggerBuff(uint64 const& go_guid);
+        void SetHoliday(bool is_holiday);
 
         // TODO: make this protected:
@@ -480 +487 @@
         bool   m_BuffChange;
 
+        BGHonorMode m_HonorMode;
     private:
         /* Battleground */

trunk/src/game/BattleGroundAB.cpp

@@ -30 +30 @@
 #include "World.h"
 #include "Util.h"
+
+// these variables aren't used outside of this file, so declare them only here
+uint32 BG_AB_HonorScoreTicks[BG_HONOR_MODE_NUM] = {
+    330, // normal honor
+    200  // holiday
+};
+
+uint32 BG_AB_ReputationScoreTicks[BG_HONOR_MODE_NUM] = {
+    200, // normal honor
+    150  // holiday
+};
 
 BattleGroundAB::BattleGroundAB()
@@ -187 +198 @@
                 m_HonorScoreTics[team] += BG_AB_TickPoints[points];
                 m_ReputationScoreTics[team] += BG_AB_TickPoints[points];
-                if( m_ReputationScoreTics[team] >= 200 )
+                if( m_ReputationScoreTics[team] >= BG_AB_ReputationScoreTicks[m_HonorMode] )
                 {
                     (team == BG_TEAM_ALLIANCE) ? RewardReputationToTeam(509, 10, ALLIANCE) : RewardReputationToTeam(510, 10, HORDE);
-                    m_ReputationScoreTics[team] -= 200;
+                    m_ReputationScoreTics[team] -= BG_AB_ReputationScoreTicks[m_HonorMode];
                 }
-                if( m_HonorScoreTics[team] >= BG_HONOR_SCORE_TICKS )
+                if( m_HonorScoreTics[team] >= BG_AB_HonorScoreTicks[m_HonorMode] )
                 {
                     (team == BG_TEAM_ALLIANCE) ? RewardHonorToTeam(20, ALLIANCE) : RewardHonorToTeam(20, HORDE);
-                    m_HonorScoreTics[team] -= BG_HONOR_SCORE_TICKS;
+                    m_HonorScoreTics[team] -= BG_AB_HonorScoreTicks[m_HonorMode];
                 }
                 if( !m_IsInformedNearVictory && m_TeamScores[team] > 1800 )

trunk/src/game/BattleGroundEY.cpp

@@ -31 +31 @@
 #include "Util.h"
 
+// these variables aren't used outside of this file, so declare them only here
+uint32 BG_EY_HonorScoreTicks[BG_HONOR_MODE_NUM] = {
+    330, // normal honor
+    200  // holiday
+};
+
 BattleGroundEY::BattleGroundEY()
 {
@@ -160 +166 @@
     m_TeamScores[team_index] += Points;
     m_HonorScoreTics[team_index] += Points;
-    if (m_HonorScoreTics[team_index] >= BG_HONOR_SCORE_TICKS)
+    if (m_HonorScoreTics[team_index] >= BG_EY_HonorScoreTicks[m_HonorMode])
     {
         RewardHonorToTeam(20, Team);
-        m_HonorScoreTics[team_index] -= BG_HONOR_SCORE_TICKS;
+        m_HonorScoreTics[team_index] -= BG_EY_HonorScoreTicks[m_HonorMode];
     }
     UpdateTeamScore(Team);

trunk/src/game/BattleGroundMgr.cpp

@@ -1785 +1785 @@
     sWorld.SendWorldText(LANG_ARENA_TESTING, m_ArenaTesting ? "on" : "off");
 }
+
+void BattleGroundMgr::SetHolidayWeekends(uint32 mask)
+{
+    for(uint32 bgtype = 1; bgtype <= 8; ++bgtype)
+    {
+        if(BattleGround * bg = GetBattleGroundTemplate(bgtype))
+        {
+            bg->SetHoliday(mask & (1 << bgtype));
+        }
+    }
+}

trunk/src/game/BattleGroundMgr.h

@@ -235 +235 @@
         const bool isArenaTesting() const { return m_ArenaTesting; }
 
+        void SetHolidayWeekends(uint32 mask);
+
     private:
 

trunk/src/game/BattleGroundWS.cpp

@@ -30 +30 @@
 #include "World.h"
 
+// these variables aren't used outside of this file, so declare them only here
+enum BG_WSG_Rewards
+{
+    BG_WSG_WIN = 0,
+    BG_WSG_FLAG_CAP,
+    BG_WSG_MAP_COMPLETE,
+    BG_WSG_REWARD_NUM
+};
+
+uint32 BG_WSG_Honor[BG_HONOR_MODE_NUM][BG_WSG_REWARD_NUM] = {
+    {20,40,40}, // normal honor
+    {60,40,80}  // holiday
+};
+
+uint32 BG_WSG_Reputation[BG_HONOR_MODE_NUM][BG_WSG_REWARD_NUM] = {
+    {0,35,0}, // normal honor
+    {0,45,0}  // holiday
+};
+
 BattleGroundWS::BattleGroundWS()
 {
@@ -242 +261 @@
             AddPoint(ALLIANCE, 1);
         PlaySoundToAll(BG_WS_SOUND_FLAG_CAPTURED_ALLIANCE);
-        RewardReputationToTeam(890, 35, ALLIANCE);          // +35 reputation
-        RewardHonorToTeam(40, ALLIANCE);                    // +40 bonushonor
+        RewardReputationToTeam(890, BG_WSG_Reputation[m_HonorMode][BG_WSG_FLAG_CAP], ALLIANCE);          // +35 reputation
+        RewardHonorToTeam(BG_WSG_Honor[m_HonorMode][BG_WSG_FLAG_CAP], ALLIANCE);                    // +40 bonushonor
     }
     else
@@ -259 +278 @@
             AddPoint(HORDE, 1);
         PlaySoundToAll(BG_WS_SOUND_FLAG_CAPTURED_HORDE);
-        RewardReputationToTeam(889, 35, HORDE);             // +35 reputation
-        RewardHonorToTeam(40, HORDE);                       // +40 bonushonor
+        RewardReputationToTeam(889, BG_WSG_Reputation[m_HonorMode][BG_WSG_FLAG_CAP], HORDE);             // +35 reputation
+        RewardHonorToTeam(BG_WSG_Honor[m_HonorMode][BG_WSG_FLAG_CAP], HORDE);                       // +40 bonushonor
     }
 
@@ -288 +307 @@
         UpdateWorldState(BG_WS_FLAG_STATE_HORDE, 1);
 
+        RewardHonorToTeam(BG_WSG_Honor[m_HonorMode][BG_WSG_WIN], winner);
         EndBattleGround(winner);
     }

trunk/src/game/GameEvent.cpp

@@ -29 +29 @@
 #include "GossipDef.h"
 #include "Player.h"
+#include "BattleGroundMgr.h"
 
 INSTANTIATE_SINGLETON_1(GameEvent);
@@ -866 +867 @@
         sLog.outString();
         sLog.outString( ">> Loaded %u npc gossip textids in game events", count );
+
+        delete result;
+    }
+
+    // set all flags to 0
+    mGameEventBattleGroundHolidays.resize(mGameEvent.size(),0);
+    // load game event battleground flags
+    //                                   0     1
+    result = WorldDatabase.Query("SELECT event, bgflag FROM game_event_battleground_holiday");
+
+    count = 0;
+    if( !result )
+    {
+        barGoLink bar3(1);
+        bar3.step();
+
+        sLog.outString();
+        sLog.outString(">> Loaded %u battleground holidays in game events", count );
+    }
+    else
+    {
+
+        barGoLink bar3( result->GetRowCount() );
+        do
+        {
+            Field *fields = result->Fetch();
+
+            bar3.step();
+
+            uint16 event_id = fields[0].GetUInt16();
+
+            if(event_id >= mGameEvent.size())
+            {
+                sLog.outErrorDb("`game_event_battleground_holiday` game event id (%u) is out of range compared to max event id in `game_event`",event_id);
+                continue;
+            }
+
+            ++count;
+
+            mGameEventBattleGroundHolidays[event_id] = fields[1].GetUInt32();
+
+        } while( result->NextRow() );
+        sLog.outString();
+        sLog.outString( ">> Loaded %u battleground holidays in game events", count );
 
         delete result;
@@ -992 +1037 @@
     // remove vendor items
     UpdateEventNPCVendor(event_id, false);
+    // update bg holiday
+    UpdateBattleGroundSettings();
 }
 
@@ -1020 +1067 @@
     // add vendor items
     UpdateEventNPCVendor(event_id, true);
+    // update bg holiday
+    UpdateBattleGroundSettings();
 }
 
@@ -1046 +1095 @@
         }
     }
+}
+
+void GameEvent::UpdateBattleGroundSettings()
+{
+    uint32 mask = 0;
+    for(ActiveEvents::const_iterator itr = m_ActiveEvents.begin(); itr != m_ActiveEvents.end(); ++itr )
+        mask |= mGameEventBattleGroundHolidays[*itr];
+    sBattleGroundMgr.SetHolidayWeekends(mask);
 }
 

trunk/src/game/GameEvent.h

@@ -119 +119 @@
         void UpdateEventNPCFlags(uint16 event_id);
         void UpdateEventNPCVendor(uint16 event_id, bool activate);
+        void UpdateBattleGroundSettings();
         bool CheckOneGameEventConditions(uint16 event_id);
         void SaveWorldEventStateToDB(uint16 event_id);
@@ -142 +143 @@
         typedef std::pair<uint16 /*event id*/, uint32 /*gossip id*/> EventNPCGossipIdPair;
         typedef std::map<uint32 /*guid*/, EventNPCGossipIdPair> GuidEventNpcGossipIdMap;
+        typedef std::vector<uint32> GameEventBitmask;
         GameEventQuestMap mGameEventCreatureQuests;
         GameEventQuestMap mGameEventGameObjectQuests;
@@ -149 +151 @@
         GameEventGuidMap  mGameEventGameobjectGuids;
         GameEventDataMap  mGameEvent;
+        GameEventBitmask  mGameEventBattleGroundHolidays;
         QuestIdToEventConditionMap mQuestToEventConditions;
         GameEventNPCFlagMap mGameEventNPCFlags;