From: Rudolf Polzer Date: Wed, 19 May 2010 05:37:41 +0000 (+0200) Subject: balance configs: get rid of weaponreplace (really doesn't belong there, is server... X-Git-Tag: xonotic-v0.1.0preview~573^3~7^2~1 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=0cd2ba9795eee1c339ddb99cf0a163eb0a5e1aa8 balance configs: get rid of weaponreplace (really doesn't belong there, is server admin preference) add a defaultXPM.cfg to set default settings for XPM (including weaponreplaces) --- diff --git a/balance.cfg b/balance.cfg index b7750d4d7b..cdb8170809 100644 --- a/balance.cfg +++ b/balance.cfg @@ -1,29 +1,3 @@ -// {{{ weapon replacement -// NOTE: this only replaces weapons on the map -// use g_start_weapon_* to also replace the on-startup weapons! -// example: g_weaponreplace_nex "nex minstanex", then Nexes become MinstaNexes 50% of the times -// set the cvars to "0" to totally disable a weapon -set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun" -set g_weaponreplace_laser "" -set g_weaponreplace_shotgun "" -set g_weaponreplace_uzi "" -set g_weaponreplace_grenadelauncher "" -set g_weaponreplace_electro "" -set g_weaponreplace_crylink "" -set g_weaponreplace_nex "" -set g_weaponreplace_hagar "" -set g_weaponreplace_rocketlauncher "" -set g_weaponreplace_porto "" -set g_weaponreplace_minstanex "" -set g_weaponreplace_hook "" -set g_weaponreplace_hlac "" -set g_weaponreplace_campingrifle "" -set g_weaponreplace_tuba "" -set g_weaponreplace_fireball "" -set g_weaponreplace_seeker "" -set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (for Q3A map compatibility)" -// }}} - // {{{ starting gear set g_start_weapon_laser -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" set g_start_weapon_shotgun -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" @@ -37,11 +11,11 @@ set g_start_weapon_rocketlauncher -1 "0 = never provide the weapon, 1 = always p set g_start_weapon_minstanex -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" set g_start_weapon_porto -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" set g_start_weapon_hook -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" -set g_start_weapon_hlac 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" +set g_start_weapon_hlac -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" set g_start_weapon_campingrifle -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" set g_start_weapon_tuba -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" -set g_start_weapon_fireball 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" -set g_start_weapon_seeker 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" +set g_start_weapon_fireball -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" +set g_start_weapon_seeker -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" set g_balance_health_start 100 set g_balance_armor_start 0 set g_start_ammo_shells 45 diff --git a/balance25.cfg b/balance25.cfg index 2f4ca97bcf..7c1fa180c1 100644 --- a/balance25.cfg +++ b/balance25.cfg @@ -1,29 +1,3 @@ -// {{{ weapon replacement -// NOTE: this only replaces weapons on the map -// use g_start_weapon_* to also replace the on-startup weapons! -// example: g_weaponreplace_nex "nex minstanex", then Nexes become MinstaNexes 50% of the times -// set the cvars to "0" to totally disable a weapon -set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun" -set g_weaponreplace_laser "" -set g_weaponreplace_shotgun "" -set g_weaponreplace_uzi "" -set g_weaponreplace_grenadelauncher "" -set g_weaponreplace_electro "" -set g_weaponreplace_crylink "" -set g_weaponreplace_nex "" -set g_weaponreplace_hagar "" -set g_weaponreplace_rocketlauncher "" -set g_weaponreplace_porto "" -set g_weaponreplace_minstanex "" -set g_weaponreplace_hook "" -set g_weaponreplace_hlac "" -set g_weaponreplace_campingrifle "" -set g_weaponreplace_tuba "" -set g_weaponreplace_fireball "" -set g_weaponreplace_seeker "" -set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (for Q3A map compatibility)" -// }}} - // {{{ starting gear set g_start_weapon_laser -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" set g_start_weapon_shotgun -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" diff --git a/balanceSamual.cfg b/balanceSamual.cfg index e633c74329..7d62bd3bc2 100644 --- a/balanceSamual.cfg +++ b/balanceSamual.cfg @@ -1,29 +1,3 @@ -// {{{ weapon replacement -// NOTE: this only replaces weapons on the map -// use g_start_weapon_* to also replace the on-startup weapons! -// example: g_weaponreplace_nex "nex minstanex", then Nexes become MinstaNexes 50% of the times -// set the cvars to "0" to totally disable a weapon -set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun" -set g_weaponreplace_laser "" -set g_weaponreplace_shotgun "" -set g_weaponreplace_uzi "" -set g_weaponreplace_grenadelauncher "" -set g_weaponreplace_electro "" -set g_weaponreplace_crylink "" -set g_weaponreplace_nex "" -set g_weaponreplace_hagar "" -set g_weaponreplace_rocketlauncher "" -set g_weaponreplace_porto "" -set g_weaponreplace_minstanex "" -set g_weaponreplace_hook "" -set g_weaponreplace_hlac 0 // I don't particularly like this weapon. -set g_weaponreplace_campingrifle "" -set g_weaponreplace_tuba "" -set g_weaponreplace_fireball 0 // Don't kill me div0, just for now until I figure out a good balance for it. -set g_weaponreplace_seeker "" -set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (for Q3A map compatibility)" -// }}} - // {{{ starting gear set g_start_weapon_laser -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" set g_start_weapon_shotgun -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" diff --git a/balanceXPM.cfg b/balanceXPM.cfg index f3b12059be..e47e1a8858 100644 --- a/balanceXPM.cfg +++ b/balanceXPM.cfg @@ -1,28 +1,3 @@ -// {{{ weapon replacement -// NOTE: this only replaces weapons on the map -// use g_start_weapon_* to also replace the on-startup weapons! -// example: g_weaponreplace_nex "nex minstanex", then Nexes become MinstaNexes 50% of the times -// set the cvars to "0" to totally disable a weapon -set g_weaponreplace_laser "" -set g_weaponreplace_shotgun "uzi" -set g_weaponreplace_uzi "shotgun" -set g_weaponreplace_grenadelauncher "" -set g_weaponreplace_electro "" -set g_weaponreplace_crylink "" -set g_weaponreplace_nex "" -set g_weaponreplace_hagar "" -set g_weaponreplace_rocketlauncher "" -set g_weaponreplace_porto "" -set g_weaponreplace_minstanex "" -set g_weaponreplace_hook 0 -set g_weaponreplace_hlac 0 -set g_weaponreplace_campingrifle 0 -set g_weaponreplace_tuba "" -set g_weaponreplace_fireball 0 -set g_weaponreplace_seeker 0 -set sv_q3acompat_machineshotgunswap 0 -// }}} - // {{{ starting gear set g_start_weapon_laser -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" set g_start_weapon_shotgun -2 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" diff --git a/default.cfg b/default.cfg index 8cf217ce4f..86b4808274 100644 --- a/default.cfg +++ b/default.cfg @@ -1,4 +1 @@ exec defaultXonotic.cfg - -// we're not xonotic 2.6 yet -//exec default25.cfg diff --git a/default25.cfg b/default25.cfg deleted file mode 100644 index 8d380fd72c..0000000000 --- a/default25.cfg +++ /dev/null @@ -1,5 +0,0 @@ -cl_netfps 20 -sys_ticrate 0.05 -sv_gameplayfix_delayprojectiles 1 -exec physics25.cfg -exec balance25.cfg diff --git a/default26.cfg b/default26.cfg deleted file mode 100644 index 260c96d275..0000000000 --- a/default26.cfg +++ /dev/null @@ -1,5 +0,0 @@ -cl_netfps 60 -sys_ticrate 0.0166667 -sv_gameplayfix_delayprojectiles 0 -exec physics26.cfg -exec balance.cfg diff --git a/defaultXPM.cfg b/defaultXPM.cfg new file mode 100644 index 0000000000..f480e22215 --- /dev/null +++ b/defaultXPM.cfg @@ -0,0 +1,23 @@ +exec defaultXonotic.cfg + +set g_weaponreplace_laser "" +set g_weaponreplace_shotgun "uzi" +set g_weaponreplace_uzi "shotgun" +set g_weaponreplace_grenadelauncher "" +set g_weaponreplace_electro "" +set g_weaponreplace_crylink "" +set g_weaponreplace_nex "" +set g_weaponreplace_hagar "" +set g_weaponreplace_rocketlauncher "" +set g_weaponreplace_porto "" +set g_weaponreplace_minstanex "" +set g_weaponreplace_hook 0 +set g_weaponreplace_hlac 0 +set g_weaponreplace_campingrifle 0 +set g_weaponreplace_tuba "" +set g_weaponreplace_fireball 0 +set g_weaponreplace_seeker 0 +set sv_q3acompat_machineshotgunswap 0 + +exec physicsXPM.cfg +exec balanceXPM.cfg diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 2c579ac49f..764782ed75 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1821,3 +1821,26 @@ volume 1 // sucks less than the old one cl_decals_newsystem 1 + +// NOTE: this only replaces weapons on the map +// use g_start_weapon_* to also replace the on-startup weapons! +// example: g_weaponreplace_nex "nex minstanex", then Nexes become MinstaNexes 50% of the times +// set the cvars to "0" to totally disable a weapon +set g_weaponreplace_laser "" +set g_weaponreplace_shotgun "" +set g_weaponreplace_uzi "" +set g_weaponreplace_grenadelauncher "" +set g_weaponreplace_electro "" +set g_weaponreplace_crylink "" +set g_weaponreplace_nex "" +set g_weaponreplace_hagar "" +set g_weaponreplace_rocketlauncher "" +set g_weaponreplace_porto "" +set g_weaponreplace_minstanex "" +set g_weaponreplace_hook "" +set g_weaponreplace_hlac "" +set g_weaponreplace_campingrifle "" +set g_weaponreplace_tuba "" +set g_weaponreplace_fireball "" +set g_weaponreplace_seeker "" +set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (for Q3A map compatibility in mapinfo files)"