X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fweapon%2Farc.qh;h=6db349889b80599587eb7a0b0e59333ba2de6668;hb=86ffc5c159e147eed742ec9169c37cbf137df852;hp=187e5840257149e270f929961f13a7ed2412a7ea;hpb=bc3f297ed082b23fb33dd0d8f5dcd33bb0198507;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/weapons/weapon/arc.qh b/qcsrc/common/weapons/weapon/arc.qh index 187e58402..6db349889 100644 --- a/qcsrc/common/weapons/weapon/arc.qh +++ b/qcsrc/common/weapons/weapon/arc.qh @@ -2,7 +2,7 @@ CLASS(Arc, Weapon) /* spawnfunc */ ATTRIB(Arc, m_canonical_spawnfunc, string, "weapon_arc"); -/* ammotype */ ATTRIB(Arc, ammo_type, int, RESOURCE_CELLS); +/* ammotype */ ATTRIB(Arc, ammo_type, int, RES_CELLS); /* impulse */ ATTRIB(Arc, impulse, int, 3); /* flags */ ATTRIB(Arc, spawnflags, int, WEP_TYPE_HITSCAN); /* rating */ ATTRIB(Arc, bot_pickupbasevalue, float, 8000); @@ -10,6 +10,8 @@ CLASS(Arc, Weapon) /* modelname */ ATTRIB(Arc, mdl, string, "arc"); #ifdef GAMEQC /* model */ ATTRIB(Arc, m_model, Model, MDL_ARC_ITEM); +/* flash mdl */ ATTRIB(Arc, m_muzzlemodel, Model, MDL_Null); +/* flash eff */ ATTRIB(Arc, m_muzzleeffect, entity, EFFECT_ARC_MUZZLEFLASH); #endif /* crosshair */ ATTRIB(Arc, w_crosshair, string, "gfx/crosshairhlac"); /* crosshair */ ATTRIB(Arc, w_crosshair_size, float, 0.7); @@ -21,6 +23,10 @@ CLASS(Arc, Weapon) BEGIN(class) \ P(class, prefix, bolt, float, NONE) \ P(class, prefix, bolt_ammo, float, NONE) \ + P(class, prefix, bolt_bounce_count, float, NONE) \ + P(class, prefix, bolt_bounce_explode, float, NONE) \ + P(class, prefix, bolt_bounce_lifetime, float, NONE) \ + P(class, prefix, bolt_count, float, NONE) \ P(class, prefix, bolt_damageforcescale, float, NONE) \ P(class, prefix, bolt_damage, float, NONE) \ P(class, prefix, bolt_edgedamage, float, NONE) \ @@ -29,6 +35,7 @@ CLASS(Arc, Weapon) P(class, prefix, bolt_lifetime, float, NONE) \ P(class, prefix, bolt_radius, float, NONE) \ P(class, prefix, bolt_refire, float, NONE) \ + P(class, prefix, bolt_refire2, float, NONE) \ P(class, prefix, bolt_speed, float, NONE) \ P(class, prefix, bolt_spread, float, NONE) \ P(class, prefix, beam_ammo, float, NONE) \