r5916 - in trunk/data: . models/items qcsrc/server scripts sound/misc

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-02-20 13:26:22 -0500 (Fri, 20 Feb 2009)
New Revision: 5916

Added:
   trunk/data/models/items/g_a50.md3
   trunk/data/sound/misc/armor17_5.wav
Modified:
   trunk/data/qcsrc/server/miscfunctions.qc
   trunk/data/qcsrc/server/t_items.qc
   trunk/data/qcsrc/server/t_quake3.qc
   trunk/data/scripts/entities.def
   trunk/data/weapons.cfg
Log:
a 50 armor


Added: trunk/data/models/items/g_a50.md3
===================================================================
(Binary files differ)


Property changes on: trunk/data/models/items/g_a50.md3
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-02-20 18:23:53 UTC (rev 5915)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-02-20 18:26:22 UTC (rev 5916)
@@ -705,6 +705,8 @@
 float g_pickup_armorsmall_max;
 float g_pickup_armormedium;
 float g_pickup_armormedium_max;
+float g_pickup_armorbig;
+float g_pickup_armorbig_max;
 float g_pickup_armorlarge;
 float g_pickup_armorlarge_max;
 float g_pickup_healthsmall;
@@ -1058,6 +1060,8 @@
 	g_pickup_armorsmall_max            = cvar("g_pickup_armorsmall_max");
 	g_pickup_armormedium               = cvar("g_pickup_armormedium");
 	g_pickup_armormedium_max           = cvar("g_pickup_armormedium_max");
+	g_pickup_armorbig                  = cvar("g_pickup_armorbig");
+	g_pickup_armorbig_max              = cvar("g_pickup_armorbig_max");
 	g_pickup_armorlarge                = cvar("g_pickup_armorlarge");
 	g_pickup_armorlarge_max            = cvar("g_pickup_armorlarge_max");
 	g_pickup_healthsmall               = cvar("g_pickup_healthsmall");

Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2009-02-20 18:23:53 UTC (rev 5915)
+++ trunk/data/qcsrc/server/t_items.qc	2009-02-20 18:26:22 UTC (rev 5916)
@@ -856,6 +856,14 @@
 	StartItem ("models/items/g_armormedium.md3", "misc/armor10.wav", g_pickup_respawntime_medium, "25 Armor", IT_ARMOR, 0, 0, commodity_pickupevalfunc, 20000);
 }
 
+void spawnfunc_item_armor_big (void) {
+	if(!self.armorvalue)
+		self.armorvalue = g_pickup_armorbig;
+	if(!self.max_armorvalue)
+		self.max_armorvalue = g_pickup_armorbig_max;
+	StartItem ("models/items/g_a50.md3", "misc/armor17_5.wav", g_pickup_respawntime_large, "50 Armor", IT_ARMOR, 0, 0, commodity_pickupevalfunc, 20000);
+}
+
 void spawnfunc_item_armor_large (void) {
 	if(!self.armorvalue)
 		self.armorvalue = g_pickup_armorlarge;

Modified: trunk/data/qcsrc/server/t_quake3.qc
===================================================================
--- trunk/data/qcsrc/server/t_quake3.qc	2009-02-20 18:23:53 UTC (rev 5915)
+++ trunk/data/qcsrc/server/t_quake3.qc	2009-02-20 18:26:22 UTC (rev 5916)
@@ -35,7 +35,7 @@
                           
 // Armor                  
 void spawnfunc_item_armor_body()     { spawnfunc_item_armor_large();   }
-void spawnfunc_item_armor_combat()   { spawnfunc_item_armor_medium();  }
+void spawnfunc_item_armor_combat()   { spawnfunc_item_armor_big();  }
 void spawnfunc_item_armor_shard()    { spawnfunc_item_armor_small();   }
 void spawnfunc_item_enviro()         { spawnfunc_item_armor_medium();  }
 //void spawnfunc_item_flight()       /* not supported */

Modified: trunk/data/scripts/entities.def
===================================================================
--- trunk/data/scripts/entities.def	2009-02-20 18:23:53 UTC (rev 5915)
+++ trunk/data/scripts/entities.def	2009-02-20 18:26:22 UTC (rev 5916)
@@ -321,6 +321,20 @@
 model="models/items/g_a25.md3"
 */
 
+/*QUAKED item_armor_big (.4 .8 .4) (-30 -30 0) (30 30 32) FLOATING
+Big Armor (default 50 armor points)
+-------- KEYS --------
+respawntime: time till it respawns (default: 20)
+armorvalue: amount of armor it gives (default: 50 (g_pickup_armorlarge))
+max_armorvalue: max of armor it increases to (default: 999 (g_pickup_armorlarge_max))
+team: out of items with the same value here, only one (random one) will spawn. Useful to put multiple items on one spot.
+cnt: weight of this item for random selection using "team". Set to a lower value for items you want to see less likely.
+-------- SPAWNFLAGS --------
+FLOATING: the item will float in air, instead of aligning to the floor by falling
+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/items/g_a50.md3"
+*/
+
 /*QUAKED item_armor_medium (.4 .8 .4) (-30 -30 0) (30 30 32) FLOATING
 Medium Armor (default 25 armor points)
 -------- KEYS --------

Added: trunk/data/sound/misc/armor17_5.wav
===================================================================
(Binary files differ)


Property changes on: trunk/data/sound/misc/armor17_5.wav
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/weapons.cfg
===================================================================
--- trunk/data/weapons.cfg	2009-02-20 18:23:53 UTC (rev 5915)
+++ trunk/data/weapons.cfg	2009-02-20 18:26:22 UTC (rev 5916)
@@ -36,6 +36,8 @@
 set g_pickup_armorsmall_max 999
 set g_pickup_armormedium 25
 set g_pickup_armormedium_max 999
+set g_pickup_armorbig 50
+set g_pickup_armorbig_max 999
 set g_pickup_armorlarge 100
 set g_pickup_armorlarge_max 999
 set g_pickup_healthsmall 5