X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_hlac.qc;h=a07d54c2283e330741d84697ac72b50a7b33126d;hb=f9f59daa240ec3e0ffc63685997216342fb10696;hp=5fe75ab2ca46bfbdfa0828b564b68aa419e8c060;hpb=f54d799f3e6e3f31b7d685453156bb7f0e448ce1;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc
index 5fe75ab2c..a07d54c22 100644
--- a/qcsrc/server/w_hlac.qc
+++ b/qcsrc/server/w_hlac.qc
@@ -2,25 +2,17 @@
 REGISTER_WEAPON(HLAC, w_hlac, IT_CELLS, 6, WEP_FLAG_NORMAL | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "hlac", "hlac", "Heavy Laser Assault Cannon");
 #else
 #ifdef SVQC
-.float HLAC_bulletcounter;
-void W_HLAC_Touch (void)
-{
-	PROJECTILE_TOUCH;
-
-	self.event_damage = SUB_Null;
 
-    RadiusDamage (self, self.owner, cvar("g_balance_hlac_primary_damage"), cvar("g_balance_hlac_primary_edgedamage"), cvar("g_balance_hlac_primary_radius"), world, cvar("g_balance_hlac_primary_force"), self.projectiledeathtype, other);
-
-	remove (self);
-}
-
-void W_HLAC_Touch2 (void)
+void W_HLAC_Touch (void)
 {
 	PROJECTILE_TOUCH;
 
 	self.event_damage = SUB_Null;
-
-    RadiusDamage (self, self.owner, cvar("g_balance_hlac_secondary_damage"), cvar("g_balance_hlac_secondary_edgedamage"), cvar("g_balance_hlac_secondary_radius"), world, cvar("g_balance_hlac_secondary_force"), self.projectiledeathtype, other);
+	
+	if(self.projectiledeathtype & HITTYPE_SECONDARY)
+		RadiusDamage (self, self.owner, autocvar_g_balance_hlac_secondary_damage, autocvar_g_balance_hlac_secondary_edgedamage, autocvar_g_balance_hlac_secondary_radius, world, autocvar_g_balance_hlac_secondary_force, self.projectiledeathtype, other);
+	else
+		RadiusDamage (self, self.owner, autocvar_g_balance_hlac_primary_damage, autocvar_g_balance_hlac_primary_edgedamage, autocvar_g_balance_hlac_primary_radius, world, autocvar_g_balance_hlac_primary_force, self.projectiledeathtype, other);
 
 	remove (self);
 }
@@ -32,15 +24,15 @@ void W_HLAC_Attack (void)
 
     if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
     {
-        self.ammo_cells = self.ammo_cells - cvar("g_balance_hlac_primary_ammo");
+        self.ammo_cells = self.ammo_cells - autocvar_g_balance_hlac_primary_ammo;
     }
 
-    spread = cvar("g_balance_hlac_primary_spread_min") + (cvar("g_balance_hlac_primary_spread_add") * self.HLAC_bulletcounter);
-    spread = min(spread,cvar("g_balance_hlac_primary_spread_max"));
+    spread = autocvar_g_balance_hlac_primary_spread_min + (autocvar_g_balance_hlac_primary_spread_add * self.misc_bulletcounter);
+    spread = min(spread,autocvar_g_balance_hlac_primary_spread_max);
     if(self.crouch)
-        spread = spread * cvar("g_balance_hlac_primary_spread_crouchmod");
+        spread = spread * autocvar_g_balance_hlac_primary_spread_crouchmod;
 
-	W_SetupShot (self, FALSE, 3, "weapons/lasergun_fire.wav", cvar("g_balance_hlac_primary_damage"));
+	W_SetupShot (self, FALSE, 3, "weapons/lasergun_fire.wav", CHAN_WEAPON, autocvar_g_balance_hlac_primary_damage);
 	pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
 	if (!g_norecoil)
 	{
@@ -51,10 +43,9 @@ void W_HLAC_Attack (void)
 	missile = spawn ();
 	missile.owner = self;
 	missile.classname = "hlacbolt";
-	// missile.dmg = issecondary;
 	missile.bot_dodge = TRUE;
 
-    missile.bot_dodgerating = cvar("g_balance_hlac_primary_damage");
+    missile.bot_dodgerating = autocvar_g_balance_hlac_primary_damage;
 
 	missile.movetype = MOVETYPE_FLY;
 	PROJECTILE_MAKETRIGGER(missile);
@@ -62,18 +53,20 @@ void W_HLAC_Attack (void)
 	setorigin (missile, w_shotorg);
 	setsize(missile, '0 0 0', '0 0 0');
 
-	W_SetupProjectileVelocity(missile, cvar("g_balance_hlac_primary_speed"), spread);
-	missile.angles = vectoangles (missile.velocity);
+	W_SetupProjectileVelocity(missile, autocvar_g_balance_hlac_primary_speed, spread);
+	//missile.angles = vectoangles (missile.velocity); // csqc
 
 	missile.touch = W_HLAC_Touch;
 	missile.think = SUB_Remove;
 
-    missile.nextthink = time + cvar("g_balance_hlac_primary_lifetime");
+    missile.nextthink = time + autocvar_g_balance_hlac_primary_lifetime;
 
 	missile.flags = FL_PROJECTILE;
 	missile.projectiledeathtype = WEP_HLAC;
 
 	CSQCProjectile(missile, TRUE, PROJECTILE_HLAC, TRUE);
+
+	other = missile; MUTATOR_CALLHOOK(EditProjectile);
 }
 
 void W_HLAC_Attack2f (void)
@@ -81,22 +74,21 @@ void W_HLAC_Attack2f (void)
 	local entity missile;
     float spread;
 
-    spread = cvar("g_balance_hlac_secondary_spread");
+    spread = autocvar_g_balance_hlac_secondary_spread;
 
 
     if(self.crouch)
-        spread = spread * cvar("g_balance_hlac_secondary_spread_crouchmod");
+        spread = spread * autocvar_g_balance_hlac_secondary_spread_crouchmod;
 
-	W_SetupShot (self, FALSE, 3, "weapons/lasergun_fire.wav", cvar("g_balance_hlac_secondary_damage"));
+	W_SetupShot (self, FALSE, 3, "weapons/lasergun_fire.wav", CHAN_WEAPON, autocvar_g_balance_hlac_secondary_damage);
 	pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
 
 	missile = spawn ();
 	missile.owner = self;
 	missile.classname = "hlacbolt";
-	// missile.dmg = issecondary;
 	missile.bot_dodge = TRUE;
 
-    missile.bot_dodgerating = cvar("g_balance_hlac_secondary_damage");
+    missile.bot_dodgerating = autocvar_g_balance_hlac_secondary_damage;
 
 	missile.movetype = MOVETYPE_FLY;
 	PROJECTILE_MAKETRIGGER(missile);
@@ -104,18 +96,20 @@ void W_HLAC_Attack2f (void)
 	setorigin (missile, w_shotorg);
 	setsize(missile, '0 0 0', '0 0 0');
 
-	W_SetupProjectileVelocity(missile, cvar("g_balance_hlac_secondary_speed"), spread);
-	missile.angles = vectoangles (missile.velocity);
+	W_SetupProjectileVelocity(missile, autocvar_g_balance_hlac_secondary_speed, spread);
+	//missile.angles = vectoangles (missile.velocity); // csqc
 
-	missile.touch = W_HLAC_Touch2;
+	missile.touch = W_HLAC_Touch;
 	missile.think = SUB_Remove;
 
-    missile.nextthink = time + cvar("g_balance_hlac_secondary_lifetime");
+    missile.nextthink = time + autocvar_g_balance_hlac_secondary_lifetime;
 
 	missile.flags = FL_PROJECTILE;
 	missile.projectiledeathtype = WEP_HLAC | HITTYPE_SECONDARY;
 
 	CSQCProjectile(missile, TRUE, PROJECTILE_HLAC, TRUE);
+
+	other = missile; MUTATOR_CALLHOOK(EditProjectile);
 }
 
 void W_HLAC_Attack2 (void)
@@ -124,10 +118,10 @@ void W_HLAC_Attack2 (void)
 
     if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
     {
-        self.ammo_cells = self.ammo_cells - cvar("g_balance_hlac_secondary_ammo");
+        self.ammo_cells = self.ammo_cells - autocvar_g_balance_hlac_secondary_ammo;
     }
 
-    for(i=cvar("g_balance_hlac_secondary_shots");i>0;--i)
+    for(i=autocvar_g_balance_hlac_secondary_shots;i>0;--i)
         W_HLAC_Attack2f();
 
 	if (!g_norecoil)
@@ -155,14 +149,14 @@ void HLAC_fire1_02()
 			return;
 		}
 
-		ATTACK_FINISHED(self) = time + cvar("g_balance_hlac_primary_refire") * W_WeaponRateFactor();
+		ATTACK_FINISHED(self) = time + autocvar_g_balance_hlac_primary_refire * W_WeaponRateFactor();
 		W_HLAC_Attack();
-		self.HLAC_bulletcounter = self.HLAC_bulletcounter + 1;
-        weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_hlac_primary_refire"), HLAC_fire1_02);
+		self.misc_bulletcounter = self.misc_bulletcounter + 1;
+        weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_hlac_primary_refire, HLAC_fire1_02);
 	}
 	else
 	{
-		weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_hlac_primary_animtime"), w_ready);
+		weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_hlac_primary_animtime, w_ready);
 	}
 };
 
@@ -174,22 +168,22 @@ void spawnfunc_weapon_hlac (void)
 float w_hlac(float req)
 {
 	if (req == WR_AIM)
-        self.BUTTON_ATCK = bot_aim(cvar("g_balance_hlac_primary_speed"), 0, cvar("g_balance_hlac_primary_lifetime"), FALSE);
+        self.BUTTON_ATCK = bot_aim(autocvar_g_balance_hlac_primary_speed, 0, autocvar_g_balance_hlac_primary_lifetime, FALSE);
 	else if (req == WR_THINK)
 	{
 		if (self.BUTTON_ATCK)
-		if (weapon_prepareattack(0, cvar("g_balance_hlac_primary_refire")))
+		if (weapon_prepareattack(0, autocvar_g_balance_hlac_primary_refire))
 		{
-			self.HLAC_bulletcounter = 0;
+			self.misc_bulletcounter = 0;
 			W_HLAC_Attack();
-			weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_hlac_primary_refire"), HLAC_fire1_02);
+			weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_hlac_primary_refire, HLAC_fire1_02);
 		}
 
-		if (self.BUTTON_ATCK2 && cvar("g_balance_hlac_secondary"))
-		if (weapon_prepareattack(1, cvar("g_balance_hlac_secondary_refire")))
+		if (self.BUTTON_ATCK2 && autocvar_g_balance_hlac_secondary)
+		if (weapon_prepareattack(1, autocvar_g_balance_hlac_secondary_refire))
 		{
 			W_HLAC_Attack2();
-			weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_hlac_secondary_animtime"), w_ready);
+			weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_hlac_secondary_animtime, w_ready);
 		}
 
 	}
@@ -204,13 +198,9 @@ float w_hlac(float req)
 	else if (req == WR_SETUP)
 		weapon_setup(WEP_HLAC);
 	else if (req == WR_CHECKAMMO1)
-		return self.ammo_cells >= cvar("g_balance_hlac_primary_ammo");
+		return self.ammo_cells >= autocvar_g_balance_hlac_primary_ammo;
 	else if (req == WR_CHECKAMMO2)
-		return self.ammo_cells >= cvar("g_balance_hlac_secondary_ammo");
-	else if (req == WR_SUICIDEMESSAGE)
-		w_deathtypestring = "should have used a smaller gun";
-	else if (req == WR_KILLMESSAGE)
-		w_deathtypestring = "was cut down by";
+		return self.ammo_cells >= autocvar_g_balance_hlac_secondary_ammo;
 	return TRUE;
 };
 #endif
@@ -229,6 +219,10 @@ float w_hlac(float req)
 	{
 		precache_sound("weapons/laserimpact.wav");
 	}
+	else if (req == WR_SUICIDEMESSAGE)
+		w_deathtypestring = "%s should have used a smaller gun";
+	else if (req == WR_KILLMESSAGE)
+		w_deathtypestring = "%s was cut down by %s";
 	return TRUE;
 }
 #endif