More types

Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs

@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace Core.Models.Eft.Trade;
+
+public class ProcessBaseTradeRequestData
+{
+	[JsonPropertyName("Action")]
+	public string Action { get; set; }
+
+	[JsonPropertyName("type")]
+	public string Type { get; set; }
+
+	[JsonPropertyName("tid")]
+	public string TransactionId { get; set; }
+}

Core/Models/Eft/Trade/ProcessBuyTradeRequestData.cs

@@ -0,0 +1,37 @@
+using System.Text.Json.Serialization;
+
+namespace Core.Models.Eft.Trade;
+
+public class ProcessBuyTradeRequestData : ProcessBaseTradeRequestData
+{
+	[JsonPropertyName("Action")]
+	public string Action { get; set; } // TODO: formerly - "buy_from_trader" | "TradingConfirm" | "RestoreHealth" | "SptInsure" | "SptRepair" | ""
+    
+	[JsonPropertyName("type")]
+	public string Type { get; set; }
+    
+	[JsonPropertyName("tid")]
+	public string TId { get; set; }
+    
+	[JsonPropertyName("item_id")]
+	public string ItemId { get; set; }
+    
+	[JsonPropertyName("count")]
+	public int Count { get; set; }
+    
+	[JsonPropertyName("scheme_id")]
+	public int SchemeId { get; set; }
+    
+	[JsonPropertyName("scheme_items")]
+	public List<SchemeItem> SchemeItems { get; set; }
+}
+
+public class SchemeItem
+{
+	/** Id of stack to take money from, is money tpl when Action is `SptInsure` */
+	[JsonPropertyName("id")]
+	public string Id { get; set; }
+    
+	[JsonPropertyName("count")]
+	public int Count { get; set; }
+}

Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs

@@ -0,0 +1,33 @@
+using System.Text.Json.Serialization;
+
+namespace Core.Models.Eft.Trade;
+
+public class ProcessRagfairTradeRequestData
+{
+	[JsonPropertyName("Action")]
+	public string Action { get; set; }
+
+	[JsonPropertyName("offers")]
+	public List<OfferRequest> Offers { get; set; }
+}
+
+public class OfferRequest
+{
+	[JsonPropertyName("id")]
+	public string Id { get; set; }
+
+	[JsonPropertyName("count")]
+	public int Count { get; set; }
+
+	[JsonPropertyName("items")]
+	public List<ItemRequest> Items { get; set; }
+}
+
+public class ItemRequest
+{
+	[JsonPropertyName("id")]
+	public string Id { get; set; }
+
+	[JsonPropertyName("count")]
+	public int Count { get; set; }
+}

Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs

@@ -0,0 +1,33 @@
+using System.Text.Json.Serialization;
+
+namespace Core.Models.Eft.Trade;
+
+public class ProcessSellTradeRequestData : ProcessBaseTradeRequestData
+{
+	[JsonPropertyName("Action")]
+	public string Action { get; set; } = "sell_to_trader";
+    
+	[JsonPropertyName("type")]
+	public string Type { get; set; }
+
+	[JsonPropertyName("tid")]
+	public string Tid { get; set; }
+
+	[JsonPropertyName("price")]
+	public double Price { get; set; }
+
+	[JsonPropertyName("items")]
+	public List<SoldItem> Items { get; set; }
+}
+
+public class SoldItem
+{
+	[JsonPropertyName("id")]
+	public string Id { get; set; }
+    
+	[JsonPropertyName("count")]
+	public int Count { get; set; }
+    
+	[JsonPropertyName("scheme_id")]
+	public int SchemeId { get; set; }
+}

Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs

@@ -0,0 +1,19 @@
+using System.Text.Json.Serialization;
+using Core.Models.Eft.Common.Request;
+
+namespace Core.Models.Eft.Trade;
+
+public class SellScavItemsToFenceRequestData
+{
+	[JsonPropertyName("Action")]
+	public string Action { get; set; } = "SellAllFromSavage";
+    
+	[JsonPropertyName("totalValue")]
+	public double TotalValue { get; set; }
+    
+	[JsonPropertyName("fromOwner")]
+	public OwnerInfo FromOwner { get; set; }
+    
+	[JsonPropertyName("toOwner")]
+	public OwnerInfo ToOwner { get; set; }
+}

Core/Models/Eft/Weather/WeatherData.cs

@@ -0,0 +1,66 @@
+using System.Text.Json.Serialization;
+using Core.Models.Enums;
+
+namespace Core.Models.Eft.Weather;
+
+public class WeatherData
+{
+	[JsonPropertyName("acceleration")]
+	public double Acceleration { get; set; }
+    
+	[JsonPropertyName("time")]
+	public string Time { get; set; }
+    
+	[JsonPropertyName("date")]
+	public string Date { get; set; }
+    
+	[JsonPropertyName("weather")]
+	public Weather Weather { get; set; }
+    
+	[JsonPropertyName("season")]
+	public Season Season { get; set; }
+}
+
+public class Weather
+{
+	[JsonPropertyName("pressure")]
+	public double Pressure { get; set; }
+    
+	[JsonPropertyName("temp")]
+	public double Temperature { get; set; }
+    
+	[JsonPropertyName("fog")]
+	public double Fog { get; set; }
+    
+	[JsonPropertyName("rain_intensity")]
+	public double RainIntensity { get; set; }
+    
+	/** 1 - 3 light rain, 3+ 'rain' */
+	[JsonPropertyName("rain")]
+	public double Rain { get; set; }
+    
+	[JsonPropertyName("wind_gustiness")]
+	public double WindGustiness { get; set; }
+    
+	[JsonPropertyName("wind_direction")]
+	public WindDirection WindDirection { get; set; }
+    
+	[JsonPropertyName("wind_speed")]
+	public double WindSpeed { get; set; }
+    
+	/** < -0.4 = clear day */
+	[JsonPropertyName("cloud")]
+	public double Cloud { get; set; }
+    
+	[JsonPropertyName("time")]
+	public string Time { get; set; }
+    
+	[JsonPropertyName("date")]
+	public string Date { get; set; }
+    
+	[JsonPropertyName("timestamp")]
+	public long Timestamp { get; set; }
+    
+	[JsonPropertyName("sptInRaidTimestamp")]
+	public long SptInRaidTimestamp { get; set; }
+}

Core/Models/Eft/Wishlist/AddToWishlistRequest.cs

@@ -0,0 +1,12 @@
+using System.Text.Json.Serialization;
+
+namespace Core.Models.Eft.Wishlist;
+
+public class AddToWishlistRequest
+{
+	[JsonPropertyName("Action")]
+	public string Action { get; set; }
+    
+	[JsonPropertyName("items")]
+	public Dictionary<string, int> Items { get; set; }
+}

Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs

@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace Core.Models.Eft.Wishlist;
+
+public class ChangeWishlistItemCategoryRequest
+{
+	[JsonPropertyName("Action")]
+	public string Action { get; set; }
+
+	[JsonPropertyName("item")]
+	public string Item { get; set; }
+
+	[JsonPropertyName("category")]
+	public int Category { get; set; }
+}

Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs

@@ -0,0 +1,12 @@
+using System.Text.Json.Serialization;
+
+namespace Core.Models.Eft.Wishlist;
+
+public class RemoveFromWishlistRequest
+{
+	[JsonPropertyName("Action")]
+	public string Action { get; set; }
+
+	[JsonPropertyName("items")]
+	public List<string> Items { get; set; }
+}

Core/Models/Eft/Ws/WsAid.cs

@@ -0,0 +1,9 @@
+using System.Text.Json.Serialization;
+
+namespace Core.Models.Eft.Ws;
+
+public class WsAid : WsNotificationEvent
+{
+	[JsonPropertyName("aid")]
+	public int Aid { get; set; }
+}

Core/Models/Eft/Ws/WsAidNickname.cs

@@ -0,0 +1,12 @@
+using System.Text.Json.Serialization;
+
+namespace Core.Models.Eft.Ws;
+
+public class WsAidNickname : WsNotificationEvent
+{
+	[JsonPropertyName("aid")]
+	public int Aid { get; set; }
+
+	[JsonPropertyName("Nickname")]
+	public string Nickname { get; set; }
+}

Core/Models/Eft/Ws/WsChatMessageReceived.cs

@@ -0,0 +1,16 @@
+using System.Text.Json.Serialization;
+using Core.Models.Eft.Profile;
+
+namespace Core.Models.Eft.Ws;
+
+public class WsChatMessageReceived : WsNotificationEvent
+{
+	[JsonPropertyName("dialogId")]
+	public string DialogId { get; set; }
+
+	[JsonPropertyName("message")]
+	public Message Message { get; set; }
+
+	[JsonPropertyName("profiles")]
+	public List<GroupCharacter>? Profiles { get; set; }
+}

Core/Models/Eft/Ws/WsFriendListAccept.cs

@@ -0,0 +1,9 @@
+using System.Text.Json.Serialization;
+
+namespace Core.Models.Eft.Ws;
+
+public class WsFriendsListAccept : WsNotificationEvent
+{
+	[JsonPropertyName("profile")]
+	public SearchFriendResponse Profile { get; set; }
+}

Core/Models/Eft/Ws/WsGroupId.cs

@@ -0,0 +1,9 @@
+using System.Text.Json.Serialization;
+
+namespace Core.Models.Eft.Ws;
+
+public class WsGroupId : WsNotificationEvent
+{
+	[JsonPropertyName("groupId")]
+	public string GroupId { get; set; }
+}

Core/Models/Eft/Ws/WsGroupMatchInviteAccept.cs

@@ -0,0 +1,5 @@
+namespace Core.Models.Eft.Ws;
+
+public class WsGroupMatchInviteAccept : WsNotificationEvent, IGroupCharacter
+{
+}

Core/Models/Eft/Ws/WsGroupMatchInviteDecline.cs

@@ -0,0 +1,12 @@
+using System.Text.Json.Serialization;
+
+namespace Core.Models.Eft.Ws;
+
+public class WsGroupMatchInviteDecline : WsNotificationEvent
+{
+	[JsonPropertyName("aid")]
+	public int Aid { get; set; }
+    
+	[JsonPropertyName("Nickname")]
+	public string Nickname { get; set; }
+}

Core/Models/Eft/Ws/WsGroupMatchInviteSend.cs

@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace Core.Models.Eft.Ws;
+
+public class WsGroupMatchInviteSend : WsNotificationEvent
+{
+	[JsonPropertyName("requestId")]
+	public string RequestId { get; set; }
+
+	[JsonPropertyName("from")]
+	public int From { get; set; }
+
+	[JsonPropertyName("members")]
+	public List<GroupCharacter> Members { get; set; }
+}

Core/Models/Eft/Ws/WsGroupMatchLeaderChanged.cs

@@ -0,0 +1,9 @@
+using System.Text.Json.Serialization;
+
+namespace Core.Models.Eft.Ws;
+
+public class WsGroupMatchLeaderChanged : WsNotificationEvent
+{
+	[JsonPropertyName("owner")]
+	public int Owner { get; set; }
+}

Core/Models/Eft/Ws/WsGroupMatchRaidReady.cs

@@ -0,0 +1,9 @@
+using System.Text.Json.Serialization;
+
+namespace Core.Models.Eft.Ws;
+
+public class WsGroupMatchRaidReady : WsNotificationEvent
+{
+	[JsonPropertyName("extendedProfile")]
+	public GroupCharacter ExtendedProfile { get; set; }
+}

Core/Models/Eft/Ws/WsGroupMatchRaidSettings.cs

@@ -0,0 +1,9 @@
+using System.Text.Json.Serialization;
+
+namespace Core.Models.Eft.Ws;
+
+public class WsGroupMatchRaidSettings : WsNotificationEvent
+{
+	[JsonPropertyName("raidSettings")]
+	public RaidSettings RaidSettings { get; set; }
+}

Core/Models/Eft/Ws/WsNotificationEvent.cs

@@ -0,0 +1,12 @@
+using System.Text.Json.Serialization;
+
+namespace Core.Models.Eft.Ws;
+
+public class WsNotificationEvent 
+{
+	[JsonPropertyName("type")]
+	public string EventType { get; set; }
+
+	[JsonPropertyName("eventId")]
+	public string? EventIdentifier { get; set; }
+}

Core/Models/Eft/Ws/WsPing.cs

@@ -0,0 +1,6 @@
+namespace Core.Models.Eft.Ws;
+
+public class WsPing : WsNotificationEvent
+{
+	
+}

Core/Models/Eft/Ws/WsRagfairOfferSold.cs

@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace Core.Models.Eft.Ws;
+
+public class WsRagfairOfferSold : WsNotificationEvent
+{
+	[JsonPropertyName("offerId")]
+	public string OfferId { get; set; }
+    
+	[JsonPropertyName("count")]
+	public int Count { get; set; }
+    
+	[JsonPropertyName("handbookId")]
+	public string HandbookId { get; set; }
+}

Core/Models/Eft/Ws/WsUserConfirmed.cs

@@ -0,0 +1,42 @@
+using System.Text.Json.Serialization;
+
+namespace Core.Models.Eft.Ws;
+
+public class WsUserConfirmed : WsNotificationEvent
+{
+	[JsonPropertyName("profileid")]
+	public string ProfileId { get; set; }
+
+	[JsonPropertyName("profileToken")]
+	public string ProfileToken { get; set; }
+
+	[JsonPropertyName("status")]
+	public ProfileStatus Status { get; set; }
+
+	[JsonPropertyName("ip")]
+	public string Ip { get; set; }
+
+	[JsonPropertyName("port")]
+	public int Port { get; set; }
+
+	[JsonPropertyName("sid")]
+	public string Sid { get; set; }
+
+	[JsonPropertyName("version")]
+	public string Version { get; set; }
+
+	[JsonPropertyName("location")]
+	public string Location { get; set; }
+
+	[JsonPropertyName("raidMode")]
+	public RaidMode RaidMode { get; set; }
+
+	[JsonPropertyName("mode")]
+	public string Mode { get; set; }
+
+	[JsonPropertyName("shortId")]
+	public string ShortId { get; set; }
+
+	[JsonPropertyName("additional_info")]
+	public List<object> AdditionalInfo { get; set; } // TODO: Was `any` in the node server.
+}

Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs

@@ -8,5 +8,5 @@ public class GetLocalWeatherResponseData
 	public int Season { get; set; }
 
 	[JsonPropertyName("weather")]
-	public List<Weather> Weather { get; set; }
+	public List<Eft.Weather.Weather> Weather { get; set; }
 }