Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/WorldStates: Migrate battleground HolidayWorldState to new system

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/020166649dd5afb94dddbfcc990d4bb51e231ab1)
This commit is contained in:
hondacrx
2022-07-13 17:35:10 -04:00
parent 9421aeee98
commit 6825419b88
5 changed files with 39 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.PvP.cs
-14
View File
@@ -717,20 +717,6 @@ namespace Game.Entities
return true;
}
void SendBGWeekendWorldStates()
{
foreach (var bl in CliDB.BattlemasterListStorage.Values)
{
if (bl.HolidayWorldState != 0)
{
if (Global.BattlegroundMgr.IsBGWeekend((BattlegroundTypeId)bl.Id))
SendUpdateWorldState(bl.HolidayWorldState, 1);
else
SendUpdateWorldState(bl.HolidayWorldState, 0);
}
}
}
public void SendPvpRewards()
{
//WorldPacket packet(SMSG_REQUEST_PVP_REWARDS_RESPONSE, 24);
Source/Game/Entities/Player/Player.cs
-1
View File
@@ -2932,7 +2932,6 @@ namespace Game.Entities
packet.AddState(3901, previousArenaSeason);
SendPacket(packet);
SendBGWeekendWorldStates();
}
public long GetBarberShopCost(List<ChrCustomizationChoice> newCustomizations)
Source/Game/Events/GameEventManager.cs
+24 -29
View File
@@ -38,13 +38,13 @@ namespace Game
{
default:
case GameEventState.Normal:
{
long currenttime = GameTime.GetGameTime();
// Get the event information
return mGameEvent[entry].start < currenttime
&& currenttime < mGameEvent[entry].end
&& (currenttime - mGameEvent[entry].start) % (mGameEvent[entry].occurence * Time.Minute) < mGameEvent[entry].length * Time.Minute;
}
{
long currenttime = GameTime.GetGameTime();
// Get the event information
return mGameEvent[entry].start < currenttime
&& currenttime < mGameEvent[entry].end
&& (currenttime - mGameEvent[entry].start) % (mGameEvent[entry].occurence * Time.Minute) < mGameEvent[entry].length * Time.Minute;
}
// if the state is conditions or nextphase, then the event should be active
case GameEventState.WorldConditions:
case GameEventState.WorldNextPhase:
@@ -55,18 +55,18 @@ namespace Game
return false;
// if inactive world event, check the prerequisite events
case GameEventState.WorldInactive:
{
long currenttime = GameTime.GetGameTime();
foreach (var gameEventId in mGameEvent[entry].prerequisite_events)
{
long currenttime = GameTime.GetGameTime();
foreach (var gameEventId in mGameEvent[entry].prerequisite_events)
{
if ((mGameEvent[gameEventId].state != GameEventState.WorldNextPhase && mGameEvent[gameEventId].state != GameEventState.WorldFinished) || // if prereq not in nextphase or finished state, then can't start this one
mGameEvent[gameEventId].nextstart > currenttime) // if not in nextphase state for long enough, can't start this one
return false;
}
// all prerequisite events are met
// but if there are no prerequisites, this can be only activated through gm command
return !(mGameEvent[entry].prerequisite_events.Empty());
if ((mGameEvent[gameEventId].state != GameEventState.WorldNextPhase && mGameEvent[gameEventId].state != GameEventState.WorldFinished) || // if prereq not in nextphase or finished state, then can't start this one
mGameEvent[gameEventId].nextstart > currenttime) // if not in nextphase state for long enough, can't start this one
return false;
}
// all prerequisite events are met
// but if there are no prerequisites, this can be only activated through gm command
return !(mGameEvent[entry].prerequisite_events.Empty());
}
}
}
@@ -1005,7 +1005,7 @@ namespace Game
// changed, save to DB the gameevent state, will be updated in next update cycle
SaveWorldEventStateToDB(id);
Log.outDebug(LogFilter.Misc, "GameEvent {0} is active", id);
Log.outDebug(LogFilter.Misc, "GameEvent {0} is active", id);
// queue for activation
if (!IsActiveEvent(id))
activate.Add(id);
@@ -1137,7 +1137,7 @@ namespace Game
}
}
});
}
}
}
void UpdateBattlegroundSettings()
@@ -1342,7 +1342,7 @@ namespace Game
{
var creatureBounds = map.GetCreatureBySpawnIdStore().LookupByKey(tuple.Item1);
foreach (var creature in creatureBounds)
{
{
if (activate)
{
tuple.Item2.equipement_id_prev = creature.GetCurrentEquipmentId();
@@ -1477,15 +1477,10 @@ namespace Game
BattlegroundTypeId bgTypeId = Global.BattlegroundMgr.WeekendHolidayIdToBGType(Event.holiday_id);
if (bgTypeId != BattlegroundTypeId.None)
{
BattlemasterListRecord bl = CliDB.BattlemasterListStorage.LookupByKey(bgTypeId);
if (bl != null && bl.HolidayWorldState != 0)
{
UpdateWorldState worldstate = new();
worldstate.VariableID = bl.HolidayWorldState;
worldstate.Value = Activate ? 1 : 0;
//worldstate.Hidden = false;
Global.WorldMgr.SendGlobalMessage(worldstate);
}
var bl = CliDB.BattlemasterListStorage.LookupByKey(Global.BattlegroundMgr.WeekendHolidayIdToBGType(Event.holiday_id));
if (bl != null)
if (bl.HolidayWorldState != 0)
Global.WorldStateMgr.SetValue(bl.HolidayWorldState, Activate ? 1 : 0, false, null);
}
}
}
Source/Game/World/WorldStateManager.cs
+2 -2
View File
@@ -154,7 +154,7 @@ namespace Game
if (worldStateTemplate == null || worldStateTemplate.MapIds.Empty())
return _realmWorldStateValues.LookupByKey(worldStateId);
if (!worldStateTemplate.MapIds.Contains(map.GetId()))
if (map == null || !worldStateTemplate.MapIds.Contains(map.GetId()))
return 0;
return map.GetWorldStateValue(worldStateId);
@@ -197,7 +197,7 @@ namespace Game
return;
}
if (!worldStateTemplate.MapIds.Contains(map.GetId()))
if (map == null || !worldStateTemplate.MapIds.Contains(map.GetId()))
return;
map.SetWorldStateValue(worldStateId, value, hidden);
sql/updates/world/master/2022_07_11_01_world.sql
+13
View File
@@ -0,0 +1,13 @@
DELETE FROM `world_state` WHERE `ID` IN (1941,1942,1943,2851,3695,4273,5360,5361,6306,6436,7671);
INSERT INTO `world_state` (`ID`,`DefaultValue`,`MapIDs`,`AreaIDs`,`ScriptName`,`Comment`) VALUES
(1941,0,NULL,NULL,'','Battleground Call to Arms - Alterac Valley'),
(1942,0,NULL,NULL,'','Battleground Call to Arms - Warsong Gulch'),
(1943,0,NULL,NULL,'','Battleground Call to Arms - Arathi Basin'),
(2851,0,NULL,NULL,'','Battleground Call to Arms - Eye of the Storm'),
(3695,0,NULL,NULL,'','Battleground Call to Arms - Strand of the Ancients'),
(4273,0,NULL,NULL,'','Battleground Call to Arms - Isle of Conquest'),
(5360,0,NULL,NULL,'','Battleground Call to Arms - The Battle for Gilneas'),
(5361,0,NULL,NULL,'','Battleground Call to Arms - Twin Peaks'),
(6306,0,NULL,NULL,'','Battleground Call to Arms - Temple of Kotmogu'),
(6436,0,NULL,NULL,'','Battleground Call to Arms - Silvershard Mines'),
(7671,0,NULL,NULL,'','Battleground Call to Arms - Deepwind Gorge (Legacy)');