Add lightning storm as a short range hazard avoidance goal to hopefully reduce the number of lightning mage suicides. Also tried to convince bots not to shoot thru allies (also leading to suicide).

Author: Vortex-Quake2

src/ai/ai_class_dmbot.c

@@ -1176,6 +1176,10 @@ qboolean BOT_DMclass_CheckShot(edict_t *ent, vec3_t	point)
 
 	//bloqued, don't shoot
 	tr = gi.trace( start, vec3_origin, vec3_origin, point, ent, MASK_AISOLID);
+
+	if (tr.ent && tr.ent->inuse && OnSameTeam(ent, tr.ent))
+		return false; //GHz: bots tend to suicide by trying to shoot past allies
+
 //	trap_Trace( &tr, self->s.origin, vec3_origin, vec3_origin, point, self, MASK_AISOLID);
 	if (tr.fraction < 0.3) //just enough to prevent self damage (by now)
 		return false;

src/ai/ai_main.c

@@ -541,7 +541,7 @@ void AI_PickShortRangeGoal(edict_t* self)
 	{
 		if (!e->inuse)
 			continue;
-		if (e->solid == SOLID_NOT)
+		if (e->solid == SOLID_NOT && e->mtype != M_LIGHTNINGSTORM)
 			continue;
 		if (!e->classname)
 			continue;

src/ai/ai_util.c

@@ -5,6 +5,8 @@
 
 qboolean AI_IsProjectile(edict_t* ent)
 {
+	if (ent->mtype == M_LIGHTNINGSTORM)
+		return true;
 	return ent->clipmask == MASK_SHOT && (ent->solid == SOLID_BBOX  || ent->solid == SOLID_TRIGGER) && ent->s.modelindex && (ent->dmg || ent->radius_dmg);
 }
 

src/combat/abilities/lightningstorm.c

@@ -69,11 +69,11 @@ void lightningstorm_think (edict_t *self)
         return;
     }
 
-	// calculate randomized firing position
-	VectorCopy(self->s.origin, start);
+	// calculate randomized firing position from the ceiling/skybox
+	VectorCopy(self->pos1, start);
 	start[0] += GetRandom(0, (int)self->dmg_radius) * crandom();
 	start[1] += GetRandom(0, (int)self->dmg_radius) * crandom();
-	tr = gi.trace(self->s.origin, NULL, NULL, start, self, MASK_SOLID);
+	tr = gi.trace(self->pos1, NULL, NULL, start, self, MASK_SOLID);
 
 	// Talent: Chainlightning Storm
 	int talentLevel = vrx_get_talent_level(self->owner, TALENT_CL_STORM);
@@ -89,7 +89,14 @@ void lightningstorm_think (edict_t *self)
 void SpawnLightningStorm (edict_t *ent, vec3_t start, float radius, int duration, int damage)
 {
 	edict_t *storm;
+	vec3_t end;
+	trace_t tr;
 
+	// trace up to the ceiling/skybox
+	VectorCopy(start, end);
+	end[2] = 8192;
+	tr = gi.trace(start, NULL, NULL, end, ent, MASK_SOLID);
+	
 	storm = G_Spawn();
 	storm->classname = "lightning storm";
 	storm->solid = SOLID_NOT;
@@ -100,8 +107,11 @@ void SpawnLightningStorm (edict_t *ent, vec3_t start, float radius, int duration
 	storm->think = lightningstorm_think;
 	VectorCopy(start, storm->s.origin);
 	VectorCopy(start, storm->s.old_origin);
-	storm->dmg_radius = radius;
+	VectorCopy(tr.endpos, storm->pos1); // store the ceiling/skybox position
+	storm->dmg_radius = radius; // radius of lightning strikes
+	storm->radius_dmg = damage; // used for bot AI hazard detection
 	storm->dmg = damage;
+	storm->mtype = M_LIGHTNINGSTORM; // used for bot AI hazard detection
 	gi.linkentity(storm);
 
 	// Talent: Chainlightning Storm
@@ -146,10 +156,10 @@ void Cmd_LightningStorm_f (edict_t *ent, float skill_mult, float cost_mult)
 	tr = gi.trace(start, NULL, NULL, end, ent, MASK_SHOT);
 
 	// trace up to the ceiling/skybox
-	VectorCopy(tr.endpos, start);
-	VectorCopy(tr.endpos, end);
-	end[2] += 8192;
-	tr = gi.trace(start, NULL, NULL, end, ent, MASK_SOLID);
+	//VectorCopy(tr.endpos, start);
+	//VectorCopy(tr.endpos, end);
+	//end[2] += 8192;
+	//tr = gi.trace(start, NULL, NULL, end, ent, MASK_SOLID);
 
 	SpawnLightningStorm(ent, tr.endpos, radius, duration, damage);
 

src/entities/drone/g_monster.c

@@ -120,7 +120,8 @@ void monster_fire_20mm(edict_t* self, vec3_t start, vec3_t dir, int damage, int
 
 	gi.sound(self, CHAN_WEAPON, gi.soundindex("weapons/sgun1.wav"), 1, ATTN_NORM, 0);
 
-	ThrowShell(self, "models/objects/shell1/tris.md2", start);
+	if (vrx_spawn_nonessential_ent(self->s.origin))
+		ThrowShell(self, "models/objects/shell1/tris.md2", start);
 }
 
 void monster_fire_shotgun (edict_t *self, vec3_t start, vec3_t aimdir, float damage, int kick, int hspread, int vspread, int count, int flashtype)

src/g_local.h

@@ -2329,6 +2329,7 @@ void Cmd_LaserSight_f(edict_t *ent);
 #define TBI_PLAYERSPAWN			706 // Team Based Invasion PlayerSpawn.
 #define HW_FLAG			707
 #define M_COMBAT_POINT			800 // temporary entity for monster navigation
+#define M_LIGHTNINGSTORM		801 // used by bot AI to ID lightning storm for hazard avoidance
 #define FUNC_DOOR				900
 //4.1 Archer
 #define TOTEM_FIRE		605