From 2112b92e240a0e256e69b24b3d24fd5219e8e759 Mon Sep 17 00:00:00 2001
From: Jaysyn904 <68194417+Jaysyn904@users.noreply.github.com>
Date: Tue, 16 Jan 2024 15:50:42 -0500
Subject: [PATCH] Update prc_inc_combmove.nss

Fixed Grappling / Freedom of Movement bug
---
 nwn/nwnprc/trunk/include/prc_inc_combmove.nss | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/nwn/nwnprc/trunk/include/prc_inc_combmove.nss b/nwn/nwnprc/trunk/include/prc_inc_combmove.nss
index c9e7cf5d..9bfafa36 100644
--- a/nwn/nwnprc/trunk/include/prc_inc_combmove.nss
+++ b/nwn/nwnprc/trunk/include/prc_inc_combmove.nss
@@ -1356,10 +1356,21 @@ int DoGrapple(object oPC, object oTarget, int nExtraBonus, int nGenerateAoO = TR
     }
     if(GetHasSpellEffect(SPELL_FREEDOM_OF_MOVEMENT, oTarget))
     {
-        FloatingTextStringOnCreature("You cannot grapple a creature that has Freedom of Movement.", oPC, FALSE);
+        FloatingTextStringOnCreature("You cannot grapple a creature under the effect of Freedom of Movement", oPC, FALSE);
         return FALSE;    
-    }    
-    
+    }
+
+	if (IPGetHasItemPropertyOnCharacter(oTarget, ITEM_PROPERTY_FREEDOM_OF_MOVEMENT))
+	{
+        FloatingTextStringOnCreature("You cannot grapple a creature under the effect of Freedom of Movement.", oPC, FALSE);
+        return FALSE;    
+    }
+	if (GetIsImmune(oTarget, IMMUNITY_TYPE_ENTANGLE))
+	{
+        FloatingTextStringOnCreature("This creature is immune to grappling.", oPC, FALSE);
+        return FALSE;    
+    }	
+	
     object oGlaive = GetItemPossessedBy(oPC, "prc_eldrtch_glv");
     if(GetIsObjectValid(oGlaive))
     	DestroyObject(oGlaive);