aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBobTheBob9 <for.oliver.kirkham@gmail.com>2022-07-15 18:02:31 +0100
committerBobTheBob9 <for.oliver.kirkham@gmail.com>2022-07-15 18:02:31 +0100
commite055a47948c17e60a97cb43d95837da4c13a400e (patch)
tree46f364d867e7d35d252f686abfb6b48fbb80d2e6
parent54c7b5eeb81e841396a1ecee6fe6f90e5e79c3bd (diff)
downloadNorthstarMods-e055a47948c17e60a97cb43d95837da4c13a400e.tar.gz
NorthstarMods-e055a47948c17e60a97cb43d95837da4c13a400e.zip
support unused sword executionfp-execution-improvements-pr
-rwxr-xr-xNorthstar.Custom/mod/scripts/vscripts/melee/_melee_synced_human.gnut34
1 files changed, 19 insertions, 15 deletions
diff --git a/Northstar.Custom/mod/scripts/vscripts/melee/_melee_synced_human.gnut b/Northstar.Custom/mod/scripts/vscripts/melee/_melee_synced_human.gnut
index efc3283d..1ad70bac 100755
--- a/Northstar.Custom/mod/scripts/vscripts/melee/_melee_synced_human.gnut
+++ b/Northstar.Custom/mod/scripts/vscripts/melee/_melee_synced_human.gnut
@@ -25,21 +25,25 @@ bool function MeleeThread_PilotVsEnemyInternal( SyncedMelee action, entity attac
#if MP
if ( GetCurrentPlaylistVarInt( "fp_embark_enabled", eFirstPersonSequenceForce1PSetting.DISABLED ) >= eFirstPersonSequenceForce1PSetting.CLASSIC_EXECUTION )
{
- action.attackerAnimation1p = "ptpov_rspn101_melee_necksnap_rear"
- action.attackerAnimation3p = "pt_rspn101_melee_necksnap_rear"
- action.targetAnimation1p = "ptpov_melee_necksnap_rear_attacked"
- action.targetAnimation3p = "pt_melee_necksnap_rear_attacked"
- action.isAttackerRef = false
- action.minDot = 0.2
-
- /* here be dragons
- action.attackerAnimation1p = "ptpov_assassin_melee_necksnap_rear"
- action.attackerAnimation3p = "pt_assassin_melee_necksnap_rear"
- action.targetAnimation1p = "ptpov_assassin_melee_necksnap_rear_attacked"
- action.targetAnimation3p = "pt_assassin_melee_necksnap_rear_attacked"
- action.attachModel1p = $"models/weapons/bolo_sword/w_bolo_sword.mdl"
- action.attachTag1p = "PROPGUN"
- */
+ if ( attacker.GetOffhandWeapon( OFFHAND_MELEE ).GetWeaponClassName() == "melee_pilot_sword" ) // funny unused content
+ {
+ action.attackerAnimation1p = "ptpov_assassin_melee_necksnap_rear"
+ action.attackerAnimation3p = "pt_assassin_melee_necksnap_rear"
+ action.targetAnimation1p = "ptpov_assassin_melee_necksnap_rear_attacked"
+ action.targetAnimation3p = "pt_assassin_melee_necksnap_rear_attacked"
+ action.attachModel1p = $"models/weapons/bolo_sword/w_bolo_sword.mdl"
+ action.attachTag1p = "PROPGUN"
+ action.minDot = 0.2
+ }
+ else
+ {
+ action.attackerAnimation1p = "ptpov_rspn101_melee_necksnap_rear"
+ action.attackerAnimation3p = "pt_rspn101_melee_necksnap_rear"
+ action.targetAnimation1p = "ptpov_melee_necksnap_rear_attacked"
+ action.targetAnimation3p = "pt_melee_necksnap_rear_attacked"
+ action.isAttackerRef = false
+ action.minDot = 0.2
+ }
// need to hardcode false here otherwise it just doesnt work for some reason??
isAttackerRef = false