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/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; } } } 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/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); } } } 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/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 e6eee9c..0b62489 100644 --- a/QMultiMod/QMultiMod.csproj +++ b/QMultiMod/QMultiMod.csproj @@ -61,8 +61,6 @@ - - @@ -72,13 +70,11 @@ - - @@ -86,7 +82,6 @@ - @@ -97,7 +92,6 @@ - diff --git a/QMultiMod/QMultiModSettings.cs b/QMultiMod/QMultiModSettings.cs index 88b445b..de1addf 100644 --- a/QMultiMod/QMultiModSettings.cs +++ b/QMultiMod/QMultiModSettings.cs @@ -16,10 +16,6 @@ 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; @@ -27,8 +23,6 @@ class QMultiModSettings public float ExosuitGrapplingArmDamage = 0f; 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; @@ -37,8 +31,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; diff --git a/README.md b/README.md index e4cd3a2..b60f2f4 100644 --- a/README.md +++ b/README.md @@ -31,26 +31,21 @@ ExosuitGrapplingArmRange | 70.0 | max range of the grappling hook ExosuitGrapplingArmDamage | 0 | increase this to give the grappling hook damage. a value between 20-50 would be reasonable 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 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 | 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 -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 +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 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