X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_fireball.qc;h=2c56756cdb697c5f80ccf44befbc54c18ca57c20;hp=31e5b6a02ebaf8d125bd3c57f3752e06aa37640a;hb=6018d119b3c9f4e54d6d21f6339948708c83d83f;hpb=60ed95fe707decf91bb54393d4c11ee4faa2e418;ds=sidebyside

diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc
index 31e5b6a02..2c56756cd 100644
--- a/qcsrc/server/w_fireball.qc
+++ b/qcsrc/server/w_fireball.qc
@@ -1,5 +1,5 @@
 #ifdef REGISTER_WEAPON
-REGISTER_WEAPON(FIREBALL, w_fireball, IT_FUEL, 9, WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "fireball", "fireball", _("Fireball"));
+REGISTER_WEAPON(FIREBALL, w_fireball, 0, 9, WEP_FLAG_SUPERWEAPON | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "fireball", "fireball", _("Fireball"));
 #else
 #ifdef SVQC
 .float bot_primary_fireballmooth; // whatever a mooth is
@@ -19,7 +19,7 @@ void W_Fireball_Explode (void)
 
 	// 1. dist damage
 	d = (self.realowner.health + self.realowner.armorvalue);
-	RadiusDamage (self, self.realowner, autocvar_g_balance_fireball_primary_damage, autocvar_g_balance_fireball_primary_edgedamage, autocvar_g_balance_fireball_primary_radius, world, autocvar_g_balance_fireball_primary_force, self.projectiledeathtype, other);
+	RadiusDamage (self, self.realowner, autocvar_g_balance_fireball_primary_damage, autocvar_g_balance_fireball_primary_edgedamage, autocvar_g_balance_fireball_primary_radius, world, world, autocvar_g_balance_fireball_primary_force, self.projectiledeathtype, other);
 	if(self.realowner.health + self.realowner.armorvalue >= d)
 	if(!self.cnt)
 	{
@@ -129,7 +129,7 @@ void W_Fireball_Damage (entity inflictor, entity attacker, float damage, float d
 
 void W_Fireball_Attack1()
 {
-	local entity proj;
+	entity proj;
 
 	W_SetupShot_ProjectileSize (self, '-16 -16 -16', '16 16 16', FALSE, 2, "weapons/fireball_fire2.wav", CH_WEAPON_A, autocvar_g_balance_fireball_primary_damage + autocvar_g_balance_fireball_primary_bfgdamage);
 
@@ -159,7 +159,8 @@ void W_Fireball_Attack1()
 	proj.touch = W_Fireball_TouchExplode;
 	setsize(proj, '-16 -16 -16', '16 16 16');
 	proj.flags = FL_PROJECTILE;
-
+    proj.missile_flags = MIF_SPLASH | MIF_PROXY;
+    
 	CSQCProjectile(proj, TRUE, PROJECTILE_FIREBALL, TRUE);
 
 	other = proj; MUTATOR_CALLHOOK(EditProjectile);
@@ -198,8 +199,6 @@ void W_Fireball_Attack1_Frame1()
 
 void W_Fireball_Attack1_Frame0()
 {
-	W_DecreaseAmmo(ammo_fuel, autocvar_g_balance_fireball_primary_ammo, autocvar_g_balance_fireball_reload_ammo);
-
 	W_Fireball_AttackEffect(0, '-1.25 -3.75 0');
 	sound (self, CH_WEAPON_SINGLE, "weapons/fireball_prefire2.wav", VOL_BASE, ATTN_NORM);
 	weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_fireball_primary_animtime, W_Fireball_Attack1_Frame1);
@@ -245,12 +244,10 @@ void W_Firemine_Touch (void)
 
 void W_Fireball_Attack2()
 {
-	local entity proj;
+	entity proj;
 	vector f_diff;
 	float c;
 
-	W_DecreaseAmmo(ammo_fuel, autocvar_g_balance_fireball_secondary_ammo, autocvar_g_balance_fireball_reload_ammo);
-
 	c = mod(self.bulletcounter, 4);
 	switch(c)
 	{
@@ -293,7 +290,8 @@ void W_Fireball_Attack2()
 
 	proj.angles = vectoangles(proj.velocity);
 	proj.flags = FL_PROJECTILE;
-
+    proj.missile_flags = MIF_SPLASH | MIF_PROXY | MIF_ARC;
+    
 	CSQCProjectile(proj, TRUE, PROJECTILE_FIREMINE, TRUE);
 
 	other = proj; MUTATOR_CALLHOOK(EditProjectile);
@@ -306,7 +304,7 @@ void spawnfunc_weapon_fireball (void)
 
 float w_fireball(float req)
 {
-	float ammo_amount;
+	//float ammo_amount;
 	if (req == WR_AIM)
 	{
 		self.BUTTON_ATCK = FALSE;
@@ -330,9 +328,7 @@ float w_fireball(float req)
 	}
 	else if (req == WR_THINK)
 	{
-		if(autocvar_g_balance_fireball_reload_ammo && self.clip_load < min(autocvar_g_balance_fireball_primary_ammo, autocvar_g_balance_fireball_secondary_ammo)) // forced reload
-			weapon_action(self.weapon, WR_RELOAD);
-		else if (self.BUTTON_ATCK)
+		if (self.BUTTON_ATCK)
 		{
 			if (time >= self.fireball_primarytime)
 			if (weapon_prepareattack(0, autocvar_g_balance_fireball_primary_refire))
@@ -364,34 +360,22 @@ float w_fireball(float req)
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_FIREBALL);
-		self.current_ammo = ammo_fuel;
+		self.current_ammo = ammo_none;
 	}
 	else if (req == WR_CHECKAMMO1)
 	{
-		ammo_amount = self.ammo_fuel >= autocvar_g_balance_fireball_primary_ammo;
-		ammo_amount += self.(weapon_load[WEP_FIREBALL]) >= autocvar_g_balance_fireball_primary_ammo;
-		return ammo_amount;
+		return 1;
 	}
 	else if (req == WR_CHECKAMMO2)
 	{
-		ammo_amount = self.ammo_fuel >= autocvar_g_balance_fireball_secondary_ammo;
-		ammo_amount += self.(weapon_load[WEP_FIREBALL]) >= autocvar_g_balance_fireball_secondary_ammo;
-		return ammo_amount;
+		return 1;
 	}
 	else if (req == WR_RESETPLAYER)
 	{
 		self.fireball_primarytime = time;
 	}
-	else if (req == WR_RELOAD)
-	{
-		// fuel can be a non-whole number, which brakes stuff here when between 0 and 1
-		if(self.ammo_fuel < 1)
-			self.ammo_fuel = 0;
-
-		W_Reload(min(autocvar_g_balance_fireball_primary_ammo, autocvar_g_balance_fireball_secondary_ammo), autocvar_g_balance_fireball_reload_ammo, autocvar_g_balance_fireball_reload_time, "weapons/reload.wav");
-	}
 	return TRUE;
-};
+}
 #endif
 #ifdef CSQC
 float w_fireball(float req)