From: Morosophos Date: Wed, 25 Sep 2019 09:13:33 +0000 (+0300) Subject: Remove separate config for buffs X-Git-Tag: xonotic-v0.8.5~1271^2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0422be1e2fdb3fbfa26e61d4386088459bba0b22;p=xonotic%2Fxonotic-data.pk3dir.git Remove separate config for buffs Add modified cvars to rulest-XDF.cfg instead. --- diff --git a/buffs-xdf.cfg b/buffs-xdf.cfg deleted file mode 100644 index fcc3b5bbf..000000000 --- a/buffs-xdf.cfg +++ /dev/null @@ -1,79 +0,0 @@ -seta cl_buffs_autoreplace 1 -set g_buffs -1 -set g_buffs_effects 1 -set g_buffs_waypoint_distance 1024 -set g_buffs_pickup_anyway 1 -set g_buffs_pickup_delay 0 -set g_buffs_randomize 0 -set g_buffs_random_lifetime 0.1 -set g_buffs_random_location 0 -set g_buffs_random_location_attempts 10 -set g_buffs_spawn_count 0 -set g_buffs_replace_powerups 0 -set g_buffs_drop 0 -set g_buffs_cooldown_activate 0 -set g_buffs_cooldown_respawn 0 -set g_buffs_ammo 0 -set g_buffs_ammo_time 60 -set g_buffs_resistance 1 -set g_buffs_resistance_time 60 -set g_buffs_resistance_blockpercent 0.5 -set g_buffs_medic 0 -set g_buffs_medic_time 60 -set g_buffs_medic_survive_chance 0.6 -set g_buffs_medic_survive_health 5 -set g_buffs_medic_rot 0.2 -set g_buffs_medic_max 1.5 -set g_buffs_medic_regen 1.7 -set g_buffs_medic_heal_amount 15 -set g_buffs_medic_heal_range 400 -set g_buffs_medic_heal_delay 1 -set g_buffs_vengeance 1 -set g_buffs_vengeance_time 60 -set g_buffs_vengeance_damage_multiplier 0.4 -set g_buffs_bash 0 -set g_buffs_bash_time 60 -set g_buffs_bash_force 2 -set g_buffs_bash_force_self 1.2 -set g_buffs_disability 0 -set g_buffs_disability_time 60 -set g_buffs_disability_slowtime 3 -set g_buffs_disability_speed 0.7 -set g_buffs_disability_rate 1.5 -set g_buffs_disability_weaponspeed 0.7 -set g_buffs_speed 1 -set g_buffs_speed_time 30 -set g_buffs_speed_speed 1.3 // q3 haste lasts 30 seconds -set g_buffs_speed_rate 0.7692307692 // 1/1.3 -set g_buffs_speed_weaponspeed 1 // do not increase projectile speed -set g_buffs_speed_damage_take 1 -set g_buffs_speed_regen 1.2 -set g_buffs_vampire 1 -set g_buffs_vampire_time 60 -set g_buffs_vampire_damage_steal 0.4 -set g_buffs_jump 0 -set g_buffs_jump_time 60 -set g_buffs_jump_height 600 -set g_buffs_invisible 1 -set g_buffs_invisible_time 60 -set g_buffs_invisible_alpha 0.15 -set g_buffs_inferno 0 -set g_buffs_inferno_time 60 -set g_buffs_inferno_damagemultiplier 0.3 -set g_buffs_inferno_burntime_factor 2 -set g_buffs_inferno_burntime_min_time 0.5 -set g_buffs_inferno_burntime_target_damage 150 -set g_buffs_inferno_burntime_target_time 5 -set g_buffs_swapper 0 -set g_buffs_swapper_time 60 -set g_buffs_swapper_range 1500 -set g_buffs_magnet 0 -set g_buffs_magnet_time 60 -set g_buffs_magnet_range_item 250 -set g_buffs_magnet_range_buff 100 -set g_buffs_luck 0 -set g_buffs_luck_time 60 -set g_buffs_luck_chance 0.15 -set g_buffs_luck_damagemultiplier 2 -set g_buffs_flight 0 -set g_buffs_flight_time 60 diff --git a/ruleset-XDF.cfg b/ruleset-XDF.cfg index a0cc24b7b..e68b00a70 100644 --- a/ruleset-XDF.cfg +++ b/ruleset-XDF.cfg @@ -20,9 +20,37 @@ g_weapon_stay 1 "1: ghost weapons can be picked up too but give no ammo, 2: ghos teamplay_mode 2 // friendly fire and self damage sv_vote_nospectators 1 timelimit_override 20 -g_buffs_cooldown_respawn 0.1 + +// general buff settings +g_buffs_cooldown_activate 0 +g_buffs_cooldown_respawn 0 g_buffs_randomize 0 +// disabled buffs +g_buffs_ammo 0 +g_buffs_resistance 0 +g_buffs_medic 0 +g_buffs_vengeance 0 +g_buffs_bash 0 +g_buffs_disability 0 +g_buffs_vampire 0 +g_buffs_jump 0 +g_buffs_invisible 0 +g_buffs_inferno 0 +g_buffs_swapper 0 +g_buffs_magnet 0 +g_buffs_luck 0 +g_buffs_flight 0 + +// speed buff (q3 haste replacement) +g_buffs_speed 1 +g_buffs_speed_time 30 +g_buffs_speed_speed 1.3 // q3 haste lasts 30 seconds +g_buffs_speed_rate 0.7692307692 // 1/1.3 +g_buffs_speed_weaponspeed 1 // do not increase projectile speed +g_buffs_speed_damage_take 1 +g_buffs_speed_regen 1.2 + // game mode settings g_cts_finish_kill_delay 2 g_cts_selfdamage 0