X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fweapon%2Felectro.qh;h=c9298acaa6e8e4bdfe073ea240a8a332a548030a;hb=bf4161ef3639ba716090dd4b31c104a8e1617126;hp=32b45c6928f2bb7faf1fe94919ef03260f7ce5fe;hpb=ee5353529c2fee304ac944aa19af53cc85eca7b0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/weapons/weapon/electro.qh b/qcsrc/common/weapons/weapon/electro.qh
index 32b45c692..c9298acaa 100644
--- a/qcsrc/common/weapons/weapon/electro.qh
+++ b/qcsrc/common/weapons/weapon/electro.qh
@@ -1,14 +1,17 @@
 #pragma once
 
 CLASS(Electro, Weapon)
-/* ammotype  */ ATTRIB(Electro, ammo_field, .int, ammo_cells);
+/* spawnfunc */ ATTRIB(Electro, m_canonical_spawnfunc, string, "weapon_electro");
+/* ammotype  */ ATTRIB(Electro, ammo_type, int, RES_CELLS);
 /* impulse   */ ATTRIB(Electro, impulse, int, 5);
-/* flags     */ ATTRIB(Electro, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH);
+/* flags     */ ATTRIB(Electro, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Electro, bot_pickupbasevalue, float, 5000);
 /* color     */ ATTRIB(Electro, wpcolor, vector, '0 0.5 1');
 /* modelname */ ATTRIB(Electro, mdl, string, "electro");
 #ifdef GAMEQC
 /* model     */ ATTRIB(Electro, m_model, Model, MDL_ELECTRO_ITEM);
+/* flash mdl */ ATTRIB(Electro, m_muzzlemodel, Model, MDL_Null);
+/* flash eff */ ATTRIB(Electro, m_muzzleeffect, entity, EFFECT_ELECTRO_MUZZLEFLASH);
 #endif
 /* crosshair */ ATTRIB(Electro, w_crosshair, string, "gfx/crosshairelectro");
 /* crosshair */ ATTRIB(Electro, w_crosshair_size, float, 0.6);
@@ -26,9 +29,12 @@ CLASS(Electro, Weapon)
 		P(class, prefix, combo_comboradius, float, NONE) \
 		P(class, prefix, combo_comboradius_thruwall, float, NONE) \
 		P(class, prefix, combo_damage, float, NONE) \
+		P(class, prefix, combo_damage_interval, float, NONE) \
+		P(class, prefix, combo_duration, float, NONE) \
 		P(class, prefix, combo_edgedamage, float, NONE) \
 		P(class, prefix, combo_force, float, NONE) \
 		P(class, prefix, combo_radius, float, NONE) \
+		P(class, prefix, combo_power, float, NONE) \
 		P(class, prefix, combo_safeammocheck, float, NONE) \
 		P(class, prefix, combo_speed, float, NONE) \
 		P(class, prefix, count, float, SEC) \
@@ -39,9 +45,13 @@ CLASS(Electro, Weapon)
 		P(class, prefix, force, float, BOTH) \
 		P(class, prefix, health, float, SEC) \
 		P(class, prefix, lifetime, float, BOTH) \
+		P(class, prefix, midaircombo_enemy, bool, PRI) \
 		P(class, prefix, midaircombo_explode, float, PRI) \
 		P(class, prefix, midaircombo_interval, float, PRI) \
+		P(class, prefix, midaircombo_own, bool, PRI) \
 		P(class, prefix, midaircombo_radius, float, PRI) \
+		P(class, prefix, midaircombo_speed, float, PRI) \
+		P(class, prefix, midaircombo_teammate, float, PRI) \
 		P(class, prefix, radius, float, BOTH) \
 		P(class, prefix, refire2, float, SEC) \
 		P(class, prefix, refire, float, BOTH) \
@@ -66,8 +76,18 @@ CLASS(Electro, Weapon)
 ENDCLASS(Electro)
 REGISTER_WEAPON(ELECTRO, electro, NEW(Electro));
 
+SPAWNFUNC_WEAPON(weapon_electro, WEP_ELECTRO)
 
 #ifdef SVQC
+.float dmg;
+.float dmg_edge;
+.float dmg_radius;
+.float dmg_force;
+.float dmg_power;
+.float dmg_duration;
+.float dmg_last;
+.float dmg_interval;
+
 .float electro_count;
 .float electro_secondarytime;
 void W_Electro_ExplodeCombo(entity this);