From c1e2a919286257757f71c4cecc8147ca65b22241 Mon Sep 17 00:00:00 2001 From: Vlad-00003 Date: Sat, 10 Mar 2018 12:34:18 +0300 Subject: [PATCH 1/7] Small update of the readme so the order of the values be the same as it in the config. --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d06f339..40df310 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,6 @@ ExosuitDrillDamageToLiving | 16.0 | damage done to things you drill ExosuitGrapplingArmRange | 70.0 | max range of the grappling hook GravsphereMaxTrapped | 24 | max number of things a grav sphere can trap GravsphereMaxForce | 30.0 | amount of force applied by the grav sphere -SwimChargeFinsModifier | 0.005 | the amount of charge returned to your handheld tool while swimming PlayerInventoryWidth | 8 | how many squares wide PlayerInventoryHeight | 8 | how many squares tall PlayerDamageTakenMultiplier | 1.0 | a value of 1.0 would mean no change from default. 2.0 would be double. 0.5 would be half @@ -37,17 +36,17 @@ SubDamageTakenMultiplier | 2.0 | ^ StorageContainersStack | true | SeamothReinforcementModuleDepth | 1600.0 | the amount of extra crush depth when the reinforcement mod is turned on SeamothHullMarkOneDepth | 100.0 | the amount of extra crush depth when the Mk1 module is used -SeamothHullMarkTwoDepth | 100.0 | the amount of extra crush depth when the Mk2 module is used -SeamothHullMarkThreeDepth | 100.0 | the amount of extra crush depth when the Mk3 module is used +SeamothHullMarkTwoDepth | 300.0 | the amount of extra crush depth when the Mk2 module is used +SeamothHullMarkThreeDepth | 1500.0 | the amount of extra crush depth when the Mk3 module is used SeamothStorageContainerWidth | 6 | how many squares wide SeamothStorageContainerHeight | 6 | how many squares tall -VehicleForwardForceMultiplier | 1.5 | changes the speed of holding forward in a vehicle -FireExtinguisherHolderRechargeValue | 0.005 | set to 0 to disable recharging the fuel when placed in a holder CyclopsThermalReactorEfficiency | 2.0 | subnautica's default value is 1.5 CyclopsTurningTorqueMultiplier | 1.5 | set to 1.0 for vanilla CyclopsForwardAccelMultiplier | 1.5 | CyclopsVerticalAccelMultiplier | 1.0 | SwimToMeatVelocity | 8.0 | how quickly the creature swims towards something it can eat, that isn't the player +VehicleForwardForceMultiplier | 1.5 | changes the speed of holding forward in a vehicle +VendingMachineAlsoGivesCoffee | true | will be removed because a lightswitch mod is being released soon ScannerSpeedNormalInterval | 14.0 | the default interval in seconds for locating a new blip ScannerSpeedMinimumInterval | 1.0 | sets the fastest rate that your scanner can run at, after other adjustments ScannerSpeedIntervalPerModule | 3.0 | each speed module added removes 3.0 seconds from the interval @@ -58,4 +57,6 @@ ScannerCameraRange | 1000.0 | the distance where the camera begins to get noise/ NitrogenEnabled | false | nitrogen is a default mechanic in the game, depricated but still available UnlockHullPlates | false | if you would like access to the promotional hull plates, set to true AllowAchievementsWithConsole | false | if you want to still unlock steam achievements after using console commands, set to true -VendingMachineAlsoGivesCoffee | true | will be removed because a lightswitch mod is being released soon +SwimChargeFinsModifier | 0.005 | the amount of charge returned to your handheld tool while swimming +FireExtinguisherHolderRechargeValue | 0.005 | set to 0 to disable recharging the fuel when placed in a holder + From 277099a4f707199f3c386ead13537f40475b657f Mon Sep 17 00:00:00 2001 From: Vlad-00003 Date: Fri, 16 Mar 2018 23:19:09 +0300 Subject: [PATCH 2/7] Removed storage size controll, as now there is a "CustomizedStorage" mod wich does this and even more - https://www.nexusmods.com/subnautica/mods/35 --- .../Exosuit_UpdateStorageSize_Patch.cs | 22 ------------- QMultiMod/Patches/Inventory_Awake_Patch.cs | 31 ------------------- .../SeamothStorageContainer_Init_Patch.cs | 14 --------- QMultiMod/QMultiMod.csproj | 3 -- QMultiMod/QMultiModSettings.cs | 8 ----- 5 files changed, 78 deletions(-) delete mode 100644 QMultiMod/Patches/Exosuit_UpdateStorageSize_Patch.cs delete mode 100644 QMultiMod/Patches/Inventory_Awake_Patch.cs delete mode 100644 QMultiMod/Patches/SeamothStorageContainer_Init_Patch.cs diff --git a/QMultiMod/Patches/Exosuit_UpdateStorageSize_Patch.cs b/QMultiMod/Patches/Exosuit_UpdateStorageSize_Patch.cs deleted file mode 100644 index 1c92dff..0000000 --- a/QMultiMod/Patches/Exosuit_UpdateStorageSize_Patch.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Harmony; - -namespace QMultiMod.Patches -{ - [HarmonyPatch(typeof(Exosuit))] - [HarmonyPatch("UpdateStorageSize")] - class Exosuit_UpdateStorageSize_Patch - { - public static bool Prefix(Exosuit __instance) - { - int width = QMultiModSettings.Instance.ExosuitStorageWidth; - int height = QMultiModSettings.Instance.ExosuitStorageHeight; - int numStorageModules = __instance.modules.GetCount(TechType.VehicleStorageModule); - - width += numStorageModules * QMultiModSettings.Instance.ExosuitWidthPerStorageModule; - height += numStorageModules * QMultiModSettings.Instance.ExosuitHeightPerStorageModule; - - __instance.storageContainer.Resize(width, height); - return false; - } - } -} diff --git a/QMultiMod/Patches/Inventory_Awake_Patch.cs b/QMultiMod/Patches/Inventory_Awake_Patch.cs deleted file mode 100644 index c84f35b..0000000 --- a/QMultiMod/Patches/Inventory_Awake_Patch.cs +++ /dev/null @@ -1,31 +0,0 @@ -using Harmony; -using System.Collections.Generic; -using System.Reflection.Emit; - -namespace QMultiMod.Patches -{ - [HarmonyPatch(typeof(Inventory))] - [HarmonyPatch("Awake")] - class Inventory_Awake_Patch - { - public static IEnumerable Transpiler(IEnumerable instructions) - { - foreach (var instruction in instructions) - { - if (instruction.opcode.Equals(OpCodes.Ldc_I4_6)) - { - yield return new CodeInstruction(OpCodes.Ldc_I4, QMultiModSettings.Instance.PlayerInventoryWidth); - continue; - } - - if (instruction.opcode.Equals(OpCodes.Ldc_I4_8)) - { - yield return new CodeInstruction(OpCodes.Ldc_I4, QMultiModSettings.Instance.PlayerInventoryHeight); - continue; - } - - yield return instruction; - } - } - } -} diff --git a/QMultiMod/Patches/SeamothStorageContainer_Init_Patch.cs b/QMultiMod/Patches/SeamothStorageContainer_Init_Patch.cs deleted file mode 100644 index cf91308..0000000 --- a/QMultiMod/Patches/SeamothStorageContainer_Init_Patch.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Harmony; - -namespace QMultiMod.Patches -{ - [HarmonyPatch(typeof(SeamothStorageContainer))] - [HarmonyPatch("Init")] - class SeamothStorageContainer_Init_Patch - { - public static void Postfix(SeamothStorageContainer __instance) - { - __instance.container.Resize(QMultiModSettings.Instance.SeamothStorageContainerWidth, QMultiModSettings.Instance.SeamothStorageContainerHeight); - } - } -} diff --git a/QMultiMod/QMultiMod.csproj b/QMultiMod/QMultiMod.csproj index d4585c5..06a9714 100644 --- a/QMultiMod/QMultiMod.csproj +++ b/QMultiMod/QMultiMod.csproj @@ -71,12 +71,10 @@ - - @@ -84,7 +82,6 @@ - diff --git a/QMultiMod/QMultiModSettings.cs b/QMultiMod/QMultiModSettings.cs index 0128608..9c757a4 100644 --- a/QMultiMod/QMultiModSettings.cs +++ b/QMultiMod/QMultiModSettings.cs @@ -15,18 +15,12 @@ class QMultiModSettings public int MinDrillableAmount = 2; public int MaxDrillableAmount = 5; public float DrillableSpawnChanceMultiplier = 2f; - public int ExosuitStorageWidth = 6; - public int ExosuitStorageHeight = 4; - public int ExosuitWidthPerStorageModule = 0; - public int ExosuitHeightPerStorageModule = 1; public float ExosuitThrustConsumption = 0.04f; public float ExosuitClawDamageToLiving = 100f; public float ExosuitDrillDamageToLiving = 16f; public float ExosuitGrapplingArmRange = 70f; public int GravsphereMaxTrapped = 24; public float GravsphereMaxForce = 30f; - public int PlayerInventoryWidth = 8; - public int PlayerInventoryHeight = 8; public float PlayerDamageTakenMultiplier = 1f; public float VehicleDamageTakenMultiplier = 2f; public float SubDamageTakenMultiplier = 2f; @@ -35,8 +29,6 @@ class QMultiModSettings public float SeamothHullMarkOneDepth = 100f; public float SeamothHullMarkTwoDepth = 300f; public float SeamothHullMarkThreeDepth = 1500f; - public int SeamothStorageContainerWidth = 6; - public int SeamothStorageContainerHeight = 6; public float CyclopsThermalReactorEfficiency = 2.0f; public float CyclopsTurningTorqueMultiplier = 1.5f; public float CyclopsForwardAccelMultiplier = 1.5f; From 5d6a556a802f3181e0fcaee7d67b4fde68021f1b Mon Sep 17 00:00:00 2001 From: Vlad-00003 Date: Fri, 16 Mar 2018 23:20:09 +0300 Subject: [PATCH 3/7] Removed the lightswitch code, as now there is a "Base Light Switch" mod, that does this way better with a fancy base buildable - https://www.nexusmods.com/subnautica/mods/46 --- .../CoffeeVendingMachine_OnHover_Patch.cs | 16 -------- ...CoffeeVendingMachine_OnMachineUse_Patch.cs | 39 ------------------- .../Patches/VendingMaching_OnUse_Patch.cs | 22 ----------- QMultiMod/QMultiMod.csproj | 3 -- QMultiMod/QMultiModSettings.cs | 1 - 5 files changed, 81 deletions(-) delete mode 100644 QMultiMod/Patches/CoffeeVendingMachine_OnHover_Patch.cs delete mode 100644 QMultiMod/Patches/CoffeeVendingMachine_OnMachineUse_Patch.cs delete mode 100644 QMultiMod/Patches/VendingMaching_OnUse_Patch.cs diff --git a/QMultiMod/Patches/CoffeeVendingMachine_OnHover_Patch.cs b/QMultiMod/Patches/CoffeeVendingMachine_OnHover_Patch.cs deleted file mode 100644 index 8a4f919..0000000 --- a/QMultiMod/Patches/CoffeeVendingMachine_OnHover_Patch.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Harmony; - -namespace QMultiMod.Patches -{ - [HarmonyPatch(typeof(CoffeeVendingMachine))] - [HarmonyPatch("OnHover")] - class CoffeeVendingMachine_OnHover_Patch - { - public static bool Prefix(CoffeeVendingMachine __instance) - { - HandReticle.main.SetInteractText("Toggle lights"); - HandReticle.main.SetIcon(HandReticle.IconType.Interact, 1f); - return false; - } - } -} diff --git a/QMultiMod/Patches/CoffeeVendingMachine_OnMachineUse_Patch.cs b/QMultiMod/Patches/CoffeeVendingMachine_OnMachineUse_Patch.cs deleted file mode 100644 index b0fc980..0000000 --- a/QMultiMod/Patches/CoffeeVendingMachine_OnMachineUse_Patch.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Reflection; -using Harmony; - -namespace QMultiMod.Patches -{ - [HarmonyPatch(typeof(CoffeeVendingMachine))] - [HarmonyPatch("OnMachineUse")] - class CoffeeVendingMachine_OnMachineUse_Patch - { - private static readonly FieldInfo _powerRelay = - typeof(CoffeeVendingMachine).GetField("powerRelay",BindingFlags.NonPublic | BindingFlags.Instance); - - private static readonly FieldInfo _enableElectonicsTime = - typeof(PowerRelay).GetField("enableElectonicsTime",BindingFlags.NonPublic | BindingFlags.Instance); - - public static bool Prefix(CoffeeVendingMachine __instance) - { - BasePowerRelay powerRelay = (BasePowerRelay)_powerRelay.GetValue(__instance); - - if (powerRelay != null) - { - PowerSystem.Status powerStatus = powerRelay.GetPowerStatus(); - - switch (powerStatus) - { - case PowerSystem.Status.Offline: - _enableElectonicsTime.SetValue(powerRelay, 1f); - break; - case PowerSystem.Status.Normal: - powerRelay.DisableElectronicsForTime(9999999f); - break; - } - } - - return false; - } - } -} diff --git a/QMultiMod/Patches/VendingMaching_OnUse_Patch.cs b/QMultiMod/Patches/VendingMaching_OnUse_Patch.cs deleted file mode 100644 index f2e6b13..0000000 --- a/QMultiMod/Patches/VendingMaching_OnUse_Patch.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Harmony; -using System.Reflection; - -namespace QMultiMod.Patches -{ - [HarmonyPatch(typeof(VendingMachine))] - [HarmonyPatch("OnUse")] - class VendingMaching_OnUse_Patch - { - private static readonly MethodInfo CanBeUsed = typeof(VendingMachine).GetMethod("GetCanBeUsed", BindingFlags.NonPublic | BindingFlags.Instance); - - public static void Prefix(VendingMachine __instance) - { - if (QMultiModSettings.Instance.VendingMachineAlsoGivesCoffee) - { - var canBeUsed = (bool)CanBeUsed.Invoke(__instance, null); - if (canBeUsed) - CraftData.AddToInventory(TechType.Coffee, 1, false, false); - } - } - } -} diff --git a/QMultiMod/QMultiMod.csproj b/QMultiMod/QMultiMod.csproj index 06a9714..fdf1449 100644 --- a/QMultiMod/QMultiMod.csproj +++ b/QMultiMod/QMultiMod.csproj @@ -61,8 +61,6 @@ - - @@ -92,7 +90,6 @@ - diff --git a/QMultiMod/QMultiModSettings.cs b/QMultiMod/QMultiModSettings.cs index 9c757a4..a3802e5 100644 --- a/QMultiMod/QMultiModSettings.cs +++ b/QMultiMod/QMultiModSettings.cs @@ -35,7 +35,6 @@ class QMultiModSettings public float CyclopsVerticalAccelMultiplier = 1.0f; public float SwimToMeatVelocity = 8f; public float VehicleForwardForceMultiplier = 1.5f; - public bool VendingMachineAlsoGivesCoffee = true; public float ScannerSpeedNormalInterval = 14f; public float ScannerSpeedMinimumInterval = 1f; public float ScannerSpeedIntervalPerModule = 3f; From abea85e08e9001460de094f3063d37a47d717824 Mon Sep 17 00:00:00 2001 From: Vlad-00003 Date: Fri, 16 Mar 2018 23:20:29 +0300 Subject: [PATCH 4/7] Simplified the code of the function. --- QMultiMod/Patches/DevConsole_HasUsedConsole_Patch.cs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/QMultiMod/Patches/DevConsole_HasUsedConsole_Patch.cs b/QMultiMod/Patches/DevConsole_HasUsedConsole_Patch.cs index 71d2349..cc817bb 100644 --- a/QMultiMod/Patches/DevConsole_HasUsedConsole_Patch.cs +++ b/QMultiMod/Patches/DevConsole_HasUsedConsole_Patch.cs @@ -8,13 +8,8 @@ class DevConsole_HasUsedConsole_Patch { public static bool Prefix(ref bool __result) { - if (QMultiModSettings.Instance.AllowAchievementsWithConsole) - { - __result = false; - return false; - } - - return true; + __result = !QMultiModSettings.Instance.AllowAchievementsWithConsole; + return __result; } } } From f83e92d0d4015730386bfeedbfb178df17f1f4ea Mon Sep 17 00:00:00 2001 From: Vlad-00003 Date: Fri, 16 Mar 2018 23:29:14 +0300 Subject: [PATCH 5/7] Readme update so it would indicates the latest changes made in the mod --- README.md | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 554aac5..6044fe7 100644 --- a/README.md +++ b/README.md @@ -18,28 +18,20 @@ TechlightUpdateInterval | 20.0 | ^ for techlight MinDrillableAmount | 2 | each time the deposit breaks down, you will get at least this much MaxDrillableAmount | 5 | each time the deposit breaks down, you will get at most this much DrillableSpawnChanceMultiplier | 2.0 | 2.0% chance to get loot while drilling, breaks the deposit faster -ExosuitStorageWidth | 6 | how many squares wide -ExosuitStorageHeight | 4 | how many squares tall -ExosuitWidthPerStorageModule | 0 | how many extra squares wide per storage module -ExosuitHeightPerStorageModule | 1 | how many extra squares wide per storage module ExosuitThrustConsumption | 0.04 | amount of thrust consumed while thrusting ExosuitClawDamageToLiving | 100.0 | damage done to things you punch ExosuitDrillDamageToLiving | 16.0 | damage done to things you drill ExosuitGrapplingArmRange | 70.0 | max range of the grappling hook GravsphereMaxTrapped | 24 | max number of things a grav sphere can trap GravsphereMaxForce | 30.0 | amount of force applied by the grav sphere -PlayerInventoryWidth | 8 | how many squares wide -PlayerInventoryHeight | 8 | how many squares tall PlayerDamageTakenMultiplier | 1.0 | a value of 1.0 would mean no change from default. 2.0 would be double. 0.5 would be half VehicleDamageTakenMultiplier | 2.0 | ^ SubDamageTakenMultiplier | 2.0 | ^ -StorageContainersStack | true | +StorageContainersStack | true | Allow you to pickup the Waterproof Locker and Carry-all bag even then they are full SeamothReinforcementModuleDepth | 1600.0 | the amount of extra crush depth when the reinforcement mod is turned on SeamothHullMarkOneDepth | 100.0 | the amount of extra crush depth when the Mk1 module is used SeamothHullMarkTwoDepth | 300.0 | the amount of extra crush depth when the Mk2 module is used SeamothHullMarkThreeDepth | 1500.0 | the amount of extra crush depth when the Mk3 module is used -SeamothStorageContainerWidth | 6 | how many squares wide -SeamothStorageContainerHeight | 6 | how many squares tall CyclopsThermalReactorEfficiency | 2.0 | subnautica's default value is 1.5 CyclopsTurningTorqueMultiplier | 1.5 | set to 1.0 for vanilla CyclopsForwardAccelMultiplier | 1.5 | @@ -58,5 +50,5 @@ NitrogenEnabled | false | nitrogen is a default mechanic in the game, depricated UnlockHullPlates | false | if you would like access to the promotional hull plates, set to true AllowAchievementsWithConsole | false | if you want to still unlock steam achievements after using console commands, set to true SwimChargeFinsModifier | 0.005 | the amount of charge returned to your handheld tool while swimming -FireExtinguisherHolderRechargeValue | 0.005 | set to 0 to disable recharging the fuel when placed in a holder +FireExtinguisherHolderRechargeValue | 0 | this value, then set hier then 0 indicates how much fuel per second Fire Extinguisher would get while in the Cyclop's holder From 59746c0912b37a181db11a5688b9b2f594cea2a6 Mon Sep 17 00:00:00 2001 From: Vlad-00003 Date: Thu, 22 Mar 2018 00:53:23 +0300 Subject: [PATCH 6/7] Once again - removed unused code. --- .../CoffeeVendingMachine_OnHover_Patch.cs | 16 -------- ...CoffeeVendingMachine_OnMachineUse_Patch.cs | 38 ------------------- .../Patches/VendingMaching_OnUse_Patch.cs | 22 ----------- QMultiMod/QMultiMod.csproj | 1 - 4 files changed, 77 deletions(-) delete mode 100644 QMultiMod/Patches/CoffeeVendingMachine_OnHover_Patch.cs delete mode 100644 QMultiMod/Patches/CoffeeVendingMachine_OnMachineUse_Patch.cs delete mode 100644 QMultiMod/Patches/VendingMaching_OnUse_Patch.cs diff --git a/QMultiMod/Patches/CoffeeVendingMachine_OnHover_Patch.cs b/QMultiMod/Patches/CoffeeVendingMachine_OnHover_Patch.cs deleted file mode 100644 index f728e23..0000000 --- a/QMultiMod/Patches/CoffeeVendingMachine_OnHover_Patch.cs +++ /dev/null @@ -1,16 +0,0 @@ -//using Harmony; - -//namespace QMultiMod.Patches -//{ -// [HarmonyPatch(typeof(CoffeeVendingMachine))] -// [HarmonyPatch("OnHover")] -// class CoffeeVendingMachine_OnHover_Patch -// { -// public static bool Prefix(CoffeeVendingMachine __instance) -// { -// HandReticle.main.SetInteractText("Toggle lights"); -// HandReticle.main.SetIcon(HandReticle.IconType.Interact, 1f); -// return false; -// } -// } -//} diff --git a/QMultiMod/Patches/CoffeeVendingMachine_OnMachineUse_Patch.cs b/QMultiMod/Patches/CoffeeVendingMachine_OnMachineUse_Patch.cs deleted file mode 100644 index 14ff8bd..0000000 --- a/QMultiMod/Patches/CoffeeVendingMachine_OnMachineUse_Patch.cs +++ /dev/null @@ -1,38 +0,0 @@ -//using System.Reflection; -//using Harmony; - -//namespace QMultiMod.Patches -//{ -// [HarmonyPatch(typeof(CoffeeVendingMachine))] -// [HarmonyPatch("OnMachineUse")] -// class CoffeeVendingMachine_OnMachineUse_Patch -// { -// private static readonly FieldInfo _powerRelay = -// typeof(CoffeeVendingMachine).GetField("powerRelay",BindingFlags.NonPublic | BindingFlags.Instance); - -// private static readonly FieldInfo _enableElectonicsTime = -// typeof(PowerRelay).GetField("enableElectonicsTime",BindingFlags.NonPublic | BindingFlags.Instance); - -// public static bool Prefix(CoffeeVendingMachine __instance) -// { -// BasePowerRelay powerRelay = (BasePowerRelay)_powerRelay.GetValue(__instance); - -// if (powerRelay != null) -// { -// PowerSystem.Status powerStatus = powerRelay.GetPowerStatus(); - -// switch (powerStatus) -// { -// case PowerSystem.Status.Offline: -// _enableElectonicsTime.SetValue(powerRelay, 1f); -// break; -// case PowerSystem.Status.Normal: -// powerRelay.DisableElectronicsForTime(9999999f); -// break; -// } -// } - -// return false; -// } -// } -//} diff --git a/QMultiMod/Patches/VendingMaching_OnUse_Patch.cs b/QMultiMod/Patches/VendingMaching_OnUse_Patch.cs deleted file mode 100644 index efda5b0..0000000 --- a/QMultiMod/Patches/VendingMaching_OnUse_Patch.cs +++ /dev/null @@ -1,22 +0,0 @@ -//using Harmony; -//using System.Reflection; - -//namespace QMultiMod.Patches -//{ -// [HarmonyPatch(typeof(VendingMachine))] -// [HarmonyPatch("OnUse")] -// class VendingMaching_OnUse_Patch -// { -// private static readonly MethodInfo CanBeUsed = typeof(VendingMachine).GetMethod("GetCanBeUsed", BindingFlags.NonPublic | BindingFlags.Instance); - -// public static void Prefix(VendingMachine __instance) -// { -// if (QMultiModSettings.Instance.VendingMachineAlsoGivesCoffee) -// { -// var canBeUsed = (bool)CanBeUsed.Invoke(__instance, null); -// if (canBeUsed) -// CraftData.AddToInventory(TechType.Coffee, 1, false, false); -// } -// } -// } -//} diff --git a/QMultiMod/QMultiMod.csproj b/QMultiMod/QMultiMod.csproj index b74402a..0b62489 100644 --- a/QMultiMod/QMultiMod.csproj +++ b/QMultiMod/QMultiMod.csproj @@ -70,7 +70,6 @@ - From fad229e861ee0d91672443a82e8c9b7db4041fa5 Mon Sep 17 00:00:00 2001 From: Vlad-00003 Date: Thu, 22 Mar 2018 01:09:01 +0300 Subject: [PATCH 7/7] Change damage type.ExosuitGrapplingArm has constants damage, wich is 5f by default, and damageType, wich is set to DamageType.Collide. Both seems to be unused anyway... --- QMultiMod/Patches/GrapplingHook_OnCollisionEnter_Patch.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QMultiMod/Patches/GrapplingHook_OnCollisionEnter_Patch.cs b/QMultiMod/Patches/GrapplingHook_OnCollisionEnter_Patch.cs index d9eb97d..95c564b 100644 --- a/QMultiMod/Patches/GrapplingHook_OnCollisionEnter_Patch.cs +++ b/QMultiMod/Patches/GrapplingHook_OnCollisionEnter_Patch.cs @@ -22,7 +22,7 @@ public static void Postfix(GrapplingHook __instance, Collision collisionInfo) return; if (QMultiModSettings.Instance.ExosuitGrapplingArmDamage != 0f) // to avoid potential event triggers - mixin.TakeDamage(QMultiModSettings.Instance.ExosuitGrapplingArmDamage, creature.transform.position, DamageType.Normal, null); + mixin.TakeDamage(QMultiModSettings.Instance.ExosuitGrapplingArmDamage, creature.transform.position, DamageType.Collide, null); } } }