/* wepimg */ ATTRIB(Seeker, model2, string, "weaponseeker");
/* refname */ ATTRIB(Seeker, netname, string, "seeker");
/* wepname */ ATTRIB(Seeker, m_name, string, _("T.A.G. Seeker"));
+
+#define X(BEGIN, P, END, class, prefix) \
+ BEGIN(class) \
+ P(class, prefix, flac_ammo, float, NONE) \
+ P(class, prefix, flac_animtime, float, NONE) \
+ P(class, prefix, flac_damage, float, NONE) \
+ P(class, prefix, flac_edgedamage, float, NONE) \
+ P(class, prefix, flac_force, float, NONE) \
+ P(class, prefix, flac_lifetime, float, NONE) \
+ P(class, prefix, flac_lifetime_rand, float, NONE) \
+ P(class, prefix, flac_radius, float, NONE) \
+ P(class, prefix, flac_refire, float, NONE) \
+ P(class, prefix, flac_speed, float, NONE) \
+ P(class, prefix, flac_speed_up, float, NONE) \
+ P(class, prefix, flac_speed_z, float, NONE) \
+ P(class, prefix, flac_spread, float, NONE) \
+ P(class, prefix, missile_accel, float, NONE) \
+ P(class, prefix, missile_ammo, float, NONE) \
+ P(class, prefix, missile_animtime, float, NONE) \
+ P(class, prefix, missile_count, float, NONE) \
+ P(class, prefix, missile_damageforcescale, float, NONE) \
+ P(class, prefix, missile_damage, float, NONE) \
+ P(class, prefix, missile_decel, float, NONE) \
+ P(class, prefix, missile_delay, float, NONE) \
+ P(class, prefix, missile_edgedamage, float, NONE) \
+ P(class, prefix, missile_force, float, NONE) \
+ P(class, prefix, missile_health, float, NONE) \
+ P(class, prefix, missile_lifetime, float, NONE) \
+ P(class, prefix, missile_proxy, float, NONE) \
+ P(class, prefix, missile_proxy_delay, float, NONE) \
+ P(class, prefix, missile_proxy_maxrange, float, NONE) \
+ P(class, prefix, missile_radius, float, NONE) \
+ P(class, prefix, missile_refire, float, NONE) \
+ P(class, prefix, missile_smart, float, NONE) \
+ P(class, prefix, missile_smart_mindist, float, NONE) \
+ P(class, prefix, missile_smart_trace_max, float, NONE) \
+ P(class, prefix, missile_smart_trace_min, float, NONE) \
+ P(class, prefix, missile_speed, float, NONE) \
+ P(class, prefix, missile_speed_max, float, NONE) \
+ P(class, prefix, missile_speed_up, float, NONE) \
+ P(class, prefix, missile_speed_z, float, NONE) \
+ P(class, prefix, missile_spread, float, NONE) \
+ P(class, prefix, missile_turnrate, float, NONE) \
+ P(class, prefix, reload_ammo, float, NONE) \
+ P(class, prefix, reload_time, float, NONE) \
+ P(class, prefix, switchdelay_drop, float, NONE) \
+ P(class, prefix, switchdelay_raise, float, NONE) \
+ P(class, prefix, tag_ammo, float, NONE) \
+ P(class, prefix, tag_animtime, float, NONE) \
+ P(class, prefix, tag_damageforcescale, float, NONE) \
+ P(class, prefix, tag_health, float, NONE) \
+ P(class, prefix, tag_lifetime, float, NONE) \
+ P(class, prefix, tag_refire, float, NONE) \
+ P(class, prefix, tag_speed, float, NONE) \
+ P(class, prefix, tag_spread, float, NONE) \
+ P(class, prefix, tag_tracker_lifetime, float, NONE) \
+ P(class, prefix, type, float, NONE) \
+ P(class, prefix, weaponreplace, string, NONE) \
+ P(class, prefix, weaponstartoverride, float, NONE) \
+ P(class, prefix, weaponstart, float, NONE) \
+ P(class, prefix, weaponthrowable, float, NONE) \
+ END()
+ W_PROPS(X, Seeker, seeker)
+#undef X
ENDCLASS(Seeker)
-REGISTER_WEAPON(SEEKER, NEW(Seeker));
-
-#define SEEKER_SETTINGS(w_cvar,w_prop) SEEKER_SETTINGS_LIST(w_cvar, w_prop, SEEKER, seeker)
-#define SEEKER_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
- w_cvar(id, sn, NONE, type) \
- w_cvar(id, sn, NONE, flac_ammo) \
- w_cvar(id, sn, NONE, flac_animtime) \
- w_cvar(id, sn, NONE, flac_damage) \
- w_cvar(id, sn, NONE, flac_edgedamage) \
- w_cvar(id, sn, NONE, flac_force) \
- w_cvar(id, sn, NONE, flac_lifetime) \
- w_cvar(id, sn, NONE, flac_lifetime_rand) \
- w_cvar(id, sn, NONE, flac_radius) \
- w_cvar(id, sn, NONE, flac_refire) \
- w_cvar(id, sn, NONE, flac_speed) \
- w_cvar(id, sn, NONE, flac_speed_up) \
- w_cvar(id, sn, NONE, flac_speed_z) \
- w_cvar(id, sn, NONE, flac_spread) \
- w_cvar(id, sn, NONE, missile_accel) \
- w_cvar(id, sn, NONE, missile_ammo) \
- w_cvar(id, sn, NONE, missile_animtime) \
- w_cvar(id, sn, NONE, missile_count) \
- w_cvar(id, sn, NONE, missile_damage) \
- w_cvar(id, sn, NONE, missile_damageforcescale) \
- w_cvar(id, sn, NONE, missile_decel) \
- w_cvar(id, sn, NONE, missile_delay) \
- w_cvar(id, sn, NONE, missile_edgedamage) \
- w_cvar(id, sn, NONE, missile_force) \
- w_cvar(id, sn, NONE, missile_health) \
- w_cvar(id, sn, NONE, missile_lifetime) \
- w_cvar(id, sn, NONE, missile_proxy) \
- w_cvar(id, sn, NONE, missile_proxy_delay) \
- w_cvar(id, sn, NONE, missile_proxy_maxrange) \
- w_cvar(id, sn, NONE, missile_radius) \
- w_cvar(id, sn, NONE, missile_refire) \
- w_cvar(id, sn, NONE, missile_smart) \
- w_cvar(id, sn, NONE, missile_smart_mindist) \
- w_cvar(id, sn, NONE, missile_smart_trace_max) \
- w_cvar(id, sn, NONE, missile_smart_trace_min) \
- w_cvar(id, sn, NONE, missile_speed) \
- w_cvar(id, sn, NONE, missile_speed_max) \
- w_cvar(id, sn, NONE, missile_speed_up) \
- w_cvar(id, sn, NONE, missile_speed_z) \
- w_cvar(id, sn, NONE, missile_spread) \
- w_cvar(id, sn, NONE, missile_turnrate) \
- w_cvar(id, sn, NONE, tag_ammo) \
- w_cvar(id, sn, NONE, tag_animtime) \
- w_cvar(id, sn, NONE, tag_damageforcescale) \
- w_cvar(id, sn, NONE, tag_health) \
- w_cvar(id, sn, NONE, tag_lifetime) \
- w_cvar(id, sn, NONE, tag_refire) \
- w_cvar(id, sn, NONE, tag_speed) \
- w_cvar(id, sn, NONE, tag_spread) \
- w_cvar(id, sn, NONE, tag_tracker_lifetime) \
- w_prop(id, sn, float, reloading_ammo, reload_ammo) \
- w_prop(id, sn, float, reloading_time, reload_time) \
- w_prop(id, sn, float, switchdelay_raise, switchdelay_raise) \
- w_prop(id, sn, float, switchdelay_drop, switchdelay_drop) \
- w_prop(id, sn, string, weaponreplace, weaponreplace) \
- w_prop(id, sn, float, weaponstart, weaponstart) \
- w_prop(id, sn, float, weaponstartoverride, weaponstartoverride) \
- w_prop(id, sn, float, weaponthrowable, weaponthrowable)
+REGISTER_WEAPON(SEEKER, seeker, NEW(Seeker));
+
#ifdef SVQC
-SEEKER_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP)
.entity tag_target, wps_tag_tracker;
.float tag_time;
#endif
entity oldenemy;
self.cnt = self.cnt - 1;
- if((!(self.realowner.items & IT_UNLIMITED_AMMO) && self.realowner.WEP_AMMO(SEEKER) < WEP_CVAR(seeker, missile_ammo)) || (self.cnt <= -1) || (self.realowner.deadflag != DEAD_NO) || (self.realowner.switchweapon != WEP_SEEKER.m_id))
+ if((!(self.realowner.items & IT_UNLIMITED_AMMO) && self.realowner.WEP_AMMO(SEEKER) < WEP_CVAR(seeker, missile_ammo)) || (self.cnt <= -1) || (self.realowner.deadflag != DEAD_NO) || (PS(self.realowner).m_switchweapon != WEP_SEEKER))
{
remove(self);
return;
void W_Seeker_Tracker_Think()
{SELFPARAM();
// commit suicide if: You die OR target dies OR you switch away from the seeker OR commit suicide if lifetime is up
- if((self.realowner.deadflag != DEAD_NO) || (self.tag_target.deadflag != DEAD_NO) || (self.realowner.switchweapon != WEP_SEEKER.m_id)
+ if((self.realowner.deadflag != DEAD_NO) || (self.tag_target.deadflag != DEAD_NO) || (PS(self.realowner).m_switchweapon != WEP_SEEKER)
|| (time > self.tag_time + WEP_CVAR(seeker, tag_tracker_lifetime)))
{
if(self)
missile.bot_dodge = true;
missile.bot_dodgerating = 50;
missile.touch = W_Seeker_Tag_Touch;
- missile.think = SUB_Remove;
+ missile.think = SUB_Remove_self;
missile.nextthink = time + WEP_CVAR(seeker, tag_lifetime);
missile.movetype = MOVETYPE_FLY;
missile.solid = SOLID_BBOX;
METHOD(Seeker, wr_think, void(entity thiswep, entity actor, .entity weaponentity, int fire))
{
if(autocvar_g_balance_seeker_reload_ammo && actor.clip_load < min(WEP_CVAR(seeker, missile_ammo), WEP_CVAR(seeker, tag_ammo))) { // forced reload
- Weapon w = get_weaponinfo(actor.weapon);
- w.wr_reload(w);
+ thiswep.wr_reload(thiswep);
} else if(fire & 1)
{
if(WEP_CVAR(seeker, type) == 1)
}
}
}
- METHOD(Seeker, wr_init, void(entity thiswep))
- {
- SEEKER_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
- }
METHOD(Seeker, wr_checkammo1, bool(entity thiswep))
{
float ammo_amount;
}
return ammo_amount;
}
- METHOD(Seeker, wr_config, void(entity thiswep))
- {
- SEEKER_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
- }
METHOD(Seeker, wr_reload, void(entity thiswep))
{
W_Reload(self, min(WEP_CVAR(seeker, missile_ammo), WEP_CVAR(seeker, tag_ammo)), SND(RELOAD));
projects / xonotic / xonotic-data.pk3dir.git / blobdiff