r3101 - branches/nexuiz-2.0/Docs branches/nexuiz-2.0/data branches/nexuiz-2.0/data/qcsrc/server trunk/Docs trunk/data trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Jan 4 16:45:44 EST 2008
Author: kadaverjack
Date: 2008-01-04 16:45:44 -0500 (Fri, 04 Jan 2008)
New Revision: 3101
Modified:
branches/nexuiz-2.0/Docs/eventlog.txt
branches/nexuiz-2.0/data/default.cfg
branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
branches/nexuiz-2.0/data/qcsrc/server/defs.qh
branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
trunk/Docs/eventlog.txt
trunk/data/default.cfg
trunk/data/qcsrc/server/cl_client.qc
trunk/data/qcsrc/server/defs.qh
trunk/data/qcsrc/server/miscfunctions.qc
Log:
changed g_minstagib_invis_alpha <= 0 to use EF_NODRAW & added restart event to eventlog.txt
Modified: branches/nexuiz-2.0/Docs/eventlog.txt
===================================================================
--- branches/nexuiz-2.0/Docs/eventlog.txt 2008-01-04 21:20:45 UTC (rev 3100)
+++ branches/nexuiz-2.0/Docs/eventlog.txt 2008-01-04 21:45:44 UTC (rev 3101)
@@ -39,6 +39,7 @@
:dom:taken:<previouscolor>:<ID of player>
:scores:<gametype>_<mapname>:<map runtime>
:player:<frags>:<deaths>:<playtime>:<team>:<ID>:<nickname>
+ :restart
:end
:gameover
Modified: branches/nexuiz-2.0/data/default.cfg
===================================================================
--- branches/nexuiz-2.0/data/default.cfg 2008-01-04 21:20:45 UTC (rev 3100)
+++ branches/nexuiz-2.0/data/default.cfg 2008-01-04 21:45:44 UTC (rev 3101)
@@ -207,7 +207,7 @@
set g_minstagib_extralives 2 // how many extra lives you will get per powerup
set g_minstagib_ammo_start 10 // starting ammo
set g_minstagib_ammo_drop 5 // how much ammo you'll get for weapons or cells
-set g_minstagib_invis_alpha 0.1 // set -1 for complete invisibility
+set g_minstagib_invis_alpha 0.05
set g_minstagib_speed_jumpheight 1.8
set g_minstagib_speed_moverate 1.25
set g_rocketarena 0
Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2008-01-04 21:20:45 UTC (rev 3100)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2008-01-04 21:45:44 UTC (rev 3101)
@@ -441,7 +441,10 @@
self.solid = SOLID_SLIDEBOX;
self.flags = FL_CLIENT;
self.takedamage = DAMAGE_AIM;
- self.effects = 0;
+ if(g_minstagib)
+ self.effects = EF_FULLBRIGHT;
+ else
+ self.effects = 0;
self.air_finished = time + 12;
self.dmg = 2;
@@ -938,13 +941,20 @@
{
if (g_minstagib)
{
- self.effects = EF_FULLBRIGHT;
if (self.items & IT_STRENGTH)
{
if (time > self.strength_finished)
{
- self.alpha = default_player_alpha;
- self.exteriorweaponentity.alpha = default_weapon_alpha;
+ if (g_minstagib_invis_alpha > 0)
+ {
+ self.alpha = default_player_alpha;
+ self.exteriorweaponentity.alpha = default_weapon_alpha;
+ self.effects = self.effects | EF_FULLBRIGHT;
+ }
+ else
+ {
+ self.effects -= self.effects & EF_NODRAW;
+ }
self.items = self.items - (self.items & IT_STRENGTH);
sprint(self, "^3Invisibility has worn off\n");
}
@@ -953,8 +963,16 @@
{
if (time < self.strength_finished)
{
- self.alpha = cvar("g_minstagib_invis_alpha");
- self.exteriorweaponentity.alpha = cvar("g_minstagib_invis_alpha");
+ if (g_minstagib_invis_alpha > 0)
+ {
+ self.alpha = g_minstagib_invis_alpha;
+ self.exteriorweaponentity.alpha = g_minstagib_invis_alpha;
+ self.effects -= self.effects & EF_FULLBRIGHT;
+ }
+ else
+ {
+ self.effects = self.effects | EF_NODRAW;
+ }
self.items = self.items | IT_STRENGTH;
sprint(self, "^3You are invisible\n");
}
@@ -1297,8 +1315,10 @@
return; // the think tics
}
+ if(self.teleport_time)
if(time > self.teleport_time)
{
+ self.teleport_time = 0;
self.effects = self.effects - (self.effects & EF_NODRAW);
if(self.weaponentity)
self.weaponentity.flags = self.weaponentity.flags - (self.weaponentity.flags & EF_NODRAW);
Modified: branches/nexuiz-2.0/data/qcsrc/server/defs.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/defs.qh 2008-01-04 21:20:45 UTC (rev 3100)
+++ branches/nexuiz-2.0/data/qcsrc/server/defs.qh 2008-01-04 21:45:44 UTC (rev 3101)
@@ -1,7 +1,7 @@
// Globals
float g_domination, g_ctf, g_tdm, g_keyhunt, g_onslaught, g_assault, g_arena, g_lms, g_runematch;
-float g_cloaked, g_footsteps, g_grappling_hook, g_instagib, g_laserguided_missile, g_midair, g_minstagib, g_nixnex, g_nixnex_with_laser, g_norecoil, g_rocketarena, g_vampire;
+float g_cloaked, g_footsteps, g_grappling_hook, g_instagib, g_laserguided_missile, g_midair, g_minstagib, g_nixnex, g_nixnex_with_laser, g_norecoil, g_rocketarena, g_vampire, g_minstagib_invis_alpha;
float sv_cheats;
Modified: branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc 2008-01-04 21:20:45 UTC (rev 3100)
+++ branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc 2008-01-04 21:45:44 UTC (rev 3101)
@@ -757,6 +757,7 @@
start_switchweapon = WEP_NEX;
weapon_action(start_switchweapon, WR_PRECACHE);
start_ammo_cells = cvar("g_minstagib_ammo_start");
+ g_minstagib_invis_alpha = cvar("g_minstagib_invis_alpha");
}
else
{
Modified: trunk/Docs/eventlog.txt
===================================================================
--- trunk/Docs/eventlog.txt 2008-01-04 21:20:45 UTC (rev 3100)
+++ trunk/Docs/eventlog.txt 2008-01-04 21:45:44 UTC (rev 3101)
@@ -39,6 +39,7 @@
:dom:taken:<previouscolor>:<ID of player>
:scores:<gametype>_<mapname>:<map runtime>
:player:<frags>:<deaths>:<playtime>:<team>:<ID>:<nickname>
+ :restart
:end
:gameover
Modified: trunk/data/default.cfg
===================================================================
--- trunk/data/default.cfg 2008-01-04 21:20:45 UTC (rev 3100)
+++ trunk/data/default.cfg 2008-01-04 21:45:44 UTC (rev 3101)
@@ -207,7 +207,7 @@
set g_minstagib_extralives 2 // how many extra lives you will get per powerup
set g_minstagib_ammo_start 10 // starting ammo
set g_minstagib_ammo_drop 5 // how much ammo you'll get for weapons or cells
-set g_minstagib_invis_alpha 0.1 // set -1 for complete invisibility
+set g_minstagib_invis_alpha 0.05
set g_minstagib_speed_jumpheight 1.8
set g_minstagib_speed_moverate 1.25
set g_rocketarena 0
Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc 2008-01-04 21:20:45 UTC (rev 3100)
+++ trunk/data/qcsrc/server/cl_client.qc 2008-01-04 21:45:44 UTC (rev 3101)
@@ -443,7 +443,10 @@
self.solid = SOLID_SLIDEBOX;
self.flags = FL_CLIENT;
self.takedamage = DAMAGE_AIM;
- self.effects = 0;
+ if(g_minstagib)
+ self.effects = EF_FULLBRIGHT;
+ else
+ self.effects = 0;
self.air_finished = time + 12;
self.dmg = 2;
@@ -939,13 +942,20 @@
{
if (g_minstagib)
{
- self.effects = EF_FULLBRIGHT;
if (self.items & IT_STRENGTH)
{
if (time > self.strength_finished)
{
- self.alpha = default_player_alpha;
- self.exteriorweaponentity.alpha = default_weapon_alpha;
+ if (g_minstagib_invis_alpha > 0)
+ {
+ self.alpha = default_player_alpha;
+ self.exteriorweaponentity.alpha = default_weapon_alpha;
+ self.effects = self.effects | EF_FULLBRIGHT;
+ }
+ else
+ {
+ self.effects -= self.effects & EF_NODRAW;
+ }
self.items = self.items - (self.items & IT_STRENGTH);
sprint(self, "^3Invisibility has worn off\n");
}
@@ -954,8 +964,16 @@
{
if (time < self.strength_finished)
{
- self.alpha = cvar("g_minstagib_invis_alpha");
- self.exteriorweaponentity.alpha = cvar("g_minstagib_invis_alpha");
+ if (g_minstagib_invis_alpha > 0)
+ {
+ self.alpha = g_minstagib_invis_alpha;
+ self.exteriorweaponentity.alpha = g_minstagib_invis_alpha;
+ self.effects -= self.effects & EF_FULLBRIGHT;
+ }
+ else
+ {
+ self.effects = self.effects | EF_NODRAW;
+ }
self.items = self.items | IT_STRENGTH;
sprint(self, "^3You are invisible\n");
}
@@ -1300,8 +1318,10 @@
return; // the think tics
}
+ if(self.teleport_time)
if(time > self.teleport_time)
{
+ self.teleport_time = 0;
self.effects = self.effects - (self.effects & EF_NODRAW);
if(self.weaponentity)
self.weaponentity.flags = self.weaponentity.flags - (self.weaponentity.flags & EF_NODRAW);
Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh 2008-01-04 21:20:45 UTC (rev 3100)
+++ trunk/data/qcsrc/server/defs.qh 2008-01-04 21:45:44 UTC (rev 3101)
@@ -1,7 +1,7 @@
// Globals
float g_domination, g_ctf, g_tdm, g_keyhunt, g_onslaught, g_assault, g_arena, g_lms, g_runematch;
-float g_cloaked, g_footsteps, g_grappling_hook, g_instagib, g_laserguided_missile, g_midair, g_minstagib, g_nixnex, g_nixnex_with_laser, g_norecoil, g_rocketarena, g_vampire;
+float g_cloaked, g_footsteps, g_grappling_hook, g_instagib, g_laserguided_missile, g_midair, g_minstagib, g_nixnex, g_nixnex_with_laser, g_norecoil, g_rocketarena, g_vampire, g_minstagib_invis_alpha;
float sv_cheats;
Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc 2008-01-04 21:20:45 UTC (rev 3100)
+++ trunk/data/qcsrc/server/miscfunctions.qc 2008-01-04 21:45:44 UTC (rev 3101)
@@ -757,6 +757,7 @@
start_switchweapon = WEP_NEX;
weapon_action(start_switchweapon, WR_PRECACHE);
start_ammo_cells = cvar("g_minstagib_ammo_start");
+ g_minstagib_invis_alpha = cvar("g_minstagib_invis_alpha");
}
else
{
More information about the nexuiz-commits
mailing list