r4310 - in trunk/data: . qcsrc/common qcsrc/menu/nexuiz qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Wed Sep 3 09:59:30 EDT 2008


Author: div0
Date: 2008-09-03 09:59:30 -0400 (Wed, 03 Sep 2008)
New Revision: 4310

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/common/constants.qh
   trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c
   trunk/data/qcsrc/server/w_minstanex.qc
   trunk/data/weapons.cfg
Log:
forgot to commit this


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2008-09-03 13:58:17 UTC (rev 4309)
+++ trunk/data/defaultNexuiz.cfg	2008-09-03 13:59:30 UTC (rev 4310)
@@ -270,7 +270,6 @@
 set g_powerup_shield 1
 set g_use_ammunition 1
 set g_pickup_items 1
-set g_instagib 0
 set g_minstagib 0		// enable minstagib
 set g_minstagib_extralives 2	// how many extra lives you will get per powerup
 set g_minstagib_ammo_start 10	// starting ammo

Modified: trunk/data/qcsrc/common/constants.qh
===================================================================
--- trunk/data/qcsrc/common/constants.qh	2008-09-03 13:58:17 UTC (rev 4309)
+++ trunk/data/qcsrc/common/constants.qh	2008-09-03 13:59:30 UTC (rev 4310)
@@ -277,7 +277,7 @@
 
 // Weapon indexes
 // %weaponaddpoint
-float WEP_FIRST				= 1;
+float WEP_FIRST				=  1;
 float WEP_LASER				=  1; float WEPBIT_LASER			= 1; // always: 2^(w-1)
 float WEP_SHOTGUN			=  2; float WEPBIT_SHOTGUN			= 2;
 float WEP_UZI				=  3; float WEPBIT_UZI				= 4;
@@ -288,8 +288,9 @@
 float WEP_HAGAR				=  8; float WEPBIT_HAGAR			= 128;
 float WEP_ROCKET_LAUNCHER	=  9; float WEPBIT_ROCKET_LAUNCHER	= 256;
 float WEP_PORTO				= 10; float WEPBIT_PORTO			= 512;
-float WEP_LAST				= 10; float WEPBIT_ALL              = 1023;
-float WEP_COUNT             = 11;
+float WEP_MINSTANEX			= 11; float WEPBIT_MINSTANEX		= 1024;
+float WEP_LAST				= 11; float WEPBIT_ALL              = 2047;
+float WEP_COUNT             = 12;
 
 float	IT_SHELLS				= 256;
 float	IT_NAILS				= 512;

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c	2008-09-03 13:58:17 UTC (rev 4309)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c	2008-09-03 13:59:30 UTC (rev 4310)
@@ -22,8 +22,6 @@
 {
 	string s;
 	s = "";
-	if(cvar("g_instagib"))
-		s = strcat(s, ", InstaGib");
 	if(cvar("g_minstagib"))
 		s = strcat(s, ", MinstaGib");
 	if(cvar("g_nixnex"))
@@ -72,8 +70,6 @@
 	me.TR(me);
 		me.TD(me, 1, 2, e = makeNexuizRadioButton(1, string_null, string_null, "Regular"));
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeNexuizRadioButton(1, "g_instagib", string_null, "InstaGib"));
-	me.TR(me);
 		me.TD(me, 1, 2, e = makeNexuizRadioButton(1, "g_minstagib", string_null, "MinstaGib"));
 	me.TR(me);
 		me.TD(me, 1, 2, e = makeNexuizRadioButton(1, "g_nixnex", string_null, "NixNex"));

Modified: trunk/data/qcsrc/server/w_minstanex.qc
===================================================================
--- trunk/data/qcsrc/server/w_minstanex.qc	2008-09-03 13:58:17 UTC (rev 4309)
+++ trunk/data/qcsrc/server/w_minstanex.qc	2008-09-03 13:59:30 UTC (rev 4310)
@@ -123,7 +123,7 @@
 		{
 			if (weapon_prepareattack(0, cvar("g_balance_minstanex_refire")))
 			{
-				W_Nex_Attack();
+				W_MinstaNex_Attack();
 				weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_minstanex_animtime"), w_ready);
 			}
 		}

Modified: trunk/data/weapons.cfg
===================================================================
--- trunk/data/weapons.cfg	2008-09-03 13:58:17 UTC (rev 4309)
+++ trunk/data/weapons.cfg	2008-09-03 13:59:30 UTC (rev 4310)
@@ -166,10 +166,12 @@
 set g_balance_nex_force 600
 set g_balance_nex_refire 1.5
 set g_balance_nex_animtime 0.3
-set g_balance_minstagib_nex_refire 1.5
-set g_balance_minstagib_nex_animtime 0.3
 set g_balance_nex_ammo 5
 
+set g_balance_minstanex_refire 1.5
+set g_balance_minstanex_animtime 0.3
+set g_balance_minstanex_ammo 10
+
 set g_balance_hagar_primary_damage 40
 set g_balance_hagar_primary_edgedamage 15
 set g_balance_hagar_primary_force 100




More information about the nexuiz-commits mailing list