From aade85dfd2c0c2d84b5505c7c0f21a16f5cc842e Mon Sep 17 00:00:00 2001 From: kadaverjack Date: Sat, 11 Feb 2006 21:28:25 +0000 Subject: [PATCH] - "Kenny is ready" message for the ready button - override cvar for lms lives - alias reset "exec game_reset.cfg" - powerups can now be disabled indepently from g_pickup_items - several additions to menu git-svn-id: svn://svn.icculus.org/nexuiz/trunk/data@1018 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- default.cfg | 980 ++++++++++++------------ menu/creategame/gamemodes/gamemisc.menu | 15 + menu/creategame/gamemodes/lms.menu | 23 +- menu/data/gamemodes/gamemisc.menu | 21 + menu/data/gamemodes/lms.menu | 114 ++- qcsrc/server/gamec/cl_client.c | 7 +- qcsrc/server/gamec/clientcommands.c | 1 + qcsrc/server/gamec/t_items.c | 3 +- qcsrc/server/gamec/teamplay.c | 4 +- 9 files changed, 661 insertions(+), 507 deletions(-) diff --git a/default.cfg b/default.cfg index a6c262d87..8a45756dc 100644 --- a/default.cfg +++ b/default.cfg @@ -1,489 +1,491 @@ -// Nexuiz version (formatted for humans) -set g_nexuizversion 1.5 - -// Nexuiz version (formatted for machines) -// used to determine if a client is compatible -// this doesn't have to be bumped with every release -// bump whenever gamedata becomes incompatible -set g_nexuizversion_major 150 - -// team aliases -alias team_none "color 0" -alias team_red "color 4" -alias team_blue "color 13" -alias team_pink "color 9" -alias team_yellow "color 12" - -// other aliases -alias "+scores" "+showscores; ping" -alias "-scores" "-showscores" - -alias "+hook" "impulse 20" -alias "-hook" "impulse 21" -alias "ready" "cmd ready" - -alias "bsp" "ls maps/*.bsp" -alias "mapcfg" "ls maps/*.mapcfg" -alias "chmap" "exec $exit_cfg; exec game_reset.cfg; exec maps/$1.mapcfg" - -alias "dem" "ls demos/*.dem" -alias "rec" "record demos/$1" -alias "ply" "playdemo demos/$1" - -alias "ccl" "cmd clogin $1" -alias "cc" "cmd ccmd $*" - -alias "dropweapon" "impulse 17" -alias "+show_info" "impulse 18" -alias "-show_info" "impulse 19" - -// player defaults -_cl_color 0 -_cl_name Player -_cl_playermodel models/player/marine.zym -_cl_playerskin 0 -crosshair 5 -fov 90 -freelook 1 -sensitivity 6 -v_gamma 1.125000 -viewsize 110 -bgmvolume 1 -volume 0.5 -// fullscreen 800x600x32bit -vid_bitsperpixel "32" -vid_fullscreen "1" -vid_width "800" -vid_height "600" -// 2D resolution 640x480 -vid_conwidth "640" -vid_conheight "480" -scr_conforcewhiledisconnected "0" - -// server settings -hostname "Nexuiz Server" -sv_maxrate 10000 -set sv_mapchange_delay 5 - -// disable rcon-like clientcommands to avoid server being open with default password -seta sv_clientcommands 0 -seta sv_clientcommands_password "hackme" - -// restart server if all players hit "ready"-button -set sv_ready_restart 0 - -seta g_viewweapon_bobintensity 1 -seta g_viewweapon_q1pitching 1 -seta nex_numbots 0 -cl_forwardspeed 480 -cl_backspeed 480 -cl_sidespeed 480 -cl_upspeed 400 -cl_movement 1 -cl_movement_accelerate 5.5 -cl_movement_edgefriction 0 -cl_movement_friction 5 -cl_movement_jumpvelocity 300 -cl_movement_maxairspeed 50 -cl_movement_maxspeed 400 -cl_movement_stepheight 34 -cl_stairsmoothspeed 200 -seta cl_autoswitch 1 -edgefriction 0 -set g_balance_jumpheight 300 -set sv_maxairspeed 50 -sv_accelerate 5.5 -sv_friction 5 -sv_maxspeed 400 -sv_stepheight 34 -seta sv_spectate 1 -seta sv_defaultcharacter 0 -seta sv_defaultplayermodel models/player/nexus.zym -seta sv_defaultplayerskin 0 -set net_messagetimeout 60 - -set g_navnodeedit 0 - -pausable 0 -set mauvebots 0 -set bot_number 0 // number of bots in server -set g_start_weapon_laser 1 -set g_start_weapon_shotgun 1 -set g_start_weapon_uzi 0 -set g_start_weapon_grenadelauncher 0 -set g_start_weapon_electro 0 -set g_start_weapon_crylink 0 -set g_start_weapon_nex 0 -set g_start_weapon_hagar 0 -set g_start_weapon_rocketlauncher 0 -set g_start_ammo_shells 50 -set g_start_ammo_nails 0 -set g_start_ammo_rockets 0 -set g_start_ammo_cells 0 -set g_powerup_superhealth 1 -set g_powerup_strength 1 -set g_powerup_shield 1 -set g_use_ammunition 1 -set g_pickup_items 1 -set g_instagib 0 -set g_minstagib 0 // enable minstagib -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_rocketarena 0 -set g_vampire 0 -set g_homing_missile 0 -set g_midair 0 -set g_forced_respawn 0 -set g_fullbrightplayers 0 -set g_fullbrightitems 0 -set g_casings 0 -seta "g_maplist" "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_nexdmctf02 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" -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 -set g_maxpushtime 8.0 - -set welcome_message_time 8 - -set exit_cfg "" -alias clearmap "disconnect; exec $exit_cfg" - -seta g_grappling_hook 0 -seta g_balance_grapplehook_speed_fly 1200 -seta g_balance_grapplehook_speed_pull 1000 - -// "This means that timelimit can be overwritten globally and fraglimit can be overwritten for each game mode: DM/TDM, Domination, CTF, and Runematch." -seta timelimit_override -1 -seta fraglimit_override -1 -seta g_ctf_capture_limit -1 -seta g_domination_point_limit -1 -seta g_runematch_point_limit -1 - -// common team values -set g_tdm 0 -seta teamplay_default 3 // default teamplay setting in team games -set deathmatch_force_teamplay 0 // always play TDM on dm maps -seta g_balance_teams 1 // automatically balance out players entering -seta g_balance_teams_force 0 // automatically balance out teams when players move or disconnect -seta g_balance_teams_prevent_imbalance 0 // prevent players from changing to larger teams -seta g_tdm_teams 2 // how many teams are in team deathmatch -set g_changeteam_banned 0 // not allowed to change team -set g_changeteam_fragtransfer 80 // % of frags you get to keep when you change teams (rounded down) - -// ctf -set g_ctf 0 -set g_ctf_flag_returntime 30 -set g_ctf_flagscore_capture 5 -set g_ctf_flagscore_capture_team 20 -set g_ctf_flagscore_pickup 1 -set g_ctf_flagscore_return 5 -set g_ctf_flagscore_return_rogue 10 - -// runematch -set g_runematch 0 -set g_runematch_pointrate 5 -set g_runematch_pointamt 1 -set g_runematch_shuffletime 30 // how often runes change position -set g_runematch_respawntime 15 // how soon after being dropped to respawn -set g_runematch_frags_killedby_runeholder 4 -set g_runematch_frags_killed_runeholder 5 -set g_runematch_frags_norune 0 -set g_runematch_drop_runes_max 2 // only drop up to 2 runes, the rest should respawn -set g_runematch_allow_same 0 // allow matching rune-curse pairs -set g_runematch_rune_alpha 0.78 -set g_runematch_rune_effects 544 // EF_ADDITIVE + EF_FULLBRIGHT -set g_runematch_rune_glow_size 0 -set g_runematch_rune_glow_color 0 -set g_runematch_rune_color_strength 1.0 //1.5 -// strength/weakness -set g_balance_rune_strength_damage 2.0 //1.5 -set g_balance_rune_strength_force 1.5 -set g_balance_curse_weak_damage 0.5 //0.6 -set g_balance_curse_weak_force 0.6 -set g_balance_rune_strength_combo_damage 0.9 -set g_balance_rune_strength_combo_force 1.0 -// defense/vulner -set g_balance_rune_defense_takedamage 0.5 -set g_balance_curse_vulner_takedamage 2.0 -set g_balance_rune_defense_combo_takedamage 1.0 -// vampire/empathy -set g_balance_rune_vampire_absorb 0.4 -set g_balance_curse_empathy_takedamage -0.4 -set g_balance_rune_vampire_combo_absorb -0.1 -set g_balance_rune_vampire_maxhealth 500 -set g_balance_curse_empathy_minhealth 20 -set g_balance_rune_vampire_combo_minhealth 40 -// regen/venom -set g_balance_rune_regen_hpmod 1.75 -set g_balance_curse_venom_hpmod 0.6 -set g_balance_rune_regen_combo_hpmod 0.9 -set g_balance_rune_regen_regenrate 3.0 -set g_balance_curse_venom_rotrate 3.0 //2 -set g_balance_rune_regen_combo_regenrate 0.5 -set g_balance_rune_regen_combo_rotrate 1.5 -// speed/slow -set g_balance_rune_speed_atkrate 0.66 -set g_balance_curse_slow_atkrate 1.5 -set g_balance_rune_speed_combo_atkrate 1.2 -set g_balance_rune_speed_moverate 1.33 -set g_balance_curse_slow_moverate 0.8 -set g_balance_rune_speed_combo_moverate 0.9 -set g_balance_rune_speed_jumpheight 1.8 -set g_balance_curse_slow_jumpheight 1.0 -set g_balance_rune_speed_combo_jumpheight 1.0 - -// domination -set g_domination 0 -set g_domination_default_teams 2 // default number of teams for maps that aren't domination-specific -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_rate 0 // override: how often to give those points -set g_domination_point_capturetime 0.1 // how long it takes to capture a point (given no interference) -set g_domination_point_glow 0 // domination point glow (warning, slow) -//seta g_domination_balance_team_points 1 // # of points received is based on team sizes - -// last man standing -set g_lms 0 -set g_lms_start_ammo_shells 30 -set g_lms_start_ammo_nails 100 -set g_lms_start_ammo_rockets 30 -set g_lms_start_ammo_cells 30 -set g_lms_last_join 3 // if g_lms_join_anytime is false, new players can only join if the worst active player has more than (fraglimit - g_lms_last_join) lives -set g_lms_join_anytime 1 // if true, new players can join, but get same amount of lives as the worst player - -// server game balance settings -set g_balance_armor_regen 0 -set g_balance_armor_rot 0.1 -set g_balance_armor_stable 100 -set g_balance_armor_start 0 -set g_balance_armor_blockpercent 0.6 -set g_balance_health_regen 0.1 -set g_balance_health_rot 0.1 -set g_balance_health_stable 100 -set g_balance_health_start 150 -set g_balance_selfdamagepercent 0.6 -set g_balance_weaponswitchdelay 0.3 -// powerup balance settings -set g_balance_powerup_invincible_takedamage 0.2 -set g_balance_powerup_invincible_time 30 -set g_balance_powerup_strength_damage 3 -set g_balance_powerup_strength_force 4 -set g_balance_powerup_strength_time 30 -// weapon balance settings -set g_balance_laser_damage 35 -set g_balance_laser_edgedamage 10 -set g_balance_laser_force 400 -set g_balance_laser_radius 70 -set g_balance_laser_speed 9000 -set g_balance_laser_refire 0.7 -set g_balance_shotgun_bullets 10 -set g_balance_shotgun_damage 6 -set g_balance_shotgun_damage2 6 -set g_balance_shotgun_spread 0.07 -set g_balance_shotgun_refire 0.5 -set g_balance_shotgun_refire2 1.5 -set g_balance_shotgun_refire3 0.2 -set g_balance_uzi_damage 16 -set g_balance_uzi_refire 0.1 -set g_balance_uzi_spread 0.05 -set g_balance_uzi_damage2 30 -set g_balance_uzi_refire2 0.2 -set g_balance_uzi_spread2 0.01 -set g_balance_grenadelauncher_damage 65 -set g_balance_grenadelauncher_edgedamage 35 -set g_balance_grenadelauncher_force 400 -set g_balance_grenadelauncher_radius 140 -set g_balance_grenadelauncher_speed 2000 -set g_balance_grenadelauncher_speed2 1400 -set g_balance_grenadelauncher_speed2_up 200 -set g_balance_grenadelauncher_speed_up 200 -set g_balance_grenadelauncher_refire 0.7 -set g_balance_grenadelauncher_refire2 0.6 -set g_balance_electro_ballspeed 900 -set g_balance_electro_ballspeed_up 200 -set g_balance_electro_damage 90 -set g_balance_electro_edgedamage 0 -set g_balance_electro_force 200 -set g_balance_electro_radius 150 -set g_balance_electro_refire 0.9 -set g_balance_electro_refire3 0.05 -set g_balance_electro_speed 2000 -set g_balance_electro_combo_coredamage 50 -set g_balance_electro_combo_edgedamage 20 -set g_balance_crylink_damage 15 -set g_balance_crylink_edgedamage 0 -set g_balance_crylink_force 55 -set g_balance_crylink_radius 3 -set g_balance_crylink_refire 0.5 -set g_balance_crylink_speed 7000 -set g_balance_crylink_spread 0.08 -set g_balance_crylink_shots 7 -set g_balance_nex_damage 150 -set g_balance_nex_refire 1 -set g_balance_hagar_damage 40 -set g_balance_hagar_edgedamage 15 -set g_balance_hagar_force 100 -set g_balance_hagar_radius 70 -set g_balance_hagar_spread 0.025 -set g_balance_hagar_speed 3000 -set g_balance_hagar_speed2 1400 -set g_balance_hagar_speed2_up 100 -set g_balance_rocketlauncher_damage 130 -set g_balance_rocketlauncher_edgedamage 50 -set g_balance_rocketlauncher_force 600 -set g_balance_rocketlauncher_radius 170 -set g_balance_rocketlauncher_speed 850 -set g_balance_rocketlauncher_refire 1 -set g_balance_rocketlauncher_homing_speed 1000 //650 -set g_balance_rocketlauncher_homing_turnrate 0.75 //0.5 -set g_balance_rocketlauncher_homing_allow_steal 1 -set g_balance_falldamage_deadminspeed 150 -set g_balance_falldamage_minspeed 1400 -set g_balance_falldamage_factor 0.15 -set g_balance_falldamage_maxdamage 25 -set g_footsteps 0 // serverside footstep sounds - -// effects -cl_decals 1 -cl_particles 1 -cl_stainmaps 0 -gl_flashblend 0 -r_bloom 1 -r_coronas 1 -r_dynamic 1 -r_shadow_bumpscale_basetexture 5 -r_shadow_realtime_world 0 -r_shadow_realtime_world_lightmaps 1 -seta r_shadow_glsl 1 -r_shadow_glsl_offsetmapping 0 -r_shadow_realtime_world_shadows 0 -r_shadow_realtime_dlight_shadows 0 -r_shadow_realtime_world_dlightshadows 0 -r_shadow_gloss 0 - -// disable watershader. Only affects NVidia cards. -// turned off to avoid fullbright water -set r_watershader 0 - -// misc -set host_maxfps 1000 -set host_minfps 10 -scr_conbrightness 0 -scr_screenshot_jpeg 1 -scr_screenshot_jpeg_quality 0.9 -sv_maxvelocity 1000000000 - -// aliases: -alias +attack2 +button3 -alias -attack2 -button3 -alias +zoom +button4 -alias -zoom -button4 -alias +crouch +button5 -alias -crouch -button5 -alias weapnext "impulse 10" -alias weapprev "impulse 12" -alias bot_add "impulse 100" -alias bot_add2 "impulse 101" -alias bot_kick "impulse 102" -alias bot_cam "impulse 102" -alias bot_wayedit "impulse 102" - -// movement -bind w +forward -bind a +moveleft -bind s +back -bind d +moveright -bind UPARROW +forward -bind LEFTARROW +moveleft -bind DOWNARROW +back -bind RIGHTARROW +moveright -bind SHIFT +crouch -bind ENTER +jump -bind SPACE +jump - -// weapons -bind 1 "impulse 1" -bind 2 "impulse 2" -bind 3 "impulse 3" -bind 4 "impulse 4" -bind 5 "impulse 5" -bind 6 "impulse 6" -bind 7 "impulse 7" -bind 8 "impulse 8" -bind 9 "impulse 9" -bind 0 "impulse 210" -bind MOUSE1 +attack -bind MOUSE2 +attack2 -bind MOUSE3 +zoom -bind MWHEELUP weapnext -bind MWHEELDOWN weapprev -bind MOUSE4 weapnext -bind MOUSE5 weapprev -bind BACKSPACE dropweapon - -// misc -bind e +hook -bind - sizedown -bind = sizeup -bind ` toggleconsole -bind ~ toggleconsole -bind TAB +showscores -bind ESCAPE togglemenu -bind r messagemode2 -bind t messagemode -bind y messagemode2 -bind i +show_info -bind PAUSE pause -bind F10 quit -bind F11 disconnect -bind F12 screenshot -bind F4 ready - -// these commands can be voted -set sv_vote_commands "restart timelimit fraglimit chmap g_grappling_hook" -// users can call a vote for the above commands -set sv_vote_call "1" -// users can call a vote to become master -set sv_vote_master "1" -// set to 1 to allow to change you vote/mind -set sv_vote_change "0" -// set to 1 to count votes once after timeout or to 0 to count with every vote -set sv_vote_singlecount "0" -// a vote will timeout after this many seconds -set sv_vote_timeout "60" -// a player can not call a vote again for this many seconds -set sv_vote_wait "120" -alias vhelp "cmd vote help" -alias vstatus "cmd vote status" -alias vcall "cmd vote call $*" -alias vstop "cmd vote stop" -alias vmaster "cmd vote master" -alias vdo "cmd vote do $*" -alias vyes "cmd vote yes" -alias vno "cmd vote no" -bind F1 vyes -bind F2 vno - -//used for spectate/observer mode -alias "spec" "cmd spectate" -bind F3 spec - -// alias for switching the teamselect menu -alias menu_showteamselect "set scmenu_directmenu TeamSelect; togglemenu" - -// UrreBots -set urrebots "0" -set urrebots_strategytime "2" -set urrebots_combattime "1" -set urrebots_stratsearch_dist "10000000" -set urrebots_minisearch_dist "800" -set urrebots_debug "0" -set urrebots_navopt "0" - -// score log -alias printstats "set _printstats 1" // print status on demand -set sv_logscores_console 0 // print scores to server console -set sv_logscores_file 0 // print scores to file -set sv_logscores_filename "scores.log" // filename -set sv_logscores_bots 0 // exclude bots by default +// Nexuiz version (formatted for humans) +set g_nexuizversion 1.5 + +// Nexuiz version (formatted for machines) +// used to determine if a client is compatible +// this doesn't have to be bumped with every release +// bump whenever gamedata becomes incompatible +set g_nexuizversion_major 150 + +// team aliases +alias team_none "color 0" +alias team_red "color 4" +alias team_blue "color 13" +alias team_pink "color 9" +alias team_yellow "color 12" + +// other aliases +alias "+scores" "+showscores; ping" +alias "-scores" "-showscores" + +alias "+hook" "impulse 20" +alias "-hook" "impulse 21" +alias "ready" "cmd ready" + +alias "bsp" "ls maps/*.bsp" +alias "mapcfg" "ls maps/*.mapcfg" +alias "chmap" "exec $exit_cfg; exec game_reset.cfg; exec maps/$1.mapcfg" +alias "reset" "exec game_reset.cfg" + +alias "dem" "ls demos/*.dem" +alias "rec" "record demos/$1" +alias "ply" "playdemo demos/$1" + +alias "ccl" "cmd clogin $1" +alias "cc" "cmd ccmd $*" + +alias "dropweapon" "impulse 17" +alias "+show_info" "impulse 18" +alias "-show_info" "impulse 19" + +// player defaults +_cl_color 0 +_cl_name Player +_cl_playermodel models/player/marine.zym +_cl_playerskin 0 +crosshair 5 +fov 90 +freelook 1 +sensitivity 6 +v_gamma 1.125000 +viewsize 110 +bgmvolume 1 +volume 0.5 +// fullscreen 800x600x32bit +vid_bitsperpixel "32" +vid_fullscreen "1" +vid_width "800" +vid_height "600" +// 2D resolution 640x480 +vid_conwidth "640" +vid_conheight "480" +scr_conforcewhiledisconnected "0" + +// server settings +hostname "Nexuiz Server" +sv_maxrate 10000 +set sv_mapchange_delay 5 + +// disable rcon-like clientcommands to avoid server being open with default password +seta sv_clientcommands 0 +seta sv_clientcommands_password "hackme" + +// restart server if all players hit "ready"-button +set sv_ready_restart 0 + +seta g_viewweapon_bobintensity 1 +seta g_viewweapon_q1pitching 1 +seta nex_numbots 0 +cl_forwardspeed 480 +cl_backspeed 480 +cl_sidespeed 480 +cl_upspeed 400 +cl_movement 1 +cl_movement_accelerate 5.5 +cl_movement_edgefriction 0 +cl_movement_friction 5 +cl_movement_jumpvelocity 300 +cl_movement_maxairspeed 50 +cl_movement_maxspeed 400 +cl_movement_stepheight 34 +cl_stairsmoothspeed 200 +seta cl_autoswitch 1 +edgefriction 0 +set g_balance_jumpheight 300 +set sv_maxairspeed 50 +sv_accelerate 5.5 +sv_friction 5 +sv_maxspeed 400 +sv_stepheight 34 +seta sv_spectate 1 +seta sv_defaultcharacter 0 +seta sv_defaultplayermodel models/player/nexus.zym +seta sv_defaultplayerskin 0 +set net_messagetimeout 60 + +set g_navnodeedit 0 + +pausable 0 +set mauvebots 0 +set bot_number 0 // number of bots in server +set g_start_weapon_laser 1 +set g_start_weapon_shotgun 1 +set g_start_weapon_uzi 0 +set g_start_weapon_grenadelauncher 0 +set g_start_weapon_electro 0 +set g_start_weapon_crylink 0 +set g_start_weapon_nex 0 +set g_start_weapon_hagar 0 +set g_start_weapon_rocketlauncher 0 +set g_start_ammo_shells 50 +set g_start_ammo_nails 0 +set g_start_ammo_rockets 0 +set g_start_ammo_cells 0 +set g_powerup_superhealth 1 +set g_powerup_strength 1 +set g_powerup_shield 1 +set g_use_ammunition 1 +set g_pickup_items 1 +set g_instagib 0 +set g_minstagib 0 // enable minstagib +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_rocketarena 0 +set g_vampire 0 +set g_homing_missile 0 +set g_midair 0 +set g_forced_respawn 0 +set g_fullbrightplayers 0 +set g_fullbrightitems 0 +set g_casings 0 +seta "g_maplist" "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_nexdmctf02 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" +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 +set g_maxpushtime 8.0 + +set welcome_message_time 8 + +set exit_cfg "" +alias clearmap "disconnect; exec $exit_cfg" + +seta g_grappling_hook 0 +seta g_balance_grapplehook_speed_fly 1200 +seta g_balance_grapplehook_speed_pull 1000 + +// "This means that timelimit can be overwritten globally and fraglimit can be overwritten for each game mode: DM/TDM, Domination, CTF, and Runematch." +seta timelimit_override -1 +seta fraglimit_override -1 +seta g_ctf_capture_limit -1 +seta g_domination_point_limit -1 +seta g_runematch_point_limit -1 + +// common team values +set g_tdm 0 +seta teamplay_default 3 // default teamplay setting in team games +set deathmatch_force_teamplay 0 // always play TDM on dm maps +seta g_balance_teams 1 // automatically balance out players entering +seta g_balance_teams_force 0 // automatically balance out teams when players move or disconnect +seta g_balance_teams_prevent_imbalance 0 // prevent players from changing to larger teams +seta g_tdm_teams 2 // how many teams are in team deathmatch +set g_changeteam_banned 0 // not allowed to change team +set g_changeteam_fragtransfer 80 // % of frags you get to keep when you change teams (rounded down) + +// ctf +set g_ctf 0 +set g_ctf_flag_returntime 30 +set g_ctf_flagscore_capture 5 +set g_ctf_flagscore_capture_team 20 +set g_ctf_flagscore_pickup 1 +set g_ctf_flagscore_return 5 +set g_ctf_flagscore_return_rogue 10 + +// runematch +set g_runematch 0 +set g_runematch_pointrate 5 +set g_runematch_pointamt 1 +set g_runematch_shuffletime 30 // how often runes change position +set g_runematch_respawntime 15 // how soon after being dropped to respawn +set g_runematch_frags_killedby_runeholder 4 +set g_runematch_frags_killed_runeholder 5 +set g_runematch_frags_norune 0 +set g_runematch_drop_runes_max 2 // only drop up to 2 runes, the rest should respawn +set g_runematch_allow_same 0 // allow matching rune-curse pairs +set g_runematch_rune_alpha 0.78 +set g_runematch_rune_effects 544 // EF_ADDITIVE + EF_FULLBRIGHT +set g_runematch_rune_glow_size 0 +set g_runematch_rune_glow_color 0 +set g_runematch_rune_color_strength 1.0 //1.5 +// strength/weakness +set g_balance_rune_strength_damage 2.0 //1.5 +set g_balance_rune_strength_force 1.5 +set g_balance_curse_weak_damage 0.5 //0.6 +set g_balance_curse_weak_force 0.6 +set g_balance_rune_strength_combo_damage 0.9 +set g_balance_rune_strength_combo_force 1.0 +// defense/vulner +set g_balance_rune_defense_takedamage 0.5 +set g_balance_curse_vulner_takedamage 2.0 +set g_balance_rune_defense_combo_takedamage 1.0 +// vampire/empathy +set g_balance_rune_vampire_absorb 0.4 +set g_balance_curse_empathy_takedamage -0.4 +set g_balance_rune_vampire_combo_absorb -0.1 +set g_balance_rune_vampire_maxhealth 500 +set g_balance_curse_empathy_minhealth 20 +set g_balance_rune_vampire_combo_minhealth 40 +// regen/venom +set g_balance_rune_regen_hpmod 1.75 +set g_balance_curse_venom_hpmod 0.6 +set g_balance_rune_regen_combo_hpmod 0.9 +set g_balance_rune_regen_regenrate 3.0 +set g_balance_curse_venom_rotrate 3.0 //2 +set g_balance_rune_regen_combo_regenrate 0.5 +set g_balance_rune_regen_combo_rotrate 1.5 +// speed/slow +set g_balance_rune_speed_atkrate 0.66 +set g_balance_curse_slow_atkrate 1.5 +set g_balance_rune_speed_combo_atkrate 1.2 +set g_balance_rune_speed_moverate 1.33 +set g_balance_curse_slow_moverate 0.8 +set g_balance_rune_speed_combo_moverate 0.9 +set g_balance_rune_speed_jumpheight 1.8 +set g_balance_curse_slow_jumpheight 1.0 +set g_balance_rune_speed_combo_jumpheight 1.0 + +// domination +set g_domination 0 +set g_domination_default_teams 2 // default number of teams for maps that aren't domination-specific +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_rate 0 // override: how often to give those points +set g_domination_point_capturetime 0.1 // how long it takes to capture a point (given no interference) +set g_domination_point_glow 0 // domination point glow (warning, slow) +//seta g_domination_balance_team_points 1 // # of points received is based on team sizes + +// last man standing +set g_lms 0 +seta g_lms_lives_override -1 +set g_lms_start_ammo_shells 30 +set g_lms_start_ammo_nails 100 +set g_lms_start_ammo_rockets 30 +set g_lms_start_ammo_cells 30 +set g_lms_last_join 3 // if g_lms_join_anytime is false, new players can only join if the worst active player has more than (fraglimit - g_lms_last_join) lives +set g_lms_join_anytime 1 // if true, new players can join, but get same amount of lives as the worst player + +// server game balance settings +set g_balance_armor_regen 0 +set g_balance_armor_rot 0.1 +set g_balance_armor_stable 100 +set g_balance_armor_start 0 +set g_balance_armor_blockpercent 0.6 +set g_balance_health_regen 0.1 +set g_balance_health_rot 0.1 +set g_balance_health_stable 100 +set g_balance_health_start 150 +set g_balance_selfdamagepercent 0.6 +set g_balance_weaponswitchdelay 0.3 +// powerup balance settings +set g_balance_powerup_invincible_takedamage 0.2 +set g_balance_powerup_invincible_time 30 +set g_balance_powerup_strength_damage 3 +set g_balance_powerup_strength_force 4 +set g_balance_powerup_strength_time 30 +// weapon balance settings +set g_balance_laser_damage 35 +set g_balance_laser_edgedamage 10 +set g_balance_laser_force 400 +set g_balance_laser_radius 70 +set g_balance_laser_speed 9000 +set g_balance_laser_refire 0.7 +set g_balance_shotgun_bullets 10 +set g_balance_shotgun_damage 6 +set g_balance_shotgun_damage2 6 +set g_balance_shotgun_spread 0.07 +set g_balance_shotgun_refire 0.5 +set g_balance_shotgun_refire2 1.5 +set g_balance_shotgun_refire3 0.2 +set g_balance_uzi_damage 16 +set g_balance_uzi_refire 0.1 +set g_balance_uzi_spread 0.05 +set g_balance_uzi_damage2 30 +set g_balance_uzi_refire2 0.2 +set g_balance_uzi_spread2 0.01 +set g_balance_grenadelauncher_damage 65 +set g_balance_grenadelauncher_edgedamage 35 +set g_balance_grenadelauncher_force 400 +set g_balance_grenadelauncher_radius 140 +set g_balance_grenadelauncher_speed 2000 +set g_balance_grenadelauncher_speed2 1400 +set g_balance_grenadelauncher_speed2_up 200 +set g_balance_grenadelauncher_speed_up 200 +set g_balance_grenadelauncher_refire 0.7 +set g_balance_grenadelauncher_refire2 0.6 +set g_balance_electro_ballspeed 900 +set g_balance_electro_ballspeed_up 200 +set g_balance_electro_damage 90 +set g_balance_electro_edgedamage 0 +set g_balance_electro_force 200 +set g_balance_electro_radius 150 +set g_balance_electro_refire 0.9 +set g_balance_electro_refire3 0.05 +set g_balance_electro_speed 2000 +set g_balance_electro_combo_coredamage 50 +set g_balance_electro_combo_edgedamage 20 +set g_balance_crylink_damage 15 +set g_balance_crylink_edgedamage 0 +set g_balance_crylink_force 55 +set g_balance_crylink_radius 3 +set g_balance_crylink_refire 0.5 +set g_balance_crylink_speed 7000 +set g_balance_crylink_spread 0.08 +set g_balance_crylink_shots 7 +set g_balance_nex_damage 150 +set g_balance_nex_refire 1 +set g_balance_hagar_damage 40 +set g_balance_hagar_edgedamage 15 +set g_balance_hagar_force 100 +set g_balance_hagar_radius 70 +set g_balance_hagar_spread 0.025 +set g_balance_hagar_speed 3000 +set g_balance_hagar_speed2 1400 +set g_balance_hagar_speed2_up 100 +set g_balance_rocketlauncher_damage 130 +set g_balance_rocketlauncher_edgedamage 50 +set g_balance_rocketlauncher_force 600 +set g_balance_rocketlauncher_radius 170 +set g_balance_rocketlauncher_speed 850 +set g_balance_rocketlauncher_refire 1 +set g_balance_rocketlauncher_homing_speed 1000 //650 +set g_balance_rocketlauncher_homing_turnrate 0.75 //0.5 +set g_balance_rocketlauncher_homing_allow_steal 1 +set g_balance_falldamage_deadminspeed 150 +set g_balance_falldamage_minspeed 1400 +set g_balance_falldamage_factor 0.15 +set g_balance_falldamage_maxdamage 25 +set g_footsteps 0 // serverside footstep sounds + +// effects +cl_decals 1 +cl_particles 1 +cl_stainmaps 0 +gl_flashblend 0 +r_bloom 1 +r_coronas 1 +r_dynamic 1 +r_shadow_bumpscale_basetexture 5 +r_shadow_realtime_world 0 +r_shadow_realtime_world_lightmaps 1 +seta r_shadow_glsl 1 +r_shadow_glsl_offsetmapping 0 +r_shadow_realtime_world_shadows 0 +r_shadow_realtime_dlight_shadows 0 +r_shadow_realtime_world_dlightshadows 0 +r_shadow_gloss 0 + +// disable watershader. Only affects NVidia cards. +// turned off to avoid fullbright water +set r_watershader 0 + +// misc +set host_maxfps 1000 +set host_minfps 10 +scr_conbrightness 0 +scr_screenshot_jpeg 1 +scr_screenshot_jpeg_quality 0.9 +sv_maxvelocity 1000000000 + +// aliases: +alias +attack2 +button3 +alias -attack2 -button3 +alias +zoom +button4 +alias -zoom -button4 +alias +crouch +button5 +alias -crouch -button5 +alias weapnext "impulse 10" +alias weapprev "impulse 12" +alias bot_add "impulse 100" +alias bot_add2 "impulse 101" +alias bot_kick "impulse 102" +alias bot_cam "impulse 102" +alias bot_wayedit "impulse 102" + +// movement +bind w +forward +bind a +moveleft +bind s +back +bind d +moveright +bind UPARROW +forward +bind LEFTARROW +moveleft +bind DOWNARROW +back +bind RIGHTARROW +moveright +bind SHIFT +crouch +bind ENTER +jump +bind SPACE +jump + +// weapons +bind 1 "impulse 1" +bind 2 "impulse 2" +bind 3 "impulse 3" +bind 4 "impulse 4" +bind 5 "impulse 5" +bind 6 "impulse 6" +bind 7 "impulse 7" +bind 8 "impulse 8" +bind 9 "impulse 9" +bind 0 "impulse 210" +bind MOUSE1 +attack +bind MOUSE2 +attack2 +bind MOUSE3 +zoom +bind MWHEELUP weapnext +bind MWHEELDOWN weapprev +bind MOUSE4 weapnext +bind MOUSE5 weapprev +bind BACKSPACE dropweapon + +// misc +bind e +hook +bind - sizedown +bind = sizeup +bind ` toggleconsole +bind ~ toggleconsole +bind TAB +showscores +bind ESCAPE togglemenu +bind r messagemode2 +bind t messagemode +bind y messagemode2 +bind i +show_info +bind PAUSE pause +bind F10 quit +bind F11 disconnect +bind F12 screenshot +bind F4 ready + +// these commands can be voted +set sv_vote_commands "restart timelimit fraglimit chmap g_grappling_hook" +// users can call a vote for the above commands +set sv_vote_call "1" +// users can call a vote to become master +set sv_vote_master "1" +// set to 1 to allow to change you vote/mind +set sv_vote_change "0" +// set to 1 to count votes once after timeout or to 0 to count with every vote +set sv_vote_singlecount "0" +// a vote will timeout after this many seconds +set sv_vote_timeout "60" +// a player can not call a vote again for this many seconds +set sv_vote_wait "120" +alias vhelp "cmd vote help" +alias vstatus "cmd vote status" +alias vcall "cmd vote call $*" +alias vstop "cmd vote stop" +alias vmaster "cmd vote master" +alias vdo "cmd vote do $*" +alias vyes "cmd vote yes" +alias vno "cmd vote no" +bind F1 vyes +bind F2 vno + +//used for spectate/observer mode +alias "spec" "cmd spectate" +bind F3 spec + +// alias for switching the teamselect menu +alias menu_showteamselect "set scmenu_directmenu TeamSelect; togglemenu" + +// UrreBots +set urrebots "0" +set urrebots_strategytime "2" +set urrebots_combattime "1" +set urrebots_stratsearch_dist "10000000" +set urrebots_minisearch_dist "800" +set urrebots_debug "0" +set urrebots_navopt "0" + +// score log +alias printstats "set _printstats 1" // print status on demand +set sv_logscores_console 0 // print scores to server console +set sv_logscores_file 0 // print scores to file +set sv_logscores_filename "scores.log" // filename +set sv_logscores_bots 0 // exclude bots by default diff --git a/menu/creategame/gamemodes/gamemisc.menu b/menu/creategame/gamemodes/gamemisc.menu index eb1fd0490..c65677f56 100644 --- a/menu/creategame/gamemodes/gamemisc.menu +++ b/menu/creategame/gamemodes/gamemisc.menu @@ -136,6 +136,21 @@ Item Layout Misc text "Pickup items" target "::Data::Game::Misc::PickupItems::Switch" } + Derive Nex_Option_Switch Superhealth + { + text "Superhealth" + target "::Data::Game::Misc::Superhealth::Switch" + } + Derive Nex_Option_Switch Strength + { + text "Strength" + target "::Data::Game::Misc::Strength::Switch" + } + Derive Nex_Option_Switch Shield + { + text "Shield" + target "::Data::Game::Misc::Shield::Switch" + } Derive Nex_Line SeperatorGamemodes {} Derive Nex_Option_Switch Instagib diff --git a/menu/creategame/gamemodes/lms.menu b/menu/creategame/gamemodes/lms.menu index cb4b93448..ca7a5936f 100755 --- a/menu/creategame/gamemodes/lms.menu +++ b/menu/creategame/gamemodes/lms.menu @@ -5,34 +5,45 @@ Item Layout LMS origin '600 50' alignment [AlignFirst] + Derive Nex_Option_EditBox TimeLimit + { + text "Time Limit Override (disable: -1)" + // use the same one from the basic menu + target "Data::Server::TimeLimit::Text" + } + Derive Nex_Option_EditBox LMSLivesOverride + { + text "Starting Lives Override (disable: -1)" + target "::Data::Game::LMS::LMSLivesOverride::Text" + } Derive Nex_Option_EditBox LMSStartingShells { - text "Starting shells" + text "Starting Shells" target "::Data::Game::LMS::LMSStartingShells::Text" } Derive Nex_Option_EditBox LMSStartingNails { - text "Starting bullets" + text "Starting Bullets" target "::Data::Game::LMS::LMSStartingNails::Text" } Derive Nex_Option_EditBox LMSStartingRockets { - text "Starting rockets" + text "Starting Rockets" target "::Data::Game::LMS::LMSStartingRockets::Text" } Derive Nex_Option_EditBox LMSStartingCells { - text "Starting cells" + text "Starting Cells" target "::Data::Game::LMS::LMSStartingCells::Text" } Derive Nex_Option_Switch LMSJoin { - text "Join anytime" + text "Join Anytime" target "::Data::Game::LMS::LMSJoin::Switch" } Derive Nex_Option_EditBox LMSLastJoin { - text "Min. lives left to join" + text "Min. Lives Left To Join" target "::Data::Game::LMS::LMSLastJoin::Text" } diff --git a/menu/data/gamemodes/gamemisc.menu b/menu/data/gamemodes/gamemisc.menu index 062827fe2..cea0754b5 100644 --- a/menu/data/gamemodes/gamemisc.menu +++ b/menu/data/gamemodes/gamemisc.menu @@ -137,6 +137,27 @@ Item DataContainer Misc [DataLink_OnOffSwitch] } + Item Data_Cvar Superhealth + { + cvarName "g_powerup_superhealth" + defValue 1 + + [DataLink_OnOffSwitch] + } + Item Data_Cvar Strength + { + cvarName "g_powerup_strength" + defValue 1 + + [DataLink_OnOffSwitch] + } + Item Data_Cvar Shield + { + cvarName "g_powerup_shield" + defValue 1 + + [DataLink_OnOffSwitch] + } Item Data_Cvar Instagib { cvarName "g_instagib" diff --git a/menu/data/gamemodes/lms.menu b/menu/data/gamemodes/lms.menu index da7531497..c418fd7a8 100755 --- a/menu/data/gamemodes/lms.menu +++ b/menu/data/gamemodes/lms.menu @@ -4,33 +4,121 @@ Item DataContainer LMS { + Item Data_Cvar LMSLivesOverride + { + cvarName "g_lms_lives_override" + defValue -1 + + Item DataLink_Value Value + { + minValue -1 + maxValue 999.0 + stepValue 1 + link "##up" + } + Item DataLink_Text Text + { + maxValue 8 + link "##down" + + Item DataLink_TextValue TextValue + { + link "##up prev" + } + } + + } Item Data_Cvar LMSStartingShells { cvarName "g_lms_start_ammo_shells" defValue 30 - [DataLink_Setting] + Item DataLink_Value Value + { + minValue 0 + maxValue 999.0 + stepValue 1 + link "##up" + } + Item DataLink_Text Text + { + maxValue 8 + link "##down" + + Item DataLink_TextValue TextValue + { + link "##up prev" + } + } } Item Data_Cvar LMSStartingNails { cvarName "g_lms_start_ammo_nails" defValue 100 - [DataLink_Setting] + Item DataLink_Value Value + { + minValue 0 + maxValue 999.0 + stepValue 1 + link "##up" + } + Item DataLink_Text Text + { + maxValue 8 + link "##down" + + Item DataLink_TextValue TextValue + { + link "##up prev" + } + } } Item Data_Cvar LMSStartingRockets { cvarName "g_lms_start_ammo_rockets" defValue 30 - [DataLink_Setting] + Item DataLink_Value Value + { + minValue 0 + maxValue 999.0 + stepValue 1 + link "##up" + } + Item DataLink_Text Text + { + maxValue 8 + link "##down" + + Item DataLink_TextValue TextValue + { + link "##up prev" + } + } } Item Data_Cvar LMSStartingCells { cvarName "g_lms_start_ammo_cells" defValue 30 - [DataLink_Setting] + Item DataLink_Value Value + { + minValue 0 + maxValue 999.0 + stepValue 1 + link "##up" + } + Item DataLink_Text Text + { + maxValue 8 + link "##down" + + Item DataLink_TextValue TextValue + { + link "##up prev" + } + } } Item Data_Cvar LMSJoin { @@ -44,6 +132,22 @@ Item DataContainer LMS cvarName "g_lms_last_join" defValue 3 - [DataLink_Setting] + Item DataLink_Value Value + { + minValue 0 + maxValue 999.0 + stepValue 1 + link "##up" + } + Item DataLink_Text Text + { + maxValue 8 + link "##down" + + Item DataLink_TextValue TextValue + { + link "##up prev" + } + } } } diff --git a/qcsrc/server/gamec/cl_client.c b/qcsrc/server/gamec/cl_client.c index 2c00d22a6..35a1c702f 100644 --- a/qcsrc/server/gamec/cl_client.c +++ b/qcsrc/server/gamec/cl_client.c @@ -216,7 +216,7 @@ void PutObserverInServer (void) self.fixangle = TRUE; self.crouch = FALSE; self.view_ofs = PL_VIEW_OFS; - setorigin (self, spot.origin + '0 0 1' * (1 - self.mins_z - 24)); + setorigin (self, spot.origin + '0 0 1' * (1 - self.mins_z - 14)); self.oldorigin = self.origin; self.items = 0; self.model = ""; @@ -543,10 +543,7 @@ void ClientConnect (void) stuffcmd(self, "cmd clientversion $g_nexuizversion_major\n"); // set cvar for team scoreboard - if(teams_matter) - stuffcmd(self, "set teamplay 1\n"); - else - stuffcmd(self, "set teamplay 0\n"); + stuffcmd(self, "set teamplay ", ftos(teams_matter), "\n"); if(cvar("g_lms")) { diff --git a/qcsrc/server/gamec/clientcommands.c b/qcsrc/server/gamec/clientcommands.c index c8aa32c59..679755298 100644 --- a/qcsrc/server/gamec/clientcommands.c +++ b/qcsrc/server/gamec/clientcommands.c @@ -221,6 +221,7 @@ void SV_ParseClientCommand(string s) { if(cvar("sv_ready_restart")) { self.ready = TRUE; + bprint(self.netname, "^2 is ready"); ReadyCount(); } } else { diff --git a/qcsrc/server/gamec/t_items.c b/qcsrc/server/gamec/t_items.c index 350532b16..e3f88e320 100644 --- a/qcsrc/server/gamec/t_items.c +++ b/qcsrc/server/gamec/t_items.c @@ -167,7 +167,8 @@ void RemoveItem(void) = { void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, string itemname, float itemid, float itemflags) { - if (!cvar("g_pickup_items") && !cvar("g_minstagib") && !cvar("g_lms")) + if (!cvar("g_pickup_items") && !cvar("g_minstagib") && + itemid != IT_STRENGTH && itemid != IT_INVINCIBLE && itemname != "100 Health") { remove (self); return; diff --git a/qcsrc/server/gamec/teamplay.c b/qcsrc/server/gamec/teamplay.c index 0a57b062f..d748f0aa7 100644 --- a/qcsrc/server/gamec/teamplay.c +++ b/qcsrc/server/gamec/teamplay.c @@ -179,7 +179,9 @@ void InitGameplayMode() { game = GAME_LMS; cvar_set("g_lms", "1"); - fraglimit_override = cvar("fraglimit_override"); + fraglimit_override = cvar("g_lms_lives_override"); + if(fraglimit_override == 0) + fraglimit_override = -1; gamemode_name = "Last Man Standing"; teams_matter = 0; cvar_set("teamplay", "0"); -- 2.39.2