NPCs should not unfake while moving... or shoot their friends even after they go unconscious... also first attempts at new unfaking animation

README.md

@@ -34,13 +34,16 @@ It is, however, not compatbile with:
 
 MUST BE DONE BEFORE RELEASE:
 
+- Spinal injuries
 - NPCs should not unfake when moved around
-- Actual specific reactions to being on fire / falling / lots of pain
+- Fire / falling / pain reaction (more rapid flailing)
+- NPCs should not unfake if being grabbed
 
 Stuff to do:
 
 - Facial expressions
 - Generally improve stumbling (foot stepping)
+- Stop NPCs from dropping their guns (that's not a good thing to do)
 
 Post release ideas:
 

lua/autorun/client/zcnpci_menu.lua

@@ -1,8 +1,23 @@
+local function PopulateAISBXToolMenu(pnl)
+    pnl:CheckBox("Allow NPCs to target downed NPCs", "zcnpci_npc_targeting_enabled")
+    pnl:ControlHelp("If enabled, NPCs target downed hostile NPCs.")
+
+    pnl:CheckBox("NPCs should target head", "zcnpci_target_should_follow_head")
+    pnl:ControlHelp("Should NPCs target the player's head? This can result in more effective targeting.")
+
+    pnl:CheckBox("NPCs shouldn't target unconscious NPCs", "zcnpci_no_unconscious_targeting")
+
+    pnl:CheckBox("NPCs shouldn't target unconscious players", "zcnpci_no_unconscious_targeting_players")
+    pnl:ControlHelp("This may or may not work.")
+end
+
 local function PopulateCustomNPCSBXToolMenu(pnl)
     local modded_npc_whitelist = CreateConVar("zcnpci_modded_npc_whitelist", "NPC-classes-here!", bit.bor(FCVAR_ARCHIVE, FCVAR_REPLICATED))
 
     pnl:Help("ZCNPCi has support for both modded NPCs, as well as base-game humanoid NPCs that Z-City never added. There is no guarantee that modded NPCs will work, but ones with similar skeletal structure to other base-game humanoid NPCs will generally work better.")
     
+    pnl:Help("As long as the NPC has a compatible skeleton, support will be provided for modded NPCs on a best-effort basis.")
+    
     pnl:CheckBox("Allow base-game extended NPCs", "zcnpci_allow_extended_base_npcs")
     pnl:ControlHelp("Enable or disables applying custom health system to most other base-game humanoid NPCs, such as Kleiner.")
 
@@ -25,7 +40,7 @@ local function PopulateCustomNPCSBXToolMenu(pnl)
 
     pnl:AddItem(text)
     
-    pnl:Help("One NPC class per line. No spaces or other characters. Can only be set by a superadmin or server operator.")
+    pnl:Help("A list of NPC classes, seperated by spaces or line breaks. Can only be set by a superadmin or server operator.")
 end
 
 local function PopulateRagdollSBXToolMenu(pnl)
@@ -125,6 +140,11 @@ if engine.ActiveGamemode() == "sandbox" then
             PopulateRagdollSBXToolMenu(pnl)
         end)
         
+        spawnmenu.AddToolMenuOption("Utilities", "zcnpci", "AISettings", "AI", "", "", function(pnl)
+            pnl:ClearControls()
+            PopulateAISBXToolMenu(pnl)
+        end)
+        
         spawnmenu.AddToolMenuOption("Utilities", "zcnpci", "MainSettings", "Main", "", "", function(pnl)
             pnl:ClearControls()
             PopulateMainSBXToolMenu(pnl)

lua/entities/npc_ragdoll_target.lua

@@ -6,18 +6,25 @@ ENT.AutomaticFrameAdvance = true
 
 local debug_show_ragdoll_targets        = CreateConVar("zcnpci_debug_show_ragdoll_targets", 0, bit.bor(FCVAR_ARCHIVE, FCVAR_REPLICATED))
 
+local should_follow_head                = CreateConVar("zcnpci_target_should_follow_head", 0, bit.bor(FCVAR_ARCHIVE, FCVAR_REPLICATED))
+local stop_targeting_when_unconscious   = CreateConVar("zcnpci_no_unconscious_targeting", 1, bit.bor(FCVAR_ARCHIVE, FCVAR_REPLICATED))
+
+local vector_offset_to_shoot_at     = Vector(0, 0, 8)
+
 local function UpdateRelationship(ent, me)
-    if !IsValid(ent) or !ent:IsNPC() then return end
+    if !IsValid(ent) or !ent:IsNPC() or (ent:GetClass() == "npc_ragdoll_target") then return end
 
     if ent:Disposition(me.dummy_entity) == D_HT then
+        print("Ragdoll target of class "..me.ragdoll_to_follow.class_in_previous_life.." is hated by a "..ent:GetClass())
         ent:AddEntityRelationship(me, D_HT, -1)
+    else
+        ent:AddEntityRelationship(me, D_NU, -1)
     end
 end
 
 local function RemoveRelationship(ent, me)
-    if !IsValid(ent) or !ent:IsNPC() then return end
+    if !IsValid(ent) or !ent:IsNPC() or (ent:GetClass() == "npc_ragdoll_target") then return end
 
-    if ent:Disposition(me.dummy_entity) == D_HT then
     ent:AddEntityRelationship(me, D_NU, -1)
     ent:ClearEnemyMemory(me)
 
@@ -25,18 +32,25 @@ local function RemoveRelationship(ent, me)
         ent:SetEnemy(nil)
         ent:ClearSchedule()
     end
-    end
+end
+
+function ENT:Classify()
+    return CLASS_NONE
 end
 
 function ENT:Initialize()
     if SERVER then
         self:SetModel("models/maxofs2d/hover_basic.mdl")
-        self:SetCollisionGroup(COLLISION_GROUP_DEBRIS)
+        self:SetCollisionGroup(COLLISION_GROUP_NONE)
         self:SetHullType(HULL_TINY_CENTERED)
         self:SetNoDraw(!debug_show_ragdoll_targets:GetBool())
+        
         self.dummy_entity = ents.Create(self.ragdoll_to_follow.class_in_previous_life)
         self.last_stop_targeting = nil
 
+        -- Have to use this collision group otherwise ragdoll will obstruct visibility of target
+        self.ragdoll_to_follow:SetCollisionGroup(COLLISION_GROUP_DEBRIS)
+
         hook.Add("OnEntityCreated", "zcnpci-"..self:GetCreationID(), function(new_entity)
             if !IsValid(new_entity) or !new_entity:IsNPC() then return end
 
@@ -50,20 +64,27 @@ end
 function ENT:Think()
     if SERVER then
         local ragdoll = self.ragdoll_to_follow
-        if !IsValid(ragdoll) then return end
+        if !IsValid(ragdoll) then self:Remove(); return end
 
+        if should_follow_head:GetBool() then
+            local head = ragdoll:GetPhysicsObjectNum(ragdoll:TranslateBoneToPhysBone(ragdoll:LookupBone("ValveBiped.Bip01_Head1")))
+            self:SetPos(head:GetPos() + vector_offset_to_shoot_at)
+        else
             self:SetPos(ragdoll:GetPos())
+        end
 
         self:SetNoDraw(!debug_show_ragdoll_targets:GetBool())
 
         if !ragdoll.organism then return true end
 
-        local should_stop_targeting = (
+        if !ragdoll.organism.alive then self:Remove(); return end
+
+        local should_stop_targeting = !stop_targeting_when_unconscious:GetBool() or (
             (ragdoll.organism.consciousness <= 0.4) or 
             (ragdoll.organism.critical)
         )
 
-        if should_stop_targeting != self.last_stop_targeting then
+        if true or (should_stop_targeting != self.last_stop_targeting) then
             self.last_stop_targeting = should_stop_targeting
 
             if should_stop_targeting then 

lua/entities/npc_ragdoll_unfaker.lua

@@ -0,0 +1,147 @@
+AddCSLuaFile()
+
+ENT.Type = "anim"
+ENT.Base = "base_anim"
+ENT.AutomaticFrameAdvance = true 
+
+
+
+local bones_to_animate = {
+    "ValveBiped.Bip01_Pelvis",
+    "ValveBiped.Bip01_Spine2",
+    "ValveBiped.Bip01_Head1",
+    "ValveBiped.Bip01_R_Thigh",
+    "ValveBiped.Bip01_L_Thigh",
+    "ValveBiped.Bip01_L_Calf",
+    "ValveBiped.Bip01_R_Calf",
+    "ValveBiped.Bip01_R_Foot",
+    "ValveBiped.Bip01_L_Foot",
+    "ValveBiped.Bip01_R_Upperarm",
+    "ValveBiped.Bip01_L_Upperarm",
+    "ValveBiped.Bip01_R_Forearm",
+    "ValveBiped.Bip01_L_Forearm",
+    "ValveBiped.Bip01_R_Hand",
+    "ValveBiped.Bip01_L_Hand",
+}
+
+function ENT:Initialize()
+    if SERVER then
+        print("I AM SERVERSIDE")
+        self:SetModel("models/dav0r/hoverball.mdl")
+    end
+
+    if CLIENT then
+        print("I AM CLIENTSIDE")
+        timer.Simple(0.2, function()
+            
+        end)
+    end
+end
+
+function ENT:Draw()
+    if CLIENT then
+        local old_ragdoll = self:GetNWEntity("parent")
+        local old_npc = self:GetNWEntity("parent_npc")
+        if IsValid(old_ragdoll) and IsValid(old_npc) then
+            if !self.ready_to_unfake then
+                self:SetModel(old_ragdoll:GetModel())
+
+                self.bone_list = {}
+                self.bone_list_end = {}
+                
+                self:SetupBones()
+
+                local i = 0
+                while i < self:GetBoneCount() do
+                    local name = self:GetBoneName(i)
+                    if name == "__INVALIDBONE__" then 
+                        i = i + 1
+                        continue
+                    end
+
+                    table.insert(bones_to_animate, name)
+
+                    
+                    local matrix = Matrix()
+                    
+                    local position, angle = old_ragdoll:GetBonePosition(i)
+                    if position == old_ragdoll:GetPos() then
+                        get_matrix = old_ragdoll:GetBoneMatrix(i)
+                        if get_matrix then
+                            position = get_matrix:GetTranslation()
+                        end
+                    end
+                    matrix:Translate(position)
+                    matrix:Rotate(angle)
+
+                    self.bone_list[name] = matrix
+
+                    local matrix = Matrix()
+
+                    local position, angle = old_npc:GetBonePosition(i)
+                    if position == old_npc:GetPos() then
+                        get_matrix = old_npc:GetBoneMatrix(i)
+                        if get_matrix then
+                            position = get_matrix:GetTranslation()
+                        end
+                    end
+                    matrix:Translate(position)
+                    matrix:Rotate(angle)
+                    
+
+                    self.bone_list_end[name] = matrix
+
+                    i = i + 1
+                end
+
+                PrintTable(bones_to_animate)
+
+                --[[for i,name in pairs(bones_to_animate) do
+                    local bone_index = old_ragdoll:LookupBone(name)
+                    if bone_index == nil then continue end
+                    
+                    self.bone_list[name] = Matrix(old_ragdoll:GetBoneMatrix(bone_index))
+                end]]
+
+                print("BONES:"..self:GetBoneCount())
+
+                self.ready_to_unfake = true
+            end
+
+            self:SetPos(old_ragdoll:GetPos())
+
+            self:SetupBones()
+
+            for name,matrix in pairs(self.bone_list) do
+                local bone_index = self:LookupBone(name)
+                if bone_index == -1 then 
+                    print(name.." does not exist, skipping...")
+                    continue
+                end
+
+
+                --print(name)
+                --local bone_matrix = old_ragdoll:GetBoneMatrix(bone_index)
+
+                if matrix:GetTranslation():DistToSqr(self:GetPos()) == 1 then continue end
+
+                self:SetBoneMatrix(bone_index, matrix)
+            end
+        end
+    end
+
+    self:DrawModel()
+end
+
+function ENT:Think()
+
+    return true
+end
+
+function ENT:OnRemove()
+    if CLIENT then
+        --[[if self.anim_ragdoll then
+            self.anim_ragdoll:Remove()
+        end]]
+    end
+end

lua/entities/v1.old

@@ -0,0 +1,92 @@
+AddCSLuaFile()
+
+ENT.Type = "anim"
+ENT.Base = "base_anim"
+ENT.AutomaticFrameAdvance = true 
+
+local bones_to_animate = {
+    "ValveBiped.Bip01_Pelvis",
+    "ValveBiped.Bip01_Spine2",
+    "ValveBiped.Bip01_Head1",
+    "ValveBiped.Bip01_R_Thigh",
+    "ValveBiped.Bip01_L_Thigh",
+    "ValveBiped.Bip01_L_Calf",
+    "ValveBiped.Bip01_R_Calf",
+    "ValveBiped.Bip01_R_Foot",
+    "ValveBiped.Bip01_L_Foot",
+    "ValveBiped.Bip01_R_Upperarm",
+    "ValveBiped.Bip01_L_Upperarm",
+    "ValveBiped.Bip01_R_Forearm",
+    "ValveBiped.Bip01_L_Forearm",
+    "ValveBiped.Bip01_R_Hand",
+    "ValveBiped.Bip01_L_Hand",
+}
+
+function ENT:Initialize()
+    if SERVER then
+        print("I AM SERVERSIDE")
+        self:SetModel("models/dav0r/hoverball.mdl")
+    end
+
+    if CLIENT then
+        print("I AM CLIENTSIDE")
+        timer.Simple(0.2, function()
+            
+        end)
+    end
+end
+
+function ENT:Draw()
+    if CLIENT then
+        local old_ragdoll = self:GetNWEntity("parent")
+        if IsValid(old_ragdoll) then
+            if !self.ready_to_unfake then
+                self:SetModel(old_ragdoll:GetModel())
+
+                self.bone_list = {}
+
+                self:SetupBones()
+
+                for i,name in pairs(bones_to_animate) do
+                    local bone_index = old_ragdoll:LookupBone(name)
+                    
+                    self.bone_list[name] = old_ragdoll:GetBoneMatrix(bone_index)
+                end
+
+                print("BONES:"..self:GetBoneCount())
+
+                self.ready_to_unfake = true
+            end
+
+            self:SetPos(old_ragdoll:GetPos())
+
+            for name,matrix in pairs(self.bone_list) do
+                local bone_index = self:LookupBone(name)
+                if bone_index == -1 then 
+                    print(name.." does not exist, skipping...")
+                    continue
+                end
+
+                print(name)
+                --local bone_matrix = old_ragdoll:GetBoneMatrix(bone_index)
+
+                self:SetBoneMatrix(bone_index, matrix)
+            end
+        end
+    end
+
+    self:DrawModel()
+end
+
+function ENT:Think()
+
+    return true
+end
+
+function ENT:OnRemove()
+    if CLIENT then
+        if self.anim_ragdoll then
+            self.anim_ragdoll:Remove()
+        end
+    end
+end

lua/entities/v2.old

@@ -0,0 +1,99 @@
+AddCSLuaFile()
+
+ENT.Type = "anim"
+ENT.Base = "base_anim"
+ENT.AutomaticFrameAdvance = true 
+
+local bones_to_animate = {
+    "ValveBiped.Bip01_Pelvis",
+    "ValveBiped.Bip01_Spine2",
+    "ValveBiped.Bip01_Head1",
+    "ValveBiped.Bip01_R_Thigh",
+    "ValveBiped.Bip01_L_Thigh",
+    "ValveBiped.Bip01_L_Calf",
+    "ValveBiped.Bip01_R_Calf",
+    "ValveBiped.Bip01_R_Foot",
+    "ValveBiped.Bip01_L_Foot",
+    "ValveBiped.Bip01_R_Upperarm",
+    "ValveBiped.Bip01_L_Upperarm",
+    "ValveBiped.Bip01_R_Forearm",
+    "ValveBiped.Bip01_L_Forearm",
+    "ValveBiped.Bip01_R_Hand",
+    "ValveBiped.Bip01_L_Hand",
+}
+
+function ENT:Initialize()
+    if SERVER then
+        print("I AM SERVERSIDE")
+        self:SetModel("models/dav0r/hoverball.mdl")
+    end
+
+    if CLIENT then
+        print("I AM CLIENTSIDE")
+        timer.Simple(0.2, function()
+            
+        end)
+    end
+end
+
+function ENT:Draw()
+    if CLIENT then
+        local old_ragdoll = self:GetNWEntity("parent")
+        if IsValid(old_ragdoll) then
+            if !self.ready_to_unfake then
+                self:SetModel(old_ragdoll:GetModel())
+
+                self.bone_list = {}
+                self.bone_original_positions = {}
+
+                self:SetupBones()
+
+                for i,name in pairs(bones_to_animate) do
+                    local bone_index = old_ragdoll:LookupBone(name)
+                    
+                    self.bone_list[name] = old_ragdoll:GetBoneMatrix(bone_index)
+                    self.bone_original_positions[name] = self:GetBoneMatrix(bone_index)
+                end
+
+                print("BONES:"..self:GetBoneCount())
+
+                self.ready_to_unfake = true
+            end
+
+            self:SetPos(old_ragdoll:GetPos())
+
+            for name,matrix in pairs(self.bone_list) do
+                local bone_index = self:LookupBone(name)
+                if bone_index == -1 then 
+                    print(name.." does not exist, skipping...")
+                    continue
+                end
+
+                print(name)
+                --local bone_matrix = old_ragdoll:GetBoneMatrix(bone_index)
+
+                local original_position = self.bone_original_positions[name]:GetTranslation()
+                local goal_position = matrix:GetTranslation() 
+
+                print((original_position - goal_position))
+
+                self:ManipulateBonePosition(bone_index, Vector(0, 0, 16))
+            end
+        end
+    end
+
+    self:DrawModel()
+end
+
+function ENT:Think()
+
+    return true
+end
+
+function ENT:OnRemove()
+    if CLIENT then
+        if self.anim_ragdoll then
+            self.anim_ragdoll:Remove()
+        end
+    end
+end

lua/entities/v3.old

@@ -0,0 +1,94 @@
+AddCSLuaFile()
+
+ENT.Type = "anim"
+ENT.Base = "base_anim"
+ENT.AutomaticFrameAdvance = true 
+
+local bones_to_animate = {
+    "ValveBiped.Bip01_Pelvis",
+    "ValveBiped.Bip01_Spine2",
+    "ValveBiped.Bip01_Head1",
+    "ValveBiped.Bip01_R_Thigh",
+    "ValveBiped.Bip01_L_Thigh",
+    "ValveBiped.Bip01_L_Calf",
+    "ValveBiped.Bip01_R_Calf",
+    "ValveBiped.Bip01_R_Foot",
+    "ValveBiped.Bip01_L_Foot",
+    "ValveBiped.Bip01_R_Upperarm",
+    "ValveBiped.Bip01_L_Upperarm",
+    "ValveBiped.Bip01_R_Forearm",
+    "ValveBiped.Bip01_L_Forearm",
+    "ValveBiped.Bip01_R_Hand",
+    "ValveBiped.Bip01_L_Hand",
+}
+
+function ENT:Initialize()
+    if SERVER then
+        print("I AM SERVERSIDE")
+        self:SetModel("models/dav0r/hoverball.mdl")
+    end
+
+    if CLIENT then
+        print("I AM CLIENTSIDE")
+        timer.Simple(0.2, function()
+            
+        end)
+    end
+end
+
+function ENT:Draw()
+    if CLIENT then
+        local old_ragdoll = self:GetNWEntity("parent")
+        if IsValid(old_ragdoll) then
+            if !self.ready_to_unfake then
+                self.ragdoll = ClientsideModel(old_ragdoll:GetModel())
+                self.ragdoll:SetModel(old_ragdoll:GetModel())
+
+                self.bone_list = {}
+
+                self.ragdoll:SetupBones()
+
+                for i,name in pairs(bones_to_animate) do
+                    local bone_index = old_ragdoll:LookupBone(name)
+                    
+                    self.bone_list[name] = old_ragdoll:GetBoneMatrix(bone_index)
+                end
+
+                print("BONES:"..self.ragdoll:GetBoneCount())
+
+                self.ready_to_unfake = true
+            end
+
+            self.ragdoll:SetPos(old_ragdoll:GetPos())
+
+            for name,matrix in pairs(self.bone_list) do
+                local bone_index = self.ragdoll:LookupBone(name)
+                if bone_index == -1 then 
+                    print(name.." does not exist, skipping...")
+                    continue
+                end
+
+                print(name)
+                --local bone_matrix = old_ragdoll:GetBoneMatrix(bone_index)
+
+                self.ragdoll:SetBoneMatrix(bone_index, matrix)
+            end
+        end
+    end
+
+    self:DrawModel()
+    self.ragdoll:DrawModel()
+end
+
+function ENT:Think()
+
+    return true
+end
+
+function ENT:OnRemove()
+    if CLIENT then
+        if self.anim_ragdoll then
+            self.anim_ragdoll:Remove()
+        end
+    end
+end

lua/zcnpci.lua

@@ -128,14 +128,16 @@ hook.Add("CreateEntityRagdoll", "zcnpci", function(ent, ragdoll)
 	end
 
 	if ent.npcfakeknockback then
+		if dmgpos and (phys_bone != -1) then
+			local phys = ragdoll:GetPhysicsObjectNum(phys_bone)
+			phys:SetVelocity(ent.npcfakeknockback)
+		else
 			ragdoll:GetPhysicsObject():SetVelocity(ent.npcfakeknockback)
 		end
+	end
 
 	local velocity = ragdoll:GetPhysicsObject():GetVelocity()
 
-	print(velocity)
-	print(max_clamp)
-
 	-- For some reason, citizen types such as rebels, medics, refugees, etc. use a keyvalue.
 	-- That keyvalue does not transfer over to the ragdoll, despite it looking like the NPC,
 	-- and you have to manually save it to the ragdoll to be able to make it work.
@@ -163,7 +165,6 @@ hook.Add("HomigradDamage", "zcnpci", function(ent, dmginfo)
 		if dmginfo:IsDamageType(DMG_BULLET + DMG_BUCKSHOT + DMG_BLAST + DMG_CLUB + DMG_SLASH + DMG_GENERIC) then
 			-- Reset ragdoll get up timer -- don't want someone getting up mid-curbstomp
 			ent.StartDie = CurTime()
-			print("I'M HIT FOR "..dmginfo:GetDamage())
 		end
 
 		return 
@@ -176,20 +177,18 @@ hook.Add("HomigradDamage", "zcnpci", function(ent, dmginfo)
 		if dmginfo:GetDamage() > 3 then
 			table.insert(npcs_to_fake, ent)
 			
-			local attacker_angle = dmginfo:GetAttacker():EyeAngles()
+			--local attacker_angle = dmginfo:GetAttacker():EyeAngles()
 
-			local normal = attacker_angle:Forward(normal)
+			--local normal = attacker_angle:Forward(normal)
 
-			ent.npcfakeknockback = normal * dmginfo:GetDamage() * 0
+			--ent.npcfakeknockback = normal * 7 * 3
 		end
 	elseif dmginfo:IsDamageType(DMG_CLUB + DMG_SLASH) then
 		local attacker = dmginfo:GetAttacker()
 		if !IsValid(attacker) then return end
 
 		local fists = attacker:HasWeapon("weapon_hands_sh")
-		if !fists then fists = dmginfo:GetAttacker():HasWeapon("weapon_hg_coolhands") end
+		if !fists then fists = attacker:HasWeapon("weapon_hg_coolhands") end
-
-		local attacker = dmginfo:GetAttacker()
 
 		-- Kicks should knock NPCs down
 		if IsValid(dmginfo:GetInflictor()) and fists and attacker.InLegKick and ((attacker.InLegKick + 0.1) > CurTime()) then 
@@ -200,6 +199,8 @@ hook.Add("HomigradDamage", "zcnpci", function(ent, dmginfo)
 			local normal = attacker_angle:Forward(normal)
 			
 			ent.npcfakeknockback = normal * dmginfo:GetDamage() * 135
+
+			last_dmgpos[ent] = nil
 		end
 	end
 end)

lua/zcnpci/modules/falling_legs.lua

@@ -100,6 +100,9 @@ local minimum_down_time = CreateConVar("zcnpci_down_time", "5", {FCVAR_ARCHIVE,
 local can_unfake = CreateConVar("zcnpci_unfake_enabled", "1", {FCVAR_ARCHIVE, FCVAR_REPLICATED}, "Whether an NPC can unfake")
 local unfake_time = CreateConVar("zcnpci_unfake_time", "1.5", {FCVAR_ARCHIVE, FCVAR_REPLICATED}, "Time it takes for an NPC to unfake")
 
+-- Targeting
+local npc_targeting_enabled = CreateConVar("zcnpci_npc_targeting_enabled", "1", {FCVAR_ARCHIVE, FCVAR_REPLICATED}, "Should NPCs target downed NPCs")
+
 --[[-------------------------------------------------------------------------
     Tug function
     Applies a random impulse to one of the leg bones.
@@ -195,6 +198,7 @@ function MODULE:Init()
     self.StopProcessing = false
     self.LastThink = CurTime()
     self.LastFakeUpCheck = CurTime()
+    self.LastPosCheck = target:GetPos()
 
     self.bullseye = ents.Create("npc_ragdoll_target")
     self.bullseye:SetPos(target:GetPos())
@@ -233,7 +237,6 @@ function MODULE:Think()
     local phys = target:GetPhysicsObject()
 
     if target.FakeUp then
-        print("fucking it")
         local parent = self.FakeParent
         if !IsValid(parent) then return end
 
@@ -294,6 +297,8 @@ end
     Physics Simulation Hook (FIXED)
 ---------------------------------------------------------------------------]]
 function MODULE:PhysicsSimulate(phys, dt)
+    if !SERVER then return end
+    
     local cur_time = CurTime()
     local target = self:GetTarget()
     if not IsValid(target) then self:Remove(); self.bullseye:Remove(); return false end
@@ -326,7 +331,6 @@ function MODULE:PhysicsSimulate(phys, dt)
         local animation_progress = (CurTime() - self.FakeUpStart) / (self.FakeUpEnd - self.FakeUpStart)
 
         for i, name in pairs(fakeup_bone_names) do
-            print(name)
             local object = target:GetPhysicsObjectNum(target:TranslateBoneToPhysBone(target:LookupBone(name)))
             local parent_bone = parent:LookupBone(name)
 
@@ -387,20 +391,23 @@ function MODULE:PhysicsSimulate(phys, dt)
 
     if !target.organism then
         self:Remove()
-        self.bullseye:Remove()
         return false -- Cut the bullshit
     end
 
 	if (!target.organism.alive) then
         -- If the NPC is dead, they probably aren't coming back; don't bother bringing them back to life
         self:Remove()
-        self.bullseye:Remove()
         return false -- Cut the bullshit
     elseif (target.organism.consciousness <= 0.5) or ((target.organism.lleg >= 0.85) and (target.organism.rleg >= 0.85)) then
         target.StartDie = cur_time
         return false
     end
 
+    if (self.LastPosCheck:DistToSqr(target:GetPos()) > (32 ^ 2)) then
+        self.LastPosCheck = target:GetPos()
+        target.StartDie = cur_time
+    end
+
     if ((CurTime() - self.LastFakeUpCheck) >= 1.0) and (can_unfake:GetBool()) then
         self.LastFakeUpCheck = CurTime()
 
@@ -465,6 +472,9 @@ function MODULE:PhysicsSimulate(phys, dt)
                 for i = 0, target:GetNumBodyGroups() - 1 do
                     ent:SetBodygroup(i, target:GetBodygroup(i))
                 end
+                
+                self.unfaker:Spawn()
+                self.unfaker:Activate()
             end)
 
             target.FakeUp = true
@@ -480,6 +490,13 @@ function MODULE:PhysicsSimulate(phys, dt)
             target:SetNotSolid(true)
             target:SetMoveType(MOVETYPE_NONE)
 
+            self.unfaker = ents.Create("npc_ragdoll_unfaker")
+            self.unfaker:SetPos(target:GetPos())
+            self.unfaker:SetNWEntity("parent", target)
+            self.unfaker:SetNWEntity("parent_npc", ent)
+            
+
+            target:SetRenderMode(RENDERMODE_NONE)
             ent:SetRenderMode(RENDERMODE_NONE)
 
             timer.Simple(self.FakeUpTime, function()
@@ -495,7 +512,6 @@ function MODULE:PhysicsSimulate(phys, dt)
                 self:Remove()
             end)
 
-            self.bullseye:Remove()
             return false
         end
     end
@@ -566,7 +582,7 @@ function MODULE:OnRemove()
     local timer_name = "Fedhoria_FallingLegs_Twitch_" .. self:EntIndex()
     timer_Remove(timer_name)
 
-    if IsValid(self.bullseye) then self.bullseye:Remove() end
+    if IsValid(self.unfaker) then self.unfaker:Remove() end
 end
 
 --[[-------------------------------------------------------------------------