Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 70 additions & 0 deletions Game.Shared/GarrysMod/Weapon357.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<ActTable> ActivityList() {
BaseCombatCharacter? owner = GetOwner();
if (owner != null && owner.IsNPC())
return acttable_npc;
return acttable;
}

public override void PrimaryAttack() {
BasePlayer? player = ToBasePlayer(GetOwner());

Expand Down
64 changes: 64 additions & 0 deletions Game.Shared/GarrysMod/WeaponAR2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<ActTable> ActivityList() {
BaseCombatCharacter? owner = GetOwner();
if (owner != null && owner.IsNPC())
return acttable_npc;
return acttable;
}

public override float GetFireRate() => 0.1f;
}
#endif
17 changes: 17 additions & 0 deletions Game.Shared/GarrysMod/WeaponBugBait.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<ActTable> ActivityList() => acttable;

[PredictionTable]
public static readonly new PredictionField[] Prediction = [
nameof(Redraw),
Expand Down
Loading
Loading