diff --git a/src/monster/parasite/parasite.c b/src/monster/parasite/parasite.c index c82344b..5b6c5e6 100644 --- a/src/monster/parasite/parasite.c +++ b/src/monster/parasite/parasite.c @@ -1,80 +1,115 @@ -/* -============================================================================== - -parasite - -============================================================================== -*/ - +/* ======================================================================= + * + * Parasite. + * + * ======================================================================= + */ + #include "../../header/local.h" #include "parasite.h" +static int sound_pain1; +static int sound_pain2; +static int sound_die; +static int sound_launch; +static int sound_impact; +static int sound_suck; +static int sound_reelin; +static int sound_sight; +static int sound_tap; +static int sound_scratch; +static int sound_search; -static int sound_pain1; -static int sound_pain2; -static int sound_die; -static int sound_launch; -static int sound_impact; -static int sound_suck; -static int sound_reelin; -static int sound_sight; -static int sound_tap; -static int sound_scratch; -static int sound_search; +void parasite_stand(edict_t *self); +void parasite_start_run(edict_t *self); +void parasite_run(edict_t *self); +void parasite_walk(edict_t *self); +void parasite_start_walk(edict_t *self); +void parasite_end_fidget(edict_t *self); +void parasite_do_fidget(edict_t *self); +void parasite_refidget(edict_t *self); - -void parasite_stand (edict_t *self); -void parasite_start_run (edict_t *self); -void parasite_run (edict_t *self); -void parasite_walk (edict_t *self); -void parasite_start_walk (edict_t *self); -void parasite_end_fidget (edict_t *self); -void parasite_do_fidget (edict_t *self); -void parasite_refidget (edict_t *self); - - -void parasite_launch (edict_t *self) -{ - gi.sound (self, CHAN_WEAPON, sound_launch, 1, ATTN_NORM, 0); +void +parasite_launch(edict_t *self) +{ + if (!self) + { + return; + } + + gi.sound(self, CHAN_WEAPON, sound_launch, 1, ATTN_NORM, 0); } -void parasite_reel_in (edict_t *self) -{ - gi.sound (self, CHAN_WEAPON, sound_reelin, 1, ATTN_NORM, 0); +void +parasite_reel_in(edict_t *self) +{ + if (!self) + { + return; + } + + gi.sound(self, CHAN_WEAPON, sound_reelin, 1, ATTN_NORM, 0); } -void parasite_sight (edict_t *self, edict_t *other) -{ - gi.sound (self, CHAN_WEAPON, sound_sight, 1, ATTN_NORM, 0); +void +parasite_sight(edict_t *self, edict_t *other) +{ + if (!self) + { + return; + } + + gi.sound(self, CHAN_WEAPON, sound_sight, 1, ATTN_NORM, 0); } -void parasite_tap (edict_t *self) -{ - gi.sound (self, CHAN_WEAPON, sound_tap, 1, ATTN_IDLE, 0); +void +parasite_tap(edict_t *self) +{ + if (!self) + { + return; + } + + gi.sound(self, CHAN_WEAPON, sound_tap, 1, ATTN_IDLE, 0); } -void parasite_scratch (edict_t *self) -{ - gi.sound (self, CHAN_WEAPON, sound_scratch, 1, ATTN_IDLE, 0); +void +parasite_scratch(edict_t *self) +{ + if (!self) + { + return; + } + + gi.sound(self, CHAN_WEAPON, sound_scratch, 1, ATTN_IDLE, 0); } -void parasite_search (edict_t *self) -{ - gi.sound (self, CHAN_WEAPON, sound_search, 1, ATTN_IDLE, 0); +void +parasite_search(edict_t *self) +{ + if (!self) + { + return; + } + + gi.sound(self, CHAN_WEAPON, sound_search, 1, ATTN_IDLE, 0); } - -mframe_t parasite_frames_start_fidget [] = -{ +mframe_t parasite_frames_start_fidget[] = { {ai_stand, 0, NULL}, {ai_stand, 0, NULL}, {ai_stand, 0, NULL}, {ai_stand, 0, NULL} }; -mmove_t parasite_move_start_fidget = {FRAME_stand18, FRAME_stand21, parasite_frames_start_fidget, parasite_do_fidget}; -mframe_t parasite_frames_fidget [] = -{ +mmove_t parasite_move_start_fidget = { + FRAME_stand18, + FRAME_stand21, + parasite_frames_start_fidget, + parasite_do_fidget +}; + +mframe_t parasite_frames_fidget[] = { {ai_stand, 0, parasite_scratch}, {ai_stand, 0, NULL}, {ai_stand, 0, NULL}, @@ -82,10 +117,15 @@ mframe_t parasite_frames_fidget [] = {ai_stand, 0, NULL}, {ai_stand, 0, NULL} }; -mmove_t parasite_move_fidget = {FRAME_stand22, FRAME_stand27, parasite_frames_fidget, parasite_refidget}; -mframe_t parasite_frames_end_fidget [] = -{ +mmove_t parasite_move_fidget = { + FRAME_stand22, + FRAME_stand27, + parasite_frames_fidget, + parasite_refidget +}; + +mframe_t parasite_frames_end_fidget[] = { {ai_stand, 0, parasite_scratch}, {ai_stand, 0, NULL}, {ai_stand, 0, NULL}, @@ -95,34 +135,66 @@ mframe_t parasite_frames_end_fidget [] = {ai_stand, 0, NULL}, {ai_stand, 0, NULL} }; -mmove_t parasite_move_end_fidget = {FRAME_stand28, FRAME_stand35, parasite_frames_end_fidget, parasite_stand}; -void parasite_end_fidget (edict_t *self) -{ +mmove_t parasite_move_end_fidget = { + FRAME_stand28, + FRAME_stand35, + parasite_frames_end_fidget, + parasite_stand +}; + +void +parasite_end_fidget(edict_t *self) +{ + if (!self) + { + return; + } + self->monsterinfo.currentmove = ¶site_move_end_fidget; } -void parasite_do_fidget (edict_t *self) -{ +void +parasite_do_fidget(edict_t *self) +{ + if (!self) + { + return; + } + self->monsterinfo.currentmove = ¶site_move_fidget; } -void parasite_refidget (edict_t *self) -{ +void +parasite_refidget(edict_t *self) +{ + if (!self) + { + return; + } + if (random() <= 0.8) + { self->monsterinfo.currentmove = ¶site_move_fidget; + } else + { self->monsterinfo.currentmove = ¶site_move_end_fidget; + } } -void parasite_idle (edict_t *self) -{ +void +parasite_idle(edict_t *self) +{ + if (!self) + { + return; + } + self->monsterinfo.currentmove = ¶site_move_start_fidget; } - -mframe_t parasite_frames_stand [] = -{ +mframe_t parasite_frames_stand[] = { {ai_stand, 0, NULL}, {ai_stand, 0, NULL}, {ai_stand, 0, parasite_tap}, @@ -141,16 +213,26 @@ mframe_t parasite_frames_stand [] = {ai_stand, 0, NULL}, {ai_stand, 0, parasite_tap} }; -mmove_t parasite_move_stand = {FRAME_stand01, FRAME_stand17, parasite_frames_stand, parasite_stand}; -void parasite_stand (edict_t *self) -{ +mmove_t parasite_move_stand = { + FRAME_stand01, + FRAME_stand17, + parasite_frames_stand, + parasite_stand +}; + +void +parasite_stand(edict_t *self) +{ + if (!self) + { + return; + } + self->monsterinfo.currentmove = ¶site_move_stand; } - -mframe_t parasite_frames_run [] = -{ +mframe_t parasite_frames_run[] = { {ai_run, 30, NULL}, {ai_run, 30, NULL}, {ai_run, 22, NULL}, @@ -159,45 +241,79 @@ mframe_t parasite_frames_run [] = {ai_run, 28, NULL}, {ai_run, 25, NULL} }; -mmove_t parasite_move_run = {FRAME_run03, FRAME_run09, parasite_frames_run, NULL}; -mframe_t parasite_frames_start_run [] = -{ - {ai_run, 0, NULL}, +mmove_t parasite_move_run = { + FRAME_run03, + FRAME_run09, + parasite_frames_run, + NULL +}; + +mframe_t parasite_frames_start_run[] = { + {ai_run, 0, NULL}, {ai_run, 30, NULL}, }; -mmove_t parasite_move_start_run = {FRAME_run01, FRAME_run02, parasite_frames_start_run, parasite_run}; -mframe_t parasite_frames_stop_run [] = -{ +mmove_t parasite_move_start_run = { + FRAME_run01, + FRAME_run02, + parasite_frames_start_run, + parasite_run +}; + +mframe_t parasite_frames_stop_run[] = { + {ai_run, 20, NULL}, {ai_run, 20, NULL}, - {ai_run, 20, NULL}, {ai_run, 12, NULL}, {ai_run, 10, NULL}, - {ai_run, 0, NULL}, - {ai_run, 0, NULL} + {ai_run, 0, NULL}, + {ai_run, 0, NULL} }; -mmove_t parasite_move_stop_run = {FRAME_run10, FRAME_run15, parasite_frames_stop_run, NULL}; -void parasite_start_run (edict_t *self) -{ +mmove_t parasite_move_stop_run = { + FRAME_run10, + FRAME_run15, + parasite_frames_stop_run, + NULL +}; + +void +parasite_start_run(edict_t *self) +{ + if (!self) + { + return; + } + if (self->monsterinfo.aiflags & AI_STAND_GROUND) + { self->monsterinfo.currentmove = ¶site_move_stand; + } else + { self->monsterinfo.currentmove = ¶site_move_start_run; + } } -void parasite_run (edict_t *self) -{ +void +parasite_run(edict_t *self) +{ + if (!self) + { + return; + } + if (self->monsterinfo.aiflags & AI_STAND_GROUND) + { self->monsterinfo.currentmove = ¶site_move_stand; + } else + { self->monsterinfo.currentmove = ¶site_move_run; + } } - -mframe_t parasite_frames_walk [] = -{ +mframe_t parasite_frames_walk[] = { {ai_walk, 30, NULL}, {ai_walk, 30, NULL}, {ai_walk, 22, NULL}, @@ -206,257 +322,359 @@ mframe_t parasite_frames_walk [] = {ai_walk, 28, NULL}, {ai_walk, 25, NULL} }; -mmove_t parasite_move_walk = {FRAME_run03, FRAME_run09, parasite_frames_walk, parasite_walk}; -mframe_t parasite_frames_start_walk [] = -{ - {ai_walk, 0, NULL}, +mmove_t parasite_move_walk = { + FRAME_run03, + FRAME_run09, + parasite_frames_walk, + parasite_walk +}; + +mframe_t parasite_frames_start_walk[] = { + {ai_walk, 0, NULL}, {ai_walk, 30, parasite_walk} }; -mmove_t parasite_move_start_walk = {FRAME_run01, FRAME_run02, parasite_frames_start_walk, NULL}; -mframe_t parasite_frames_stop_walk [] = -{ +mmove_t parasite_move_start_walk = { + FRAME_run01, + FRAME_run02, + parasite_frames_start_walk, + NULL +}; + +mframe_t parasite_frames_stop_walk[] = { + {ai_walk, 20, NULL}, {ai_walk, 20, NULL}, - {ai_walk, 20, NULL}, {ai_walk, 12, NULL}, {ai_walk, 10, NULL}, - {ai_walk, 0, NULL}, - {ai_walk, 0, NULL} + {ai_walk, 0, NULL}, + {ai_walk, 0, NULL} }; -mmove_t parasite_move_stop_walk = {FRAME_run10, FRAME_run15, parasite_frames_stop_walk, NULL}; -void parasite_start_walk (edict_t *self) -{ +mmove_t parasite_move_stop_walk = { + FRAME_run10, + FRAME_run15, + parasite_frames_stop_walk, + NULL +}; + +void +parasite_start_walk(edict_t *self) +{ + if (!self) + { + return; + } + self->monsterinfo.currentmove = ¶site_move_start_walk; } -void parasite_walk (edict_t *self) -{ +void +parasite_walk(edict_t *self) +{ + if (!self) + { + return; + } + self->monsterinfo.currentmove = ¶site_move_walk; } - -mframe_t parasite_frames_pain1 [] = -{ +mframe_t parasite_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, 6, NULL}, + {ai_move, 0, NULL}, + {ai_move, 0, NULL}, + {ai_move, 0, NULL}, + {ai_move, 0, NULL}, + {ai_move, 6, NULL}, {ai_move, 16, NULL}, {ai_move, -6, NULL}, {ai_move, -7, NULL}, {ai_move, 0, NULL} }; -mmove_t parasite_move_pain1 = {FRAME_pain101, FRAME_pain111, parasite_frames_pain1, parasite_start_run}; -void parasite_pain (edict_t *self, edict_t *other, float kick, int damage) -{ +mmove_t parasite_move_pain1 = { + FRAME_pain101, + FRAME_pain111, + parasite_frames_pain1, + parasite_start_run +}; + +void +parasite_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; if (skill->value == 3) - return; // no pain anims in nightmare + { + return; /* no pain anims in nightmare */ + } if (random() < 0.5) - gi.sound (self, CHAN_VOICE, sound_pain1, 1, ATTN_NORM, 0); + { + gi.sound(self, CHAN_VOICE, sound_pain1, 1, ATTN_NORM, 0); + } else - gi.sound (self, CHAN_VOICE, sound_pain2, 1, ATTN_NORM, 0); + { + gi.sound(self, CHAN_VOICE, sound_pain2, 1, ATTN_NORM, 0); + } self->monsterinfo.currentmove = ¶site_move_pain1; } - -//static qboolean parasite_drain_attack_ok (vec3_t start, vec3_t end) -qboolean parasite_drain_attack_ok (vec3_t start, vec3_t end) +qboolean +parasite_drain_attack_ok(vec3_t start, vec3_t end) { - vec3_t dir, angles; + vec3_t dir, angles; + + /* check for max distance */ + VectorSubtract(start, end, dir); - // check for max distance - VectorSubtract (start, end, dir); if (VectorLength(dir) > 256) + { return false; + } + + /* check for min/max pitch */ + vectoangles(dir, angles); - // check for min/max pitch - vectoangles (dir, angles); if (angles[0] < -180) + { angles[0] += 360; + } + if (fabs(angles[0]) > 30) + { return false; + } return true; } -void parasite_drain_attack (edict_t *self) +void +parasite_drain_attack(edict_t *self) { - vec3_t offset, start, f, r, end, dir; - trace_t tr; + vec3_t offset, start, f, r, end, dir; + trace_t tr; int damage; + + if (!self) + { + return; + } + + AngleVectors(self->s.angles, f, r, NULL); + VectorSet(offset, 24, 0, 6); + G_ProjectSource(self->s.origin, offset, f, r, start); - AngleVectors (self->s.angles, f, r, NULL); - VectorSet (offset, 24, 0, 6); - G_ProjectSource (self->s.origin, offset, f, r, start); + VectorCopy(self->enemy->s.origin, end); - VectorCopy (self->enemy->s.origin, end); if (!parasite_drain_attack_ok(start, end)) { end[2] = self->enemy->s.origin[2] + self->enemy->maxs[2] - 8; + if (!parasite_drain_attack_ok(start, end)) { end[2] = self->enemy->s.origin[2] + self->enemy->mins[2] + 8; + if (!parasite_drain_attack_ok(start, end)) + { return; + } } } - VectorCopy (self->enemy->s.origin, end); - tr = gi.trace (start, NULL, NULL, end, self, MASK_SHOT); + VectorCopy(self->enemy->s.origin, end); + + tr = gi.trace(start, NULL, NULL, end, self, MASK_SHOT); + if (tr.ent != self->enemy) + { return; + } if (self->s.frame == FRAME_drain03) { damage = 5; - gi.sound (self->enemy, CHAN_AUTO, sound_impact, 1, ATTN_NORM, 0); + gi.sound(self->enemy, CHAN_AUTO, sound_impact, 1, ATTN_NORM, 0); } else { if (self->s.frame == FRAME_drain04) - gi.sound (self, CHAN_WEAPON, sound_suck, 1, ATTN_NORM, 0); + { + gi.sound(self, CHAN_WEAPON, sound_suck, 1, ATTN_NORM, 0); + } + damage = 2; } - gi.WriteByte (svc_temp_entity); - gi.WriteByte (TE_PARASITE_ATTACK); - gi.WriteShort (self - g_edicts); - gi.WritePosition (start); - gi.WritePosition (end); - gi.multicast (self->s.origin, MULTICAST_PVS); + gi.WriteByte(svc_temp_entity); + gi.WriteByte(TE_PARASITE_ATTACK); + gi.WriteShort(self - g_edicts); + gi.WritePosition(start); + gi.WritePosition(end); + gi.multicast(self->s.origin, MULTICAST_PVS); - VectorSubtract (start, end, dir); - T_Damage (self->enemy, self, self, dir, self->enemy->s.origin, vec3_origin, damage, 0, DAMAGE_NO_KNOCKBACK, MOD_UNKNOWN); + VectorSubtract(start, end, dir); + T_Damage(self->enemy, self, self, dir, self->enemy->s.origin, vec3_origin, + damage, 0, DAMAGE_NO_KNOCKBACK, MOD_UNKNOWN); } -mframe_t parasite_frames_drain [] = -{ - {ai_charge, 0, parasite_launch}, - {ai_charge, 0, NULL}, - {ai_charge, 15, parasite_drain_attack}, // Target hits - {ai_charge, 0, parasite_drain_attack}, // drain - {ai_charge, 0, parasite_drain_attack}, // drain - {ai_charge, 0, parasite_drain_attack}, // drain - {ai_charge, 0, parasite_drain_attack}, // drain - {ai_charge, -2, parasite_drain_attack}, // drain - {ai_charge, -2, parasite_drain_attack}, // drain - {ai_charge, -3, parasite_drain_attack}, // drain - {ai_charge, -2, parasite_drain_attack}, // drain - {ai_charge, 0, parasite_drain_attack}, // drain - {ai_charge, -1, parasite_drain_attack}, // drain - {ai_charge, 0, parasite_reel_in}, // let go - {ai_charge, -2, NULL}, - {ai_charge, -2, NULL}, - {ai_charge, -3, NULL}, - {ai_charge, 0, NULL} +mframe_t parasite_frames_drain[] = { + {ai_charge, 0, parasite_launch}, + {ai_charge, 0, NULL}, + {ai_charge, 15, parasite_drain_attack}, /* Target hits */ + {ai_charge, 0, parasite_drain_attack}, /* drain */ + {ai_charge, 0, parasite_drain_attack}, /* drain */ + {ai_charge, 0, parasite_drain_attack}, /* drain */ + {ai_charge, 0, parasite_drain_attack}, /* drain */ + {ai_charge, -2, parasite_drain_attack}, /* drain */ + {ai_charge, -2, parasite_drain_attack}, /* drain */ + {ai_charge, -3, parasite_drain_attack}, /* drain */ + {ai_charge, -2, parasite_drain_attack}, /* drain */ + {ai_charge, 0, parasite_drain_attack}, /* drain */ + {ai_charge, -1, parasite_drain_attack}, /* drain */ + {ai_charge, 0, parasite_reel_in}, /* let go */ + {ai_charge, -2, NULL}, + {ai_charge, -2, NULL}, + {ai_charge, -3, NULL}, + {ai_charge, 0, NULL} }; -mmove_t parasite_move_drain = {FRAME_drain01, FRAME_drain18, parasite_frames_drain, parasite_start_run}; - -mframe_t parasite_frames_break [] = -{ - {ai_charge, 0, NULL}, - {ai_charge, -3, NULL}, - {ai_charge, 1, NULL}, - {ai_charge, 2, NULL}, - {ai_charge, -3, NULL}, - {ai_charge, 1, NULL}, - {ai_charge, 1, NULL}, - {ai_charge, 3, NULL}, - {ai_charge, 0, NULL}, - {ai_charge, -18, NULL}, - {ai_charge, 3, NULL}, - {ai_charge, 9, NULL}, - {ai_charge, 6, NULL}, - {ai_charge, 0, NULL}, - {ai_charge, -18, NULL}, - {ai_charge, 0, NULL}, - {ai_charge, 8, NULL}, - {ai_charge, 9, NULL}, - {ai_charge, 0, NULL}, - {ai_charge, -18, NULL}, - {ai_charge, 0, NULL}, - {ai_charge, 0, NULL}, // airborne - {ai_charge, 0, NULL}, // airborne - {ai_charge, 0, NULL}, // slides - {ai_charge, 0, NULL}, // slides - {ai_charge, 0, NULL}, // slides - {ai_charge, 0, NULL}, // slides - {ai_charge, 4, NULL}, - {ai_charge, 11, NULL}, - {ai_charge, -2, NULL}, - {ai_charge, -5, NULL}, - {ai_charge, 1, NULL} +mmove_t parasite_move_drain = { + FRAME_drain01, + FRAME_drain18, + parasite_frames_drain, + parasite_start_run }; -mmove_t parasite_move_break = {FRAME_break01, FRAME_break32, parasite_frames_break, parasite_start_run}; -/* -=== -Break Stuff Ends -=== -*/ +mframe_t parasite_frames_break[] = { + {ai_charge, 0, NULL}, + {ai_charge, -3, NULL}, + {ai_charge, 1, NULL}, + {ai_charge, 2, NULL}, + {ai_charge, -3, NULL}, + {ai_charge, 1, NULL}, + {ai_charge, 1, NULL}, + {ai_charge, 3, NULL}, + {ai_charge, 0, NULL}, + {ai_charge, -18, NULL}, + {ai_charge, 3, NULL}, + {ai_charge, 9, NULL}, + {ai_charge, 6, NULL}, + {ai_charge, 0, NULL}, + {ai_charge, -18, NULL}, + {ai_charge, 0, NULL}, + {ai_charge, 8, NULL}, + {ai_charge, 9, NULL}, + {ai_charge, 0, NULL}, + {ai_charge, -18, NULL}, + {ai_charge, 0, NULL}, + {ai_charge, 0, NULL}, /* airborne */ + {ai_charge, 0, NULL}, /* airborne */ + {ai_charge, 0, NULL}, /* slides */ + {ai_charge, 0, NULL}, /* slides */ + {ai_charge, 0, NULL}, /* slides */ + {ai_charge, 0, NULL}, /* slides */ + {ai_charge, 4, NULL}, + {ai_charge, 11, NULL}, + {ai_charge, -2, NULL}, + {ai_charge, -5, NULL}, + {ai_charge, 1, NULL} +}; -void parasite_attack (edict_t *self) -{ - self->monsterinfo.currentmove = ¶site_move_drain; +mmove_t parasite_move_break = { + FRAME_break01, + FRAME_break32, + parasite_frames_break, + parasite_start_run +}; + +void +parasite_attack(edict_t *self) +{ + if (!self) + { + return; + } + + self->monsterinfo.currentmove = ¶site_move_drain; } - -//================ -//ROGUE -void parasite_jump_down (edict_t *self) +void +parasite_jump_down(edict_t *self) { - vec3_t forward,up; + vec3_t forward, up; + + if (!self) + { + return; + } + + monster_jump_start(self); - monster_jump_start (self); - - AngleVectors (self->s.angles, forward, NULL, up); + AngleVectors(self->s.angles, forward, NULL, up); VectorMA(self->velocity, 100, forward, self->velocity); VectorMA(self->velocity, 300, up, self->velocity); } -void parasite_jump_up (edict_t *self) +void +parasite_jump_up(edict_t *self) { - vec3_t forward,up; + vec3_t forward, up; + + if (!self) + { + return; + } + + monster_jump_start(self); - monster_jump_start (self); - - AngleVectors (self->s.angles, forward, NULL, up); + AngleVectors(self->s.angles, forward, NULL, up); VectorMA(self->velocity, 200, forward, self->velocity); VectorMA(self->velocity, 450, up, self->velocity); } -void parasite_jump_wait_land (edict_t *self) -{ - if(self->groundentity == NULL) +void +parasite_jump_wait_land(edict_t *self) +{ + if (!self) + { + return; + } + + if (self->groundentity == NULL) { self->monsterinfo.nextframe = self->s.frame; - if(monster_jump_finished (self)) + if (monster_jump_finished(self)) + { self->monsterinfo.nextframe = self->s.frame + 1; + } } - else + else + { self->monsterinfo.nextframe = self->s.frame + 1; + } } -mframe_t parasite_frames_jump_up [] = -{ +mframe_t parasite_frames_jump_up[] = { {ai_move, -8, NULL}, {ai_move, -8, NULL}, {ai_move, -8, NULL}, @@ -466,10 +684,15 @@ mframe_t parasite_frames_jump_up [] = {ai_move, 0, parasite_jump_wait_land}, {ai_move, 0, NULL} }; -mmove_t parasite_move_jump_up = { FRAME_jump01, FRAME_jump08, parasite_frames_jump_up, parasite_run }; -mframe_t parasite_frames_jump_down [] = -{ +mmove_t parasite_move_jump_up = { + FRAME_jump01, + FRAME_jump08, + parasite_frames_jump_up, + parasite_run +}; + +mframe_t parasite_frames_jump_down[] = { {ai_move, 0, NULL}, {ai_move, 0, NULL}, {ai_move, 0, NULL}, @@ -479,160 +702,220 @@ mframe_t parasite_frames_jump_down [] = {ai_move, 0, parasite_jump_wait_land}, {ai_move, 0, NULL} }; -mmove_t parasite_move_jump_down = { FRAME_jump01, FRAME_jump08, parasite_frames_jump_down, parasite_run }; -void parasite_jump (edict_t *self) -{ - if(!self->enemy) +mmove_t parasite_move_jump_down = { + FRAME_jump01, + FRAME_jump08, + parasite_frames_jump_down, + parasite_run +}; + +void +parasite_jump(edict_t *self) +{ + if (!self) + { return; + } + + if (!self->enemy) + { + return; + } - if(self->enemy->s.origin[2] > self->s.origin[2]) + if (self->enemy->s.origin[2] > self->s.origin[2]) + { self->monsterinfo.currentmove = ¶site_move_jump_up; + } else + { self->monsterinfo.currentmove = ¶site_move_jump_down; + } } -/* -=== -Blocked -=== -*/ -qboolean parasite_blocked (edict_t *self, float dist) -{ - if(blocked_checkshot (self, 0.25 + (0.05 * skill->value) )) - return true; - - if(blocked_checkjump (self, dist, 256, 68)) +qboolean +parasite_blocked(edict_t *self, float dist) +{ + if (!self) + { + return false; + } + + if (blocked_checkshot(self, 0.25 + (0.05 * skill->value))) { - parasite_jump (self); return true; } - if(blocked_checkplat (self, dist)) + if (blocked_checkjump(self, dist, 256, 68)) + { + parasite_jump(self); return true; + } + + if (blocked_checkplat(self, dist)) + { + return true; + } + return false; } -//ROGUE -//================ - -qboolean parasite_checkattack (edict_t *self) +qboolean +parasite_checkattack(edict_t *self) { - vec3_t f, r, offset, start, end; - trace_t tr; + vec3_t f, r, offset, start, end; + trace_t tr; qboolean retval; - - retval = M_CheckAttack (self); + + if (!self) + { + return false; + } + + retval = M_CheckAttack(self); if (!retval) + { return false; + } - AngleVectors (self->s.angles, f, r, NULL); - VectorSet (offset, 24, 0, 6); - G_ProjectSource (self->s.origin, offset, f, r, start); + AngleVectors(self->s.angles, f, r, NULL); + VectorSet(offset, 24, 0, 6); + G_ProjectSource(self->s.origin, offset, f, r, start); + + VectorCopy(self->enemy->s.origin, end); - VectorCopy (self->enemy->s.origin, end); if (!parasite_drain_attack_ok(start, end)) { end[2] = self->enemy->s.origin[2] + self->enemy->maxs[2] - 8; + if (!parasite_drain_attack_ok(start, end)) { end[2] = self->enemy->s.origin[2] + self->enemy->mins[2] + 8; + if (!parasite_drain_attack_ok(start, end)) + { return false; + } } } - VectorCopy (self->enemy->s.origin, end); - tr = gi.trace (start, NULL, NULL, end, self, MASK_SHOT); + VectorCopy(self->enemy->s.origin, end); + + tr = gi.trace(start, NULL, NULL, end, self, MASK_SHOT); + if (tr.ent != self->enemy) { self->monsterinfo.aiflags |= AI_BLOCKED; - - if(self->monsterinfo.attack) + + if (self->monsterinfo.attack) + { self->monsterinfo.attack(self); - + } + self->monsterinfo.aiflags &= ~AI_BLOCKED; return true; } + return false; } - -/* -=== -Death Stuff Starts -=== -*/ - -void parasite_dead (edict_t *self) -{ - VectorSet (self->mins, -16, -16, -24); - VectorSet (self->maxs, 16, 16, -8); +void +parasite_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 parasite_frames_death [] = -{ - {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} +mframe_t parasite_frames_death[] = { + {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 parasite_move_death = {FRAME_death101, FRAME_death107, parasite_frames_death, parasite_dead}; -void parasite_die (edict_t *self, edict_t *inflictor, edict_t *attacker, int damage, vec3_t point) +mmove_t parasite_move_death = { + FRAME_death101, + FRAME_death107, + parasite_frames_death, + parasite_dead +}; + +void +parasite_die(edict_t *self, edict_t *inflictor /* unused */, edict_t *attacker /* unused */, + int damage, vec3_t point /* unsued */) { - int n; - - // check for gib + int n; + + if (!self) + { + return; + } + + /* check for gib */ 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; + } - // regular death - gi.sound (self, CHAN_VOICE, sound_die, 1, ATTN_NORM, 0); + /* regular death */ + gi.sound(self, CHAN_VOICE, sound_die, 1, ATTN_NORM, 0); self->deadflag = DEAD_DEAD; self->takedamage = DAMAGE_YES; self->monsterinfo.currentmove = ¶site_move_death; } /* -=== -End Death Stuff -=== -*/ - -/*QUAKED monster_parasite (1 .5 0) (-16 -16 -24) (16 16 32) Ambush Trigger_Spawn Sight -*/ -void SP_monster_parasite (edict_t *self) -{ + * QUAKED monster_parasite (1 .5 0) (-16 -16 -24) (16 16 32) Ambush Trigger_Spawn Sight + */ +void +SP_monster_parasite(edict_t *self) +{ + if (!self) + { + return; + } + if (deathmatch->value) { - G_FreeEdict (self); + G_FreeEdict(self); return; } - sound_pain1 = gi.soundindex ("parasite/parpain1.wav"); - sound_pain2 = gi.soundindex ("parasite/parpain2.wav"); - sound_die = gi.soundindex ("parasite/pardeth1.wav"); + sound_pain1 = gi.soundindex("parasite/parpain1.wav"); + sound_pain2 = gi.soundindex("parasite/parpain2.wav"); + sound_die = gi.soundindex("parasite/pardeth1.wav"); sound_launch = gi.soundindex("parasite/paratck1.wav"); sound_impact = gi.soundindex("parasite/paratck2.wav"); sound_suck = gi.soundindex("parasite/paratck3.wav"); @@ -642,9 +925,9 @@ void SP_monster_parasite (edict_t *self) sound_scratch = gi.soundindex("parasite/paridle2.wav"); sound_search = gi.soundindex("parasite/parsrch1.wav"); - self->s.modelindex = gi.modelindex ("models/monsters/parasite/tris.md2"); - VectorSet (self->mins, -16, -16, -24); - VectorSet (self->maxs, 16, 16, 24); + self->s.modelindex = gi.modelindex("models/monsters/parasite/tris.md2"); + VectorSet(self->mins, -16, -16, -24); + VectorSet(self->maxs, 16, 16, 24); self->movetype = MOVETYPE_STEP; self->solid = SOLID_BBOX; @@ -661,14 +944,13 @@ void SP_monster_parasite (edict_t *self) self->monsterinfo.attack = parasite_attack; self->monsterinfo.sight = parasite_sight; self->monsterinfo.idle = parasite_idle; - self->monsterinfo.blocked = parasite_blocked; // PGM + self->monsterinfo.blocked = parasite_blocked; self->monsterinfo.checkattack = parasite_checkattack; - gi.linkentity (self); + gi.linkentity(self); - self->monsterinfo.currentmove = ¶site_move_stand; + self->monsterinfo.currentmove = ¶site_move_stand; self->monsterinfo.scale = MODEL_SCALE; - walkmonster_start (self); + walkmonster_start(self); } - diff --git a/src/monster/parasite/parasite.h b/src/monster/parasite/parasite.h index 3a3e55a..4310c87 100644 --- a/src/monster/parasite/parasite.h +++ b/src/monster/parasite/parasite.h @@ -1,7 +1,10 @@ -// G:\quake2\baseq2\models/monsters/parasite - -// This file generated by ModelGen - Do NOT Modify - +/* ======================================================================= + * + * Parasite animations. + * + * ======================================================================= + */ + #define FRAME_break01 0 #define FRAME_break02 1 #define FRAME_break03 2 @@ -120,7 +123,6 @@ #define FRAME_stand33 115 #define FRAME_stand34 116 #define FRAME_stand35 117 - #define FRAME_jump01 118 #define FRAME_jump02 119 #define FRAME_jump03 120 @@ -129,5 +131,4 @@ #define FRAME_jump06 123 #define FRAME_jump07 124 #define FRAME_jump08 125 - #define MODEL_SCALE 1.000000