From 83ca08ac879fd25ff8673add31109c3934f5ce4a Mon Sep 17 00:00:00 2001 From: chomp Date: Mon, 15 Apr 2024 10:36:40 +0000 Subject: [PATCH] 381 > 390 (!108) Co-authored-by: Kaeno Co-authored-by: Dev Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Modules/pulls/108 --- project/Aki.Custom/Airdrops/Utils/ItemFactoryUtil.cs | 3 ++- project/Aki.Custom/CustomAI/PmcFoundInRaidEquipment.cs | 3 ++- project/Aki.Custom/Patches/ClampRagdollPatch.cs | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/project/Aki.Custom/Airdrops/Utils/ItemFactoryUtil.cs b/project/Aki.Custom/Airdrops/Utils/ItemFactoryUtil.cs index 1ea01da..031413f 100644 --- a/project/Aki.Custom/Airdrops/Utils/ItemFactoryUtil.cs +++ b/project/Aki.Custom/Airdrops/Utils/ItemFactoryUtil.cs @@ -8,6 +8,7 @@ using Newtonsoft.Json; using System.Collections.Generic; using Aki.Custom.Airdrops.Models; using System.Linq; +using System.Threading.Tasks; namespace Aki.Custom.Airdrops.Utils { @@ -34,7 +35,7 @@ namespace Aki.Custom.Airdrops.Utils } } - public async void AddLoot(LootableContainer container, AirdropLootResultModel lootToAdd) + public async Task AddLoot(LootableContainer container, AirdropLootResultModel lootToAdd) { Item actualItem; foreach (var item in lootToAdd.Loot) diff --git a/project/Aki.Custom/CustomAI/PmcFoundInRaidEquipment.cs b/project/Aki.Custom/CustomAI/PmcFoundInRaidEquipment.cs index cdf7df4..9399460 100644 --- a/project/Aki.Custom/CustomAI/PmcFoundInRaidEquipment.cs +++ b/project/Aki.Custom/CustomAI/PmcFoundInRaidEquipment.cs @@ -16,6 +16,7 @@ namespace Aki.Custom.CustomAI private static readonly string throwableItemId = "543be6564bdc2df4348b4568"; private static readonly string ammoItemId = "5485a8684bdc2da71d8b4567"; private static readonly string weaponId = "5422acb9af1c889c16000029"; + private static readonly string moneyId = "543be5dd4bdc2deb348b4569"; private static readonly string armorPlate = "644120aa86ffbe10ee032b6f"; private static readonly string builtInInserts = "65649eb40bf0ed77b8044453"; private static readonly List nonFiRItems = new List() { magazineId, drugId, mediKitItem, medicalItemId, injectorItemId, throwableItemId, ammoItemId, armorPlate, builtInInserts }; @@ -32,7 +33,7 @@ namespace Aki.Custom.CustomAI private static readonly string knifeId = "5447e1d04bdc2dff2f8b4567"; private static readonly List weaponTypeIds = new List() { pistolId, smgId, assaultRifleId, assaultCarbineId, shotgunId, marksmanRifleId, sniperRifleId, machinegunId, grenadeLauncherId, knifeId }; - private static readonly List nonFiRPocketLoot = new List{ throwableItemId, ammoItemId, magazineId, medicalItemId, mediKitItem, injectorItemId, drugId }; + private static readonly List nonFiRPocketLoot = new List{ moneyId, throwableItemId, ammoItemId, magazineId, medicalItemId, mediKitItem, injectorItemId, drugId }; private readonly ManualLogSource logger; public PmcFoundInRaidEquipment(ManualLogSource logger) diff --git a/project/Aki.Custom/Patches/ClampRagdollPatch.cs b/project/Aki.Custom/Patches/ClampRagdollPatch.cs index 266eb40..2eea7ff 100644 --- a/project/Aki.Custom/Patches/ClampRagdollPatch.cs +++ b/project/Aki.Custom/Patches/ClampRagdollPatch.cs @@ -16,7 +16,7 @@ namespace Aki.Custom.Patches [PatchPrefix] private static void PatchPreFix(ref Vector3 velocity) { - velocity.y = Mathf.Clamp(velocity.y, -1f, 1f); + velocity.y = Mathf.Clamp(velocity.y, -2f, 2f); } } }