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

Core: SOme code cleanup, more to follow.

Browse Source
This commit is contained in:
hondacrx
2021-03-20 22:48:48 -04:00
parent 62f554f2e0
commit 62ec699ec6
318 changed files with 5080 additions and 5125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Garrisons/GarrisonManager.cs
+18 -18
View File
@@ -175,7 +175,7 @@ namespace Game.Garrisons
Cypher.Assert(faction< 2);
bool hasForcedExclusiveTrait = false;
List<GarrAbilityRecord> result = new List<GarrAbilityRecord>();
List<GarrAbilityRecord> result = new();
uint[] slots = { AbilitiesForQuality[quality, 0], AbilitiesForQuality[quality, 1] };
GarrAbilities garrAbilities = null;
@@ -183,10 +183,10 @@ namespace Game.Garrisons
if (abilities != null)
garrAbilities = abilities;
List<GarrAbilityRecord> abilityList = new List<GarrAbilityRecord>();
List<GarrAbilityRecord> forcedAbilities = new List<GarrAbilityRecord>();
List<GarrAbilityRecord> traitList = new List<GarrAbilityRecord>();
List<GarrAbilityRecord> forcedTraits = new List<GarrAbilityRecord>();
List<GarrAbilityRecord> abilityList = new();
List<GarrAbilityRecord> forcedAbilities = new();
List<GarrAbilityRecord> traitList = new();
List<GarrAbilityRecord> forcedTraits = new();
if (garrAbilities != null)
{
foreach (GarrAbilityRecord ability in garrAbilities.Counters)
@@ -252,7 +252,7 @@ namespace Game.Garrisons
if (slots[1] > forcedTraits.Count + traitList.Count)
{
List<GarrAbilityRecord> genericTraitsTemp = new List<GarrAbilityRecord>();
List<GarrAbilityRecord> genericTraitsTemp = new();
foreach (GarrAbilityRecord ability in _garrisonFollowerRandomTraits)
{
if (ability.Flags.HasAnyFlag(GarrisonAbilityFlags.HordeOnly) && faction != GarrisonFactionIndex.Horde)
@@ -309,7 +309,7 @@ namespace Game.Garrisons
List<GarrAbilityRecord> GetClassSpecAbilities(GarrFollowerRecord follower, uint faction)
{
List<GarrAbilityRecord> abilities = new List<GarrAbilityRecord>();
List<GarrAbilityRecord> abilities = new();
uint classSpecId;
switch (faction)
{
@@ -412,7 +412,7 @@ namespace Game.Garrisons
continue;
}
FinalizeGarrisonPlotGOInfo info = new FinalizeGarrisonPlotGOInfo();
FinalizeGarrisonPlotGOInfo info = new();
info.factionInfo[GarrisonFactionIndex.Horde].GameObjectId = hordeGameObjectId;
info.factionInfo[GarrisonFactionIndex.Horde].Pos = new Position(result.Read<float>(2), result.Read<float>(3), result.Read<float>(4), result.Read<float>(5));
info.factionInfo[GarrisonFactionIndex.Horde].AnimKitId = hordeAnimKitId;
@@ -468,23 +468,23 @@ namespace Game.Garrisons
Log.outInfo(LogFilter.ServerLoading, "Loaded {0} garrison follower class spec abilities in {1}.", count, Time.GetMSTimeDiffToNow(msTime));
}
MultiMap<uint, GarrSiteLevelPlotInstRecord> _garrisonPlotInstBySiteLevel = new MultiMap<uint, GarrSiteLevelPlotInstRecord>();
Dictionary<uint, Dictionary<uint, GameObjectsRecord>> _garrisonPlots = new Dictionary<uint, Dictionary<uint, GameObjectsRecord>>();
MultiMap<uint, uint> _garrisonBuildingsByPlot = new MultiMap<uint, uint>();
Dictionary<ulong, uint> _garrisonBuildingPlotInstances = new Dictionary<ulong, uint>();
MultiMap<uint, uint> _garrisonBuildingsByType = new MultiMap<uint, uint>();
Dictionary<uint, FinalizeGarrisonPlotGOInfo> _finalizePlotGOInfo = new Dictionary<uint, FinalizeGarrisonPlotGOInfo>();
MultiMap<uint, GarrSiteLevelPlotInstRecord> _garrisonPlotInstBySiteLevel = new();
Dictionary<uint, Dictionary<uint, GameObjectsRecord>> _garrisonPlots = new();
MultiMap<uint, uint> _garrisonBuildingsByPlot = new();
Dictionary<ulong, uint> _garrisonBuildingPlotInstances = new();
MultiMap<uint, uint> _garrisonBuildingsByType = new();
Dictionary<uint, FinalizeGarrisonPlotGOInfo> _finalizePlotGOInfo = new();
Dictionary<uint, GarrAbilities>[] _garrisonFollowerAbilities = new Dictionary<uint, GarrAbilities>[2];
MultiMap<uint, GarrAbilityRecord> _garrisonFollowerClassSpecAbilities = new MultiMap<uint, GarrAbilityRecord>();
List<GarrAbilityRecord> _garrisonFollowerRandomTraits = new List<GarrAbilityRecord>();
MultiMap<uint, GarrAbilityRecord> _garrisonFollowerClassSpecAbilities = new();
List<GarrAbilityRecord> _garrisonFollowerRandomTraits = new();
ulong _followerDbIdGenerator = 1;
}
class GarrAbilities
{
public List<GarrAbilityRecord> Counters = new List<GarrAbilityRecord>();
public List<GarrAbilityRecord> Traits = new List<GarrAbilityRecord>();
public List<GarrAbilityRecord> Counters = new();
public List<GarrAbilityRecord> Traits = new();
}
public class FinalizeGarrisonPlotGOInfo
Source/Game/Garrisons/GarrisonMap.cs
+1 -1
View File
@@ -35,7 +35,7 @@ namespace Game.Garrisons
{
base.LoadGridObjects(grid, cell);
GarrisonGridLoader loader = new GarrisonGridLoader(grid, this, cell);
GarrisonGridLoader loader = new(grid, this, cell);
loader.LoadN();
}
Source/Game/Garrisons/Garrisons.cs
+29 -29
View File
@@ -229,7 +229,7 @@ namespace Game.Garrisons
InitializePlots();
GarrisonCreateResult garrisonCreateResult = new GarrisonCreateResult();
GarrisonCreateResult garrisonCreateResult = new();
garrisonCreateResult.GarrSiteLevelID = _siteLevel.Id;
_owner.SendPacket(garrisonCreateResult);
PhasingHandler.OnConditionChange(_owner);
@@ -239,11 +239,11 @@ namespace Game.Garrisons
public void Delete()
{
SQLTransaction trans = new SQLTransaction();
SQLTransaction trans = new();
DeleteFromDB(_owner.GetGUID().GetCounter(), trans);
DB.Characters.CommitTransaction(trans);
GarrisonDeleteResult garrisonDelete = new GarrisonDeleteResult();
GarrisonDeleteResult garrisonDelete = new();
garrisonDelete.Result = GarrisonError.Success;
garrisonDelete.GarrSiteID = _siteLevel.GarrSiteID;
_owner.SendPacket(garrisonDelete);
@@ -281,7 +281,7 @@ namespace Game.Garrisons
void Enter()
{
WorldLocation loc = new WorldLocation(_siteLevel.MapID);
WorldLocation loc = new(_siteLevel.MapID);
loc.Relocate(_owner);
_owner.TeleportTo(loc, TeleportToOptions.Seamless);
}
@@ -291,7 +291,7 @@ namespace Game.Garrisons
MapRecord map = CliDB.MapStorage.LookupByKey(_siteLevel.MapID);
if (map != null)
{
WorldLocation loc = new WorldLocation((uint)map.ParentMapID);
WorldLocation loc = new((uint)map.ParentMapID);
loc.Relocate(_owner);
_owner.TeleportTo(loc, TeleportToOptions.Seamless);
}
@@ -319,7 +319,7 @@ namespace Game.Garrisons
public void LearnBlueprint(uint garrBuildingId)
{
GarrisonLearnBlueprintResult learnBlueprintResult = new GarrisonLearnBlueprintResult();
GarrisonLearnBlueprintResult learnBlueprintResult = new();
learnBlueprintResult.GarrTypeID = GetGarrisonType();
learnBlueprintResult.BuildingID = garrBuildingId;
learnBlueprintResult.Result = GarrisonError.Success;
@@ -336,7 +336,7 @@ namespace Game.Garrisons
void UnlearnBlueprint(uint garrBuildingId)
{
GarrisonUnlearnBlueprintResult unlearnBlueprintResult = new GarrisonUnlearnBlueprintResult();
GarrisonUnlearnBlueprintResult unlearnBlueprintResult = new();
unlearnBlueprintResult.GarrTypeID = GetGarrisonType();
unlearnBlueprintResult.BuildingID = garrBuildingId;
unlearnBlueprintResult.Result = GarrisonError.Success;
@@ -353,7 +353,7 @@ namespace Game.Garrisons
public void PlaceBuilding(uint garrPlotInstanceId, uint garrBuildingId)
{
GarrisonPlaceBuildingResult placeBuildingResult = new GarrisonPlaceBuildingResult();
GarrisonPlaceBuildingResult placeBuildingResult = new();
placeBuildingResult.GarrTypeID = GetGarrisonType();
placeBuildingResult.Result = CheckBuildingPlacement(garrPlotInstanceId, garrBuildingId);
if (placeBuildingResult.Result == GarrisonError.Success)
@@ -389,7 +389,7 @@ namespace Game.Garrisons
if (oldBuildingId != 0)
{
GarrisonBuildingRemoved buildingRemoved = new GarrisonBuildingRemoved();
GarrisonBuildingRemoved buildingRemoved = new();
buildingRemoved.GarrTypeID = GetGarrisonType();
buildingRemoved.Result = GarrisonError.Success;
buildingRemoved.GarrPlotInstanceID = garrPlotInstanceId;
@@ -405,7 +405,7 @@ namespace Game.Garrisons
public void CancelBuildingConstruction(uint garrPlotInstanceId)
{
GarrisonBuildingRemoved buildingRemoved = new GarrisonBuildingRemoved();
GarrisonBuildingRemoved buildingRemoved = new();
buildingRemoved.GarrTypeID = GetGarrisonType();
buildingRemoved.Result = CheckBuildingRemoval(garrPlotInstanceId);
if (buildingRemoved.Result == GarrisonError.Success)
@@ -433,7 +433,7 @@ namespace Game.Garrisons
uint restored = Global.GarrisonMgr.GetPreviousLevelBuilding(constructing.BuildingType, constructing.UpgradeLevel);
Cypher.Assert(restored != 0);
GarrisonPlaceBuildingResult placeBuildingResult = new GarrisonPlaceBuildingResult();
GarrisonPlaceBuildingResult placeBuildingResult = new();
placeBuildingResult.GarrTypeID = GetGarrisonType();
placeBuildingResult.Result = GarrisonError.Success;
placeBuildingResult.BuildingInfo.GarrPlotInstanceID = garrPlotInstanceId;
@@ -473,7 +473,7 @@ namespace Game.Garrisons
map.AddToMap(go);
}
GarrisonBuildingActivated buildingActivated = new GarrisonBuildingActivated();
GarrisonBuildingActivated buildingActivated = new();
buildingActivated.GarrPlotInstanceID = garrPlotInstanceId;
_owner.SendPacket(buildingActivated);
}
@@ -482,7 +482,7 @@ namespace Game.Garrisons
public void AddFollower(uint garrFollowerId)
{
GarrisonAddFollowerResult addFollowerResult = new GarrisonAddFollowerResult();
GarrisonAddFollowerResult addFollowerResult = new();
addFollowerResult.GarrTypeID = GetGarrisonType();
GarrFollowerRecord followerEntry = CliDB.GarrFollowerStorage.LookupByKey(garrFollowerId);
if (_followerIds.Contains(garrFollowerId) || followerEntry == null)
@@ -495,7 +495,7 @@ namespace Game.Garrisons
_followerIds.Add(garrFollowerId);
ulong dbId = Global.GarrisonMgr.GenerateFollowerDbId();
Follower follower = new Follower();
Follower follower = new();
follower.PacketInfo.DbID = dbId;
follower.PacketInfo.GarrFollowerID = garrFollowerId;
follower.PacketInfo.Quality = followerEntry.Quality; // TODO: handle magic upgrades
@@ -532,10 +532,10 @@ namespace Game.Garrisons
public void SendInfo()
{
GetGarrisonInfoResult garrisonInfo = new GetGarrisonInfoResult();
GetGarrisonInfoResult garrisonInfo = new();
garrisonInfo.FactionIndex = GetFaction();
GarrisonInfo garrison = new GarrisonInfo();
GarrisonInfo garrison = new();
garrison.GarrTypeID = GetGarrisonType();
garrison.GarrSiteID = _siteLevel.GarrSiteID;
garrison.GarrSiteLevelID = _siteLevel.Id;
@@ -561,9 +561,9 @@ namespace Game.Garrisons
if (garrisonMap == null || _owner.GetMapId() != garrisonMap.ParentMapID)
return;
GarrisonRemoteInfo remoteInfo = new GarrisonRemoteInfo();
GarrisonRemoteInfo remoteInfo = new();
GarrisonRemoteSiteInfo remoteSiteInfo = new GarrisonRemoteSiteInfo();
GarrisonRemoteSiteInfo remoteSiteInfo = new();
remoteSiteInfo.GarrSiteLevelID = _siteLevel.Id;
foreach (var p in _plots)
if (p.Value.BuildingInfo.PacketInfo.HasValue)
@@ -575,7 +575,7 @@ namespace Game.Garrisons
public void SendBlueprintAndSpecializationData()
{
GarrisonRequestBlueprintAndSpecializationDataResult data = new GarrisonRequestBlueprintAndSpecializationDataResult();
GarrisonRequestBlueprintAndSpecializationDataResult data = new();
data.GarrTypeID = GetGarrisonType();
data.BlueprintsKnown = _knownBuildings;
_owner.SendPacket(data);
@@ -583,7 +583,7 @@ namespace Game.Garrisons
public void SendMapData(Player receiver)
{
GarrisonMapDataResponse mapData = new GarrisonMapDataResponse();
GarrisonMapDataResponse mapData = new();
foreach (var plot in _plots.Values)
{
@@ -677,10 +677,10 @@ namespace Game.Garrisons
GarrSiteLevelRecord _siteLevel;
uint _followerActivationsRemainingToday;
Dictionary<uint, Plot> _plots = new Dictionary<uint, Plot>();
List<uint> _knownBuildings = new List<uint>();
Dictionary<ulong, Follower> _followers = new Dictionary<ulong, Follower>();
List<uint> _followerIds = new List<uint>();
Dictionary<uint, Plot> _plots = new();
List<uint> _knownBuildings = new();
Dictionary<ulong, Follower> _followers = new();
List<uint> _followerIds = new();
public class Building
{
@@ -697,7 +697,7 @@ namespace Game.Garrisons
}
public ObjectGuid Guid;
public List<ObjectGuid> Spawns = new List<ObjectGuid>();
public List<ObjectGuid> Spawns = new();
public Optional<GarrisonBuildingInfo> PacketInfo;
}
@@ -808,7 +808,7 @@ namespace Game.Garrisons
public void ClearBuildingInfo(GarrisonType garrisonType, Player owner)
{
GarrisonPlotPlaced plotPlaced = new GarrisonPlotPlaced();
GarrisonPlotPlaced plotPlaced = new();
plotPlaced.GarrTypeID = garrisonType;
plotPlaced.PlotInfo = PacketInfo;
owner.SendPacket(plotPlaced);
@@ -820,7 +820,7 @@ namespace Game.Garrisons
{
if (!BuildingInfo.PacketInfo.HasValue)
{
GarrisonPlotRemoved plotRemoved = new GarrisonPlotRemoved();
GarrisonPlotRemoved plotRemoved = new();
plotRemoved.GarrPlotInstanceID = PacketInfo.GarrPlotInstanceID;
owner.SendPacket(plotRemoved);
}
@@ -830,7 +830,7 @@ namespace Game.Garrisons
T BuildingSpawnHelper<T>(GameObject building, ulong spawnId, Map map) where T : WorldObject, new()
{
T spawn = new T();
T spawn = new();
if (!spawn.LoadFromDB(spawnId, map, false, false))
return null;
@@ -869,7 +869,7 @@ namespace Game.Garrisons
public class Follower
{
public GarrisonFollower PacketInfo = new GarrisonFollower();
public GarrisonFollower PacketInfo = new();
public uint GetItemLevel()
{