Bring back the Deadalus, lost during early cleanup

This commit is contained in:
Yamagi Burmeister 2014-02-11 19:06:23 +01:00
parent 58520be47b
commit 2bbb79e56b
2 changed files with 264 additions and 200 deletions

View file

@ -1,6 +1,6 @@
/* =======================================================================
*
* Icarus.
* Icarus and Daedalus.
*
* =======================================================================
*/
@ -26,6 +26,15 @@ static int sound_sight;
static int sound_search1;
static int sound_search2;
/* daedalus sounds */
static int daed_sound_pain1;
static int daed_sound_pain2;
static int daed_sound_death1;
static int daed_sound_death2;
static int daed_sound_sight;
static int daed_sound_search1;
static int daed_sound_search2;
void
hover_sight(edict_t *self, edict_t *other /* unused */)
{
@ -34,7 +43,14 @@ hover_sight(edict_t *self, edict_t *other /* unused */)
return;
}
gi.sound(self, CHAN_VOICE, sound_sight, 1, ATTN_NORM, 0);
if (self->mass < 225)
{
gi.sound(self, CHAN_VOICE, sound_sight, 1, ATTN_NORM, 0);
}
else
{
gi.sound(self, CHAN_VOICE, daed_sound_sight, 1, ATTN_NORM, 0);
}
}
void
@ -45,13 +61,27 @@ hover_search(edict_t *self)
return;
}
if (random() < 0.5)
if (self->mass < 225)
{
gi.sound(self, CHAN_VOICE, sound_search1, 1, ATTN_NORM, 0);
if (random() < 0.5)
{
gi.sound(self, CHAN_VOICE, sound_search1, 1, ATTN_NORM, 0);
}
else
{
gi.sound(self, CHAN_VOICE, sound_search2, 1, ATTN_NORM, 0);
}
}
else
{
gi.sound(self, CHAN_VOICE, sound_search2, 1, ATTN_NORM, 0);
if (random() < 0.5)
{
gi.sound(self, CHAN_VOICE, daed_sound_search1, 1, ATTN_NORM, 0);
}
else
{
gi.sound(self, CHAN_VOICE, daed_sound_search2, 1, ATTN_NORM, 0);
}
}
}
@ -95,83 +125,6 @@ mmove_t hover_move_stand = {
NULL
};
mframe_t hover_frames_stop1[] = {
{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 hover_move_stop1 = {
FRAME_stop101,
FRAME_stop109,
hover_frames_stop1,
NULL
};
mframe_t hover_frames_stop2[] = {
{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 hover_move_stop2 = {
FRAME_stop201,
FRAME_stop208,
hover_frames_stop2,
NULL
};
mframe_t hover_frames_takeoff[] = {
{ai_move, 0, NULL},
{ai_move, -2, 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, -1, NULL},
{ai_move, 0, NULL},
{ai_move, 2, NULL},
{ai_move, 2, NULL},
{ai_move, 1, NULL},
{ai_move, 1, NULL},
{ai_move, -6, NULL},
{ai_move, -9, NULL},
{ai_move, 1, NULL},
{ai_move, 0, NULL},
{ai_move, 2, NULL},
{ai_move, 2, NULL},
{ai_move, 1, NULL},
{ai_move, 1, NULL},
{ai_move, 1, NULL},
{ai_move, 2, NULL},
{ai_move, 0, NULL},
{ai_move, 2, NULL},
{ai_move, 3, NULL},
{ai_move, 2, NULL},
{ai_move, 0, NULL}
};
mmove_t hover_move_takeoff = {
FRAME_takeof01,
FRAME_takeof30,
hover_frames_takeoff,
NULL
};
mframe_t hover_frames_pain3[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -251,62 +204,6 @@ mmove_t hover_move_pain1 = {
hover_run
};
mframe_t hover_frames_land[] = {
{ai_move, 0, NULL}
};
mmove_t hover_move_land = {
FRAME_land01,
FRAME_land01,
hover_frames_land,
NULL
};
mframe_t hover_frames_forward[] = {
{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 hover_move_forward = {
FRAME_forwrd01,
FRAME_forwrd35,
hover_frames_forward,
NULL
};
mframe_t hover_frames_walk[] = {
{ai_walk, 4, NULL},
{ai_walk, 4, NULL},
@ -418,40 +315,6 @@ mmove_t hover_move_death1 = {
hover_dead
};
mframe_t hover_frames_backward[] = {
{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 hover_move_backward = {
FRAME_backwd01,
FRAME_backwd24,
hover_frames_backward,
NULL
};
mframe_t hover_frames_start_attack[] = {
{ai_charge, 1, NULL},
{ai_charge, 1, NULL},
@ -490,6 +353,44 @@ mmove_t hover_move_end_attack = {
hover_run
};
mframe_t hover_frames_start_attack2[] = {
{ai_charge, 15, NULL},
{ai_charge, 15, NULL},
{ai_charge, 15, NULL}
};
mmove_t hover_move_start_attack2 = {
FRAME_attak101,
FRAME_attak103,
hover_frames_start_attack2,
hover_attack
};
mframe_t hover_frames_attack2[] = {
{ai_charge, 10, hover_fire_blaster},
{ai_charge, 10, hover_fire_blaster},
{ai_charge, 10, hover_reattack},
};
mmove_t hover_move_attack2 = {
FRAME_attak104,
FRAME_attak106,
hover_frames_attack2,
NULL
};
mframe_t hover_frames_end_attack2[] = {
{ai_charge, 15, NULL},
{ai_charge, 15, NULL}
};
mmove_t hover_move_end_attack2 = {
FRAME_attak107,
FRAME_attak108,
hover_frames_end_attack2,
hover_run
};
void
hover_reattack(edict_t *self)
{
@ -504,8 +405,20 @@ hover_reattack(edict_t *self)
{
if (random() <= 0.6)
{
self->monsterinfo.currentmove = &hover_move_attack1;
return;
if (self->monsterinfo.attack_state == AS_STRAIGHT)
{
self->monsterinfo.currentmove = &hover_move_attack1;
return;
}
else if (self->monsterinfo.attack_state == AS_SLIDING)
{
self->monsterinfo.currentmove = &hover_move_attack2;
return;
}
else
{
gi.dprintf("hover_reattack: unexpected state %d\n", self->monsterinfo.attack_state);
}
}
}
}
@ -527,6 +440,11 @@ hover_fire_blaster(edict_t *self)
return;
}
if (!self->enemy || !self->enemy->inuse)
{
return;
}
if (self->s.frame == FRAME_attak104)
{
effect = EF_HYPERBLASTER;
@ -544,7 +462,16 @@ hover_fire_blaster(edict_t *self)
end[2] += self->enemy->viewheight;
VectorSubtract(end, start, dir);
monster_fire_blaster(self, start, dir, 1, 1000, MZ2_HOVER_BLASTER_1, effect);
if (self->mass < 200)
{
monster_fire_blaster(self, start, dir, 1,
1000, MZ2_HOVER_BLASTER_1, effect);
}
else
{
monster_fire_blaster2(self, start, dir, 1, 1000,
MZ2_DAEDALUS_BLASTER, EF_BLASTER);
}
}
void
@ -600,13 +527,43 @@ hover_start_attack(edict_t *self)
void
hover_attack(edict_t *self)
{
{
float chance;
if (!self)
{
return;
}
self->monsterinfo.currentmove = &hover_move_attack1;
if (!skill->value)
{
chance = 0;
}
else
{
chance = 1.0 - (0.5 / (float)(skill->value));
}
if (self->mass > 150) /* the daedalus strafes more */
{
chance += 0.1;
}
if (random() > chance)
{
self->monsterinfo.currentmove = &hover_move_attack1;
self->monsterinfo.attack_state = AS_STRAIGHT;
}
else /* circle strafe */
{
if (random() <= 0.5) /* switch directions */
{
self->monsterinfo.lefty = 1 - self->monsterinfo.lefty;
}
self->monsterinfo.currentmove = &hover_move_attack2;
self->monsterinfo.attack_state = AS_SLIDING;
}
}
void
@ -619,7 +576,7 @@ hover_pain(edict_t *self, edict_t *other /* unused */, float kick, int damage)
if (self->health < (self->max_health / 2))
{
self->s.skinnum = 1;
self->s.skinnum |= 1; /* support for skins 2 & 3. */
}
if (level.time < self->pain_debounce_time)
@ -638,19 +595,63 @@ hover_pain(edict_t *self, edict_t *other /* unused */, float kick, int damage)
{
if (random() < 0.5)
{
gi.sound(self, CHAN_VOICE, sound_pain1, 1, ATTN_NORM, 0);
/* daedalus sounds */
if (self->mass < 225)
{
gi.sound(self, CHAN_VOICE, sound_pain1, 1, ATTN_NORM, 0);
}
else
{
gi.sound(self, CHAN_VOICE, daed_sound_pain1, 1, ATTN_NORM, 0);
}
self->monsterinfo.currentmove = &hover_move_pain3;
}
else
{
gi.sound(self, CHAN_VOICE, sound_pain2, 1, ATTN_NORM, 0);
/* daedalus sounds */
if (self->mass < 225)
{
gi.sound(self, CHAN_VOICE, sound_pain2, 1, ATTN_NORM, 0);
}
else
{
gi.sound(self, CHAN_VOICE, daed_sound_pain2, 1, ATTN_NORM, 0);
}
self->monsterinfo.currentmove = &hover_move_pain2;
}
}
else
{
gi.sound(self, CHAN_VOICE, sound_pain1, 1, ATTN_NORM, 0);
self->monsterinfo.currentmove = &hover_move_pain1;
if (random() < (0.45 - (0.1 * skill->value)))
{
/* daedalus sounds */
if (self->mass < 225)
{
gi.sound(self, CHAN_VOICE, sound_pain1, 1, ATTN_NORM, 0);
}
else
{
gi.sound(self, CHAN_VOICE, daed_sound_pain1, 1, ATTN_NORM, 0);
}
self->monsterinfo.currentmove = &hover_move_pain1;
}
else
{
/* daedalus sounds */
if (self->mass < 225)
{
gi.sound(self, CHAN_VOICE, sound_pain2, 1, ATTN_NORM, 0);
}
else
{
gi.sound(self, CHAN_VOICE, daed_sound_pain2, 1, ATTN_NORM, 0);
}
self->monsterinfo.currentmove = &hover_move_pain2;
}
}
}
@ -699,10 +700,13 @@ hover_die(edict_t *self, edict_t *inflictor /* unused */, edict_t *attacker /* u
return;
}
self->s.effects = 0;
self->monsterinfo.power_armor_type = POWER_ARMOR_NONE;
/* check for gib */
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++)
{
@ -725,13 +729,27 @@ hover_die(edict_t *self, edict_t *inflictor /* unused */, edict_t *attacker /* u
}
/* regular death */
if (random() < 0.5)
if (self->mass < 225)
{
gi.sound(self, CHAN_VOICE, sound_death1, 1, ATTN_NORM, 0);
if (random() < 0.5)
{
gi.sound(self, CHAN_VOICE, sound_death1, 1, ATTN_NORM, 0);
}
else
{
gi.sound(self, CHAN_VOICE, sound_death2, 1, ATTN_NORM, 0);
}
}
else
{
gi.sound(self, CHAN_VOICE, sound_death2, 1, ATTN_NORM, 0);
if (random() < 0.5)
{
gi.sound(self, CHAN_VOICE, daed_sound_death1, 1, ATTN_NORM, 0);
}
else
{
gi.sound(self, CHAN_VOICE, daed_sound_death2, 1, ATTN_NORM, 0);
}
}
self->deadflag = DEAD_DEAD;
@ -739,8 +757,28 @@ hover_die(edict_t *self, edict_t *inflictor /* unused */, edict_t *attacker /* u
self->monsterinfo.currentmove = &hover_move_death1;
}
/*
qboolean
hover_blocked(edict_t *self, float dist)
{
if (!self)
{
return false;
}
if (blocked_checkshot(self, 0.25 + (0.05 * skill->value)))
{
return true;
}
return false;
}
/*
* QUAKED monster_hover (1 .5 0) (-16 -16 -24) (16 16 32) Ambush Trigger_Spawn Sight
*
* QUAKED monster_daedalus (1 .5 0) (-16 -16 -24) (16 16 32) Ambush Trigger_Spawn Sight
* This is the improved icarus monster.
*/
void
SP_monster_hover(edict_t *self)
@ -756,18 +794,6 @@ SP_monster_hover(edict_t *self)
return;
}
sound_pain1 = gi.soundindex("hover/hovpain1.wav");
sound_pain2 = gi.soundindex("hover/hovpain2.wav");
sound_death1 = gi.soundindex("hover/hovdeth1.wav");
sound_death2 = gi.soundindex("hover/hovdeth2.wav");
sound_sight = gi.soundindex("hover/hovsght1.wav");
sound_search1 = gi.soundindex("hover/hovsrch1.wav");
sound_search2 = gi.soundindex("hover/hovsrch2.wav");
gi.soundindex("hover/hovatck1.wav");
self->s.sound = gi.soundindex("hover/hovidle1.wav");
self->movetype = MOVETYPE_STEP;
self->solid = SOLID_BBOX;
self->s.modelindex = gi.modelindex("models/monsters/hover/tris.md2");
@ -787,6 +813,38 @@ SP_monster_hover(edict_t *self)
self->monsterinfo.attack = hover_start_attack;
self->monsterinfo.sight = hover_sight;
self->monsterinfo.search = hover_search;
self->monsterinfo.blocked = hover_blocked;
if (strcmp(self->classname, "monster_daedalus") == 0)
{
self->health = 450;
self->mass = 225;
self->yaw_speed = 25;
self->monsterinfo.power_armor_type = POWER_ARMOR_SCREEN;
self->monsterinfo.power_armor_power = 100;
self->s.sound = gi.soundindex("daedalus/daedidle1.wav");
daed_sound_pain1 = gi.soundindex("daedalus/daedpain1.wav");
daed_sound_pain2 = gi.soundindex("daedalus/daedpain2.wav");
daed_sound_death1 = gi.soundindex("daedalus/daeddeth1.wav");
daed_sound_death2 = gi.soundindex("daedalus/daeddeth2.wav");
daed_sound_sight = gi.soundindex("daedalus/daedsght1.wav");
daed_sound_search1 = gi.soundindex("daedalus/daedsrch1.wav");
daed_sound_search2 = gi.soundindex("daedalus/daedsrch2.wav");
gi.soundindex("tank/tnkatck3.wav");
}
else
{
sound_pain1 = gi.soundindex("hover/hovpain1.wav");
sound_pain2 = gi.soundindex("hover/hovpain2.wav");
sound_death1 = gi.soundindex("hover/hovdeth1.wav");
sound_death2 = gi.soundindex("hover/hovdeth2.wav");
sound_sight = gi.soundindex("hover/hovsght1.wav");
sound_search1 = gi.soundindex("hover/hovsrch1.wav");
sound_search2 = gi.soundindex("hover/hovsrch2.wav");
gi.soundindex("hover/hovatck1.wav");
self->s.sound = gi.soundindex("hover/hovidle1.wav");
}
gi.linkentity(self);
@ -794,4 +852,10 @@ SP_monster_hover(edict_t *self)
self->monsterinfo.scale = MODEL_SCALE;
flymonster_start(self);
if (strcmp(self->classname, "monster_daedalus") == 0)
{
self->s.skinnum = 2;
}
}

View file

@ -1,6 +1,6 @@
/* =======================================================================
*
* Icarus animations.
* Icarus and Daedalus animations.
*
* =======================================================================
*/