From: Martin Taibr Date: Mon, 17 Jul 2017 00:38:31 +0000 (+0200) Subject: move bugrigs and running_guns into mutators.cfg X-Git-Tag: xonotic-v0.8.5~2430^2~68 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ff76afcc6fffbc6b6e53db6054a4e8c5a7163efb;p=xonotic%2Fxonotic-data.pk3dir.git move bugrigs and running_guns into mutators.cfg --- diff --git a/defaultServer.cfg b/defaultServer.cfg index 9dbaa1593..f24b8dab3 100644 --- a/defaultServer.cfg +++ b/defaultServer.cfg @@ -444,22 +444,6 @@ set g_maplist_allow_frustrating 0 "allow impossible maps to be, e.g., voted for set sv_clones 0 "number of clones a player may make (reset by the \"kill\" command)" -set g_bugrigs 0 -set g_bugrigs_planar_movement 1 "BROTRR bug emulation" -set g_bugrigs_planar_movement_car_jumping 1 "my own bug" -set g_bugrigs_reverse_speeding 1 "BROTRR bug emulation" -set g_bugrigs_reverse_spinning 1 "BROTRR bug emulation" -set g_bugrigs_reverse_stopping 1 "BROTRR bug emulation" -set g_bugrigs_air_steering 1 "NFS bug emulation" -set g_bugrigs_angle_smoothing 5 "smooth the car angle a bit, looks nice" -set g_bugrigs_friction_floor 50 "units/sec friction on floor" -set g_bugrigs_friction_brake 950 "units/sec friction for braking" -set g_bugrigs_friction_air 0.00001 "(very small) v <- v - v^2 * g_bugrigs_friction_air" -set g_bugrigs_accel 800 "acceleration" -set g_bugrigs_speed_ref 400 "reference speed for accel and steer responsiveness" -set g_bugrigs_speed_pow 2 "reference power for accel and steer responsiveness" -set g_bugrigs_steer 1 "steering amount" - set g_ban_sync_uri "" "sync using this ban list provider (empty string to disable)" set g_ban_sync_interval 5 "sync every 5 minutes" set g_ban_sync_trusted_servers "" "request ban lists from these xonotic servers (do not include your own server there, or unbanning may fail)" @@ -486,8 +470,6 @@ seta sv_gentle 0 "force gentle mode for everyone, also remove references to act set g_jetpack 0 "Jetpack mutator" -set g_running_guns 0 "... or wonder, till it drives you mad, what would have followed if you had." - set g_hitplots 0 "when set to 1, hitplots are stored by the server to provide a means of proving that a triggerbot was used" seta g_hitplots_individuals "" "the individuals, by IP, that should have their hitplots recorded" diff --git a/mutators.cfg b/mutators.cfg index d07849489..cee083932 100644 --- a/mutators.cfg +++ b/mutators.cfg @@ -440,3 +440,27 @@ set g_globalforces 0 "Global forces: knockback affects everyone" set g_globalforces_noself 1 "Global forces: ignore self damage" set g_globalforces_self 1 "Global forces: knockback self scale" set g_globalforces_range 1000 "Global forces: max range of effect" + +// ========= +// bugrigs +// ========= +set g_bugrigs 0 +set g_bugrigs_planar_movement 1 "BROTRR bug emulation" +set g_bugrigs_planar_movement_car_jumping 1 "my own bug" +set g_bugrigs_reverse_speeding 1 "BROTRR bug emulation" +set g_bugrigs_reverse_spinning 1 "BROTRR bug emulation" +set g_bugrigs_reverse_stopping 1 "BROTRR bug emulation" +set g_bugrigs_air_steering 1 "NFS bug emulation" +set g_bugrigs_angle_smoothing 5 "smooth the car angle a bit, looks nice" +set g_bugrigs_friction_floor 50 "units/sec friction on floor" +set g_bugrigs_friction_brake 950 "units/sec friction for braking" +set g_bugrigs_friction_air 0.00001 "(very small) v <- v - v^2 * g_bugrigs_friction_air" +set g_bugrigs_accel 800 "acceleration" +set g_bugrigs_speed_ref 400 "reference speed for accel and steer responsiveness" +set g_bugrigs_speed_pow 2 "reference power for accel and steer responsiveness" +set g_bugrigs_steer 1 "steering amount" + +// ============== +// running guns +// ============== +set g_running_guns 0 "... or wonder, till it drives you mad, what would have followed if you had."