yquake2
/
zaero
mirror of https://github.com/yquake2/zaero.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Actor und Berserker aufgeräumt

This commit is contained in:
Yamagi Burmeister 2009-10-07 09:11:27 +00:00
parent 1d1062b173
commit ca12654654
2 changed files with 259 additions and 315 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

261
src/m_actor.c
View File

@ -19,49 +19,49 @@ char *actor_names[MAX_ACTOR_NAMES] =
mframe_t actor_frames_stand [] = mframe_t actor_frames_stand [] =
{ {
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL {ai_stand, 0, NULL}
}; };
mmove_t actor_move_stand = {FRAME_stand101, FRAME_stand140, actor_frames_stand, NULL}; mmove_t actor_move_stand = {FRAME_stand101, FRAME_stand140, actor_frames_stand, NULL};
@ -77,17 +77,17 @@ void actor_stand (edict_t *self)
mframe_t actor_frames_walk [] = mframe_t actor_frames_walk [] =
{ {
ai_walk, 0, NULL, {ai_walk, 0, NULL},
ai_walk, 6, NULL, {ai_walk, 6, NULL},
ai_walk, 10, NULL, {ai_walk, 10, NULL},
ai_walk, 3, NULL, {ai_walk, 3, NULL},
ai_walk, 2, NULL, {ai_walk, 2, NULL},
ai_walk, 7, NULL, {ai_walk, 7, NULL},
ai_walk, 10, NULL, {ai_walk, 10, NULL},
ai_walk, 1, NULL, {ai_walk, 1, NULL},
ai_walk, 4, NULL, {ai_walk, 4, NULL},
ai_walk, 0, NULL, {ai_walk, 0, NULL},
ai_walk, 0, NULL {ai_walk, 0, NULL}
}; };
mmove_t actor_move_walk = {FRAME_walk01, FRAME_walk08, actor_frames_walk, NULL}; mmove_t actor_move_walk = {FRAME_walk01, FRAME_walk08, actor_frames_walk, NULL};
@ -99,18 +99,18 @@ void actor_walk (edict_t *self)
mframe_t actor_frames_run [] = mframe_t actor_frames_run [] =
{ {
ai_run, 4, NULL, {ai_run, 4, NULL},
ai_run, 15, NULL, {ai_run, 15, NULL},
ai_run, 15, NULL, {ai_run, 15, NULL},
ai_run, 8, NULL, {ai_run, 8, NULL},
ai_run, 20, NULL, {ai_run, 20, NULL},
ai_run, 15, NULL, {ai_run, 15, NULL},
ai_run, 8, NULL, {ai_run, 8, NULL},
ai_run, 17, NULL, {ai_run, 17, NULL},
ai_run, 12, NULL, {ai_run, 12, NULL},
ai_run, -2, NULL, {ai_run, -2, NULL},
ai_run, -2, NULL, {ai_run, -2, NULL},
ai_run, -1, NULL {ai_run, -1, NULL}
}; };
mmove_t actor_move_run = {FRAME_run02, FRAME_run07, actor_frames_run, NULL}; mmove_t actor_move_run = {FRAME_run02, FRAME_run07, actor_frames_run, NULL};
@ -137,66 +137,66 @@ void actor_run (edict_t *self)
mframe_t actor_frames_pain1 [] = mframe_t actor_frames_pain1 [] =
{ {
ai_move, -5, NULL, {ai_move, -5, NULL},
ai_move, 4, NULL, {ai_move, 4, NULL},
ai_move, 1, NULL {ai_move, 1, NULL}
}; };
mmove_t actor_move_pain1 = {FRAME_pain101, FRAME_pain103, actor_frames_pain1, actor_run}; mmove_t actor_move_pain1 = {FRAME_pain101, FRAME_pain103, actor_frames_pain1, actor_run};
mframe_t actor_frames_pain2 [] = mframe_t actor_frames_pain2 [] =
{ {
ai_move, -4, NULL, {ai_move, -4, NULL},
ai_move, 4, NULL, {ai_move, 4, NULL},
ai_move, 0, NULL {ai_move, 0, NULL}
}; };
mmove_t actor_move_pain2 = {FRAME_pain201, FRAME_pain203, actor_frames_pain2, actor_run}; mmove_t actor_move_pain2 = {FRAME_pain201, FRAME_pain203, actor_frames_pain2, actor_run};
mframe_t actor_frames_pain3 [] = mframe_t actor_frames_pain3 [] =
{ {
ai_move, -1, NULL, {ai_move, -1, NULL},
ai_move, 1, NULL, {ai_move, 1, NULL},
ai_move, 0, NULL {ai_move, 0, NULL}
}; };
mmove_t actor_move_pain3 = {FRAME_pain301, FRAME_pain303, actor_frames_pain3, actor_run}; mmove_t actor_move_pain3 = {FRAME_pain301, FRAME_pain303, actor_frames_pain3, actor_run};
mframe_t actor_frames_flipoff [] = mframe_t actor_frames_flipoff [] =
{ {
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL {ai_turn, 0, NULL}
}; };
mmove_t actor_move_flipoff = {FRAME_flip01, FRAME_flip14, actor_frames_flipoff, actor_run}; mmove_t actor_move_flipoff = {FRAME_flip01, FRAME_flip14, actor_frames_flipoff, actor_run};
mframe_t actor_frames_taunt [] = mframe_t actor_frames_taunt [] =
{ {
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL, {ai_turn, 0, NULL},
ai_turn, 0, NULL {ai_turn, 0, NULL}
}; };
mmove_t actor_move_taunt = {FRAME_taunt01, FRAME_taunt17, actor_frames_taunt, actor_run}; mmove_t actor_move_taunt = {FRAME_taunt01, FRAME_taunt17, actor_frames_taunt, actor_run};
@ -219,7 +219,6 @@ void actor_pain (edict_t *self, edict_t *other, float kick, int damage)
return; return;
self->pain_debounce_time = level.time + 3; self->pain_debounce_time = level.time + 3;
// gi.sound (self, CHAN_VOICE, actor.sound_pain, 1, ATTN_NORM, 0);
if ((other->client) && (random() < 0.4)) if ((other->client) && (random() < 0.4))
{ {
@ -289,31 +288,31 @@ void actor_dead (edict_t *self)
mframe_t actor_frames_death1 [] = mframe_t actor_frames_death1 [] =
{ {
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, -13, NULL, {ai_move, -13, NULL},
ai_move, 14, NULL, {ai_move, 14, NULL},
ai_move, 3, NULL, {ai_move, 3, NULL},
ai_move, -2, NULL, {ai_move, -2, NULL},
ai_move, 1, NULL {ai_move, 1, NULL}
}; };
mmove_t actor_move_death1 = {FRAME_death101, FRAME_death107, actor_frames_death1, actor_dead}; mmove_t actor_move_death1 = {FRAME_death101, FRAME_death107, actor_frames_death1, actor_dead};
mframe_t actor_frames_death2 [] = mframe_t actor_frames_death2 [] =
{ {
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 7, NULL, {ai_move, 7, NULL},
ai_move, -6, NULL, {ai_move, -6, NULL},
ai_move, -5, NULL, {ai_move, -5, NULL},
ai_move, 1, NULL, {ai_move, 1, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, -1, NULL, {ai_move, -1, NULL},
ai_move, -2, NULL, {ai_move, -2, NULL},
ai_move, -1, NULL, {ai_move, -1, NULL},
ai_move, -9, NULL, {ai_move, -9, NULL},
ai_move, -13, NULL, {ai_move, -13, NULL},
ai_move, -13, NULL, {ai_move, -13, NULL},
ai_move, 0, NULL {ai_move, 0, NULL}
}; };
mmove_t actor_move_death2 = {FRAME_death201, FRAME_death213, actor_frames_death2, actor_dead}; mmove_t actor_move_death2 = {FRAME_death201, FRAME_death213, actor_frames_death2, actor_dead};
@ -321,10 +320,9 @@ void actor_die (edict_t *self, edict_t *inflictor, edict_t *attacker, int damage
{ {
int n; int n;
// check for gib // check for gib
if (self->health <= -80) if (self->health <= -80)
{ {
// gi.sound (self, CHAN_VOICE, actor.sound_gib, 1, ATTN_NORM, 0);
for (n= 0; n < 2; n++) for (n= 0; n < 2; n++)
ThrowGib (self, "models/objects/gibs/bone/tris.md2", damage, GIB_ORGANIC); ThrowGib (self, "models/objects/gibs/bone/tris.md2", damage, GIB_ORGANIC);
for (n= 0; n < 4; n++) for (n= 0; n < 4; n++)
@ -337,8 +335,7 @@ void actor_die (edict_t *self, edict_t *inflictor, edict_t *attacker, int damage
if (self->deadflag == DEAD_DEAD) if (self->deadflag == DEAD_DEAD)
return; return;
// regular death // regular death
// gi.sound (self, CHAN_VOICE, actor.sound_die, 1, ATTN_NORM, 0);
self->deadflag = DEAD_DEAD; self->deadflag = DEAD_DEAD;
self->takedamage = DAMAGE_YES; self->takedamage = DAMAGE_YES;
@ -362,10 +359,10 @@ void actor_fire (edict_t *self)
mframe_t actor_frames_attack [] = mframe_t actor_frames_attack [] =
{ {
ai_charge, -2, actor_fire, {ai_charge, -2, actor_fire},
ai_charge, -2, NULL, {ai_charge, -2, NULL},
ai_charge, 3, NULL, {ai_charge, 3, NULL},
ai_charge, 2, NULL {ai_charge, 2, NULL}
}; };
mmove_t actor_move_attack = {FRAME_attak01, FRAME_attak04, actor_frames_attack, actor_run}; mmove_t actor_move_attack = {FRAME_attak01, FRAME_attak04, actor_frames_attack, actor_run};

313
src/m_berserk.c
View File

@ -31,11 +31,11 @@ void berserk_search (edict_t *self)
void berserk_fidget (edict_t *self); void berserk_fidget (edict_t *self);
mframe_t berserk_frames_stand [] = mframe_t berserk_frames_stand [] =
{ {
ai_stand, 0, berserk_fidget, {ai_stand, 0, berserk_fidget},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
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}; mmove_t berserk_move_stand = {FRAME_stand1, FRAME_stand5, berserk_frames_stand, NULL};
@ -46,26 +46,26 @@ void berserk_stand (edict_t *self)
mframe_t berserk_frames_stand_fidget [] = mframe_t berserk_frames_stand_fidget [] =
{ {
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL, {ai_stand, 0, NULL},
ai_stand, 0, NULL {ai_stand, 0, NULL}
}; };
mmove_t berserk_move_stand_fidget = {FRAME_standb1, FRAME_standb20, berserk_frames_stand_fidget, berserk_stand}; mmove_t berserk_move_stand_fidget = {FRAME_standb1, FRAME_standb20, berserk_frames_stand_fidget, berserk_stand};
@ -83,18 +83,18 @@ void berserk_fidget (edict_t *self)
mframe_t berserk_frames_walk [] = mframe_t berserk_frames_walk [] =
{ {
ai_walk, 9.1, NULL, {ai_walk, 9.1, NULL},
ai_walk, 6.3, NULL, {ai_walk, 6.3, NULL},
ai_walk, 4.9, NULL, {ai_walk, 4.9, NULL},
ai_walk, 6.7, NULL, {ai_walk, 6.7, NULL},
ai_walk, 6.0, NULL, {ai_walk, 6.0, NULL},
ai_walk, 8.2, NULL, {ai_walk, 8.2, NULL},
ai_walk, 7.2, NULL, {ai_walk, 7.2, NULL},
ai_walk, 6.1, NULL, {ai_walk, 6.1, NULL},
ai_walk, 4.9, NULL, {ai_walk, 4.9, NULL},
ai_walk, 4.7, NULL, {ai_walk, 4.7, NULL},
ai_walk, 4.7, NULL, {ai_walk, 4.7, NULL},
ai_walk, 4.8, NULL {ai_walk, 4.8, NULL}
}; };
mmove_t berserk_move_walk = {FRAME_walkc1, FRAME_walkc11, berserk_frames_walk, NULL}; mmove_t berserk_move_walk = {FRAME_walkc1, FRAME_walkc11, berserk_frames_walk, NULL};
@ -103,39 +103,14 @@ void berserk_walk (edict_t *self)
self->monsterinfo.currentmove = &berserk_move_walk; self->monsterinfo.currentmove = &berserk_move_walk;
} }
/*
*****************************
SKIPPED THIS FOR NOW!
*****************************
Running -> Arm raised in air
void() berserk_runb1 =[ $r_att1 , berserk_runb2 ] {ai_run(21);};
void() berserk_runb2 =[ $r_att2 , berserk_runb3 ] {ai_run(11);};
void() berserk_runb3 =[ $r_att3 , berserk_runb4 ] {ai_run(21);};
void() berserk_runb4 =[ $r_att4 , berserk_runb5 ] {ai_run(25);};
void() berserk_runb5 =[ $r_att5 , berserk_runb6 ] {ai_run(18);};
void() berserk_runb6 =[ $r_att6 , berserk_runb7 ] {ai_run(19);};
// running with arm in air : start loop
void() berserk_runb7 =[ $r_att7 , berserk_runb8 ] {ai_run(21);};
void() berserk_runb8 =[ $r_att8 , berserk_runb9 ] {ai_run(11);};
void() berserk_runb9 =[ $r_att9 , berserk_runb10 ] {ai_run(21);};
void() berserk_runb10 =[ $r_att10 , berserk_runb11 ] {ai_run(25);};
void() berserk_runb11 =[ $r_att11 , berserk_runb12 ] {ai_run(18);};
void() berserk_runb12 =[ $r_att12 , berserk_runb7 ] {ai_run(19);};
// running with arm in air : end loop
*/
mframe_t berserk_frames_run1 [] = mframe_t berserk_frames_run1 [] =
{ {
ai_run, 21, NULL, {ai_run, 21, NULL},
ai_run, 11, NULL, {ai_run, 11, NULL},
ai_run, 21, NULL, {ai_run, 21, NULL},
ai_run, 25, NULL, {ai_run, 25, NULL},
ai_run, 18, NULL, {ai_run, 18, NULL},
ai_run, 19, NULL {ai_run, 19, NULL}
}; };
mmove_t berserk_move_run1 = {FRAME_run1, FRAME_run6, berserk_frames_run1, NULL}; mmove_t berserk_move_run1 = {FRAME_run1, FRAME_run6, berserk_frames_run1, NULL};
@ -162,14 +137,14 @@ void berserk_swing (edict_t *self)
mframe_t berserk_frames_attack_spike [] = mframe_t berserk_frames_attack_spike [] =
{ {
ai_charge, 0, NULL, {ai_charge, 0, NULL},
ai_charge, 0, NULL, {ai_charge, 0, NULL},
ai_charge, 0, berserk_swing, {ai_charge, 0, berserk_swing},
ai_charge, 0, berserk_attack_spike, {ai_charge, 0, berserk_attack_spike},
ai_charge, 0, NULL, {ai_charge, 0, NULL},
ai_charge, 0, NULL, {ai_charge, 0, NULL},
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}; mmove_t berserk_move_attack_spike = {FRAME_att_c1, FRAME_att_c8, berserk_frames_attack_spike, berserk_run};
@ -184,44 +159,43 @@ void berserk_attack_club (edict_t *self)
mframe_t berserk_frames_attack_club [] = mframe_t berserk_frames_attack_club [] =
{ {
ai_charge, 0, NULL, {ai_charge, 0, NULL},
ai_charge, 0, NULL, {ai_charge, 0, NULL},
ai_charge, 0, NULL, {ai_charge, 0, NULL},
ai_charge, 0, NULL, {ai_charge, 0, NULL},
ai_charge, 0, berserk_swing, {ai_charge, 0, berserk_swing},
ai_charge, 0, NULL, {ai_charge, 0, NULL},
ai_charge, 0, NULL, {ai_charge, 0, NULL},
ai_charge, 0, NULL, {ai_charge, 0, NULL},
ai_charge, 0, berserk_attack_club, {ai_charge, 0, berserk_attack_club},
ai_charge, 0, NULL, {ai_charge, 0, NULL},
ai_charge, 0, NULL, {ai_charge, 0, NULL},
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)
{ {
//FIXME play impact sound
} }
mframe_t berserk_frames_attack_strike [] = mframe_t berserk_frames_attack_strike [] =
{ {
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, berserk_swing, {ai_move, 0, berserk_swing},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, berserk_strike, {ai_move, 0, berserk_strike},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 9.7, NULL, {ai_move, 9.7, NULL},
ai_move, 13.6, 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};
@ -235,61 +209,38 @@ void berserk_melee (edict_t *self)
self->monsterinfo.currentmove = &berserk_move_attack_club; self->monsterinfo.currentmove = &berserk_move_attack_club;
} }
/*
void() berserk_atke1 =[ $r_attb1, berserk_atke2 ] {ai_run(9);};
void() berserk_atke2 =[ $r_attb2, berserk_atke3 ] {ai_run(6);};
void() berserk_atke3 =[ $r_attb3, berserk_atke4 ] {ai_run(18.4);};
void() berserk_atke4 =[ $r_attb4, berserk_atke5 ] {ai_run(25);};
void() berserk_atke5 =[ $r_attb5, berserk_atke6 ] {ai_run(14);};
void() berserk_atke6 =[ $r_attb6, berserk_atke7 ] {ai_run(20);};
void() berserk_atke7 =[ $r_attb7, berserk_atke8 ] {ai_run(8.5);};
void() berserk_atke8 =[ $r_attb8, berserk_atke9 ] {ai_run(3);};
void() berserk_atke9 =[ $r_attb9, berserk_atke10 ] {ai_run(17.5);};
void() berserk_atke10 =[ $r_attb10, berserk_atke11 ] {ai_run(17);};
void() berserk_atke11 =[ $r_attb11, berserk_atke12 ] {ai_run(9);};
void() berserk_atke12 =[ $r_attb12, berserk_atke13 ] {ai_run(25);};
void() berserk_atke13 =[ $r_attb13, berserk_atke14 ] {ai_run(3.7);};
void() berserk_atke14 =[ $r_attb14, berserk_atke15 ] {ai_run(2.6);};
void() berserk_atke15 =[ $r_attb15, berserk_atke16 ] {ai_run(19);};
void() berserk_atke16 =[ $r_attb16, berserk_atke17 ] {ai_run(25);};
void() berserk_atke17 =[ $r_attb17, berserk_atke18 ] {ai_run(19.6);};
void() berserk_atke18 =[ $r_attb18, berserk_run1 ] {ai_run(7.8);};
*/
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},
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, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL {ai_move, 0, NULL}
}; };
mmove_t berserk_move_pain2 = {FRAME_painb1, FRAME_painb20, berserk_frames_pain2, berserk_run}; mmove_t berserk_move_pain2 = {FRAME_painb1, FRAME_painb20, berserk_frames_pain2, berserk_run};
@ -327,19 +278,19 @@ void berserk_dead (edict_t *self)
mframe_t berserk_frames_death1 [] = mframe_t berserk_frames_death1 [] =
{ {
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {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};
@ -347,14 +298,14 @@ mmove_t berserk_move_death1 = {FRAME_death1, FRAME_death13, berserk_frames_death
mframe_t berserk_frames_death2 [] = mframe_t berserk_frames_death2 [] =
{ {
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
ai_move, 0, NULL, {ai_move, 0, NULL},
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};
@ -389,17 +340,6 @@ void berserk_die (edict_t *self, edict_t *inflictor, edict_t *attacker, int dama
} }
void SP_monster_berserk_precache(void)
{
// 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");
}
/*QUAKED monster_berserk (1 .5 0) (-16 -16 -24) (16 16 32) Ambush Trigger_Spawn Sight /*QUAKED monster_berserk (1 .5 0) (-16 -16 -24) (16 16 32) Ambush Trigger_Spawn Sight
*/ */
void SP_monster_berserk (edict_t *self) void SP_monster_berserk (edict_t *self)
@ -410,7 +350,13 @@ void SP_monster_berserk (edict_t *self)
return; return;
} }
SP_monster_berserk_precache(); // 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"); self->s.modelindex = gi.modelindex("models/monsters/berserk/tris.md2");
VectorSet (self->mins, -16, -16, -24); VectorSet (self->mins, -16, -16, -24);
@ -441,3 +387,4 @@ void SP_monster_berserk (edict_t *self)
walkmonster_start (self); walkmonster_start (self);
} }