mirror of https://github.com/yquake2/zaero.git
Mutand aufgeräumt
This commit is contained in:
Yamagi Burmeister
parent
5a6e8255b6
commit
1d1062b173
309
src/m_mutant.c
309
src/m_mutant.c
|
|
@ -62,62 +62,62 @@ void mutant_swing (edict_t *self)
|
|||
|
||||
mframe_t mutant_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, // 10
|
||||
{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}, // 10
|
||||
|
||||
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, // 20
|
||||
{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}, // 20
|
||||
|
||||
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, // 30
|
||||
{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}, // 30
|
||||
|
||||
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, // 40
|
||||
{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}, // 40
|
||||
|
||||
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, // 50
|
||||
{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}, // 50
|
||||
|
||||
ai_stand, 0, NULL
|
||||
{ai_stand, 0, NULL}
|
||||
};
|
||||
mmove_t mutant_move_stand = {FRAME_stand101, FRAME_stand151, mutant_frames_stand, NULL};
|
||||
|
||||
|
|
@ -139,19 +139,19 @@ void mutant_idle_loop (edict_t *self)
|
|||
|
||||
mframe_t mutant_frames_idle [] =
|
||||
{
|
||||
ai_stand, 0, NULL,
|
||||
ai_stand, 0, NULL,
|
||||
ai_stand, 0, NULL,
|
||||
ai_stand, 0, NULL, // scratch loop start
|
||||
ai_stand, 0, NULL,
|
||||
ai_stand, 0, NULL,
|
||||
ai_stand, 0, mutant_idle_loop, // scratch loop end
|
||||
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}, // scratch loop start
|
||||
{ai_stand, 0, NULL},
|
||||
{ai_stand, 0, NULL},
|
||||
{ai_stand, 0, mutant_idle_loop}, // scratch loop end
|
||||
{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 mutant_move_idle = {FRAME_stand152, FRAME_stand164, mutant_frames_idle, mutant_stand};
|
||||
|
||||
|
|
@ -170,18 +170,18 @@ void mutant_walk (edict_t *self);
|
|||
|
||||
mframe_t mutant_frames_walk [] =
|
||||
{
|
||||
ai_walk, 3, NULL,
|
||||
ai_walk, 1, NULL,
|
||||
ai_walk, 5, NULL,
|
||||
ai_walk, 10, NULL,
|
||||
ai_walk, 13, NULL,
|
||||
ai_walk, 10, NULL,
|
||||
ai_walk, 0, NULL,
|
||||
ai_walk, 5, NULL,
|
||||
ai_walk, 6, NULL,
|
||||
ai_walk, 16, NULL,
|
||||
ai_walk, 15, NULL,
|
||||
ai_walk, 6, NULL
|
||||
{ai_walk, 3, NULL},
|
||||
{ai_walk, 1, NULL},
|
||||
{ai_walk, 5, NULL},
|
||||
{ai_walk, 10, NULL},
|
||||
{ai_walk, 13, NULL},
|
||||
{ai_walk, 10, NULL},
|
||||
{ai_walk, 0, NULL},
|
||||
{ai_walk, 5, NULL},
|
||||
{ai_walk, 6, NULL},
|
||||
{ai_walk, 16, NULL},
|
||||
{ai_walk, 15, NULL},
|
||||
{ai_walk, 6, NULL}
|
||||
};
|
||||
mmove_t mutant_move_walk = {FRAME_walk05, FRAME_walk16, mutant_frames_walk, NULL};
|
||||
|
||||
|
|
@ -192,10 +192,10 @@ void mutant_walk_loop (edict_t *self)
|
|||
|
||||
mframe_t mutant_frames_start_walk [] =
|
||||
{
|
||||
ai_walk, 5, NULL,
|
||||
ai_walk, 5, NULL,
|
||||
ai_walk, -2, NULL,
|
||||
ai_walk, 1, NULL
|
||||
{ai_walk, 5, NULL},
|
||||
{ai_walk, 5, NULL},
|
||||
{ai_walk, -2, NULL},
|
||||
{ai_walk, 1, NULL}
|
||||
};
|
||||
mmove_t mutant_move_start_walk = {FRAME_walk01, FRAME_walk04, mutant_frames_start_walk, mutant_walk_loop};
|
||||
|
||||
|
|
@ -211,12 +211,12 @@ void mutant_walk (edict_t *self)
|
|||
|
||||
mframe_t mutant_frames_run [] =
|
||||
{
|
||||
ai_run, 40, NULL,
|
||||
ai_run, 40, mutant_step,
|
||||
ai_run, 24, NULL,
|
||||
ai_run, 5, mutant_step,
|
||||
ai_run, 17, NULL,
|
||||
ai_run, 10, NULL
|
||||
{ai_run, 40, NULL},
|
||||
{ai_run, 40, mutant_step},
|
||||
{ai_run, 24, NULL},
|
||||
{ai_run, 5, mutant_step},
|
||||
{ai_run, 17, NULL},
|
||||
{ai_run, 10, NULL}
|
||||
};
|
||||
mmove_t mutant_move_run = {FRAME_run03, FRAME_run08, mutant_frames_run, NULL};
|
||||
|
||||
|
|
@ -266,13 +266,13 @@ void mutant_check_refire (edict_t *self)
|
|||
|
||||
mframe_t mutant_frames_attack [] =
|
||||
{
|
||||
ai_charge, 0, NULL,
|
||||
ai_charge, 0, NULL,
|
||||
ai_charge, 0, mutant_hit_left,
|
||||
ai_charge, 0, NULL,
|
||||
ai_charge, 0, NULL,
|
||||
ai_charge, 0, mutant_hit_right,
|
||||
ai_charge, 0, mutant_check_refire
|
||||
{ai_charge, 0, NULL},
|
||||
{ai_charge, 0, NULL},
|
||||
{ai_charge, 0, mutant_hit_left},
|
||||
{ai_charge, 0, NULL},
|
||||
{ai_charge, 0, NULL},
|
||||
{ai_charge, 0, mutant_hit_right},
|
||||
{ai_charge, 0, mutant_check_refire}
|
||||
};
|
||||
mmove_t mutant_move_attack = {FRAME_attack09, FRAME_attack15, mutant_frames_attack, mutant_run};
|
||||
|
||||
|
|
@ -356,14 +356,14 @@ void mutant_check_landing (edict_t *self)
|
|||
|
||||
mframe_t mutant_frames_jump [] =
|
||||
{
|
||||
ai_charge, 0, NULL,
|
||||
ai_charge, 17, NULL,
|
||||
ai_charge, 15, mutant_jump_takeoff,
|
||||
ai_charge, 15, NULL,
|
||||
ai_charge, 15, mutant_check_landing,
|
||||
ai_charge, 0, NULL,
|
||||
ai_charge, 3, NULL,
|
||||
ai_charge, 0, NULL
|
||||
{ai_charge, 0, NULL},
|
||||
{ai_charge, 17, NULL},
|
||||
{ai_charge, 15, mutant_jump_takeoff},
|
||||
{ai_charge, 15, NULL},
|
||||
{ai_charge, 15, mutant_check_landing},
|
||||
{ai_charge, 0, NULL},
|
||||
{ai_charge, 3, NULL},
|
||||
{ai_charge, 0, NULL}
|
||||
};
|
||||
mmove_t mutant_move_jump = {FRAME_attack01, FRAME_attack08, mutant_frames_jump, mutant_run};
|
||||
|
||||
|
|
@ -439,38 +439,38 @@ qboolean mutant_checkattack (edict_t *self)
|
|||
|
||||
mframe_t mutant_frames_pain1 [] =
|
||||
{
|
||||
ai_move, 4, NULL,
|
||||
ai_move, -3, NULL,
|
||||
ai_move, -8, NULL,
|
||||
ai_move, 2, NULL,
|
||||
ai_move, 5, NULL
|
||||
{ai_move, 4, NULL},
|
||||
{ai_move, -3, NULL},
|
||||
{ai_move, -8, NULL},
|
||||
{ai_move, 2, NULL},
|
||||
{ai_move, 5, NULL}
|
||||
};
|
||||
mmove_t mutant_move_pain1 = {FRAME_pain101, FRAME_pain105, mutant_frames_pain1, mutant_run};
|
||||
|
||||
mframe_t mutant_frames_pain2 [] =
|
||||
{
|
||||
ai_move, -24,NULL,
|
||||
ai_move, 11, NULL,
|
||||
ai_move, 5, NULL,
|
||||
ai_move, -2, NULL,
|
||||
ai_move, 6, NULL,
|
||||
ai_move, 4, NULL
|
||||
{ai_move, -24,NULL},
|
||||
{ai_move, 11, NULL},
|
||||
{ai_move, 5, NULL},
|
||||
{ai_move, -2, NULL},
|
||||
{ai_move, 6, NULL},
|
||||
{ai_move, 4, NULL}
|
||||
};
|
||||
mmove_t mutant_move_pain2 = {FRAME_pain201, FRAME_pain206, mutant_frames_pain2, mutant_run};
|
||||
|
||||
mframe_t mutant_frames_pain3 [] =
|
||||
{
|
||||
ai_move, -22,NULL,
|
||||
ai_move, 3, NULL,
|
||||
ai_move, 3, NULL,
|
||||
ai_move, 2, NULL,
|
||||
ai_move, 1, NULL,
|
||||
ai_move, 1, NULL,
|
||||
ai_move, 6, NULL,
|
||||
ai_move, 3, NULL,
|
||||
ai_move, 2, NULL,
|
||||
ai_move, 0, NULL,
|
||||
ai_move, 1, NULL
|
||||
{ai_move, -22,NULL},
|
||||
{ai_move, 3, NULL},
|
||||
{ai_move, 3, NULL},
|
||||
{ai_move, 2, NULL},
|
||||
{ai_move, 1, NULL},
|
||||
{ai_move, 1, NULL},
|
||||
{ai_move, 6, NULL},
|
||||
{ai_move, 3, NULL},
|
||||
{ai_move, 2, NULL},
|
||||
{ai_move, 0, NULL},
|
||||
{ai_move, 1, NULL}
|
||||
};
|
||||
mmove_t mutant_move_pain3 = {FRAME_pain301, FRAME_pain311, mutant_frames_pain3, mutant_run};
|
||||
|
||||
|
|
@ -525,30 +525,30 @@ void mutant_dead (edict_t *self)
|
|||
|
||||
mframe_t mutant_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}
|
||||
};
|
||||
mmove_t mutant_move_death1 = {FRAME_death101, FRAME_death109, mutant_frames_death1, mutant_dead};
|
||||
|
||||
mframe_t mutant_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},
|
||||
{ai_move, 0, NULL},
|
||||
{ai_move, 0, NULL},
|
||||
{ai_move, 0, NULL},
|
||||
{ai_move, 0, NULL}
|
||||
};
|
||||
mmove_t mutant_move_death2 = {FRAME_death201, FRAME_death210, mutant_frames_death2, mutant_dead};
|
||||
|
||||
|
|
@ -587,9 +587,16 @@ void mutant_die (edict_t *self, edict_t *inflictor, edict_t *attacker, int damag
|
|||
// SPAWN
|
||||
//
|
||||
|
||||
|
||||
void SP_monster_mutant_precache(void)
|
||||
/*QUAKED monster_mutant (1 .5 0) (-32 -32 -24) (32 32 32) Ambush Trigger_Spawn Sight
|
||||
*/
|
||||
void SP_monster_mutant (edict_t *self)
|
||||
{
|
||||
if (deathmatch->value)
|
||||
{
|
||||
G_FreeEdict (self);
|
||||
return;
|
||||
}
|
||||
|
||||
sound_swing = gi.soundindex ("mutant/mutatck1.wav");
|
||||
sound_hit = gi.soundindex ("mutant/mutatck2.wav");
|
||||
sound_hit2 = gi.soundindex ("mutant/mutatck3.wav");
|
||||
|
|
@ -603,20 +610,6 @@ void SP_monster_mutant_precache(void)
|
|||
sound_step2 = gi.soundindex ("mutant/step2.wav");
|
||||
sound_step3 = gi.soundindex ("mutant/step3.wav");
|
||||
sound_thud = gi.soundindex ("mutant/thud1.wav");
|
||||
}
|
||||
|
||||
|
||||
/*QUAKED monster_mutant (1 .5 0) (-32 -32 -24) (32 32 32) Ambush Trigger_Spawn Sight
|
||||
*/
|
||||
void SP_monster_mutant (edict_t *self)
|
||||
{
|
||||
if (deathmatch->value)
|
||||
{
|
||||
G_FreeEdict (self);
|
||||
return;
|
||||
}
|
||||
|
||||
SP_monster_mutant_precache();
|
||||
|
||||
self->movetype = MOVETYPE_STEP;
|
||||
self->solid = SOLID_BBOX;
|
||||
|
|
|
|||
Loading…
Reference in New Issue