Revert "Update JSONs + add new params to interfaces"

This reverts commit 3bf644c0e4b6854bbeb279c9f1e9c5ce17fcceaa.

project/assets/configs/core.json

@@ -1,7 +1,7 @@
 {
-    "akiVersion": "3.7.0",
+    "akiVersion": "3.6.1",
     "projectName": "SPT-AKI",
-    "compatibleTarkovVersion": "0.13.5.25725",
+    "compatibleTarkovVersion": "0.13.1.25206",
     "serverName": "SPT Server",
     "profileSaveIntervalSeconds": 15,
 	"sptFriendNickname": "SPT",

project/assets/database/locations/bigmap/base.json

@@ -73,18 +73,11 @@
         "path": "CONTENT/banners/banner_scavraider.jpg",
         "rcid": ""
       }
-    },
-    {
-      "id": "64c0ad6af99768b777048f4e",
-      "pic": {
-        "path": "CONTENT/banners/banner_emissary.jpg",
-        "rcid": ""
-      }
     }
   ],
   "BossLocationSpawn": [
     {
-      "BossChance": 10,
+      "BossChance": 30,
       "BossDifficult": "normal",
       "BossEscortAmount": "2",
       "BossEscortDifficult": "normal",
@@ -119,20 +112,20 @@
       "Time": -1
     },
     {
-      "BossChance": 10,
+      "BossChance": 35,
       "BossDifficult": "normal",
       "BossEscortAmount": "4",
       "BossEscortDifficult": "normal",
       "BossEscortType": "followerBully",
       "BossName": "bossBully",
       "BossPlayer": false,
-      "BossZone": "ZoneDormitory",
+      "BossZone": "ZoneDormitory,ZoneGasStation",
       "RandomTimeSpawn": false,
       "Supports": null,
       "Time": -1
     },
     {
-      "BossChance": 5,
+      "BossChance": 15,
       "BossDifficult": "normal",
       "BossEscortAmount": "4",
       "BossEscortDifficult": "normal",
@@ -179,14 +172,11 @@
   "BotMaxPlayer": 9,
   "BotMaxTimePlayer": 1000,
   "BotNormal": 50,
-  "BotSpawnCountStep": 4,
-  "BotSpawnPeriodCheck": 15,
   "BotSpawnTimeOffMax": 30,
   "BotSpawnTimeOffMin": 20,
   "BotSpawnTimeOnMax": 320,
   "BotSpawnTimeOnMin": 260,
-  "BotStart": 20,
-  "BotStartPlayer": 210,
+  "BotStart": 120,
   "BotStop": 1500,
   "Description": "Very Big Map",
   "DisabledForScav": false,
@@ -196,7 +186,6 @@
   "EscapeTimeLimit": 40,
   "EscapeTimeLimitCoop": 25,
   "GenerateLocalLootCache": true,
-  "GlobalContainerChanceModifier": 1,
   "GlobalLootChanceModifier": 0.8,
   "IconX": 456,
   "IconY": 443,
@@ -252,12 +241,6 @@
   "MinPlayers": 10,
   "Name": "Customs",
   "NewSpawn": true,
-  "NonWaveGroupScenario": {
-    "Chance": 50,
-    "Enabled": true,
-    "MaxToBeGroup": 3,
-    "MinToBeGroup": 2
-  },
   "OcculsionCullingEnabled": false,
   "OfflineNewSpawn": true,
   "OfflineOldSpawn": false,

project/assets/database/locations/factory4_day/base.json

@@ -59,18 +59,11 @@
         "path": "CONTENT/banners/banner_scavraider.jpg",
         "rcid": ""
       }
-    },
-    {
-      "id": "64c0ad6af99768b777048f4e",
-      "pic": {
-        "path": "CONTENT/banners/banner_emissary.jpg",
-        "rcid": ""
-      }
     }
   ],
   "BossLocationSpawn": [
     {
-      "BossChance": 10,
+      "BossChance": 35,
       "BossDifficult": "normal",
       "BossEscortAmount": "0",
       "BossEscortDifficult": "normal",
@@ -104,14 +97,11 @@
   "BotMaxPlayer": 0,
   "BotMaxTimePlayer": 0,
   "BotNormal": 0,
-  "BotSpawnCountStep": 3,
-  "BotSpawnPeriodCheck": 15,
   "BotSpawnTimeOffMax": 0,
   "BotSpawnTimeOffMin": 0,
   "BotSpawnTimeOnMax": 0,
   "BotSpawnTimeOnMin": 0,
   "BotStart": 0,
-  "BotStartPlayer": 0,
   "BotStop": 0,
   "Description": "The industrial estate and facilities of the chemical plant No.16 that were rented out illegally to the TerraGroup company. ",
   "DisabledForScav": false,
@@ -121,7 +111,6 @@
   "EscapeTimeLimit": 20,
   "EscapeTimeLimitCoop": 15,
   "GenerateLocalLootCache": true,
-  "GlobalContainerChanceModifier": 1,
   "GlobalLootChanceModifier": 0.2,
   "IconX": 318,
   "IconY": 359,
@@ -159,12 +148,6 @@
   "MinPlayers": 5,
   "Name": "Factory",
   "NewSpawn": false,
-  "NonWaveGroupScenario": {
-    "Chance": 50,
-    "Enabled": true,
-    "MaxToBeGroup": 3,
-    "MinToBeGroup": 2
-  },
   "OcculsionCullingEnabled": true,
   "OfflineNewSpawn": false,
   "OfflineOldSpawn": true,
@@ -630,7 +613,8 @@
     {
       "BotZoneName": "",
       "Categories": [
-        "Bot"
+        "Bot",
+        "Boss"
       ],
       "ColliderParams": {
         "_parent": "SpawnSphereParams",
@@ -2694,7 +2678,8 @@
     {
       "BotZoneName": "",
       "Categories": [
-        "Bot"
+        "Bot",
+        "Boss"
       ],
       "ColliderParams": {
         "_parent": "SpawnSphereParams",
@@ -2840,7 +2825,8 @@
     {
       "BotZoneName": "",
       "Categories": [
-        "Bot"
+        "Bot",
+        "Boss"
       ],
       "ColliderParams": {
         "_parent": "SpawnSphereParams",
@@ -3015,7 +3001,8 @@
     {
       "BotZoneName": "",
       "Categories": [
-        "Bot"
+        "Bot",
+        "Boss"
       ],
       "ColliderParams": {
         "_parent": "SpawnSphereParams",
@@ -3582,7 +3569,8 @@
     {
       "BotZoneName": "",
       "Categories": [
-        "Bot"
+        "Bot",
+        "Boss"
       ],
       "ColliderParams": {
         "_parent": "SpawnSphereParams",

project/assets/database/locations/interchange/base.json

@@ -31,18 +31,11 @@
         "path": "CONTENT/banners/banner_scavraider.jpg",
         "rcid": ""
       }
-    },
-    {
-      "id": "64c0acf85174e095610734a0",
-      "pic": {
-        "path": "CONTENT/banners/banner_sherpa.jpg",
-        "rcid": ""
-      }
     }
   ],
   "BossLocationSpawn": [
     {
-      "BossChance": 10,
+      "BossChance": 35,
       "BossDifficult": "normal",
       "BossEscortAmount": "0",
       "BossEscortDifficult": "normal",
@@ -73,14 +66,11 @@
   "BotMaxPlayer": 9,
   "BotMaxTimePlayer": 1000,
   "BotNormal": 50,
-  "BotSpawnCountStep": 4,
-  "BotSpawnPeriodCheck": 15,
   "BotSpawnTimeOffMax": 30,
   "BotSpawnTimeOffMin": 20,
   "BotSpawnTimeOnMax": 320,
   "BotSpawnTimeOnMin": 240,
-  "BotStart": 20,
-  "BotStartPlayer": 200,
+  "BotStart": 120,
   "BotStop": 2400,
   "Description": "The South-Eastern highway interchange is a critical point in the transportation system of the city. Essentially, it is a strategical node connecting the port and harbour infrastructure with the industrial outskirts of Tarkov. ",
   "DisabledForScav": false,
@@ -90,7 +80,6 @@
   "EscapeTimeLimit": 40,
   "EscapeTimeLimitCoop": 30,
   "GenerateLocalLootCache": true,
-  "GlobalContainerChanceModifier": 1,
   "GlobalLootChanceModifier": 0.64,
   "IconX": 506,
   "IconY": 503,
@@ -140,12 +129,6 @@
   "MinPlayers": 10,
   "Name": "Interchange",
   "NewSpawn": true,
-  "NonWaveGroupScenario": {
-    "Chance": 50,
-    "Enabled": true,
-    "MaxToBeGroup": 3,
-    "MinToBeGroup": 2
-  },
   "OcculsionCullingEnabled": true,
   "OfflineNewSpawn": true,
   "OfflineOldSpawn": false,

project/assets/database/locations/lighthouse/base.json

@@ -31,13 +31,6 @@
         "path": "CONTENT/banners/banner_scavraider.jpg",
         "rcid": ""
       }
-    },
-    {
-      "id": "64c0acf85174e095610734a0",
-      "pic": {
-        "path": "CONTENT/banners/banner_sherpa.jpg",
-        "rcid": ""
-      }
     }
   ],
   "BossLocationSpawn": [
@@ -249,14 +242,11 @@
   "BotMaxPlayer": 7,
   "BotMaxTimePlayer": 1000,
   "BotNormal": 50,
-  "BotSpawnCountStep": 3,
-  "BotSpawnPeriodCheck": 15,
   "BotSpawnTimeOffMax": 30,
   "BotSpawnTimeOffMin": 20,
   "BotSpawnTimeOnMax": 320,
   "BotSpawnTimeOnMin": 260,
-  "BotStart": 20,
-  "BotStartPlayer": 250,
+  "BotStart": 200,
   "BotStop": 1900,
   "Description": "The lighthouse at Cape Dalniy used to be an important strategic point of the city. At the outbreak of the conflict, USEC used it as a landing zone, thus attracting the attention of BEAR troops that aimed to reduce the hostile PMC presence to zero. ",
   "DisabledForScav": false,
@@ -266,7 +256,6 @@
   "EscapeTimeLimit": 40,
   "EscapeTimeLimitCoop": 30,
   "GenerateLocalLootCache": true,
-  "GlobalContainerChanceModifier": 1,
   "GlobalLootChanceModifier": 0.17,
   "IconX": 137,
   "IconY": 173,
@@ -316,12 +305,6 @@
   "MinPlayers": 10,
   "Name": "Lighthouse",
   "NewSpawn": true,
-  "NonWaveGroupScenario": {
-    "Chance": 50,
-    "Enabled": true,
-    "MaxToBeGroup": 3,
-    "MinToBeGroup": 2
-  },
   "OcculsionCullingEnabled": false,
   "OfflineNewSpawn": true,
   "OfflineOldSpawn": false,

project/assets/database/locations/rezervbase/base.json

@@ -31,18 +31,11 @@
         "path": "CONTENT/banners/banner_scavraider.jpg",
         "rcid": ""
       }
-    },
-    {
-      "id": "64c0ad6af99768b777048f4e",
-      "pic": {
-        "path": "CONTENT/banners/banner_emissary.jpg",
-        "rcid": ""
-      }
     }
   ],
   "BossLocationSpawn": [
     {
-      "BossChance": 10,
+      "BossChance": 35,
       "BossDifficult": "normal",
       "BossEscortAmount": "0",
       "BossEscortDifficult": "normal",
@@ -159,14 +152,11 @@
   "BotMaxPlayer": 7,
   "BotMaxTimePlayer": 1000,
   "BotNormal": 50,
-  "BotSpawnCountStep": 3,
-  "BotSpawnPeriodCheck": 15,
   "BotSpawnTimeOffMax": 30,
   "BotSpawnTimeOffMin": 20,
   "BotSpawnTimeOnMax": 320,
   "BotSpawnTimeOnMin": 260,
   "BotStart": 20,
-  "BotStartPlayer": 100,
   "BotStop": 1500,
   "Description": "The secret Federal State Reserve Agency base that, according to urban legends, contains enough supplies to last for years: food, medications and other resources, enough to survive an all-out nuclear war.",
   "DisabledForScav": false,
@@ -176,7 +166,6 @@
   "EscapeTimeLimit": 40,
   "EscapeTimeLimitCoop": 30,
   "GenerateLocalLootCache": true,
-  "GlobalContainerChanceModifier": 1,
   "GlobalLootChanceModifier": 0.33,
   "IconX": 156,
   "IconY": 286,
@@ -226,12 +215,6 @@
   "MinPlayers": 10,
   "Name": "ReserveBase",
   "NewSpawn": false,
-  "NonWaveGroupScenario": {
-    "Chance": 50,
-    "Enabled": false,
-    "MaxToBeGroup": 3,
-    "MinToBeGroup": 2
-  },
   "OcculsionCullingEnabled": false,
   "OfflineNewSpawn": false,
   "OfflineOldSpawn": true,

project/assets/database/locations/woods/base.json

@@ -31,18 +31,11 @@
         "path": "CONTENT/banners/banner_scavraider.jpg",
         "rcid": ""
       }
-    },
-    {
-      "id": "64c0ad6af99768b777048f4e",
-      "pic": {
-        "path": "CONTENT/banners/banner_emissary.jpg",
-        "rcid": ""
-      }
     }
   ],
   "BossLocationSpawn": [
     {
-      "BossChance": 10,
+      "BossChance": 35,
       "BossDifficult": "normal",
       "BossEscortAmount": "2",
       "BossEscortDifficult": "normal",
@@ -77,7 +70,7 @@
       "Time": -1
     },
     {
-      "BossChance": 10,
+      "BossChance": 35,
       "BossDifficult": "normal",
       "BossEscortAmount": "2",
       "BossEscortDifficult": "normal",
@@ -90,7 +83,7 @@
       "Time": -1
     },
     {
-      "BossChance": 5,
+      "BossChance": 10,
       "BossDifficult": "normal",
       "BossEscortAmount": "4",
       "BossEscortDifficult": "normal",
@@ -137,14 +130,11 @@
   "BotMaxPlayer": 9,
   "BotMaxTimePlayer": 1000,
   "BotNormal": 50,
-  "BotSpawnCountStep": 4,
-  "BotSpawnPeriodCheck": 15,
   "BotSpawnTimeOffMax": 30,
   "BotSpawnTimeOffMin": 20,
   "BotSpawnTimeOnMax": 320,
   "BotSpawnTimeOnMin": 260,
-  "BotStart": 10,
-  "BotStartPlayer": 200,
+  "BotStart": 70,
   "BotStop": 1900,
   "Description": "The Priozersk Natural Reserve was recently included into the list of state-protected wildlife reserves of the North-Western Federal District.",
   "DisabledForScav": false,
@@ -154,7 +144,6 @@
   "EscapeTimeLimit": 40,
   "EscapeTimeLimitCoop": 30,
   "GenerateLocalLootCache": true,
-  "GlobalContainerChanceModifier": 1,
   "GlobalLootChanceModifier": 0.9,
   "IconX": 252,
   "IconY": 463,
@@ -204,12 +193,6 @@
   "MinPlayers": 10,
   "Name": "Woods",
   "NewSpawn": true,
-  "NonWaveGroupScenario": {
-    "Chance": 50,
-    "Enabled": true,
-    "MaxToBeGroup": 3,
-    "MinToBeGroup": 2
-  },
   "OcculsionCullingEnabled": false,
   "OfflineNewSpawn": true,
   "OfflineOldSpawn": false,

project/src/models/eft/common/IGlobals.ts

@@ -34,7 +34,6 @@ export interface IConfig
     TradingUnlimitedItems: boolean
     MaxLoyaltyLevelForAll: boolean
     GlobalLootChanceModifier: number
-    GraphicSettings: IGraphicSettings
     TimeBeforeDeploy: number
     TimeBeforeDeployLocal: number
     TradingSetting: number,
@@ -85,7 +84,6 @@ export interface IConfig
     SkillExpPerLevel: number
     GameSearchingTimeout: number
     WallContusionAbsorption: Ixyz
-    WeaponFastDrawSettings: IWeaponFastDrawSettings
     SkillsSettings: ISkillsSettings
     AzimuthPanelShowsPlayerOrientation: boolean
     Aiming: IAiming
@@ -98,23 +96,6 @@ export interface IConfig
     RepairSettings: IRepairSettings
 }
 
-export interface IWeaponFastDrawSettings
-{
-    HandShakeCurveFrequency: number
-    HandShakeCurveIntensity: number
-    HandShakeMaxDuration: number
-    HandShakeTremorIntensity: number
-    WeaponFastSwitchMaxSpeedMult: number
-    WeaponFastSwitchMinSpeedMult: number
-    WeaponPistolFastSwitchMaxSpeedMult: number
-    WeaponPistolFastSwitchMinSpeedMult: number
-}
-
-export interface IGraphicSettings
-{
-    ExperimentalFogInCity: boolean
-}
-
 export interface IBufferZone
 {
     CustomerAccessTime: number
@@ -188,11 +169,7 @@ export interface IKill
     expOnDamageAllHealth: number
     longShotDistance: number
     bloodLossToLitre: number
-    botExpOnDamageAllHealth: number
-    botHeadShotMult: number
     victimBotLevelExp: number
-    pmcExpOnDamageAllHealth: number
-    pmcHeadShotMult: number
 }
 
 export interface ICombo 
@@ -943,7 +920,6 @@ export interface IStamina
     OverweightConsumptionByPose: Ixyz
     AimingSpeedMultiplier: number
     WalkVisualEffectMultiplier: number
-    WeaponFastSwitchConsumption: number
     HandsCapacity: number
     HandsRestoration: number
     ProneConsumption: number
@@ -1515,11 +1491,6 @@ export interface IFenceLevel
     ScavAttackSupport: boolean
     ExfiltrationPriceModifier: number
     AvailableExits: number
-    BotApplySilenceChance: number
-    BotGetInCoverChance: number
-    BotHelpChance: number
-    BotSpreadoutChance: number
-    BotStopChance: number
 }
 
 export interface IInertia 

project/src/models/eft/common/ILocationBase.ts

@@ -21,8 +21,6 @@ export interface ILocationBase
     BotMaxPlayer: number
     BotMaxTimePlayer: number
     BotNormal: number
-    BotSpawnCountStep: number
-    BotSpawnPeriodCheck: number
     BotSpawnTimeOffMax: number
     BotSpawnTimeOffMin: number
     BotSpawnTimeOnMax: number
@@ -35,7 +33,6 @@ export interface ILocationBase
     Enabled: boolean
     EnableCoop: boolean
     GlobalLootChanceModifier: number
-    GlobalContainerChanceModifier: number
     IconX: number
     IconY: number
     Id: string
@@ -53,7 +50,6 @@ export interface ILocationBase
     MinPlayers: number
     MaxCoopGroup: number
     Name: string
-    NonWaveGroupScenario: INonWaveGroupScenario
     NewSpawn: boolean
     OcculsionCullingEnabled: boolean
     OldSpawn: boolean
@@ -93,14 +89,6 @@ export interface ILocationBase
     waves: Wave[]
 }
 
-export interface INonWaveGroupScenario
-{
-    Chance: number
-    Enabled: boolean,
-    MaxToBeGroup: number
-    MinToBeGroup: number
-}
-
 export interface ILimit extends MinMax
 {
     items: any[]

project/src/models/eft/common/tables/ITemplateItem.ts

@@ -13,7 +13,6 @@ export interface ITemplateItem
 export interface Props 
 {
     AllowSpawnOnLocations?: any[]
-    BeltMagazineRefreshCount?: number
     ChangePriceCoef?: number
     FixedPrice?: boolean
     SendToClient?: boolean
@@ -88,7 +87,6 @@ export interface Props
     Velocity?: number
     RaidModdable?: boolean
     ToolModdable?: boolean
-    UniqueAnimationModID?: number
     BlocksFolding?: boolean
     BlocksCollapsible?: boolean
     IsAnimated?: boolean
@@ -112,12 +110,10 @@ export interface Props
     Intensity?: number
     Mask?: string
     MaskSize?: number
-    IsMagazineForStationaryWeapon?: boolean
     NoiseIntensity?: number
     NoiseScale?: number
     Color?: IColor
     DiffuseIntensity?: number
-    MagazineWithBelt?: boolean
     HasHinge?: boolean
     RampPalette?: string
     DepthFade?: number
@@ -220,7 +216,6 @@ export interface Props
     MinRepairDegradation?: number
     MaxRepairDegradation?: number
     IronSightRange?: number
-    IsBeltMachineGun?: boolean
     IsFlareGun?: boolean
     IsGrenadeLauncher?: boolean
     IsOneoff?: boolean

project/src/models/eft/hideout/IHideoutArea.ts

@@ -24,7 +24,6 @@ export interface Stage
     autoUpgrade: boolean
     bonuses: StageBonus[]
     constructionTime: number
-    container: string
     description: string
     displayInterface: boolean
     improvements: IStageImprovement[]