Separate health and armor item respawning timers

diff --git a/balance-mario.cfg b/balance-mario.cfg
index 8b9f37ac10d7782c60f1248aef0e82feb4cd2c5f..21a4980ac561d8c264741ef32e2648e10655e41d 100644 (file)
--- a/balance-mario.cfg
+++ b/balance-mario.cfg
@@ -127,21 +127,31 @@ set g_pickup_healthbig_anyway 1
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 200
 set g_pickup_healthmega_anyway 1
-set g_pickup_respawntime_short 15
-set g_pickup_respawntime_medium 20
-set g_pickup_respawntime_long 30
 set g_pickup_respawntime_powerup 120
 set g_pickup_respawntime_weapon 10
 set g_pickup_respawntime_superweapon 120
 set g_pickup_respawntime_ammo 10
+set g_pickup_respawntime_armor_small 15
+set g_pickup_respawntime_armor_medium 20
+set g_pickup_respawntime_armor_big 30
+set g_pickup_respawntime_armor_mega 30
+set g_pickup_respawntime_health_small 15
+set g_pickup_respawntime_health_medium 15
+set g_pickup_respawntime_health_big 20
+set g_pickup_respawntime_health_mega 30
 set g_pickup_respawntime_initial_random 1
-set g_pickup_respawntimejitter_short 0
-set g_pickup_respawntimejitter_medium 0
-set g_pickup_respawntimejitter_long 0
 set g_pickup_respawntimejitter_powerup 0
 set g_pickup_respawntimejitter_weapon 0
 set g_pickup_respawntimejitter_superweapon 10
 set g_pickup_respawntimejitter_ammo 0
+set g_pickup_respawntimejitter_armor_small 0
+set g_pickup_respawntimejitter_armor_medium 0
+set g_pickup_respawntimejitter_armor_big 0
+set g_pickup_respawntimejitter_armor_mega 0
+set g_pickup_respawntimejitter_health_small 0
+set g_pickup_respawntimejitter_health_medium 0
+set g_pickup_respawntimejitter_health_big 0
+set g_pickup_respawntimejitter_health_mega 0
 // }}}
 
 // {{{ regen/rot

diff --git a/balance-nexuiz25.cfg b/balance-nexuiz25.cfg
index 0b39de222f3a3305f0836801995204cdcbfe45db..d2213d6faa4e9b2230ece0a503189c10e1af6d95 100644 (file)
--- a/balance-nexuiz25.cfg
+++ b/balance-nexuiz25.cfg
@@ -127,21 +127,31 @@ set g_pickup_healthbig_anyway 0
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 999
 set g_pickup_healthmega_anyway 0
-set g_pickup_respawntime_short 15
-set g_pickup_respawntime_medium 20
-set g_pickup_respawntime_long 30
 set g_pickup_respawntime_powerup 120
 set g_pickup_respawntime_weapon 15
 set g_pickup_respawntime_superweapon 120
 set g_pickup_respawntime_ammo 15
+set g_pickup_respawntime_armor_small 15
+set g_pickup_respawntime_armor_medium 20
+set g_pickup_respawntime_armor_big 30
+set g_pickup_respawntime_armor_mega 30
+set g_pickup_respawntime_health_small 15
+set g_pickup_respawntime_health_medium 15
+set g_pickup_respawntime_health_big 20
+set g_pickup_respawntime_health_mega 30
 set g_pickup_respawntime_initial_random 2
-set g_pickup_respawntimejitter_short 0
-set g_pickup_respawntimejitter_medium 0
-set g_pickup_respawntimejitter_long 0
 set g_pickup_respawntimejitter_powerup 10
 set g_pickup_respawntimejitter_weapon 0
 set g_pickup_respawntimejitter_superweapon 10
 set g_pickup_respawntimejitter_ammo 0
+set g_pickup_respawntimejitter_armor_small 0
+set g_pickup_respawntimejitter_armor_medium 0
+set g_pickup_respawntimejitter_armor_big 0
+set g_pickup_respawntimejitter_armor_mega 0
+set g_pickup_respawntimejitter_health_small 0
+set g_pickup_respawntimejitter_health_medium 0
+set g_pickup_respawntimejitter_health_big 0
+set g_pickup_respawntimejitter_health_mega 0
 // }}}
 
 // {{{ regen/rot

diff --git a/balance-overkill.cfg b/balance-overkill.cfg
index 3944d7d3b18ab87d6cc280e38df1c23360bf912f..3eb522751ce0c5aa143349e8cf9895251cebef6d 100644 (file)
--- a/balance-overkill.cfg
+++ b/balance-overkill.cfg
@@ -127,21 +127,31 @@ set g_pickup_healthbig_anyway 1
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 200
 set g_pickup_healthmega_anyway 0
-set g_pickup_respawntime_short 15
-set g_pickup_respawntime_medium 20
-set g_pickup_respawntime_long 30
 set g_pickup_respawntime_powerup 120
 set g_pickup_respawntime_weapon 10
 set g_pickup_respawntime_superweapon 120
 set g_pickup_respawntime_ammo 10
+set g_pickup_respawntime_armor_small 15
+set g_pickup_respawntime_armor_medium 20
+set g_pickup_respawntime_armor_big 30
+set g_pickup_respawntime_armor_mega 30
+set g_pickup_respawntime_health_small 15
+set g_pickup_respawntime_health_medium 15
+set g_pickup_respawntime_health_big 20
+set g_pickup_respawntime_health_mega 30
 set g_pickup_respawntime_initial_random 0
-set g_pickup_respawntimejitter_short 0
-set g_pickup_respawntimejitter_medium 0
-set g_pickup_respawntimejitter_long 0
 set g_pickup_respawntimejitter_powerup 0
 set g_pickup_respawntimejitter_weapon 0
 set g_pickup_respawntimejitter_superweapon 10
 set g_pickup_respawntimejitter_ammo 0
+set g_pickup_respawntimejitter_armor_small 0
+set g_pickup_respawntimejitter_armor_medium 0
+set g_pickup_respawntimejitter_armor_big 0
+set g_pickup_respawntimejitter_armor_mega 0
+set g_pickup_respawntimejitter_health_small 0
+set g_pickup_respawntimejitter_health_medium 0
+set g_pickup_respawntimejitter_health_big 0
+set g_pickup_respawntimejitter_health_mega 0
 // }}}
 
 // {{{ regen/rot

diff --git a/balance-samual.cfg b/balance-samual.cfg
index 5686c58d6e24fa2eb211af18644d7ecd536986b6..6219367880595dbe3b8651ae29082e44c457a3a7 100644 (file)
--- a/balance-samual.cfg
+++ b/balance-samual.cfg
@@ -127,21 +127,31 @@ set g_pickup_healthbig_anyway 1
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 200
 set g_pickup_healthmega_anyway 1
-set g_pickup_respawntime_short 15
-set g_pickup_respawntime_medium 20
-set g_pickup_respawntime_long 30
 set g_pickup_respawntime_powerup 120
 set g_pickup_respawntime_weapon 10
 set g_pickup_respawntime_superweapon 120
 set g_pickup_respawntime_ammo 10
+set g_pickup_respawntime_armor_small 15
+set g_pickup_respawntime_armor_medium 20
+set g_pickup_respawntime_armor_big 30
+set g_pickup_respawntime_armor_mega 30
+set g_pickup_respawntime_health_small 15
+set g_pickup_respawntime_health_medium 15
+set g_pickup_respawntime_health_big 20
+set g_pickup_respawntime_health_mega 30
 set g_pickup_respawntime_initial_random 2
-set g_pickup_respawntimejitter_short 0
-set g_pickup_respawntimejitter_medium 0
-set g_pickup_respawntimejitter_long 0
 set g_pickup_respawntimejitter_powerup 30
 set g_pickup_respawntimejitter_weapon 0
 set g_pickup_respawntimejitter_superweapon 10
 set g_pickup_respawntimejitter_ammo 0
+set g_pickup_respawntimejitter_armor_small 0
+set g_pickup_respawntimejitter_armor_medium 0
+set g_pickup_respawntimejitter_armor_big 0
+set g_pickup_respawntimejitter_armor_mega 0
+set g_pickup_respawntimejitter_health_small 0
+set g_pickup_respawntimejitter_health_medium 0
+set g_pickup_respawntimejitter_health_big 0
+set g_pickup_respawntimejitter_health_mega 0
 // }}}
 
 // {{{ regen/rot

diff --git a/balance-xdf.cfg b/balance-xdf.cfg
index d8d4df60d53e2a6c916d61a7785bb07df3efd8b8..0818ef574d9fca2fcd9f9f9f2c2483632f28e724 100644 (file)
--- a/balance-xdf.cfg
+++ b/balance-xdf.cfg
@@ -127,21 +127,31 @@ set g_pickup_healthbig_anyway 0
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 200
 set g_pickup_healthmega_anyway 0
-set g_pickup_respawntime_short 0.1
-set g_pickup_respawntime_medium 0.1
-set g_pickup_respawntime_long 0.1
 set g_pickup_respawntime_powerup 0.1
 set g_pickup_respawntime_weapon 0.1
 set g_pickup_respawntime_superweapon 0.1
 set g_pickup_respawntime_ammo 0.1
+set g_pickup_respawntime_armor_small 0.1
+set g_pickup_respawntime_armor_medium 0.1
+set g_pickup_respawntime_armor_big 0.1
+set g_pickup_respawntime_armor_mega 0.1
+set g_pickup_respawntime_health_small 0.1
+set g_pickup_respawntime_health_medium 0.1
+set g_pickup_respawntime_health_big 0.1
+set g_pickup_respawntime_health_mega 0.1
 set g_pickup_respawntime_initial_random 2
-set g_pickup_respawntimejitter_short 0
-set g_pickup_respawntimejitter_medium 0
-set g_pickup_respawntimejitter_long 0
 set g_pickup_respawntimejitter_powerup 0
 set g_pickup_respawntimejitter_weapon 0
 set g_pickup_respawntimejitter_superweapon 10
 set g_pickup_respawntimejitter_ammo 0
+set g_pickup_respawntimejitter_armor_small 0
+set g_pickup_respawntimejitter_armor_medium 0
+set g_pickup_respawntimejitter_armor_big 0
+set g_pickup_respawntimejitter_armor_mega 0
+set g_pickup_respawntimejitter_health_small 0
+set g_pickup_respawntimejitter_health_medium 0
+set g_pickup_respawntimejitter_health_big 0
+set g_pickup_respawntimejitter_health_mega 0
 // }}}
 
 // {{{ regen/rot

diff --git a/balance-xonotic.cfg b/balance-xonotic.cfg
index 2cf8c9eb4269b106877384494b4a6392c3200fc4..1027c6f49102dc728952a32fe206d40bbc10a707 100644 (file)
--- a/balance-xonotic.cfg
+++ b/balance-xonotic.cfg
@@ -127,21 +127,31 @@ set g_pickup_healthbig_anyway 1
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 200
 set g_pickup_healthmega_anyway 1
-set g_pickup_respawntime_short 15
-set g_pickup_respawntime_medium 20
-set g_pickup_respawntime_long 30
 set g_pickup_respawntime_powerup 120
 set g_pickup_respawntime_weapon 10
 set g_pickup_respawntime_superweapon 120
 set g_pickup_respawntime_ammo 10
+set g_pickup_respawntime_armor_small 15
+set g_pickup_respawntime_armor_medium 20
+set g_pickup_respawntime_armor_big 30
+set g_pickup_respawntime_armor_mega 30
+set g_pickup_respawntime_health_small 15
+set g_pickup_respawntime_health_medium 15
+set g_pickup_respawntime_health_big 20
+set g_pickup_respawntime_health_mega 30
 set g_pickup_respawntime_initial_random 1
-set g_pickup_respawntimejitter_short 0
-set g_pickup_respawntimejitter_medium 0
-set g_pickup_respawntimejitter_long 0
 set g_pickup_respawntimejitter_powerup 0
 set g_pickup_respawntimejitter_weapon 0
 set g_pickup_respawntimejitter_superweapon 10
 set g_pickup_respawntimejitter_ammo 0
+set g_pickup_respawntimejitter_armor_small 0
+set g_pickup_respawntimejitter_armor_medium 0
+set g_pickup_respawntimejitter_armor_big 0
+set g_pickup_respawntimejitter_armor_mega 0
+set g_pickup_respawntimejitter_health_small 0
+set g_pickup_respawntimejitter_health_medium 0
+set g_pickup_respawntimejitter_health_big 0
+set g_pickup_respawntimejitter_health_mega 0
 // }}}
 
 // {{{ regen/rot

diff --git a/balance-xpm.cfg b/balance-xpm.cfg
index 87b781a555216639bb618652be91097abfe09e62..ebfceb2c4d6d89d736f051176ad2274ea7986e0d 100644 (file)
--- a/balance-xpm.cfg
+++ b/balance-xpm.cfg
@@ -127,21 +127,31 @@ set g_pickup_healthbig_anyway 0
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 200
 set g_pickup_healthmega_anyway 0
-set g_pickup_respawntime_short 15
-set g_pickup_respawntime_medium 20
-set g_pickup_respawntime_long 30
 set g_pickup_respawntime_powerup 120
 set g_pickup_respawntime_weapon 10
 set g_pickup_respawntime_superweapon 120
 set g_pickup_respawntime_ammo 10
+set g_pickup_respawntime_armor_small 15
+set g_pickup_respawntime_armor_medium 20
+set g_pickup_respawntime_armor_big 30
+set g_pickup_respawntime_armor_mega 30
+set g_pickup_respawntime_health_small 15
+set g_pickup_respawntime_health_medium 15
+set g_pickup_respawntime_health_big 20
+set g_pickup_respawntime_health_mega 30
 set g_pickup_respawntime_initial_random 1
-set g_pickup_respawntimejitter_short 0
-set g_pickup_respawntimejitter_medium 0
-set g_pickup_respawntimejitter_long 0
 set g_pickup_respawntimejitter_powerup 0
 set g_pickup_respawntimejitter_weapon 0
 set g_pickup_respawntimejitter_superweapon 10
 set g_pickup_respawntimejitter_ammo 0
+set g_pickup_respawntimejitter_armor_small 0
+set g_pickup_respawntimejitter_armor_medium 0
+set g_pickup_respawntimejitter_armor_big 0
+set g_pickup_respawntimejitter_armor_mega 0
+set g_pickup_respawntimejitter_health_small 0
+set g_pickup_respawntimejitter_health_medium 0
+set g_pickup_respawntimejitter_health_big 0
+set g_pickup_respawntimejitter_health_mega 0
 // }}}
 
 // {{{ regen/rot

diff --git a/qcsrc/common/items/item/armor.qh b/qcsrc/common/items/item/armor.qh
index f8cabaa0595f08bacfde5fbf9b14c5ffae0654d4..341dfec7fa01ce6437df2155108b64193badfa7e 100644 (file)
--- a/qcsrc/common/items/item/armor.qh
+++ b/qcsrc/common/items/item/armor.qh
@@ -43,12 +43,12 @@ REGISTER_ITEM(ArmorSmall, Armor) {
     this.m_icon                 =   "armor_small";
 #ifdef CSQC
     if(precache_pic(strcat("gfx/hud/luma/", this.m_icon)) == "")
-       this.m_icon             =   "armor"; // compatible with Xonotic v0.8.2 or lower
+        this.m_icon             =   "armor"; // compatible with Xonotic v0.8.2 or lower
 #endif
 #ifdef SVQC
     this.m_itemid               =   IT_RESOURCE;
-    this.m_respawntime          =   GET(g_pickup_respawntime_short);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_short);
+    this.m_respawntime          =   GET(g_pickup_respawntime_armor_small);
+    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_armor_small);
     this.m_pickupanyway         =   GET(g_pickup_armorsmall_anyway);
     this.m_iteminit             =   item_armorsmall_init;
 #endif
@@ -85,12 +85,12 @@ REGISTER_ITEM(ArmorMedium, Armor) {
     this.m_icon                 =   "armor_medium";
 #ifdef CSQC
     if(precache_pic(strcat("gfx/hud/luma/", this.m_icon)) == "")
-       this.m_icon             =   "armor"; // compatible with Xonotic v0.8.2 or lower
+        this.m_icon             =   "armor"; // compatible with Xonotic v0.8.2 or lower
 #endif
 #ifdef SVQC
     this.m_itemid               =   IT_RESOURCE;
-    this.m_respawntime          =   GET(g_pickup_respawntime_medium);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_medium);
+    this.m_respawntime          =   GET(g_pickup_respawntime_armor_medium);
+    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_armor_medium);
     this.m_pickupanyway         =   GET(g_pickup_armormedium_anyway);
     this.m_iteminit             =   item_armormedium_init;
 #endif
@@ -127,14 +127,14 @@ REGISTER_ITEM(ArmorBig, Armor) {
     this.m_icon                 =   "armor_big";
 #ifdef CSQC
     if(precache_pic(strcat("gfx/hud/luma/", this.m_icon)) == "")
-       this.m_icon             =   "armor"; // compatible with Xonotic v0.8.2 or lower
+        this.m_icon             =   "armor"; // compatible with Xonotic v0.8.2 or lower
 #endif
     this.m_color                =   '0 1 0';
     this.m_waypoint             =   _("Big armor");
 #ifdef SVQC
     this.m_itemid               =   IT_RESOURCE;
-    this.m_respawntime          =   GET(g_pickup_respawntime_long);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_long);
+    this.m_respawntime          =   GET(g_pickup_respawntime_armor_big);
+    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_armor_big);
     this.m_pickupanyway         =   GET(g_pickup_armorbig_anyway);
     this.m_iteminit             =   item_armorbig_init;
 #endif
@@ -171,7 +171,7 @@ REGISTER_ITEM(ArmorMega, Armor) {
     this.m_icon                 =   "armor_mega";
 #ifdef CSQC
     if(precache_pic(strcat("gfx/hud/luma/", this.m_icon)) == "")
-       this.m_icon             =   "item_large_armor"; // compatible with Xonotic v0.8.2 or lower
+        this.m_icon             =   "item_large_armor"; // compatible with Xonotic v0.8.2 or lower
 #endif
     this.m_color                =   '0 1 0';
     this.m_waypoint             =   _("Mega armor");
@@ -179,8 +179,8 @@ REGISTER_ITEM(ArmorMega, Armor) {
 #ifdef SVQC
     this.m_maxs                 =   '16 16 70';
     this.m_itemid               =   IT_RESOURCE;
-    this.m_respawntime          =   GET(g_pickup_respawntime_long);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_long);
+    this.m_respawntime          =   GET(g_pickup_respawntime_armor_mega);
+    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_armor_mega);
     this.m_pickupanyway         =   GET(g_pickup_armormega_anyway);
     this.m_iteminit             =   item_armormega_init;
 #endif

diff --git a/qcsrc/common/items/item/health.qh b/qcsrc/common/items/item/health.qh
index ca94651aa328a5e7d314e66c2d0b7906332c1129..a2664cc516b5bf0c6d7aeee46ec67e01509e6499 100644 (file)
--- a/qcsrc/common/items/item/health.qh
+++ b/qcsrc/common/items/item/health.qh
@@ -34,7 +34,7 @@ void item_healthsmall_init(Pickup this, entity item)
 REGISTER_ITEM(HealthSmall, Health) {
     this.m_canonical_spawnfunc = "item_health_small";
 #ifdef GAMEQC
-       this.spawnflags = ITEM_FLAG_NORMAL | ITEM_FLAG_RESOURCE;
+    this.spawnflags = ITEM_FLAG_NORMAL | ITEM_FLAG_RESOURCE;
     this.m_model                =   MDL_HealthSmall_ITEM;
     this.m_sound                =   SND_HealthSmall;
 #endif
@@ -43,14 +43,15 @@ REGISTER_ITEM(HealthSmall, Health) {
     this.m_icon                 =   "health_small";
 #ifdef CSQC
     if(precache_pic(strcat("gfx/hud/luma/", this.m_icon)) == "")
-       this.m_icon             =   "health"; // compatible with Xonotic v0.8.2 or lower
+        this.m_icon             =   "health"; // compatible with Xonotic v0.8.2 or lower
 #endif
 #ifdef SVQC
     this.m_itemid               =   IT_RESOURCE;
-    this.m_respawntime          =   GET(g_pickup_respawntime_short);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_short);
+    this.m_respawntime          =   GET(g_pickup_respawntime_health_small);
+    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_health_small);
     this.m_pickupanyway         =   GET(g_pickup_healthsmall_anyway);
     this.m_iteminit             =   item_healthsmall_init;
+
 #endif
 }
 
@@ -76,7 +77,7 @@ void item_healthmedium_init(Pickup this, entity item)
 REGISTER_ITEM(HealthMedium, Health) {
     this.m_canonical_spawnfunc = "item_health_medium";
 #ifdef GAMEQC
-       this.spawnflags = ITEM_FLAG_NORMAL | ITEM_FLAG_RESOURCE;
+    this.spawnflags = ITEM_FLAG_NORMAL | ITEM_FLAG_RESOURCE;
     this.m_model                =   MDL_HealthMedium_ITEM;
     this.m_sound                =   SND_HealthMedium;
 #endif
@@ -85,12 +86,12 @@ REGISTER_ITEM(HealthMedium, Health) {
     this.m_icon                 =   "health_medium";
 #ifdef CSQC
     if(precache_pic(strcat("gfx/hud/luma/", this.m_icon)) == "")
-       this.m_icon             =   "health"; // compatible with Xonotic v0.8.2 or lower
+        this.m_icon             =   "health"; // compatible with Xonotic v0.8.2 or lower
 #endif
 #ifdef SVQC
     this.m_itemid               =   IT_RESOURCE;
-    this.m_respawntime          =   GET(g_pickup_respawntime_short);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_short);
+    this.m_respawntime          =   GET(g_pickup_respawntime_health_medium);
+    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_health_medium);
     this.m_pickupanyway         =   GET(g_pickup_healthmedium_anyway);
     this.m_iteminit             =   item_healthmedium_init;
 #endif
@@ -118,7 +119,7 @@ void item_healthbig_init(Pickup this, entity item)
 REGISTER_ITEM(HealthBig, Health) {
     this.m_canonical_spawnfunc = "item_health_big";
 #ifdef GAMEQC
-       this.spawnflags = ITEM_FLAG_NORMAL | ITEM_FLAG_RESOURCE;
+    this.spawnflags = ITEM_FLAG_NORMAL | ITEM_FLAG_RESOURCE;
     this.m_model                =   MDL_HealthBig_ITEM;
     this.m_sound                =   SND_HealthBig;
 #endif
@@ -129,12 +130,12 @@ REGISTER_ITEM(HealthBig, Health) {
     this.m_waypoint             =   _("Big health");
 #ifdef CSQC
     if(precache_pic(strcat("gfx/hud/luma/", this.m_icon)) == "")
-       this.m_icon             =   "health"; // compatible with Xonotic v0.8.2 or lower
+        this.m_icon             =   "health"; // compatible with Xonotic v0.8.2 or lower
 #endif
 #ifdef SVQC
     this.m_itemid               =   IT_RESOURCE;
-    this.m_respawntime          =   GET(g_pickup_respawntime_medium);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_medium);
+    this.m_respawntime          =   GET(g_pickup_respawntime_health_big);
+    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_health_big);
     this.m_pickupanyway         =   GET(g_pickup_healthbig_anyway);
     this.m_iteminit             =   item_healthbig_init;
 #endif
@@ -171,7 +172,7 @@ REGISTER_ITEM(HealthMega, Health) {
     this.m_icon                 =   "health_mega";
 #ifdef CSQC
     if(precache_pic(strcat("gfx/hud/luma/", this.m_icon)) == "")
-       this.m_icon             =   "item_mega_health"; // compatible with Xonotic v0.8.2 or lower
+        this.m_icon             =   "item_mega_health"; // compatible with Xonotic v0.8.2 or lower
 #endif
     this.m_color                =   '1 0 0';
     this.m_waypoint             =   _("Mega health");
@@ -179,8 +180,8 @@ REGISTER_ITEM(HealthMega, Health) {
 #ifdef SVQC
     this.m_maxs                 =   '16 16 70';
     this.m_itemid               =   IT_RESOURCE;
-    this.m_respawntime          =   GET(g_pickup_respawntime_long);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_long);
+    this.m_respawntime          =   GET(g_pickup_respawntime_health_mega);
+    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_health_mega);
     this.m_pickupanyway         =   GET(g_pickup_healthmega_anyway);
     this.m_iteminit             =   item_healthmega_init;
 #endif

diff --git a/qcsrc/common/items/item/pickup.qh b/qcsrc/common/items/item/pickup.qh
index d21923e258dc196ef15e80209e3fbfb230b9de63..6df6baf83a90682dd37c3eecd92e9c9c8ca673ee 100644 (file)
--- a/qcsrc/common/items/item/pickup.qh
+++ b/qcsrc/common/items/item/pickup.qh
@@ -4,16 +4,26 @@
 PROPERTY(float, g_pickup_respawntime_weapon)
 PROPERTY(float, g_pickup_respawntime_superweapon)
 PROPERTY(float, g_pickup_respawntime_ammo)
-PROPERTY(float, g_pickup_respawntime_short)
-PROPERTY(float, g_pickup_respawntime_medium)
-PROPERTY(float, g_pickup_respawntime_long)
+PROPERTY(float, g_pickup_respawntime_armor_small)
+PROPERTY(float, g_pickup_respawntime_armor_medium)
+PROPERTY(float, g_pickup_respawntime_armor_big)
+PROPERTY(float, g_pickup_respawntime_armor_mega)
+PROPERTY(float, g_pickup_respawntime_health_small)
+PROPERTY(float, g_pickup_respawntime_health_medium)
+PROPERTY(float, g_pickup_respawntime_health_big)
+PROPERTY(float, g_pickup_respawntime_health_mega)
 PROPERTY(float, g_pickup_respawntime_powerup)
 PROPERTY(float, g_pickup_respawntimejitter_weapon)
 PROPERTY(float, g_pickup_respawntimejitter_superweapon)
 PROPERTY(float, g_pickup_respawntimejitter_ammo)
-PROPERTY(float, g_pickup_respawntimejitter_short)
-PROPERTY(float, g_pickup_respawntimejitter_medium)
-PROPERTY(float, g_pickup_respawntimejitter_long)
+PROPERTY(float, g_pickup_respawntimejitter_health_small)
+PROPERTY(float, g_pickup_respawntimejitter_health_medium)
+PROPERTY(float, g_pickup_respawntimejitter_health_big)
+PROPERTY(float, g_pickup_respawntimejitter_health_mega)
+PROPERTY(float, g_pickup_respawntimejitter_armor_small)
+PROPERTY(float, g_pickup_respawntimejitter_armor_medium)
+PROPERTY(float, g_pickup_respawntimejitter_armor_big)
+PROPERTY(float, g_pickup_respawntimejitter_armor_mega)
 PROPERTY(float, g_pickup_respawntimejitter_powerup)
 #endif
 

diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc
index 977f235715a90a90064d4a8f332f3dbd36595af1..3487b68073ac571998f6879d957f5093e2a0ff30 100644 (file)
--- a/qcsrc/server/world.qc
+++ b/qcsrc/server/world.qc
@@ -2149,16 +2149,26 @@ void readlevelcvars()
        g_pickup_respawntime_weapon = cvar("g_pickup_respawntime_weapon");
        g_pickup_respawntime_superweapon = cvar("g_pickup_respawntime_superweapon");
        g_pickup_respawntime_ammo = cvar("g_pickup_respawntime_ammo");
-       g_pickup_respawntime_short = cvar("g_pickup_respawntime_short");
-       g_pickup_respawntime_medium = cvar("g_pickup_respawntime_medium");
-       g_pickup_respawntime_long = cvar("g_pickup_respawntime_long");
+       g_pickup_respawntime_armor_small = cvar("g_pickup_respawntime_armor_small");
+       g_pickup_respawntime_armor_medium = cvar("g_pickup_respawntime_armor_medium");
+       g_pickup_respawntime_armor_big = cvar("g_pickup_respawntime_armor_big");
+       g_pickup_respawntime_armor_mega = cvar("g_pickup_respawntime_armor_mega");
+       g_pickup_respawntime_health_small = cvar("g_pickup_respawntime_health_small");
+       g_pickup_respawntime_health_medium = cvar("g_pickup_respawntime_health_medium");
+       g_pickup_respawntime_health_big = cvar("g_pickup_respawntime_health_big");
+       g_pickup_respawntime_health_mega = cvar("g_pickup_respawntime_health_mega");
        g_pickup_respawntime_powerup = cvar("g_pickup_respawntime_powerup");
        g_pickup_respawntimejitter_weapon = cvar("g_pickup_respawntimejitter_weapon");
        g_pickup_respawntimejitter_superweapon = cvar("g_pickup_respawntimejitter_superweapon");
        g_pickup_respawntimejitter_ammo = cvar("g_pickup_respawntimejitter_ammo");
-       g_pickup_respawntimejitter_short = cvar("g_pickup_respawntimejitter_short");
-       g_pickup_respawntimejitter_medium = cvar("g_pickup_respawntimejitter_medium");
-       g_pickup_respawntimejitter_long = cvar("g_pickup_respawntimejitter_long");
+       g_pickup_respawntimejitter_armor_small = cvar("g_pickup_respawntimejitter_armor_small");
+       g_pickup_respawntimejitter_armor_medium = cvar("g_pickup_respawntimejitter_armor_medium");
+       g_pickup_respawntimejitter_armor_big = cvar("g_pickup_respawntimejitter_armor_big");
+       g_pickup_respawntimejitter_armor_mega = cvar("g_pickup_respawntimejitter_armor_mega");
+       g_pickup_respawntimejitter_health_small = cvar("g_pickup_respawntimejitter_health_small");
+       g_pickup_respawntimejitter_health_medium = cvar("g_pickup_respawntimejitter_health_medium");
+       g_pickup_respawntimejitter_health_big = cvar("g_pickup_respawntimejitter_health_big");
+       g_pickup_respawntimejitter_health_mega = cvar("g_pickup_respawntimejitter_health_mega");
        g_pickup_respawntimejitter_powerup = cvar("g_pickup_respawntimejitter_powerup");
 
        g_pickup_shells = cvar("g_pickup_shells");