Merge pull request #12 from seionmoya/main

Update location model
project-fika · Aug 29, 2024 · 6073ff9 · 6073ff9
2 parents 2d6df4f + 952ebe4
commit 6073ff9
Show file tree

Hide file tree

Showing 18 changed files with 426,439 additions and 426,331 deletions.
diff --git a/Fuyu.Platform.Common/Models/EFT/Bots/EBotRole.cs b/Fuyu.Platform.Common/Models/EFT/Bots/EBotRole.cs
@@ -3,51 +3,58 @@ namespace Fuyu.Platform.Common.Models.EFT.Bots
     // Assembly-CSharp.dll: EFT.WildSpawnType
 	public enum EBotRole
 	{
-		marksman,
-		assault,
-		bossTest,
-		bossBully,
-		followerTest,
-		followerBully,
-		bossKilla,
-		bossKojaniy,
-		followerKojaniy,
-		pmcBot,
-		cursedAssault,
-		bossGluhar,
-		followerGluharAssault,
-		followerGluharSecurity,
-		followerGluharScout,
-		followerGluharSnipe,
-		followerSanitar,
-		bossSanitar,
-		test,
-		assaultGroup,
-		sectantWarrior,
-		sectantPriest,
-		bossTagilla,
-		followerTagilla,
-		exUsec,
-		gifter,
-		bossKnight,
-		followerBigPipe,
-		followerBirdEye,
-		bossZryachiy,
-		followerZryachiy,
-		bossBoar = 32,
-		followerBoar,
-		arenaFighter,
-		arenaFighterEvent,
-		bossBoarSniper,
-		crazyAssaultEvent,
-		peacefullZryachiyEvent,
-		sectactPriestEvent,
-		ravangeZryachiyEvent,
-		followerBoarClose1,
-		followerBoarClose2,
-		bossKolontay,
-		followerKolontayAssault,
-		followerKolontaySecurity,
-		shooterBTR
+        marksman,
+        assault,
+        bossTest,
+        bossBully,
+        followerTest,
+        followerBully,
+        bossKilla,
+        bossKojaniy,
+        followerKojaniy,
+        pmcBot,
+        cursedAssault,
+        bossGluhar,
+        followerGluharAssault,
+        followerGluharSecurity,
+        followerGluharScout,
+        followerGluharSnipe,
+        followerSanitar,
+        bossSanitar,
+        test,
+        assaultGroup,
+        sectantWarrior,
+        sectantPriest,
+        bossTagilla,
+        followerTagilla,
+        exUsec,
+        gifter,
+        bossKnight,
+        followerBigPipe,
+        followerBirdEye,
+        bossZryachiy,
+        followerZryachiy,
+        bossBoar = 32,
+        followerBoar,
+        arenaFighter,
+        arenaFighterEvent,
+        bossBoarSniper,
+        crazyAssaultEvent,
+        peacefullZryachiyEvent,
+        sectactPriestEvent,
+        ravangeZryachiyEvent,
+        followerBoarClose1,
+        followerBoarClose2,
+        bossKolontay,
+        followerKolontayAssault,
+        followerKolontaySecurity,
+        shooterBTR,
+        bossPartisan,
+        spiritWinter,
+        spiritSpring,
+        peacemaker,
+        pmcBEAR,
+        pmcUSEC,
+        skier
 	}
 }
diff --git a/Fuyu.Platform.Common/Models/EFT/Locations/AirdropParameters.cs b/Fuyu.Platform.Common/Models/EFT/Locations/AirdropParameters.cs
@@ -0,0 +1,41 @@
+using System.Runtime.Serialization;
+
+namespace Fuyu.Platform.Common.Models.EFT.Locations
+{
+    [DataContract]
+    public struct AirdropParameters
+    {
+        [DataMember]
+        public string id;
+
+        [DataMember]
+        public int PlaneAirdropStartMin;
+
+        [DataMember]
+        public int PlaneAirdropStartMax;
+
+        [DataMember]
+        public int PlaneAirdropEnd;
+
+        [DataMember]
+        public float PlaneAirdropChance;
+
+        [DataMember]
+        public int PlaneAirdropMax;
+
+        [DataMember]
+        public int PlaneAirdropCooldownMin;
+
+        [DataMember]
+        public int PlaneAirdropCooldownMax;
+
+        [DataMember]
+        public int AirdropPointDeactivateDistance;
+
+        [DataMember]
+        public int MinPlayersCountToSpawnAirdrop;
+
+        [DataMember]
+        public int UnsuccessfulTryPenalty;
+    }
+}
diff --git a/Fuyu.Platform.Common/Models/EFT/Locations/Banner.cs b/Fuyu.Platform.Common/Models/EFT/Locations/Banner.cs
@@ -0,0 +1,15 @@
+using System.Runtime.Serialization;
+using Fuyu.Platform.Common.Models.EFT.Common;
+
+namespace Fuyu.Platform.Common.Models.EFT.Locations
+{
+    [DataContract]
+    public struct Banner
+    {
+        [DataMember]
+        public string id;
+
+        [DataMember]
+        public BundleAddress pic;
+    }
+}
diff --git a/Fuyu.Platform.Common/Models/EFT/Locations/BossSpawn.cs b/Fuyu.Platform.Common/Models/EFT/Locations/BossSpawn.cs
@@ -11,6 +11,9 @@ public struct BossSpawn
         [DataMember]
         public int BossChance;
 
+        [DataMember]
+        public string BossZone;
+
         [DataMember]
         public bool BossPlayer;
 
@@ -29,25 +32,29 @@ public struct BossSpawn
         [DataMember]
         public int Time;
 
-        [DataMember]
-        public string TriggerId;
-
-        [DataMember]
-        public string TriggerName;
-
         [DataMember(EmitDefaultValue = false)]
         public BossSupport[] Supports;
 
         [DataMember]
         public bool RandomTimeSpawn;
 
-        [DataMember(EmitDefaultValue = false)]
-        public int Delay;
-
         [DataMember(EmitDefaultValue = false)]
         public bool ForceSpawn;
 
         [DataMember(EmitDefaultValue = false)]
         public bool IgnoreMaxBots;
+
+        [DataMember]
+        public string TriggerName;
+
+        [DataMember]
+        public string TriggerId;
+
+        [DataMember(EmitDefaultValue = false)]
+        public int Delay;
+
+        // NOTE: server-side only
+        [DataMember]
+        public string[] SpawnMode;
     }
 }
diff --git a/Fuyu.Platform.Common/Models/EFT/Locations/BotLocationModifier.cs b/Fuyu.Platform.Common/Models/EFT/Locations/BotLocationModifier.cs
@@ -21,16 +21,16 @@ public struct BotLocationModifier
         public float VisibleDistance;
 
         [DataMember]
-        public float DistToSleep;
+        public float DistToPersueAxemanCoef;
 
         [DataMember]
-        public float DistToActivate;
+        public float DistToSleep;
 
         [DataMember]
-        public float MagnetPower;
+        public float DistToActivate;
 
         [DataMember]
-        public float DistToPersueAxemanCoef;
+        public float MagnetPower;        
 
         [DataMember]
         public float KhorovodChance;

diff --git a/Fuyu.Platform.Common/Models/EFT/Locations/Location.cs b/Fuyu.Platform.Common/Models/EFT/Locations/Location.cs
@@ -81,10 +81,6 @@ public struct Location
         [DataMember]
         public bool IsSecret;
 
-        // TODO: proper type
-        [DataMember]
-        public object[] doors;
-
         [DataMember]
         public int MaxDistToFreePoint;
 
@@ -169,30 +165,6 @@ public struct Location
         [DataMember]
         public long UnixDateTime;
 
-        [DataMember]
-        public int users_gather_seconds;
-
-        [DataMember]
-        public int users_spawn_seconds_n;
-
-        [DataMember]
-        public int users_spawn_seconds_n2;
-
-        [DataMember]
-        public int users_summon_seconds;
-
-        [DataMember]
-        public int sav_summon_seconds;
-
-        [DataMember]
-        public int matching_min_seconds;
-
-        [DataMember]
-        public bool GenerateLocalLootCache;
-
-        [DataMember]
-        public int PlayersRequestCount;
-
         [DataMember]
         public GroupScenario NonWaveGroupScenario;
 
@@ -208,8 +180,9 @@ public struct Location
         [DataMember]
         public MinMaxBot[] MinMaxBots;
 
+        // TODO: update BotLocationModifier type
         [DataMember]
-        public BotLocationModifier BotLocationModifier;
+        public object BotLocationModifier;
 
         [DataMember]
         public Exit[] exits;
@@ -218,24 +191,22 @@ public struct Location
         public bool DisabledForScav;
 
         [DataMember]
-        public SpawnPointParam[] spawnPointParams;
+        public MaxItemCount[] maxItemCountInLocation;
 
-        // TODO: proper type
         [DataMember]
-        public object[] AirdropParameters;
+        public BossSpawn[] BossLocationSpawn;
 
         [DataMember]
-        public MaxItemCount[] maxItemCountInLocation;
+        public SpawnPointParam[] spawnPointParams;
 
         [DataMember]
-        public BossSpawn[] BossLocationSpawn;
+        public AirdropParameters[] AirdropParameters;
 
         [DataMember(EmitDefaultValue = false)]
         public MatchMakerWaitTime[] MatchMakerMinPlayersByWaitTime;
 
-        // TODO: proper type
         [DataMember]
-        public object[] transits;
+        public Transit[] transits;
 
         [DataMember]
         public string Id;
@@ -248,6 +219,6 @@ public struct Location
         public object[] Loot;
 
         [DataMember]
-        public BundleAddress[] Banners;
+        public Banner[] Banners;
     }
 }
diff --git a/Fuyu.Platform.Common/Models/EFT/Locations/SpawnPointParam.cs b/Fuyu.Platform.Common/Models/EFT/Locations/SpawnPointParam.cs
@@ -32,5 +32,8 @@ public struct SpawnPointParam
 
         [DataMember]
         public string BotZoneName;
+
+        [DataMember]
+        public int CorePointId;
     }
 }
diff --git a/Fuyu.Platform.Common/Models/EFT/Locations/Transit.cs b/Fuyu.Platform.Common/Models/EFT/Locations/Transit.cs
@@ -0,0 +1,35 @@
+using System.Runtime.Serialization;
+
+namespace Fuyu.Platform.Common.Models.EFT.Locations
+{
+    [DataContract]
+    public struct Transit
+    {
+        [DataMember]
+        public int id;
+
+        [DataMember]
+        public bool active;
+
+        [DataMember]
+        public string name;
+
+        [DataMember]
+        public string location;
+
+        [DataMember]
+        public string description;
+
+        [DataMember]
+        public int activateAfterSec;
+
+        [DataMember]
+        public string target;
+
+        [DataMember]
+        public int time;
+
+        [DataMember]
+        public string conditions;
+    }
+}
diff --git a/Fuyu.Platform.Common/Models/EFT/Locations/Wave.cs b/Fuyu.Platform.Common/Models/EFT/Locations/Wave.cs
@@ -35,6 +35,8 @@ public struct Wave
         [DataMember]
         public string WildSpawnType;
 
+        // Tracks which waves to send for which game mode
+        // NOTE: server-side only
         [DataMember]
         public string[] SpawnMode;
     }