From: Dr. Jaska Date: Tue, 11 Jul 2023 22:10:49 +0000 (+0000) Subject: Implemented 3 Balance Council votes X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6ac3d2917f9c0a71acc8139b6c4a43850ab96add;p=xonotic%2Fxonotic-data.pk3dir.git Implemented 3 Balance Council votes --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd99d5e35..48fa0d93f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,7 +75,7 @@ test_sv_game: - wget -nv -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints - wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache - - EXPECT=12af950c278c649fbe8bcad6acf89bdb + - EXPECT=9fb6b4ba8c0f8b04995c123e3801b32d - HASH=$(${ENGINE} +exec serverbench.cfg | tee /dev/stderr | grep '^:' diff --git a/bal-wep-mario.cfg b/bal-wep-mario.cfg index 5cb22ec3c..25293a947 100644 --- a/bal-wep-mario.cfg +++ b/bal-wep-mario.cfg @@ -79,7 +79,7 @@ set g_balance_machinegun_first_force 3 set g_balance_machinegun_first_refire 0.125 set g_balance_machinegun_first_spread 0.03 set g_balance_machinegun_mode 1 -set g_balance_machinegun_reload_ammo 60 +set g_balance_machinegun_reload_ammo 0 set g_balance_machinegun_reload_time 2 set g_balance_machinegun_solidpenetration 13.1 set g_balance_machinegun_spread_add 0.012 diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg index de6d5418d..29d73a424 100644 --- a/bal-wep-xonotic.cfg +++ b/bal-wep-xonotic.cfg @@ -79,7 +79,7 @@ set g_balance_machinegun_first_force 3 set g_balance_machinegun_first_refire 0.125 set g_balance_machinegun_first_spread 0.03 set g_balance_machinegun_mode 1 -set g_balance_machinegun_reload_ammo 60 +set g_balance_machinegun_reload_ammo 0 set g_balance_machinegun_reload_time 2 set g_balance_machinegun_solidpenetration 13.1 set g_balance_machinegun_spread_add 0.012 diff --git a/ruleset-XPM.cfg b/ruleset-XPM.cfg index 0cbd29c39..50ce89066 100644 --- a/ruleset-XPM.cfg +++ b/ruleset-XPM.cfg @@ -6,7 +6,6 @@ exec xonotic-server.cfg exec balance-xpm.cfg // general gameplay -g_shootfromeye 1 // hit where you point at with the crosshair (promoders don't care about ugliness) g_balance_kill_antispam 0 g_forced_respawn 1 teamplay_mode 2 // friendly fire and self damage diff --git a/xonotic-server.cfg b/xonotic-server.cfg index 819ef7a50..707e2ba8e 100644 --- a/xonotic-server.cfg +++ b/xonotic-server.cfg @@ -193,14 +193,14 @@ set g_spawnshieldtime 1 "number of seconds you are invincible after you spawned, set g_spawnshield_blockdamage 1 "how much spawn shield protects you from damage (1 = full protection)" set g_antilag 2 "AntiLag (0 = no AntiLag, 1 = verified client side hit scan, 2 = server side hit scan in the past)" set g_antilag_nudge 0 "don't touch" -set g_shootfromeye 0 "shots are fired from your eye/crosshair; visual gun position can still be influenced by cl_gunalign 1 and 2" +set g_shootfromeye 1 "shots are fired from your eye/crosshair; visual gun position can still be influenced by cl_gunalign 1 and 2" set g_shootfromcenter 0 "weapon gets moved to the center, shots still come from the barrel of your weapon; visual gun position can still be influenced by cl_gunalign 1 and 2" set g_shootfromfixedorigin "" "if set to a string like 0 y z, the gun is moved to the given y and z coordinates. If set to a string like x y z, the whole shot origin is used" set g_weapon_stay 0 "1: ghost weapons can be picked up but give no ammo, thrown guns have ammo 2: ghost weapons can be picked up and refill ammo to one pickup size, thrown guns have no ammo (to prevent infinite ammo abuse)" set g_weapon_throwable 1 "if set to 1, weapons can be dropped" set g_powerups -1 "if set to 0 no powerups will spawn, if 1 they will spawn in all game modes, -1 is game mode default" set g_powerups_drop 0 "allow dropping powerups (1 = timer continues, 2 = timer freezes until picked up)" -set g_powerups_drop_ondeath 0 "players will drop their powerups on death (1 = timer continues, 2 = timer freezes until picked up)" +set g_powerups_drop_ondeath 1 "players will drop their powerups on death (1 = timer continues, 2 = timer freezes until picked up)" set g_powerups_stack 0 "enables stacking of powerup timers when picking up a powerup you already have; otherwise timer is reset to the time granted by the item, if greater than the time you currently have" set g_powerups_strength 1 "allow strength powerups to spawn" set g_powerups_shield 1 "allow shield powerups to spawn"