From e055a47948c17e60a97cb43d95837da4c13a400e Mon Sep 17 00:00:00 2001 From: BobTheBob9 Date: Fri, 15 Jul 2022 18:02:31 +0100 Subject: support unused sword execution --- .../vscripts/melee/_melee_synced_human.gnut | 34 ++++++++++++---------- 1 file 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 efc3283db..1ad70bac6 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 -- cgit v1.2.3