Merge pull request #1222 from CombatExtended-Continued/VFETrenches

Add support for VFE Trenches
CombatExtended-Continued · Dec 20, 2021 · 1f09107 · 1f09107
2 parents 962395e + 8c768f5
commit 1f09107
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 4 deletions.
diff --git a/Source/CombatExtended/CombatExtended/CollisionVertical.cs b/Source/CombatExtended/CombatExtended/CollisionVertical.cs
@@ -1,10 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using RimWorld;
 using Verse;
 using UnityEngine;
+using CombatExtended.Compatibility;
 
 namespace CombatExtended
 {
@@ -69,10 +70,12 @@ private static void CalculateHeightRange(Thing thing, out FloatRange heightRange
 
             float collisionHeight = 0f;
             float shotHeightOffset = 0;
+            float heightAdjust = CETrenches.GetHeightAdjust(thing.Position, thing.Map);
+
             var pawn = thing as Pawn;
             if (pawn != null)
             {
-            	collisionHeight = CE_Utility.GetCollisionBodyFactors(pawn).y;
+                collisionHeight = CE_Utility.GetCollisionBodyFactors(pawn).y;
 
                 shotHeightOffset = collisionHeight * (1 - BodyRegionMiddleHeight);
 
@@ -90,7 +93,7 @@ private static void CalculateHeightRange(Thing thing, out FloatRange heightRange
                             Thing cover = curCell.GetCover(map);
                             if (cover != null && cover.def.Fillage == FillCategory.Partial && !cover.IsPlant())
                             {
-                                var coverHeight = new CollisionVertical(cover).Max;
+                                var coverHeight = new CollisionVertical(cover).Max - heightAdjust;
                                 if (coverHeight > crouchHeight) crouchHeight = coverHeight;
                             }
                         }
@@ -112,7 +115,7 @@ private static void CalculateHeightRange(Thing thing, out FloatRange heightRange
                 }
             }
             float fillPercent2 = collisionHeight;
-            heightRange = new FloatRange(Mathf.Min(edificeHeight, edificeHeight + fillPercent2), Mathf.Max(edificeHeight, edificeHeight + fillPercent2));
+            heightRange = new FloatRange(Mathf.Min(edificeHeight, edificeHeight + fillPercent2) + heightAdjust, Mathf.Max(edificeHeight, edificeHeight + fillPercent2) + heightAdjust);
             shotHeight = heightRange.max - shotHeightOffset;
         }
 

diff --git a/Source/CombatExtended/Compatibility/Trenches.cs b/Source/CombatExtended/Compatibility/Trenches.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using CombatExtended.CombatExtended.LoggerUtils;
+using UnityEngine;
+using Verse;
+using VFESecurity;
+
+namespace CombatExtended.Compatibility
+{
+    [StaticConstructorOnStartup]
+    public class CETrenches
+    {
+        private static bool vfeInstalled;
+        private const string VFES_ModName = "Vanilla Furniture Expanded - Security";
+        static CETrenches()
+        {
+            vfeInstalled = ModLister.HasActiveModWithName(VFES_ModName);
+        }
+        public static float GetHeightAdjust(IntVec3 cell, Map map)
+        {
+            if (cell == null || map == null)
+            {
+                return 0;
+            }
+
+            if (vfeInstalled)
+            {
+                List<Thing> thingList = GridsUtility.GetThingList(cell, map);
+                foreach (Thing thing in thingList) 
+                {
+		    CompProperties_TerrainSetter compProperties = thing.def.GetCompProperties<CompProperties_TerrainSetter>();
+                    if (compProperties == null)
+                    {
+                        return 0f;
+                    }
+
+                    TerrainDef terrainDef = compProperties.terrainDef;
+                    TerrainDefExtension terrainDefExtension = TerrainDefExtension.Get(terrainDef);
+                    return -terrainDefExtension.coverEffectiveness * CollisionVertical.WallCollisionHeight;
+
+		}
+	    }
+	    return 0f;
+	}
+    }
+}