From: Martin Taibr Date: Sat, 17 Aug 2019 18:28:33 +0000 (+0200) Subject: Merge branch 'master' into martin-t/ok-config and remove workaround from ruleset cfg X-Git-Tag: xonotic-v0.8.5~1385^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ca9f533b1a28ea7648da1df2c6548f11675d2bc1;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into martin-t/ok-config and remove workaround from ruleset cfg --- ca9f533b1a28ea7648da1df2c6548f11675d2bc1 diff --cc bal-wep-xonotic.cfg index dd2c9ed6e,44ca94b9b..bf33f599a --- a/bal-wep-xonotic.cfg +++ b/bal-wep-xonotic.cfg @@@ -796,7 -797,8 +797,8 @@@ set g_balance_okhmg_secondary_animtime set g_balance_okhmg_secondary_damage 25 set g_balance_okhmg_secondary_delay 0 set g_balance_okhmg_secondary_edgedamage 12.5 -set g_balance_okhmg_secondary_force 300 +set g_balance_okhmg_secondary_force 360 + set g_balance_okhmg_secondary_force_zscale 1 set g_balance_okhmg_secondary_lifetime 5 set g_balance_okhmg_secondary_radius 70 set g_balance_okhmg_secondary_refire 0.7 @@@ -826,7 -828,8 +828,8 @@@ set g_balance_okmachinegun_secondary_an set g_balance_okmachinegun_secondary_damage 25 set g_balance_okmachinegun_secondary_delay 0 set g_balance_okmachinegun_secondary_edgedamage 12.5 -set g_balance_okmachinegun_secondary_force 300 +set g_balance_okmachinegun_secondary_force 360 + set g_balance_okmachinegun_secondary_force_zscale 1 set g_balance_okmachinegun_secondary_lifetime 5 set g_balance_okmachinegun_secondary_radius 70 set g_balance_okmachinegun_secondary_refire 0.7 @@@ -878,7 -881,8 +881,8 @@@ set g_balance_oknex_secondary_damagefal set g_balance_oknex_secondary_damagefalloff_mindist 0 set g_balance_oknex_secondary_delay 0 set g_balance_oknex_secondary_edgedamage 12.5 -set g_balance_oknex_secondary_force 300 +set g_balance_oknex_secondary_force 360 + set g_balance_oknex_secondary_force_zscale 1 set g_balance_oknex_secondary_lifetime 5 set g_balance_oknex_secondary_radius 70 set g_balance_oknex_secondary_refire 0.7 @@@ -914,7 -918,8 +918,8 @@@ set g_balance_okrpc_secondary_animtime set g_balance_okrpc_secondary_damage 25 set g_balance_okrpc_secondary_delay 0 set g_balance_okrpc_secondary_edgedamage 12.5 -set g_balance_okrpc_secondary_force 300 +set g_balance_okrpc_secondary_force 360 + set g_balance_okrpc_secondary_force_zscale 1 set g_balance_okrpc_secondary_lifetime 5 set g_balance_okrpc_secondary_radius 70 set g_balance_okrpc_secondary_refire 0.7 @@@ -945,7 -950,8 +950,8 @@@ set g_balance_okshotgun_secondary_animt set g_balance_okshotgun_secondary_damage 25 set g_balance_okshotgun_secondary_delay 0 set g_balance_okshotgun_secondary_edgedamage 12.5 -set g_balance_okshotgun_secondary_force 300 +set g_balance_okshotgun_secondary_force 360 + set g_balance_okshotgun_secondary_force_zscale 1 set g_balance_okshotgun_secondary_lifetime 5 set g_balance_okshotgun_secondary_radius 70 set g_balance_okshotgun_secondary_refire 0.7 diff --cc ruleset-overkill.cfg index 27ae48a40,15086f22a..28b3d90a5 --- a/ruleset-overkill.cfg +++ b/ruleset-overkill.cfg @@@ -8,36 -8,31 +8,33 @@@ exec physicsOverkill.cf exec randomitems-overkill.cfg if_dedicated exec help-overkill.cfg -// general gameplay -set g_overkill 1 +g_overkill 1 + +g_use_ammunition 0 - // temporary workaround since overkill has no bal-wep file and insta also uses the secondary cvar - g_balance_blaster_secondary_force_zscale 1.2 - // hack - eventually, we should be able to choose overkill models in menu like for vanilla -set sv_defaultcharacter 1 -set sv_defaultplayermodel "models/ok_player/okrobot1.dpm models/ok_player/okrobot2.dpm models/ok_player/okrobot3.dpm models/ok_player/okrobot4.dpm models/ok_player/okmale1.dpm models/ok_player/okmale2.dpm models/ok_player/okmale3.dpm models/ok_player/okmale4.dpm" -set sv_defaultplayermodel_red "models/ok_player/okrobot1.dpm models/ok_player/okrobot2.dpm models/ok_player/okrobot3.dpm models/ok_player/okrobot4.dpm" -set sv_defaultplayermodel_blue "models/ok_player/okmale1.dpm models/ok_player/okmale2.dpm models/ok_player/okmale3.dpm models/ok_player/okmale4.dpm" -set sv_defaultplayermodel_yellow "models/ok_player/okrobot1.dpm models/ok_player/okrobot2.dpm models/ok_player/okrobot3.dpm models/ok_player/okrobot4.dpm" -set sv_defaultplayermodel_pink "models/ok_player/okmale1.dpm models/ok_player/okmale2.dpm models/ok_player/okmale3.dpm models/ok_player/okmale4.dpm" - -set g_respawn_ghosts 0 - -set g_nades 1 -set g_nades_nade_small 1 -set g_nades_spread 0 -set g_nades_nade_refire 10 -set g_nades_nade_newton_style 2 - -set g_dodging 1 -set sv_dodging_wall_dodging 1 - -set g_spawn_near_teammate "!g_assault !g_freezetag" -set g_spawn_near_teammate_ignore_spawnpoint 1 -set g_spawnshieldtime 0.5 -set g_respawn_delay_forced 2 - -set g_lms_start_armor 100 +sv_defaultcharacter 1 +sv_defaultplayermodel "models/ok_player/okrobot1.dpm models/ok_player/okrobot2.dpm models/ok_player/okrobot3.dpm models/ok_player/okrobot4.dpm models/ok_player/okmale1.dpm models/ok_player/okmale2.dpm models/ok_player/okmale3.dpm models/ok_player/okmale4.dpm" +sv_defaultplayermodel_red "models/ok_player/okrobot1.dpm models/ok_player/okrobot2.dpm models/ok_player/okrobot3.dpm models/ok_player/okrobot4.dpm" +sv_defaultplayermodel_blue "models/ok_player/okmale1.dpm models/ok_player/okmale2.dpm models/ok_player/okmale3.dpm models/ok_player/okmale4.dpm" +sv_defaultplayermodel_yellow "models/ok_player/okrobot1.dpm models/ok_player/okrobot2.dpm models/ok_player/okrobot3.dpm models/ok_player/okrobot4.dpm" +sv_defaultplayermodel_pink "models/ok_player/okmale1.dpm models/ok_player/okmale2.dpm models/ok_player/okmale3.dpm models/ok_player/okmale4.dpm" + +g_fullbrightplayers 1 +g_respawn_ghosts 0 + +g_nades 1 +g_nades_nade_small 1 +g_nades_spread 0 +g_nades_nade_refire 10 +g_nades_nade_newton_style 2 + +g_dodging 1 +sv_dodging_wall_dodging 1 + +g_spawn_near_teammate "!g_assault !g_freezetag" +g_spawn_near_teammate_ignore_spawnpoint 1 +g_spawnshieldtime 0.5 +g_respawn_delay_forced 2 + +g_buffs_resistance_blockpercent 0.5