[nexuiz-commits] r7500 - in trunk/data: . maps qcsrc/menu/nexuiz qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sun Aug 23 13:21:59 EDT 2009
Author: fruitiex
Date: 2009-08-23 13:21:59 -0400 (Sun, 23 Aug 2009)
New Revision: 7500
Modified:
trunk/data/defaultNexuiz.cfg
trunk/data/maps/aneurysm.bsp
trunk/data/maps/aneurysm.map
trunk/data/maps/stormkeep.bsp
trunk/data/maps/stormkeep.map
trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_advanced.c
trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c
trunk/data/qcsrc/server/domination.qc
trunk/data/qcsrc/server/teamplay.qc
Log:
3in1 gameplay patch by Taoki, bot domination fix (now joins yellow/pink teams), dom map fixes by terencehill (use yellow team instead of pink on aneurysm and stormkeep)
Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg 2009-08-23 14:38:47 UTC (rev 7499)
+++ trunk/data/defaultNexuiz.cfg 2009-08-23 17:21:59 UTC (rev 7500)
@@ -26,7 +26,7 @@
seta g_configversion 0 "Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1 Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg"
// default.cfg versioning (update using update-cvarcount.sh, run that every time after adding a new cvar)
-set cvar_check_default 40fd98ae84e7814d9494ef3cef6fb162
+set cvar_check_default ff6f4ae047891b3b61ecfc5b3d3b38b4
// Nexuiz version (formatted for machines)
// used to determine if a client version is compatible
@@ -641,6 +641,7 @@
// domination
set g_domination 0 "Domination: capture and hold control points to gain points"
set g_domination_default_teams 2 "default number of teams for maps that aren't domination-specific"
+seta g_domination_teams_override 0 "use a specific number of teams in domination games (minimum 2), disables dom_team entities"
set g_domination_disable_frags 0 "players can't get frags normally, only get points from kills"
set g_domination_point_amt 0 "override: how many points to get per ping"
set g_domination_point_fullbright 0 "domination point fullbright"
@@ -1214,7 +1215,7 @@
set g_balance_keyhunt_throwvelocity 400
set g_balance_keyhunt_protecttime 0.8
set g_balance_keyhunt_damageforcescale 1
-set g_keyhunt_teams_override 0
+seta g_keyhunt_teams_override 0
set g_keyhunt_teams 0
// so it can be stuffcmd-ed still
@@ -1308,6 +1309,9 @@
seta sbar_scoreboard_alpha_bg 0.28 "scoreboard background alpha"
seta sbar_scoreboard_highlight 1 "enable highlighting for rows and columns in the scoreboard"
+// for votation window
+set menu_vote ""
+
// for menu server list (eventually make them have engine support?)
seta menu_slist_showfull 1 "show servers even if they are full and have no slots to join"
seta menu_slist_showempty 1 "show servers even if they are no empty and have no opponents to play against"
Modified: trunk/data/maps/aneurysm.bsp
===================================================================
(Binary files differ)
Modified: trunk/data/maps/aneurysm.map
===================================================================
--- trunk/data/maps/aneurysm.map 2009-08-23 14:38:47 UTC (rev 7499)
+++ trunk/data/maps/aneurysm.map 2009-08-23 17:21:59 UTC (rev 7500)
@@ -30625,10 +30625,10 @@
// entity 150
{
"classname" "dom_team"
-"cnt" "9"
-"message" "Pink team has captured a control point"
-"model" "models/domination/dom_pink.md3"
-"netname" "^6Pink Team^3"
+"cnt" "12"
+"message" "Yellow team has captured a control point"
+"model" "models/domination/dom_yellow.md3"
+"netname" "^3Yellow Team^3"
"noise" "domination/claim.wav"
"noise1" "domination/claim.wav"
"origin" "352.000000 -16.000000 -112.000000"
Modified: trunk/data/maps/stormkeep.bsp
===================================================================
(Binary files differ)
Modified: trunk/data/maps/stormkeep.map
===================================================================
--- trunk/data/maps/stormkeep.map 2009-08-23 14:38:47 UTC (rev 7499)
+++ trunk/data/maps/stormkeep.map 2009-08-23 17:21:59 UTC (rev 7500)
@@ -15229,12 +15229,12 @@
// entity 574
{
"classname" "dom_team"
-"netname" "^6Pink Team^3"
-"cnt" "9"
+"netname" "^6Yellow Team^3"
+"cnt" "12"
"noise" "domination/claim.wav"
"noise1" "domination/claim.wav"
-"message" "Pink team has captured a control point"
-"model" "models/domination/dom_pink.md3"
+"message" "Yellow team has captured a control point"
+"model" "models/domination/dom_yellow.md3"
"origin" "0 152 96"
}
// entity 575
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_advanced.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_advanced.c 2009-08-23 14:38:47 UTC (rev 7499)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_advanced.c 2009-08-23 17:21:59 UTC (rev 7500)
@@ -6,7 +6,7 @@
ATTRIB(NexuizAdvancedDialog, title, string, "Advanced server settings")
ATTRIB(NexuizAdvancedDialog, color, vector, SKINCOLOR_DIALOG_ADVANCED)
ATTRIB(NexuizAdvancedDialog, intendedWidth, float, 0.5)
- ATTRIB(NexuizAdvancedDialog, rows, float, 13)
+ ATTRIB(NexuizAdvancedDialog, rows, float, 14)
ATTRIB(NexuizAdvancedDialog, columns, float, 3)
ATTRIB(NexuizAdvancedDialog, refilterEntity, entity, NULL)
ENDCLASS(NexuizAdvancedDialog)
@@ -51,8 +51,19 @@
me.TD(me, 1, 1.7, e = makeNexuizSlider(0, 1.0, 0.05, "g_friendlyfire"));
me.TR(me);
me.TDempty(me, 0.2);
- me.TD(me, 1, 1.2, e = makeNexuizTextLabel(0, "Mirror damage:"));
+ me.TD(me, 1, 1.2, e = makeNexuizTextLabel(0, "Friendly fire penalty:"));
me.TD(me, 1, 1.7, e = makeNexuizSlider(0, 1.0, 0.05, "g_mirrordamage"));
+ setDependent(e, "g_tdm", 0, -1);
+ me.TR(me);
+ me.TDempty(me, 0.2);
+ me.TD(me, 1, 1.2, e = makeNexuizTextLabel(0, "Teams:"));
+ me.TD(me, 1, 1.7, e = makeNexuizTextSlider("g_tdm_teams_override"));
+ e.addValue(e, "Default", "0");
+ e.addValue(e, "2 teams", "2");
+ e.addValue(e, "3 teams", "3");
+ e.addValue(e, "4 teams", "4");
+ e.configureNexuizTextSliderValues(e);
+ makeMulti(e, "g_domination_teams_override g_keyhunt_teams_override");
me.gotoRC(me, me.rows - 1, 0);
me.TD(me, 1, me.columns, e = makeNexuizButton("OK", '0 0 0'));
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c 2009-08-23 14:38:47 UTC (rev 7499)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c 2009-08-23 17:21:59 UTC (rev 7500)
@@ -7,7 +7,7 @@
ATTRIB(NexuizMutatorsDialog, title, string, "Mutators")
ATTRIB(NexuizMutatorsDialog, color, vector, SKINCOLOR_DIALOG_MUTATORS)
ATTRIB(NexuizMutatorsDialog, intendedWidth, float, 0.9)
- ATTRIB(NexuizMutatorsDialog, rows, float, 17)
+ ATTRIB(NexuizMutatorsDialog, rows, float, 18)
ATTRIB(NexuizMutatorsDialog, columns, float, 6)
ATTRIB(NexuizMutatorsDialog, refilterEntity, entity, NULL)
ENDCLASS(NexuizMutatorsDialog)
@@ -70,6 +70,8 @@
s = strcat(s, ", NixNex");
if(cvar_string("g_weaponarena") != "0")
s = strcat(s, ", ", WeaponArenaString());
+ if(cvar("g_start_weapon_laser") == 0)
+ s = strcat(s, ", No start weapons");
if(cvar("sv_gravity") < 800)
s = strcat(s, ", Low gravity");
if(cvar("g_cloaked"))
@@ -257,6 +259,11 @@
me.TDempty(me, 0.2);
me.TD(me, 1, 2, e = makeNexuizRadioButton(1, "g_weaponarena", "most", "Most weapons"));
e.cvarOffValue = "0";
+ me.TR(me);
+ me.TDempty(me, 0.2);
+ me.TD(me, 1, 2, e = makeNexuizRadioButton(1, "g_start_weapon_laser", "0", "No start weapons"));
+ e.cvarOffValue = "-1";
+ makeMulti(e, "g_start_weapon_shotgun g_start_weapon_uzi g_start_weapon_grenadelauncher g_start_weapon_electro g_start_weapon_crylink g_start_weapon_nex g_start_weapon_hagar g_start_weapon_rocketlauncher g_start_weapon_campingrifle g_start_weapon_hlac g_start_weapon_seeker g_start_weapon_minstanex g_start_weapon_hook g_start_weapon_porto g_start_weapon_tuba");
me.gotoRC(me, me.rows - 1, 0);
me.TD(me, 1, me.columns, e = makeNexuizButton("OK", '0 0 0'));
Modified: trunk/data/qcsrc/server/domination.qc
===================================================================
--- trunk/data/qcsrc/server/domination.qc 2009-08-23 14:38:47 UTC (rev 7499)
+++ trunk/data/qcsrc/server/domination.qc 2009-08-23 17:21:59 UTC (rev 7500)
@@ -252,7 +252,7 @@
void spawnfunc_dom_team()
{
- if(!g_domination)
+ if(!g_domination || cvar("g_domination_teams_override") >= 2)
{
remove(self);
return;
@@ -578,8 +578,10 @@
void dom_spawnteams()
{
float numteams;
-
- numteams = cvar("g_domination_default_teams");
+ if(cvar("g_domination_teams_override") < 2)
+ numteams = cvar("g_domination_default_teams");
+ else
+ numteams = cvar("g_domination_teams_override");
// LordHavoc: edit this if you want to change defaults
dom_spawnteam("Red", COLOR_TEAM1-1, "models/domination/dom_red.md3", 0, "domination/claim.wav", "", "Red team has captured a control point");
dom_spawnteam("Blue", COLOR_TEAM2-1, "models/domination/dom_blue.md3", 0, "domination/claim.wav", "", "Blue team has captured a control point");
@@ -594,8 +596,8 @@
{
local entity head;
- // if no teams are found, spawn defaults
- if (find(world, classname, "dom_team") == world)
+ // if no teams are found, spawn defaults, if custom teams are set, use them
+ if (find(world, classname, "dom_team") == world || cvar("g_domination_teams_override") >= 2)
dom_spawnteams();
// if no control points are found, spawn defaults
if (find(world, classname, "dom_controlpoint") == world)
Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc 2009-08-23 14:38:47 UTC (rev 7499)
+++ trunk/data/qcsrc/server/teamplay.qc 2009-08-23 17:21:59 UTC (rev 7500)
@@ -477,6 +477,8 @@
modifications = strcat(modifications, ", NixNex");
if(g_weaponarena)
modifications = strcat(modifications, ", ", g_weaponarena_list, " Arena");
+ if(cvar("g_start_weapon_laser") == 0)
+ modifications = strcat(modifications, ", No start weapons");
if(cvar("sv_gravity") < 800)
modifications = strcat(modifications, ", Low gravity");
if(g_cloaked)
@@ -875,15 +877,6 @@
// find out what teams are available
CheckAllowedTeams(pl);
- if(g_domination)
- {
- // <div0> WHY? TODO
- if(cvar("g_domination_default_teams") < 3)
- c3 = 999999999;
- if(cvar("g_domination_default_teams") < 4)
- c4 = 999999999;
- }
-
// 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(!forcebestteam)
More information about the nexuiz-commits
mailing list