X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_hagar.qc;h=0be6ea527e4e20f125eed0586c54b094e092b8db;hb=cfaacd5aff51c88ae76519d019aa6427ba1c5bc0;hp=12abae6eac7463294df678d82cf4e496263665e1;hpb=fd2b1a8ba60990ceca63c494e1fc6094c3b7f6b2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index 12abae6ea..0be6ea527 100644
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -1,12 +1,22 @@
 #ifdef REGISTER_WEAPON
-REGISTER_WEAPON(HAGAR, w_hagar, IT_ROCKETS, 8, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "hagar", "hagar", _("Hagar"))
+REGISTER_WEAPON(
+/* WEP_##id  */ HAGAR,
+/* function  */ w_hagar,
+/* ammotype  */ IT_ROCKETS,
+/* impulse   */ 8,
+/* flags     */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH,
+/* rating    */ BOT_PICKUP_RATING_MID,
+/* model     */ "hagar",
+/* shortname */ "hagar",
+/* fullname  */ _("Hagar")
+);
 #else
 #ifdef SVQC
 // NO bounce protection, as bounces are limited!
 
 void W_Hagar_Explode (void)
 {
-	self.event_damage = SUB_Null;
+	self.event_damage = func_null;
 	RadiusDamage (self, self.realowner, autocvar_g_balance_hagar_primary_damage, autocvar_g_balance_hagar_primary_edgedamage, autocvar_g_balance_hagar_primary_radius, world, autocvar_g_balance_hagar_primary_force, self.projectiledeathtype, other);
 
 	remove (self);
@@ -14,7 +24,7 @@ void W_Hagar_Explode (void)
 
 void W_Hagar_Explode2 (void)
 {
-	self.event_damage = SUB_Null;
+	self.event_damage = func_null;
 	RadiusDamage (self, self.realowner, autocvar_g_balance_hagar_secondary_damage, autocvar_g_balance_hagar_secondary_edgedamage, autocvar_g_balance_hagar_secondary_radius, world, autocvar_g_balance_hagar_secondary_force, self.projectiledeathtype, other);
 
 	remove (self);
@@ -25,7 +35,7 @@ void W_Hagar_Damage (entity inflictor, entity attacker, float damage, float deat
 	if (self.health <= 0)
 		return;
 		
-	float is_linkexplode = ((inflictor.realowner == self.realowner) 
+	float is_linkexplode = ( ((inflictor.owner != world) ? (inflictor.owner == self.owner) : TRUE)
 		&& (inflictor.projectiledeathtype & HITTYPE_SECONDARY) 
 		&& (self.projectiledeathtype & HITTYPE_SECONDARY));
 	
@@ -33,7 +43,7 @@ void W_Hagar_Damage (entity inflictor, entity attacker, float damage, float deat
 		is_linkexplode = (is_linkexplode && autocvar_g_balance_hagar_secondary_load_linkexplode);
 	else
 		is_linkexplode = -1; // not secondary load, so continue as normal without exception.
-		
+
 	if (!W_CheckProjectileDamage(inflictor.realowner, self.realowner, deathtype, is_linkexplode))
 		return; // g_projectiles_damage says to halt
 
@@ -101,6 +111,7 @@ void W_Hagar_Attack (void)
 
 	missile.angles = vectoangles (missile.velocity);
 	missile.flags = FL_PROJECTILE;
+	missile.missile_flags = MIF_SPLASH; 
 
 	CSQCProjectile(missile, TRUE, PROJECTILE_HAGAR, TRUE);
 
@@ -144,6 +155,7 @@ void W_Hagar_Attack2 (void)
 
 	missile.angles = vectoangles (missile.velocity);
 	missile.flags = FL_PROJECTILE;
+	missile.missile_flags = MIF_SPLASH; 
 
 	CSQCProjectile(missile, TRUE, PROJECTILE_HAGAR_BOUNCING, TRUE);
 
@@ -174,7 +186,7 @@ void W_Hagar_Attack2_Load_Release (void)
 
 	shots = self.hagar_load;
 	missile = world;
-	while (counter < shots)
+	for(counter = 0; counter < shots; ++counter)
 	{
 		missile = spawn ();
 		missile.owner = missile.realowner = self;
@@ -197,6 +209,7 @@ void W_Hagar_Attack2_Load_Release (void)
 		setorigin (missile, w_shotorg);
 		setsize(missile, '0 0 0', '0 0 0');
 		missile.movetype = MOVETYPE_FLY;
+		missile.missile_flags = MIF_SPLASH; 
 		
 		// per-shot spread calculation: the more shots there are, the less spread is applied (based on the bias cvar)
 		spread_pershot = ((shots - 1) / (autocvar_g_balance_hagar_secondary_load_max - 1)); 
@@ -223,8 +236,6 @@ void W_Hagar_Attack2_Load_Release (void)
 		CSQCProjectile(missile, TRUE, PROJECTILE_HAGAR, TRUE);
 
 		other = missile; MUTATOR_CALLHOOK(EditProjectile);
-
-		counter = counter + 1;
 	}
 
 	weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_hagar_secondary_load_animtime, w_ready);
@@ -235,6 +246,9 @@ void W_Hagar_Attack2_Load_Release (void)
 void W_Hagar_Attack2_Load (void)
 {
 	// loadable hagar secondary attack, must always run each frame
+	
+	if(time < game_starttime)
+		return;
 
 	float loaded, enough_ammo;
 	loaded = self.hagar_load >= autocvar_g_balance_hagar_secondary_load_max;
@@ -350,7 +364,7 @@ float w_hagar(float req)
 	else if (req == WR_THINK)
 	{
 		float loadable_secondary;
-		loadable_secondary = autocvar_g_balance_hagar_secondary_load && autocvar_g_balance_hagar_secondary;
+		loadable_secondary = (autocvar_g_balance_hagar_secondary_load && autocvar_g_balance_hagar_secondary);
 
 		if (loadable_secondary)
 			W_Hagar_Attack2_Load(); // must always run each frame
@@ -431,6 +445,17 @@ float w_hagar(float req)
 		if not(self.hagar_load) // require releasing loaded rockets first
 			W_Reload(min(autocvar_g_balance_hagar_primary_ammo, autocvar_g_balance_hagar_secondary_ammo), autocvar_g_balance_hagar_reload_ammo, autocvar_g_balance_hagar_reload_time, "weapons/reload.wav");
 	}
+	else if (req == WR_SUICIDEMESSAGE)
+	{
+		return WEAPON_HAGAR_SUICIDE;
+	}
+	else if (req == WR_KILLMESSAGE)
+	{
+		if(w_deathtype & HITTYPE_SECONDARY)
+			return WEAPON_HAGAR_MURDER_BURST;
+		else
+			return WEAPON_HAGAR_MURDER_SPRAY;
+	}
 	return TRUE;
 }
 #endif
@@ -458,15 +483,6 @@ float w_hagar(float req)
 		precache_sound("weapons/hagexp2.wav");
 		precache_sound("weapons/hagexp3.wav");
 	}
-	else if (req == WR_SUICIDEMESSAGE)
-		w_deathtypestring = _("%s played with tiny rockets");
-	else if (req == WR_KILLMESSAGE)
-	{
-		if(w_deathtype & HITTYPE_BOUNCE) // must be secondary; unchecked: SPLASH
-			w_deathtypestring = _("%s hoped %s's missiles wouldn't bounce");
-		else // unchecked: SPLASH, SECONDARY
-			w_deathtypestring = _("%s was pummeled by %s");
-	}
 	return TRUE;
 }
 #endif