X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Ft_items.qc;h=ef2923b86932814247d70707de3466153b51145c;hp=1029f7865682df59cdde8d83500552bd0503a8b7;hb=8e5d3750fe6c2938222b1a6547b0d26b7a1ede60;hpb=d764d7a3da4b1bb52406aebae463a6a9fec759fa diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc index 1029f78656..ef2923b869 100644 --- a/qcsrc/common/t_items.qc +++ b/qcsrc/common/t_items.qc @@ -23,6 +23,7 @@ #include #include + #include #include "../lib/warpzone/util_server.qh" #elif defined(CSQC) @@ -174,8 +175,7 @@ NET_HANDLE(ENT_CLIENT_ITEM, bool isnew) if(sf & ISF_SIZE) { - float use_bigsize = ReadByte(); - setsize(this, '-16 -16 0', (use_bigsize) ? '16 16 48' : '16 16 32'); + setsize(this, '-16 -16 0', '16 16 48'); } if(sf & ISF_STATUS) // need to read/write status first so model can handle simple, fb etc. @@ -185,14 +185,16 @@ NET_HANDLE(ENT_CLIENT_ITEM, bool isnew) Item_SetAlpha(this); if(this.ItemStatus & ITS_ALLOWFB) - this.effects |= EF_FULLBRIGHT; + this.effects |= EF_FULLBRIGHT; + else + this.effects &= ~EF_FULLBRIGHT; if(this.ItemStatus & ITS_GLOW) { if(this.ItemStatus & ITS_AVAILABLE) this.effects |= (EF_ADDITIVE | EF_FULLBRIGHT); else - this.effects &= ~(EF_ADDITIVE | EF_FULLBRIGHT); + this.effects &= ~(EF_ADDITIVE | EF_FULLBRIGHT); } } @@ -205,8 +207,6 @@ NET_HANDLE(ENT_CLIENT_ITEM, bool isnew) this.solid = SOLID_TRIGGER; //this.flags |= FL_ITEM; - bool use_bigsize = ReadByte(); - this.fade_end = ReadShort(); this.fade_start = ReadShort(); if(!warpzone_warpzones_exist && this.fade_start && !autocvar_cl_items_nofade) @@ -257,7 +257,7 @@ NET_HANDLE(ENT_CLIENT_ITEM, bool isnew) precache_model(this.mdl); _setmodel(this, this.mdl); - setsize(this, '-16 -16 0', (use_bigsize) ? '16 16 48' : '16 16 32'); + setsize(this, '-16 -16 0', '16 16 48'); } if(sf & ISF_COLORMAP) @@ -326,19 +326,14 @@ bool ItemSend(entity this, entity to, int sf) WriteAngle(MSG_ENTITY, this.angles_z); } - if(sf & ISF_SIZE) - { - Pickup p = this.itemdef; - WriteByte(MSG_ENTITY, p.instanceOfPowerup || p.instanceOfHealth || p.instanceOfArmor); - } + // sets size on the client, unused on server + //if(sf & ISF_SIZE) if(sf & ISF_STATUS) WriteByte(MSG_ENTITY, this.ItemStatus); if(sf & ISF_MODEL) { - Pickup p = this.itemdef; - WriteByte(MSG_ENTITY, p.instanceOfPowerup || p.instanceOfHealth || p.instanceOfArmor); WriteShort(MSG_ENTITY, this.fade_end); WriteShort(MSG_ENTITY, this.fade_start); @@ -451,9 +446,10 @@ void Item_Show(entity e, int mode) if (autocvar_g_nodepthtestitems) e.effects |= EF_NODEPTHTEST; - if (autocvar_g_fullbrightitems) e.ItemStatus |= ITS_ALLOWFB; + else + e.ItemStatus &= ~ITS_ALLOWFB; if (autocvar_sv_simple_items) e.ItemStatus |= ITS_ALLOWSI; @@ -512,7 +508,7 @@ void Item_RespawnCountdown(entity this) { do { { - entity wi = Weapons_from(this.weapon); + entity wi = REGISTRY_GET(Weapons, this.weapon); if (wi != WEP_Null) { entity wp = WaypointSprite_Spawn(WP_Weapon, 0, 0, this, '0 0 64', NULL, 0, this, waypointsprite_attached, true, RADARICON_Weapon); wp.wp_extra = wi.m_id; @@ -544,7 +540,7 @@ void Item_RespawnCountdown(entity this) if(this.waypointsprite_attached.waypointsprite_visible_for_player(this.waypointsprite_attached, it, it)) { msg_entity = it; - soundto(MSG_ONE, this, CH_TRIGGER, SND(ITEMRESPAWNCOUNTDOWN), VOL_BASE, ATTEN_NORM); // play respawn sound + soundto(MSG_ONE, this, CH_TRIGGER, SND(ITEMRESPAWNCOUNTDOWN), VOL_BASE, ATTEN_NORM, 0); // play respawn sound } }); @@ -743,7 +739,11 @@ bool Item_GiveAmmoTo(entity item, entity player, int res_type, float ammomax) return false; } else if (g_weapon_stay == 2) + { ammomax = min(amount, ammomax); + if(player_amount >= ammomax) + return false; + } else return false; if (amount < 0) @@ -829,17 +829,17 @@ bool Item_GiveTo(entity item, entity player) if (item.strength_finished) { pickedup = true; - player.strength_finished = max(player.strength_finished, time) + item.strength_finished; + STAT(STRENGTH_FINISHED, player) = max(STAT(STRENGTH_FINISHED, player), time) + item.strength_finished; } if (item.invincible_finished) { pickedup = true; - player.invincible_finished = max(player.invincible_finished, time) + item.invincible_finished; + STAT(INVINCIBLE_FINISHED, player) = max(STAT(INVINCIBLE_FINISHED, player), time) + item.invincible_finished; } if (item.superweapons_finished) { pickedup = true; - player.superweapons_finished = max(player.superweapons_finished, time) + item.superweapons_finished; + STAT(SUPERWEAPONS_FINISHED, player) = max(STAT(SUPERWEAPONS_FINISHED, player), time) + item.superweapons_finished; } // always eat teamed entities @@ -856,7 +856,7 @@ bool Item_GiveTo(entity item, entity player) { .entity weaponentity = weaponentities[slot]; if(player.(weaponentity).m_weapon != WEP_Null || slot == 0) - W_SwitchWeapon_Force(player, Weapons_from(item.weapon), weaponentity); + W_SwitchWeapon_Force(player, REGISTRY_GET(Weapons, item.weapon), weaponentity); } return true; } @@ -1203,7 +1203,7 @@ void _StartItem(entity this, entity def, float defaultrespawntime, float default } if(weaponid) - STAT(WEAPONS, this) = WepSet_FromWeapon(Weapons_from(weaponid)); + STAT(WEAPONS, this) = WepSet_FromWeapon(REGISTRY_GET(Weapons, weaponid)); this.flags = FL_ITEM | itemflags; IL_PUSH(g_items, this); @@ -1307,7 +1307,7 @@ void _StartItem(entity this, entity def, float defaultrespawntime, float default this.is_item = true; } - weaponsInMap |= WepSet_FromWeapon(Weapons_from(weaponid)); + weaponsInMap |= WepSet_FromWeapon(REGISTRY_GET(Weapons, weaponid)); if ( def.instanceOfPowerup || def.instanceOfWeaponPickup @@ -1482,10 +1482,11 @@ spawnfunc(target_items) if(!this.superweapons_finished) this.superweapons_finished = autocvar_g_balance_superweapons_time; + string str; int n = tokenize_console(this.netname); if(argv(0) == "give") { - this.netname = substring(this.netname, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)); + str = substring(this.netname, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)); } else { @@ -1553,27 +1554,29 @@ spawnfunc(target_items) itemprefix = valueprefix = string_null; } - this.netname = ""; - this.netname = sprintf("%s %s%d %s", this.netname, itemprefix, boolean(this.items & IT_UNLIMITED_AMMO), "unlimited_weapon_ammo"); - this.netname = sprintf("%s %s%d %s", this.netname, itemprefix, boolean(this.items & IT_UNLIMITED_SUPERWEAPONS), "unlimited_superweapons"); - this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, this.strength_finished * boolean(this.items & ITEM_Strength.m_itemid), "strength"); - this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, this.invincible_finished * boolean(this.items & ITEM_Shield.m_itemid), "invincible"); - this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, this.superweapons_finished * boolean(this.items & IT_SUPERWEAPON), "superweapons"); - this.netname = sprintf("%s %s%d %s", this.netname, itemprefix, boolean(this.items & ITEM_Jetpack.m_itemid), "jetpack"); - this.netname = sprintf("%s %s%d %s", this.netname, itemprefix, boolean(this.items & ITEM_JetpackRegen.m_itemid), "fuel_regen"); - if(GetResource(this, RES_SHELLS) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResource(this, RES_SHELLS)), "shells"); - if(GetResource(this, RES_BULLETS) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResource(this, RES_BULLETS)), "nails"); - if(GetResource(this, RES_ROCKETS) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResource(this, RES_ROCKETS)), "rockets"); - if(GetResource(this, RES_CELLS) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResource(this, RES_CELLS)), "cells"); - if(GetResource(this, RES_PLASMA) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResource(this, RES_PLASMA)), "plasma"); - if(GetResource(this, RES_FUEL) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResource(this, RES_FUEL)), "fuel"); - if(GetResource(this, RES_HEALTH) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResource(this, RES_HEALTH)), "health"); - if(GetResource(this, RES_ARMOR) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResource(this, RES_ARMOR)), "armor"); - FOREACH(Buffs, it != BUFF_Null && (STAT(BUFFS, this) & it.m_itemid), this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, STAT(BUFF_TIME, this)), it.netname)); - FOREACH(Weapons, it != WEP_Null, this.netname = sprintf("%s %s%d %s", this.netname, itemprefix, !!(STAT(WEAPONS, this) & (it.m_wepset)), it.netname)); - } - this.netname = strzone(this.netname); - //print(this.netname, "\n"); + str = ""; + str = sprintf("%s %s%d %s", str, itemprefix, boolean(this.items & IT_UNLIMITED_AMMO), "unlimited_weapon_ammo"); + str = sprintf("%s %s%d %s", str, itemprefix, boolean(this.items & IT_UNLIMITED_SUPERWEAPONS), "unlimited_superweapons"); + str = sprintf("%s %s%d %s", str, valueprefix, this.strength_finished * boolean(this.items & ITEM_Strength.m_itemid), "strength"); + str = sprintf("%s %s%d %s", str, valueprefix, this.invincible_finished * boolean(this.items & ITEM_Shield.m_itemid), "invincible"); + str = sprintf("%s %s%d %s", str, valueprefix, this.superweapons_finished * boolean(this.items & IT_SUPERWEAPON), "superweapons"); + str = sprintf("%s %s%d %s", str, itemprefix, boolean(this.items & ITEM_Jetpack.m_itemid), "jetpack"); + str = sprintf("%s %s%d %s", str, itemprefix, boolean(this.items & ITEM_JetpackRegen.m_itemid), "fuel_regen"); + float res; + res = GetResource(this, RES_SHELLS); if(res != 0) str = sprintf("%s %s%d %s", str, valueprefix, max(0, res), "shells"); + res = GetResource(this, RES_BULLETS); if(res != 0) str = sprintf("%s %s%d %s", str, valueprefix, max(0, res), "nails"); + res = GetResource(this, RES_ROCKETS); if(res != 0) str = sprintf("%s %s%d %s", str, valueprefix, max(0, res), "rockets"); + res = GetResource(this, RES_CELLS); if(res != 0) str = sprintf("%s %s%d %s", str, valueprefix, max(0, res), "cells"); + res = GetResource(this, RES_PLASMA); if(res != 0) str = sprintf("%s %s%d %s", str, valueprefix, max(0, res), "plasma"); + res = GetResource(this, RES_FUEL); if(res != 0) str = sprintf("%s %s%d %s", str, valueprefix, max(0, res), "fuel"); + res = GetResource(this, RES_HEALTH); if(res != 0) str = sprintf("%s %s%d %s", str, valueprefix, max(0, res), "health"); + res = GetResource(this, RES_ARMOR); if(res != 0) str = sprintf("%s %s%d %s", str, valueprefix, max(0, res), "armor"); + // HACK: buffs share a single timer, so we need to include enabled buffs AFTER disabled ones to avoid loss + FOREACH(Buffs, it != BUFF_Null && !(STAT(BUFFS, this) & it.m_itemid), str = sprintf("%s %s%d %s", str, valueprefix, max(0, STAT(BUFF_TIME, this)), it.netname)); + FOREACH(Buffs, it != BUFF_Null && (STAT(BUFFS, this) & it.m_itemid), str = sprintf("%s %s%d %s", str, valueprefix, max(0, STAT(BUFF_TIME, this)), it.netname)); + FOREACH(Weapons, it != WEP_Null, str = sprintf("%s %s%d %s", str, itemprefix, !!(STAT(WEAPONS, this) & (it.m_wepset)), it.netname)); + } + this.netname = strzone(str); n = tokenize_console(this.netname); for(int j = 0; j < n; ++j) @@ -1588,7 +1591,7 @@ spawnfunc(target_items) float GiveWeapon(entity e, float wpn, float op, float val) { WepSet v0, v1; - WepSet s = WepSet_FromWeapon(Weapons_from(wpn)); + WepSet s = WepSet_FromWeapon(REGISTRY_GET(Weapons, wpn)); v0 = (STAT(WEAPONS, e) & s); switch(op) { @@ -1619,28 +1622,36 @@ float GiveWeapon(entity e, float wpn, float op, float val) bool GiveBuff(entity e, Buff thebuff, int op, int val) { bool had_buff = (STAT(BUFFS, e) & thebuff.m_itemid); + float new_buff_time = ((had_buff) ? STAT(BUFF_TIME, e) : 0); switch (op) { case OP_SET: - STAT(BUFF_TIME, e) = val; + new_buff_time = val; break; case OP_MIN: - STAT(BUFF_TIME, e) = max(STAT(BUFF_TIME, e), val); + new_buff_time = max(new_buff_time, val); break; case OP_MAX: - STAT(BUFF_TIME, e) = min(STAT(BUFF_TIME, e), val); + new_buff_time = min(new_buff_time, val); break; case OP_PLUS: - STAT(BUFF_TIME, e) += val; + new_buff_time += val; break; case OP_MINUS: - STAT(BUFF_TIME, e) -= val; + new_buff_time -= val; break; } - if(STAT(BUFF_TIME, e) <= 0) + if(new_buff_time <= 0) + { + if(had_buff) + STAT(BUFF_TIME, e) = new_buff_time; STAT(BUFFS, e) &= ~thebuff.m_itemid; + } else + { + STAT(BUFF_TIME, e) = new_buff_time; STAT(BUFFS, e) = thebuff.m_itemid; // NOTE: replaces any existing buffs on the player! + } bool have_buff = (STAT(BUFFS, e) & thebuff.m_itemid); return (had_buff != have_buff); } @@ -1671,17 +1682,19 @@ void GiveRot(entity e, float v0, float v1, .float rotfield, float rottime, .floa bool GiveResourceValue(entity e, int res_type, int op, int val) { int v0 = GetResource(e, res_type); + float new_val = 0; switch (op) { // min 100 cells = at least 100 cells - case OP_SET: SetResource(e, res_type, val); break; - case OP_MIN: SetResource(e, res_type, max(v0, val)); break; - case OP_MAX: SetResource(e, res_type, min(v0, val)); break; - case OP_PLUS: SetResource(e, res_type, v0 + val); break; - case OP_MINUS: SetResource(e, res_type, v0 - val); break; - } - int v1 = GetResource(e, res_type); - return v0 != v1; + case OP_SET: new_val = val; break; + case OP_MIN: new_val = max(v0, val); break; + case OP_MAX: new_val = min(v0, val); break; + case OP_PLUS: new_val = v0 + val; break; + case OP_MINUS: new_val = v0 - val; break; + default: return false; + } + + return SetResourceExplicit(e, res_type, new_val); } float GiveItems(entity e, float beginarg, float endarg) @@ -1707,16 +1720,16 @@ float GiveItems(entity e, float beginarg, float endarg) } } - e.strength_finished = max(0, e.strength_finished - time); - e.invincible_finished = max(0, e.invincible_finished - time); - e.superweapons_finished = max(0, e.superweapons_finished - time); + STAT(STRENGTH_FINISHED, e) = max(0, STAT(STRENGTH_FINISHED, e) - time); + STAT(INVINCIBLE_FINISHED, e) = max(0, STAT(INVINCIBLE_FINISHED, e) - time); + STAT(SUPERWEAPONS_FINISHED, e) = max(0, STAT(SUPERWEAPONS_FINISHED, e) - time); STAT(BUFF_TIME, e) = max(0, STAT(BUFF_TIME, e) - time); PREGIVE(e, items); PREGIVE_WEAPONS(e); - PREGIVE(e, strength_finished); - PREGIVE(e, invincible_finished); - PREGIVE(e, superweapons_finished); + PREGIVE(e, stat_STRENGTH_FINISHED); + PREGIVE(e, stat_INVINCIBLE_FINISHED); + PREGIVE(e, stat_SUPERWEAPONS_FINISHED); PREGIVE_RESOURCE(e, RES_BULLETS); PREGIVE_RESOURCE(e, RES_CELLS); PREGIVE_RESOURCE(e, RES_PLASMA); @@ -1755,9 +1768,9 @@ float GiveItems(entity e, float beginarg, float endarg) continue; case "ALL": got += GiveBit(e, items, ITEM_JetpackRegen.m_itemid, op, val); - got += GiveValue(e, strength_finished, op, val); - got += GiveValue(e, invincible_finished, op, val); - got += GiveValue(e, superweapons_finished, op, val); + got += GiveValue(e, stat_STRENGTH_FINISHED, op, val); + got += GiveValue(e, stat_INVINCIBLE_FINISHED, op, val); + got += GiveValue(e, stat_SUPERWEAPONS_FINISHED, op, val); got += GiveBit(e, items, IT_UNLIMITED_AMMO | IT_UNLIMITED_SUPERWEAPONS, op, val); case "all": got += GiveBit(e, items, ITEM_Jetpack.m_itemid, op, val); @@ -1792,13 +1805,13 @@ float GiveItems(entity e, float beginarg, float endarg) got += GiveBit(e, items, ITEM_JetpackRegen.m_itemid, op, val); break; case "strength": - got += GiveValue(e, strength_finished, op, val); + got += GiveValue(e, stat_STRENGTH_FINISHED, op, val); break; case "invincible": - got += GiveValue(e, invincible_finished, op, val); + got += GiveValue(e, stat_INVINCIBLE_FINISHED, op, val); break; case "superweapons": - got += GiveValue(e, superweapons_finished, op, val); + got += GiveValue(e, stat_SUPERWEAPONS_FINISHED, op, val); break; case "cells": got += GiveResourceValue(e, RES_CELLS, op, val); @@ -1826,7 +1839,7 @@ float GiveItems(entity e, float beginarg, float endarg) got += GiveResourceValue(e, RES_FUEL, op, val); break; default: - FOREACH(Buffs, it != BUFF_Null && Buff_UndeprecateName(cmd) == it.netname, + FOREACH(Buffs, it != BUFF_Null && buff_Available(it) && Buff_UndeprecateName(cmd) == it.netname, { got += GiveBuff(e, it, op, val); break; @@ -1851,9 +1864,9 @@ float GiveItems(entity e, float beginarg, float endarg) if(STAT(WEAPONS, e) & (it.m_wepset)) it.wr_init(it); }); - POSTGIVE_VALUE(e, strength_finished, 1, SND_POWERUP, SND_POWEROFF); - POSTGIVE_VALUE(e, invincible_finished, 1, SND_Shield, SND_POWEROFF); - //POSTGIVE_VALUE(e, superweapons_finished, 1, SND_Null, SND_Null); + POSTGIVE_VALUE(e, stat_STRENGTH_FINISHED, 1, SND_POWERUP, SND_POWEROFF); + POSTGIVE_VALUE(e, stat_INVINCIBLE_FINISHED, 1, SND_Shield, SND_POWEROFF); + //POSTGIVE_VALUE(e, stat_SUPERWEAPONS_FINISHED, 1, SND_Null, SND_Null); POSTGIVE_RESOURCE(e, RES_BULLETS, 0, SND_ITEMPICKUP, SND_Null); POSTGIVE_RESOURCE(e, RES_CELLS, 0, SND_ITEMPICKUP, SND_Null); POSTGIVE_RESOURCE(e, RES_PLASMA, 0, SND_ITEMPICKUP, SND_Null); @@ -1863,22 +1876,22 @@ float GiveItems(entity e, float beginarg, float endarg) POSTGIVE_RES_ROT(e, RES_ARMOR, 1, pauserotarmor_finished, autocvar_g_balance_pause_armor_rot, pauseregen_finished, autocvar_g_balance_pause_health_regen, SND_ARMOR25, SND_Null); POSTGIVE_RES_ROT(e, RES_HEALTH, 1, pauserothealth_finished, autocvar_g_balance_pause_health_rot, pauseregen_finished, autocvar_g_balance_pause_health_regen, SND_MEGAHEALTH, SND_Null); - if(e.superweapons_finished <= 0) + if(STAT(SUPERWEAPONS_FINISHED, e) <= 0) if(!g_weaponarena && (STAT(WEAPONS, e) & WEPSET_SUPERWEAPONS)) - e.superweapons_finished = autocvar_g_balance_superweapons_time; + STAT(SUPERWEAPONS_FINISHED, e) = autocvar_g_balance_superweapons_time; - if(e.strength_finished <= 0) - e.strength_finished = 0; + if(STAT(STRENGTH_FINISHED, e) <= 0) + STAT(STRENGTH_FINISHED, e) = 0; else - e.strength_finished += time; - if(e.invincible_finished <= 0) - e.invincible_finished = 0; + STAT(STRENGTH_FINISHED, e) += time; + if(STAT(INVINCIBLE_FINISHED, e) <= 0) + STAT(INVINCIBLE_FINISHED, e) = 0; else - e.invincible_finished += time; - if(e.superweapons_finished <= 0) - e.superweapons_finished = 0; + STAT(INVINCIBLE_FINISHED, e) += time; + if(STAT(SUPERWEAPONS_FINISHED, e) <= 0) + STAT(SUPERWEAPONS_FINISHED, e) = 0; else - e.superweapons_finished += time; + STAT(SUPERWEAPONS_FINISHED, e) += time; if(STAT(BUFF_TIME, e) <= 0) STAT(BUFF_TIME, e) = 0; else