blendo/thirtyflightsofloving
0
0
Fork 0
mirror of https://github.com/blendogames/thirtyflightsofloving.git synced 2025-02-22 11:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bug with gekks not jumping out of water in missionpack DLL.

Browse source 
Fixed non-precached sounds for Xatrix soldiers in missionpack DLL.
Changed cvar mp_monster_replace to CVAR_LATCH in missionpack DLL to prevent issues with glitched soldier sounds.
This commit is contained in:
Knightmare66 2021-08-26 00:48:03 -04:00
parent 5fa2f39ddc
commit a916bca556
4 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
missionpack/g_weapon.c
View file

@ -448,7 +448,7 @@ void fire_blueblaster (edict_t *self, vec3_t start, vec3_t dir, int damage, int
bolt->clipmask = MASK_SHOT;
bolt->solid = SOLID_BBOX;
bolt->s.effects |= effect;
bolt->s.renderfx |= RF_NOSHADOW; //Knightmare- no shadow
bolt->s.renderfx |= RF_NOSHADOW; // Knightmare- no shadow
VectorClear (bolt->mins);
VectorClear (bolt->maxs);

2
missionpack/km_cvar.c
View file

@ -343,7 +343,7 @@ cvar_t *sk_visor_time;
void InitLithiumVars (void)
{
mega_gibs = gi.cvar("mega_gibs", "0", CVAR_ARCHIVE);
mp_monster_replace = gi.cvar("mp_monster_replace", "0", CVAR_ARCHIVE);
mp_monster_replace = gi.cvar("mp_monster_replace", "0", CVAR_LATCH);
mp_monster_ammo_replace = gi.cvar("mp_monster_ammo_replace", "0", CVAR_ARCHIVE);
kamikaze_flyer_replace = gi.cvar("kamikaze_flyer_replace", "0", CVAR_ARCHIVE);
allow_player_use_abandoned_turret = gi.cvar("allow_player_use_abandoned_turret", "0", CVAR_ARCHIVE);

20
missionpack/m_gekk.c
View file

@ -80,7 +80,7 @@ qboolean gekk_check_jump_hazard (edict_t *self, qboolean watertoland, qboolean f
if (!self->enemy || (self->enemy->health <= 0)) // paranoia
return false;
//gi.dprintf ("Gekk: checking jump for hazards...\n");
// gi.dprintf ("Gekk: checking jump for hazards...\n");
VectorSubtract(self->s.origin, self->enemy->s.origin, v);
distance = VectorLength(v);
@ -104,7 +104,7 @@ qboolean gekk_check_jump_hazard (edict_t *self, qboolean watertoland, qboolean f
continue;
if (!grenade->classname)
continue;
if (!Q_stricmp(grenade->classname,"grenade") || !Q_stricmp(grenade->classname,"hgrenade"))
if (!Q_stricmp(grenade->classname, "grenade") || !Q_stricmp(grenade->classname, "hgrenade"))
{
VectorSubtract(grenade->s.origin, oldorg, dir);
g1 = VectorLength(dir);
@ -458,9 +458,9 @@ void gekk_swim (edict_t *self)
if (!self->enemy || (self->enemy->health <= 0)) // paranoia
return;
if (gekk_checkattack(self)) // Knightmare- check for grenades and lasers
if (!self->enemy->waterlevel && random() > 0.7 && gekk_check_jump_hazard(self, true, gekk_check_jump(self)))
water_to_land (self);
// Knightmare- check for grenades and lasers
if ( !self->enemy->waterlevel && (random() > 0.7) && gekk_check_jump_hazard(self, true, gekk_check_jump(self)) )
water_to_land (self);
else
self->monsterinfo.currentmove = &gekk_move_swim_start;
}
@ -1213,16 +1213,16 @@ void gekk_jump (edict_t *self)
}
else
{
//if (random() > 0.8 && self->health < self->max_health)
// self->monsterinfo.currentmove = &gekk_move_idle2;
//else
// if (random() > 0.8 && self->health < self->max_health)
// self->monsterinfo.currentmove = &gekk_move_idle2;
// else
{
if (random() > 0.5 && (range (self, self->enemy) >= RANGE_NEAR))
if ( (random() > 0.5) && (range (self, self->enemy) >= RANGE_NEAR) )
self->monsterinfo.currentmove = &gekk_move_spit;
else if (random() > 0.8)
self->monsterinfo.currentmove = &gekk_move_spit;
// Knightmare- check for grenades and lasers
else if (gekk_check_jump_hazard(self, false, gekk_check_jump(self)))
else if ( gekk_check_jump_hazard(self, false, gekk_check_jump(self)) )
self->monsterinfo.currentmove = &gekk_move_leapatk;
else
self->monsterinfo.currentmove = &gekk_move_spit;

35
missionpack/m_soldier.c
View file

@ -24,6 +24,10 @@ static int sound_death_light;
static int sound_death;
static int sound_death_ss;
static int sound_cock;
// Knightmare- added sounds for hyperblaster and laser soldier
static int sound_hyper_loop = 0;
static int sound_hyper_spindown = 0;
static int sound_laser = 0;
void soldier_duck_up (edict_t *self);
@ -2086,7 +2090,7 @@ void soldierh_laserbeam (edict_t *self, int flash_index)
// RAFAEL
// this sound can't be called this frequent
// if (random() > 0.8)
// gi.sound (self, CHAN_AUTO, gi.soundindex("misc/lasfly.wav"), 1, ATTN_STATIC, 0);
// gi.sound (self, CHAN_AUTO, sound_laser, 1, ATTN_STATIC, 0);
VectorCopy (self->s.origin, start);
VectorCopy (self->enemy->s.origin, end);
@ -2105,7 +2109,7 @@ void soldierh_laserbeam (edict_t *self, int flash_index)
// RAFAEL
// this sound can't be called this frequent
if (random() > 0.8)
gi.sound (self, CHAN_AUTO, gi.soundindex("misc/lasfly.wav"), 1, ATTN_STATIC, 0);
gi.sound (self, CHAN_AUTO, sound_laser, 1, ATTN_STATIC, 0);
ent = G_Spawn ();
VectorCopy (self->s.origin, ent->s.origin);
@ -2214,9 +2218,9 @@ void soldierh_fire (edict_t *self, int flash_number)
// else if ((self->s.skinnum % 6) <= 3)
else if (self->skinnum <= 3)
{
monster_fire_blaster (self, start, aim, 4, 600, flash_index, EF_BLUEHYPERBLASTER, BLASTER_BLUE);
// monster_fire_blueblaster (self, start, aim, 4, 600, MZ_BLUEHYPERBLASTER, EF_BLUEHYPERBLASTER);
// monster_fire_blueblaster (self, start, aim, 4, 600, flash_index, EF_BLUEHYPERBLASTER); // Knightmare- use an actual monster muzzleflash here!
monster_fire_blaster (self, start, aim, 4, 600, flash_index, EF_BLUEHYPERBLASTER, BLASTER_BLUE);
}
else // if (self->skinnum <= 5)
{
@ -2245,7 +2249,7 @@ void soldierh_hyper_refire1 (edict_t *self)
if (random() < 0.7)
self->s.frame = FRAME_attak103;
else
gi.sound(self, CHAN_AUTO, gi.soundindex("weapons/hyprbd1a.wav"), 1, ATTN_NORM, 0);
gi.sound (self, CHAN_AUTO, sound_hyper_spindown, 1, ATTN_NORM, 0); // Knightmare- use stored index
}
}
@ -2300,7 +2304,7 @@ void soldierh_hyper_sound (edict_t *self)
return;
// else if ((self->s.skinnum % 6) < 4)
else if (self->skinnum < 4)
gi.sound(self, CHAN_AUTO, gi.soundindex("weapons/hyprbl1a.wav"), 1, ATTN_NORM, 0);
gi.sound (self, CHAN_AUTO, sound_hyper_loop, 1, ATTN_NORM, 0); // Knightmare- use stored index
else
return;
}
@ -2335,7 +2339,7 @@ void soldierh_hyper_refire2 (edict_t *self)
if (random() < 0.7)
self->s.frame = FRAME_attak205;
else
gi.sound(self, CHAN_AUTO, gi.soundindex("weapons/hyprbd1a.wav"), 1, ATTN_NORM, 0);
gi.sound (self, CHAN_AUTO, sound_hyper_spindown, 1, ATTN_NORM, 0); // Knightmare- use stored index
}
}
@ -3258,7 +3262,6 @@ void SP_monster_soldier (edict_t *self)
return;
}
sound_pain = gi.soundindex ("soldier/solpain1.wav");
sound_death = gi.soundindex ("soldier/soldeth1.wav");
gi.soundindex ("soldier/solatck1.wav");
@ -3322,6 +3325,7 @@ void SP_monster_soldier_plasma_re (edict_t *self)
sound_pain_ss = gi.soundindex ("soldier/solpain3.wav");
sound_death_ss = gi.soundindex ("soldier/soldeth3.wav");
gi.modelindex (PLASMA_SPRITE_FLY);
gi.soundindex(PLASMA_SOUND_FLYBY);
#ifdef KMQUAKE2_ENGINE_MOD
gi.soundindex ("weapons/plasma/fire1.wav");
#else
@ -3360,6 +3364,7 @@ void SP_monster_soldier_plasma_sp (edict_t *self)
sound_pain_ss = gi.soundindex ("soldier/solpain3.wav");
sound_death_ss = gi.soundindex ("soldier/soldeth3.wav");
gi.modelindex (PLASMA_SPRITE_FLY);
gi.soundindex(PLASMA_SOUND_FLYBY);
#ifdef KMQUAKE2_ENGINE_MOD
gi.soundindex ("weapons/plasma/fire2.wav");
#else
@ -3480,10 +3485,8 @@ void SP_monster_soldier_ripper (edict_t *self)
return;
}
sound_pain_light = gi.soundindex ("soldier/solpain2.wav");
sound_death_light = gi.soundindex ("soldier/soldeth2.wav");
gi.modelindex ("models/objects/boomrang/tris.md2");
gi.soundindex ("misc/lasfly.wav");
#ifdef KMQUAKE2_ENGINE_MOD
@ -3495,7 +3498,6 @@ void SP_monster_soldier_ripper (edict_t *self)
self->common_name = "Ripper Guard";
self->class_id = ENTITY_MONSTER_SOLDIER_RIPPER;
// self->s.skinnum = 0;
if (!self->health)
self->health = 50;
if (!self->gib_health)
@ -3522,11 +3524,13 @@ void SP_monster_soldier_hypergun (edict_t *self)
return;
}
gi.modelindex ("models/objects/blaser/tris.md2");
sound_pain = gi.soundindex ("soldier/solpain1.wav");
sound_death = gi.soundindex ("soldier/soldeth1.wav");
gi.soundindex ("weapons/hyprbl1a.wav"); // Knightmare- missing precache
gi.soundindex ("weapons/hyprbd1a.wav"); // Knightmare- missing precache
sound_hyper_loop = gi.soundindex ("weapons/hyprbl1a.wav"); // Knightmare- missing precache
sound_hyper_spindown = gi.soundindex ("weapons/hyprbd1a.wav"); // Knightmare- missing precache
// gi.modelindex ("models/objects/blaser/tris.md2");
gi.modelindex ("models/objects/laser/tris.md2"); // Knightmare- precache shared laser model instead
gi.soundindex ("misc/lasfly.wav"); // Knightmare added
#ifdef KMQUAKE2_ENGINE_MOD
gi.soundindex ("weapons/hyprbf1a.wav"); // Knightmare- used by new muzzleflash
#else
@ -3536,7 +3540,6 @@ void SP_monster_soldier_hypergun (edict_t *self)
self->common_name = "Hyperblaster Guard";
self->class_id = ENTITY_MONSTER_SOLDIER_HYPERGUN;
//self->s.skinnum = 2;
if (!self->health)
self->health = 60;
if (!self->gib_health)
@ -3565,12 +3568,12 @@ void SP_monster_soldier_lasergun (edict_t *self)
sound_pain_ss = gi.soundindex ("soldier/solpain3.wav");
sound_death_ss = gi.soundindex ("soldier/soldeth3.wav");
// gi.soundindex ("soldier/solatck3.wav"); // Knightmare- not used
sound_laser = gi.soundindex ("misc/lasfly.wav"); // Knightmare- missing precache
// gi.soundindex ("soldier/solatck3.wav"); // Knightmare- not used
self->common_name = "Laser Guard";
self->class_id = ENTITY_MONSTER_SOLDIER_LASER;
//self->s.skinnum = 4;
if (!self->health)
self->health = 70;
if (!self->gib_health)