X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fw_electro.qc;h=352e4eeae5d282c325f10eefb3eb1f3fc2345d5c;hb=3eef5671b855ba69c8a4eba4fb4325d76393c42c;hp=05df53a0da86fa27b91e19b061a497f4fbe9197e;hpb=d86869ae654e8fe9d36e840a4086cc77bedcb0f4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/weapons/w_electro.qc b/qcsrc/common/weapons/w_electro.qc
index 05df53a0d..352e4eeae 100644
--- a/qcsrc/common/weapons/w_electro.qc
+++ b/qcsrc/common/weapons/w_electro.qc
@@ -6,6 +6,7 @@ REGISTER_WEAPON(
 /* impulse  */ 5,
 /* flags    */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH,
 /* rating   */ BOT_PICKUP_RATING_MID,
+/* color	*/ '0 0.5 1',
 /* model    */ "electro",
 /* netname  */ "electro",
 /* fullname */ _("Electro")
@@ -261,7 +262,7 @@ void W_Electro_Attack_Bolt(void)
 	setorigin(proj, w_shotorg);
 
 	proj.movetype = MOVETYPE_FLY;
-	WEP_SETUPPROJVELOCITY_PRI(proj, electro);
+	WEP_SPV_PRI(proj, electro);
 	proj.angles = vectoangles(proj.velocity);
 	proj.touch = W_Electro_TouchExplode;
 	setsize(proj, '0 0 -3', '0 0 -3');
@@ -353,7 +354,7 @@ void W_Electro_Attack_Orb(void)
 	//proj.glow_size = 50;
 	//proj.glow_color = 45;
 	proj.movetype = MOVETYPE_BOUNCE;
-	WEP_SETUPPROJVELOCITY_UP_SEC(proj, electro);
+	WEP_SPV_UP_SEC(proj, electro);
 	proj.touch = W_Electro_Orb_Touch;
 	setsize(proj, '0 0 -4', '0 0 -4');
 	proj.takedamage = DAMAGE_YES;
@@ -485,14 +486,9 @@ float W_Electro(float req)
 			ELECTRO_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
 			return TRUE;
 		}
-		case WR_SETUP:
-		{
-			self.current_ammo = ammo_cells;
-			return TRUE;
-		}
 		case WR_CHECKAMMO1:
 		{
-			ammo_amount = self.ammo_cells >= WEP_CVAR_PRI(electro, ammo);
+			ammo_amount = self.AMMO_VAL(WEP_ELECTRO) >= WEP_CVAR_PRI(electro, ammo);
 			ammo_amount += self.(weapon_load[WEP_ELECTRO]) >= WEP_CVAR_PRI(electro, ammo);
 			return ammo_amount;
 		}
@@ -500,12 +496,12 @@ float W_Electro(float req)
 		{
 			if(WEP_CVAR(electro, combo_safeammocheck)) // true if you can fire at least one secondary blob AND one primary shot after it, otherwise false.
 			{
-				ammo_amount = self.ammo_cells >= WEP_CVAR_SEC(electro, ammo) + WEP_CVAR_PRI(electro, ammo);
+				ammo_amount = self.AMMO_VAL(WEP_ELECTRO) >= WEP_CVAR_SEC(electro, ammo) + WEP_CVAR_PRI(electro, ammo);
 				ammo_amount += self.(weapon_load[WEP_ELECTRO]) >= WEP_CVAR_SEC(electro, ammo) + WEP_CVAR_PRI(electro, ammo);
 			}
 			else
 			{
-				ammo_amount = self.ammo_cells >= WEP_CVAR_SEC(electro, ammo);
+				ammo_amount = self.AMMO_VAL(WEP_ELECTRO) >= WEP_CVAR_SEC(electro, ammo);
 				ammo_amount += self.(weapon_load[WEP_ELECTRO]) >= WEP_CVAR_SEC(electro, ammo);
 			}
 			return ammo_amount;