Core/Misc: Misc cleanups and changing of fields

This commit is contained in:
hondacrx
2018-05-13 20:26:05 -04:00
parent 868c67c8f0
commit 7d4c0b7634
38 changed files with 269 additions and 244 deletions
+8 -8
View File
@@ -23,9 +23,9 @@ namespace Game.DataStorage
{
public class AchievementRecord
{
public LocalizedString Title;
public LocalizedString Description;
public LocalizedString Reward;
public string Title;
public string Description;
public string Reward;
public AchievementFlags Flags;
public short InstanceID;
public ushort Supercedes;
@@ -123,7 +123,7 @@ namespace Game.DataStorage
public sealed class ArtifactRecord
{
public uint Id;
public LocalizedString Name;
public string Name;
public uint UiBarOverlayColor;
public uint UiBarBackgroundColor;
public uint UiNameColor;
@@ -137,7 +137,7 @@ namespace Game.DataStorage
public sealed class ArtifactAppearanceRecord
{
public LocalizedString Name;
public string Name;
public uint UiSwatchColor;
public float UiModelSaturation;
public float UiModelOpacity;
@@ -156,8 +156,8 @@ namespace Game.DataStorage
public sealed class ArtifactAppearanceSetRecord
{
public LocalizedString Name;
public LocalizedString Description;
public string Name;
public string Description;
public ushort UiCameraID;
public ushort AltHandUICameraID;
public byte DisplayIndex;
@@ -217,7 +217,7 @@ namespace Game.DataStorage
public sealed class AuctionHouseRecord
{
public uint Id;
public LocalizedString Name;
public string Name;
public ushort FactionID;
public byte DepositRate;
public byte ConsignmentRate;
+7 -7
View File
@@ -33,8 +33,8 @@ namespace Game.DataStorage
public sealed class BarberShopStyleRecord
{
public LocalizedString DisplayName;
public LocalizedString Description;
public string DisplayName;
public string Description;
public float CostModifier;
public byte Type;
public byte Race;
@@ -60,8 +60,8 @@ namespace Game.DataStorage
public sealed class BattlePetSpeciesRecord
{
public LocalizedString SourceText;
public LocalizedString Description;
public string SourceText;
public string Description;
public uint CreatureID;
public uint IconFileDataID;
public uint SummonSpellID;
@@ -85,9 +85,9 @@ namespace Game.DataStorage
{
public uint Id;
public LocalizedString Name;
public LocalizedString GameType;
public LocalizedString ShortDescription;
public LocalizedString LongDescription;
public string GameType;
public string ShortDescription;
public string LongDescription;
public int IconFileDataID;
public short[] MapId = new short[16];
public ushort HolidayWorldState;
+4 -4
View File
@@ -74,7 +74,7 @@ namespace Game.DataStorage
{
public uint Id;
public LocalizedString Name;
public LocalizedString Shortcut;
public string Shortcut;
public ChannelDBCFlags Flags;
public sbyte FactionGroup;
}
@@ -83,8 +83,8 @@ namespace Game.DataStorage
{
public string PetNameToken;
public LocalizedString Name;
public LocalizedString NameFemale;
public LocalizedString NameMale;
public string NameFemale;
public string NameMale;
public uint FileName;
public uint CreateScreenFileDataID;
public uint SelectScreenFileDataID;
@@ -297,7 +297,7 @@ namespace Game.DataStorage
public sealed class CreatureTypeRecord
{
public uint Id;
public LocalizedString Name;
public string Name;
public byte Flags;
}
+1 -1
View File
@@ -49,7 +49,7 @@ namespace Game.DataStorage
public sealed class DifficultyRecord
{
public uint Id;
public LocalizedString Name;
public string Name;
public ushort GroupSizeHealthCurveID;
public ushort GroupSizeDmgCurveID;
public ushort GroupSizeSpellPointsCurveID;
+6 -6
View File
@@ -49,8 +49,8 @@ namespace Game.DataStorage
public sealed class GarrAbilityRecord
{
public LocalizedString Name;
public LocalizedString Description;
public string Name;
public string Description;
public uint IconFileDataID;
public GarrisonAbilityFlags Flags;
public ushort FactionChangeGarrAbilityID;
@@ -99,9 +99,9 @@ namespace Game.DataStorage
public sealed class GarrClassSpecRecord
{
public LocalizedString ClassSpec;
public LocalizedString ClassSpecMale;
public LocalizedString ClassSpecFemale;
public string ClassSpec;
public string ClassSpecMale;
public string ClassSpecFemale;
public ushort UiTextureAtlasMemberID; // UiTextureAtlasMember.db2 ref
public ushort GarrFollItemSetID;
public byte FollowerClassLimit;
@@ -156,7 +156,7 @@ namespace Game.DataStorage
public sealed class GarrPlotRecord
{
public uint Id;
public LocalizedString Name;
public string Name;
public uint AllianceConstructObjID;
public uint HordeConstructObjID;
public byte UiCategoryID;
+2 -2
View File
@@ -228,7 +228,7 @@ namespace Game.DataStorage
public sealed class ItemLimitCategoryRecord
{
public uint Id;
public LocalizedString Name;
public string Name;
public byte Quantity;
public byte Flags;
}
@@ -277,7 +277,7 @@ namespace Game.DataStorage
public sealed class ItemSearchNameRecord
{
public ulong AllowableRace;
public LocalizedString Display;
public string Display;
public uint Id;
public uint[] Flags = new uint[3];
public ushort ItemLevel;
+1 -1
View File
@@ -29,7 +29,7 @@ namespace Game.DataStorage
public sealed class MapRecord
{
public uint Id;
public uint Directory;
public string Directory;
public LocalizedString MapName;
public string MapDescription0; // Horde
public string MapDescription1; // Alliance
+1 -1
View File
@@ -186,7 +186,7 @@ namespace Game.DataStorage
public sealed class PvpTalentRecord
{
public uint Id;
public LocalizedString Description;
public string Description;
public uint SpellID;
public uint OverridesSpellID;
public int ActionBarSpellID;
+1 -1
View File
@@ -43,7 +43,7 @@ namespace Game.DataStorage
public sealed class QuestSortRecord
{
public uint Id;
public LocalizedString SortName;
public string SortName;
public byte UiOrderIndex;
}
+8 -8
View File
@@ -40,7 +40,7 @@ namespace Game.DataStorage
public sealed class ScenarioRecord
{
public uint Id;
public LocalizedString Name;
public string Name;
public ushort AreaTableID;
public byte Flags;
public byte Type;
@@ -49,8 +49,8 @@ namespace Game.DataStorage
public sealed class ScenarioStepRecord
{
public uint Id;
public LocalizedString Description;
public LocalizedString Title;
public string Description;
public string Title;
public ushort ScenarioID;
public ushort Supersedes; // Used in conjunction with Proving Grounds scenarios, when sequencing steps (Not using step order?)
public ushort RewardQuestID;
@@ -97,8 +97,8 @@ namespace Game.DataStorage
{
public uint Id;
public LocalizedString DisplayName;
public LocalizedString Description;
public LocalizedString AlternateVerb;
public string Description;
public string AlternateVerb;
public ushort Flags;
public SkillCategory CategoryID;
public byte CanLink;
@@ -240,7 +240,7 @@ namespace Game.DataStorage
public sealed class SpellCategoryRecord
{
public uint Id;
public LocalizedString Name;
public string Name;
public int ChargeRecoveryTime;
public SpellCategoryFlags Flags;
public byte UsesPerWeek;
@@ -321,7 +321,7 @@ namespace Game.DataStorage
public sealed class SpellFocusObjectRecord
{
public uint Id;
public LocalizedString Name;
public string Name;
}
public sealed class SpellInterruptsRecord
@@ -495,7 +495,7 @@ namespace Game.DataStorage
public sealed class SpellShapeshiftFormRecord
{
public uint Id;
public LocalizedString Name;
public string Name;
public float DamageVariance;
public SpellShapeshiftFormFlags Flags;
public ushort CombatRoundTime;
+4 -4
View File
@@ -81,14 +81,14 @@ namespace Game.DataStorage
public sealed class TotemCategoryRecord
{
public uint Id;
public LocalizedString Name;
public string Name;
public uint TotemCategoryMask;
public byte TotemCategoryType;
}
public sealed class ToyRecord
{
public LocalizedString SourceText;
public string SourceText;
public uint ItemID;
public byte Flags;
public byte SourceTypeEnum;
@@ -103,7 +103,7 @@ namespace Game.DataStorage
public sealed class TransmogSetRecord
{
public LocalizedString Name;
public string Name;
public ushort ParentTransmogSetID;
public ushort UIOrder;
public byte ExpansionID;
@@ -117,7 +117,7 @@ namespace Game.DataStorage
public sealed class TransmogSetGroupRecord
{
public LocalizedString Name;
public string Name;
public uint Id;
}
@@ -109,7 +109,6 @@ namespace Game.DataStorage
public uint EnterUISoundID;
public ushort ExitUISoundID;
public bool CanEnterOrExit()
{
return (Flags.HasAnyFlag(VehicleSeatFlags.CanEnterOrExit) ||