Cleanup berserker and add sanity checks

This commit is contained in:
Yamagi Burmeister 2014-02-03 17:48:26 +01:00
parent d97357f177
commit 2c05b79e46
2 changed files with 307 additions and 148 deletions

View file

@ -1,15 +1,13 @@
/*
==============================================================================
BERSERK
==============================================================================
*/
/* =======================================================================
*
* The berserker.
*
* =======================================================================
*/
#include "../../header/local.h"
#include "berserker.h"
static int sound_pain;
static int sound_die;
static int sound_idle;
@ -17,35 +15,57 @@ static int sound_punch;
static int sound_sight;
static int sound_search;
void berserk_sight (edict_t *self, edict_t *other)
{
gi.sound (self, CHAN_VOICE, sound_sight, 1, ATTN_NORM, 0);
void berserk_fidget(edict_t *self);
void
berserk_sight(edict_t *self, edict_t *other)
{
if (!self || !other)
{
return;
}
gi.sound(self, CHAN_VOICE, sound_sight, 1, ATTN_NORM, 0);
}
void berserk_search (edict_t *self)
{
gi.sound (self, CHAN_VOICE, sound_search, 1, ATTN_NORM, 0);
void
berserk_search(edict_t *self)
{
if (!self)
{
return;
}
gi.sound(self, CHAN_VOICE, sound_search, 1, ATTN_NORM, 0);
}
void berserk_fidget (edict_t *self);
mframe_t berserk_frames_stand [] =
{
mframe_t berserk_frames_stand[] = {
{ai_stand, 0, berserk_fidget},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL}
};
mmove_t berserk_move_stand = {FRAME_stand1, FRAME_stand5, berserk_frames_stand, NULL};
void berserk_stand (edict_t *self)
{
mmove_t berserk_move_stand = {
FRAME_stand1,
FRAME_stand5,
berserk_frames_stand,
NULL
};
void
berserk_stand(edict_t *self)
{
if (!self)
{
return;
}
self->monsterinfo.currentmove = &berserk_move_stand;
}
mframe_t berserk_frames_stand_fidget [] =
{
mframe_t berserk_frames_stand_fidget[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -67,22 +87,37 @@ mframe_t berserk_frames_stand_fidget [] =
{ai_stand, 0, NULL},
{ai_stand, 0, NULL}
};
mmove_t berserk_move_stand_fidget = {FRAME_standb1, FRAME_standb20, berserk_frames_stand_fidget, berserk_stand};
void berserk_fidget (edict_t *self)
{
mmove_t berserk_move_stand_fidget = {
FRAME_standb1,
FRAME_standb20,
berserk_frames_stand_fidget,
berserk_stand
};
void
berserk_fidget(edict_t *self)
{
if (!self)
{
return;
}
if (self->monsterinfo.aiflags & AI_STAND_GROUND)
{
return;
}
if (random() > 0.15)
{
return;
}
self->monsterinfo.currentmove = &berserk_move_stand_fidget;
gi.sound (self, CHAN_WEAPON, sound_idle, 1, ATTN_IDLE, 0);
gi.sound(self, CHAN_WEAPON, sound_idle, 1, ATTN_IDLE, 0);
}
mframe_t berserk_frames_walk [] =
{
mframe_t berserk_frames_walk[] = {
{ai_walk, 9.1, NULL},
{ai_walk, 6.3, NULL},
{ai_walk, 4.9, NULL},
@ -96,15 +131,26 @@ mframe_t berserk_frames_walk [] =
{ai_walk, 4.7, NULL},
{ai_walk, 4.8, NULL}
};
mmove_t berserk_move_walk = {FRAME_walkc1, FRAME_walkc11, berserk_frames_walk, NULL};
void berserk_walk (edict_t *self)
{
mmove_t berserk_move_walk = {
FRAME_walkc1,
FRAME_walkc11,
berserk_frames_walk,
NULL
};
void
berserk_walk(edict_t *self)
{
if (!self)
{
return;
}
self->monsterinfo.currentmove = &berserk_move_walk;
}
mframe_t berserk_frames_run1 [] =
{
mframe_t berserk_frames_run1[] = {
{ai_run, 21, NULL},
{ai_run, 11, NULL},
{ai_run, 21, NULL},
@ -112,53 +158,88 @@ mframe_t berserk_frames_run1 [] =
{ai_run, 18, NULL},
{ai_run, 19, NULL}
};
mmove_t berserk_move_run1 = {FRAME_run1, FRAME_run6, berserk_frames_run1, NULL};
void berserk_run (edict_t *self)
{
if (self->monsterinfo.aiflags & AI_STAND_GROUND)
self->monsterinfo.currentmove = &berserk_move_stand;
else
self->monsterinfo.currentmove = &berserk_move_run1;
}
void berserk_attack_spike (edict_t *self)
{
static vec3_t aim = {MELEE_DISTANCE, 0, -24};
fire_hit (self, aim, (15 + (rand() % 6)), 400); // Faster attack -- upwards and backwards
}
void berserk_swing (edict_t *self)
{
gi.sound (self, CHAN_WEAPON, sound_punch, 1, ATTN_NORM, 0);
}
mframe_t berserk_frames_attack_spike [] =
{
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, berserk_swing},
{ai_charge, 0, berserk_attack_spike},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL}
mmove_t berserk_move_run1 = {
FRAME_run1,
FRAME_run6,
berserk_frames_run1,
NULL
};
mmove_t berserk_move_attack_spike = {FRAME_att_c1, FRAME_att_c8, berserk_frames_attack_spike, berserk_run};
void berserk_attack_club (edict_t *self)
{
vec3_t aim;
VectorSet (aim, MELEE_DISTANCE, self->mins[0], -4);
fire_hit (self, aim, (5 + (rand() % 6)), 400); // Slower attack
void
berserk_run(edict_t *self)
{
if (!self)
{
return;
}
if (self->monsterinfo.aiflags & AI_STAND_GROUND)
{
self->monsterinfo.currentmove = &berserk_move_stand;
}
else
{
self->monsterinfo.currentmove = &berserk_move_run1;
}
}
mframe_t berserk_frames_attack_club [] =
{
void
berserk_attack_spike(edict_t *self)
{
if (!self)
{
return;
}
static vec3_t aim = {MELEE_DISTANCE, 0, -24};
fire_hit(self, aim, (15 + (rand() % 6)), 400);
}
void
berserk_swing(edict_t *self)
{
if (!self)
{
return;
}
gi.sound(self, CHAN_WEAPON, sound_punch, 1, ATTN_NORM, 0);
}
mframe_t berserk_frames_attack_spike[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, berserk_swing},
{ai_charge, 0, berserk_attack_spike},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL}
};
mmove_t berserk_move_attack_spike = {
FRAME_att_c1,
FRAME_att_c8,
berserk_frames_attack_spike,
berserk_run
};
void
berserk_attack_club(edict_t *self)
{
vec3_t aim;
if (!self)
{
return;
}
VectorSet(aim, MELEE_DISTANCE, self->mins[0], -4);
fire_hit(self, aim, (5 + (rand() % 6)), 400);
}
mframe_t berserk_frames_attack_club[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
@ -172,16 +253,20 @@ mframe_t berserk_frames_attack_club [] =
{ai_charge, 0, NULL},
{ai_charge, 0, NULL}
};
mmove_t berserk_move_attack_club = {FRAME_att_c9, FRAME_att_c20, berserk_frames_attack_club, berserk_run};
mmove_t berserk_move_attack_club = {
FRAME_att_c9,
FRAME_att_c20,
berserk_frames_attack_club,
berserk_run
};
void berserk_strike (edict_t *self)
void
berserk_strike(edict_t *self)
{
}
mframe_t berserk_frames_attack_strike [] =
{
mframe_t berserk_frames_attack_strike[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -197,30 +282,47 @@ mframe_t berserk_frames_attack_strike [] =
{ai_move, 9.7, NULL},
{ai_move, 13.6, NULL}
};
mmove_t berserk_move_attack_strike = {FRAME_att_c21, FRAME_att_c34, berserk_frames_attack_strike, berserk_run};
mmove_t berserk_move_attack_strike = {
FRAME_att_c21,
FRAME_att_c34,
berserk_frames_attack_strike,
berserk_run
};
void berserk_melee (edict_t *self)
{
void
berserk_melee(edict_t *self)
{
if (!self)
{
return;
}
if ((rand() % 2) == 0)
{
self->monsterinfo.currentmove = &berserk_move_attack_spike;
}
else
{
self->monsterinfo.currentmove = &berserk_move_attack_club;
}
}
mframe_t berserk_frames_pain1 [] =
{
mframe_t berserk_frames_pain1[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL}
};
mmove_t berserk_move_pain1 = {FRAME_painc1, FRAME_painc4, berserk_frames_pain1, berserk_run};
mmove_t berserk_move_pain1 = {
FRAME_painc1,
FRAME_painc4,
berserk_frames_pain1,
berserk_run
};
mframe_t berserk_frames_pain2 [] =
{
mframe_t berserk_frames_pain2[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -242,42 +344,67 @@ mframe_t berserk_frames_pain2 [] =
{ai_move, 0, NULL},
{ai_move, 0, NULL}
};
mmove_t berserk_move_pain2 = {FRAME_painb1, FRAME_painb20, berserk_frames_pain2, berserk_run};
void berserk_pain (edict_t *self, edict_t *other, float kick, int damage)
{
mmove_t berserk_move_pain2 = {
FRAME_painb1,
FRAME_painb20,
berserk_frames_pain2,
berserk_run
};
void
berserk_pain(edict_t *self, edict_t *other /* unused */, float kick, int damage)
{
if (!self)
{
return;
}
if (self->health < (self->max_health / 2))
{
self->s.skinnum = 1;
}
if (level.time < self->pain_debounce_time)
{
return;
}
self->pain_debounce_time = level.time + 3;
gi.sound (self, CHAN_VOICE, sound_pain, 1, ATTN_NORM, 0);
gi.sound(self, CHAN_VOICE, sound_pain, 1, ATTN_NORM, 0);
if (skill->value == 3)
return; // no pain anims in nightmare
{
return; /* no pain anims in nightmare */
}
if ((damage < 20) || (random() < 0.5))
{
self->monsterinfo.currentmove = &berserk_move_pain1;
}
else
{
self->monsterinfo.currentmove = &berserk_move_pain2;
}
}
void berserk_dead (edict_t *self)
{
VectorSet (self->mins, -16, -16, -24);
VectorSet (self->maxs, 16, 16, -8);
void
berserk_dead(edict_t *self)
{
if (!self)
{
return;
}
VectorSet(self->mins, -16, -16, -24);
VectorSet(self->maxs, 16, 16, -8);
self->movetype = MOVETYPE_TOSS;
self->svflags |= SVF_DEADMONSTER;
self->nextthink = 0;
gi.linkentity (self);
gi.linkentity(self);
}
mframe_t berserk_frames_death1 [] =
{
mframe_t berserk_frames_death1[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -291,13 +418,16 @@ mframe_t berserk_frames_death1 [] =
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL}
};
mmove_t berserk_move_death1 = {FRAME_death1, FRAME_death13, berserk_frames_death1, berserk_dead};
mmove_t berserk_move_death1 = {
FRAME_death1,
FRAME_death13,
berserk_frames_death1,
berserk_dead
};
mframe_t berserk_frames_death2 [] =
{
mframe_t berserk_frames_death2[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -307,60 +437,91 @@ mframe_t berserk_frames_death2 [] =
{ai_move, 0, NULL},
{ai_move, 0, NULL}
};
mmove_t berserk_move_death2 = {FRAME_deathc1, FRAME_deathc8, berserk_frames_death2, berserk_dead};
mmove_t berserk_move_death2 = {
FRAME_deathc1,
FRAME_deathc8,
berserk_frames_death2,
berserk_dead
};
void berserk_die (edict_t *self, edict_t *inflictor, edict_t *attacker, int damage, vec3_t point)
void
berserk_die(edict_t *self, edict_t *inflictor /* unused */, edict_t *attacker /* unused */,
int damage, vec3_t point)
{
int n;
int n;
if (!self)
{
return;
}
if (self->health <= self->gib_health)
{
gi.sound (self, CHAN_VOICE, gi.soundindex ("misc/udeath.wav"), 1, ATTN_NORM, 0);
for (n= 0; n < 2; n++)
ThrowGib (self, "models/objects/gibs/bone/tris.md2", damage, GIB_ORGANIC);
for (n= 0; n < 4; n++)
ThrowGib (self, "models/objects/gibs/sm_meat/tris.md2", damage, GIB_ORGANIC);
ThrowHead (self, "models/objects/gibs/head2/tris.md2", damage, GIB_ORGANIC);
gi.sound(self, CHAN_VOICE, gi.soundindex("misc/udeath.wav"), 1, ATTN_NORM, 0);
for (n = 0; n < 2; n++)
{
ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, GIB_ORGANIC);
}
for (n = 0; n < 4; n++)
{
ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, GIB_ORGANIC);
}
ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, GIB_ORGANIC);
self->deadflag = DEAD_DEAD;
return;
}
if (self->deadflag == DEAD_DEAD)
{
return;
}
gi.sound (self, CHAN_VOICE, sound_die, 1, ATTN_NORM, 0);
gi.sound(self, CHAN_VOICE, sound_die, 1, ATTN_NORM, 0);
self->deadflag = DEAD_DEAD;
self->takedamage = DAMAGE_YES;
if (damage >= 50)
{
self->monsterinfo.currentmove = &berserk_move_death1;
}
else
{
self->monsterinfo.currentmove = &berserk_move_death2;
}
}
/*QUAKED monster_berserk (1 .5 0) (-16 -16 -24) (16 16 32) Ambush Trigger_Spawn Sight
*/
void SP_monster_berserk (edict_t *self)
{
/*
* QUAKED monster_berserk (1 .5 0) (-16 -16 -24) (16 16 32) Ambush Trigger_Spawn Sight
*/
void
SP_monster_berserk(edict_t *self)
{
if (!self)
{
return;
}
if (deathmatch->value)
{
G_FreeEdict (self);
G_FreeEdict(self);
return;
}
// pre-caches
sound_pain = gi.soundindex ("berserk/berpain2.wav");
sound_die = gi.soundindex ("berserk/berdeth2.wav");
sound_idle = gi.soundindex ("berserk/beridle1.wav");
sound_punch = gi.soundindex ("berserk/attack.wav");
sound_search = gi.soundindex ("berserk/bersrch1.wav");
sound_sight = gi.soundindex ("berserk/sight.wav");
/* pre-caches */
sound_pain = gi.soundindex("berserk/berpain2.wav");
sound_die = gi.soundindex("berserk/berdeth2.wav");
sound_idle = gi.soundindex("berserk/beridle1.wav");
sound_punch = gi.soundindex("berserk/attack.wav");
sound_search = gi.soundindex("berserk/bersrch1.wav");
sound_sight = gi.soundindex("berserk/sight.wav");
self->s.modelindex = gi.modelindex("models/monsters/berserk/tris.md2");
VectorSet (self->mins, -16, -16, -24);
VectorSet (self->maxs, 16, 16, 32);
VectorSet(self->mins, -16, -16, -24);
VectorSet(self->maxs, 16, 16, 32);
self->movetype = MOVETYPE_STEP;
self->solid = SOLID_BBOX;
@ -383,8 +544,7 @@ void SP_monster_berserk (edict_t *self)
self->monsterinfo.currentmove = &berserk_move_stand;
self->monsterinfo.scale = MODEL_SCALE;
gi.linkentity (self);
gi.linkentity(self);
walkmonster_start (self);
walkmonster_start(self);
}

View file

@ -1,7 +1,10 @@
// G:\quake2\baseq2\models/monsters/berserk
// This file generated by ModelGen - Do NOT Modify
/* =======================================================================
*
* Berserker animations.
*
* =======================================================================
*/
#define FRAME_stand1 0
#define FRAME_stand2 1
#define FRAME_stand3 2
@ -246,8 +249,6 @@
#define FRAME_deathc6 241
#define FRAME_deathc7 242
#define FRAME_deathc8 243
//PGM
#define FRAME_jump1 244
#define FRAME_jump2 245
#define FRAME_jump3 246
@ -257,6 +258,4 @@
#define FRAME_jump7 250
#define FRAME_jump8 251
#define FRAME_jump9 252
//PGM
#define MODEL_SCALE 1.000000
#define MODEL_SCALE 1.000000