Merge branch 'bones_was_here/hlac_speed' into 'master'

Set HLAC projectile speed to 6000, matches Blaster

See merge request xonotic/xonotic-data.pk3dir!905

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index cb7e71ce29e5674513c59366db4ce03dd4770374..7715b7c46d707322746680f1f450a5b2cdb9f375 100644 (file)
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -505,7 +505,7 @@ set g_balance_hlac_primary_force 90
 set g_balance_hlac_primary_lifetime 5
 set g_balance_hlac_primary_radius 70
 set g_balance_hlac_primary_refire 0.15
-set g_balance_hlac_primary_speed 9000
+set g_balance_hlac_primary_speed 6000
 set g_balance_hlac_primary_spread_add 0.0045
 set g_balance_hlac_primary_spread_crouchmod 0.25
 set g_balance_hlac_primary_spread_max 0.25
@@ -522,7 +522,7 @@ set g_balance_hlac_secondary_lifetime 5
 set g_balance_hlac_secondary_radius 70
 set g_balance_hlac_secondary_refire 1
 set g_balance_hlac_secondary_shots 6
-set g_balance_hlac_secondary_speed 9000
+set g_balance_hlac_secondary_speed 6000
 set g_balance_hlac_secondary_spread 0.15
 set g_balance_hlac_secondary_spread_crouchmod 0.5
 set g_balance_hlac_switchdelay_drop 0.2

diff --git a/balance-mario.cfg b/balance-mario.cfg
index ad6a0e5c42c40a254c2c8015e3fb7384f6d3b53a..42e3a66967db0f6d958a220c9a9e6425c1683f1d 100644 (file)
--- a/balance-mario.cfg
+++ b/balance-mario.cfg
@@ -263,4 +263,8 @@ set g_balance_portal_health 200 // these get recharged whenever the portal is us
 set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used
 // }}}
 
+// {{{ hlac
+// hlac projectile settings are supposed to match the blaster, make sure they match when updating the blaster balance
+// }}}
+
 exec bal-wep-mario.cfg

diff --git a/balance-nexuiz25.cfg b/balance-nexuiz25.cfg
index 80716a51b945d771c5f6e1c1f357951b91b8d910..6cdc29dcc4deec4152bd1e8f985cf87630e90de9 100644 (file)
--- a/balance-nexuiz25.cfg
+++ b/balance-nexuiz25.cfg
@@ -263,4 +263,8 @@ set g_balance_portal_health 200 // these get recharged whenever the portal is us
 set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used
 // }}}
 
+// {{{ hlac
+// hlac projectile settings are supposed to match the blaster, make sure they match when updating the blaster balance
+// }}}
+
 exec bal-wep-nexuiz25.cfg

diff --git a/balance-overkill.cfg b/balance-overkill.cfg
index 2ab3e5b4c3ff81ec348fd86ba2d6621c11b29b1a..e33ee827f66699289c388db8bd38351d4e8c8ccf 100644 (file)
--- a/balance-overkill.cfg
+++ b/balance-overkill.cfg
@@ -262,3 +262,7 @@ set g_balance_grapplehook_pull_frozen 0
 set g_balance_portal_health 200 // these get recharged whenever the portal is used
 set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used
 // }}}
+
+// {{{ hlac
+// hlac projectile settings are supposed to match the blaster, make sure they match when updating the blaster balance
+// }}}

diff --git a/balance-samual.cfg b/balance-samual.cfg
index 24e166ae02d70595b4a0caf28024ac727e2d20c6..7850aaba8b97eac07e8c77dce3ee632d85433a09 100644 (file)
--- a/balance-samual.cfg
+++ b/balance-samual.cfg
@@ -263,4 +263,8 @@ set g_balance_portal_health 200 // these get recharged whenever the portal is us
 set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used
 // }}}
 
+// {{{ hlac
+// hlac projectile settings are supposed to match the blaster, make sure they match when updating the blaster balance
+// }}}
+
 exec bal-wep-samual.cfg

diff --git a/balance-xdf.cfg b/balance-xdf.cfg
index ddea3d6eb6c6379eb5c1ea5343696df56274aaf5..94e98a6461ccc1f85ded776b3bd7685f9c6f71ad 100644 (file)
--- a/balance-xdf.cfg
+++ b/balance-xdf.cfg
@@ -263,4 +263,8 @@ set g_balance_portal_health 200 // these get recharged whenever the portal is us
 set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used
 // }}}
 
+// {{{ hlac
+// hlac projectile settings are supposed to match the blaster, make sure they match when updating the blaster balance
+// }}}
+
 exec bal-wep-xdf.cfg

diff --git a/balance-xonotic.cfg b/balance-xonotic.cfg
index ee2da53f12ce6f447189ac8fe091e7415bb08b47..5731be9f5f24e0311f84f01aeef467fd68ce161e 100644 (file)
--- a/balance-xonotic.cfg
+++ b/balance-xonotic.cfg
@@ -263,4 +263,8 @@ set g_balance_portal_health 200 // these get recharged whenever the portal is us
 set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used
 // }}}
 
+// {{{ hlac
+// hlac projectile settings are supposed to match the blaster, make sure they match when updating the blaster balance
+// }}}
+
 exec bal-wep-xonotic.cfg

diff --git a/balance-xpm.cfg b/balance-xpm.cfg
index 2eac05cc557e8f9e62a084d034930fc533beec50..ed2b81c3f3e4a6093ad6127b410803eb2f841d0c 100644 (file)
--- a/balance-xpm.cfg
+++ b/balance-xpm.cfg
@@ -263,4 +263,8 @@ set g_balance_portal_health 200 // these get recharged whenever the portal is us
 set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used
 // }}}
 
+// {{{ hlac
+// hlac projectile settings are supposed to match the blaster, make sure they match when updating the blaster balance
+// }}}
+
 exec bal-wep-xonotic.cfg