yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-01 05:30:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup chick and add sanity checks

Browse source
This commit is contained in:
Yamagi Burmeister 2011-10-07 16:05:30 +00:00
parent c08a7e1bbe
commit caf17d1c3e
3 changed files with 979 additions and 685 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/shared/flash.c
View file

@ -349,7 +349,7 @@ vec3_t monster_flash_offset[] = {
{56, 32, 32}, {56, 32, 32},
/* MZ2_WIDOW_RAIL 150 */ /* MZ2_WIDOW_RAIL 150 */
{62, -20, 84}, {62, -20, 84},
/* MZ2_WIDOW_PLASMABEAM 151 /* MZ2_WIDOW_PLASMABEAM 151 */
{32, 0, 6}, {32, 0, 6},
/* MZ2_CARRIER_MACHINEGUN_L2 152 */ /* MZ2_CARRIER_MACHINEGUN_L2 152 */
{61, -32, 12}, {61, -32, 12},

661
src/game/baseq2/monster/chick/chick.c
View file

@ -1,37 +1,36 @@
/* /*
Copyright (C) 1997-2001 Id Software, Inc. * Copyright (C) 1997-2001 Id Software, Inc.
*
This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or modify
modify it under the terms of the GNU General Public License * it under the terms of the GNU General Public License as published by
as published by the Free Software Foundation; either version 2 * the Free Software Foundation; either version 2 of the License, or (at
of the License, or (at your option) any later version. * your option) any later version.
*
This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful, but
but WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
See the GNU General Public License for more details. * See the GNU General Public License for more details.
*
You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/ *
/* * =======================================================================
============================================================================== *
* Iron Maiden.
chick *
* =======================================================================
============================================================================== */
*/
#include "../../header/local.h" #include "../../header/local.h"
#include "chick.h" #include "chick.h"
qboolean visible (edict_t *self, edict_t *other); qboolean visible(edict_t *self, edict_t *other);
void chick_stand (edict_t *self); void chick_stand(edict_t *self);
void chick_run (edict_t *self); void chick_run(edict_t *self);
void chick_reslash(edict_t *self); void chick_reslash(edict_t *self);
void chick_rerocket(edict_t *self); void chick_rerocket(edict_t *self);
void chick_attack1(edict_t *self); void chick_attack1(edict_t *self);
@ -52,17 +51,25 @@ static int sound_pain3;
static int sound_sight; static int sound_sight;
static int sound_search; static int sound_search;
void
void ChickMoan (edict_t *self) ChickMoan(edict_t *self)
{ {
if (!self)
{
return;
}
if (random() < 0.5) if (random() < 0.5)
gi.sound (self, CHAN_VOICE, sound_idle1, 1, ATTN_IDLE, 0); {
gi.sound(self, CHAN_VOICE, sound_idle1, 1, ATTN_IDLE, 0);
}
else else
gi.sound (self, CHAN_VOICE, sound_idle2, 1, ATTN_IDLE, 0); {
gi.sound(self, CHAN_VOICE, sound_idle2, 1, ATTN_IDLE, 0);
}
} }
mframe_t chick_frames_fidget [] = mframe_t chick_frames_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},
@ -94,18 +101,35 @@ mframe_t chick_frames_fidget [] =
{ai_stand, 0, NULL}, {ai_stand, 0, NULL},
{ai_stand, 0, NULL} {ai_stand, 0, NULL}
}; };
mmove_t chick_move_fidget = {FRAME_stand201, FRAME_stand230, chick_frames_fidget, chick_stand};
void chick_fidget (edict_t *self) mmove_t chick_move_fidget =
{ {
if (self->monsterinfo.aiflags & AI_STAND_GROUND) FRAME_stand201,
FRAME_stand230,
chick_frames_fidget,
chick_stand
};
void
chick_fidget(edict_t *self)
{
if (!self)
{
return; return;
}
if (self->monsterinfo.aiflags & AI_STAND_GROUND)
{
return;
}
if (random() <= 0.3) if (random() <= 0.3)
{
self->monsterinfo.currentmove = &chick_move_fidget; self->monsterinfo.currentmove = &chick_move_fidget;
}
} }
mframe_t chick_frames_stand [] = mframe_t chick_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},
@ -136,17 +160,28 @@ mframe_t chick_frames_stand [] =
{ai_stand, 0, NULL}, {ai_stand, 0, NULL},
{ai_stand, 0, NULL}, {ai_stand, 0, NULL},
{ai_stand, 0, chick_fidget}, {ai_stand, 0, chick_fidget},
}; };
mmove_t chick_move_stand = {FRAME_stand101, FRAME_stand130, chick_frames_stand, NULL};
void chick_stand (edict_t *self) mmove_t chick_move_stand =
{ {
FRAME_stand101,
FRAME_stand130,
chick_frames_stand,
NULL
};
void
chick_stand(edict_t *self)
{
if (!self)
{
return;
}
self->monsterinfo.currentmove = &chick_move_stand; self->monsterinfo.currentmove = &chick_move_stand;
} }
mframe_t chick_frames_start_run [] = mframe_t chick_frames_start_run[] = {
{
{ai_run, 1, NULL}, {ai_run, 1, NULL},
{ai_run, 0, NULL}, {ai_run, 0, NULL},
{ai_run, 0, NULL}, {ai_run, 0, NULL},
@ -158,10 +193,16 @@ mframe_t chick_frames_start_run [] =
{ai_run, 6, NULL}, {ai_run, 6, NULL},
{ai_run, 3, NULL} {ai_run, 3, NULL}
}; };
mmove_t chick_move_start_run = {FRAME_walk01, FRAME_walk10, chick_frames_start_run, chick_run};
mframe_t chick_frames_run [] = mmove_t chick_move_start_run =
{ {
FRAME_walk01,
FRAME_walk10,
chick_frames_start_run,
chick_run
};
mframe_t chick_frames_run[] = {
{ai_run, 6, NULL}, {ai_run, 6, NULL},
{ai_run, 8, NULL}, {ai_run, 8, NULL},
{ai_run, 13, NULL}, {ai_run, 13, NULL},
@ -172,13 +213,17 @@ mframe_t chick_frames_run [] =
{ai_run, 5, NULL}, {ai_run, 5, NULL},
{ai_run, 9, NULL}, {ai_run, 9, NULL},
{ai_run, 7, NULL} {ai_run, 7, NULL}
}; };
mmove_t chick_move_run = {FRAME_walk11, FRAME_walk20, chick_frames_run, NULL}; mmove_t chick_move_run =
mframe_t chick_frames_walk [] =
{ {
FRAME_walk11,
FRAME_walk20,
chick_frames_run,
NULL
};
mframe_t chick_frames_walk[] = {
{ai_walk, 6, NULL}, {ai_walk, 6, NULL},
{ai_walk, 8, NULL}, {ai_walk, 8, NULL},
{ai_walk, 13, NULL}, {ai_walk, 13, NULL},
@ -191,23 +236,41 @@ mframe_t chick_frames_walk [] =
{ai_walk, 7, NULL} {ai_walk, 7, NULL}
}; };
mmove_t chick_move_walk = {FRAME_walk11, FRAME_walk20, chick_frames_walk, NULL}; mmove_t chick_move_walk =
void chick_walk (edict_t *self)
{ {
FRAME_walk11,
FRAME_walk20,
chick_frames_walk,
NULL
};
void
chick_walk(edict_t *self)
{
if (!self)
{
return;
}
self->monsterinfo.currentmove = &chick_move_walk; self->monsterinfo.currentmove = &chick_move_walk;
} }
void chick_run (edict_t *self) void
chick_run(edict_t *self)
{ {
if (!self)
{
return;
}
if (self->monsterinfo.aiflags & AI_STAND_GROUND) if (self->monsterinfo.aiflags & AI_STAND_GROUND)
{ {
self->monsterinfo.currentmove = &chick_move_stand; self->monsterinfo.currentmove = &chick_move_stand;
return; return;
} }
if (self->monsterinfo.currentmove == &chick_move_walk || if ((self->monsterinfo.currentmove == &chick_move_walk) ||
self->monsterinfo.currentmove == &chick_move_start_run) (self->monsterinfo.currentmove == &chick_move_start_run))
{ {
self->monsterinfo.currentmove = &chick_move_run; self->monsterinfo.currentmove = &chick_move_run;
} }
@ -217,28 +280,39 @@ void chick_run (edict_t *self)
} }
} }
mframe_t chick_frames_pain1 [] = mframe_t chick_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},
{ai_move, 0, NULL} {ai_move, 0, NULL}
}; };
mmove_t chick_move_pain1 = {FRAME_pain101, FRAME_pain105, chick_frames_pain1, chick_run};
mframe_t chick_frames_pain2 [] = mmove_t chick_move_pain1 =
{ {
FRAME_pain101,
FRAME_pain105,
chick_frames_pain1,
chick_run
};
mframe_t chick_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}
}; };
mmove_t chick_move_pain2 = {FRAME_pain201, FRAME_pain205, chick_frames_pain2, chick_run};
mframe_t chick_frames_pain3 [] = mmove_t chick_move_pain2 =
{ {
FRAME_pain201,
FRAME_pain205,
chick_frames_pain2,
chick_run
};
mframe_t chick_frames_pain3[] = {
{ai_move, 0, NULL}, {ai_move, 0, NULL},
{ai_move, 0, NULL}, {ai_move, 0, NULL},
{ai_move, -6, NULL}, {ai_move, -6, NULL},
@ -261,51 +335,89 @@ mframe_t chick_frames_pain3 [] =
{ai_move, -8, NULL}, {ai_move, -8, NULL},
{ai_move, 2, NULL} {ai_move, 2, NULL}
}; };
mmove_t chick_move_pain3 = {FRAME_pain301, FRAME_pain321, chick_frames_pain3, chick_run};
void chick_pain (edict_t *self, edict_t *other, float kick, int damage) mmove_t chick_move_pain3 =
{
FRAME_pain301,
FRAME_pain321,
chick_frames_pain3,
chick_run
};
void
chick_pain(edict_t *self, edict_t *other /* unused */,
float kick /* unused */, int damage)
{ {
float r; float r;
if (!self)
{
return;
}
if (self->health < (self->max_health / 2)) if (self->health < (self->max_health / 2))
{
self->s.skinnum = 1; self->s.skinnum = 1;
}
if (level.time < self->pain_debounce_time) if (level.time < self->pain_debounce_time)
{
return; return;
}
self->pain_debounce_time = level.time + 3; self->pain_debounce_time = level.time + 3;
r = random(); r = random();
if (r < 0.33) if (r < 0.33)
gi.sound (self, CHAN_VOICE, sound_pain1, 1, ATTN_NORM, 0); {
gi.sound(self, CHAN_VOICE, sound_pain1, 1, ATTN_NORM, 0);
}
else if (r < 0.66) else if (r < 0.66)
gi.sound (self, CHAN_VOICE, sound_pain2, 1, ATTN_NORM, 0); {
gi.sound(self, CHAN_VOICE, sound_pain2, 1, ATTN_NORM, 0);
}
else else
gi.sound (self, CHAN_VOICE, sound_pain3, 1, ATTN_NORM, 0); {
gi.sound(self, CHAN_VOICE, sound_pain3, 1, ATTN_NORM, 0);
}
if (skill->value == 3) if (skill->value == 3)
return; // no pain anims in nightmare {
return; /* no pain anims in nightmare */
}
if (damage <= 10) if (damage <= 10)
{
self->monsterinfo.currentmove = &chick_move_pain1; self->monsterinfo.currentmove = &chick_move_pain1;
}
else if (damage <= 25) else if (damage <= 25)
{
self->monsterinfo.currentmove = &chick_move_pain2; self->monsterinfo.currentmove = &chick_move_pain2;
}
else else
{
self->monsterinfo.currentmove = &chick_move_pain3; self->monsterinfo.currentmove = &chick_move_pain3;
}
} }
void chick_dead (edict_t *self) void
chick_dead(edict_t *self)
{ {
VectorSet (self->mins, -16, -16, 0); if (!self)
VectorSet (self->maxs, 16, 16, 16); {
return;
}
VectorSet(self->mins, -16, -16, 0);
VectorSet(self->maxs, 16, 16, 16);
self->movetype = MOVETYPE_TOSS; self->movetype = MOVETYPE_TOSS;
self->svflags |= SVF_DEADMONSTER; self->svflags |= SVF_DEADMONSTER;
self->nextthink = 0; self->nextthink = 0;
gi.linkentity (self); gi.linkentity(self);
} }
mframe_t chick_frames_death2 [] = mframe_t chick_frames_death2[] = {
{
{ai_move, -6, NULL}, {ai_move, -6, NULL},
{ai_move, 0, NULL}, {ai_move, 0, NULL},
{ai_move, -1, NULL}, {ai_move, -1, NULL},
@ -330,10 +442,16 @@ mframe_t chick_frames_death2 [] =
{ai_move, 14, NULL}, {ai_move, 14, NULL},
{ai_move, 1, NULL} {ai_move, 1, NULL}
}; };
mmove_t chick_move_death2 = {FRAME_death201, FRAME_death223, chick_frames_death2, chick_dead};
mframe_t chick_frames_death1 [] = mmove_t chick_move_death2 =
{ {
FRAME_death201,
FRAME_death223,
chick_frames_death2,
chick_dead
};
mframe_t chick_frames_death1[] = {
{ai_move, 0, NULL}, {ai_move, 0, NULL},
{ai_move, 0, NULL}, {ai_move, 0, NULL},
{ai_move, -7, NULL}, {ai_move, -7, NULL},
@ -346,77 +464,127 @@ mframe_t chick_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}
}; };
mmove_t chick_move_death1 = {FRAME_death101, FRAME_death112, chick_frames_death1, chick_dead};
void chick_die (edict_t *self, edict_t *inflictor, edict_t *attacker, int damage, vec3_t point) mmove_t chick_move_death1 =
{
FRAME_death101,
FRAME_death112,
chick_frames_death1,
chick_dead
};
void
chick_die(edict_t *self, edict_t *inflictor /* unused */,
edict_t *attacker /* unused */, int damage,
vec3_t point /*unused */)
{ {
int n; int n;
// check for gib if (!self)
{
return;
}
/* check for gib */
if (self->health <= self->gib_health) if (self->health <= self->gib_health)
{ {
gi.sound (self, CHAN_VOICE, gi.soundindex ("misc/udeath.wav"), 1, ATTN_NORM, 0); 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 < 2; n++)
for (n= 0; n < 4; n++) {
ThrowGib (self, "models/objects/gibs/sm_meat/tris.md2", damage, GIB_ORGANIC); ThrowGib(self, "models/objects/gibs/bone/tris.md2",
ThrowHead (self, "models/objects/gibs/head2/tris.md2", damage, GIB_ORGANIC); 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; self->deadflag = DEAD_DEAD;
return; return;
} }
if (self->deadflag == DEAD_DEAD) if (self->deadflag == DEAD_DEAD)
{
return; return;
}
// regular death /* regular death */
self->deadflag = DEAD_DEAD; self->deadflag = DEAD_DEAD;
self->takedamage = DAMAGE_YES; self->takedamage = DAMAGE_YES;
n = rand() % 2; n = rand() % 2;
if (n == 0) if (n == 0)
{ {
self->monsterinfo.currentmove = &chick_move_death1; self->monsterinfo.currentmove = &chick_move_death1;
gi.sound (self, CHAN_VOICE, sound_death1, 1, ATTN_NORM, 0); gi.sound(self, CHAN_VOICE, sound_death1, 1, ATTN_NORM, 0);
} }
else else
{ {
self->monsterinfo.currentmove = &chick_move_death2; self->monsterinfo.currentmove = &chick_move_death2;
gi.sound (self, CHAN_VOICE, sound_death2, 1, ATTN_NORM, 0); gi.sound(self, CHAN_VOICE, sound_death2, 1, ATTN_NORM, 0);
} }
} }
void
void chick_duck_down (edict_t *self) chick_duck_down(edict_t *self)
{ {
if (self->monsterinfo.aiflags & AI_DUCKED) if (!self)
{
return; return;
}
if (self->monsterinfo.aiflags & AI_DUCKED)
{
return;
}
self->monsterinfo.aiflags |= AI_DUCKED; self->monsterinfo.aiflags |= AI_DUCKED;
self->maxs[2] -= 32; self->maxs[2] -= 32;
self->takedamage = DAMAGE_YES; self->takedamage = DAMAGE_YES;
self->monsterinfo.pausetime = level.time + 1; self->monsterinfo.pausetime = level.time + 1;
gi.linkentity (self); gi.linkentity(self);
} }
void chick_duck_hold (edict_t *self) void
chick_duck_hold(edict_t *self)
{ {
if (!self)
{
return;
}
if (level.time >= self->monsterinfo.pausetime) if (level.time >= self->monsterinfo.pausetime)
{
self->monsterinfo.aiflags &= ~AI_HOLD_FRAME; self->monsterinfo.aiflags &= ~AI_HOLD_FRAME;
}
else else
{
self->monsterinfo.aiflags |= AI_HOLD_FRAME; self->monsterinfo.aiflags |= AI_HOLD_FRAME;
}
} }
void chick_duck_up (edict_t *self) void
chick_duck_up(edict_t *self)
{ {
if (!self)
{
return;
}
self->monsterinfo.aiflags &= ~AI_DUCKED; self->monsterinfo.aiflags &= ~AI_DUCKED;
self->maxs[2] += 32; self->maxs[2] += 32;
self->takedamage = DAMAGE_AIM; self->takedamage = DAMAGE_AIM;
gi.linkentity (self); gi.linkentity(self);
} }
mframe_t chick_frames_duck [] = mframe_t chick_frames_duck[] = {
{
{ai_move, 0, chick_duck_down}, {ai_move, 0, chick_duck_down},
{ai_move, 1, NULL}, {ai_move, 1, NULL},
{ai_move, 4, chick_duck_hold}, {ai_move, 4, chick_duck_hold},
@ -425,60 +593,99 @@ mframe_t chick_frames_duck [] =
{ai_move, 3, NULL}, {ai_move, 3, NULL},
{ai_move, 1, NULL} {ai_move, 1, NULL}
}; };
mmove_t chick_move_duck = {FRAME_duck01, FRAME_duck07, chick_frames_duck, chick_run};
void chick_dodge (edict_t *self, edict_t *attacker, float eta) mmove_t chick_move_duck =
{ {
if (random() > 0.25) FRAME_duck01,
FRAME_duck07,
chick_frames_duck,
chick_run
};
void
chick_dodge(edict_t *self, edict_t *attacker, float eta /* unused */)
{
if (!self || !attacker)
{
return; return;
}
if (random() > 0.25)
{
return;
}
if (!self->enemy) if (!self->enemy)
{
self->enemy = attacker; self->enemy = attacker;
}
self->monsterinfo.currentmove = &chick_move_duck; self->monsterinfo.currentmove = &chick_move_duck;
} }
void ChickSlash (edict_t *self) void
ChickSlash(edict_t *self)
{ {
vec3_t aim; vec3_t aim;
VectorSet (aim, MELEE_DISTANCE, self->mins[0], 10); if (!self)
gi.sound (self, CHAN_WEAPON, sound_melee_swing, 1, ATTN_NORM, 0); {
fire_hit (self, aim, (10 + (rand() %6)), 100); return;
}
VectorSet(aim, MELEE_DISTANCE, self->mins[0], 10);
gi.sound(self, CHAN_WEAPON, sound_melee_swing, 1, ATTN_NORM, 0);
fire_hit(self, aim, (10 + (rand() % 6)), 100);
} }
void
void ChickRocket (edict_t *self) ChickRocket(edict_t *self)
{ {
if (!self)
{
return;
}
vec3_t forward, right; vec3_t forward, right;
vec3_t start; vec3_t start;
vec3_t dir; vec3_t dir;
vec3_t vec; vec3_t vec;
AngleVectors (self->s.angles, forward, right, NULL); AngleVectors(self->s.angles, forward, right, NULL);
G_ProjectSource (self->s.origin, monster_flash_offset[MZ2_CHICK_ROCKET_1], forward, right, start); G_ProjectSource(self->s.origin, monster_flash_offset[MZ2_CHICK_ROCKET_1],
forward, right, start);
VectorCopy (self->enemy->s.origin, vec); VectorCopy(self->enemy->s.origin, vec);
vec[2] += self->enemy->viewheight; vec[2] += self->enemy->viewheight;
VectorSubtract (vec, start, dir); VectorSubtract(vec, start, dir);
VectorNormalize (dir); VectorNormalize(dir);
monster_fire_rocket (self, start, dir, 50, 500, MZ2_CHICK_ROCKET_1); monster_fire_rocket(self, start, dir, 50, 500, MZ2_CHICK_ROCKET_1);
} }
void Chick_PreAttack1 (edict_t *self) void
Chick_PreAttack1(edict_t *self)
{ {
gi.sound (self, CHAN_VOICE, sound_missile_prelaunch, 1, ATTN_NORM, 0); if (!self)
{
return;
}
gi.sound(self, CHAN_VOICE, sound_missile_prelaunch, 1, ATTN_NORM, 0);
} }
void ChickReload (edict_t *self) void
ChickReload(edict_t *self)
{ {
gi.sound (self, CHAN_VOICE, sound_missile_reload, 1, ATTN_NORM, 0); if (!self)
{
return;
}
gi.sound(self, CHAN_VOICE, sound_missile_reload, 1, ATTN_NORM, 0);
} }
mframe_t chick_frames_start_attack1[] = {
mframe_t chick_frames_start_attack1 [] =
{
{ai_charge, 0, Chick_PreAttack1}, {ai_charge, 0, Chick_PreAttack1},
{ai_charge, 0, NULL}, {ai_charge, 0, NULL},
{ai_charge, 0, NULL}, {ai_charge, 0, NULL},
@ -493,11 +700,15 @@ mframe_t chick_frames_start_attack1 [] =
{ai_charge, 0, NULL}, {ai_charge, 0, NULL},
{ai_charge, 0, chick_attack1} {ai_charge, 0, chick_attack1}
}; };
mmove_t chick_move_start_attack1 = {FRAME_attak101, FRAME_attak113, chick_frames_start_attack1, NULL};
mmove_t chick_move_start_attack1 =
mframe_t chick_frames_attack1 [] =
{ {
FRAME_attak101,
FRAME_attak113,
chick_frames_start_attack1,
NULL};
mframe_t chick_frames_attack1[] = {
{ai_charge, 19, ChickRocket}, {ai_charge, 19, ChickRocket},
{ai_charge, -6, NULL}, {ai_charge, -6, NULL},
{ai_charge, -5, NULL}, {ai_charge, -5, NULL},
@ -512,42 +723,70 @@ mframe_t chick_frames_attack1 [] =
{ai_charge, 6, NULL}, {ai_charge, 6, NULL},
{ai_charge, 4, NULL}, {ai_charge, 4, NULL},
{ai_charge, 3, chick_rerocket} {ai_charge, 3, chick_rerocket}
}; };
mmove_t chick_move_attack1 = {FRAME_attak114, FRAME_attak127, chick_frames_attack1, NULL};
mframe_t chick_frames_end_attack1 [] = mmove_t chick_move_attack1 =
{ {
FRAME_attak114,
FRAME_attak127,
chick_frames_attack1,
NULL
};
mframe_t chick_frames_end_attack1[] = {
{ai_charge, -3, NULL}, {ai_charge, -3, NULL},
{ai_charge, 0, NULL}, {ai_charge, 0, NULL},
{ai_charge, -6, NULL}, {ai_charge, -6, NULL},
{ai_charge, -4, NULL}, {ai_charge, -4, NULL},
{ai_charge, -2, NULL} {ai_charge, -2, NULL}
}; };
mmove_t chick_move_end_attack1 = {FRAME_attak128, FRAME_attak132, chick_frames_end_attack1, chick_run};
void chick_rerocket(edict_t *self) mmove_t chick_move_end_attack1 =
{ {
FRAME_attak128,
FRAME_attak132,
chick_frames_end_attack1,
chick_run
};
void
chick_rerocket(edict_t *self)
{
if (!self)
{
return;
}
if (self->enemy->health > 0) if (self->enemy->health > 0)
{ {
if (range (self, self->enemy) > RANGE_MELEE) if (range(self, self->enemy) > RANGE_MELEE)
if ( visible (self, self->enemy) ) {
if (visible(self, self->enemy))
{
if (random() <= 0.6) if (random() <= 0.6)
{ {
self->monsterinfo.currentmove = &chick_move_attack1; self->monsterinfo.currentmove = &chick_move_attack1;
return; return;
} }
} }
}
}
self->monsterinfo.currentmove = &chick_move_end_attack1; self->monsterinfo.currentmove = &chick_move_end_attack1;
} }
void chick_attack1(edict_t *self) void
chick_attack1(edict_t *self)
{ {
if (!self)
{
return;
}
self->monsterinfo.currentmove = &chick_move_attack1; self->monsterinfo.currentmove = &chick_move_attack1;
} }
mframe_t chick_frames_slash [] = mframe_t chick_frames_slash[] = {
{
{ai_charge, 1, NULL}, {ai_charge, 1, NULL},
{ai_charge, 7, ChickSlash}, {ai_charge, 7, ChickSlash},
{ai_charge, -7, NULL}, {ai_charge, -7, NULL},
@ -558,23 +797,41 @@ mframe_t chick_frames_slash [] =
{ai_charge, 1, NULL}, {ai_charge, 1, NULL},
{ai_charge, -2, chick_reslash} {ai_charge, -2, chick_reslash}
}; };
mmove_t chick_move_slash = {FRAME_attak204, FRAME_attak212, chick_frames_slash, NULL};
mframe_t chick_frames_end_slash [] = mmove_t chick_move_slash =
{ {
FRAME_attak204,
FRAME_attak212,
chick_frames_slash,
NULL
};
mframe_t chick_frames_end_slash[] = {
{ai_charge, -6, NULL}, {ai_charge, -6, NULL},
{ai_charge, -1, NULL}, {ai_charge, -1, NULL},
{ai_charge, -6, NULL}, {ai_charge, -6, NULL},
{ai_charge, 0, NULL} {ai_charge, 0, NULL}
}; };
mmove_t chick_move_end_slash = {FRAME_attak213, FRAME_attak216, chick_frames_end_slash, chick_run};
mmove_t chick_move_end_slash =
void chick_reslash(edict_t *self)
{ {
FRAME_attak213,
FRAME_attak216,
chick_frames_end_slash,
chick_run
};
void
chick_reslash(edict_t *self)
{
if (!self)
{
return;
}
if (self->enemy->health > 0) if (self->enemy->health > 0)
{ {
if (range (self, self->enemy) == RANGE_MELEE) if (range(self, self->enemy) == RANGE_MELEE)
{ {
if (random() <= 0.9) if (random() <= 0.9)
{ {
@ -588,72 +845,106 @@ void chick_reslash(edict_t *self)
} }
} }
} }
self->monsterinfo.currentmove = &chick_move_end_slash; self->monsterinfo.currentmove = &chick_move_end_slash;
} }
void chick_slash(edict_t *self) void
chick_slash(edict_t *self)
{ {
if (!self)
{
return;
}
self->monsterinfo.currentmove = &chick_move_slash; self->monsterinfo.currentmove = &chick_move_slash;
} }
mframe_t chick_frames_start_slash[] = {
mframe_t chick_frames_start_slash [] =
{
{ai_charge, 1, NULL}, {ai_charge, 1, NULL},
{ai_charge, 8, NULL}, {ai_charge, 8, NULL},
{ai_charge, 3, NULL} {ai_charge, 3, NULL}
}; };
mmove_t chick_move_start_slash = {FRAME_attak201, FRAME_attak203, chick_frames_start_slash, chick_slash};
mmove_t chick_move_start_slash =
void chick_melee(edict_t *self)
{ {
self->monsterinfo.currentmove = &chick_move_start_slash; FRAME_attak201,
} FRAME_attak203,
chick_frames_start_slash,
chick_slash
};
void
void chick_attack(edict_t *self) chick_melee(edict_t *self)
{ {
self->monsterinfo.currentmove = &chick_move_start_attack1; if (!self)
}
void chick_sight(edict_t *self, edict_t *other)
{
gi.sound (self, CHAN_VOICE, sound_sight, 1, ATTN_NORM, 0);
}
/*QUAKED monster_chick (1 .5 0) (-16 -16 -24) (16 16 32) Ambush Trigger_Spawn Sight
*/
void SP_monster_chick (edict_t *self)
{
if (deathmatch->value)
{ {
G_FreeEdict (self);
return; return;
} }
sound_missile_prelaunch = gi.soundindex ("chick/chkatck1.wav"); self->monsterinfo.currentmove = &chick_move_start_slash;
sound_missile_launch = gi.soundindex ("chick/chkatck2.wav"); }
sound_melee_swing = gi.soundindex ("chick/chkatck3.wav");
sound_melee_hit = gi.soundindex ("chick/chkatck4.wav"); void
sound_missile_reload = gi.soundindex ("chick/chkatck5.wav"); chick_attack(edict_t *self)
sound_death1 = gi.soundindex ("chick/chkdeth1.wav"); {
sound_death2 = gi.soundindex ("chick/chkdeth2.wav"); if (!self)
sound_fall_down = gi.soundindex ("chick/chkfall1.wav"); {
sound_idle1 = gi.soundindex ("chick/chkidle1.wav"); return;
sound_idle2 = gi.soundindex ("chick/chkidle2.wav"); }
sound_pain1 = gi.soundindex ("chick/chkpain1.wav");
sound_pain2 = gi.soundindex ("chick/chkpain2.wav"); self->monsterinfo.currentmove = &chick_move_start_attack1;
sound_pain3 = gi.soundindex ("chick/chkpain3.wav"); }
sound_sight = gi.soundindex ("chick/chksght1.wav");
sound_search = gi.soundindex ("chick/chksrch1.wav"); void
chick_sight(edict_t *self, edict_t *other /* unused */)
{
if (!self)
{
return;
}
gi.sound(self, CHAN_VOICE, sound_sight, 1, ATTN_NORM, 0);
}
/*
* QUAKED monster_chick (1 .5 0) (-16 -16 -24) (16 16 32) Ambush Trigger_Spawn Sight
*/
void
SP_monster_chick(edict_t *self)
{
if (!self)
{
return;
}
if (deathmatch->value)
{
G_FreeEdict(self);
return;
}
sound_missile_prelaunch = gi.soundindex("chick/chkatck1.wav");
sound_missile_launch = gi.soundindex("chick/chkatck2.wav");
sound_melee_swing = gi.soundindex("chick/chkatck3.wav");
sound_melee_hit = gi.soundindex("chick/chkatck4.wav");
sound_missile_reload = gi.soundindex("chick/chkatck5.wav");
sound_death1 = gi.soundindex("chick/chkdeth1.wav");
sound_death2 = gi.soundindex("chick/chkdeth2.wav");
sound_fall_down = gi.soundindex("chick/chkfall1.wav");
sound_idle1 = gi.soundindex("chick/chkidle1.wav");
sound_idle2 = gi.soundindex("chick/chkidle2.wav");
sound_pain1 = gi.soundindex("chick/chkpain1.wav");
sound_pain2 = gi.soundindex("chick/chkpain2.wav");
sound_pain3 = gi.soundindex("chick/chkpain3.wav");
sound_sight = gi.soundindex("chick/chksght1.wav");
sound_search = gi.soundindex("chick/chksrch1.wav");
self->movetype = MOVETYPE_STEP; self->movetype = MOVETYPE_STEP;
self->solid = SOLID_BBOX; self->solid = SOLID_BBOX;
self->s.modelindex = gi.modelindex ("models/monsters/bitch/tris.md2"); self->s.modelindex = gi.modelindex("models/monsters/bitch/tris.md2");
VectorSet (self->mins, -16, -16, 0); VectorSet(self->mins, -16, -16, 0);
VectorSet (self->maxs, 16, 16, 56); VectorSet(self->maxs, 16, 16, 56);
self->health = 175; self->health = 175;
self->gib_health = -70; self->gib_health = -70;
@ -670,11 +961,11 @@ void SP_monster_chick (edict_t *self)
self->monsterinfo.melee = chick_melee; self->monsterinfo.melee = chick_melee;
self->monsterinfo.sight = chick_sight; self->monsterinfo.sight = chick_sight;
gi.linkentity (self); gi.linkentity(self);
self->monsterinfo.currentmove = &chick_move_stand; self->monsterinfo.currentmove = &chick_move_stand;
self->monsterinfo.scale = MODEL_SCALE; self->monsterinfo.scale = MODEL_SCALE;
walkmonster_start (self); walkmonster_start(self);
} }

45
src/game/baseq2/monster/chick/chick.h
View file

@ -1,25 +1,28 @@
/* /*
Copyright (C) 1997-2001 Id Software, Inc. * Copyright (C) 1997-2001 Id Software, Inc.
*
This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or modify
modify it under the terms of the GNU General Public License * it under the terms of the GNU General Public License as published by
as published by the Free Software Foundation; either version 2 * the Free Software Foundation; either version 2 of the License, or (at
of the License, or (at your option) any later version. * your option) any later version.
*
This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful, but
but WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
See the GNU General Public License for more details. * See the GNU General Public License for more details.
*
You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/ *
// G:\quake2\baseq2\models/monsters/bitch * =======================================================================
*
// This file generated by qdata - Do NOT Modify * Iron Maiden animations.
*
* =======================================================================
*/
#define FRAME_attak101 0 #define FRAME_attak101 0
#define FRAME_attak102 1 #define FRAME_attak102 1