X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_items.qc;h=03af802e71c12d8b762c0e34df606ba8c096ee3d;hp=238c6cec506240d758fb262853bb3345f7b9dbf4;hb=77f03e6ce033bef39ac19e0e7cb6e606ffcb26db;hpb=20256058c4de97b81ee5aaedaa383a99010752f0 diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index 238c6cec50..03af802e71 100644 --- a/qcsrc/server/t_items.qc +++ b/qcsrc/server/t_items.qc @@ -1,32 +1,34 @@ -#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; +#if defined(CSQC) + #include "../dpdefs/csprogsdefs.qh" + #include "../common/util.qh" + #include "../common/buffs.qh" + #include "../common/weapons/weapons.qh" + #include "../client/autocvars.qh" + #include "../client/movetypes.qh" + #include "../client/main.qh" + #include "../csqcmodellib/common.qh" + #include "../csqcmodellib/cl_model.qh" + #include "t_items.qh" +#elif defined(MENUQC) +#elif defined(SVQC) + #include "../dpdefs/progsdefs.qh" + #include "../dpdefs/dpextensions.qh" + #include "../warpzonelib/util_server.qh" + #include "../common/constants.qh" + #include "../common/util.qh" + #include "../common/monsters/monsters.qh" + #include "../common/weapons/weapons.qh" + #include "weapons/weaponsystem.qh" + #include "t_items.qh" + #include "autocvars.qh" + #include "constants.qh" + #include "defs.qh" + #include "../common/notifications.qh" + #include "../common/deathtypes.qh" + #include "mutators/mutators_include.qh" +#endif #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) @@ -76,7 +78,7 @@ void ItemDrawSimple() void ItemRead(float _IsNew) { - float sf = ReadByte(); + int sf = ReadByte(); if(sf & ISF_LOCATION) { @@ -95,6 +97,17 @@ void ItemRead(float _IsNew) 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(); @@ -138,7 +151,7 @@ void ItemRead(float _IsNew) if(sf & ISF_MODEL) { self.drawmask = MASK_NORMAL; - self.movetype = MOVETYPE_NOCLIP; + self.movetype = MOVETYPE_TOSS; self.draw = ItemDraw; if(self.mdl) @@ -186,7 +199,7 @@ void ItemRead(float _IsNew) 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(); @@ -216,7 +229,6 @@ void ItemRead(float _IsNew) #endif #ifdef SVQC -float autocvar_sv_simple_items; float ItemSend(entity to, float sf) { if(self.gravity) @@ -230,16 +242,26 @@ float ItemSend(entity to, float sf) //WriteByte(MSG_ENTITY, self.cnt); if(sf & ISF_LOCATION) { - WriteCoord(MSG_ENTITY, self.origin_x); - WriteCoord(MSG_ENTITY, self.origin_y); - WriteCoord(MSG_ENTITY, self.origin_z); + WriteCoord(MSG_ENTITY, self.origin.x); + WriteCoord(MSG_ENTITY, self.origin.y); + WriteCoord(MSG_ENTITY, self.origin.z); } if(sf & ISF_ANGLES) { - WriteCoord(MSG_ENTITY, self.angles_x); - WriteCoord(MSG_ENTITY, self.angles_y); - WriteCoord(MSG_ENTITY, self.angles_z); + WriteCoord(MSG_ENTITY, self.angles.x); + WriteCoord(MSG_ENTITY, self.angles.y); + 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) @@ -260,12 +282,12 @@ float ItemSend(entity to, float sf) if(sf & ISF_DROP) { - WriteCoord(MSG_ENTITY, self.velocity_x); - WriteCoord(MSG_ENTITY, self.velocity_y); - WriteCoord(MSG_ENTITY, self.velocity_z); + WriteCoord(MSG_ENTITY, self.velocity.x); + WriteCoord(MSG_ENTITY, self.velocity.y); + WriteCoord(MSG_ENTITY, self.velocity.z); } - return TRUE; + return true; } void ItemUpdate(entity item) @@ -278,85 +300,34 @@ float have_pickup_item(void) if(self.flags & FL_POWERUP) { if(autocvar_g_powerups > 0) - return TRUE; + return true; if(autocvar_g_powerups == 0) - return FALSE; + return false; } else { if(autocvar_g_pickup_items > 0) - return TRUE; + return true; if(autocvar_g_pickup_items == 0) - return FALSE; + return false; if(g_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"); + if(self.weapons || (self.items & IT_AMMO)) // no item or ammo pickups in weaponarena + return false; } -#ifdef GMQCC - // should never happen - return string_null; -#endif + return true; } -.float max_armorvalue; -.float pickup_anyway; /* float Item_Customize() { if(self.spawnshieldtime) - return TRUE; + return true; if(self.weapons & ~other.weapons) { self.colormod = '0 0 0'; self.glowmod = self.colormod; self.alpha = 0.5 + 0.5 * g_ghost_items; // halfway more alpha - return TRUE; + return true; } else { @@ -365,10 +336,10 @@ float Item_Customize() self.colormod = stov(autocvar_g_ghost_items_color); self.glowmod = self.colormod; self.alpha = g_ghost_items; - return TRUE; + return true; } else - return FALSE; + return false; } } */ @@ -430,6 +401,16 @@ void Item_Show (entity e, float mode) 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); @@ -442,6 +423,9 @@ void Item_Respawn (void) 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); } @@ -480,13 +464,13 @@ void Item_RespawnCountdown (void) entity wi = get_weaponinfo(self.weapon); if(wi) { - name = wi.model2; + name = wi.wpmodel; rgb = '1 0 0'; } } if(name) { - WaypointSprite_Spawn(name, 0, 0, self, '0 0 64', world, 0, self, waypointsprite_attached, TRUE, RADARICON_POWERUP, rgb); + WaypointSprite_Spawn(name, 0, 0, self, '0 0 64', world, 0, self, waypointsprite_attached, true, RADARICON_POWERUP, rgb); if(self.waypointsprite_attached) WaypointSprite_UpdateBuildFinished(self.waypointsprite_attached, time + ITEM_RESPAWN_TICKS); } @@ -505,6 +489,19 @@ void Item_RespawnCountdown (void) } } +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)) @@ -515,8 +512,9 @@ void Item_ScheduleRespawnIn(entity e, float t) } else { - e.think = Item_Respawn; - e.nextthink = time + t; + e.think = Item_RespawnThink; + e.nextthink = time; + e.wait = time + t; } } @@ -537,34 +535,30 @@ void Item_ScheduleInitialRespawn(entity e) Item_ScheduleRespawnIn(e, game_starttime - time + ITEM_RESPAWNTIME_INITIAL(e)); } -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) +float Item_GiveAmmoTo(entity item, entity player, .float ammotype, float ammomax, float mode) { - if (!item.ammofield) - return FALSE; + if (!item.ammotype) + return false; if (item.spawnshieldtime) { - if ((player.ammofield < ammomax) || item.pickup_anyway) + if ((player.ammotype < ammomax) || item.pickup_anyway) { - player.ammofield = bound(player.ammofield, ammomax, player.ammofield + item.ammofield); + player.ammotype = bound(player.ammotype, ammomax, player.ammotype + item.ammotype); goto YEAH; } } else if(g_weapon_stay == 2) { - float mi = min(item.ammofield, ammomax); - if (player.ammofield < mi) + float mi = min(item.ammotype, ammomax); + if (player.ammotype < mi) { - player.ammofield = mi; + player.ammotype = mi; goto YEAH; } } - return FALSE; + return false; :YEAH switch(mode) @@ -581,7 +575,7 @@ float Item_GiveAmmoTo(entity item, entity player, .float ammofield, float ammoma default: break; } - return TRUE; + return true; } float Item_GiveTo(entity item, entity player) @@ -592,23 +586,24 @@ float Item_GiveTo(entity item, entity player) float i; // if nothing happens to player, just return without taking the item - pickedup = FALSE; - _switchweapon = FALSE; + pickedup = false; + _switchweapon = false; // in case the player has autoswitch enabled do the following: // if the player is using their best weapon before items are given, they // probably want to switch to an even better weapon after items are given if (player.autoswitch) if (player.switchweapon == w_getbestweapon(player)) - _switchweapon = TRUE; + _switchweapon = true; if (!(player.weapons & WepSet_FromWeapon(player.switchweapon))) - _switchweapon = TRUE; + _switchweapon = true; pickedup |= Item_GiveAmmoTo(item, player, ammo_fuel, g_pickup_fuel_max, ITEM_MODE_FUEL); pickedup |= Item_GiveAmmoTo(item, player, ammo_shells, g_pickup_shells_max, ITEM_MODE_NONE); 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); @@ -620,33 +615,36 @@ float Item_GiveTo(entity item, entity player) if (it || (item.spawnshieldtime && item.pickup_anyway)) { - pickedup = TRUE; + pickedup = true; for(i = WEP_FIRST; i <= WEP_LAST; ++i) if(it & WepSet_FromWeapon(i)) + { + W_DropEvent(WR_PICKUP, player, i, item); W_GiveWeapon(player, i); + } } } if((it = (item.items - (item.items & player.items)) & IT_PICKUPMASK)) { - pickedup = TRUE; + pickedup = true; player.items |= it; - sprint (player, strcat("You got the ^2", item.netname, "\n")); + Send_Notification(NOTIF_ONE, player, MSG_INFO, INFO_ITEM_WEAPON_GOT, item.netname); } if (item.strength_finished) { - pickedup = TRUE; + pickedup = true; player.strength_finished = max(player.strength_finished, time) + item.strength_finished; } if (item.invincible_finished) { - pickedup = TRUE; + pickedup = true; player.invincible_finished = max(player.invincible_finished, time) + item.invincible_finished; } if (item.superweapons_finished) { - pickedup = TRUE; + pickedup = true; player.superweapons_finished = max(player.superweapons_finished, time) + item.superweapons_finished; } @@ -654,7 +652,7 @@ float Item_GiveTo(entity item, entity player) // always eat teamed entities if(item.team) - pickedup = TRUE; + pickedup = true; if (!pickedup) return 0; @@ -682,6 +680,8 @@ void Item_Touch (void) if (!IS_PLAYER(other)) return; + if (other.frozen) + return; if (other.deadflag) return; if (self.solid != SOLID_TRIGGER) @@ -756,8 +756,8 @@ void Item_Reset() if(self.classname != "droppedweapon") { - self.think = func_null; - self.nextthink = 0; + self.think = Item_Think; + self.nextthink = time; if(self.waypointsprite_attached) WaypointSprite_Kill(self.waypointsprite_attached); @@ -819,7 +819,7 @@ float weapon_pickupevalfunc(entity player, entity item) // If I can pick it up if(!item.spawnshieldtime) c = 0; - else if(player.ammo_cells || player.ammo_shells || player.ammo_nails || player.ammo_rockets) + else if(player.ammo_cells || player.ammo_shells || player.ammo_plasma || player.ammo_nails || player.ammo_rockets) { // Skilled bots will grab more c = bound(0, skill / 10, 1) * 0.5; @@ -862,7 +862,7 @@ float weapon_pickupevalfunc(entity player, entity item) float commodity_pickupevalfunc(entity player, entity item) { float c, i; - float need_shells = FALSE, need_nails = FALSE, need_rockets = FALSE, need_cells = FALSE, need_fuel = FALSE; + float need_shells = false, need_nails = false, need_rockets = false, need_cells = false, need_plasma = false, need_fuel = false; entity wi; c = 0; @@ -875,15 +875,17 @@ float commodity_pickupevalfunc(entity player, entity item) continue; if(wi.items & IT_SHELLS) - need_shells = TRUE; + need_shells = true; else if(wi.items & IT_NAILS) - need_nails = TRUE; + need_nails = true; else if(wi.items & IT_ROCKETS) - need_rockets = TRUE; + need_rockets = true; else if(wi.items & IT_CELLS) - need_cells = TRUE; + need_cells = true; + else if(wi.items & IT_PLASMA) + need_plasma = true; else if(wi.items & IT_FUEL) - need_cells = TRUE; + need_fuel = true; } // TODO: figure out if the player even has the weapon this ammo is for? @@ -905,6 +907,10 @@ float commodity_pickupevalfunc(entity player, entity item) 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) @@ -925,10 +931,9 @@ void Item_Damage(entity inflictor, entity attacker, float damage, float deathtyp 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; + startitem_failed = false; if(self.model == "") self.model = itemmodel; @@ -958,7 +963,7 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, if(MUTATOR_CALLHOOK(FilterItem)) // error means we do not want the item { - startitem_failed = TRUE; + startitem_failed = true; remove(self); return; } @@ -998,7 +1003,7 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, traceline(self.origin, self.origin, MOVE_NORMAL, self); if (trace_dpstartcontents & DPCONTENTS_NODROP) { - startitem_failed = TRUE; + startitem_failed = true; remove(self); return; } @@ -1007,14 +1012,11 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, { if(!have_pickup_item()) { - startitem_failed = TRUE; + startitem_failed = true; remove (self); return; } - if(self.angles != '0 0 0') - self.SendFlags |= ISF_ANGLES; - self.reset = Item_Reset; // it's a level item if(self.spawnflags & 1) @@ -1033,7 +1035,8 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, 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 + + // note droptofloor returns false if stuck/or would fall too far droptofloor(); waypoint_spawnforitem(self); } @@ -1046,7 +1049,7 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, { // target_give not yet supported; maybe later print("removed targeted ", self.classname, "\n"); - startitem_failed = TRUE; + startitem_failed = true; remove (self); return; } @@ -1065,7 +1068,7 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, error("Mapper sucks."); } } - self.is_item = TRUE; + self.is_item = true; } weaponsInMap |= WepSet_FromWeapon(weaponid); @@ -1085,7 +1088,7 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, self.target = "###item###"; // for finding the nearest item using find() } - self.bot_pickup = TRUE; + self.bot_pickup = true; self.bot_pickupevalfunc = pickupevalfunc; self.bot_pickupbasevalue = pickupbasevalue; self.mdl = self.model; @@ -1135,193 +1138,20 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, else Item_Reset(); - Net_LinkEntity(self, FALSE, 0, ItemSend); + 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)) { - startitem_failed = TRUE; + startitem_failed = true; remove(self); 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; @@ -1336,9 +1166,9 @@ void spawnfunc_item_bullets (void) { if(autocvar_sv_q3acompat_machineshotgunswap) if(self.classname != "droppedweapon") { - weaponswapping = TRUE; + weaponswapping = true; spawnfunc_item_shells(); - weaponswapping = FALSE; + weaponswapping = false; return; } @@ -1357,14 +1187,23 @@ void spawnfunc_item_cells (void) { 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) if(self.classname != "droppedweapon") { - weaponswapping = TRUE; + weaponswapping = true; spawnfunc_item_bullets(); - weaponswapping = FALSE; + weaponswapping = false; return; } @@ -1478,7 +1317,6 @@ void spawnfunc_item_invincible (void) { // 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") @@ -1507,6 +1345,7 @@ void spawnfunc_target_items (void) { float n, i, j; entity e; + string s; self.use = target_items_use; if(!self.strength_finished) @@ -1545,11 +1384,12 @@ void spawnfunc_target_items (void) for(j = WEP_FIRST; j <= WEP_LAST; ++j) { e = get_weaponinfo(j); - if(argv(i) == e.netname) + s = W_UndeprecateName(argv(i)); + if(s == e.netname) { self.weapons |= WepSet_FromWeapon(j); if(self.spawnflags == 0 || self.spawnflags == 2) - weapon_action(e.weapon, WR_PRECACHE); + WEP_ACTION(e.weapon, WR_INIT); break; } } @@ -1582,10 +1422,7 @@ void spawnfunc_target_items (void) else { error("invalid spawnflags"); -#ifdef GMQCC - itemprefix = string_null; - valueprefix = string_null; -#endif + itemprefix = valueprefix = string_null; } self.netname = ""; @@ -1600,6 +1437,7 @@ void spawnfunc_target_items (void) 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"); @@ -1621,7 +1459,7 @@ void spawnfunc_target_items (void) e = get_weaponinfo(j); if(argv(i) == e.netname) { - weapon_action(e.weapon, WR_PRECACHE); + WEP_ACTION(e.weapon, WR_INIT); break; } } @@ -1649,8 +1487,6 @@ void spawnfunc_item_fuel_regen(void) void spawnfunc_item_jetpack(void) { - if(g_grappling_hook) - return; // sorry, but these two can't coexist (same button); spawn fuel instead if(!self.ammo_fuel) self.ammo_fuel = g_pickup_fuel_jetpack; if(start_items & IT_JETPACK) @@ -1661,13 +1497,6 @@ void spawnfunc_item_jetpack(void) 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; @@ -1777,14 +1606,6 @@ void GiveRot(entity e, float v0, float v1, .float rotfield, float rottime, .floa 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; @@ -1797,10 +1618,10 @@ float GiveItems(entity e, float beginarg, float endarg) got = 0; - _switchweapon = FALSE; + _switchweapon = false; if (e.autoswitch) if (e.switchweapon == w_getbestweapon(e)) - _switchweapon = TRUE; + _switchweapon = true; e.strength_finished = max(0, e.strength_finished - time); e.invincible_finished = max(0, e.invincible_finished - time); @@ -1813,6 +1634,7 @@ float GiveItems(entity e, float beginarg, float endarg) 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); @@ -1866,6 +1688,7 @@ float GiveItems(entity e, float beginarg, float endarg) } 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); @@ -1898,6 +1721,9 @@ float GiveItems(entity e, float beginarg, float endarg) 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; @@ -1947,13 +1773,14 @@ float GiveItems(entity e, float beginarg, float endarg) POSTGIVE_WEAPON(e, j, "weapons/weaponpickup.wav", string_null); if (!(save_weapons & WepSet_FromWeapon(j))) if(e.weapons & WepSet_FromWeapon(j)) - weapon_action(wi.weapon, WR_PRECACHE); + WEP_ACTION(wi.weapon, WR_INIT); } } 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); @@ -1978,7 +1805,7 @@ float GiveItems(entity e, float beginarg, float endarg) e.superweapons_finished += time; if (!(e.weapons & WepSet_FromWeapon(e.switchweapon))) - _switchweapon = TRUE; + _switchweapon = true; if(_switchweapon) W_SwitchWeapon_Force(e, w_getbestweapon(e));