From: drjaska <drjaska83@gmail.com>
Date: Mon, 20 Mar 2023 18:14:28 +0000 (+0200)
Subject: brainfartfixes
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b9de6995179fe935e8c53df0e02ccf5af2544f74;p=xonotic%2Fxonotic-data.pk3dir.git

brainfartfixes
---

diff --git a/bal-wep-legacyxdf.cfg b/bal-wep-legacyxdf.cfg
index 58d388b9d..09466acce 100644
--- a/bal-wep-legacyxdf.cfg
+++ b/bal-wep-legacyxdf.cfg
@@ -1,5 +1,3 @@
-set g_balance_damagepush_speedfactor 2.5
-
 // {{{ #1: Blaster
 set g_balance_blaster_primary_animtime 0.2
 set g_balance_blaster_primary_damage 20
diff --git a/bal-wep-xdf.cfg b/bal-wep-xdf.cfg
index 23ed67d8e..544406c12 100644
--- a/bal-wep-xdf.cfg
+++ b/bal-wep-xdf.cfg
@@ -1,5 +1,3 @@
-set g_balance_damagepush_speedfactor 0
-
 // {{{ #1: Blaster
 set g_balance_blaster_primary_animtime 0.2
 set g_balance_blaster_primary_damage 20
@@ -131,7 +129,7 @@ set g_balance_mortar_secondary_health 30
 set g_balance_mortar_secondary_lifetime 8
 set g_balance_mortar_secondary_lifetime_bounce 0.5
 set g_balance_mortar_secondary_lifetime_stick 0
-set g_balance_mortar_secondary_radius 200 //should be 150
+set g_balance_mortar_secondary_radius 200 //should be 150 for q3 compliance
 set g_balance_mortar_secondary_refire 0.7
 set g_balance_mortar_secondary_remote_detonateprimary 0
 set g_balance_mortar_secondary_speed 800
@@ -348,7 +346,7 @@ set g_balance_hagar_primary_ammo 1
 set g_balance_hagar_primary_damage 25
 set g_balance_hagar_primary_damageforcescale 0
 set g_balance_hagar_primary_edgedamage 12.5
-set g_balance_hagar_primary_force 75 // maybe 65?
+set g_balance_hagar_primary_force 65 // should be 40 for q3 compliance
 set g_balance_hagar_primary_health 15
 set g_balance_hagar_primary_lifetime 5
 set g_balance_hagar_primary_radius 20
diff --git a/balance-legacyxdf.cfg b/balance-legacyxdf.cfg
index 5637410f0..168f8e721 100644
--- a/balance-legacyxdf.cfg
+++ b/balance-legacyxdf.cfg
@@ -219,6 +219,7 @@ set g_balance_falldamage_minspeed 900
 set g_balance_falldamage_factor 0.20
 set g_balance_falldamage_maxdamage 40
 set g_balance_falldamage_onlyvertical 0
+set g_balance_damagepush_speedfactor 2.5
 set g_balance_contents_damagerate 0.2 // ticrate interval for applying damage with playerdamage/projectiledamage
 set g_balance_contents_drowndelay 10 // time under water before a player begins drowning
 set g_balance_contents_playerdamage_drowning 20 // damage per second for while player is drowning
@@ -282,4 +283,4 @@ set g_balance_portal_lifetime 15 // these get recharged whenever the portal is u
 // hlac projectile settings are supposed to match the blaster, make sure they match when updating the blaster balance
 // }}}
 
-exec bal-wep-xdf.cfg
+exec bal-wep-legacyxdf.cfg
diff --git a/balance-xdf.cfg b/balance-xdf.cfg
index 5637410f0..3763baa56 100644
--- a/balance-xdf.cfg
+++ b/balance-xdf.cfg
@@ -219,6 +219,7 @@ set g_balance_falldamage_minspeed 900
 set g_balance_falldamage_factor 0.20
 set g_balance_falldamage_maxdamage 40
 set g_balance_falldamage_onlyvertical 0
+set g_balance_damagepush_speedfactor 0
 set g_balance_contents_damagerate 0.2 // ticrate interval for applying damage with playerdamage/projectiledamage
 set g_balance_contents_drowndelay 10 // time under water before a player begins drowning
 set g_balance_contents_playerdamage_drowning 20 // damage per second for while player is drowning