Made use of EquipmentSlots enum

This commit is contained in:
Chomp
2025-01-15 00:04:44 +00:00
parent b6e4dde259
commit 5e79f02cbf
11 changed files with 338 additions and 43 deletions
+2 -1
View File
@@ -1,5 +1,6 @@
using System.Text.Json.Serialization;
using Core.Models.Common;
using Core.Models.Enums;
using Core.Utils.Json.Converters;
namespace Core.Models.Eft.Common.Tables;
@@ -332,7 +333,7 @@ public class BodyPart
public class BotTypeInventory
{
[JsonPropertyName("equipment")]
public Dictionary<string, Dictionary<string, double>>? Equipment { get; set; }
public Dictionary<EquipmentSlots, Dictionary<string, double>>? Equipment { get; set; }
public GlobalAmmo? Ammo { get; set; }
+3 -3
View File
@@ -1,4 +1,4 @@
using System.Text.Json.Serialization;
using System.Text.Json.Serialization;
using Core.Models.Enums;
using Core.Models.Enums.RaidSettings;
using Core.Models.Enums.RaidSettings.TimeAndWeather;
@@ -17,7 +17,7 @@ public class RaidSettings
public bool? IsLocationTransition { get; set; }
[JsonPropertyName("timeVariant")]
public DateTime? TimeVariant { get; set; }
public DateTimeEnum TimeVariant { get; set; }
[JsonPropertyName("metabolismDisabled")]
public bool? MetabolismDisabled { get; set; }
@@ -93,4 +93,4 @@ public class WavesSettings
[JsonPropertyName("isTaggedAndCursed")]
public bool? IsTaggedAndCursed { get; set; }
}
}
+16 -16
View File
@@ -1,19 +1,19 @@
namespace Core.Models.Enums;
namespace Core.Models.Enums;
public enum EquipmentSlots
{
HEADWEAR,
EARPIECE,
FACE_COVER,
ARMOR_VEST,
EYEWEAR,
ARM_BAND,
TACTICAL_VEST,
POCKETS,
BACKPACK,
SECURED_CONTAINER,
FIRST_PRIMARY_WEAPON,
SECOND_PRIMARY_WEAPON,
HOLSTER,
SCABBARD
}
Headwear,
Earpiece,
FaceCover,
ArmorVest,
Eyewear,
ArmBand,
TacticalVest,
Pockets,
Backpack,
SecuredContainer,
FirstPrimaryWeapon,
SecondPrimaryWeapon,
Holster,
Scabbard
}
@@ -1,5 +1,6 @@
using System.Text.Json.Serialization;
using Core.Models.Eft.Common.Tables;
using Core.Models.Enums;
using Core.Models.Spt.Config;
namespace Core.Models.Spt.Bots;
@@ -10,13 +11,13 @@ public class GenerateEquipmentProperties
/// Root Slot being generated
/// </summary>
[JsonPropertyName("rootEquipmentSlot")]
public string? RootEquipmentSlot { get; set; }
public EquipmentSlots RootEquipmentSlot { get; set; }
/// <summary>
/// Equipment pool for root slot being generated
/// </summary>
[JsonPropertyName("rootEquipmentPool")]
public Dictionary<string, int>? RootEquipmentPool { get; set; }
public Dictionary<string, double>? RootEquipmentPool { get; set; }
[JsonPropertyName("modPool")]
public GlobalMods? ModPool { get; set; }
@@ -53,4 +54,4 @@ public class GenerateEquipmentProperties
[JsonPropertyName("generatingPlayerLevel")]
public int? GeneratingPlayerLevel { get; set; }
}
}
+2 -1
View File
@@ -2,6 +2,7 @@ using System.Collections.Generic;
using System.Text.Json.Serialization;
using Core.Models.Common;
using Core.Models.Eft.Common.Tables;
using Core.Models.Enums;
namespace Core.Models.Spt.Config;
@@ -479,7 +480,7 @@ public class EquipmentFilterDetails
/// Key: equipment slot name e.g. FirstPrimaryWeapon, value: item tpls
/// </summary>
[JsonPropertyName("gear")]
public Dictionary<string, List<string>>? Gear { get; set; }
public Dictionary<EquipmentSlots, List<string>>? Gear { get; set; }
/// <summary>
/// Key: cartridge type e.g. Caliber23x75, value: item tpls
+2 -1
View File
@@ -1,5 +1,6 @@
using System.Text.Json.Serialization;
using Core.Models.Eft.Common.Tables;
using Core.Models.Enums;
namespace Core.Models.Spt.Config;
@@ -24,7 +25,7 @@ public class KarmaLevel
public Dictionary<string, GenerationData> ItemLimits { get; set; }
[JsonPropertyName("equipmentBlacklist")]
public Dictionary<string, string[]> EquipmentBlacklist { get; set; }
public Dictionary<EquipmentSlots, string[]> EquipmentBlacklist { get; set; }
[JsonPropertyName("labsAccessCardChancePercent")]
public double? LabsAccessCardChancePercent { get; set; }