X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=data%2FdefaultVoretournament.cfg;h=5026bf267b1912cbdd670938892125ef43b6f7a2;hb=278c0dd853a7b20389c2a693a5b878e1a50e2988;hp=38f0dc33a0d17391d380946d62ed9c2a99dc2889;hpb=80b1fe478fef0a5cbe7784d8073f828be3457b86;p=voretournament%2Fvoretournament.git

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index 38f0dc33..5026bf26 100644
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -1,4 +1,4 @@
-set g_voretournamentversion 0.1.1git	"Voretournament version (formatted for humans)"
+set g_voretournamentversion 0.2.0git	"Voretournament version (formatted for humans)"
 
 //!<showbrand
 showbrand 3
@@ -35,9 +35,9 @@ seta g_configversion 0	"Configuration file version (used to upgrade settings) 0:
 // servers either
 //
 // e.g. Voretournament 1.5.1 RC1 will be 15101
-gameversion 01100
-gameversion_min 01100 // 0.1.1 still used this
-gameversion_max 02000 // 0.1.1 version allows any 0.2 release, but no more
+gameversion 02000
+gameversion_min 02000 // 0.2.0 still used this
+gameversion_max 03000 // 0.2.0 version allows any 0.3 release, but no more
 
 // compatibility guideline:
 //   version a.b.c   = a0b0c
@@ -63,8 +63,8 @@ alias asay_noammo "say_team (%l) need %W for %w"
 alias asay_drop "say_team (%l) dropped %w ; impulse 17"
 
 // other aliases
-alias +grabber +button6
-alias -grabber -button6
+alias +jetpack +button6
+alias -jetpack -button6
 alias ready "cmd ready"
 alias lockteams "sv_cmd lockteams"
 alias unlockteams "sv_cmd unlockteams"
@@ -247,7 +247,7 @@ set sv_fragmessage_information_typefrag 1 "Enable typefrag display information,
 
 // use default physics
 set sv_friction_on_land 0
-exec physics26.cfg
+exec physics.cfg
 
 set sv_player_viewoffset "0 0 35" "view offset of the player model"
 set sv_player_mins "-16 -16 -24" "playermodel mins"
@@ -350,7 +350,6 @@ set bot_ai_bunnyhop_stopdistance 220 "Stop jumping after reaching this distance
 set bot_ai_bunnyhop_firstjumpdelay 0.5 "Start running to the goal only if it was seen for more than N seconds"
 set bot_ai_vore_decide_pred 4 "How fast bots decide what to do with their prey, at lowest skill"
 set bot_ai_vore_decide_prey 4 "How fast bots decide what to do with their predator, at lowest skill"
-set bot_ai_vore_decide_giveuphealth 50 "If a bot is inside the stomach, having less than this amount of health causes them to give up and trigger digestion, at lowest skill"
 set bot_ai_vore_decide_fear 2 "How much bots will fear players more powerful than them, and therefore avoid them in some situations"
 set bot_god 0 "god mode for bots"
 set bot_ai_navigation_jetpack 0 "Enable bots to navigat maps using the jetpack"
@@ -416,7 +415,7 @@ set g_casings 2 "specifies which casings (0: none, 1: only shotgun casings, 2: s
 set g_norecoil 0 "if set to 1 shooting weapons won't make you crosshair to move upwards (recoil)"
 set g_maplist_mostrecent "" "contains the name of the maps that were most recently played"
 seta g_maplist_mostrecent_count 3	"number of most recent maps that are blocked from being played again"
-seta g_maplist "basement basementctf soylent"
+seta g_maplist "basement basementctf soylent voretemple"
 seta g_maplist_index 0	"this is used internally for saving position in maplist cycle"
 seta g_maplist_selectrandom 0	"if 1, a random map will be chosen as next map - DEPRECATED in favor of g_maplist_shuffle"
 seta g_maplist_shuffle 1	"new randomization method: like selectrandom, but avoid playing the same maps in short succession. This works by taking out the first element and inserting it into g_maplist with a bias to the end of the list"
@@ -435,8 +434,6 @@ set welcome_message_time 8
 
 alias clearmap "disconnect"
 
-set g_grappling_hook 0 "let players spawn with the grappling hook which allows them to pull themselves up"
-
 set leadlimit 0
 
 // this means that timelimit can be overidden globally and fraglimit can be overidden for each game mode: DM/TDM, Domination, CTF.
@@ -499,7 +496,7 @@ seta timelimit_overtimes 0 "how many overtimes to add at max"
 seta timelimit_suddendeath 5 "number of minutes suddendeath mode lasts after all overtimes were added and still no winner was found"
 
 // common team values
-set g_tdm 0 "Team Deathmatch: the team who kills their opponents most often wins"
+seta g_tdm 0 "Team Deathmatch: the team who kills their opponents most often wins"
 
 seta teamplay_default 4 "default teamplay setting in team games. 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 four cvars"
 seta g_mirrordamage 0.3	"for teamplay 4: mirror damage factor"
@@ -520,11 +517,11 @@ set g_changeteam_fragtransfer 0	"% of frags you get to keep when you change team
 set sv_teamnagger 1 "enable a nag message when the teams are unbalanced"
 
 // dm
-set g_dm 1 "Deathmatch: killing any other player is one frag, player with most frags wins"
+seta g_dm 1 "Deathmatch: killing any other player is one frag, player with most frags wins"
 set gamecfg 1	// "deathmatch"
 
 // ctf
-set g_ctf 0 "Capture The Flag: take the enemy flag and bring it to yours at your base to score"
+seta g_ctf 0 "Capture The Flag: take the enemy flag and bring it to yours at your base to score"
 set g_ctf_flag_returntime 30
 set g_ctf_flagcarrier_selfdamage 1
 set g_ctf_flagcarrier_selfforce 1
@@ -549,10 +546,10 @@ set g_ctf_flag_pickup_effects 1
 set g_ctf_flag_capture_effects 1
 set g_ctf_captimerecord_always 0 "if enabled, assisted CTF records (with other players on the server) are recorded too"
 
-exec ctfscoring-ai.cfg
+exec ctfscoring.cfg
 
 // domination
-set g_domination			0 "Domination: capture and hold control points to gain points"
+seta 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"
@@ -564,7 +561,7 @@ set g_domination_point_glow		0 "domination point glow (warning, slow)"
 //set g_domination_balance_team_points	1 "# of points received is based on team sizes"
 
 // last man standing
-set g_lms 0 "Last Man Standing: everyone starts with a certain amount of lives, and the survivor wins"
+seta g_lms 0 "Last Man Standing: everyone starts with a certain amount of lives, and the survivor wins"
 set g_lms_lives_override -1
 set g_lms_regenerate 0
 set g_lms_campcheck_interval 10
@@ -575,20 +572,20 @@ set g_lms_last_join 3	"if g_lms_join_anytime is false, new players can only join
 set g_lms_join_anytime 1	"if true, new players can join, but get same amount of lives as the worst player"
 
 // arena
-set g_arena 0 "Arena: many one-on-one rounds are played to find the winner"
+seta g_arena 0 "Arena: many one-on-one rounds are played to find the winner"
 set g_arena_maxspawned 2	"maximum number of players to spawn at once (the rest is spectating, waiting for their turn)"
 set g_arena_roundbased 1	"if disabled, the next player will spawn as soon as someone dies"
 set g_arena_warmup 5	"time, newly spawned players have to prepare themselves in round based matches"
 set g_arena_powerups 0	"enables powerups (superhealth, strength and shield), which are removed by default"
 
 // ca
-set g_ca 0 "Clan Arena: Played in rounds, once you're dead you're out! The team with survivors wins the round."
+seta g_ca 0 "Clan Arena: Played in rounds, once you're dead you're out! The team with survivors wins the round."
 set g_ca_point_limit 10 "point limit 10 is standard for clan arena"
 set g_ca_point_leadlimit 0
 set g_ca_warmup 10 "how long the players will have time to run around the map before the round starts"
 
 // onslaught
-set g_onslaught 0 "Onslaught: take control points towards the enemy generator and then destroy it"
+seta g_onslaught 0 "Onslaught: take control points towards the enemy generator and then destroy it"
 set g_onslaught_gen_health 5000
 set g_onslaught_cp_health 1000
 set g_onslaught_cp_buildhealth 100
@@ -596,19 +593,19 @@ set g_onslaught_cp_buildtime 10
 set g_onslaught_cp_regen 20
 
 // assault
-set g_assault 0 "Assault: attack the enemy base as fast as you can, then defend the base against the enemy for that time to win"
+seta g_assault 0 "Assault: attack the enemy base as fast as you can, then defend the base against the enemy for that time to win"
 
 // race
-set g_race 0 "Race: be faster than your opponents"
+seta g_race 0 "Race: be faster than your opponents"
 set g_race_qualifying_timelimit 0
 set g_race_qualifying_timelimit_override -1
 set g_race_teams 0	"when 2, 3, or 4, the race is played as a team game (the team members can add up their laps)"
 
 // cts
-set g_cts 0 "CTS: complete the stage"
+seta g_cts 0 "CTS: complete the stage"
 
 // rpg
-set g_rpg 0 "RPG: RolePlay / Free Roam gametype"
+seta g_rpg 0 "RPG: RolePlay / Free Roam gametype"
 
 // server game balance settings
 // powerup balance settings
@@ -661,21 +658,15 @@ scr_conbrightness 0.2
 scr_screenshot_jpeg 1
 scr_screenshot_jpeg_quality 0.9
 sv_maxvelocity 1000000000
-cl_sound_wizardhit ""
-cl_sound_hknighthit ""
-cl_sound_tink1 weapons/tink1.wav
-cl_sound_ric1 weapons/ric1.wav
-cl_sound_ric2 weapons/ric2.wav
-cl_sound_ric3 weapons/ric3.wav
-cl_sound_r_exp3 ""
-sv_sound_land ""
-sv_sound_watersplash ""
-seta cl_sound_maptime_warning "1" "play announcer sound telling you the remaining maptime - 0: do not play at all, 1: play at one minute, 2: play at five minutes, 3: play both"
+seta cl_sound_maptime_warning "3" "play announcer sound telling you the remaining maptime - 0: do not play at all, 1: play at one minute, 2: play at five minutes, 3: play both"
 seta cl_notify_carried_items "3" "notify you of carried items when you obtain them (e.g. flags in CTF) - 0: disabled, 1: notify of taken items, 2: notify of picking up dropped items, 3: notify of both"
 
 seta cl_hitsound 1 "play a hit notifier sound when you have hit an enemy"
 seta cl_announcer default "name of the announcer you wish to use from data/sound/announcer"
 
+seta cl_itembobheight 10
+seta cl_itembobspeed 0.5
+
 // startmap_dm is used when running with the -listen or -dedicated commandline options
 set serverconfig server.cfg
 alias startmap_dm "set _sv_init 0; map _init/_init; exec $serverconfig; set _sv_init 1; map _init/_init"
@@ -762,7 +753,7 @@ bind g dropweapon
 bind f +use
 
 // misc
-bind r +grabber
+bind r +jetpack
 bind ` toggleconsole
 bind ~ toggleconsole
 bind TAB +showscores
@@ -1009,7 +1000,7 @@ alias addfav "qc_cmd addtolist net_slist_favorites $*"
 alias addvote "qc_cmd addtolist sv_vote_commands $*"
 
 // key hunt
-set g_keyhunt 0 "Key Hunt: collect all keys from the enemies and bring them together to score"
+seta g_keyhunt 0 "Key Hunt: collect all keys from the enemies and bring them together to score"
 set g_balance_keyhunt_delay_return 60
 set g_balance_keyhunt_delay_round 5
 set g_balance_keyhunt_delay_tracking 10
@@ -1114,6 +1105,7 @@ seta sbar_color_bg_r 0.25 "red color component of the HUD background"
 seta sbar_color_bg_g 0 "green color component of the HUD background"
 seta sbar_color_bg_b 0.5 "blue color component of the HUD background"
 seta sbar_color_bg_team 0.5 "team color multiplier of the HUD background"
+seta sbar_scoreboard_offset 100 "scoreboard vertical position"
 seta sbar_scoreboard_alpha_bg 0.6 "scoreboard background alpha"
 seta sbar_scoreboard_alpha_fg 1 "scoreboard foreground alpha"
 seta sbar_scoreboard_alpha_name 0.9 "alpha of player text in scoreboard list other than self"
@@ -1123,6 +1115,11 @@ seta sbar_scoreboard_fadeoutspeed 5 "speed at which scoreboard fades out, higher
 seta sbar_scoreboard_highlight 1 "enable highlighting for rows and columns in the scoreboard"
 seta sbar_scoreboard_highlight_alpha 0.10 "highlight alpha value (depends on sbar_scoreboard_highlight 1)"
 seta sbar_scoreboard_highlight_alpha_self 0.25 "self highlight alpha value"
+seta sbar_stomachboard_color1 "0 0.5 0" "RGB color of the stomach board indicators for self"
+seta sbar_stomachboard_color2 "0.5 0 0" "RGB color of the stomach board indicators for predator"
+seta sbar_stomachboard_status_alpha 0.75 "alpha of the stomach board status"
+seta sbar_stomachboard_status_fade 1 "color fading speed of the stomach board status"
+seta sbar_stomachboard_highlight_alpha 0.25 "alpha of the stomach board highlight"
 seta sbar_timer_increment 0 "1 = show elapsed time on the timer"
 seta sbar_timer_scale 1 "scale multiplier of the timer"
 seta sbar_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted"
@@ -1132,7 +1129,7 @@ seta menu_slist_showfull 1 "show servers even if they are full and have no slots
 seta menu_slist_showempty 1 "show servers even if they are no empty and have no opponents to play against"
 set menu_slist_modfilter "=" // set to either: !modname or modname. modname of = means "same as we are running now".
 
-seta menu_maxplayers 8 "maxplayers value when the menu starts a game"
+seta menu_maxplayers 16 "maxplayers value when the menu starts a game"
 
 // command executed before loading a map by the menu
 // makes sure maxplayers is at least minplayers or bot_number + 1
@@ -1494,12 +1491,16 @@ set g_triggerimpulse_radial_multiplier 1 "trigger_impulse radial field multiplie
 seta g_ghost_items 1 "enable ghosted items (when between 0 and 1, overrides the alpha value)"
 seta g_ghost_items_color "-1 -1 -1" "color of ghosted items, 0 0 0 leaves the color unchanged"
 
+set cl_vore_stomachmodel 1 "when enabled, we see the stomach model around us when eaten. -1 = disabled, 1 = enabled, anything between 0 and 1 = alpha"
+set cl_vore_cameraspeed 1.5 "speed at which you see yourself sliding down when getting swallowed, 0 disables"
 set g_vore_regurgitatecolor_released "0.75 1 0.5" "the color players will have when released from the stomach alive"
 set g_vore_regurgitatecolor_digested "-0.125 0.25 0" "the color players will have when released from the stomach digested"
-set g_vore_gurglesound 1 "allow the ambient gurgle sound to play when there's someone in your stomach"
+set g_vore_gurglesound 1 "predators make an ambient gurgling sound"
 set g_vore_biggergut 1 "when enabled, a player can't swallow someone with more players in their stomach than them"
+set g_vore_stealprey 0.5 "probability of stealing the prey from someone you are eating (when true their prey joins your stomach rather than popping out). 0 = never and 1 = always"
 set g_vore_dropweapon 0.75 "probability of dropping your weapon when being swallowed. 0 = never and 1 = always, does not apply to team mates"
 set g_vore_showpreyhealth 1 "when enabled, a predator can see their prey's health on the stomach board"
+set g_vore_soundocclusion 0.25 "directional player sounds are played at this amount of their normal volume for eaten players (simulates hearing harder from the stomach)"
 
 set sv_weaponstats_damagefile "" "when set to a file name, per-weapon damage stats get written to that file"
 set sv_weaponstats_killfile "" "when set to a file name, per-weapon kill stats get written to that file"
@@ -1549,6 +1550,9 @@ collision_endposnudge 1
 set cl_lerpanim_maxdelta_framegroups 0.05 // must be faster than fastest weapon refire
 set cl_lerpanim_maxdelta_server 0.1 // must be slower than slowest server controlled anim (e.g. animinfo stuff)
 
+// sucks less than the old one
+cl_decals_newsystem 1
+
 // FIXME temporary
 set menu_font_size_snapping_fix 1