Jump to content

Naked Defeat AE/SE


Recommended Posts

Posted
3 hours ago, cvonb said:


is the ND source available? i can just fix these but i dont see a link

I don't get the question? What source are you looking for? The psc's are included, there is no dll, so ...

Posted
4 hours ago, cvonb said:


is the ND source available? i can just fix these but i dont see a link

 

proposed changes:

 

diff --git a/Source/nade_configquest_scr.psc b/Source/nade_configquest_scr.psc
--- a/Source/nade_configquest_scr.psc
+++ b/Source/nade_configquest_scr.psc
@@ -14455,6 +14455,7 @@ Function KeyAbortAll()
 
         
         Immobilize(false)
+        EmergencyReleasePlayer("KeyAbortAll")
         FadeToBlack(false)
 
         LastAddedDevice.DisableNoWait()
@@ -14545,6 +14546,7 @@ Debug.Trace("NAKED DEFEAT #DEBUG: KeyFixBleedout() FIX BLEEDOUT. PressedTimes: "
 ;    endif
 
     Immobilize(false)
+    EmergencyReleaseControls("KeyFixBleedout")
     PlayerRef.PushActorAway(PlayerRef, 0.1)
     PlayerRef.RestoreActorValue("Health", 100)        
     PlayerRef.SetNoBleedoutRecovery(true)            
@@ -35976,6 +35978,11 @@ EndFunction
 
 Function ForceSheatheWeapon(bool Disarm) ;LATEST VERSION    ;#ForceSheatheWeapon
 
+    if IsPlayerWerewolfForm()
+    DebugTrace("ForceSheatheWeapon skipped: player is in werewolf form")
+    return
+    endif
+
     if PlayerRef.IsWeaponDrawn()
     PlayerRef.SheatheWeapon()    
     Utility.Wait(1.0)
@@ -36004,12 +36011,17 @@ Function ForceSheatheWeapon(bool Disarm) ;LATEST VERSION    ;#ForceSheatheWeapon
     ;        endif 
         endif 
         
-        ;if Nym()
-        while PlayerRef.IsWeaponDrawn()
+        int SheatheWait = 5
+        while PlayerRef.IsWeaponDrawn() && SheatheWait > 0
         DebugTrace("ForceSheatheWeapon(WEAPON STILL DRAWN LOOP)")
         PlayerRef.SheatheWeapon()
         Utility.Wait(1.0)
+        SheatheWait -= 1
         endwhile 
+
+        if PlayerRef.IsWeaponDrawn()
+        Debug.Trace("NAKED DEFEAT configquest: ForceSheatheWeapon timeout; continuing to avoid soft-lock")
+        endif
         ;else
         
     ;    PlayerRef.SheatheWeapon()    
@@ -36028,6 +36040,44 @@ Function ForceSheatheWeapon(bool Disarm) ;LATEST VERSION    ;#ForceSheatheWeapon
     endif 
 EndFunction
 
+Bool Function IsPlayerWerewolfForm()
+    String PlayerRaceKey = GetRaceKey(PlayerRef)
+    if PlayerRaceKey == "Werewolves"
+    return true
+    endif
+    return false
+EndFunction
+
+Function EmergencyReleasePlayer(String Reason)
+    Debug.Trace("NAKED DEFEAT configquest: EmergencyReleasePlayer("+Reason+")")
+    EmergencyReleaseControls(Reason)
+    StopHeartBeat()
+    Crawl(PlayerRef, false)
+    if SPE_Actor.IsActorCalmed(PlayerRef)
+    SPE_Actor.SetActorCalmed(PlayerRef, false)
+    endif
+    if PlayerRef.IsInFaction(ProtectedActorFaction)
+    PlayerRef.RemoveFromFaction(ProtectedActorFaction)
+    endif
+    if PlayerRef.IsInFaction(nade_DefeatFaction)
+    PlayerRef.RemoveFromFaction(nade_DefeatFaction)
+    endif
+    if PlayerRef.IsInFaction(DownedFaction)
+    PlayerRef.RemoveFromFaction(DownedFaction)
+    endif
+    DefeatQuestRunning = false
+    PlayerDownAlready = false
+    DefeatStatePlayer = "Free"
+EndFunction
+
+Function EmergencyReleaseControls(String Reason)
+    Debug.Trace("NAKED DEFEAT configquest: EmergencyReleaseControls("+Reason+")")
+    AlreadyImmobilized = false
+    Game.EnablePlayerControls()
+    Game.SetPlayerAIDriven(false)
+    Debug.SendAnimationEvent(PlayerRef, "IdleForceDefaultState")
+EndFunction
+
 Function NymBox(String Text2)        ;#NymBox
     if Nym()
     Debug.MessageBox("configuest: "+Text2)
 

Posted

confirmed that my above patch works

 

also, it would be much better if the enemies who defeated you were in the scene rather tahn randos like with Acheron?

Posted
53 minutes ago, cvonb said:

confirmed that my above patch works

 

also, it would be much better if the enemies who defeated you were in the scene rather tahn randos like with Acheron?

Great, feel free to post the psc and pex files, ideally in a patch format so that everyone who feels like it can test/profit. Doubt Nymra minds someone helping out.

Posted

Not sure if it bothers anyone else as much as it bothers me, but has anyone figured out how to fix all the 'save' instead of 'safe' in the screenmessages?
I for some reason cannot find them to fix it myself

Posted (edited)

Despite having proxy animation registered + re ran SLATE I get an error on the death scenario stating no animation where found

 

Nvm had so many animation apparently it took a solid 5min for animation to properly register, reran SLATE after and seems to be working as intended

Edited by alphafr
Posted

Nymra vanishes at the most unfortunate times.

 

Does anybody recall the most recent version where whipping was functional?

Posted

Okey, I figured out! It was Sexlab Cum Overlays problem! I move it before sexlab in MO2 files. And It works nice! Finally, I really like Naked Defeat! Works good! Better then Acheron!

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!

Register a new account

Sign in

Already have an account? Sign in here.

Sign In Now
  • Recently Browsing   0 members

    • No registered users viewing this page.
×
×
  • Create New...