hondacrx
2023-08-21 07:22:33 -04:00
parent 794ff2bb99
commit f6807e152c
76 changed files with 3149 additions and 2233 deletions
+2
View File
@@ -107,6 +107,7 @@ namespace Game.DataStorage
ChrSpecializationStorage = ReadDB2<ChrSpecializationRecord>("ChrSpecialization.db2", HotfixStatements.SEL_CHR_SPECIALIZATION, HotfixStatements.SEL_CHR_SPECIALIZATION_LOCALE);
CinematicCameraStorage = ReadDB2<CinematicCameraRecord>("CinematicCamera.db2", HotfixStatements.SEL_CINEMATIC_CAMERA);
CinematicSequencesStorage = ReadDB2<CinematicSequencesRecord>("CinematicSequences.db2", HotfixStatements.SEL_CINEMATIC_SEQUENCES);
ConditionalChrModelStorage = ReadDB2<ConditionalChrModelRecord>("ConditionalChrModel.db2", HotfixStatements.SEL_CONDITIONAL_CHR_MODEL);
ConditionalContentTuningStorage = ReadDB2<ConditionalContentTuningRecord>("ConditionalContentTuning.db2", HotfixStatements.SEL_CONDITIONAL_CONTENT_TUNING);
ContentTuningStorage = ReadDB2<ContentTuningRecord>("ContentTuning.db2", HotfixStatements.SEL_CONTENT_TUNING);
ContentTuningXExpectedStorage = ReadDB2<ContentTuningXExpectedRecord>("ContentTuningXExpected.db2", HotfixStatements.SEL_CONTENT_TUNING_X_EXPECTED);
@@ -539,6 +540,7 @@ namespace Game.DataStorage
public static DB6Storage<ChrSpecializationRecord> ChrSpecializationStorage;
public static DB6Storage<CinematicCameraRecord> CinematicCameraStorage;
public static DB6Storage<CinematicSequencesRecord> CinematicSequencesStorage;
public static DB6Storage<ConditionalChrModelRecord> ConditionalChrModelStorage;
public static DB6Storage<ConditionalContentTuningRecord> ConditionalContentTuningStorage;
public static DB6Storage<ContentTuningRecord> ContentTuningStorage;
public static DB6Storage<ContentTuningXExpectedRecord> ContentTuningXExpectedStorage;
+3 -1
View File
@@ -3,6 +3,7 @@
using Framework.Constants;
using Framework.Database;
using Game.Miscellaneous;
using Game.Networking;
using System;
using System.Collections;
@@ -1830,7 +1831,8 @@ namespace Game.DataStorage
var bounds = _skillRaceClassInfoBySkill.LookupByKey(skill);
foreach (var skllRaceClassInfo in bounds)
{
if (skllRaceClassInfo.RaceMask != 0 && !Convert.ToBoolean(skllRaceClassInfo.RaceMask & SharedConst.GetMaskForRace(race)))
var raceMask = new RaceMask<long>(skllRaceClassInfo.RaceMask);
if (!raceMask.IsEmpty() && !raceMask.HasRace(race))
continue;
if (skllRaceClassInfo.ClassMask != 0 && !Convert.ToBoolean(skllRaceClassInfo.ClassMask & (1 << ((byte)class_ - 1))))
continue;
+1 -1
View File
@@ -122,7 +122,7 @@ namespace Game.DataStorage
public uint UwIntroSound;
public byte FactionGroupMask;
public float AmbientMultiplier;
public byte MountFlags;
public int MountFlags;
public short PvpCombatWorldStateID;
public byte WildBattlePetLevelMin;
public byte WildBattlePetLevelMax;
+15 -4
View File
@@ -183,6 +183,7 @@ namespace Game.DataStorage
public sealed class ChrCustomizationReqRecord
{
public uint Id;
public long RaceMask;
public string ReqSource;
public int Flags;
public int ClassMask;
@@ -329,6 +330,16 @@ namespace Game.DataStorage
public ushort[] Camera = new ushort[8];
}
public sealed class ConditionalChrModelRecord
{
public uint Id;
public uint ChrModelID; // This is the PK
public int ChrCustomizationReqID;
public int PlayerConditionID;
public int Flags;
public int ChrCustomizationCategoryID;
}
public sealed class ConditionalContentTuningRecord
{
public uint Id;
@@ -512,12 +523,12 @@ namespace Game.DataStorage
public CriteriaType Type;
public uint Asset;
public uint ModifierTreeId;
public byte StartEvent;
public int StartEvent;
public uint StartAsset;
public ushort StartTimer;
public byte FailEvent;
public int FailEvent;
public uint FailAsset;
public byte Flags;
public int Flags;
public ushort EligibilityWorldStateID;
public byte EligibilityWorldStateValue;
@@ -530,7 +541,7 @@ namespace Game.DataStorage
public string Description;
public uint Parent;
public uint Amount;
public sbyte Operator;
public int Operator;
public uint CriteriaID;
public int OrderIndex;
public CriteriaTreeFlags Flags;
@@ -21,6 +21,9 @@ namespace Game.DataStorage
public short ObjectEffectPackageID;
public float OverrideLootEffectScale;
public float OverrideNameScale;
public int AlternateDisplayType;
public int ClientCreatureDisplayInfoID;
public int ClientItemID;
public Vector3 GeoBoxMin
{
+2 -1
View File
@@ -16,7 +16,8 @@ namespace Game.DataStorage
public UiMapType Type;
public int BountySetID;
public uint BountyDisplayLocation;
public int VisibilityPlayerConditionID;
public int VisibilityPlayerConditionID2; // if not met then map is skipped when evaluating UiMapAssignment
public int VisibilityPlayerConditionID; // if not met then client checks other maps with the same AlternateUiMapGroup, not re-evaluating UiMapAssignment for them
public sbyte HelpTextPosition;
public int BkgAtlasID;
public int AlternateUiMapGroup;