Merge pull request #95 from seionmoya/update-0.15.5.133420

Update 0.15.5.133420
project-fika · Nov 21, 2024 · b97baa4 · b97baa4
2 parents e1eec24 + ca193dd
commit b97baa4
Show file tree

Hide file tree

Showing 111 changed files with 370 additions and 45,465 deletions.
diff --git a/Fuyu.Backend.BSG/Models/Bots/EBotRole.cs b/Fuyu.Backend.BSG/Models/Bots/EBotRole.cs
@@ -58,6 +58,11 @@ public enum EBotRole
         skier,
         sectantPredvestnik = 57,
         sectantPrizrak,
-        sectantOni
+        sectantOni,
+        infectedAssault,
+        infectedPmc,
+        infectedCivil,
+        infectedLaborant,
+        infectedTagilla
     }
 }
diff --git a/Fuyu.Backend.BSG/Models/Locations/CrowdAttackSpawnParameters.cs b/Fuyu.Backend.BSG/Models/Locations/CrowdAttackSpawnParameters.cs
@@ -0,0 +1,18 @@
+using System.Runtime.Serialization;
+using Fuyu.Backend.BSG.Models.Bots;
+
+namespace Fuyu.Backend.BSG.Models.Locations
+{
+    [DataContract]
+    public class CrowdAttackSpawnParameters
+    {
+        [DataMember]
+        public EBotDifficulty Difficulty;
+
+        [DataMember]
+        public EBotRole Role;
+
+        [DataMember]
+        public int Weight;
+    }
+}
diff --git a/Fuyu.Backend.BSG/Models/Locations/Event.cs b/Fuyu.Backend.BSG/Models/Locations/Event.cs
@@ -0,0 +1,51 @@
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Fuyu.Backend.BSG.Models.Locations
+{
+    [DataContract]
+    public class Event
+    {
+        [DataMember]
+        public int InfectionPercentage;
+
+        [DataMember]
+        public int MinInfectionPercentage;
+
+        [DataMember]
+        public List<CrowdAttackSpawnParameters> CrowdAttackSpawnParams;
+
+        [DataMember]
+        public float ZombieMultiplier;
+
+        [DataMember]
+        public int MaxCrowdAttackSpawnLimit;
+
+        [DataMember]
+        public int CrowdsLimit;
+
+        [DataMember]
+        public float InfectedLookCoeff;
+
+        [DataMember]
+        public float CrowdCooldownPerPlayerSec;
+
+        [DataMember]
+        public float ZombieCallPeriodSec;
+
+        [DataMember]
+        public float ZombieCallDeltaRadius;
+
+        [DataMember]
+        public float ZombieCallRadiusLimit;
+
+        [DataMember]
+        public float CrowdAttackBlockRadius;
+
+        [DataMember]
+        public float MinSpawnDistToPlayer;
+
+        [DataMember]
+        public float TargetPointSearchRadiusLimit;
+    }
+}
diff --git a/Fuyu.Backend.BSG/Models/Locations/Location.cs b/Fuyu.Backend.BSG/Models/Locations/Location.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Runtime.Serialization;
 using Fuyu.Backend.BSG.Models.Common;
 
@@ -220,5 +221,8 @@ public class Location
 
         [DataMember]
         public Banner[] Banners;
+
+        [DataMember]
+        public Dictionary<string, Event> Events;
     }
 }
diff --git a/Fuyu.Backend.BSG/Models/Profiles/Info/BotSettings.cs b/Fuyu.Backend.BSG/Models/Profiles/Info/BotSettings.cs
@@ -23,5 +23,8 @@ public class BotSettings
 
         [DataMember]
         public float AggressorBonus;
+
+        [DataMember(EmitDefaultValue = false)]
+        public bool? UseSimpleAnimator;
     }
 }
diff --git a/Fuyu.Backend.BSG/Models/Profiles/Profile.cs b/Fuyu.Backend.BSG/Models/Profiles/Profile.cs
@@ -55,25 +55,25 @@ public class Profile
         [DataMember]
         public Union<Dictionary<MongoId, EWishlistGroup>, object[]> WishList;
 
-        [DataMember]
+        [DataMember(EmitDefaultValue = false)]
         public NotesInfo Notes;
 
-        [DataMember]
+        [DataMember(EmitDefaultValue = false)]
         public List<QuestInfo> Quests;
 
-        [DataMember]
+        [DataMember(EmitDefaultValue = false)]
         public Dictionary<MongoId, int> Achievements;
 
-        [DataMember]
+        [DataMember(EmitDefaultValue = false)]
         public RagfairInfo RagfairInfo;
 
         [DataMember(EmitDefaultValue = false)]
-        public Union<Dictionary<MongoId, TraderInfo>, object[]> TradersInfo;
+        public Union<Dictionary<MongoId, TraderInfo>, object[]>? TradersInfo;
 
-        [DataMember]
+        [DataMember(EmitDefaultValue = false)]
         public UnlockedInfo UnlockedInfo;
 
-        [DataMember]
+        [DataMember(EmitDefaultValue = false)]
         public MoneyTransferLimitInfo moneyTransferLimitData;
 
         // NOTE: Deserialization works but is deserialized as

diff --git a/Fuyu.Backend.EFT/Controllers/Http/GameVersionValidateController.cs b/Fuyu.Backend.EFT/Controllers/Http/GameVersionValidateController.cs
@@ -1,3 +1,16 @@
+/* TODO: GameVersionValidateRequest
+{
+    "version": {
+        "major": "0.15.5.1.33420",
+        "minor": "live",
+        "game": "live",
+        "backend": "6",
+        "taxonomy": "341"
+    },
+    "develop": true
+}
+*/
+
 using System.Threading.Tasks;
 using Fuyu.Backend.BSG.Models.Responses;
 using Fuyu.Backend.EFT.Networking;

diff --git a/Fuyu.Backend.EFT/Controllers/Http/GlobalsController.cs b/Fuyu.Backend.EFT/Controllers/Http/GlobalsController.cs
@@ -14,7 +14,7 @@ public override Task RunAsync(EftHttpContext context)
             // TODO: generate this
             // --seionmoya, 2024-11-18
             var text = EftOrm.GetGlobals();
-            return context.SendJsonAsync(text);
+            return context.SendJsonAsync(text, true, true);
         }
     }
 }
diff --git a/Fuyu.Backend.EFT/Controllers/Http/LocationsController.cs b/Fuyu.Backend.EFT/Controllers/Http/LocationsController.cs
@@ -15,8 +15,7 @@ public LocationsController() : base("/client/locations")
         public override Task RunAsync(EftHttpContext context)
         {
             var json = EftOrm.GetLocations();
-            var locations = Json.Parse<ResponseBody<WorldMap>>(json);
-            var response = Json.Stringify(locations);
+            var response = Json.Parse<ResponseBody<WorldMap>>(json);
             var text = Json.Stringify(response);
             return context.SendJsonAsync(text, true, true);
         }

diff --git a/Fuyu.Backend.EFT/Controllers/Http/MatchLocalStartController.cs b/Fuyu.Backend.EFT/Controllers/Http/MatchLocalStartController.cs
@@ -16,13 +16,13 @@ public MatchLocalStartController() : base("/client/match/local/start")
             {
                 { "bigmap",         Resx.GetText("eft", "database.locations.bigmap.json")          },
                 { "factory4_day",   Resx.GetText("eft", "database.locations.factory4_day.json")    },
-                { "factory4_night", string.Empty                                                   },
+                { "factory4_night", Resx.GetText("eft", "database.locations.factory4_night.json")  },
                 { "interchange",    Resx.GetText("eft", "database.locations.interchange.json")     },
-                { "laboratory",     string.Empty                                                   },
+                { "laboratory",     Resx.GetText("eft", "database.locations.laboratory.json")      },
                 { "lighthouse",     Resx.GetText("eft", "database.locations.lighthouse.json")      },
                 { "rezervbase",     Resx.GetText("eft", "database.locations.rezervbase.json")      },
                 { "sandbox",        Resx.GetText("eft", "database.locations.sandbox.json")         },
-                { "shorline",       Resx.GetText("eft", "database.locations.shorline.json")        },
+                { "shoreline",      Resx.GetText("eft", "database.locations.shoreline.json")       },
                 { "tarkovstreets",  Resx.GetText("eft", "database.locations.tarkovstreets.json")   },
                 { "woods",          Resx.GetText("eft", "database.locations.woods.json")           }
             };

diff --git a/Fuyu.Backend.EFT/Fuyu.Backend.EFT.csproj b/Fuyu.Backend.EFT/Fuyu.Backend.EFT.csproj
@@ -11,20 +11,47 @@
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Include="embedded/database/bots/marksman.json" />
     <EmbeddedResource Include="embedded/database/bots/assault.json" />
     <EmbeddedResource Include="embedded/database/bots/bossbully.json" />
-    <EmbeddedResource Include="embedded/database/bots/bossknight.json" />
+    <EmbeddedResource Include="embedded/database/bots/followerbully.json" />
+    <EmbeddedResource Include="embedded/database/bots/bosskilla.json" />
+    <EmbeddedResource Include="embedded/database/bots/bosskojaniy.json" />
+    <EmbeddedResource Include="embedded/database/bots/followerkojaniy.json" />
+    <EmbeddedResource Include="embedded/database/bots/pmcbear.json" />
+    <EmbeddedResource Include="embedded/database/bots/pmcbot.json" />
+    <EmbeddedResource Include="embedded/database/bots/pmcusec.json" />
+    <EmbeddedResource Include="embedded/database/bots/bossgluhar.json" />
+    <EmbeddedResource Include="embedded/database/bots/followergluharassault.json" />
+    <EmbeddedResource Include="embedded/database/bots/followergluharsecurity.json" />
+    <EmbeddedResource Include="embedded/database/bots/followergluharscout.json" />
+    <EmbeddedResource Include="embedded/database/bots/followersanitar.json" />
+    <EmbeddedResource Include="embedded/database/bots/sectantwarrior.json" />
+    <EmbeddedResource Include="embedded/database/bots/sectantpriest.json" />
     <EmbeddedResource Include="embedded/database/bots/bosstagilla.json" />
-    <EmbeddedResource Include="embedded/database/bots/bosspartisan.json" />
+    <EmbeddedResource Include="embedded/database/bots/exusec.json" />
+    <EmbeddedResource Include="embedded/database/bots/bossknight.json" />
     <EmbeddedResource Include="embedded/database/bots/followerbigpipe.json" />
     <EmbeddedResource Include="embedded/database/bots/followerbirdeye.json" />
-    <EmbeddedResource Include="embedded/database/bots/followerbully.json" />
-    <EmbeddedResource Include="embedded/database/bots/marksman.json" />
-    <EmbeddedResource Include="embedded/database/bots/sectantoni.json" />
+    <EmbeddedResource Include="embedded/database/bots/bosszryachiy.json" />
+    <EmbeddedResource Include="embedded/database/bots/followerzryachiy.json" />
+    <EmbeddedResource Include="embedded/database/bots/bossboar.json" />
+    <EmbeddedResource Include="embedded/database/bots/followerboar.json" />
+    <EmbeddedResource Include="embedded/database/bots/bossboarsniper.json" />
+    <EmbeddedResource Include="embedded/database/bots/followerboarclose1.json" />
+    <EmbeddedResource Include="embedded/database/bots/followerboarclose2.json" />
+    <EmbeddedResource Include="embedded/database/bots/bosskolontay.json" />
+    <EmbeddedResource Include="embedded/database/bots/followerkolontayassault.json" />
+    <EmbeddedResource Include="embedded/database/bots/followerkolontaysecurity.json" />
+    <EmbeddedResource Include="embedded/database/bots/shooterbtr.json" />
+    <EmbeddedResource Include="embedded/database/bots/bosspartisan.json" />
     <EmbeddedResource Include="embedded/database/bots/sectantpredvestnik.json" />
-    <EmbeddedResource Include="embedded/database/bots/sectantpriest.json" />
     <EmbeddedResource Include="embedded/database/bots/sectantprizrak.json" />
-    <EmbeddedResource Include="embedded/database/bots/sectantwarrior.json" />
+    <EmbeddedResource Include="embedded/database/bots/sectantoni.json" />
+    <EmbeddedResource Include="embedded/database/bots/infectedassault.json" />
+    <EmbeddedResource Include="embedded/database/bots/infectedpmc.json" />
+    <EmbeddedResource Include="embedded/database/bots/infectedcivil.json" />
+    <EmbeddedResource Include="embedded/database/bots/infectedlaborant.json" />
     <EmbeddedResource Include="embedded/database/locales/client.languages.json" />
     <EmbeddedResource Include="embedded/database/locales/client.locale-ch.json" />
     <EmbeddedResource Include="embedded/database/locales/client.locale-cz.json" />
@@ -62,11 +89,13 @@
     <EmbeddedResource Include="embedded/database/locales/client.menu.locale-tu.json" />
     <EmbeddedResource Include="embedded/database/locations/bigmap.json" />
     <EmbeddedResource Include="embedded/database/locations/factory4_day.json" />
+    <EmbeddedResource Include="embedded/database/locations/factory4_night.json" />
     <EmbeddedResource Include="embedded/database/locations/interchange.json" />
+    <EmbeddedResource Include="embedded/database/locations/laboratory.json" />
     <EmbeddedResource Include="embedded/database/locations/lighthouse.json" />
     <EmbeddedResource Include="embedded/database/locations/rezervbase.json" />
     <EmbeddedResource Include="embedded/database/locations/sandbox.json" />
-    <EmbeddedResource Include="embedded/database/locations/shorline.json" />
+    <EmbeddedResource Include="embedded/database/locations/shoreline.json" />
     <EmbeddedResource Include="embedded/database/locations/tarkovstreets.json" />
     <EmbeddedResource Include="embedded/database/locations/woods.json" />
     <EmbeddedResource Include="embedded/database/profiles/player.savage.json" />