Merge branch 'main' of https://github.com/sp-tarkov/server-csharp

Libraries/Core/Callbacks/HideoutCallbacks.cs

@@ -125,7 +125,7 @@ public class HideoutCallbacks(
     /// <summary>
     /// Handle client/game/profile/items/moving - HideoutCancelProductionCommand
     /// </summary>
-    public ItemEventRouterResponse CancelProduction(PmcData pmcData, HideoutImproveAreaRequestData request, string sessionID)
+    public ItemEventRouterResponse CancelProduction(PmcData pmcData, HideoutCancelProductionRequestData request, string sessionID)
     {
          return _hideoutController.CancelProduction(sessionID, pmcData, request);
     }

Libraries/Core/Helpers/HideoutHelper.cs

@@ -17,6 +17,12 @@ public class HideoutHelper(
     LocalisationService _localisationService
 )
 {
+    public const string BitcoinFarm = "5d5c205bd582a50d042a3c0e";
+    public const string CultistCircleCraftId = "66827062405f392b203a44cf";
+    public const string BitcoinProductionId = "5d5c205bd582a50d042a3c0e";
+    public const string WaterCollector = "5d5589c1f934db045e6c5492";
+    public const int MaxSkillPoint = 5000;
+    
     /// <summary>
     /// Add production to profiles' Hideout.Production array
     /// </summary>
@@ -31,12 +37,27 @@ public class HideoutHelper(
     {
         throw new NotImplementedException();
     }
+    
+    /// <summary>
+    /// Add production to profiles' Hideout.Production array
+    /// </summary>
+    /// <param name="profileData">Profile to add production to</param>
+    /// <param name="productionRequest">Production request</param>
+    /// <param name="sessionId">Session id</param>
+    /// <returns>client response</returns>
+    public void RegisterProduction(
+        PmcData profileData,
+        HideoutContinuousProductionStartRequestData productionRequest,
+        string sessionId)
+    {
+        throw new NotImplementedException();
+    }
 
     /// <summary>
     /// This convenience function initializes new Production Object
     /// with all the constants.
     /// </summary>
-    public void InitProduction(
+    public Production InitProduction(
         string recipeId,
         int productionTime,
         bool needFuelForAllProductionTime)

Libraries/Core/Models/Eft/Common/Tables/BotBase.cs

@@ -536,7 +536,7 @@ public record InsuredItem
 
 public record Hideout
 {
-    public Dictionary<string, Production>? Production { get; set; }
+    public Dictionary<string, Production?>? Production { get; set; }
     public List<BotHideoutArea>? Areas { get; set; }
     public Dictionary<string, HideoutImprovement>? Improvements { get; set; }
     

Libraries/Core/Models/Eft/Hideout/HideoutCancelProductionRequestData.cs

@@ -0,0 +1,13 @@
+using System.Text.Json.Serialization;
+using Core.Models.Eft.Common.Request;
+
+namespace Core.Models.Eft.Hideout;
+
+public record HideoutCancelProductionRequestData : BaseInteractionRequestData
+{
+    [JsonPropertyName("recipeId")]
+    public string? RecipeId { get; set; }
+    
+    [JsonPropertyName("timestamp")]
+    public long? Timestamp { get; set; }
+}

Libraries/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs

@@ -1,6 +1,7 @@
 using System.Text.Json.Serialization;
 using Core.Models.Eft.Common.Request;
 using Core.Models.Eft.Common.Tables;
+using Core.Models.Enums;
 
 namespace Core.Models.Eft.Hideout;
 
@@ -11,7 +12,7 @@ public record HideoutImproveAreaRequestData : BaseInteractionRequestData
     public string? AreaId { get; set; }
 
     [JsonPropertyName("areaType")]
-    public int? AreaType { get; set; }
+    public HideoutAreas? AreaType { get; set; }
 
     [JsonPropertyName("items")]
     public List<HideoutItem>? Items { get; set; }

Libraries/Core/Models/Eft/Hideout/HideoutProduction.cs

@@ -1,5 +1,6 @@
 using System.Text.Json.Serialization;
 using Core.Models.Common;
+using Core.Models.Enums;
 
 namespace Core.Models.Eft.Hideout;
 
@@ -21,7 +22,7 @@ public record HideoutProduction
     public string? Id { get; set; }
 
     [JsonPropertyName("areaType")]
-    public int? AreaType { get; set; }
+    public HideoutAreas? AreaType { get; set; }
 
     [JsonPropertyName("requirements")]
     public List<Requirement>? Requirements { get; set; }

Libraries/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs

@@ -1,6 +1,7 @@
 using System.Text.Json.Serialization;
 using Core.Models.Common;
 using Core.Models.Eft.Common.Request;
+using Core.Models.Enums;
 
 namespace Core.Models.Eft.Hideout;
 
@@ -8,7 +9,7 @@ public record HideoutPutItemInRequestData : BaseInteractionRequestData
 {
 
     [JsonPropertyName("areaType")]
-    public int? AreaType { get; set; }
+    public HideoutAreas? AreaType { get; set; }
 
     [JsonPropertyName("items")]
     public Dictionary<string, IdWithCount>? Items { get; set; }

Libraries/Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs

@@ -1,12 +1,13 @@
 using System.Text.Json.Serialization;
 using Core.Models.Eft.Common.Request;
+using Core.Models.Enums;
 
 namespace Core.Models.Eft.Hideout;
 
 public record HideoutTakeItemOutRequestData : BaseInteractionRequestData
 {
     [JsonPropertyName("areaType")]
-    public int? AreaType { get; set; }
+    public HideoutAreas? AreaType { get; set; }
 
     [JsonPropertyName("slots")]
     public List<int>? Slots { get; set; }

Libraries/Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs

@@ -1,12 +1,13 @@
 using System.Text.Json.Serialization;
 using Core.Models.Eft.Common.Request;
+using Core.Models.Enums;
 
 namespace Core.Models.Eft.Hideout;
 
 public record HideoutToggleAreaRequestData : BaseInteractionRequestData
 {
     [JsonPropertyName("areaType")]
-    public int? AreaType { get; set; }
+    public HideoutAreas? AreaType { get; set; }
 
     [JsonPropertyName("enabled")]
     public bool? Enabled { get; set; }

Libraries/Core/Models/Eft/Hideout/QteData.cs

@@ -89,24 +89,24 @@ public record QteEffect
 {
     [JsonPropertyName("type")]
     [JsonConverter(typeof(JsonStringEnumConverter))]
-    public QteRewardType? EffectType { get; set; }
+    public QteRewardType? Type { get; set; }
 
     [JsonPropertyName("skillId")]
     [JsonConverter(typeof(JsonStringEnumConverter))]
-    public SkillTypes? SkillIdentifier { get; set; }
+    public SkillTypes? SkillId { get; set; }
 
     [JsonPropertyName("levelMultipliers")]
     public List<SkillLevelMultiplier>? LevelMultipliers { get; set; }
 
     [JsonPropertyName("time")]
-    public int? DurationInMilliseconds { get; set; }
+    public int? Time { get; set; }
 
     [JsonPropertyName("weight")]
-    public float? EffectWeight { get; set; }
+    public float? Weight { get; set; }
 
     [JsonPropertyName("result")]
     [JsonConverter(typeof(JsonStringEnumConverter))]
-    public QteResultType? ResultType { get; set; }
+    public QteResultType? Result { get; set; }
 }
 
 public record SkillLevelMultiplier

Libraries/Core/Models/Eft/Inventory/AddItemDirectRequest.cs

@@ -9,7 +9,7 @@ public record AddItemDirectRequest
     /// Item and child mods to add to player inventory
     /// </summary>
     [JsonPropertyName("itemWithModsToAdd")]
-    public List<Item>? ItemWithModsToAdd { get; set; }
+    public List<HideoutItem>? ItemWithModsToAdd { get; set; }
 
     [JsonPropertyName("foundInRaid")]
     public bool? FoundInRaid { get; set; }

Libraries/Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs

@@ -164,26 +164,6 @@ public record TraderData
     public bool? Disabled { get; set; }
 }
 
-public record Product
+public record Product : Item
 {
-    [JsonPropertyName("_id")]
-    public string? Id { get; set; }
-
-    /// <summary>
-    /// _tpl
-    /// </summary>
-    [JsonPropertyName("_tpl")]
-    public string? Template { get; set; }
-
-    [JsonPropertyName("parentId")]
-    public string? ParentId { get; set; }
-
-    [JsonPropertyName("slotId")]
-    public string? SlotId { get; set; }
-
-    [JsonPropertyName("location")]
-    public ItemLocation? Location { get; set; }
-
-    [JsonPropertyName("upd")]
-    public Upd? Upd { get; set; }
 }