X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_items.qc;h=79c39ae95d7998899e99529451df30ff22b05fed;hb=1f1c714c231334ca941e029e7ab2094fff25b476;hp=dfe1a5cb0bdd203d9eed0e7ab7faf72309a27159;hpb=a022216a47ca24cd1bac2ff836d4056154be7015;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index dfe1a5cb0..79c39ae95 100644 --- a/qcsrc/server/t_items.qc +++ b/qcsrc/server/t_items.qc @@ -5,7 +5,7 @@ float have_pickup_item(void) if(self.classname != "minstagib") return FALSE; - if(self.items == IT_STRENGTH || self.items == IT_INVINCIBLE) + if(self.flags & FL_POWERUP) { if(autocvar_g_powerups > 0) return TRUE; @@ -233,6 +233,11 @@ void Item_RespawnCountdown (void) case IT_FUEL_REGEN: name = "item-fuelregen"; rgb = '1 0.5 0'; break; case IT_JETPACK: name = "item-jetpack"; rgb = '0.5 0.5 0.5'; break; } + if(!name) + { + print("Unknown powerup-marked item is wanting to respawn\n"); + localcmd(sprintf("prvm_edict server %d\n", num_for_edict(self))); + } if(name) { WaypointSprite_Spawn(name, 0, 0, self, '0 0 64', world, 0, self, waypointsprite_attached, TRUE, RADARICON_POWERUP, rgb); @@ -281,6 +286,53 @@ void Item_ScheduleInitialRespawn(entity e) Item_ScheduleRespawnIn(e, game_starttime - time + ITEM_RESPAWNTIME_INITIAL(e)); } +float ITEM_MODE_NONE = 0; +float ITEM_MODE_HEALTH = 1; +float ITEM_MODE_ARMOR = 2; +float ITEM_MODE_FUEL = 3; +float Item_GiveAmmoTo(entity item, entity player, .float ammofield, float ammomax, float mode) +{ + if (!item.ammofield) + return FALSE; + + if (item.spawnshieldtime) + { + if ((player.ammofield < ammomax) || item.pickup_anyway) + { + player.ammofield = bound(player.ammofield, ammomax, player.ammofield + item.ammofield); + goto YEAH; + } + } + else if(g_weapon_stay == 2) + { + float mi = min(item.ammofield, ammomax); + if (player.ammofield < mi) + { + player.ammofield = mi; + goto YEAH; + } + } + + return FALSE; + +:YEAH + switch(mode) + { + case ITEM_MODE_FUEL: + player.pauserotfuel_finished = max(player.pauserotfuel_finished, time + autocvar_g_balance_pause_fuel_rot); + break; + case ITEM_MODE_HEALTH: + player.pauserothealth_finished = max(player.pauserothealth_finished, time + autocvar_g_balance_pause_health_rot); + break; + case ITEM_MODE_ARMOR: + player.pauserotarmor_finished = max(player.pauserotarmor_finished, time + autocvar_g_balance_pause_armor_rot); + break; + default: + break; + } + return TRUE; +} + float Item_GiveTo(entity item, entity player) { float _switchweapon; @@ -297,23 +349,8 @@ float Item_GiveTo(entity item, entity player) { float prevcells = player.ammo_cells; - if(item.spawnshieldtime) - { - if (item.ammo_fuel) - if (player.ammo_fuel < g_pickup_fuel_max) - { - pickedup = TRUE; - player.ammo_fuel = bound(player.ammo_fuel, g_pickup_fuel_max, player.ammo_fuel + item.ammo_fuel); - player.pauserotfuel_finished = max(player.pauserotfuel_finished, time + autocvar_g_balance_pause_fuel_rot); - } - - if (item.ammo_cells) - if (player.ammo_cells < g_pickup_cells_max) - { - pickedup = TRUE; - player.ammo_cells = bound(player.ammo_cells, g_pickup_cells_max, player.ammo_cells + item.ammo_cells); - } - } + pickedup |= Item_GiveAmmoTo(item, player, ammo_fuel, g_pickup_fuel_max, ITEM_MODE_FUEL); + pickedup |= Item_GiveAmmoTo(item, player, ammo_cells, 999, ITEM_MODE_NONE); if(player.ammo_cells > prevcells) { @@ -385,43 +422,16 @@ float Item_GiveTo(entity item, entity player) if not(player.weapons & W_WeaponBit(player.switchweapon)) _switchweapon = TRUE; - if(item.spawnshieldtime) - { - if (item.ammo_shells) - if ((player.ammo_shells < g_pickup_shells_max) || item.pickup_anyway) - { - pickedup = TRUE; - player.ammo_shells = bound(player.ammo_shells, g_pickup_shells_max, player.ammo_shells + item.ammo_shells); - } - if (item.ammo_nails) - if ((player.ammo_nails < g_pickup_nails_max) || item.pickup_anyway) - { - pickedup = TRUE; - player.ammo_nails = bound(player.ammo_nails, g_pickup_nails_max, player.ammo_nails + item.ammo_nails); - } - if (item.ammo_rockets) - if ((player.ammo_rockets < g_pickup_rockets_max) || item.pickup_anyway) - { - pickedup = TRUE; - player.ammo_rockets = bound(player.ammo_rockets, g_pickup_rockets_max, player.ammo_rockets + item.ammo_rockets); - } - if (item.ammo_cells) - if ((player.ammo_cells < g_pickup_cells_max) || item.pickup_anyway) - { - pickedup = TRUE; - player.ammo_cells = bound(player.ammo_cells, g_pickup_cells_max, player.ammo_cells + item.ammo_cells); - } - if (item.ammo_fuel) - if ((player.ammo_fuel < g_pickup_fuel_max) || item.pickup_anyway) - { - pickedup = TRUE; - player.ammo_fuel = bound(player.ammo_fuel, g_pickup_fuel_max, player.ammo_fuel + item.ammo_fuel); - player.pauserotfuel_finished = max(player.pauserotfuel_finished, time + autocvar_g_balance_pause_fuel_rot); - } - } + 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, health, item.max_health, ITEM_MODE_HEALTH); + pickedup |= Item_GiveAmmoTo(item, player, armorvalue, item.max_armorvalue, ITEM_MODE_ARMOR); if (item.flags & FL_WEAPON) - if ((it = item.weapons - (item.weapons & player.weapons)) || (g_pickup_weapons_anyway)) + if ((it = item.weapons - (item.weapons & player.weapons)) || (item.spawnshieldtime && g_pickup_weapons_anyway)) { pickedup = TRUE; for(i = WEP_FIRST; i <= WEP_LAST; ++i) @@ -439,7 +449,7 @@ float Item_GiveTo(entity item, entity player) sprint (player, strcat("You got the ^2", item.netname, "\n")); } - if (item.strength_finished) + if (item.strength_finished) { pickedup = TRUE; player.strength_finished = max(player.strength_finished, time) + autocvar_g_balance_powerup_strength_time; @@ -449,21 +459,6 @@ float Item_GiveTo(entity item, entity player) pickedup = TRUE; player.invincible_finished = max(player.invincible_finished, time) + autocvar_g_balance_powerup_invincible_time; } - - if (item.health) - if ((player.health < item.max_health) || item.pickup_anyway) - { - pickedup = TRUE; - player.health = bound(player.health, item.max_health, player.health + item.health); - player.pauserothealth_finished = max(player.pauserothealth_finished, time + autocvar_g_balance_pause_health_rot); - } - if (item.armorvalue) - if ((player.armorvalue < item.max_armorvalue) || item.pickup_anyway) - { - pickedup = TRUE; - player.armorvalue = bound(player.armorvalue, item.max_armorvalue, player.armorvalue + item.armorvalue); - player.pauserotarmor_finished = max(player.pauserotarmor_finished, time + autocvar_g_balance_pause_armor_rot); - } } :skip @@ -705,6 +700,7 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, self.items = itemid; self.weapons = weaponid; + self.flags = FL_ITEM | itemflags; // is it a dropped weapon? if (self.classname == "droppedweapon") @@ -821,7 +817,6 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, self.respawntimejitter = defaultrespawntimejitter; } self.netname = itemname; - self.flags = FL_ITEM | itemflags; self.touch = Item_Touch; setmodel (self, self.mdl); // precision set below self.effects |= EF_LOWPRECISION;