Final Touches

Includes Motionpatch Prep for Incoming Gumshoe which will be a separate PR

Author: elias-michaias

fighters/duckhunt/src/acmd/smashes.rs

@@ -10,56 +10,10 @@ unsafe fn duckhunt_attack_hi4_game(fighter: &mut L2CAgentBase) {
     }
     frame(lua_state, 7.0);
     if is_excute(fighter) {
-        WorkModule::set_int(
-            boma,
-            5,
-            *FIGHTER_DUCKHUNT_STATUS_ATTACK_INT_SMASH_DELAY_FRAME,
-        );
-        WorkModule::set_int(
-            boma,
-            6,
-            *FIGHTER_DUCKHUNT_STATUS_ATTACK_INT_SMASH_RETICLE_DISPLAY_FRAME,
-        );
+        WorkModule::set_int( boma, 5, *FIGHTER_DUCKHUNT_STATUS_ATTACK_INT_SMASH_DELAY_FRAME);
+        WorkModule::set_int( boma, 6, *FIGHTER_DUCKHUNT_STATUS_ATTACK_INT_SMASH_RETICLE_DISPLAY_FRAME);
         FT_MOTION_RATE_RANGE(fighter, 17.0, 57.0, 28.0);
-        ATTACK(
-            fighter,
-            /*ID*/ 0,
-            /*Part*/ 0,
-            /*Bone*/ Hash40::new("top"),
-            /*Damage*/ 5.0,
-            /*Angle*/ 127,
-            /*KBG*/ 0,
-            /*FKB*/ 0,
-            /*BKB*/ 110,
-            /*Size*/ 5.3,
-            /*X*/ 0.0,
-            /*Y*/ 6.0,
-            /*Z*/ 9.0,
-            /*X2*/ None,
-            /*Y2*/ None,
-            /*Z2*/ None,
-            /*Hitlag*/ 1.0,
-            /*SDI*/ 0.5,
-            /*Clang_Rebound*/ *ATTACK_SETOFF_KIND_THRU,
-            /*FacingRestrict*/ *ATTACK_LR_CHECK_POS,
-            /*SetWeight*/ false,
-            /*ShieldDamage*/ 0,
-            /*Trip*/ 0.0,
-            /*Rehit*/ 0,
-            /*Reflectable*/ false,
-            /*Absorbable*/ false,
-            /*Flinchless*/ false,
-            /*DisableHitlag*/ false,
-            /*Direct_Hitbox*/ true,
-            /*Ground_or_Air*/ *COLLISION_SITUATION_MASK_GA,
-            /*Hitbits*/ *COLLISION_CATEGORY_MASK_ALL,
-            /*CollisionPart*/ *COLLISION_PART_MASK_ALL,
-            /*FriendlyFire*/ false,
-            /*Effect*/ Hash40::new("collision_attr_fire"),
-            /*SFXLevel*/ *ATTACK_SOUND_LEVEL_M,
-            /*SFXType*/ *COLLISION_SOUND_ATTR_PUNCH,
-            /*Type*/ *ATTACK_REGION_NONE,
-        );
+        ATTACK( fighter, /*ID*/ 0, /*Part*/ 0, /*Bone*/ Hash40::new("top"), /*Damage*/ 5.0, /*Angle*/ 127, /*KBG*/ 0, /*FKB*/ 0, /*BKB*/ 110, /*Size*/ 5.3, /*X*/ 0.0, /*Y*/ 6.0, /*Z*/ 9.0, /*X2*/ None, /*Y2*/ None, /*Z2*/ None, /*Hitlag*/ 1.0, /*SDI*/ 0.5, /*Clang_Rebound*/ *ATTACK_SETOFF_KIND_THRU, /*FacingRestrict*/ *ATTACK_LR_CHECK_POS, /*SetWeight*/ false, /*ShieldDamage*/ 0, /*Trip*/ 0.0, /*Rehit*/ 0, /*Reflectable*/ false, /*Absorbable*/ false, /*Flinchless*/ false, /*DisableHitlag*/ false, /*Direct_Hitbox*/ true, /*Ground_or_Air*/ *COLLISION_SITUATION_MASK_GA, /*Hitbits*/ *COLLISION_CATEGORY_MASK_ALL, /*CollisionPart*/ *COLLISION_PART_MASK_ALL, /*FriendlyFire*/ false, /*Effect*/ Hash40::new("collision_attr_fire"), /*SFXLevel*/ *ATTACK_SOUND_LEVEL_M, /*SFXType*/ *COLLISION_SOUND_ATTR_PUNCH, /*Type*/ *ATTACK_REGION_NONE);
     }
     frame(lua_state, 15.0);
     if is_excute(fighter) {
@@ -169,46 +123,8 @@ unsafe fn duckhunt_attack_s4_s_game(fighter: &mut L2CAgentBase) {
     frame(lua_state, 18.0);
     FT_MOTION_RATE_RANGE(fighter, 18.0, 24.0, 4.0);
     if is_excute(fighter) {
-        ATTACK(
-            fighter,
-            1,
-            0,
-            Hash40::new("top"),
-            4.0,
-            45,
-            100,
-            70,
-            0,
-            7.0,
-            0.0,
-            6.0,
-            18.0,
-            None,
-            None,
-            None,
-            1.0,
-            1.0,
-            *ATTACK_SETOFF_KIND_THRU,
-            *ATTACK_LR_CHECK_F,
-            false,
-            0,
-            0.0,
-            0,
-            false,
-            false,
-            false,
-            false,
-            true,
-            *COLLISION_SITUATION_MASK_GA,
-            *COLLISION_CATEGORY_MASK_ALL,
-            *COLLISION_PART_MASK_ALL,
-            false,
-            Hash40::new("collision_attr_fire"),
-            *ATTACK_SOUND_LEVEL_M,
-            *COLLISION_SOUND_ATTR_PUNCH,
-            *ATTACK_REGION_NONE,
-        );
-    }
+        ATTACK(fighter, 1, 0, Hash40::new("top"), 4.0, 45, 100, 70, 0, 7.0, 0.0, 6.0, 18.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_THRU, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_PUNCH, *ATTACK_REGION_NONE,); 
+    } 
     frame(lua_state, 24.0);
     FT_MOTION_RATE(fighter, 1.0);
     if is_excute(fighter) {

fighters/duckhunt/src/acmd/specials.rs

@@ -1,4 +1,3 @@
-
 use super::*;
 
 #[acmd_script( agent = "duckhunt", script = "game_specialhi" , category = ACMD_GAME , low_priority)]
@@ -7,11 +6,79 @@ unsafe fn duckhunt_special_hi_game(fighter: &mut L2CAgentBase) {
     let boma = fighter.boma();
     frame(lua_state, 3.0);
     if is_excute(fighter) {
-        WorkModule::on_flag(boma, *FIGHTER_DUCKHUNT_INSTANCE_WORK_ID_FLAG_REQUEST_SPECIAL_HI_CANCEL);
+        WorkModule::set_int( boma, 5, *FIGHTER_DUCKHUNT_STATUS_ATTACK_INT_SMASH_DELAY_FRAME);
+        WorkModule::set_int( boma, 6, *FIGHTER_DUCKHUNT_STATUS_ATTACK_INT_SMASH_RETICLE_DISPLAY_FRAME);
+        ATTACK(fighter, 1, 0, Hash40::new("top"), 5.0, 45, 30, 0, 40, 7.0, 0.0, -2.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_THRU, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_PUNCH, *ATTACK_REGION_NONE,); 
+    }
+}
+
+
+#[acmd_script( agent = "duckhunt", script = "game_specialhi2" , category = ACMD_GAME , low_priority)]
+unsafe fn duckhunt_special_hi2_game(fighter: &mut L2CAgentBase) {
+    let lua_state = fighter.lua_state_agent;
+    let boma = fighter.boma();
+    frame(lua_state, 3.0);
+    if is_excute(fighter) {
+        WorkModule::set_int( boma, 5, *FIGHTER_DUCKHUNT_STATUS_ATTACK_INT_SMASH_DELAY_FRAME);
+        WorkModule::set_int( boma, 6, *FIGHTER_DUCKHUNT_STATUS_ATTACK_INT_SMASH_RETICLE_DISPLAY_FRAME);
+        ATTACK(fighter, 1, 0, Hash40::new("top"), 7.5, 45, 40, 0, 50, 7.0, 0.0, -2.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_THRU, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_PUNCH, *ATTACK_REGION_NONE,); 
+    }
+}
+
+#[acmd_script( agent = "duckhunt", script = "game_specialhi3" , category = ACMD_GAME , low_priority)]
+unsafe fn duckhunt_special_hi3_game(fighter: &mut L2CAgentBase) {
+    let lua_state = fighter.lua_state_agent;
+    let boma = fighter.boma();
+    frame(lua_state, 3.0);
+    if is_excute(fighter) {
+        WorkModule::set_int( boma, 5, *FIGHTER_DUCKHUNT_STATUS_ATTACK_INT_SMASH_DELAY_FRAME);
+        WorkModule::set_int( boma, 6, *FIGHTER_DUCKHUNT_STATUS_ATTACK_INT_SMASH_RETICLE_DISPLAY_FRAME);
+        ATTACK(fighter, 1, 0, Hash40::new("top"), 15.0, 45, 85, 0, 80, 7.0, 0.0, -2.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_THRU, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_PUNCH, *ATTACK_REGION_NONE,); 
     }
-    
 }
 
+#[acmd_script( agent = "duckhunt", scripts = ["effect_specialhi", "effect_specialhi2", "effect_specialhi3"] , category = ACMD_EFFECT , low_priority)]
+unsafe fn duckhunt_special_hi_effect(agent: &mut L2CAgentBase) {
+    let lua_state = agent.lua_state_agent;
+    let boma = agent.boma();
+    if is_excute(agent) {
+        EFFECT_FOLLOW_arg11(agent, Hash40::new("duckhunt_feather_long"), Hash40::new("duckrot"), 0, 4, 0, 20, 0, 0, 1, true, *FIGHTER_INSTANCE_WORK_ID_INT_COLOR);
+    }
+}
+
+#[acmd_script( agent = "duckhunt", scripts = ["sound_specialhi", "sound_specialhi2", "sound_specialhi3"] , category = ACMD_SOUND , low_priority)]
+unsafe fn duckhunt_special_hi_sound(agent: &mut L2CAgentBase) {
+    let lua_state = agent.lua_state_agent;
+    let boma = agent.boma();
+    frame(lua_state, 1.0);
+    if is_excute(agent) {
+        PLAY_SE(agent, Hash40::new("se_duckhunt_special_h02"));
+    }
+    frame(lua_state, 5.0);
+    if is_excute(agent) {
+        PLAY_SE(agent, Hash40::new("se_duckhunt_special_h03"));
+    }
+}
+
+#[acmd_script( agent = "duckhunt", scripts = ["expression_specialhi", "expression_specialhi2", "expression_specialhi3"] , category = ACMD_EXPRESSION , low_priority)]
+unsafe fn duckhunt_special_hi_expression(agent: &mut L2CAgentBase) {
+    let lua_state = agent.lua_state_agent;
+    let boma = agent.boma();
+    if is_excute(agent) {
+    }
+}
+
+
+#[acmd_script( agent = "duckhunt_reticle", scripts = ["game_specialhi", "game_specialhi2", "game_specialhi3"] , category = ACMD_GAME , low_priority)]
+unsafe fn reticle_special_hi_game(agent: &mut L2CAgentBase) {
+    let lua_state = agent.lua_state_agent;
+    let boma = agent.boma();
+    if is_excute(agent) {
+        WorkModule::set_float(boma, 1.0, *WEAPON_DUCKHUNT_RETICLE_INSTANCE_WORK_ID_FLOAT_SIZE);
+    }
+}
+
+
 #[acmd_script( agent = "duckhunt" , scripts = ["game_specialairlw", "game_speciallw"], category = ACMD_GAME , low_priority)]
 unsafe fn duckhunt_special_lw_game(fighter: &mut L2CAgentBase) {
     let lua_state: u64 = fighter.lua_state_agent;
@@ -64,7 +131,15 @@ unsafe fn duckhunt_special_s_game(fighter: &mut L2CAgentBase) {
 
 pub fn install() {
     install_acmd_scripts!(
+        //gumshoe {{{
         duckhunt_special_hi_game,
+        duckhunt_special_hi2_game,
+        duckhunt_special_hi3_game,
+        duckhunt_special_hi_effect,
+        duckhunt_special_hi_sound,
+        duckhunt_special_hi_expression,
+        reticle_special_hi_game,
+        //gumshoe }}}
         duckhunt_special_n_game,
         duckhunt_special_lw_game,
         duckhunt_special_s_game,

romfs/source/fighter/duckhunt/motion/body/motion_patch.yaml

@@ -60,6 +60,69 @@ attack_squat_s3:
     intangible_end_frame: 0
     cancel_frame: 27
     freeze_during_hitstop: false
+special_hi:
+  flags:
+    loop: false
+  extra:
+    cancel_frame: 25
+special_hi_2:
+  game_script: game_specialhi2
+  flags:
+    turn: false
+    loop: false
+    move: false
+    fix_trans: false
+    fix_rot: false
+    fix_scale: false
+    unk_40: false
+    unk_80: true
+    unk_100: false
+    unk_200: false
+    unk_400: false
+    unk_800: false
+    unk_1000: false
+    unk_2000: false
+  blend_frames: 10
+  animations:
+  - name: d02specialhi2.nuanmb
+  scripts:
+  - expression_specialhi2
+  - sound_specialhi2
+  - effect_specialhi2
+  extra:
+    intangible_start_frame: 0
+    intangible_end_frame: 0
+    cancel_frame: 0
+    freeze_during_hitstop: false
+special_hi_3:
+  game_script: game_specialhi3
+  flags:
+    turn: false
+    loop: false
+    move: false
+    fix_trans: false
+    fix_rot: false
+    fix_scale: false
+    unk_40: false
+    unk_80: true
+    unk_100: false
+    unk_200: false
+    unk_400: false
+    unk_800: false
+    unk_1000: false
+    unk_2000: false
+  blend_frames: 10
+  animations:
+  - name: d02specialhi3.nuanmb
+  scripts:
+  - expression_specialhi3
+  - sound_specialhi3
+  - effect_specialhi3
+  extra:
+    intangible_start_frame: 0
+    intangible_end_frame: 0
+    cancel_frame: 0
+    freeze_during_hitstop: false
 fall_aerial:
   blend_frames: 5
 fall_special: