r5222 - in trunk/data: . qcsrc/client qcsrc/server qcsrc/server/tturrets/units
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Dec 15 09:11:05 EST 2008
Author: div0
Date: 2008-12-15 09:11:05 -0500 (Mon, 15 Dec 2008)
New Revision: 5222
Modified:
trunk/data/defaultNexuiz.cfg
trunk/data/qcsrc/client/teamradar.qh
trunk/data/qcsrc/server/assault.qc
trunk/data/qcsrc/server/cl_client.qc
trunk/data/qcsrc/server/defs.qh
trunk/data/qcsrc/server/g_damage.qc
trunk/data/qcsrc/server/movelib.qc
trunk/data/qcsrc/server/tturrets/units/unit_walker.qc
trunk/data/qcsrc/server/vote.qc
trunk/data/qcsrc/server/w_hook.qc
Log:
friendly fire/team damage/mirror damage change; warnings cleanup
Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg 2008-12-15 13:56:35 UTC (rev 5221)
+++ trunk/data/defaultNexuiz.cfg 2008-12-15 14:11:05 UTC (rev 5222)
@@ -370,9 +370,11 @@
// 1 = no friendly fire, self damage
// 2 = friendly fire and self damage enabled
// 3 = no friendly fire, but self damage enabled
- // 4 = obey the following two cvars
-seta g_mirrordamage 0.2 // for teamplay 4: mirror damage factor
-seta g_friendlyfire 0.0 // for teamplay 4: fiendly fire factor
+ // 4 = obey the following four cvars
+seta g_mirrordamage 0.5 // for teamplay 4: mirror damage factor
+seta g_friendlyfire 0.2 // for teamplay 4: fiendly fire factor
+seta g_teamdamage_threshold 50 // for teamplay 4: threshold over which to apply mirror damage
+seta g_teamdamage_resetspeed 30 // for teamplay 4: how fast player's teamdamage count decreases
set deathmatch_force_teamplay 0 // always play TDM on dm maps
seta g_balance_teams 0 // automatically balance out players entering instead of asking them for their preferred team
Modified: trunk/data/qcsrc/client/teamradar.qh
===================================================================
--- trunk/data/qcsrc/client/teamradar.qh 2008-12-15 13:56:35 UTC (rev 5221)
+++ trunk/data/qcsrc/client/teamradar.qh 2008-12-15 14:11:05 UTC (rev 5222)
@@ -4,6 +4,6 @@
// to make entities have dots on the team radar
.float teamradar_icon;
-.float teamradar_times[MAX_TEAMRADAR_TIMES];
+.float teamradar_times[MAX_TEAMRADAR_TIMES]; FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(teamradar_times);
.float teamradar_time_index;
.vector teamradar_color;
Modified: trunk/data/qcsrc/server/assault.qc
===================================================================
--- trunk/data/qcsrc/server/assault.qc 2008-12-15 13:56:35 UTC (rev 5221)
+++ trunk/data/qcsrc/server/assault.qc 2008-12-15 14:11:05 UTC (rev 5222)
@@ -115,7 +115,6 @@
float assault_decreaser_sprite_visible(entity e)
{
entity decreaser;
- entity object;
decreaser = self.assault_decreaser;
@@ -272,7 +271,6 @@
// swap spawn point teams
local entity ent;
- local entity oldself;
ent = find(world, classname, "info_player_deathmatch");
while (ent)
{
Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc 2008-12-15 13:56:35 UTC (rev 5221)
+++ trunk/data/qcsrc/server/cl_client.qc 2008-12-15 14:11:05 UTC (rev 5222)
@@ -717,6 +717,7 @@
self.think = SUB_Null;
self.nextthink = 0;
self.hook_time = 0;
+ self.dmg_team = 0;
self.runes = 0;
@@ -2249,6 +2250,8 @@
ctf_setstatus();
kh_setstatus();
+ self.dmg_team = max(0, self.dmg_team - cvar("g_teamdamage_resetspeed") * frametime);
+
//self.angles_y=self.v_angle_y + 90; // temp
//if (TetrisPreFrame()) return;
Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh 2008-12-15 13:56:35 UTC (rev 5221)
+++ trunk/data/qcsrc/server/defs.qh 2008-12-15 14:11:05 UTC (rev 5222)
@@ -79,7 +79,6 @@
//.float style;
//.float skill;
.float sounds;
-.string music;
.string killtarget;
Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc 2008-12-15 13:56:35 UTC (rev 5221)
+++ trunk/data/qcsrc/server/g_damage.qc 2008-12-15 14:11:05 UTC (rev 5222)
@@ -6,6 +6,7 @@
float headshot;
float damage_headshotbonus; // bonus multiplier for head shots, set to 0 after use
+.float dmg_team;
.float teamkill_complain;
.float teamkill_soundtime;
.entity teamkill_soundsource;
@@ -499,6 +500,7 @@
{
float mirrordamage;
float mirrorforce;
+ float teamdamage0;
entity attacker_save;
mirrordamage = 0;
mirrorforce = 0;
@@ -575,7 +577,10 @@
{
if(targ.classname == "player" && targ.deadflag == DEAD_NO)
{
- mirrordamage = cvar("g_mirrordamage") * damage;
+ teamdamage0 = max(attacker.dmg_team, cvar("g_teamdamage_threshold"));
+ attacker.dmg_team = attacker.dmg_team + damage;
+ if(attacker.dmg_team > teamdamage0)
+ mirrordamage = cvar("g_mirrordamage") * (attacker.dmg_team - teamdamage0);
mirrorforce = cvar("g_mirrordamage") * vlen(force);
if(g_minstagib)
{
@@ -746,13 +751,14 @@
}
else
{
- attacker.typehitsound += 1; // TODO possibly trigger teamkill complain sound!
- if(time > attacker.teamkill_complain)
- {
- attacker.teamkill_complain = time + 5;
- attacker.teamkill_soundtime = time + 0.4;
- attacker.teamkill_soundsource = targ;
- }
+ attacker.typehitsound += 1;
+ if(mirrordamage > 0)
+ if(time > attacker.teamkill_complain)
+ {
+ attacker.teamkill_complain = time + 5;
+ attacker.teamkill_soundtime = time + 0.4;
+ attacker.teamkill_soundsource = targ;
+ }
}
}
}
Modified: trunk/data/qcsrc/server/movelib.qc
===================================================================
--- trunk/data/qcsrc/server/movelib.qc 2008-12-15 13:56:35 UTC (rev 5221)
+++ trunk/data/qcsrc/server/movelib.qc 2008-12-15 14:11:05 UTC (rev 5222)
@@ -1,5 +1,3 @@
-.float mass;
-
/**
Simulate drag
self.velocity = movelib_vdrag(self.velocity,0.02,0.5);
Modified: trunk/data/qcsrc/server/tturrets/units/unit_walker.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_walker.qc 2008-12-15 13:56:35 UTC (rev 5221)
+++ trunk/data/qcsrc/server/tturrets/units/unit_walker.qc 2008-12-15 14:11:05 UTC (rev 5222)
@@ -701,8 +701,6 @@
//.string target_start;
void turret_walker_dinit()
{
- entity e;
-
if (self.netname == "") self.netname = "Walker Turret";
/*
Modified: trunk/data/qcsrc/server/vote.qc
===================================================================
--- trunk/data/qcsrc/server/vote.qc 2008-12-15 13:56:35 UTC (rev 5221)
+++ trunk/data/qcsrc/server/vote.qc 2008-12-15 14:11:05 UTC (rev 5222)
@@ -18,7 +18,7 @@
{
float tokens;
float n, t;
- string ns, s;
+ string ns;
entity e;
string reason;
Modified: trunk/data/qcsrc/server/w_hook.qc
===================================================================
--- trunk/data/qcsrc/server/w_hook.qc 2008-12-15 13:56:35 UTC (rev 5221)
+++ trunk/data/qcsrc/server/w_hook.qc 2008-12-15 14:11:05 UTC (rev 5222)
@@ -8,7 +8,7 @@
void W_Hook_ExplodeThink (void)
{
- float dt, dmg_remaining, dmg_remaining_next, f;
+ float dt, dmg_remaining_next, f;
dt = time - self.teleport_time;
dmg_remaining_next = pow(bound(0, 1 - dt / self.dmg_duration, 1), self.dmg_power);
More information about the nexuiz-commits
mailing list