From dbcc694e529409fb5bc912e5bfc1e0531fb74e95 Mon Sep 17 00:00:00 2001 From: InvalidArgument3 Date: Fri, 6 Sep 2024 19:14:35 -0500 Subject: [PATCH 1/5] add commented out cost multiplier for subgrids (might be useful later) (this feature was actually broken in this version lol) --- .../Data/Scripts/ShipPoints/ShipTracking/GridStats.cs | 5 +++++ .../Data/Scripts/ShipPoints/ShipTracking/ShipTracker.cs | 3 +++ 2 files changed, 8 insertions(+) diff --git a/TLBGridPoints/Data/Scripts/ShipPoints/ShipTracking/GridStats.cs b/TLBGridPoints/Data/Scripts/ShipPoints/ShipTracking/GridStats.cs index 99c7299..26c0c28 100644 --- a/TLBGridPoints/Data/Scripts/ShipPoints/ShipTracking/GridStats.cs +++ b/TLBGridPoints/Data/Scripts/ShipPoints/ShipTracking/GridStats.cs @@ -21,6 +21,7 @@ internal class GridStats // TODO convert this to be event-driven. OnBlockPlace, private WcApi WcApi => AllGridsList.I.WcApi; public bool NeedsUpdate { get; private set; } = true; + public bool IsPrimaryGrid = false; #region Public Methods @@ -313,6 +314,10 @@ private void CalculateCost(IMyCubeBlock block) if (WcApi.HasCoreWeapon((MyEntity)block)) { + // Weapons on subgrids have an extra 20% cost applied (this is disabled) + //if (!IsPrimaryGrid) + // blockPoints = (int)(blockPoints * 1.2f); + var validTargetTypes = new List(); WcApi.GetTurretTargetTypes((MyEntity)block, validTargetTypes); if (validTargetTypes.Contains("Projectiles")) diff --git a/TLBGridPoints/Data/Scripts/ShipPoints/ShipTracking/ShipTracker.cs b/TLBGridPoints/Data/Scripts/ShipPoints/ShipTracking/ShipTracker.cs index ab86a0f..00dffa3 100644 --- a/TLBGridPoints/Data/Scripts/ShipPoints/ShipTracking/ShipTracker.cs +++ b/TLBGridPoints/Data/Scripts/ShipPoints/ShipTracking/ShipTracker.cs @@ -196,7 +196,10 @@ public void Update() // TODO: Update pilots foreach (var gridStat in _gridStats.Values) + { + gridStat.IsPrimaryGrid = gridStat.Grid == Grid; gridStat.Update(); + } bool bufferIsFunctional = IsFunctional; IsFunctional = TotalPower > 0 && TotalTorque > 0 && CockpitCount > 0; From 078bb0492a10bb4659b2b69596e11f18169b235a Mon Sep 17 00:00:00 2001 From: wa la Date: Sat, 7 Sep 2024 20:08:07 +0100 Subject: [PATCH 2/5] fixed sword --- ModernWarfareGuns/Data/Secondary Weapons/Sword.sbc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ModernWarfareGuns/Data/Secondary Weapons/Sword.sbc b/ModernWarfareGuns/Data/Secondary Weapons/Sword.sbc index 2721994..d3b7671 100644 --- a/ModernWarfareGuns/Data/Secondary Weapons/Sword.sbc +++ b/ModernWarfareGuns/Data/Secondary Weapons/Sword.sbc @@ -111,7 +111,7 @@ 30 Models\Magazines\GrenadeCrate.mwm Ammo - 3 + 140 100 From e6d31f095b83f26486d0bde94a6c618dea8f026a Mon Sep 17 00:00:00 2001 From: wa la Date: Mon, 9 Sep 2024 13:04:07 +0100 Subject: [PATCH 3/5] added sound for sword turret --- .../Data/Scripts/BobGuns/otherstuff/DigiSoundFix.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ModernWarfareGuns/Data/Scripts/BobGuns/otherstuff/DigiSoundFix.cs b/ModernWarfareGuns/Data/Scripts/BobGuns/otherstuff/DigiSoundFix.cs index 17e58c8..f4ca019 100644 --- a/ModernWarfareGuns/Data/Scripts/BobGuns/otherstuff/DigiSoundFix.cs +++ b/ModernWarfareGuns/Data/Scripts/BobGuns/otherstuff/DigiSoundFix.cs @@ -14,7 +14,7 @@ namespace bob { - [MyEntityComponentDescriptor(typeof(MyObjectBuilder_LargeMissileTurret), false, "Shotgun", "RB_CompactTurretMissile_Small","Flamer", "Shotgun_Large", "RB_CompactTurretMissile_Small_Large", "Flamer_Large", "Minigun_Large", "Minigun")] + [MyEntityComponentDescriptor(typeof(MyObjectBuilder_LargeMissileTurret), false, "Shotgun", "RB_CompactTurretMissile_Small","Flamer", "Shotgun_Large", "RB_CompactTurretMissile_Small_Large", "Flamer_Large", "Minigun_Large", "Minigun", "SwordLauncher")] public class MissileTurret : MyGameLogicComponent { private IMyFunctionalBlock block; From 837057e3e876678e986f157900f6818c5b247d3c Mon Sep 17 00:00:00 2001 From: wa la Date: Mon, 9 Sep 2024 14:27:15 +0100 Subject: [PATCH 4/5] added wing tips --- .../PlaneParts/CubeBlocks_Plane_parts_A.sbc | 298 ++++++++++++++++++ .../Data/Scripts/ModernWarfareCore/GitGone.cs | 2 +- 2 files changed, 299 insertions(+), 1 deletion(-) diff --git a/ModernWarfareCore/Data/PlaneParts/CubeBlocks_Plane_parts_A.sbc b/ModernWarfareCore/Data/PlaneParts/CubeBlocks_Plane_parts_A.sbc index 0d89fb8..5a8d025 100644 --- a/ModernWarfareCore/Data/PlaneParts/CubeBlocks_Plane_parts_A.sbc +++ b/ModernWarfareCore/Data/PlaneParts/CubeBlocks_Plane_parts_A.sbc @@ -1059,5 +1059,303 @@ 115 + + + + + CubeBlock + aero-wing_tip_A_1x1x1_rounded_half_Small + + Wing_tip_A_1x1x1_rounded_half + Textures\Icons\aero-wing_tip_A_1x1x1_rounded_half.dds + Small + 0.2 + TriangleMesh + + + + + + + +Models\aero-wing_tip_A_1x1x1_rounded_half\aero-wing_tip_A_1x1x1_rounded_half_Small.mwm + + + + + + + + + + +aero-wing_tip_A_1x1x1_rounded_half +Z +None +X + Light + 3 + 1 + + + + + CubeBlock + aero-wing_tip_B_1x1x1_rounded_half_Small + + Wing_tip_B_1x1x1_rounded_half + Textures\Icons\aero-wing_tip_B_1x1x1_rounded_half.dds + false + Small + 0.2 + TriangleMesh + + + + + + + +Models\aero-wing_tip_B_1x1x1_rounded_half\aero-wing_tip_B_1x1x1_rounded_half_Small.mwm + + + + + + + + + +aero-wing_tip_B_1x1x1_rounded_half +Z +None +X + Light + 3 + 1 + + + + + CubeBlock + aero-wing_tip_C_1x1x1_rounded_full_Small + + Wing_tip_C_1x1x1_rounded_full + Textures\Icons\aero-wing_tip_C_1x1x1_rounded_full.dds + false + Small + 0.2 + TriangleMesh + + + + + + + +Models\aero-wing_tip_C_1x1x1_rounded_full\aero-wing_tip_C_1x1x1_rounded_full_Small.mwm + + + + + + + + + +aero-wing_tip_C_1x1x1_rounded_full +Z +None +X + Light + 3 + 1 + + + + + CubeBlock + aero-wing_tip_D_2x1x1_rounded_full_to_edge_Small + + Wing_tip_D_2x1x1_rounded_full_to_edge + Textures\Icons\aero-wing_tip_D_2x1x1_rounded_full_to_edge.dds + Small + 0.2 + TriangleMesh + + + + + + + +Models\aero-wing_tip_D_2x1x1_rounded_full_to_edge\aero-wing_tip_D_2x1x1_rounded_full_to_edge_Small.mwm + + + + + + + + + + +aero-wing_tip_D_2x1x1_rounded_full_to_edge +Z +None +X + Light + 3 + 1 + + + + + CubeBlock + aero-wing_tip_E_2x1x1_rounded_half_to_edge_Small + + Wing_tip_E_2x1x1_rounded_half_ro_edge + Textures\Icons\aero-wing_tip_E_2x1x1_rounded_half_to_edge.dds + false + Small + 0.2 + TriangleMesh + + + + + + + +Models\aero-wing_tip_E_2x1x1_rounded_half_to_edge\aero-wing_tip_E_2x1x1_rounded_half_to_edge_Small.mwm + + + + + + + + + + +aero-wing_tip_E_2x1x1_rounded_half_to_edge +Z +None +X + Light + 3 + 1 + + + + + CubeBlock + aero-wing_tip_F_2x2x1_edge_to_edge_Small + + Wing_tip_F_2x2x1_edge_to_edge + Textures\Icons\aero-wing_tip_F_2x2x1_edge_to_edge.dds + false + Small + 0.2 + TriangleMesh + + + + + + + +Models\aero-wing_tip_F_2x2x1_edge_to_edge\aero-wing_tip_F_2x2x1_edge_to_edge_Small.mwm + + + + + + + +aero-wing_tip_F_2x2x1_edge_to_edge +Z +None +X + Light + 3 + 1 + + + + + CubeBlock + aero-wing_tip_G_05x05x1_rounded_half_Small + + Wing_tip_G_0.5x0.5x1_rounded_half + Textures\Icons\aero-wing_tip_G_05x05x1_rounded_half.dds + false + Small + 0.2 + TriangleMesh + + + + + + + +Models\aero-wing_tip_G_05x05x1_rounded_half\aero-wing_tip_G_05x05x1_rounded_half_Small.mwm + + + + + + + + + +aero-wing_tip_G_05x05x1_rounded_half +Z +None +X + Light + 3 + 1 + + + + + CubeBlock + aero-wing_inside_curved_1x1x1_rounded_Small + + Wing_1x1x1_inside_curved_rounded + Textures\Icons\aero-wing_inside_curved_1x1x1_rounded.dds + Small + 0.2 + TriangleMesh + + + + + + + +Models\aero-wing_inside_curved_1x1x1_rounded\aero-wing_inside_curved_1x1x1_rounded_Small.mwm + + + + + + + + + + + +aero-wing_inside_curved_1x1x1_rounded +Z +None +X + Light + 3 + 1 + + \ No newline at end of file diff --git a/ModernWarfareCore/Data/Scripts/ModernWarfareCore/GitGone.cs b/ModernWarfareCore/Data/Scripts/ModernWarfareCore/GitGone.cs index 0a4deda..152c648 100644 --- a/ModernWarfareCore/Data/Scripts/ModernWarfareCore/GitGone.cs +++ b/ModernWarfareCore/Data/Scripts/ModernWarfareCore/GitGone.cs @@ -90,7 +90,7 @@ public class BlockRemover : MySessionComponentBase "Plane", "plane", ///... plane parts, fuck you. "wing_fill", - "wing_tip", + //"wing_tip", "wing_rigging", }); From 198d45d0611d2873fa6c7219f70870e26bb50588 Mon Sep 17 00:00:00 2001 From: wa la Date: Mon, 9 Sep 2024 15:24:21 +0100 Subject: [PATCH 5/5] added tooltip for wing tips --- .../Data/PlaneParts/CubeBlocks_Plane_parts_A.sbc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ModernWarfareCore/Data/PlaneParts/CubeBlocks_Plane_parts_A.sbc b/ModernWarfareCore/Data/PlaneParts/CubeBlocks_Plane_parts_A.sbc index 5a8d025..2f48147 100644 --- a/ModernWarfareCore/Data/PlaneParts/CubeBlocks_Plane_parts_A.sbc +++ b/ModernWarfareCore/Data/PlaneParts/CubeBlocks_Plane_parts_A.sbc @@ -1068,6 +1068,7 @@ Wing_tip_A_1x1x1_rounded_half Textures\Icons\aero-wing_tip_A_1x1x1_rounded_half.dds + Does not provide lift Small 0.2 TriangleMesh @@ -1105,6 +1106,7 @@ Wing_tip_B_1x1x1_rounded_half Textures\Icons\aero-wing_tip_B_1x1x1_rounded_half.dds + Does not provide lift false Small 0.2 @@ -1142,6 +1144,7 @@ Wing_tip_C_1x1x1_rounded_full Textures\Icons\aero-wing_tip_C_1x1x1_rounded_full.dds + Does not provide lift false Small 0.2 @@ -1179,6 +1182,7 @@ Wing_tip_D_2x1x1_rounded_full_to_edge Textures\Icons\aero-wing_tip_D_2x1x1_rounded_full_to_edge.dds + Does not provide lift Small 0.2 TriangleMesh @@ -1216,6 +1220,7 @@ Wing_tip_E_2x1x1_rounded_half_ro_edge Textures\Icons\aero-wing_tip_E_2x1x1_rounded_half_to_edge.dds + Does not provide lift false Small 0.2 @@ -1254,6 +1259,7 @@ Wing_tip_F_2x2x1_edge_to_edge Textures\Icons\aero-wing_tip_F_2x2x1_edge_to_edge.dds + Does not provide lift false Small 0.2 @@ -1289,6 +1295,7 @@ Wing_tip_G_0.5x0.5x1_rounded_half Textures\Icons\aero-wing_tip_G_05x05x1_rounded_half.dds + Does not provide lift false Small 0.2 @@ -1326,6 +1333,7 @@ Wing_1x1x1_inside_curved_rounded Textures\Icons\aero-wing_inside_curved_1x1x1_rounded.dds + Does not provide lift Small 0.2 TriangleMesh