MON_ADD_CVAR(monster, attack_grenade_radius) \
MON_ADD_CVAR(monster, attack_grenade_speed) \
MON_ADD_CVAR(monster, attack_grenade_speed_up) \
+ MON_ADD_CVAR(monster, speed_stop) \
MON_ADD_CVAR(monster, speed_run) \
MON_ADD_CVAR(monster, speed_walk)
self.brute_cycles += 1;
self.angles_y = self.angles_y + random()* 25;
- monster_melee(self.enemy, MON_CVAR(brute, attack_chainsaw_damage), 0.3, DEATH_MONSTER_BRUTE_BLADE, TRUE);
+ monster_melee(self.enemy, MON_CVAR(brute, attack_chainsaw_damage), self.attack_range, DEATH_MONSTER_BRUTE_BLADE, TRUE);
if(self.brute_cycles <= 4)
defer(0.2, brute_blade);
monster_makevectors(self.enemy);
- W_SetupShot (self, autocvar_g_antilag_bullets && 18000 >= autocvar_g_antilag_bullets, 0, "weapons/uzi_fire.wav", CH_WEAPON_A, MON_CVAR(brute, attack_uzi_damage));
- fireBallisticBullet(w_shotorg, w_shotdir, 0.02, 18000, 5, MON_CVAR(brute, attack_uzi_damage), MON_CVAR(brute, attack_uzi_force), DEATH_MONSTER_BRUTE_UZI, 0, 1, 115);
+ sound(self, CH_WEAPON_A, "weapons/uzi_fire.wav", VOL_BASE, ATTEN_NORM);
+ fireBallisticBullet(CENTER_OR_VIEWOFS(self), v_forward, 0.02, 18000, 5, MON_CVAR(brute, attack_uzi_damage), MON_CVAR(brute, attack_uzi_force), DEATH_MONSTER_BRUTE_UZI, 0, 1, 115);
endFireBallisticBullet();
if(self.brute_cycles <= MON_CVAR(brute, attack_uzi_bullets))
void brute_grenade_explode()
{
pointparticles(particleeffectnum("grenade_explode"), self.origin, '0 0 0', 1);
- sound(self, CH_SHOTS, "weapons/grenade_impact.wav", VOL_BASE, ATTN_NORM);
+ sound(self, CH_SHOTS, "weapons/grenade_impact.wav", VOL_BASE, ATTEN_NORM);
self.event_damage = func_null;
self.takedamage = DAMAGE_NO;
void brute_grenade()
{
entity gren;
-
- W_SetupShot_ProjectileSize (self, '-3 -3 -3', '3 3 3', FALSE, 4, "weapons/grenade_fire.wav", CH_WEAPON_A, MON_CVAR(brute, attack_grenade_damage));
- w_shotdir = v_forward; // no TrueAim for grenades please
+
+ monster_makevectors(self.enemy);
+
+ sound(self, CH_WEAPON_A, "weapons/grenade_fire.wav", VOL_BASE, ATTEN_NORM);
gren = spawn ();
gren.owner = gren.realowner = self;
gren.movetype = MOVETYPE_BOUNCE;
PROJECTILE_MAKETRIGGER(gren);
gren.projectiledeathtype = DEATH_MONSTER_BRUTE_GRENADE;
- setorigin(gren, w_shotorg);
+ setorigin(gren, CENTER_OR_VIEWOFS(self));
setsize(gren, '-3 -3 -3', '3 3 3');
gren.cnt = time + 5;
gren.event_damage = brute_grenade_damage;
gren.damagedbycontents = TRUE;
gren.missile_flags = MIF_SPLASH | MIF_ARC;
- W_SetupProjectileVelocityEx(gren, w_shotdir, v_up, MON_CVAR(brute, attack_grenade_speed), MON_CVAR(brute, attack_grenade_speed_up), 0, 0, FALSE);
+ W_SetupProjectileVelocityEx(gren, v_forward, v_up, MON_CVAR(brute, attack_grenade_speed), MON_CVAR(brute, attack_grenade_speed_up), 0, 0, FALSE);
gren.angles = vectoangles (gren.velocity);
gren.flags = FL_PROJECTILE;
if not(monster_initialize(MON_BRUTE, FALSE)) { remove(self); return; }
}
+// compatibility with old spawns
+void spawnfunc_monster_ogre() { spawnfunc_monster_brute(); }
+
float m_brute(float req)
{
switch(req)
{
case MR_THINK:
{
- monster_move(MON_CVAR(brute, speed_run), MON_CVAR(brute, speed_walk), 300, brute_anim_run, brute_anim_walk, brute_anim_idle);
+ monster_move(MON_CVAR(brute, speed_run), MON_CVAR(brute, speed_walk), MON_CVAR(brute, speed_stop), brute_anim_run, brute_anim_walk, brute_anim_idle);
return TRUE;
}
case MR_DEATH:
case MR_SETUP:
{
if not(self.health) self.health = MON_CVAR(brute, health);
-
+
+ self.monster_loot = spawnfunc_item_bullets;
self.monster_attackfunc = brute_attack;
monsters_setframe(brute_anim_idle);
self.weapon = WEP_GRENADE_LAUNCHER;