From 6f2527f922592f6d53462c0ccac1e433c47cf36b Mon Sep 17 00:00:00 2001 From: kadaverjack Date: Sun, 19 Feb 2006 19:34:11 +0000 Subject: [PATCH] - removed lms_nexdm14 from mapcycle (to many camping spots :() - fixed bots joining invalid teams in domination - blowing an enemies rocket/nade in his face counts as frag - crylink projectiles are now orange git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1100 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/default.cfg | 6 +++--- data/maps/lms_nexdm14.mapcfg | 4 ---- data/maps/lms_nexdm14.txt | 15 --------------- data/qcsrc/server/gamec/teamplay.c | 9 +++++++++ data/qcsrc/server/gamec/w_crylink.c | 3 +++ data/qcsrc/server/gamec/w_grenadelauncher.c | 3 +++ data/qcsrc/server/gamec/w_rocketlauncher.c | 3 +++ 7 files changed, 21 insertions(+), 22 deletions(-) delete mode 100644 data/maps/lms_nexdm14.mapcfg delete mode 100644 data/maps/lms_nexdm14.txt diff --git a/data/default.cfg b/data/default.cfg index 6fa9ee195..751b41096 100644 --- a/data/default.cfg +++ b/data/default.cfg @@ -142,7 +142,7 @@ set g_forced_respawn 0 set g_fullbrightplayers 0 set g_fullbrightitems 0 set g_casings 0 -set g_maplist_defaultlist "dm_nexdm01 dm_nexdm02 dm_nexdm03 dm_nexdm04 dm_nexdm05 dm_nexdm06 dm_nexdm07 dm_nexdm08 dm_nexdm09 dm_nexdm10 dm_nexdm11 dm_nexdm12 dm_nexdm13 dm_nexdm14 dm_nexdm15 dm_nexdm16 dm_nexdm17 dm_nexdm18 dm_nexdm18_1on1remix dm_nexdmextra1 dm_nexdmextra2 dom_nexdm01 dom_nexdm02 dom_nexdm03 dom_nexdm04 dom_nexdm05 dom_nexdm06 dom_nexdm07 dom_nexdm08 dom_nexdm09 dom_nexdm10 dom_nexdm11 dom_nexdm12 dom_nexdm13 dom_nexdm14 dom_nexdm15 dom_nexdm16 dom_nexdm17 dom_nexdm18 dom_nexdm18_1on1remix dom_nexdmextra1 dom_nexdmextra2 rune_nexdm01 rune_nexdm02 rune_nexdm03 rune_nexdm04 rune_nexdm05 rune_nexdm06 rune_nexdm07 rune_nexdm08 rune_nexdm09 rune_nexdm10 rune_nexdm11 rune_nexdm12 rune_nexdm13 rune_nexdm14 rune_nexdm15 rune_nexdm16 rune_nexdm17 rune_nexdm18 rune_nexdm18_1on1remix rune_nexdmextra1 rune_nexdmextra2 tdm_nexdm01 tdm_nexdm02 tdm_nexdm03 tdm_nexdm04 tdm_nexdm05 tdm_nexdm06 tdm_nexdm07 tdm_nexdm08 tdm_nexdm09 tdm_nexdm10 tdm_nexdm11 tdm_nexdm12 tdm_nexdm13 tdm_nexdm14 tdm_nexdm15 tdm_nexdm16 tdm_nexdm17 tdm_nexdm18 tdm_nexdm18_1on1remix tdm_nexdmextra1 tdm_nexdmextra2 ctf_nexctf01 ctf_nexctf02 ctf_nexdm13 lms_nexdm01 lms_nexdm02 lms_nexdm05 lms_nexdm06 lms_nexdm07 lms_nexdm10 lms_nexdm12 lms_nexdm13 lms_nexdm14 lms_nexdm18 lms_nexdm18_1on1remix" +set g_maplist_defaultlist "dm_nexdm01 dm_nexdm02 dm_nexdm03 dm_nexdm04 dm_nexdm05 dm_nexdm06 dm_nexdm07 dm_nexdm08 dm_nexdm09 dm_nexdm10 dm_nexdm11 dm_nexdm12 dm_nexdm13 dm_nexdm14 dm_nexdm15 dm_nexdm16 dm_nexdm17 dm_nexdm18 dm_nexdm18_1on1remix dm_nexdmextra1 dm_nexdmextra2 dom_nexdm01 dom_nexdm02 dom_nexdm03 dom_nexdm04 dom_nexdm05 dom_nexdm06 dom_nexdm07 dom_nexdm08 dom_nexdm09 dom_nexdm10 dom_nexdm11 dom_nexdm12 dom_nexdm13 dom_nexdm14 dom_nexdm15 dom_nexdm16 dom_nexdm17 dom_nexdm18 dom_nexdm18_1on1remix dom_nexdmextra1 dom_nexdmextra2 rune_nexdm01 rune_nexdm02 rune_nexdm03 rune_nexdm04 rune_nexdm05 rune_nexdm06 rune_nexdm07 rune_nexdm08 rune_nexdm09 rune_nexdm10 rune_nexdm11 rune_nexdm12 rune_nexdm13 rune_nexdm14 rune_nexdm15 rune_nexdm16 rune_nexdm17 rune_nexdm18 rune_nexdm18_1on1remix rune_nexdmextra1 rune_nexdmextra2 tdm_nexdm01 tdm_nexdm02 tdm_nexdm03 tdm_nexdm04 tdm_nexdm05 tdm_nexdm06 tdm_nexdm07 tdm_nexdm08 tdm_nexdm09 tdm_nexdm10 tdm_nexdm11 tdm_nexdm12 tdm_nexdm13 tdm_nexdm14 tdm_nexdm15 tdm_nexdm16 tdm_nexdm17 tdm_nexdm18 tdm_nexdm18_1on1remix tdm_nexdmextra1 tdm_nexdmextra2 ctf_nexctf01 ctf_nexctf02 ctf_nexdm13 lms_nexdm01 lms_nexdm02 lms_nexdm05 lms_nexdm06 lms_nexdm07 lms_nexdm10 lms_nexdm12 lms_nexdm13 lms_nexdm18 lms_nexdm18_1on1remix" seta g_maplist $g_maplist_defaultlist seta g_maplist_index 0 // this is used internally for saving position in maplist cycle // timeout for kill credit when your damage knocks someone into a death trap @@ -367,7 +367,7 @@ set g_balance_crylink_primary_shots 7 set g_balance_crylink_primary_lifetime 9 set g_balance_crylink_primary_refire 0.5 set g_balance_crylink_primary_animtime 0.15 -set g_balance_crylink_primary_ammo 1 +set g_balance_crylink_primary_ammo 3 set g_balance_crylink_secondary_damage 15 set g_balance_crylink_secondary_edgedamage 0 set g_balance_crylink_secondary_force 55 @@ -378,7 +378,7 @@ set g_balance_crylink_secondary_shots 7 set g_balance_crylink_secondary_lifetime 9 set g_balance_crylink_secondary_refire 0.5 set g_balance_crylink_secondary_animtime 0.15 -set g_balance_crylink_secondary_ammo 1 +set g_balance_crylink_secondary_ammo 3 set g_balance_nex_damage 150 set g_balance_nex_refire 1 diff --git a/data/maps/lms_nexdm14.mapcfg b/data/maps/lms_nexdm14.mapcfg deleted file mode 100644 index 071f4f796..000000000 --- a/data/maps/lms_nexdm14.mapcfg +++ /dev/null @@ -1,4 +0,0 @@ -set g_lms 1 -set fraglimit 10 -set timelimit 30 -changelevel nexdm14 diff --git a/data/maps/lms_nexdm14.txt b/data/maps/lms_nexdm14.txt deleted file mode 100644 index 4c87c646b..000000000 --- a/data/maps/lms_nexdm14.txt +++ /dev/null @@ -1,15 +0,0 @@ -Soylent Space (lms_nexdm14) -maps/nexdm14 - -Medium sized vertical Level - -Players: 2-6 - -Weapons: Mortar, Nexgun, -Rocket Launcher, Crylink, -Hagar, Machine Gun - -Gametype: Last Man Standing - -Author: -Paul Evers \ No newline at end of file diff --git a/data/qcsrc/server/gamec/teamplay.c b/data/qcsrc/server/gamec/teamplay.c index 4895279f8..99b48db88 100644 --- a/data/qcsrc/server/gamec/teamplay.c +++ b/data/qcsrc/server/gamec/teamplay.c @@ -618,6 +618,15 @@ float JoinBestTeam(entity pl, float only_return_best) // find out what teams are available CheckAllowedTeams(); + + if(cvar("g_domination")) + { + if(cvar("g_domination_default_teams") < 3) + c3 = 9999; + if(cvar("g_domination_default_teams") < 4) + c4 = 9999; + } + // if we don't care what team he ends up on, put him on whatever team he entered as. // if he's not on a valid team, then let other code put him on the smallest team if(!cvar("g_balance_teams") && !cvar("g_balance_teams_force")) diff --git a/data/qcsrc/server/gamec/w_crylink.c b/data/qcsrc/server/gamec/w_crylink.c index e752c4fb3..c8e8331a2 100644 --- a/data/qcsrc/server/gamec/w_crylink.c +++ b/data/qcsrc/server/gamec/w_crylink.c @@ -5,6 +5,7 @@ void() crylink_deselect_01; void() crylink_select_01; .float gravity; +const vector proj_color = '1 0.6 0'; float() crylink_check = { @@ -134,6 +135,7 @@ void W_Crylink_Attack (void) //proj.glow_size = 20; proj.effects = EF_NOSHADOW | EF_FULLBRIGHT | EF_LOWPRECISION; + proj.colormod = proj_color; counter = counter + 1; } } @@ -185,6 +187,7 @@ void W_Crylink_Attack2 (void) //proj.glow_size = 20; proj.effects = EF_NOSHADOW | EF_FULLBRIGHT | EF_LOWPRECISION; + proj.colormod = proj_color; counter = counter + 1; } } diff --git a/data/qcsrc/server/gamec/w_grenadelauncher.c b/data/qcsrc/server/gamec/w_grenadelauncher.c index c0e0a0b7c..ece135983 100644 --- a/data/qcsrc/server/gamec/w_grenadelauncher.c +++ b/data/qcsrc/server/gamec/w_grenadelauncher.c @@ -78,7 +78,10 @@ void W_Grenade_Damage (entity inflictor, entity attacker, float damage, float de { self.health = self.health - damage; if (self.health <= 0) + { + self.owner = attacker; self.think (); + } } void W_Grenade_Attack (void) diff --git a/data/qcsrc/server/gamec/w_rocketlauncher.c b/data/qcsrc/server/gamec/w_rocketlauncher.c index 55832a3af..a36716118 100644 --- a/data/qcsrc/server/gamec/w_rocketlauncher.c +++ b/data/qcsrc/server/gamec/w_rocketlauncher.c @@ -212,7 +212,10 @@ void W_Rocket_Damage (entity inflictor, entity attacker, float damage, float dea { self.health = self.health - damage; if (self.health <= 0) + { + self.owner = attacker; W_Rocket_Explode(); + } } void W_Rocket_Attack (void) -- 2.39.2