From: Rudolf Polzer Date: Fri, 16 Aug 2013 13:53:15 +0000 (+0200) Subject: crylink: kill jointime X-Git-Tag: xonotic-v0.8.0~363 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a6429c18eca824a5eff9995cd01672c23d39f61a;p=xonotic%2Fxonotic-data.pk3dir.git crylink: kill jointime --- diff --git a/balance25.cfg b/balance25.cfg index 343891810..9f6571859 100644 --- a/balance25.cfg +++ b/balance25.cfg @@ -440,7 +440,6 @@ set g_balance_crylink_primary_ammo 2 set g_balance_crylink_primary_bouncedamagefactor 0.5 set g_balance_crylink_primary_joindelay 0 set g_balance_crylink_primary_joinspread 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 @@ -469,7 +468,6 @@ set g_balance_crylink_secondary_ammo 2 set g_balance_crylink_secondary_bouncedamagefactor 0.5 set g_balance_crylink_secondary_joindelay 0 set g_balance_crylink_secondary_joinspread 0 -set g_balance_crylink_secondary_jointime 0 set g_balance_crylink_secondary_joinexplode 0 set g_balance_crylink_secondary_joinexplode_damage 0 set g_balance_crylink_secondary_joinexplode_edgedamage 0 diff --git a/balanceFruitieX.cfg b/balanceFruitieX.cfg index ce125421f..c16d2772c 100644 --- a/balanceFruitieX.cfg +++ b/balanceFruitieX.cfg @@ -440,7 +440,6 @@ set g_balance_crylink_primary_ammo 2 set g_balance_crylink_primary_bouncedamagefactor 0.2 set g_balance_crylink_primary_joindelay 0 set g_balance_crylink_primary_joinspread 0.2 -set g_balance_crylink_primary_jointime 0.1 set g_balance_crylink_primary_joinexplode 0 set g_balance_crylink_primary_joinexplode_damage 0 set g_balance_crylink_primary_joinexplode_edgedamage 0 @@ -469,7 +468,6 @@ set g_balance_crylink_secondary_ammo 3 // LOG: 2 -> 3 set g_balance_crylink_secondary_bouncedamagefactor 0.4 // LOG: 0.2 -> 0.4 set g_balance_crylink_secondary_joindelay 0 set g_balance_crylink_secondary_joinspread 0.2 -set g_balance_crylink_secondary_jointime 0.1 set g_balance_crylink_secondary_joinexplode 0 set g_balance_crylink_secondary_joinexplode_damage 0 set g_balance_crylink_secondary_joinexplode_edgedamage 0 diff --git a/balanceXDF.cfg b/balanceXDF.cfg index 5745548e2..33cdf6a0b 100644 --- a/balanceXDF.cfg +++ b/balanceXDF.cfg @@ -440,7 +440,6 @@ set g_balance_crylink_primary_ammo 3 set g_balance_crylink_primary_bouncedamagefactor 0.5 set g_balance_crylink_primary_joindelay 0.1 set g_balance_crylink_primary_joinspread 0.2 -set g_balance_crylink_primary_jointime 0 set g_balance_crylink_primary_joinexplode 1 set g_balance_crylink_primary_joinexplode_damage 0 set g_balance_crylink_primary_joinexplode_edgedamage 0 @@ -469,7 +468,6 @@ set g_balance_crylink_secondary_ammo 2 set g_balance_crylink_secondary_bouncedamagefactor 0.5 set g_balance_crylink_secondary_joindelay 0 set g_balance_crylink_secondary_joinspread 0 -set g_balance_crylink_secondary_jointime 0 set g_balance_crylink_secondary_joinexplode 0 set g_balance_crylink_secondary_joinexplode_damage 0 set g_balance_crylink_secondary_joinexplode_edgedamage 0 diff --git a/balanceXPM.cfg b/balanceXPM.cfg index 9eebc5e86..4f5562a80 100644 --- a/balanceXPM.cfg +++ b/balanceXPM.cfg @@ -440,7 +440,6 @@ set g_balance_crylink_primary_ammo 3 set g_balance_crylink_primary_bouncedamagefactor 0.5 set g_balance_crylink_primary_joindelay 0.1 set g_balance_crylink_primary_joinspread 0.2 -set g_balance_crylink_primary_jointime 0 set g_balance_crylink_primary_joinexplode 1 set g_balance_crylink_primary_joinexplode_damage 0 set g_balance_crylink_primary_joinexplode_edgedamage 0 @@ -469,7 +468,6 @@ set g_balance_crylink_secondary_ammo 2 set g_balance_crylink_secondary_bouncedamagefactor 0.5 set g_balance_crylink_secondary_joindelay 0 set g_balance_crylink_secondary_joinspread 0 -set g_balance_crylink_secondary_jointime 0 set g_balance_crylink_secondary_joinexplode 0 set g_balance_crylink_secondary_joinexplode_damage 0 set g_balance_crylink_secondary_joinexplode_edgedamage 0 diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg index fa4795cbf..807f563c3 100644 --- a/balanceXonotic.cfg +++ b/balanceXonotic.cfg @@ -440,7 +440,6 @@ set g_balance_crylink_primary_ammo 3 set g_balance_crylink_primary_bouncedamagefactor 0.5 set g_balance_crylink_primary_joindelay 0.1 set g_balance_crylink_primary_joinspread 0.2 -set g_balance_crylink_primary_jointime 0 set g_balance_crylink_primary_joinexplode 1 set g_balance_crylink_primary_joinexplode_damage 0 set g_balance_crylink_primary_joinexplode_edgedamage 0 @@ -469,7 +468,6 @@ set g_balance_crylink_secondary_ammo 2 set g_balance_crylink_secondary_bouncedamagefactor 0.5 set g_balance_crylink_secondary_joindelay 0 set g_balance_crylink_secondary_joinspread 0 -set g_balance_crylink_secondary_jointime 0 set g_balance_crylink_secondary_joinexplode 0 set g_balance_crylink_secondary_joinexplode_damage 0 set g_balance_crylink_secondary_joinexplode_edgedamage 0 diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index 3d640de5d..711d91436 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -139,7 +139,6 @@ float autocvar_g_balance_crylink_primary_joinexplode_edgedamage; float autocvar_g_balance_crylink_primary_joinexplode_force; float autocvar_g_balance_crylink_primary_joinexplode_radius; float autocvar_g_balance_crylink_primary_joinspread; -float autocvar_g_balance_crylink_primary_jointime; float autocvar_g_balance_crylink_primary_linkexplode; float autocvar_g_balance_crylink_primary_middle_fadetime; float autocvar_g_balance_crylink_primary_middle_lifetime; @@ -165,7 +164,6 @@ float autocvar_g_balance_crylink_secondary_joinexplode_edgedamage; float autocvar_g_balance_crylink_secondary_joinexplode_force; float autocvar_g_balance_crylink_secondary_joinexplode_radius; float autocvar_g_balance_crylink_secondary_joinspread; -float autocvar_g_balance_crylink_secondary_jointime; float autocvar_g_balance_crylink_secondary_line_fadetime; float autocvar_g_balance_crylink_secondary_line_lifetime; float autocvar_g_balance_crylink_secondary_linkexplode; diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc index 4cce61bbe..320d84b3c 100644 --- a/qcsrc/server/w_crylink.qc +++ b/qcsrc/server/w_crylink.qc @@ -94,10 +94,9 @@ void W_Crylink_LinkExplode (entity e, entity e2) // stored in w_crylink_linkjoin_time. // could possibly network this origin and time, and display a special particle // effect when projectiles meet there :P -// jspeed: MINIMUM jing speed -// jtime: MAXIMUM jing time (0: none) +// jspeed: joining speed (calculate this as join spread * initial speed) float w_crylink_linkjoin_time; -vector W_Crylink_LinkJoin(entity e, float jspeed, float jtime) +vector W_Crylink_LinkJoin(entity e, float jspeed) { vector avg_origin, avg_velocity; vector targ_origin; @@ -134,7 +133,7 @@ vector W_Crylink_LinkJoin(entity e, float jspeed, float jtime) if(avg_dist == 0) return avg_origin; // no change needed - if(jspeed == 0 && jtime == 0) + if(jspeed == 0) { e.velocity = avg_velocity; UpdateCSQCProjectile(e); @@ -147,14 +146,6 @@ vector W_Crylink_LinkJoin(entity e, float jspeed, float jtime) } else { - if(jtime) - { - if(jspeed) - w_crylink_linkjoin_time = min(jtime, avg_dist / jspeed); - else - w_crylink_linkjoin_time = jtime; - } - else w_crylink_linkjoin_time = avg_dist / jspeed; targ_origin = avg_origin + w_crylink_linkjoin_time * avg_velocity; @@ -453,7 +444,7 @@ void W_Crylink_Attack (void) other = proj; MUTATOR_CALLHOOK(EditProjectile); } - if(autocvar_g_balance_crylink_primary_joinspread != 0 || autocvar_g_balance_crylink_primary_jointime != 0) + if(autocvar_g_balance_crylink_primary_joinspread != 0) { self.crylink_lastgroup = proj; W_Crylink_CheckLinks(proj); @@ -569,7 +560,7 @@ void W_Crylink_Attack2 (void) other = proj; MUTATOR_CALLHOOK(EditProjectile); } - if(autocvar_g_balance_crylink_secondary_joinspread != 0 || autocvar_g_balance_crylink_secondary_jointime != 0) + if(autocvar_g_balance_crylink_secondary_joinspread != 0) { self.crylink_lastgroup = proj; W_Crylink_CheckLinks(proj); @@ -629,12 +620,12 @@ float w_crylink(float req) if(self.crylink_waitrelease == 1) { - pos = W_Crylink_LinkJoin(self.crylink_lastgroup, autocvar_g_balance_crylink_primary_joinspread * autocvar_g_balance_crylink_primary_speed, autocvar_g_balance_crylink_primary_jointime); + pos = W_Crylink_LinkJoin(self.crylink_lastgroup, autocvar_g_balance_crylink_primary_joinspread * autocvar_g_balance_crylink_primary_speed); } else { - pos = W_Crylink_LinkJoin(self.crylink_lastgroup, autocvar_g_balance_crylink_secondary_joinspread * autocvar_g_balance_crylink_secondary_speed, autocvar_g_balance_crylink_secondary_jointime); + pos = W_Crylink_LinkJoin(self.crylink_lastgroup, autocvar_g_balance_crylink_secondary_joinspread * autocvar_g_balance_crylink_secondary_speed); } linkjoineffect = spawn();