From: tzork Date: Fri, 12 Nov 2010 06:17:17 +0000 (+0100) Subject: Support g_balance_crylink_primary_joinexplode. X-Git-Tag: xonotic-v0.1.0preview~153^2~2^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d1c6822cc0deb38e498fd1ab4bcff93bb6e7e103;p=xonotic%2Fxonotic-data.pk3dir.git Support g_balance_crylink_primary_joinexplode. --- diff --git a/balance25.cfg b/balance25.cfg index 8569fc85c..e21df9972 100644 --- a/balance25.cfg +++ b/balance25.cfg @@ -408,6 +408,11 @@ set g_balance_crylink_primary_ammo 2 set g_balance_crylink_primary_bouncedamagefactor 0.5 set g_balance_crylink_primary_joinspeed 0 set g_balance_crylink_primary_jointime 0 +set g_balance_crylink_primary_joinexplode 0 +set g_balance_crylink_primary_joinexplode_damage 0 +set g_balance_crylink_primary_joinexplode_edgedamage 0 +set g_balance_crylink_primary_joinexplode_radius 0 +set g_balance_crylink_primary_joinexplode_force 0 set g_balance_crylink_primary_linkexplode 1 set g_balance_crylink_primary_middle_lifetime 5 // range: 35000 full, fades to 70000 diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg index 144843191..2288341d5 100644 --- a/balanceLeeStricklin.cfg +++ b/balanceLeeStricklin.cfg @@ -419,6 +419,11 @@ set g_balance_crylink_primary_ammo 3 set g_balance_crylink_primary_bouncedamagefactor 0.2 set g_balance_crylink_primary_joinspeed 0 set g_balance_crylink_primary_jointime 0 +set g_balance_crylink_primary_joinexplode 0 +set g_balance_crylink_primary_joinexplode_damage 0 +set g_balance_crylink_primary_joinexplode_edgedamage 0 +set g_balance_crylink_primary_joinexplode_radius 0 +set g_balance_crylink_primary_joinexplode_force 0 set g_balance_crylink_primary_linkexplode 1 set g_balance_crylink_primary_middle_lifetime 5 // range: 10000 full, fades to 20000 diff --git a/balanceNexSVN.cfg b/balanceNexSVN.cfg index 59c506c6a..b5d3fcccf 100644 --- a/balanceNexSVN.cfg +++ b/balanceNexSVN.cfg @@ -407,6 +407,11 @@ set g_balance_crylink_primary_ammo 2 set g_balance_crylink_primary_bouncedamagefactor 0.5 set g_balance_crylink_primary_joinspeed 0 set g_balance_crylink_primary_jointime 0 +set g_balance_crylink_primary_joinexplode 0 +set g_balance_crylink_primary_joinexplode_damage 0 +set g_balance_crylink_primary_joinexplode_edgedamage 0 +set g_balance_crylink_primary_joinexplode_radius 0 +set g_balance_crylink_primary_joinexplode_force 0 set g_balance_crylink_primary_linkexplode 1 set g_balance_crylink_primary_middle_lifetime 5 // range: 35000 full, fades to 70000 diff --git a/balanceSamual.cfg b/balanceSamual.cfg index 555c231d5..4148ce068 100644 --- a/balanceSamual.cfg +++ b/balanceSamual.cfg @@ -408,8 +408,12 @@ set g_balance_crylink_primary_ammo 2 set g_balance_crylink_primary_bouncedamagefactor 0.5 set g_balance_crylink_primary_joinspeed 0 set g_balance_crylink_primary_jointime 0 +set g_balance_crylink_primary_joinexplode 0 +set g_balance_crylink_primary_joinexplode_damage 0 +set g_balance_crylink_primary_joinexplode_edgedamage 0 +set g_balance_crylink_primary_joinexplode_radius 0 +set g_balance_crylink_primary_joinexplode_force 0 set g_balance_crylink_primary_linkexplode 1 - set g_balance_crylink_primary_middle_lifetime 5 // range: 35000 full, fades to 70000 set g_balance_crylink_primary_middle_fadetime 5 set g_balance_crylink_primary_other_lifetime 0.1 // range: 700 full, fades to 2450 diff --git a/balanceTest.cfg b/balanceTest.cfg index 8abc27fe8..c9a06f8ad 100644 --- a/balanceTest.cfg +++ b/balanceTest.cfg @@ -408,6 +408,11 @@ set g_balance_crylink_primary_ammo 2 set g_balance_crylink_primary_bouncedamagefactor 0.2 set g_balance_crylink_primary_joinspeed 250 set g_balance_crylink_primary_jointime 0 +set g_balance_crylink_primary_joinexplode 0 +set g_balance_crylink_primary_joinexplode_damage 0 +set g_balance_crylink_primary_joinexplode_edgedamage 0 +set g_balance_crylink_primary_joinexplode_radius 0 +set g_balance_crylink_primary_joinexplode_force 0 set g_balance_crylink_primary_linkexplode 0 set g_balance_crylink_primary_middle_lifetime 5 // range: 10000 full, fades to 20000 diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg index eb72b126d..d00c292c5 100644 --- a/balanceXonotic.cfg +++ b/balanceXonotic.cfg @@ -408,6 +408,11 @@ set g_balance_crylink_primary_ammo 2 set g_balance_crylink_primary_bouncedamagefactor 0.2 set g_balance_crylink_primary_joinspeed 250 set g_balance_crylink_primary_jointime 0 +set g_balance_crylink_primary_joinexplode 0 +set g_balance_crylink_primary_joinexplode_damage 0 +set g_balance_crylink_primary_joinexplode_edgedamage 0 +set g_balance_crylink_primary_joinexplode_radius 0 +set g_balance_crylink_primary_joinexplode_force 0 set g_balance_crylink_primary_linkexplode 0 set g_balance_crylink_primary_middle_lifetime 5 // range: 10000 full, fades to 20000 diff --git a/balancetZork.cfg b/balancetZork.cfg index 4de12ee5c..8bb1f4859 100644 --- a/balancetZork.cfg +++ b/balancetZork.cfg @@ -416,24 +416,28 @@ set g_balance_electro_combo_comboradius 0 set g_balance_electro_combo_speed 1000 // }}} // {{{ crylink -set g_balance_crylink_primary_damage 20 -set g_balance_crylink_primary_edgedamage 5 -set g_balance_crylink_primary_force 50 -set g_balance_crylink_primary_radius 50 -set g_balance_crylink_primary_speed 2000 -set g_balance_crylink_primary_spread 0.075 -set g_balance_crylink_primary_shots 4 +set g_balance_crylink_primary_damage 5 +set g_balance_crylink_primary_edgedamage 3 +set g_balance_crylink_primary_force 10 +set g_balance_crylink_primary_radius 15 +set g_balance_crylink_primary_speed 1500 +set g_balance_crylink_primary_spread 0.1 +set g_balance_crylink_primary_shots 8 set g_balance_crylink_primary_bounces 1 set g_balance_crylink_primary_refire 1 set g_balance_crylink_primary_animtime 0.4 set g_balance_crylink_primary_ammo 2 set g_balance_crylink_primary_bouncedamagefactor 0.2 -set g_balance_crylink_primary_joinspeed 0 +set g_balance_crylink_primary_joinspeed 150 set g_balance_crylink_primary_jointime 0 -set g_balance_crylink_secondary_linkexplode 1 - +set g_balance_crylink_primary_joinexplode 1 //if != 0 do a extra damage pass when projectiles join +set g_balance_crylink_primary_joinexplode_damage 100 //Max demage (Determined by % of _primary_shots that joins) +set g_balance_crylink_primary_joinexplode_edgedamage 20 +set g_balance_crylink_primary_joinexplode_radius 200 +set g_balance_crylink_primary_joinexplode_force 400 +set g_balance_crylink_primary_linkexplode 0 set g_balance_crylink_primary_middle_lifetime 5 -set g_balance_crylink_primary_middle_fadetime 5 +set g_balance_crylink_primary_middle_fadetime 0.25 set g_balance_crylink_primary_other_lifetime 2 // range: 800 full, fades to 1300 set g_balance_crylink_primary_other_fadetime 0.25 @@ -453,7 +457,7 @@ set g_balance_crylink_secondary_ammo 1 set g_balance_crylink_secondary_bouncedamagefactor 0.5 set g_balance_crylink_secondary_joinspeed 0 set g_balance_crylink_secondary_jointime 0 -set g_balance_crylink_primary_linkexplode 1 +set g_balance_crylink_secondary_linkexplode 0 set g_balance_crylink_secondary_middle_lifetime 5 // range: 10000 full, fades to 10000 set g_balance_crylink_secondary_middle_fadetime 5 @@ -461,9 +465,9 @@ set g_balance_crylink_secondary_line_lifetime 2 // range: 4000 full, fades to 80 set g_balance_crylink_secondary_line_fadetime 2 // }}} // {{{ nex -set g_balance_nex_primary_damage 110 +set g_balance_nex_primary_damage 100 set g_balance_nex_primary_force 600 -set g_balance_nex_primary_refire 0.75 +set g_balance_nex_primary_refire 1 set g_balance_nex_primary_animtime 0.3 set g_balance_nex_primary_ammo 5 set g_balance_nex_primary_damagefalloff_mindist 0 @@ -473,7 +477,7 @@ set g_balance_nex_primary_damagefalloff_forcehalflife 0 set g_balance_nex_secondary 1 set g_balance_nex_secondary_charge 1 -set g_balance_nex_secondary_charge_rate 0.6 +set g_balance_nex_secondary_charge_rate 0.55 set g_balance_nex_secondary_damage 100 set g_balance_nex_secondary_force 600 set g_balance_nex_secondary_refire 1.5 @@ -614,13 +618,13 @@ set g_balance_campingrifle_reloadtime 2 // matches reload anim set g_balance_campingrifle_auto_reload_after_changing_weapons 0 set g_balance_campingrifle_bursttime 0 set g_balance_campingrifle_primary_tracer 1 -set g_balance_campingrifle_primary_damage 50 -set g_balance_campingrifle_primary_headshotaddeddamage 90 +set g_balance_campingrifle_primary_damage 40 +set g_balance_campingrifle_primary_headshotaddeddamage 100 set g_balance_campingrifle_primary_spread 0 set g_balance_campingrifle_primary_force 2 set g_balance_campingrifle_primary_speed 40000 set g_balance_campingrifle_primary_lifetime 5 -set g_balance_campingrifle_primary_refire 0.5 +set g_balance_campingrifle_primary_refire 0.65 set g_balance_campingrifle_primary_animtime 0.6 set g_balance_campingrifle_primary_ammo 10 set g_balance_campingrifle_primary_bulletconstant 110 // 62.2qu diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc index 592582749..747dc4edc 100644 --- a/qcsrc/server/w_crylink.qc +++ b/qcsrc/server/w_crylink.qc @@ -148,6 +148,16 @@ void W_Crylink_LinkJoinEffect_Think() } if(n >= 2) { + + if(cvar("g_balance_crylink_primary_joinexplode")) + { + n = n / cvar("g_balance_crylink_primary_shots"); + RadiusDamage (e, e.realowner, cvar("g_balance_crylink_primary_joinexplode_damage") * n, + cvar("g_balance_crylink_primary_joinexplode_edgedamage") * n, + cvar("g_balance_crylink_primary_joinexplode_radius") * n, world, + cvar("g_balance_crylink_primary_joinexplode_force") * n, e.projectiledeathtype, other); + } + // they seem to touch... // TODO make a specific particle effect for this pointparticles(particleeffectnum("crylink_linkjoin"), self.origin, '0 0 0', 1);