Skip to content

Commit eb3bbf8

Browse files
committed
SERVER: Update frame calls for new Bowie Knife
1 parent f3a0c0b commit eb3bbf8

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

source/server/entities/wall_weapon.qc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ void () WallWeapon_TouchTrigger =
326326
W_HideCrosshair(other);
327327
Player_RemoveScore(other, self.cost2);
328328
Sound_PlaySound(other, "sounds/misc/ching.wav", SOUND_TYPE_ENV_CHING, SOUND_PRIORITY_PLAYALWAYS);
329+
Sound_PlaySound(other, "sounds/weapons/knife/bowie.wav", SOUND_TYPE_WEAPON_OTHER, SOUND_PRIORITY_PLAYALWAYS);
329330
other.ach_tracker_coll++;
330331
if (self.enemy)
331332
{
@@ -334,7 +335,7 @@ void () WallWeapon_TouchTrigger =
334335
entity tempz;
335336
tempz = self;
336337
self = other;
337-
Set_W_Frame(15, 30, 2.75, 0, 0, W_PlayTakeOut, "models/weapons/knife/v_bowie.mdl", false, S_BOTH, true);
338+
Set_W_Frame(16, 43, 2.75, 0, 0, W_PlayTakeOut, "models/weapons/knife/v_bowie.mdl", false, S_BOTH, true);
338339
self.has_bowie_knife = true;
339340
}
340341
}

source/shared/weapon_stats.qc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3762,6 +3762,9 @@ void(float weptype) precache_extra =
37623762
case W_BETTY:
37633763
precache_model("models/weapons/grenade/g_betty.mdl");
37643764
break;
3765+
case W_BOWIE:
3766+
precache_sound("sounds/weapons/knife/bowie.wav");
3767+
break;
37653768
}
37663769
}
37673770

@@ -4676,8 +4679,8 @@ float(float weapon) WepDef_GetWeaponMeleeRange =
46764679
// FIXME -- data-drive these.
46774680
#define MELEE_BOWIE_FIRST_FRAME_NORMAL 0
46784681
#define MELEE_BOWIE_LAST_FRAME_NORMAL 3
4679-
#define MELEE_BOWIE_FIRST_FRAME_LUNGED 4
4680-
#define MELEE_BOWIE_LAST_FRAME_LUNGED 10
4682+
#define MELEE_BOWIE_FIRST_FRAME_LUNGED 5
4683+
#define MELEE_BOWIE_LAST_FRAME_LUNGED 15
46814684
#define MELEE_BOWIE_DURATION_NORMAL 0.65
46824685
#define MELEE_BOWIE_DURATION_LUNGED 1.0
46834686
#define MELEE_BOWIE_VIEWMODEL_PATH "models/weapons/knife/v_bowie.mdl"

0 commit comments

Comments
 (0)