diff --git a/Game.Shared/GarrysMod/Weapon357.cs b/Game.Shared/GarrysMod/Weapon357.cs index 477df047..171a9053 100644 --- a/Game.Shared/GarrysMod/Weapon357.cs +++ b/Game.Shared/GarrysMod/Weapon357.cs @@ -15,6 +15,76 @@ public partial class Weapon357 : BaseHL2MPCombatWeapon public static readonly new NetworkProp[] Props = [ ]; + static readonly ActTable[] acttable = [ + new() { BaseAct = Activity.ACT_MP_STAND_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_REVOLVER, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCH_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_CROUCH_REVOLVER, Required = false }, + new() { BaseAct = Activity.ACT_MP_RUN, WeaponAct = Activity.ACT_HL2MP_RUN_REVOLVER, Required = false }, + new() { BaseAct = Activity.ACT_MP_WALK, WeaponAct = Activity.ACT_HL2MP_WALK_REVOLVER, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCHWALK, WeaponAct = Activity.ACT_HL2MP_WALK_CROUCH_REVOLVER, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM, WeaponAct = Activity.ACT_HL2MP_SWIM_REVOLVER, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM_IDLE, WeaponAct = Activity.ACT_HL2MP_SWIM_IDLE_REVOLVER, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_STAND_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_REVOLVER, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_CROUCH_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_REVOLVER, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_STAND, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_REVOLVER, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_CROUCH, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_REVOLVER, Required = false }, + new() { BaseAct = Activity.ACT_MP_JUMP, WeaponAct = Activity.ACT_HL2MP_JUMP_REVOLVER, Required = false }, + ]; + + static readonly ActTable[] acttable_npc = [ + new() { BaseAct = Activity.ACT_IDLE, WeaponAct = Activity.ACT_IDLE_PISTOL, Required = true }, + new() { BaseAct = Activity.ACT_IDLE_ANGRY, WeaponAct = Activity.ACT_IDLE_ANGRY_PISTOL, Required = true }, + new() { BaseAct = Activity.ACT_RANGE_ATTACK1, WeaponAct = Activity.ACT_RANGE_ATTACK_PISTOL, Required = true }, + new() { BaseAct = Activity.ACT_RELOAD, WeaponAct = Activity.ACT_RELOAD_PISTOL, Required = true }, + new() { BaseAct = Activity.ACT_WALK_AIM, WeaponAct = Activity.ACT_WALK_AIM_PISTOL, Required = true }, + new() { BaseAct = Activity.ACT_RUN_AIM, WeaponAct = Activity.ACT_RUN_AIM_PISTOL, Required = true }, + new() { BaseAct = Activity.ACT_GESTURE_RANGE_ATTACK1, WeaponAct = Activity.ACT_GESTURE_RANGE_ATTACK_PISTOL, Required = true }, + new() { BaseAct = Activity.ACT_RELOAD_LOW, WeaponAct = Activity.ACT_RELOAD_PISTOL_LOW, Required = false }, + new() { BaseAct = Activity.ACT_RANGE_ATTACK1_LOW, WeaponAct = Activity.ACT_RANGE_ATTACK_PISTOL_LOW, Required = false }, + new() { BaseAct = Activity.ACT_COVER_LOW, WeaponAct = Activity.ACT_COVER_PISTOL_LOW, Required = false }, + new() { BaseAct = Activity.ACT_RANGE_AIM_LOW, WeaponAct = Activity.ACT_RANGE_AIM_PISTOL_LOW, Required = false }, + new() { BaseAct = Activity.ACT_GESTURE_RELOAD, WeaponAct = Activity.ACT_GESTURE_RELOAD_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_WALK, WeaponAct = Activity.ACT_WALK_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_RUN, WeaponAct = Activity.ACT_RUN_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_RELAXED, WeaponAct = Activity.ACT_IDLE_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_STIMULATED, WeaponAct = Activity.ACT_IDLE_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AGITATED, WeaponAct = Activity.ACT_IDLE_ANGRY_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_STEALTH, WeaponAct = Activity.ACT_IDLE_STEALTH_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_WALK_RELAXED, WeaponAct = Activity.ACT_WALK, Required = false }, + new() { BaseAct = Activity.ACT_WALK_STIMULATED, WeaponAct = Activity.ACT_WALK_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AGITATED, WeaponAct = Activity.ACT_WALK_AIM_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_WALK_STEALTH, WeaponAct = Activity.ACT_WALK_STEALTH_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_RUN_RELAXED, WeaponAct = Activity.ACT_RUN, Required = false }, + new() { BaseAct = Activity.ACT_RUN_STIMULATED, WeaponAct = Activity.ACT_RUN_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AGITATED, WeaponAct = Activity.ACT_RUN_AIM_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_RUN_STEALTH, WeaponAct = Activity.ACT_RUN_STEALTH_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AIM_RELAXED, WeaponAct = Activity.ACT_IDLE_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AIM_STIMULATED, WeaponAct = Activity.ACT_IDLE_ANGRY_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AIM_AGITATED, WeaponAct = Activity.ACT_IDLE_ANGRY_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AIM_STEALTH, WeaponAct = Activity.ACT_IDLE_STEALTH_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM_RELAXED, WeaponAct = Activity.ACT_WALK, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM_STIMULATED, WeaponAct = Activity.ACT_WALK_AIM_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM_AGITATED, WeaponAct = Activity.ACT_WALK_AIM_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM_STEALTH, WeaponAct = Activity.ACT_WALK_AIM_STEALTH_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AIM_RELAXED, WeaponAct = Activity.ACT_RUN, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AIM_STIMULATED, WeaponAct = Activity.ACT_RUN_AIM_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AIM_AGITATED, WeaponAct = Activity.ACT_RUN_AIM_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AIM_STEALTH, WeaponAct = Activity.ACT_RUN_AIM_STEALTH_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_CROUCHIDLE_STIMULATED, WeaponAct = Activity.ACT_HL2MP_IDLE_CROUCH_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_CROUCHIDLE_AIM_STIMULATED, WeaponAct = Activity.ACT_RANGE_AIM_PISTOL_LOW, Required = false }, + new() { BaseAct = Activity.ACT_CROUCHIDLE_AGITATED, WeaponAct = Activity.ACT_RANGE_AIM_PISTOL_LOW, Required = false }, + new() { BaseAct = Activity.ACT_READINESS_RELAXED_TO_STIMULATED, WeaponAct = Activity.ACT_READINESS_PISTOL_RELAXED_TO_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_READINESS_RELAXED_TO_STIMULATED_WALK, WeaponAct = Activity.ACT_READINESS_PISTOL_RELAXED_TO_STIMULATED_WALK, Required = false }, + new() { BaseAct = Activity.ACT_READINESS_AGITATED_TO_STIMULATED, WeaponAct = Activity.ACT_READINESS_PISTOL_AGITATED_TO_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_READINESS_STIMULATED_TO_RELAXED, WeaponAct = Activity.ACT_READINESS_PISTOL_STIMULATED_TO_RELAXED, Required = false }, + ]; + + public override ReadOnlySpan ActivityList() { + BaseCombatCharacter? owner = GetOwner(); + if (owner != null && owner.IsNPC()) + return acttable_npc; + return acttable; + } + public override void PrimaryAttack() { BasePlayer? player = ToBasePlayer(GetOwner()); diff --git a/Game.Shared/GarrysMod/WeaponAR2.cs b/Game.Shared/GarrysMod/WeaponAR2.cs index 5eaa520f..2678d21c 100644 --- a/Game.Shared/GarrysMod/WeaponAR2.cs +++ b/Game.Shared/GarrysMod/WeaponAR2.cs @@ -11,6 +11,70 @@ public partial class WeaponAR2 : HL2MPMachineGun public static readonly new NetworkProp[] Props = [ ]; + static readonly ActTable[] acttable = [ + new() { BaseAct = Activity.ACT_MP_STAND_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_AR2, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCH_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_CROUCH_AR2, Required = false }, + new() { BaseAct = Activity.ACT_MP_RUN, WeaponAct = Activity.ACT_HL2MP_RUN_AR2, Required = false }, + new() { BaseAct = Activity.ACT_MP_WALK, WeaponAct = Activity.ACT_HL2MP_WALK_AR2, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCHWALK, WeaponAct = Activity.ACT_HL2MP_WALK_CROUCH_AR2, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_STAND_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_AR2, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_CROUCH_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_AR2, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_STAND, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_AR2, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_CROUCH, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_AR2, Required = false }, + new() { BaseAct = Activity.ACT_MP_JUMP, WeaponAct = Activity.ACT_HL2MP_JUMP_AR2, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM, WeaponAct = Activity.ACT_HL2MP_SWIM_AR2, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM_IDLE, WeaponAct = Activity.ACT_HL2MP_SWIM_IDLE_AR2, Required = false }, + ]; + + static readonly ActTable[] acttable_npc = [ + new() { BaseAct = Activity.ACT_RANGE_ATTACK1, WeaponAct = Activity.ACT_RANGE_ATTACK_AR2, Required = true }, + new() { BaseAct = Activity.ACT_RELOAD, WeaponAct = Activity.ACT_RELOAD_SMG1, Required = true }, + new() { BaseAct = Activity.ACT_IDLE, WeaponAct = Activity.ACT_IDLE_SMG1, Required = true }, + new() { BaseAct = Activity.ACT_IDLE_ANGRY, WeaponAct = Activity.ACT_IDLE_ANGRY_SMG1, Required = true }, + new() { BaseAct = Activity.ACT_WALK, WeaponAct = Activity.ACT_WALK_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_IDLE_RELAXED, WeaponAct = Activity.ACT_IDLE_SMG1_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_STIMULATED, WeaponAct = Activity.ACT_IDLE_SMG1_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AGITATED, WeaponAct = Activity.ACT_IDLE_ANGRY_SMG1, Required = false }, + new() { BaseAct = Activity.ACT_WALK_RELAXED, WeaponAct = Activity.ACT_WALK_RIFLE_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_WALK_STIMULATED, WeaponAct = Activity.ACT_WALK_RIFLE_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AGITATED, WeaponAct = Activity.ACT_WALK_AIM_RIFLE, Required = false }, + new() { BaseAct = Activity.ACT_RUN_RELAXED, WeaponAct = Activity.ACT_RUN_RIFLE_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_RUN_STIMULATED, WeaponAct = Activity.ACT_RUN_RIFLE_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AGITATED, WeaponAct = Activity.ACT_RUN_AIM_RIFLE, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AIM_RELAXED, WeaponAct = Activity.ACT_IDLE_SMG1_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AIM_STIMULATED, WeaponAct = Activity.ACT_IDLE_AIM_RIFLE_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AIM_AGITATED, WeaponAct = Activity.ACT_IDLE_ANGRY_SMG1, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM_RELAXED, WeaponAct = Activity.ACT_WALK_RIFLE_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM_STIMULATED, WeaponAct = Activity.ACT_WALK_AIM_RIFLE_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM_AGITATED, WeaponAct = Activity.ACT_WALK_AIM_RIFLE, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AIM_RELAXED, WeaponAct = Activity.ACT_RUN_RIFLE_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AIM_STIMULATED, WeaponAct = Activity.ACT_RUN_AIM_RIFLE_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AIM_AGITATED, WeaponAct = Activity.ACT_RUN_AIM_RIFLE, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM, WeaponAct = Activity.ACT_WALK_AIM_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_WALK_CROUCH, WeaponAct = Activity.ACT_WALK_CROUCH_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_WALK_CROUCH_AIM, WeaponAct = Activity.ACT_WALK_CROUCH_AIM_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_RUN, WeaponAct = Activity.ACT_RUN_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_RUN_AIM, WeaponAct = Activity.ACT_RUN_AIM_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_RUN_CROUCH, WeaponAct = Activity.ACT_RUN_CROUCH_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_RUN_CROUCH_AIM, WeaponAct = Activity.ACT_RUN_CROUCH_AIM_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_GESTURE_RANGE_ATTACK1, WeaponAct = Activity.ACT_GESTURE_RANGE_ATTACK_AR2, Required = false }, + new() { BaseAct = Activity.ACT_COVER_LOW, WeaponAct = Activity.ACT_COVER_SMG1_LOW, Required = false }, + new() { BaseAct = Activity.ACT_RANGE_AIM_LOW, WeaponAct = Activity.ACT_RANGE_AIM_AR2_LOW, Required = false }, + new() { BaseAct = Activity.ACT_RANGE_ATTACK1_LOW, WeaponAct = Activity.ACT_RANGE_ATTACK_SMG1_LOW, Required = true }, + new() { BaseAct = Activity.ACT_RELOAD_LOW, WeaponAct = Activity.ACT_RELOAD_SMG1_LOW, Required = false }, + new() { BaseAct = Activity.ACT_GESTURE_RELOAD, WeaponAct = Activity.ACT_GESTURE_RELOAD_SMG1, Required = true }, + new() { BaseAct = Activity.ACT_CROUCHIDLE_STIMULATED, WeaponAct = Activity.ACT_RANGE_AIM_SMG1_LOW, Required = false }, + new() { BaseAct = Activity.ACT_CROUCHIDLE_AIM_STIMULATED, WeaponAct = Activity.ACT_RANGE_AIM_SMG1_LOW, Required = false }, + new() { BaseAct = Activity.ACT_CROUCHIDLE_AGITATED, WeaponAct = Activity.ACT_RANGE_AIM_SMG1_LOW, Required = false }, + ]; + + public override ReadOnlySpan ActivityList() { + BaseCombatCharacter? owner = GetOwner(); + if (owner != null && owner.IsNPC()) + return acttable_npc; + return acttable; + } + public override float GetFireRate() => 0.1f; } #endif diff --git a/Game.Shared/GarrysMod/WeaponBugBait.cs b/Game.Shared/GarrysMod/WeaponBugBait.cs index 5c0d24e5..ec50d004 100644 --- a/Game.Shared/GarrysMod/WeaponBugBait.cs +++ b/Game.Shared/GarrysMod/WeaponBugBait.cs @@ -13,6 +13,23 @@ public partial class WeaponBugBait : BaseHL2MPCombatWeapon nameof(DrawbackFinished), ]; + static readonly ActTable[] acttable = [ + new() { BaseAct = Activity.ACT_MP_STAND_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_GRENADE, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCH_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_CROUCH_GRENADE, Required = false }, + new() { BaseAct = Activity.ACT_MP_RUN, WeaponAct = Activity.ACT_HL2MP_RUN_GRENADE, Required = false }, + new() { BaseAct = Activity.ACT_MP_WALK, WeaponAct = Activity.ACT_HL2MP_WALK_GRENADE, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCHWALK, WeaponAct = Activity.ACT_HL2MP_WALK_CROUCH_GRENADE, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_STAND_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_GRENADE, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_CROUCH_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_GRENADE, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_STAND, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_GRENADE, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_CROUCH, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_GRENADE, Required = false }, + new() { BaseAct = Activity.ACT_MP_JUMP, WeaponAct = Activity.ACT_HL2MP_JUMP_GRENADE, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM, WeaponAct = Activity.ACT_HL2MP_SWIM_GRENADE, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM_IDLE, WeaponAct = Activity.ACT_HL2MP_SWIM_IDLE_GRENADE, Required = false }, + ]; + + public override ReadOnlySpan ActivityList() => acttable; + [PredictionTable] public static readonly new PredictionField[] Prediction = [ nameof(Redraw), diff --git a/Game.Shared/GarrysMod/WeaponCrossbow.cs b/Game.Shared/GarrysMod/WeaponCrossbow.cs index 690f25ef..c00d2c82 100644 --- a/Game.Shared/GarrysMod/WeaponCrossbow.cs +++ b/Game.Shared/GarrysMod/WeaponCrossbow.cs @@ -27,6 +27,68 @@ public partial class WeaponCrossbow : BaseHL2MPCombatWeapon nameof(MustReload), ]; + static readonly ActTable[] acttable = [ + new() { BaseAct = Activity.ACT_MP_STAND_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_CROSSBOW, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCH_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_CROUCH_CROSSBOW, Required = false }, + new() { BaseAct = Activity.ACT_MP_RUN, WeaponAct = Activity.ACT_HL2MP_RUN_CROSSBOW, Required = false }, + new() { BaseAct = Activity.ACT_MP_WALK, WeaponAct = Activity.ACT_HL2MP_WALK_CROSSBOW, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCHWALK, WeaponAct = Activity.ACT_HL2MP_WALK_CROUCH_CROSSBOW, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_STAND_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_CROSSBOW, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_CROUCH_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_CROSSBOW, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_STAND, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_CROSSBOW, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_CROUCH, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_CROSSBOW, Required = false }, + new() { BaseAct = Activity.ACT_MP_JUMP, WeaponAct = Activity.ACT_HL2MP_JUMP_CROSSBOW, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM, WeaponAct = Activity.ACT_HL2MP_SWIM_CROSSBOW, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM_IDLE, WeaponAct = Activity.ACT_HL2MP_SWIM_IDLE_CROSSBOW, Required = false }, + ]; + + static readonly ActTable[] acttable_npc = [ + new() { BaseAct = Activity.ACT_IDLE, WeaponAct = Activity.ACT_IDLE_SMG1, Required = true }, + new() { BaseAct = Activity.ACT_RANGE_ATTACK1, WeaponAct = Activity.ACT_RANGE_ATTACK_SHOTGUN, Required = true }, + new() { BaseAct = Activity.ACT_RELOAD, WeaponAct = Activity.ACT_RELOAD_SHOTGUN, Required = false }, + new() { BaseAct = Activity.ACT_WALK, WeaponAct = Activity.ACT_WALK_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_IDLE_ANGRY, WeaponAct = Activity.ACT_IDLE_ANGRY_SHOTGUN, Required = true }, + new() { BaseAct = Activity.ACT_IDLE_RELAXED, WeaponAct = Activity.ACT_IDLE_SHOTGUN_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_STIMULATED, WeaponAct = Activity.ACT_IDLE_SHOTGUN_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AGITATED, WeaponAct = Activity.ACT_IDLE_SHOTGUN_AGITATED, Required = false }, + new() { BaseAct = Activity.ACT_WALK_RELAXED, WeaponAct = Activity.ACT_WALK_RIFLE_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_WALK_STIMULATED, WeaponAct = Activity.ACT_WALK_RIFLE_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AGITATED, WeaponAct = Activity.ACT_WALK_AIM_RIFLE, Required = false }, + new() { BaseAct = Activity.ACT_RUN_RELAXED, WeaponAct = Activity.ACT_RUN_RIFLE_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_RUN_STIMULATED, WeaponAct = Activity.ACT_RUN_RIFLE_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AGITATED, WeaponAct = Activity.ACT_RUN_AIM_RIFLE, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AIM_RELAXED, WeaponAct = Activity.ACT_IDLE_SMG1_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AIM_STIMULATED, WeaponAct = Activity.ACT_IDLE_AIM_RIFLE_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AIM_AGITATED, WeaponAct = Activity.ACT_IDLE_ANGRY_SMG1, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM_RELAXED, WeaponAct = Activity.ACT_WALK_RIFLE_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM_STIMULATED, WeaponAct = Activity.ACT_WALK_AIM_RIFLE_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM_AGITATED, WeaponAct = Activity.ACT_WALK_AIM_RIFLE, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AIM_RELAXED, WeaponAct = Activity.ACT_RUN_RIFLE_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AIM_STIMULATED, WeaponAct = Activity.ACT_RUN_AIM_RIFLE_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AIM_AGITATED, WeaponAct = Activity.ACT_RUN_AIM_RIFLE, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM, WeaponAct = Activity.ACT_WALK_AIM_SHOTGUN, Required = true }, + new() { BaseAct = Activity.ACT_WALK_CROUCH, WeaponAct = Activity.ACT_WALK_CROUCH_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_WALK_CROUCH_AIM, WeaponAct = Activity.ACT_WALK_CROUCH_AIM_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_RUN, WeaponAct = Activity.ACT_RUN_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_RUN_AIM, WeaponAct = Activity.ACT_RUN_AIM_SHOTGUN, Required = true }, + new() { BaseAct = Activity.ACT_RUN_CROUCH, WeaponAct = Activity.ACT_RUN_CROUCH_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_RUN_CROUCH_AIM, WeaponAct = Activity.ACT_RUN_CROUCH_AIM_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_GESTURE_RANGE_ATTACK1, WeaponAct = Activity.ACT_GESTURE_RANGE_ATTACK_SHOTGUN, Required = true }, + new() { BaseAct = Activity.ACT_RANGE_ATTACK1_LOW, WeaponAct = Activity.ACT_RANGE_ATTACK_SHOTGUN_LOW, Required = true }, + new() { BaseAct = Activity.ACT_RELOAD_LOW, WeaponAct = Activity.ACT_RELOAD_SHOTGUN_LOW, Required = false }, + new() { BaseAct = Activity.ACT_GESTURE_RELOAD, WeaponAct = Activity.ACT_GESTURE_RELOAD_SHOTGUN, Required = false }, + new() { BaseAct = Activity.ACT_CROUCHIDLE_STIMULATED, WeaponAct = Activity.ACT_HL2MP_IDLE_CROUCH_SMG1, Required = false }, + new() { BaseAct = Activity.ACT_CROUCHIDLE_AIM_STIMULATED, WeaponAct = Activity.ACT_RANGE_AIM_SMG1_LOW, Required = false }, + new() { BaseAct = Activity.ACT_CROUCHIDLE_AGITATED, WeaponAct = Activity.ACT_RANGE_AIM_SMG1_LOW, Required = false }, + ]; + + public override ReadOnlySpan ActivityList() { + BaseCombatCharacter? owner = GetOwner(); + if (owner != null && owner.IsNPC()) + return acttable_npc; + return acttable; + } + [PredictionTable] public static readonly new PredictionField[] Prediction = [ nameof(InZoom), diff --git a/Game.Shared/GarrysMod/WeaponCrowbar.cs b/Game.Shared/GarrysMod/WeaponCrowbar.cs index d555275b..f3badca9 100644 --- a/Game.Shared/GarrysMod/WeaponCrowbar.cs +++ b/Game.Shared/GarrysMod/WeaponCrowbar.cs @@ -23,20 +23,35 @@ public partial class WeaponCrowbar : BaseHL2MPBludgeonWeapon public const float CROWBAR_RANGE = 75.0f; public const float CROWBAR_REFIRE = 0.4f; -#if !CLIENT_DLL static readonly ActTable[] acttable = [ - new() { BaseAct = Activity.ACT_RANGE_ATTACK1, WeaponAct = Activity.ACT_RANGE_ATTACK_SLAM, Required = true }, - new() { BaseAct = Activity.ACT_HL2MP_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_MELEE, Required = false }, - new() { BaseAct = Activity.ACT_HL2MP_RUN, WeaponAct = Activity.ACT_HL2MP_RUN_MELEE, Required = false }, - new() { BaseAct = Activity.ACT_HL2MP_IDLE_CROUCH, WeaponAct = Activity.ACT_HL2MP_IDLE_CROUCH_MELEE, Required = false }, - new() { BaseAct = Activity.ACT_HL2MP_WALK_CROUCH, WeaponAct = Activity.ACT_HL2MP_WALK_CROUCH_MELEE, Required = false }, - new() { BaseAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_MELEE, Required = false }, - new() { BaseAct = Activity.ACT_HL2MP_GESTURE_RELOAD, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_MELEE, Required = false }, - new() { BaseAct = Activity.ACT_HL2MP_JUMP, WeaponAct = Activity.ACT_HL2MP_JUMP_MELEE, Required = false }, + new() { BaseAct = Activity.ACT_MP_STAND_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_MELEE, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCH_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_CROUCH_MELEE, Required = false }, + new() { BaseAct = Activity.ACT_MP_RUN, WeaponAct = Activity.ACT_HL2MP_RUN_MELEE, Required = false }, + new() { BaseAct = Activity.ACT_MP_WALK, WeaponAct = Activity.ACT_HL2MP_WALK_MELEE, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCHWALK, WeaponAct = Activity.ACT_HL2MP_WALK_CROUCH_MELEE, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_STAND_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_MELEE, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_CROUCH_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_MELEE, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_STAND, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_MELEE, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_CROUCH, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_MELEE, Required = false }, + new() { BaseAct = Activity.ACT_MP_JUMP, WeaponAct = Activity.ACT_HL2MP_JUMP_MELEE, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM, WeaponAct = Activity.ACT_HL2MP_SWIM_MELEE, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM_IDLE, WeaponAct = Activity.ACT_HL2MP_SWIM_IDLE_MELEE, Required = false }, ]; - public override ReadOnlySpan ActivityList() => acttable; + static readonly ActTable[] acttable_npc = [ + new() { BaseAct = Activity.ACT_MELEE_ATTACK1, WeaponAct = Activity.ACT_MELEE_ATTACK_SWING, Required = true }, + new() { BaseAct = Activity.ACT_IDLE, WeaponAct = Activity.ACT_IDLE_ANGRY_MELEE, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_ANGRY, WeaponAct = Activity.ACT_IDLE_ANGRY_MELEE, Required = false }, + ]; + public override ReadOnlySpan ActivityList() { + BaseCombatCharacter? owner = GetOwner(); + if (owner != null && owner.IsNPC()) + return acttable_npc; + return acttable; + } + +#if !CLIENT_DLL public static readonly ConVar sk_npc_dmg_crowbar = new("sk_npc_dmg_crowbar", "0"); public static readonly ConVar sk_crowbar_lead_time = new("sk_crowbar_lead_time", "0.9"); diff --git a/Game.Shared/GarrysMod/WeaponFrag.cs b/Game.Shared/GarrysMod/WeaponFrag.cs index 038ba854..a7b5b62d 100644 --- a/Game.Shared/GarrysMod/WeaponFrag.cs +++ b/Game.Shared/GarrysMod/WeaponFrag.cs @@ -14,6 +14,23 @@ public partial class WeaponFrag : BaseHL2MPCombatWeapon new(nameof(AttackPaused)) { Bits = 4 }, ]; + static readonly ActTable[] acttable = [ + new() { BaseAct = Activity.ACT_MP_STAND_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_GRENADE, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCH_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_CROUCH_GRENADE, Required = false }, + new() { BaseAct = Activity.ACT_MP_RUN, WeaponAct = Activity.ACT_HL2MP_RUN_GRENADE, Required = false }, + new() { BaseAct = Activity.ACT_MP_WALK, WeaponAct = Activity.ACT_HL2MP_WALK_GRENADE, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCHWALK, WeaponAct = Activity.ACT_HL2MP_WALK_CROUCH_GRENADE, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_STAND_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_GRENADE, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_CROUCH_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_GRENADE, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_STAND, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_GRENADE, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_CROUCH, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_GRENADE, Required = false }, + new() { BaseAct = Activity.ACT_MP_JUMP, WeaponAct = Activity.ACT_HL2MP_JUMP_GRENADE, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM, WeaponAct = Activity.ACT_HL2MP_SWIM_GRENADE, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM_IDLE, WeaponAct = Activity.ACT_HL2MP_SWIM_IDLE_GRENADE, Required = false }, + ]; + + public override ReadOnlySpan ActivityList() => acttable; + [PredictionTable] public static readonly new PredictionField[] Prediction = [ nameof(Redraw), diff --git a/Game.Shared/GarrysMod/WeaponPhysCannon.cs b/Game.Shared/GarrysMod/WeaponPhysCannon.cs index cc5bb3c1..f535d755 100644 --- a/Game.Shared/GarrysMod/WeaponPhysCannon.cs +++ b/Game.Shared/GarrysMod/WeaponPhysCannon.cs @@ -177,6 +177,23 @@ public void SetVisible(bool state = true) { nameof(PhyscannonState), ]; + static readonly ActTable[] acttable = [ + new() { BaseAct = Activity.ACT_MP_STAND_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_PHYSGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCH_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_CROUCH_PHYSGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_RUN, WeaponAct = Activity.ACT_HL2MP_RUN_PHYSGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_WALK, WeaponAct = Activity.ACT_HL2MP_WALK_PHYSGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCHWALK, WeaponAct = Activity.ACT_HL2MP_WALK_CROUCH_PHYSGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_STAND_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_PHYSGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_CROUCH_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_PHYSGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_STAND, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_PHYSGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_CROUCH, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_PHYSGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_JUMP, WeaponAct = Activity.ACT_HL2MP_JUMP_PHYSGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM, WeaponAct = Activity.ACT_HL2MP_SWIM_PHYSGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM_IDLE, WeaponAct = Activity.ACT_HL2MP_SWIM_IDLE_PHYSGUN, Required = false }, + ]; + + public override ReadOnlySpan ActivityList() => acttable; + [PredictionTable] public static readonly new PredictionField[] Prediction = [ nameof(EffectState), diff --git a/Game.Shared/GarrysMod/WeaponPhysGun.cs b/Game.Shared/GarrysMod/WeaponPhysGun.cs index 7103e7fd..1d39563e 100644 --- a/Game.Shared/GarrysMod/WeaponPhysGun.cs +++ b/Game.Shared/GarrysMod/WeaponPhysGun.cs @@ -37,6 +37,23 @@ public partial class nameof(GrabbedEntity), ]; + static readonly ActTable[] acttable = [ + new() { BaseAct = Activity.ACT_MP_STAND_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_PHYSGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCH_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_CROUCH_PHYSGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_RUN, WeaponAct = Activity.ACT_HL2MP_RUN_PHYSGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_WALK, WeaponAct = Activity.ACT_HL2MP_WALK_PHYSGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCHWALK, WeaponAct = Activity.ACT_HL2MP_WALK_CROUCH_PHYSGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_STAND_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_PHYSGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_CROUCH_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_PHYSGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_STAND, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_PHYSGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_CROUCH, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_PHYSGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_JUMP, WeaponAct = Activity.ACT_HL2MP_JUMP_PHYSGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM, WeaponAct = Activity.ACT_HL2MP_SWIM_PHYSGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM_IDLE, WeaponAct = Activity.ACT_HL2MP_SWIM_IDLE_PHYSGUN, Required = false }, + ]; + + public override ReadOnlySpan ActivityList() => acttable; + [PredictionTable] public static readonly new PredictionField[] Prediction = [ nameof(HitPosLocal), @@ -54,7 +71,6 @@ public override void Activate() { base.Activate(); } - // ActivityList? public #if CLIENT_DLL diff --git a/Game.Shared/GarrysMod/WeaponPistol.cs b/Game.Shared/GarrysMod/WeaponPistol.cs index 0a076010..f11baaaf 100644 --- a/Game.Shared/GarrysMod/WeaponPistol.cs +++ b/Game.Shared/GarrysMod/WeaponPistol.cs @@ -18,6 +18,76 @@ public partial class WeaponPistol : HL2MPMachineGun new(nameof(NumShotsFired)) { Bits = 16 }, ]; + static readonly ActTable[] acttable = [ + new() { BaseAct = Activity.ACT_MP_STAND_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCH_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_CROUCH_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_MP_RUN, WeaponAct = Activity.ACT_HL2MP_RUN_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_MP_WALK, WeaponAct = Activity.ACT_HL2MP_WALK_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCHWALK, WeaponAct = Activity.ACT_HL2MP_WALK_CROUCH_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM, WeaponAct = Activity.ACT_HL2MP_SWIM_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM_IDLE, WeaponAct = Activity.ACT_HL2MP_SWIM_IDLE_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_STAND_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_CROUCH_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_STAND, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_CROUCH, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_MP_JUMP, WeaponAct = Activity.ACT_HL2MP_JUMP_PISTOL, Required = false }, + ]; + + static readonly ActTable[] acttable_npc = [ + new() { BaseAct = Activity.ACT_IDLE, WeaponAct = Activity.ACT_IDLE_PISTOL, Required = true }, + new() { BaseAct = Activity.ACT_IDLE_ANGRY, WeaponAct = Activity.ACT_IDLE_ANGRY_PISTOL, Required = true }, + new() { BaseAct = Activity.ACT_RANGE_ATTACK1, WeaponAct = Activity.ACT_RANGE_ATTACK_PISTOL, Required = true }, + new() { BaseAct = Activity.ACT_RELOAD, WeaponAct = Activity.ACT_RELOAD_PISTOL, Required = true }, + new() { BaseAct = Activity.ACT_WALK_AIM, WeaponAct = Activity.ACT_WALK_AIM_PISTOL, Required = true }, + new() { BaseAct = Activity.ACT_RUN_AIM, WeaponAct = Activity.ACT_RUN_AIM_PISTOL, Required = true }, + new() { BaseAct = Activity.ACT_GESTURE_RANGE_ATTACK1, WeaponAct = Activity.ACT_GESTURE_RANGE_ATTACK_PISTOL, Required = true }, + new() { BaseAct = Activity.ACT_RELOAD_LOW, WeaponAct = Activity.ACT_RELOAD_PISTOL_LOW, Required = false }, + new() { BaseAct = Activity.ACT_RANGE_ATTACK1_LOW, WeaponAct = Activity.ACT_RANGE_ATTACK_PISTOL_LOW, Required = false }, + new() { BaseAct = Activity.ACT_COVER_LOW, WeaponAct = Activity.ACT_COVER_PISTOL_LOW, Required = false }, + new() { BaseAct = Activity.ACT_RANGE_AIM_LOW, WeaponAct = Activity.ACT_RANGE_AIM_PISTOL_LOW, Required = false }, + new() { BaseAct = Activity.ACT_GESTURE_RELOAD, WeaponAct = Activity.ACT_GESTURE_RELOAD_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_WALK, WeaponAct = Activity.ACT_WALK_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_RUN, WeaponAct = Activity.ACT_RUN_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_RELAXED, WeaponAct = Activity.ACT_IDLE_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_STIMULATED, WeaponAct = Activity.ACT_IDLE_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AGITATED, WeaponAct = Activity.ACT_IDLE_ANGRY_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_STEALTH, WeaponAct = Activity.ACT_IDLE_STEALTH_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_WALK_RELAXED, WeaponAct = Activity.ACT_WALK, Required = false }, + new() { BaseAct = Activity.ACT_WALK_STIMULATED, WeaponAct = Activity.ACT_WALK_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AGITATED, WeaponAct = Activity.ACT_WALK_AIM_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_WALK_STEALTH, WeaponAct = Activity.ACT_WALK_STEALTH_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_RUN_RELAXED, WeaponAct = Activity.ACT_RUN, Required = false }, + new() { BaseAct = Activity.ACT_RUN_STIMULATED, WeaponAct = Activity.ACT_RUN_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AGITATED, WeaponAct = Activity.ACT_RUN_AIM_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_RUN_STEALTH, WeaponAct = Activity.ACT_RUN_STEALTH_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AIM_RELAXED, WeaponAct = Activity.ACT_IDLE_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AIM_STIMULATED, WeaponAct = Activity.ACT_IDLE_ANGRY_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AIM_AGITATED, WeaponAct = Activity.ACT_IDLE_ANGRY_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AIM_STEALTH, WeaponAct = Activity.ACT_IDLE_STEALTH_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM_RELAXED, WeaponAct = Activity.ACT_WALK, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM_STIMULATED, WeaponAct = Activity.ACT_WALK_AIM_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM_AGITATED, WeaponAct = Activity.ACT_WALK_AIM_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM_STEALTH, WeaponAct = Activity.ACT_WALK_AIM_STEALTH_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AIM_RELAXED, WeaponAct = Activity.ACT_RUN, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AIM_STIMULATED, WeaponAct = Activity.ACT_RUN_AIM_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AIM_AGITATED, WeaponAct = Activity.ACT_RUN_AIM_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AIM_STEALTH, WeaponAct = Activity.ACT_RUN_AIM_STEALTH_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_CROUCHIDLE_STIMULATED, WeaponAct = Activity.ACT_HL2MP_IDLE_CROUCH_PISTOL, Required = false }, + new() { BaseAct = Activity.ACT_CROUCHIDLE_AIM_STIMULATED, WeaponAct = Activity.ACT_RANGE_AIM_PISTOL_LOW, Required = false }, + new() { BaseAct = Activity.ACT_CROUCHIDLE_AGITATED, WeaponAct = Activity.ACT_RANGE_AIM_PISTOL_LOW, Required = false }, + new() { BaseAct = Activity.ACT_READINESS_RELAXED_TO_STIMULATED, WeaponAct = Activity.ACT_READINESS_PISTOL_RELAXED_TO_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_READINESS_RELAXED_TO_STIMULATED_WALK, WeaponAct = Activity.ACT_READINESS_PISTOL_RELAXED_TO_STIMULATED_WALK, Required = false }, + new() { BaseAct = Activity.ACT_READINESS_AGITATED_TO_STIMULATED, WeaponAct = Activity.ACT_READINESS_PISTOL_AGITATED_TO_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_READINESS_STIMULATED_TO_RELAXED, WeaponAct = Activity.ACT_READINESS_PISTOL_STIMULATED_TO_RELAXED, Required = false }, + ]; + + public override ReadOnlySpan ActivityList() { + BaseCombatCharacter? owner = GetOwner(); + if (owner != null && owner.IsNPC()) + return acttable_npc; + return acttable; + } + [PredictionTable] public static readonly new PredictionField[] Prediction = [ nameof(SoonestPrimaryAttack), diff --git a/Game.Shared/GarrysMod/WeaponRPG.cs b/Game.Shared/GarrysMod/WeaponRPG.cs index 69ebe3c9..5b1da93b 100644 --- a/Game.Shared/GarrysMod/WeaponRPG.cs +++ b/Game.Shared/GarrysMod/WeaponRPG.cs @@ -19,6 +19,49 @@ public partial class WeaponRPG : BaseHL2MPCombatWeapon new(nameof(LaserDot)) { Bits = 0, Flags = PropFlags.NoScale }, ]; + static readonly ActTable[] acttable = [ + new() { BaseAct = Activity.ACT_MP_STAND_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_RPG, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCH_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_CROUCH_RPG, Required = false }, + new() { BaseAct = Activity.ACT_MP_RUN, WeaponAct = Activity.ACT_HL2MP_RUN_RPG, Required = false }, + new() { BaseAct = Activity.ACT_MP_WALK, WeaponAct = Activity.ACT_HL2MP_WALK_RPG, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCHWALK, WeaponAct = Activity.ACT_HL2MP_WALK_CROUCH_RPG, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_STAND_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_RPG, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_CROUCH_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_RPG, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_STAND, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_RPG, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_CROUCH, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_RPG, Required = false }, + new() { BaseAct = Activity.ACT_MP_JUMP, WeaponAct = Activity.ACT_HL2MP_JUMP_RPG, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM, WeaponAct = Activity.ACT_HL2MP_SWIM_RPG, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM_IDLE, WeaponAct = Activity.ACT_HL2MP_SWIM_IDLE_RPG, Required = false }, + ]; + + static readonly ActTable[] acttable_npc = [ + new() { BaseAct = Activity.ACT_RANGE_ATTACK1, WeaponAct = Activity.ACT_RANGE_ATTACK_RPG, Required = true }, + new() { BaseAct = Activity.ACT_IDLE_RELAXED, WeaponAct = Activity.ACT_IDLE_RPG_RELAXED, Required = true }, + new() { BaseAct = Activity.ACT_IDLE_STIMULATED, WeaponAct = Activity.ACT_IDLE_ANGRY_RPG, Required = true }, + new() { BaseAct = Activity.ACT_IDLE_AGITATED, WeaponAct = Activity.ACT_IDLE_ANGRY_RPG, Required = true }, + new() { BaseAct = Activity.ACT_IDLE, WeaponAct = Activity.ACT_IDLE_RPG, Required = true }, + new() { BaseAct = Activity.ACT_IDLE_ANGRY, WeaponAct = Activity.ACT_IDLE_ANGRY_RPG, Required = true }, + new() { BaseAct = Activity.ACT_WALK, WeaponAct = Activity.ACT_WALK_RPG, Required = true }, + new() { BaseAct = Activity.ACT_WALK_CROUCH, WeaponAct = Activity.ACT_WALK_CROUCH_RPG, Required = true }, + new() { BaseAct = Activity.ACT_RUN, WeaponAct = Activity.ACT_RUN_RPG, Required = true }, + new() { BaseAct = Activity.ACT_RUN_CROUCH, WeaponAct = Activity.ACT_RUN_CROUCH_RPG, Required = true }, + new() { BaseAct = Activity.ACT_COVER_LOW, WeaponAct = Activity.ACT_COVER_LOW_RPG, Required = true }, + new() { BaseAct = Activity.ACT_RANGE_ATTACK1_LOW, WeaponAct = Activity.ACT_RANGE_ATTACK_SMG1_LOW, Required = true }, + new() { BaseAct = Activity.ACT_RANGE_AIM_LOW, WeaponAct = Activity.ACT_RANGE_AIM_SMG1_LOW, Required = false }, + new() { BaseAct = Activity.ACT_RELOAD_LOW, WeaponAct = Activity.ACT_RELOAD_SMG1_LOW, Required = false }, + new() { BaseAct = Activity.ACT_CROUCHIDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_CROUCH_SMG1, Required = false }, + new() { BaseAct = Activity.ACT_CROUCHIDLE_STIMULATED, WeaponAct = Activity.ACT_HL2MP_IDLE_CROUCH_SMG1, Required = false }, + new() { BaseAct = Activity.ACT_CROUCHIDLE_AIM_STIMULATED, WeaponAct = Activity.ACT_RANGE_AIM_SMG1_LOW, Required = false }, + new() { BaseAct = Activity.ACT_CROUCHIDLE_AGITATED, WeaponAct = Activity.ACT_RANGE_AIM_SMG1_LOW, Required = false }, + ]; + + public override ReadOnlySpan ActivityList() { + BaseCombatCharacter? owner = GetOwner(); + if (owner != null && owner.IsNPC()) + return acttable_npc; + return acttable; + } + [PredictionTable] public static readonly new PredictionField[] Prediction = [ nameof(Guiding), diff --git a/Game.Shared/GarrysMod/WeaponSLAM.cs b/Game.Shared/GarrysMod/WeaponSLAM.cs index 8dcbaf0f..c066c235 100644 --- a/Game.Shared/GarrysMod/WeaponSLAM.cs +++ b/Game.Shared/GarrysMod/WeaponSLAM.cs @@ -20,6 +20,23 @@ public partial class WeaponSLAM : BaseHL2MPCombatWeapon nameof(AttachTripmine), ]; + static readonly ActTable[] acttable = [ + new() { BaseAct = Activity.ACT_MP_STAND_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_SLAM, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCH_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_CROUCH_SLAM, Required = false }, + new() { BaseAct = Activity.ACT_MP_RUN, WeaponAct = Activity.ACT_HL2MP_RUN_SLAM, Required = false }, + new() { BaseAct = Activity.ACT_MP_WALK, WeaponAct = Activity.ACT_HL2MP_WALK_SLAM, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCHWALK, WeaponAct = Activity.ACT_HL2MP_WALK_CROUCH_SLAM, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_STAND_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_SLAM, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_CROUCH_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_SLAM, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_STAND, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_SLAM, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_CROUCH, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_SLAM, Required = false }, + new() { BaseAct = Activity.ACT_MP_JUMP, WeaponAct = Activity.ACT_HL2MP_JUMP_SLAM, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM, WeaponAct = Activity.ACT_HL2MP_SWIM_SLAM, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM_IDLE, WeaponAct = Activity.ACT_HL2MP_SWIM_IDLE_SLAM, Required = false }, + ]; + + public override ReadOnlySpan ActivityList() => acttable; + [PredictionTable] public static readonly new PredictionField[] Prediction = [ nameof(SlamState), diff --git a/Game.Shared/GarrysMod/WeaponSMG1.cs b/Game.Shared/GarrysMod/WeaponSMG1.cs index bdc95002..c596b03d 100644 --- a/Game.Shared/GarrysMod/WeaponSMG1.cs +++ b/Game.Shared/GarrysMod/WeaponSMG1.cs @@ -12,6 +12,71 @@ public partial class WeaponSMG1 : HL2MPMachineGun public static readonly new NetworkProp[] Props = [ ]; + static readonly ActTable[] acttable = [ + new() { BaseAct = Activity.ACT_MP_STAND_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_SMG1, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCH_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_CROUCH_SMG1, Required = false }, + new() { BaseAct = Activity.ACT_MP_RUN, WeaponAct = Activity.ACT_HL2MP_RUN_SMG1, Required = false }, + new() { BaseAct = Activity.ACT_MP_WALK, WeaponAct = Activity.ACT_HL2MP_WALK_SMG1, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCHWALK, WeaponAct = Activity.ACT_HL2MP_WALK_CROUCH_SMG1, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_STAND_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_SMG1, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_CROUCH_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_SMG1, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_STAND, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_SMG1, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_CROUCH, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_SMG1, Required = false }, + new() { BaseAct = Activity.ACT_MP_JUMP, WeaponAct = Activity.ACT_HL2MP_JUMP_SMG1, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM, WeaponAct = Activity.ACT_HL2MP_SWIM_SMG1, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM_IDLE, WeaponAct = Activity.ACT_HL2MP_SWIM_IDLE_SMG1, Required = false }, + ]; + + static readonly ActTable[] acttable_npc = [ + new() { BaseAct = Activity.ACT_RANGE_ATTACK1, WeaponAct = Activity.ACT_RANGE_ATTACK_SMG1, Required = true }, + new() { BaseAct = Activity.ACT_RELOAD, WeaponAct = Activity.ACT_RELOAD_SMG1, Required = true }, + new() { BaseAct = Activity.ACT_IDLE, WeaponAct = Activity.ACT_IDLE_SMG1, Required = true }, + new() { BaseAct = Activity.ACT_IDLE_ANGRY, WeaponAct = Activity.ACT_IDLE_ANGRY_SMG1, Required = true }, + new() { BaseAct = Activity.ACT_WALK, WeaponAct = Activity.ACT_WALK_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_WALK_AIM, WeaponAct = Activity.ACT_WALK_AIM_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_IDLE_RELAXED, WeaponAct = Activity.ACT_IDLE_SMG1_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_STIMULATED, WeaponAct = Activity.ACT_IDLE_SMG1_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AGITATED, WeaponAct = Activity.ACT_IDLE_ANGRY_SMG1, Required = false }, + new() { BaseAct = Activity.ACT_WALK_RELAXED, WeaponAct = Activity.ACT_WALK_RIFLE_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_WALK_STIMULATED, WeaponAct = Activity.ACT_WALK_RIFLE_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AGITATED, WeaponAct = Activity.ACT_WALK_AIM_RIFLE, Required = false }, + new() { BaseAct = Activity.ACT_RUN_RELAXED, WeaponAct = Activity.ACT_RUN_RIFLE_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_RUN_STIMULATED, WeaponAct = Activity.ACT_RUN_RIFLE_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AGITATED, WeaponAct = Activity.ACT_RUN_AIM_RIFLE, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AIM_RELAXED, WeaponAct = Activity.ACT_IDLE_SMG1_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AIM_STIMULATED, WeaponAct = Activity.ACT_IDLE_AIM_RIFLE_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AIM_AGITATED, WeaponAct = Activity.ACT_IDLE_ANGRY_SMG1, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM_RELAXED, WeaponAct = Activity.ACT_WALK_RIFLE_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM_STIMULATED, WeaponAct = Activity.ACT_WALK_AIM_RIFLE_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM_AGITATED, WeaponAct = Activity.ACT_WALK_AIM_RIFLE, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AIM_RELAXED, WeaponAct = Activity.ACT_RUN_RIFLE_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AIM_STIMULATED, WeaponAct = Activity.ACT_RUN_AIM_RIFLE_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AIM_AGITATED, WeaponAct = Activity.ACT_RUN_AIM_RIFLE, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM, WeaponAct = Activity.ACT_WALK_AIM_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_WALK_CROUCH, WeaponAct = Activity.ACT_WALK_CROUCH_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_WALK_CROUCH_AIM, WeaponAct = Activity.ACT_WALK_CROUCH_AIM_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_RUN, WeaponAct = Activity.ACT_RUN_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_RUN_AIM, WeaponAct = Activity.ACT_RUN_AIM_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_RUN_CROUCH, WeaponAct = Activity.ACT_RUN_CROUCH_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_RUN_CROUCH_AIM, WeaponAct = Activity.ACT_RUN_CROUCH_AIM_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_GESTURE_RANGE_ATTACK1, WeaponAct = Activity.ACT_GESTURE_RANGE_ATTACK_SMG1, Required = true }, + new() { BaseAct = Activity.ACT_RANGE_ATTACK1_LOW, WeaponAct = Activity.ACT_RANGE_ATTACK_SMG1_LOW, Required = true }, + new() { BaseAct = Activity.ACT_COVER_LOW, WeaponAct = Activity.ACT_COVER_SMG1_LOW, Required = false }, + new() { BaseAct = Activity.ACT_RANGE_AIM_LOW, WeaponAct = Activity.ACT_RANGE_AIM_SMG1_LOW, Required = false }, + new() { BaseAct = Activity.ACT_RELOAD_LOW, WeaponAct = Activity.ACT_RELOAD_SMG1_LOW, Required = false }, + new() { BaseAct = Activity.ACT_GESTURE_RELOAD, WeaponAct = Activity.ACT_GESTURE_RELOAD_SMG1, Required = true }, + new() { BaseAct = Activity.ACT_CROUCHIDLE_STIMULATED, WeaponAct = Activity.ACT_HL2MP_IDLE_CROUCH_SMG1, Required = false }, + new() { BaseAct = Activity.ACT_CROUCHIDLE_AIM_STIMULATED, WeaponAct = Activity.ACT_RANGE_AIM_SMG1_LOW, Required = false }, + new() { BaseAct = Activity.ACT_CROUCHIDLE_AGITATED, WeaponAct = Activity.ACT_RANGE_AIM_SMG1_LOW, Required = false }, + ]; + + public override ReadOnlySpan ActivityList() { + BaseCombatCharacter? owner = GetOwner(); + if (owner != null && owner.IsNPC()) + return acttable_npc; + return acttable; + } + public override float GetFireRate() => 0.075f; public override Activity GetPrimaryAttackActivity() { if (ShotsFired < 2) diff --git a/Game.Shared/GarrysMod/WeaponShotgun.cs b/Game.Shared/GarrysMod/WeaponShotgun.cs index 1e53edaa..1d5a22de 100644 --- a/Game.Shared/GarrysMod/WeaponShotgun.cs +++ b/Game.Shared/GarrysMod/WeaponShotgun.cs @@ -18,6 +18,68 @@ public partial class WeaponShotgun : BaseHL2MPCombatWeapon nameof(DelayedReload), ]; + static readonly ActTable[] acttable = [ + new() { BaseAct = Activity.ACT_MP_STAND_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_SHOTGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCH_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_CROUCH_SHOTGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_RUN, WeaponAct = Activity.ACT_HL2MP_RUN_SHOTGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_WALK, WeaponAct = Activity.ACT_HL2MP_WALK_SHOTGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCHWALK, WeaponAct = Activity.ACT_HL2MP_WALK_CROUCH_SHOTGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_STAND_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_SHOTGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_CROUCH_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_SHOTGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_STAND, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_SHOTGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_CROUCH, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_SHOTGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_JUMP, WeaponAct = Activity.ACT_HL2MP_JUMP_SHOTGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM, WeaponAct = Activity.ACT_HL2MP_SWIM_SHOTGUN, Required = false }, + new() { BaseAct = Activity.ACT_MP_SWIM_IDLE, WeaponAct = Activity.ACT_HL2MP_SWIM_IDLE_SHOTGUN, Required = false }, + ]; + + static readonly ActTable[] acttable_npc = [ + new() { BaseAct = Activity.ACT_IDLE, WeaponAct = Activity.ACT_IDLE_SMG1, Required = true }, + new() { BaseAct = Activity.ACT_RANGE_ATTACK1, WeaponAct = Activity.ACT_RANGE_ATTACK_SHOTGUN, Required = true }, + new() { BaseAct = Activity.ACT_RELOAD, WeaponAct = Activity.ACT_RELOAD_SHOTGUN, Required = false }, + new() { BaseAct = Activity.ACT_WALK, WeaponAct = Activity.ACT_WALK_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_IDLE_ANGRY, WeaponAct = Activity.ACT_IDLE_ANGRY_SHOTGUN, Required = true }, + new() { BaseAct = Activity.ACT_IDLE_RELAXED, WeaponAct = Activity.ACT_IDLE_SHOTGUN_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_STIMULATED, WeaponAct = Activity.ACT_IDLE_SHOTGUN_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AGITATED, WeaponAct = Activity.ACT_IDLE_SHOTGUN_AGITATED, Required = false }, + new() { BaseAct = Activity.ACT_WALK_RELAXED, WeaponAct = Activity.ACT_WALK_RIFLE_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_WALK_STIMULATED, WeaponAct = Activity.ACT_WALK_RIFLE_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AGITATED, WeaponAct = Activity.ACT_WALK_AIM_RIFLE, Required = false }, + new() { BaseAct = Activity.ACT_RUN_RELAXED, WeaponAct = Activity.ACT_RUN_RIFLE_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_RUN_STIMULATED, WeaponAct = Activity.ACT_RUN_RIFLE_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AGITATED, WeaponAct = Activity.ACT_RUN_AIM_RIFLE, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AIM_RELAXED, WeaponAct = Activity.ACT_IDLE_SMG1_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AIM_STIMULATED, WeaponAct = Activity.ACT_IDLE_AIM_RIFLE_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_IDLE_AIM_AGITATED, WeaponAct = Activity.ACT_IDLE_ANGRY_SMG1, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM_RELAXED, WeaponAct = Activity.ACT_WALK_RIFLE_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM_STIMULATED, WeaponAct = Activity.ACT_WALK_AIM_RIFLE_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM_AGITATED, WeaponAct = Activity.ACT_WALK_AIM_RIFLE, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AIM_RELAXED, WeaponAct = Activity.ACT_RUN_RIFLE_RELAXED, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AIM_STIMULATED, WeaponAct = Activity.ACT_RUN_AIM_RIFLE_STIMULATED, Required = false }, + new() { BaseAct = Activity.ACT_RUN_AIM_AGITATED, WeaponAct = Activity.ACT_RUN_AIM_RIFLE, Required = false }, + new() { BaseAct = Activity.ACT_WALK_AIM, WeaponAct = Activity.ACT_WALK_AIM_SHOTGUN, Required = true }, + new() { BaseAct = Activity.ACT_WALK_CROUCH, WeaponAct = Activity.ACT_WALK_CROUCH_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_WALK_CROUCH_AIM, WeaponAct = Activity.ACT_WALK_CROUCH_AIM_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_RUN, WeaponAct = Activity.ACT_RUN_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_RUN_AIM, WeaponAct = Activity.ACT_RUN_AIM_SHOTGUN, Required = true }, + new() { BaseAct = Activity.ACT_RUN_CROUCH, WeaponAct = Activity.ACT_RUN_CROUCH_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_RUN_CROUCH_AIM, WeaponAct = Activity.ACT_RUN_CROUCH_AIM_RIFLE, Required = true }, + new() { BaseAct = Activity.ACT_GESTURE_RANGE_ATTACK1, WeaponAct = Activity.ACT_GESTURE_RANGE_ATTACK_SHOTGUN, Required = true }, + new() { BaseAct = Activity.ACT_RANGE_ATTACK1_LOW, WeaponAct = Activity.ACT_RANGE_ATTACK_SHOTGUN_LOW, Required = true }, + new() { BaseAct = Activity.ACT_RELOAD_LOW, WeaponAct = Activity.ACT_RELOAD_SHOTGUN_LOW, Required = false }, + new() { BaseAct = Activity.ACT_GESTURE_RELOAD, WeaponAct = Activity.ACT_GESTURE_RELOAD_SHOTGUN, Required = false }, + new() { BaseAct = Activity.ACT_CROUCHIDLE_STIMULATED, WeaponAct = Activity.ACT_HL2MP_IDLE_CROUCH_SMG1, Required = false }, + new() { BaseAct = Activity.ACT_CROUCHIDLE_AIM_STIMULATED, WeaponAct = Activity.ACT_RANGE_AIM_SMG1_LOW, Required = false }, + new() { BaseAct = Activity.ACT_CROUCHIDLE_AGITATED, WeaponAct = Activity.ACT_RANGE_AIM_SMG1_LOW, Required = false }, + ]; + + public override ReadOnlySpan ActivityList() { + BaseCombatCharacter? owner = GetOwner(); + if (owner != null && owner.IsNPC()) + return acttable_npc; + return acttable; + } + [PredictionTable] public static readonly new PredictionField[] Prediction = [ nameof(NeedPump), diff --git a/Game.Shared/GarrysMod/WeaponStunStick.cs b/Game.Shared/GarrysMod/WeaponStunStick.cs index da67d87d..42bdb720 100644 --- a/Game.Shared/GarrysMod/WeaponStunStick.cs +++ b/Game.Shared/GarrysMod/WeaponStunStick.cs @@ -30,20 +30,30 @@ public partial class WeaponStunStick : BaseHL2MPBludgeonWeapon public const float STUNSTICK_REFIRE = 0.8f; public const string STUNSTICK_BEAM_MATERIAL = "sprites/lgtning.vmt"; -#if !CLIENT_DLL static readonly ActTable[] acttable = [ - new() { BaseAct = Activity.ACT_RANGE_ATTACK1, WeaponAct = Activity.ACT_RANGE_ATTACK_SLAM, Required = true }, - new() { BaseAct = Activity.ACT_HL2MP_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_MELEE, Required = false }, - new() { BaseAct = Activity.ACT_HL2MP_RUN, WeaponAct = Activity.ACT_HL2MP_RUN_MELEE, Required = false }, - new() { BaseAct = Activity.ACT_HL2MP_IDLE_CROUCH, WeaponAct = Activity.ACT_HL2MP_IDLE_CROUCH_MELEE, Required = false }, - new() { BaseAct = Activity.ACT_HL2MP_WALK_CROUCH, WeaponAct = Activity.ACT_HL2MP_WALK_CROUCH_MELEE, Required = false }, - new() { BaseAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_MELEE, Required = false }, - new() { BaseAct = Activity.ACT_HL2MP_GESTURE_RELOAD, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_MELEE, Required = false }, - new() { BaseAct = Activity.ACT_HL2MP_JUMP, WeaponAct = Activity.ACT_HL2MP_JUMP_MELEE, Required = false }, + new() { BaseAct = Activity.ACT_MP_STAND_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_MELEE, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCH_IDLE, WeaponAct = Activity.ACT_HL2MP_IDLE_CROUCH_MELEE, Required = false }, + new() { BaseAct = Activity.ACT_MP_RUN, WeaponAct = Activity.ACT_HL2MP_RUN_MELEE, Required = false }, + new() { BaseAct = Activity.ACT_MP_WALK, WeaponAct = Activity.ACT_HL2MP_WALK_MELEE, Required = false }, + new() { BaseAct = Activity.ACT_MP_CROUCHWALK, WeaponAct = Activity.ACT_HL2MP_WALK_CROUCH_MELEE, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_STAND_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_MELEE, Required = false }, + new() { BaseAct = Activity.ACT_MP_ATTACK_CROUCH_PRIMARYFIRE, WeaponAct = Activity.ACT_HL2MP_GESTURE_RANGE_ATTACK_MELEE, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_STAND, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_MELEE, Required = false }, + new() { BaseAct = Activity.ACT_MP_RELOAD_CROUCH, WeaponAct = Activity.ACT_HL2MP_GESTURE_RELOAD_MELEE, Required = false }, + new() { BaseAct = Activity.ACT_MP_JUMP, WeaponAct = Activity.ACT_HL2MP_JUMP_MELEE, Required = false }, ]; - public override ReadOnlySpan ActivityList() => acttable; -#endif + static readonly ActTable[] acttable_npc = [ + new() { BaseAct = Activity.ACT_MELEE_ATTACK1, WeaponAct = Activity.ACT_MELEE_ATTACK_SWING, Required = true }, + new() { BaseAct = Activity.ACT_IDLE_ANGRY, WeaponAct = Activity.ACT_IDLE_ANGRY_MELEE, Required = true }, + ]; + + public override ReadOnlySpan ActivityList() { + BaseCombatCharacter? owner = GetOwner(); + if (owner != null && owner.IsNPC()) + return acttable_npc; + return acttable; + } public WeaponStunStick() { Active = false;