yquake2/rogue
0
0
Fork 0
mirror of https://github.com/yquake2/rogue.git synced 2024-11-12 23:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #106 from BjossiAlfreds/blind-rockets

Browse source 
Fixed wrong Tank muzzle flash
This commit is contained in:
Yamagi 2023-06-05 20:49:51 +02:00 committed by GitHub
commit 2ad53a679f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 62 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/g_newai.c
View file

@ -1746,3 +1746,48 @@ monster_jump_finished(edict_t *self)
return false; return false;
} }
qboolean
blind_rocket_ok (edict_t *self, vec3_t start, vec3_t right, vec3_t target, float ofs,
vec3_t dir)
{
trace_t tr;
vec3_t vec;
if (!self)
{
return false;
}
tr = gi.trace(start, vec3_origin, vec3_origin, target, self, MASK_SHOT);
/* since all traces have the same start point this only needs one check */
if (tr.startsolid)
{
return false;
}
if (!tr.allsolid && (tr.fraction >= 0.5f))
{
return true;
}
VectorMA(target, -ofs, right, vec);
VectorSubtract(vec, start, dir);
VectorNormalize(dir);
tr = gi.trace(start, vec3_origin, vec3_origin, vec, self, MASK_SHOT);
if (!tr.allsolid && (tr.fraction >= 0.5f))
{
return true;
}
VectorMA(target, ofs, right, vec);
VectorSubtract(vec, start, dir);
VectorNormalize(dir);
tr = gi.trace(start, vec3_origin, vec3_origin, vec, self, MASK_SHOT);
return !tr.allsolid && (tr.fraction >= 0.5f);
}

2
src/header/local.h
View file

@ -965,6 +965,8 @@ edict_t *PickCoopTarget(edict_t *self);
int CountPlayers(void); int CountPlayers(void);
void monster_jump_start(edict_t *self); void monster_jump_start(edict_t *self);
qboolean monster_jump_finished(edict_t *self); qboolean monster_jump_finished(edict_t *self);
qboolean blind_rocket_ok (edict_t *self, vec3_t start, vec3_t right,
vec3_t target, float ofs, vec3_t dir);
/* g_sphere.c */ /* g_sphere.c */
void Defender_Launch(edict_t *self); void Defender_Launch(edict_t *self);

46
src/monster/chick/chick.c
View file

@ -625,58 +625,26 @@ ChickRocket(edict_t *self)
VectorNormalize(dir); VectorNormalize(dir);
trace = gi.trace(start, vec3_origin, vec3_origin, vec, self, MASK_SHOT);
if (blindfire) if (blindfire)
{ {
/* blindfire has different fail criteria for the trace */ /* blindfire has different fail criteria for the trace */
if (!(trace.startsolid || trace.allsolid || (trace.fraction < 0.5))) if (!blind_rocket_ok(self, start, right, target, 10.0f, dir))
{ {
monster_fire_rocket(self, start, dir, 50, return;
rocketSpeed, MZ2_CHICK_ROCKET_1);
}
else
{
VectorCopy(target, vec);
VectorMA(vec, -10, right, vec);
VectorSubtract(vec, start, dir);
VectorNormalize(dir);
trace = gi.trace(start, vec3_origin, vec3_origin, vec,
self, MASK_SHOT);
if (!(trace.startsolid || trace.allsolid || (trace.fraction < 0.5)))
{
monster_fire_rocket(self, start, dir, 50, rocketSpeed, MZ2_CHICK_ROCKET_1);
}
else
{
/* ok, that failed. try to the right */
VectorCopy(target, vec);
VectorMA(vec, 10, right, vec);
VectorSubtract(vec, start, dir);
VectorNormalize(dir);
trace = gi.trace(start, vec3_origin, vec3_origin, vec,
self, MASK_SHOT);
if (!(trace.startsolid || trace.allsolid || (trace.fraction < 0.5)))
{
monster_fire_rocket(self, start, dir, 50, rocketSpeed, MZ2_CHICK_ROCKET_1);
}
}
} }
} }
else else
{ {
trace = gi.trace(start, vec3_origin, vec3_origin, vec, self, MASK_SHOT); trace = gi.trace(start, vec3_origin, vec3_origin, vec, self, MASK_SHOT);
if ((trace.ent == self->enemy) || (trace.ent == world)) if (((trace.ent != self->enemy) && (trace.ent != world)) ||
((trace.fraction <= 0.5f) && !trace.ent->client))
{ {
if ((trace.fraction > 0.5) || (trace.ent && trace.ent->client)) return;
{
monster_fire_rocket(self, start, dir, 50, rocketSpeed, MZ2_CHICK_ROCKET_1);
}
} }
} }
monster_fire_rocket(self, start, dir, 50, rocketSpeed, MZ2_CHICK_ROCKET_1);
} }
void void

54
src/monster/tank/tank.c
View file

@ -547,64 +547,26 @@ TankRocket(edict_t *self)
VectorNormalize(dir); VectorNormalize(dir);
// Blindfire doesn't check target (done in checkattack). Paranoia:
// Make sure we're not shooting a target right next to us.
trace = gi.trace(start, vec3_origin, vec3_origin, vec, self, MASK_SHOT);
if (blindfire) if (blindfire)
{ {
// Blindfire has different fail criteria for the trace /* blindfire has different fail criteria for the trace */
if (!(trace.startsolid || trace.allsolid || (trace.fraction < 0.5))) if (!blind_rocket_ok(self, start, right, target, 20.0f, dir))
{ {
monster_fire_rocket (self, start, dir, 50, rocketSpeed, flash_number); return;
}
else
{
// Try shifting the target to the left a little (to help counter large offset)
VectorCopy(target, vec);
VectorMA(vec, -20, right, vec);
VectorSubtract(vec, start, dir);
VectorNormalize(dir);
trace = gi.trace(start, vec3_origin, vec3_origin, vec, self, MASK_SHOT);
if (!(trace.startsolid || trace.allsolid || (trace.fraction < 0.5)))
{
monster_fire_rocket (self, start, dir, 50, rocketSpeed, flash_number);
}
else
{
// OK, that failed. Try to the right.
VectorCopy(target, vec);
VectorMA(vec, 20, right, vec);
VectorSubtract(vec, start, dir);
VectorNormalize(dir);
trace = gi.trace(start, vec3_origin, vec3_origin, vec, self, MASK_SHOT);
if (!(trace.startsolid || trace.allsolid || (trace.fraction < 0.5)))
{
monster_fire_rocket (self, start, dir, 50, rocketSpeed, flash_number);
}
else if ((g_showlogic) && (g_showlogic->value))
{
gi.dprintf ("tank avoiding blindfire shot\n");
}
}
} }
} }
else else
{ {
trace = gi.trace(start, vec3_origin, vec3_origin, vec, self, MASK_SHOT); trace = gi.trace(start, vec3_origin, vec3_origin, vec, self, MASK_SHOT);
if (trace.ent == self->enemy || trace.ent == world) if (((trace.ent != self->enemy) && (trace.ent != world)) ||
((trace.fraction <= 0.5f) && !trace.ent->client))
{ {
if (trace.fraction > 0.5 || (trace.ent && trace.ent->client)) return;
{
monster_fire_rocket (self, start, dir, 50, rocketSpeed, MZ2_CHICK_ROCKET_1);
}
} }
} }
monster_fire_rocket (self, start, dir, 50, rocketSpeed, flash_number);
} }
void void