+#define ISF_LOCATION 2
+#define ISF_MODEL 4
+#define ISF_STATUS 8
+ #define ITS_STAYWEP 1
+ #define ITS_ANIMATE1 2
+ #define ITS_ANIMATE2 4
+ #define ITS_AVAILABLE 8
+ #define ITS_ALLOWFB 16
+ #define ITS_ALLOWSI 32
+ #define ITS_POWERUP 64
+#define ISF_COLORMAP 16
+#define ISF_DROP 32
+#define ISF_ANGLES 64
+
+.float ItemStatus;
+
#ifdef CSQC
+
+var float autocvar_cl_animate_items = 1;
+var float autocvar_cl_ghost_items = 0.45;
+var vector autocvar_cl_ghost_items_color = '-1 -1 -1';
+var float autocvar_cl_fullbright_items = 0;
+var vector autocvar_cl_weapon_stay_color = '2 0.5 0.5';
+var float autocvar_cl_weapon_stay_alpha = 0.75;
+var float autocvar_cl_simple_items = 0;
+var string autocvar_cl_simpleitems_postfix = "_simple";
+.float spawntime;
+.float gravity;
+.vector colormod;
void ItemDraw()
{
if(self.gravity)
self.move_angles = self.angles;
}
- if(sf & ISF_SIZE)
- {
- self.mins_x = ReadCoord();
- self.mins_y = ReadCoord();
- self.mins_z = ReadCoord();
- self.maxs_x = ReadCoord();
- self.maxs_y = ReadCoord();
- self.maxs_z = ReadCoord();
- setsize(self, self.mins, self.maxs);
- }
-
if(sf & ISF_STATUS) // need to read/write status frist so model can handle simple, fb etc.
{
self.ItemStatus = ReadByte();
if(sf & ISF_MODEL)
{
self.drawmask = MASK_NORMAL;
- self.movetype = MOVETYPE_TOSS;
+ self.movetype = MOVETYPE_NOCLIP;
self.draw = ItemDraw;
if(self.mdl)
if(sf & ISF_DROP)
{
self.gravity = 1;
- //self.move_angles = '0 0 0';
+ self.move_angles = '0 0 0';
self.move_movetype = MOVETYPE_TOSS;
self.move_velocity_x = ReadCoord();
self.move_velocity_y = ReadCoord();
#endif
#ifdef SVQC
+float autocvar_sv_simple_items;
float ItemSend(entity to, float sf)
{
if(self.gravity)
WriteCoord(MSG_ENTITY, self.angles_z);
}
- if(sf & ISF_SIZE)
- {
- WriteCoord(MSG_ENTITY, self.mins_x);
- WriteCoord(MSG_ENTITY, self.mins_y);
- WriteCoord(MSG_ENTITY, self.mins_z);
- WriteCoord(MSG_ENTITY, self.maxs_x);
- WriteCoord(MSG_ENTITY, self.maxs_y);
- WriteCoord(MSG_ENTITY, self.maxs_z);
- }
-
if(sf & ISF_STATUS)
WriteByte(MSG_ENTITY, self.ItemStatus);
if(autocvar_g_pickup_items == 0)
return FALSE;
if(g_weaponarena)
- if(self.weapons || (self.items & IT_AMMO)) // no item or ammo pickups in weaponarena
+ if(self.weapons || (self.items & IT_AMMO))
return FALSE;
}
return TRUE;
}
+#define ITEM_RESPAWN_TICKS 10
+
+#define ITEM_RESPAWNTIME(i) ((i).respawntime + crandom() * (i).respawntimejitter)
+ // range: respawntime - respawntimejitter .. respawntime + respawntimejitter
+#define ITEM_RESPAWNTIME_INITIAL(i) (ITEM_RESPAWN_TICKS + random() * ((i).respawntime + (i).respawntimejitter - ITEM_RESPAWN_TICKS))
+ // range: 10 .. respawntime + respawntimejitter
+
+floatfield Item_CounterField(float it)
+{
+ switch(it)
+ {
+ case IT_SHELLS: return ammo_shells;
+ case IT_NAILS: return ammo_nails;
+ case IT_ROCKETS: return ammo_rockets;
+ case IT_CELLS: return ammo_cells;
+ case IT_FUEL: return ammo_fuel;
+ case IT_5HP: return health;
+ case IT_25HP: return health;
+ case IT_HEALTH: return health;
+ case IT_ARMOR_SHARD: return armorvalue;
+ case IT_ARMOR: return armorvalue;
+ // add more things here (health, armor)
+ default: error("requested item has no counter field");
+ }
+#ifdef GMQCC
+ // should never happen
+ return health;
+#endif
+}
+
+string Item_CounterFieldName(float it)
+{
+ switch(it)
+ {
+ case IT_SHELLS: return "shells";
+ case IT_NAILS: return "nails";
+ case IT_ROCKETS: return "rockets";
+ case IT_CELLS: return "cells";
+ case IT_FUEL: return "fuel";
+
+ // add more things here (health, armor)
+ default: error("requested item has no counter field name");
+ }
+#ifdef GMQCC
+ // should never happen
+ return string_null;
+#endif
+}
+
+.float max_armorvalue;
+.float pickup_anyway;
/*
float Item_Customize()
{
e.SendFlags |= ISF_STATUS;
}
-void Item_Think()
-{
- self.nextthink = time;
- if(self.origin != self.oldorigin)
- {
- self.oldorigin = self.origin;
- ItemUpdate(self);
- }
-}
-
void Item_Respawn (void)
{
Item_Show(self, 1);
sound (self, CH_TRIGGER, "misc/itemrespawn.wav", VOL_BASE, ATTEN_NORM); // play respawn sound
setorigin (self, self.origin);
- self.think = Item_Think;
- self.nextthink = time;
-
//pointparticles(particleeffectnum("item_respawn"), self.origin + self.mins_z * '0 0 1' + '0 0 48', '0 0 0', 1);
pointparticles(particleeffectnum("item_respawn"), self.origin + 0.5 * (self.mins + self.maxs), '0 0 0', 1);
}
entity wi = get_weaponinfo(self.weapon);
if(wi)
{
- name = wi.wpmodel;
+ name = wi.model2;
rgb = '1 0 0';
}
}
}
}
-void Item_RespawnThink()
-{
- self.nextthink = time;
- if(self.origin != self.oldorigin)
- {
- self.oldorigin = self.origin;
- ItemUpdate(self);
- }
-
- if(time >= self.wait)
- Item_Respawn();
-}
-
void Item_ScheduleRespawnIn(entity e, float t)
{
if((e.flags & FL_POWERUP) || (e.weapons & WEPSET_SUPERWEAPONS))
}
else
{
- e.think = Item_RespawnThink;
- e.nextthink = time;
- e.wait = time + t;
+ e.think = Item_Respawn;
+ e.nextthink = time + t;
}
}
Item_ScheduleRespawnIn(e, game_starttime - time + ITEM_RESPAWNTIME_INITIAL(e));
}
-float Item_GiveAmmoTo(entity item, entity player, .float ammotype, float ammomax, float mode)
+const float ITEM_MODE_NONE = 0;
+const float ITEM_MODE_HEALTH = 1;
+const float ITEM_MODE_ARMOR = 2;
+const float ITEM_MODE_FUEL = 3;
+float Item_GiveAmmoTo(entity item, entity player, .float ammofield, float ammomax, float mode)
{
- if (!item.ammotype)
+ if (!item.ammofield)
return FALSE;
if (item.spawnshieldtime)
{
- if ((player.ammotype < ammomax) || item.pickup_anyway)
+ if ((player.ammofield < ammomax) || item.pickup_anyway)
{
- player.ammotype = bound(player.ammotype, ammomax, player.ammotype + item.ammotype);
+ player.ammofield = bound(player.ammofield, ammomax, player.ammofield + item.ammofield);
goto YEAH;
}
}
else if(g_weapon_stay == 2)
{
- float mi = min(item.ammotype, ammomax);
- if (player.ammotype < mi)
+ float mi = min(item.ammofield, ammomax);
+ if (player.ammofield < mi)
{
- player.ammotype = mi;
+ player.ammofield = mi;
goto YEAH;
}
}
pickedup |= Item_GiveAmmoTo(item, player, ammo_nails, g_pickup_nails_max, ITEM_MODE_NONE);
pickedup |= Item_GiveAmmoTo(item, player, ammo_rockets, g_pickup_rockets_max, ITEM_MODE_NONE);
pickedup |= Item_GiveAmmoTo(item, player, ammo_cells, g_pickup_cells_max, ITEM_MODE_NONE);
- pickedup |= Item_GiveAmmoTo(item, player, ammo_plasma, g_pickup_plasma_max, ITEM_MODE_NONE);
pickedup |= Item_GiveAmmoTo(item, player, health, item.max_health, ITEM_MODE_HEALTH);
pickedup |= Item_GiveAmmoTo(item, player, armorvalue, item.max_armorvalue, ITEM_MODE_ARMOR);
if(self.classname != "droppedweapon")
{
- self.think = Item_Think;
- self.nextthink = time;
+ self.think = func_null;
+ self.nextthink = 0;
if(self.waypointsprite_attached)
WaypointSprite_Kill(self.waypointsprite_attached);
// If I can pick it up
if(!item.spawnshieldtime)
c = 0;
- else if(player.ammo_cells || player.ammo_shells || player.ammo_plasma || player.ammo_nails || player.ammo_rockets)
+ else if(player.ammo_cells || player.ammo_shells || player.ammo_nails || player.ammo_rockets)
{
// Skilled bots will grab more
c = bound(0, skill / 10, 1) * 0.5;
float commodity_pickupevalfunc(entity player, entity item)
{
float c, i;
- float need_shells = FALSE, need_nails = FALSE, need_rockets = FALSE, need_cells = FALSE, need_plasma = FALSE, need_fuel = FALSE;
+ float need_shells = FALSE, need_nails = FALSE, need_rockets = FALSE, need_cells = FALSE, need_fuel = FALSE;
entity wi;
c = 0;
need_rockets = TRUE;
else if(wi.items & IT_CELLS)
need_cells = TRUE;
- else if(wi.items & IT_PLASMA)
- need_plasma = TRUE;
else if(wi.items & IT_FUEL)
need_cells = TRUE;
}
if (item.ammo_cells)
if (player.ammo_cells < g_pickup_cells_max)
c = c + max(0, 1 - player.ammo_cells / g_pickup_cells_max);
- if (need_plasma)
- if (item.ammo_plasma)
- if (player.ammo_plasma < g_pickup_plasma_max)
- c = c + max(0, 1 - player.ammo_plasma / g_pickup_plasma_max);
if (need_fuel)
if (item.ammo_fuel)
if (player.ammo_fuel < g_pickup_fuel_max)
RemoveItem();
}
+.float is_item;
void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, float defaultrespawntimejitter, string itemname, float itemid, float weaponid, float itemflags, float(entity player, entity item) pickupevalfunc, float pickupbasevalue)
{
startitem_failed = FALSE;
return;
}
+ if(self.angles != '0 0 0')
+ self.SendFlags |= ISF_ANGLES;
+
self.reset = Item_Reset;
// it's a level item
if(self.spawnflags & 1)
setsize (self, '-16 -16 0', '16 16 48');
else
setsize (self, '-16 -16 0', '16 16 32');
-
// note droptofloor returns FALSE if stuck/or would fall too far
droptofloor();
waypoint_spawnforitem(self);
Item_Reset();
Net_LinkEntity(self, FALSE, 0, ItemSend);
-
- self.SendFlags |= ISF_SIZE;
- if(self.angles)
- self.SendFlags |= ISF_ANGLES;
// call this hook after everything else has been done
if(MUTATOR_CALLHOOK(Item_Spawn))
return;
}
}
+
+float weaponswapping;
+float internalteam;
+
+void weapon_defaultspawnfunc(float wpn)
+{
+ entity e;
+ float t;
+ var .float ammofield;
+ string s;
+ entity oldself;
+ float i, j;
+ float f;
+
+ if(self.classname != "droppedweapon" && self.classname != "replacedweapon")
+ {
+ e = get_weaponinfo(wpn);
+
+ if(e.spawnflags & WEP_FLAG_MUTATORBLOCKED)
+ {
+ objerror("Attempted to spawn a mutator-blocked weapon rejected");
+ startitem_failed = TRUE;
+ return;
+ }
+
+ s = W_Apply_Weaponreplace(e.netname);
+ ret_string = s;
+ other = e;
+ MUTATOR_CALLHOOK(SetWeaponreplace);
+ s = ret_string;
+ if(s == "")
+ {
+ remove(self);
+ startitem_failed = TRUE;
+ return;
+ }
+ t = tokenize_console(s);
+ if(t >= 2)
+ {
+ self.team = --internalteam;
+ oldself = self;
+ for(i = 1; i < t; ++i)
+ {
+ s = argv(i);
+ for(j = WEP_FIRST; j <= WEP_LAST; ++j)
+ {
+ e = get_weaponinfo(j);
+ if(e.netname == s)
+ {
+ self = spawn();
+ copyentity(oldself, self);
+ self.classname = "replacedweapon";
+ weapon_defaultspawnfunc(j);
+ break;
+ }
+ }
+ if(j > WEP_LAST)
+ {
+ print("The weapon replace list for ", oldself.classname, " contains an unknown weapon ", s, ". Skipped.\n");
+ }
+ }
+ self = oldself;
+ }
+ if(t >= 1) // always the case!
+ {
+ s = argv(0);
+ wpn = 0;
+ for(j = WEP_FIRST; j <= WEP_LAST; ++j)
+ {
+ e = get_weaponinfo(j);
+ if(e.netname == s)
+ {
+ wpn = j;
+ break;
+ }
+ }
+ if(j > WEP_LAST)
+ {
+ print("The weapon replace list for ", self.classname, " contains an unknown weapon ", s, ". Skipped.\n");
+ }
+ }
+ if(wpn == 0)
+ {
+ remove(self);
+ startitem_failed = TRUE;
+ return;
+ }
+ }
+
+ e = get_weaponinfo(wpn);
+
+ if(!self.respawntime)
+ {
+ if(e.weapons & WEPSET_SUPERWEAPONS)
+ {
+ self.respawntime = g_pickup_respawntime_superweapon;
+ self.respawntimejitter = g_pickup_respawntimejitter_superweapon;
+ }
+ else
+ {
+ self.respawntime = g_pickup_respawntime_weapon;
+ self.respawntimejitter = g_pickup_respawntimejitter_weapon;
+ }
+ }
+
+ if(e.weapons & WEPSET_SUPERWEAPONS)
+ if(!self.superweapons_finished)
+ self.superweapons_finished = autocvar_g_balance_superweapons_time;
+
+ if(e.items)
+ {
+ for(i = 0, j = 1; i < 24; ++i, j *= 2)
+ {
+ if(e.items & j)
+ {
+ ammofield = Item_CounterField(j);
+ if(!self.ammofield)
+ self.ammofield = cvar(strcat("g_pickup_", Item_CounterFieldName(j), "_weapon"));
+ }
+ }
+ }
+
+ // pickup anyway
+ if(g_pickup_weapons_anyway)
+ self.pickup_anyway = TRUE;
+
+ f = FL_WEAPON;
+
+ // no weapon-stay on superweapons
+ if(e.weapons & WEPSET_SUPERWEAPONS)
+ f |= FL_NO_WEAPON_STAY;
+
+ // weapon stay isn't supported for teamed weapons
+ if(self.team)
+ f |= FL_NO_WEAPON_STAY;
+
+ StartItem(e.model, "weapons/weaponpickup.wav", self.respawntime, self.respawntimejitter, e.message, 0, e.weapon, f, weapon_pickupevalfunc, e.bot_pickupbasevalue);
+ if (self.modelindex) // don't precache if self was removed
+ weapon_action(e.weapon, WR_PRECACHE);
+}
+
+void spawnfunc_weapon_shotgun (void);
+void spawnfunc_weapon_uzi (void) {
+ if(autocvar_sv_q3acompat_machineshotgunswap)
+ if(self.classname != "droppedweapon")
+ {
+ weapon_defaultspawnfunc(WEP_SHOTGUN);
+ return;
+ }
+ weapon_defaultspawnfunc(WEP_UZI);
+}
+
+void spawnfunc_weapon_shotgun (void) {
+ if(autocvar_sv_q3acompat_machineshotgunswap)
+ if(self.classname != "droppedweapon")
+ {
+ weapon_defaultspawnfunc(WEP_UZI);
+ return;
+ }
+ weapon_defaultspawnfunc(WEP_SHOTGUN);
+}
+
+void spawnfunc_weapon_nex (void)
+{
+ weapon_defaultspawnfunc(WEP_NEX);
+}
+
+void spawnfunc_weapon_minstanex (void)
+{
+ weapon_defaultspawnfunc(WEP_MINSTANEX);
+}
+
+void spawnfunc_weapon_rocketlauncher (void)
+{
+ weapon_defaultspawnfunc(WEP_ROCKET_LAUNCHER);
+}
+
void spawnfunc_item_rockets (void) {
if(!self.ammo_rockets)
self.ammo_rockets = g_pickup_rockets;
StartItem ("models/items/a_cells.md3", "misc/itempickup.wav", g_pickup_respawntime_ammo, g_pickup_respawntimejitter_ammo, "cells", IT_CELLS, 0, 0, commodity_pickupevalfunc, 2000);
}
-void spawnfunc_item_plasma()
-{
- if(!self.ammo_plasma)
- self.ammo_plasma = g_pickup_plasma;
- if(!self.pickup_anyway)
- self.pickup_anyway = g_pickup_ammo_anyway;
- StartItem ("models/items/a_cells.md3", "misc/itempickup.wav", g_pickup_respawntime_ammo, g_pickup_respawntimejitter_ammo, "plasma", IT_PLASMA, 0, 0, commodity_pickupevalfunc, 2000);
-}
-
void spawnfunc_item_shells (void) {
if(!weaponswapping)
if(autocvar_sv_q3acompat_machineshotgunswap)
// compatibility:
void spawnfunc_item_quad (void) {self.classname = "item_strength";spawnfunc_item_strength();}
+float GiveItems(entity e, float beginarg, float endarg);
void target_items_use (void)
{
if(activator.classname == "droppedweapon")
{
self.weapons |= WepSet_FromWeapon(j);
if(self.spawnflags == 0 || self.spawnflags == 2)
- WEP_ACTION(e.weapon, WR_INIT);
+ weapon_action(e.weapon, WR_PRECACHE);
break;
}
}
if(self.ammo_nails != 0) self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, max(0, self.ammo_nails), "nails");
if(self.ammo_rockets != 0) self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, max(0, self.ammo_rockets), "rockets");
if(self.ammo_cells != 0) self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, max(0, self.ammo_cells), "cells");
- if(self.ammo_plasma != 0) self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, max(0, self.ammo_plasma), "plasma");
if(self.ammo_fuel != 0) self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, max(0, self.ammo_fuel), "fuel");
if(self.health != 0) self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, max(0, self.health), "health");
if(self.armorvalue != 0) self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, max(0, self.health), "armor");
e = get_weaponinfo(j);
if(argv(i) == e.netname)
{
- WEP_ACTION(e.weapon, WR_INIT);
+ weapon_action(e.weapon, WR_PRECACHE);
break;
}
}
StartItem ("models/items/g_jetpack.md3", "misc/itempickup.wav", g_pickup_respawntime_powerup, g_pickup_respawntimejitter_powerup, "Jet pack", IT_JETPACK, 0, FL_POWERUP, commodity_pickupevalfunc, BOT_PICKUP_RATING_LOW);
}
+
+#define OP_SET 0
+#define OP_MIN 1
+#define OP_MAX 2
+#define OP_PLUS 3
+#define OP_MINUS 4
+
float GiveWeapon(entity e, float wpn, float op, float val)
{
WepSet v0, v1;
else if(v0 > v1)
e.regenfield = max(e.regenfield, time + regentime);
}
+
+#define PREGIVE_WEAPONS(e) WepSet save_weapons; save_weapons = e.weapons
+#define PREGIVE(e,f) float save_##f; save_##f = (e).f
+#define POSTGIVE_WEAPON(e,b,snd_incr,snd_decr) GiveSound((e), !!(save_weapons & WepSet_FromWeapon(b)), !!(e.weapons & WepSet_FromWeapon(b)), 0, snd_incr, snd_decr)
+#define POSTGIVE_BIT(e,f,b,snd_incr,snd_decr) GiveSound((e), save_##f & (b), (e).f & (b), 0, snd_incr, snd_decr)
+#define POSTGIVE_VALUE(e,f,t,snd_incr,snd_decr) GiveSound((e), save_##f, (e).f, t, snd_incr, snd_decr)
+#define POSTGIVE_VALUE_ROT(e,f,t,rotfield,rottime,regenfield,regentime,snd_incr,snd_decr) GiveRot((e), save_##f, (e).f, rotfield, rottime, regenfield, regentime); GiveSound((e), save_##f, (e).f, t, snd_incr, snd_decr)
+
float GiveItems(entity e, float beginarg, float endarg)
{
float got, i, j, val, op;
PREGIVE(e, superweapons_finished);
PREGIVE(e, ammo_nails);
PREGIVE(e, ammo_cells);
- PREGIVE(e, ammo_plasma);
PREGIVE(e, ammo_shells);
PREGIVE(e, ammo_rockets);
PREGIVE(e, ammo_fuel);
}
case "allammo":
got += GiveValue(e, ammo_cells, op, val);
- got += GiveValue(e, ammo_plasma, op, val);
got += GiveValue(e, ammo_shells, op, val);
got += GiveValue(e, ammo_nails, op, val);
got += GiveValue(e, ammo_rockets, op, val);
case "cells":
got += GiveValue(e, ammo_cells, op, val);
break;
- case "plasma":
- got += GiveValue(e, ammo_plasma, op, val);
- break;
case "shells":
got += GiveValue(e, ammo_shells, op, val);
break;
POSTGIVE_WEAPON(e, j, "weapons/weaponpickup.wav", string_null);
if (!(save_weapons & WepSet_FromWeapon(j)))
if(e.weapons & WepSet_FromWeapon(j))
- WEP_ACTION(wi.weapon, WR_INIT);
+ weapon_action(wi.weapon, WR_PRECACHE);
}
}
POSTGIVE_VALUE(e, strength_finished, 1, "misc/powerup.wav", "misc/poweroff.wav");
POSTGIVE_VALUE(e, invincible_finished, 1, "misc/powerup_shield.wav", "misc/poweroff.wav");
POSTGIVE_VALUE(e, ammo_nails, 0, "misc/itempickup.wav", string_null);
POSTGIVE_VALUE(e, ammo_cells, 0, "misc/itempickup.wav", string_null);
- POSTGIVE_VALUE(e, ammo_plasma, 0, "misc/itempickup.wav", string_null);
POSTGIVE_VALUE(e, ammo_shells, 0, "misc/itempickup.wav", string_null);
POSTGIVE_VALUE(e, ammo_rockets, 0, "misc/itempickup.wav", string_null);
POSTGIVE_VALUE_ROT(e, ammo_fuel, 1, pauserotfuel_finished, autocvar_g_balance_pause_fuel_rot, pauseregen_finished, autocvar_g_balance_pause_fuel_regen, "misc/itempickup.wav", string_null);
projects / xonotic / xonotic-data.pk3dir.git / blobdiff