diff options
Diffstat (limited to 'src/baseq2/m_boss31.c')
| -rw-r--r-- | src/baseq2/m_boss31.c | 362 |
1 files changed, 162 insertions, 200 deletions
diff --git a/src/baseq2/m_boss31.c b/src/baseq2/m_boss31.c index 0a272fb..d62dc2a 100644 --- a/src/baseq2/m_boss31.c +++ b/src/baseq2/m_boss31.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but 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. @@ -28,8 +28,8 @@ jorg #include "g_local.h" #include "m_boss31.h" -extern void SP_monster_makron (edict_t *self); -qboolean visible (edict_t *self, edict_t *other); +extern void SP_monster_makron(edict_t *self); +qboolean visible(edict_t *self, edict_t *other); static int sound_pain1; static int sound_pain2; @@ -46,29 +46,29 @@ static int sound_step_left; static int sound_step_right; static int sound_death_hit; -void BossExplode (edict_t *self); -void MakronToss (edict_t *self); +void BossExplode(edict_t *self); +void MakronToss(edict_t *self); -void jorg_search (edict_t *self) +void jorg_search(edict_t *self) { float r; r = random(); if (r <= 0.3) - gi.sound (self, CHAN_VOICE, sound_search1, 1, ATTN_NORM, 0); + gi.sound(self, CHAN_VOICE, sound_search1, 1, ATTN_NORM, 0); else if (r <= 0.6) - gi.sound (self, CHAN_VOICE, sound_search2, 1, ATTN_NORM, 0); + gi.sound(self, CHAN_VOICE, sound_search2, 1, ATTN_NORM, 0); else - gi.sound (self, CHAN_VOICE, sound_search3, 1, ATTN_NORM, 0); + gi.sound(self, CHAN_VOICE, sound_search3, 1, ATTN_NORM, 0); } -void jorg_dead (edict_t *self); -void jorgBFG (edict_t *self); -void jorgMachineGun (edict_t *self); -void jorg_firebullet (edict_t *self); +void jorg_dead(edict_t *self); +void jorgBFG(edict_t *self); +void jorgMachineGun(edict_t *self); +void jorg_firebullet(edict_t *self); void jorg_reattack1(edict_t *self); void jorg_attack1(edict_t *self); void jorg_idle(edict_t *self); @@ -80,8 +80,7 @@ void jorg_death_hit(edict_t *self); // stand // -mframe_t jorg_frames_stand []= -{ +mframe_t jorg_frames_stand [] = { { ai_stand, 0, jorg_idle }, { ai_stand, 0, NULL }, { ai_stand, 0, NULL }, @@ -136,35 +135,34 @@ mframe_t jorg_frames_stand []= }; mmove_t jorg_move_stand = {FRAME_stand01, FRAME_stand51, jorg_frames_stand, NULL}; -void jorg_idle (edict_t *self) +void jorg_idle(edict_t *self) { - gi.sound (self, CHAN_VOICE, sound_idle, 1, ATTN_NORM,0); + gi.sound(self, CHAN_VOICE, sound_idle, 1, ATTN_NORM, 0); } -void jorg_death_hit (edict_t *self) +void jorg_death_hit(edict_t *self) { - gi.sound (self, CHAN_BODY, sound_death_hit, 1, ATTN_NORM,0); + gi.sound(self, CHAN_BODY, sound_death_hit, 1, ATTN_NORM, 0); } -void jorg_step_left (edict_t *self) +void jorg_step_left(edict_t *self) { - gi.sound (self, CHAN_BODY, sound_step_left, 1, ATTN_NORM,0); + gi.sound(self, CHAN_BODY, sound_step_left, 1, ATTN_NORM, 0); } -void jorg_step_right (edict_t *self) +void jorg_step_right(edict_t *self) { - gi.sound (self, CHAN_BODY, sound_step_right, 1, ATTN_NORM,0); + gi.sound(self, CHAN_BODY, sound_step_right, 1, ATTN_NORM, 0); } -void jorg_stand (edict_t *self) +void jorg_stand(edict_t *self) { self->monsterinfo.currentmove = &jorg_move_stand; } -mframe_t jorg_frames_run [] = -{ +mframe_t jorg_frames_run [] = { { ai_run, 17, jorg_step_left }, { ai_run, 0, NULL }, { ai_run, 0, NULL }, @@ -186,8 +184,7 @@ mmove_t jorg_move_run = {FRAME_walk06, FRAME_walk19, jorg_frames_run, NULL}; // walk // -mframe_t jorg_frames_start_walk [] = -{ +mframe_t jorg_frames_start_walk [] = { { ai_walk, 5, NULL }, { ai_walk, 6, NULL }, { ai_walk, 7, NULL }, @@ -196,8 +193,7 @@ mframe_t jorg_frames_start_walk [] = }; mmove_t jorg_move_start_walk = {FRAME_walk01, FRAME_walk05, jorg_frames_start_walk, NULL}; -mframe_t jorg_frames_walk [] = -{ +mframe_t jorg_frames_walk [] = { { ai_walk, 17, NULL }, { ai_walk, 0, NULL }, { ai_walk, 0, NULL }, @@ -215,8 +211,7 @@ mframe_t jorg_frames_walk [] = }; mmove_t jorg_move_walk = {FRAME_walk06, FRAME_walk19, jorg_frames_walk, NULL}; -mframe_t jorg_frames_end_walk [] = -{ +mframe_t jorg_frames_end_walk [] = { { ai_walk, 11, NULL }, { ai_walk, 0, NULL }, { ai_walk, 0, NULL }, @@ -226,12 +221,12 @@ mframe_t jorg_frames_end_walk [] = }; mmove_t jorg_move_end_walk = {FRAME_walk20, FRAME_walk25, jorg_frames_end_walk, NULL}; -void jorg_walk (edict_t *self) +void jorg_walk(edict_t *self) { - self->monsterinfo.currentmove = &jorg_move_walk; + self->monsterinfo.currentmove = &jorg_move_walk; } -void jorg_run (edict_t *self) +void jorg_run(edict_t *self) { if (self->monsterinfo.aiflags & AI_STAND_GROUND) self->monsterinfo.currentmove = &jorg_move_stand; @@ -239,8 +234,7 @@ void jorg_run (edict_t *self) self->monsterinfo.currentmove = &jorg_move_run; } -mframe_t jorg_frames_pain3 [] = -{ +mframe_t jorg_frames_pain3 [] = { { ai_move, -28, NULL }, { ai_move, -6, NULL }, { ai_move, -3, jorg_step_left }, @@ -269,24 +263,21 @@ mframe_t jorg_frames_pain3 [] = }; mmove_t jorg_move_pain3 = {FRAME_pain301, FRAME_pain325, jorg_frames_pain3, jorg_run}; -mframe_t jorg_frames_pain2 [] = -{ +mframe_t jorg_frames_pain2 [] = { { ai_move, 0, NULL }, { ai_move, 0, NULL }, { ai_move, 0, NULL } }; mmove_t jorg_move_pain2 = {FRAME_pain201, FRAME_pain203, jorg_frames_pain2, jorg_run}; -mframe_t jorg_frames_pain1 [] = -{ +mframe_t jorg_frames_pain1 [] = { { ai_move, 0, NULL }, { ai_move, 0, NULL }, { ai_move, 0, NULL } }; mmove_t jorg_move_pain1 = {FRAME_pain101, FRAME_pain103, jorg_frames_pain1, jorg_run}; -mframe_t jorg_frames_death1 [] = -{ +mframe_t jorg_frames_death1 [] = { { ai_move, 0, NULL }, { ai_move, 0, NULL }, { ai_move, 0, NULL }, @@ -310,10 +301,10 @@ mframe_t jorg_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 }, // 30 @@ -330,25 +321,24 @@ mframe_t jorg_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, MakronToss }, { ai_move, 0, BossExplode } // 50 }; mmove_t jorg_move_death = {FRAME_death01, FRAME_death50, jorg_frames_death1, jorg_dead}; -mframe_t jorg_frames_attack2 []= -{ +mframe_t jorg_frames_attack2 [] = { { 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, jorgBFG }, + { ai_charge, 0, jorgBFG }, { ai_move, 0, NULL }, { ai_move, 0, NULL }, { ai_move, 0, NULL }, @@ -358,8 +348,7 @@ mframe_t jorg_frames_attack2 []= }; mmove_t jorg_move_attack2 = {FRAME_attak201, FRAME_attak213, jorg_frames_attack2, jorg_run}; -mframe_t jorg_frames_start_attack1 [] = -{ +mframe_t jorg_frames_start_attack1 [] = { { ai_charge, 0, NULL }, { ai_charge, 0, NULL }, { ai_charge, 0, NULL }, @@ -371,8 +360,7 @@ mframe_t jorg_frames_start_attack1 [] = }; mmove_t jorg_move_start_attack1 = {FRAME_attak101, FRAME_attak108, jorg_frames_start_attack1, jorg_attack1}; -mframe_t jorg_frames_attack1[]= -{ +mframe_t jorg_frames_attack1[] = { { ai_charge, 0, jorg_firebullet }, { ai_charge, 0, jorg_firebullet }, { ai_charge, 0, jorg_firebullet }, @@ -382,8 +370,7 @@ mframe_t jorg_frames_attack1[]= }; mmove_t jorg_move_attack1 = {FRAME_attak109, FRAME_attak114, jorg_frames_attack1, jorg_reattack1}; -mframe_t jorg_frames_end_attack1[]= -{ +mframe_t jorg_frames_end_attack1[] = { { ai_move, 0, NULL }, { ai_move, 0, NULL }, { ai_move, 0, NULL }, @@ -396,15 +383,13 @@ void jorg_reattack1(edict_t *self) if (visible(self, self->enemy)) if (random() < 0.9) self->monsterinfo.currentmove = &jorg_move_attack1; - else - { + else { self->s.sound = 0; - self->monsterinfo.currentmove = &jorg_move_end_attack1; + self->monsterinfo.currentmove = &jorg_move_end_attack1; } - else - { + else { self->s.sound = 0; - self->monsterinfo.currentmove = &jorg_move_end_attack1; + self->monsterinfo.currentmove = &jorg_move_end_attack1; } } @@ -413,37 +398,37 @@ void jorg_attack1(edict_t *self) self->monsterinfo.currentmove = &jorg_move_attack1; } -void jorg_pain (edict_t *self, edict_t *other, float kick, int damage) +void jorg_pain(edict_t *self, edict_t *other, float kick, int damage) { if (self->health < (self->max_health / 2)) - self->s.skinnum = 1; - + self->s.skinnum = 1; + self->s.sound = 0; if (level.time < self->pain_debounce_time) - return; + return; // Lessen the chance of him going into his pain frames if he takes little damage if (damage <= 40) - if (random()<=0.6) + if (random() <= 0.6) return; - /* + /* If he's entering his attack1 or using attack1, lessen the chance of him going into pain */ - - if ( (self->s.frame >= FRAME_attak101) && (self->s.frame <= FRAME_attak108) ) + + if ((self->s.frame >= FRAME_attak101) && (self->s.frame <= FRAME_attak108)) if (random() <= 0.005) return; - if ( (self->s.frame >= FRAME_attak109) && (self->s.frame <= FRAME_attak114) ) + if ((self->s.frame >= FRAME_attak109) && (self->s.frame <= FRAME_attak114)) if (random() <= 0.00005) return; - if ( (self->s.frame >= FRAME_attak201) && (self->s.frame <= FRAME_attak208) ) + if ((self->s.frame >= FRAME_attak201) && (self->s.frame <= FRAME_attak208)) if (random() <= 0.005) return; @@ -452,85 +437,79 @@ void jorg_pain (edict_t *self, edict_t *other, float kick, int damage) if (skill->value == 3) return; // no pain anims in nightmare - if (damage <= 50) - { - gi.sound (self, CHAN_VOICE, sound_pain1, 1, ATTN_NORM,0); + if (damage <= 50) { + gi.sound(self, CHAN_VOICE, sound_pain1, 1, ATTN_NORM, 0); self->monsterinfo.currentmove = &jorg_move_pain1; - } - else if (damage <= 100) - { - gi.sound (self, CHAN_VOICE, sound_pain2, 1, ATTN_NORM,0); + } else if (damage <= 100) { + gi.sound(self, CHAN_VOICE, sound_pain2, 1, ATTN_NORM, 0); self->monsterinfo.currentmove = &jorg_move_pain2; - } - else - { - if (random() <= 0.3) - { - gi.sound (self, CHAN_VOICE, sound_pain3, 1, ATTN_NORM,0); + } else { + if (random() <= 0.3) { + gi.sound(self, CHAN_VOICE, sound_pain3, 1, ATTN_NORM, 0); self->monsterinfo.currentmove = &jorg_move_pain3; } } }; -void jorgBFG (edict_t *self) +void jorgBFG(edict_t *self) { vec3_t forward, right; vec3_t start; vec3_t dir; vec3_t vec; - AngleVectors (self->s.angles, forward, right, NULL); - G_ProjectSource (self->s.origin, monster_flash_offset[MZ2_JORG_BFG_1], forward, right, start); + AngleVectors(self->s.angles, forward, right, NULL); + G_ProjectSource(self->s.origin, monster_flash_offset[MZ2_JORG_BFG_1], forward, right, start); - VectorCopy (self->enemy->s.origin, vec); + VectorCopy(self->enemy->s.origin, vec); vec[2] += self->enemy->viewheight; - VectorSubtract (vec, start, dir); - VectorNormalize (dir); - gi.sound (self, CHAN_VOICE, sound_attack2, 1, ATTN_NORM, 0); - /*void monster_fire_bfg (edict_t *self, - vec3_t start, - vec3_t aimdir, - int damage, - int speed, - int kick, - float damage_radius, + VectorSubtract(vec, start, dir); + VectorNormalize(dir); + gi.sound(self, CHAN_VOICE, sound_attack2, 1, ATTN_NORM, 0); + /*void monster_fire_bfg (edict_t *self, + vec3_t start, + vec3_t aimdir, + int damage, + int speed, + int kick, + float damage_radius, int flashtype)*/ - monster_fire_bfg (self, start, dir, 50, 300, 100, 200, MZ2_JORG_BFG_1); -} + monster_fire_bfg(self, start, dir, 50, 300, 100, 200, MZ2_JORG_BFG_1); +} -void jorg_firebullet_right (edict_t *self) +void jorg_firebullet_right(edict_t *self) { vec3_t forward, right, target; vec3_t start; - AngleVectors (self->s.angles, forward, right, NULL); - G_ProjectSource (self->s.origin, monster_flash_offset[MZ2_JORG_MACHINEGUN_R1], forward, right, start); + AngleVectors(self->s.angles, forward, right, NULL); + G_ProjectSource(self->s.origin, monster_flash_offset[MZ2_JORG_MACHINEGUN_R1], forward, right, start); - VectorMA (self->enemy->s.origin, -0.2, self->enemy->velocity, target); + VectorMA(self->enemy->s.origin, -0.2, self->enemy->velocity, target); target[2] += self->enemy->viewheight; - VectorSubtract (target, start, forward); - VectorNormalize (forward); + VectorSubtract(target, start, forward); + VectorNormalize(forward); - monster_fire_bullet (self, start, forward, 6, 4, DEFAULT_BULLET_HSPREAD, DEFAULT_BULLET_VSPREAD, MZ2_JORG_MACHINEGUN_R1); -} + monster_fire_bullet(self, start, forward, 6, 4, DEFAULT_BULLET_HSPREAD, DEFAULT_BULLET_VSPREAD, MZ2_JORG_MACHINEGUN_R1); +} -void jorg_firebullet_left (edict_t *self) +void jorg_firebullet_left(edict_t *self) { vec3_t forward, right, target; vec3_t start; - AngleVectors (self->s.angles, forward, right, NULL); - G_ProjectSource (self->s.origin, monster_flash_offset[MZ2_JORG_MACHINEGUN_L1], forward, right, start); + AngleVectors(self->s.angles, forward, right, NULL); + G_ProjectSource(self->s.origin, monster_flash_offset[MZ2_JORG_MACHINEGUN_L1], forward, right, start); - VectorMA (self->enemy->s.origin, -0.2, self->enemy->velocity, target); + VectorMA(self->enemy->s.origin, -0.2, self->enemy->velocity, target); target[2] += self->enemy->viewheight; - VectorSubtract (target, start, forward); - VectorNormalize (forward); + VectorSubtract(target, start, forward); + VectorNormalize(forward); - monster_fire_bullet (self, start, forward, 6, 4, DEFAULT_BULLET_HSPREAD, DEFAULT_BULLET_VSPREAD, MZ2_JORG_MACHINEGUN_L1); -} + monster_fire_bullet(self, start, forward, 6, 4, DEFAULT_BULLET_HSPREAD, DEFAULT_BULLET_VSPREAD, MZ2_JORG_MACHINEGUN_L1); +} -void jorg_firebullet (edict_t *self) +void jorg_firebullet(edict_t *self) { jorg_firebullet_left(self); jorg_firebullet_right(self); @@ -540,24 +519,21 @@ void jorg_attack(edict_t *self) { vec3_t vec; float range; - - VectorSubtract (self->enemy->s.origin, self->s.origin, vec); - range = VectorLength (vec); - - if (random() <= 0.75) - { - gi.sound (self, CHAN_VOICE, sound_attack1, 1, ATTN_NORM,0); - self->s.sound = gi.soundindex ("boss3/w_loop.wav"); + + VectorSubtract(self->enemy->s.origin, self->s.origin, vec); + range = VectorLength(vec); + + if (random() <= 0.75) { + gi.sound(self, CHAN_VOICE, sound_attack1, 1, ATTN_NORM, 0); + self->s.sound = gi.soundindex("boss3/w_loop.wav"); self->monsterinfo.currentmove = &jorg_move_start_attack1; - } - else - { - gi.sound (self, CHAN_VOICE, sound_attack2, 1, ATTN_NORM,0); + } else { + gi.sound(self, CHAN_VOICE, sound_attack2, 1, ATTN_NORM, 0); self->monsterinfo.currentmove = &jorg_move_attack2; } } -void jorg_dead (edict_t *self) +void jorg_dead(edict_t *self) { #if 0 edict_t *tempent; @@ -565,30 +541,30 @@ void jorg_dead (edict_t *self) VectorSet (self->mins, -16, -16, -24); VectorSet (self->maxs, 16, 16, -8); */ - + // Jorg is on modelindex2. Do not clear him. - VectorSet (self->mins, -60, -60, 0); - VectorSet (self->maxs, 60, 60, 72); + VectorSet(self->mins, -60, -60, 0); + VectorSet(self->maxs, 60, 60, 72); self->movetype = MOVETYPE_TOSS; self->nextthink = 0; - gi.linkentity (self); + gi.linkentity(self); tempent = G_Spawn(); - VectorCopy (self->s.origin, tempent->s.origin); - VectorCopy (self->s.angles, tempent->s.angles); + VectorCopy(self->s.origin, tempent->s.origin); + VectorCopy(self->s.angles, tempent->s.angles); tempent->killtarget = self->killtarget; tempent->target = self->target; tempent->activator = self->enemy; self->killtarget = 0; self->target = 0; - SP_monster_makron (tempent); + SP_monster_makron(tempent); #endif } -void jorg_die (edict_t *self, edict_t *inflictor, edict_t *attacker, int damage, vec3_t point) +void jorg_die(edict_t *self, edict_t *inflictor, edict_t *attacker, int damage, vec3_t point) { - gi.sound (self, CHAN_VOICE, sound_death, 1, ATTN_NORM, 0); + gi.sound(self, CHAN_VOICE, sound_death, 1, ATTN_NORM, 0); self->deadflag = DEAD_DEAD; self->takedamage = DAMAGE_NO; self->s.sound = 0; @@ -596,7 +572,7 @@ void jorg_die (edict_t *self, edict_t *inflictor, edict_t *attacker, int damage, self->monsterinfo.currentmove = &jorg_move_death; } -qboolean Jorg_CheckAttack (edict_t *self) +qboolean Jorg_CheckAttack(edict_t *self) { vec3_t spot1, spot2; vec3_t temp; @@ -606,79 +582,66 @@ qboolean Jorg_CheckAttack (edict_t *self) int enemy_range; float enemy_yaw; - if (self->enemy->health > 0) - { - // see if any entities are in the way of the shot - VectorCopy (self->s.origin, spot1); + if (self->enemy->health > 0) { + // see if any entities are in the way of the shot + VectorCopy(self->s.origin, spot1); spot1[2] += self->viewheight; - VectorCopy (self->enemy->s.origin, spot2); + VectorCopy(self->enemy->s.origin, spot2); spot2[2] += self->enemy->viewheight; - tr = gi.trace (spot1, NULL, NULL, spot2, self, CONTENTS_SOLID|CONTENTS_MONSTER|CONTENTS_SLIME|CONTENTS_LAVA); + tr = gi.trace(spot1, NULL, NULL, spot2, self, CONTENTS_SOLID | CONTENTS_MONSTER | CONTENTS_SLIME | CONTENTS_LAVA); // do we have a clear shot? if (tr.ent != self->enemy) return qfalse; } - + enemy_infront = infront(self, self->enemy); enemy_range = range(self, self->enemy); - VectorSubtract (self->enemy->s.origin, self->s.origin, temp); + VectorSubtract(self->enemy->s.origin, self->s.origin, temp); enemy_yaw = vectoyaw(temp); self->ideal_yaw = enemy_yaw; // melee attack - if (enemy_range == RANGE_MELEE) - { + if (enemy_range == RANGE_MELEE) { if (self->monsterinfo.melee) self->monsterinfo.attack_state = AS_MELEE; else self->monsterinfo.attack_state = AS_MISSILE; return qtrue; } - + // missile attack if (!self->monsterinfo.attack) return qfalse; - + if (level.time < self->monsterinfo.attack_finished) return qfalse; - + if (enemy_range == RANGE_FAR) return qfalse; - if (self->monsterinfo.aiflags & AI_STAND_GROUND) - { + if (self->monsterinfo.aiflags & AI_STAND_GROUND) { chance = 0.4; - } - else if (enemy_range == RANGE_MELEE) - { + } else if (enemy_range == RANGE_MELEE) { chance = 0.8; - } - else if (enemy_range == RANGE_NEAR) - { + } else if (enemy_range == RANGE_NEAR) { chance = 0.4; - } - else if (enemy_range == RANGE_MID) - { + } else if (enemy_range == RANGE_MID) { chance = 0.2; - } - else - { + } else { return qfalse; } - if (random () < chance) - { + if (random() < chance) { self->monsterinfo.attack_state = AS_MISSILE; - self->monsterinfo.attack_finished = level.time + 2*random(); + self->monsterinfo.attack_finished = level.time + 2 * random(); return qtrue; } - if (self->flags & FL_FLY) - { + if (self->flags & FL_FLY) { if (random() < 0.3) self->monsterinfo.attack_state = AS_SLIDING; else @@ -689,41 +652,40 @@ qboolean Jorg_CheckAttack (edict_t *self) } -void MakronPrecache (void); +void MakronPrecache(void); /*QUAKED monster_jorg (1 .5 0) (-80 -80 0) (90 90 140) Ambush Trigger_Spawn Sight */ -void SP_monster_jorg (edict_t *self) +void SP_monster_jorg(edict_t *self) { - if (deathmatch->value) - { - G_FreeEdict (self); + if (deathmatch->value) { + G_FreeEdict(self); return; } - sound_pain1 = gi.soundindex ("boss3/bs3pain1.wav"); - sound_pain2 = gi.soundindex ("boss3/bs3pain2.wav"); - sound_pain3 = gi.soundindex ("boss3/bs3pain3.wav"); - sound_death = gi.soundindex ("boss3/bs3deth1.wav"); - sound_attack1 = gi.soundindex ("boss3/bs3atck1.wav"); - sound_attack2 = gi.soundindex ("boss3/bs3atck2.wav"); - sound_search1 = gi.soundindex ("boss3/bs3srch1.wav"); - sound_search2 = gi.soundindex ("boss3/bs3srch2.wav"); - sound_search3 = gi.soundindex ("boss3/bs3srch3.wav"); - sound_idle = gi.soundindex ("boss3/bs3idle1.wav"); - sound_step_left = gi.soundindex ("boss3/step1.wav"); - sound_step_right = gi.soundindex ("boss3/step2.wav"); - sound_firegun = gi.soundindex ("boss3/xfire.wav"); - sound_death_hit = gi.soundindex ("boss3/d_hit.wav"); - - MakronPrecache (); + sound_pain1 = gi.soundindex("boss3/bs3pain1.wav"); + sound_pain2 = gi.soundindex("boss3/bs3pain2.wav"); + sound_pain3 = gi.soundindex("boss3/bs3pain3.wav"); + sound_death = gi.soundindex("boss3/bs3deth1.wav"); + sound_attack1 = gi.soundindex("boss3/bs3atck1.wav"); + sound_attack2 = gi.soundindex("boss3/bs3atck2.wav"); + sound_search1 = gi.soundindex("boss3/bs3srch1.wav"); + sound_search2 = gi.soundindex("boss3/bs3srch2.wav"); + sound_search3 = gi.soundindex("boss3/bs3srch3.wav"); + sound_idle = gi.soundindex("boss3/bs3idle1.wav"); + sound_step_left = gi.soundindex("boss3/step1.wav"); + sound_step_right = gi.soundindex("boss3/step2.wav"); + sound_firegun = gi.soundindex("boss3/xfire.wav"); + sound_death_hit = gi.soundindex("boss3/d_hit.wav"); + + MakronPrecache(); self->movetype = MOVETYPE_STEP; self->solid = SOLID_BBOX; - self->s.modelindex = gi.modelindex ("models/monsters/boss3/rider/tris.md2"); - self->s.modelindex2 = gi.modelindex ("models/monsters/boss3/jorg/tris.md2"); - VectorSet (self->mins, -80, -80, 0); - VectorSet (self->maxs, 80, 80, 140); + self->s.modelindex = gi.modelindex("models/monsters/boss3/rider/tris.md2"); + self->s.modelindex2 = gi.modelindex("models/monsters/boss3/jorg/tris.md2"); + VectorSet(self->mins, -80, -80, 0); + VectorSet(self->maxs, 80, 80, 140); self->health = 3000; self->gib_health = -2000; @@ -740,8 +702,8 @@ void SP_monster_jorg (edict_t *self) self->monsterinfo.melee = NULL; self->monsterinfo.sight = NULL; self->monsterinfo.checkattack = Jorg_CheckAttack; - gi.linkentity (self); - + gi.linkentity(self); + self->monsterinfo.currentmove = &jorg_move_stand; self->monsterinfo.scale = MODEL_SCALE; |