From: Samual Lenks Date: Tue, 31 Jul 2012 04:59:30 +0000 (-0400) Subject: Cleanup debugging, plus add zscale cvar for attack force X-Git-Tag: xonotic-v0.8.0~152^2~408^2~12 X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=e6f8036b0c0cadbb273cab65b19f6556cd4a6bbd;p=xonotic%2Fxonotic-data.pk3dir.git Cleanup debugging, plus add zscale cvar for attack force --- diff --git a/balance25.cfg b/balance25.cfg index 4a4f518bf..7b75ebf93 100644 --- a/balance25.cfg +++ b/balance25.cfg @@ -280,8 +280,9 @@ set g_balance_laser_secondary_force_other_scale 1 set g_balance_laser_shockwave_damage 20 set g_balance_laser_shockwave_distance 2000 set g_balance_laser_shockwave_edgedamage 0 -set g_balance_laser_shockwave_force 250 -set g_balance_laser_shockwave_force_forwardbias 0.5 +set g_balance_laser_shockwave_force 200 +set g_balance_laser_shockwave_force_forwardbias 50 +set g_balance_laser_shockwave_force_zscale 1.5 set g_balance_laser_shockwave_jump_damage 20 set g_balance_laser_shockwave_jump_edgedamage 0 set g_balance_laser_shockwave_jump_force 300 @@ -297,7 +298,7 @@ set g_balance_laser_shockwave_multiplier_min 0 set g_balance_laser_shockwave_splash_damage 15 set g_balance_laser_shockwave_splash_edgedamage 0 set g_balance_laser_shockwave_splash_force 100 -set g_balance_laser_shockwave_splash_force_forwardbias 0.5 +set g_balance_laser_shockwave_splash_force_forwardbias 50 set g_balance_laser_shockwave_splash_multiplier_accuracy 0.5 set g_balance_laser_shockwave_splash_multiplier_distance 0.5 set g_balance_laser_shockwave_splash_multiplier_min 0 diff --git a/balanceFruitieX.cfg b/balanceFruitieX.cfg index bf4307f4b..aad5b3fce 100644 --- a/balanceFruitieX.cfg +++ b/balanceFruitieX.cfg @@ -280,8 +280,9 @@ set g_balance_laser_secondary_force_other_scale 0 set g_balance_laser_shockwave_damage 20 set g_balance_laser_shockwave_distance 2000 set g_balance_laser_shockwave_edgedamage 0 -set g_balance_laser_shockwave_force 250 -set g_balance_laser_shockwave_force_forwardbias 0.5 +set g_balance_laser_shockwave_force 200 +set g_balance_laser_shockwave_force_forwardbias 50 +set g_balance_laser_shockwave_force_zscale 1.5 set g_balance_laser_shockwave_jump_damage 20 set g_balance_laser_shockwave_jump_edgedamage 0 set g_balance_laser_shockwave_jump_force 300 @@ -297,7 +298,7 @@ set g_balance_laser_shockwave_multiplier_min 0 set g_balance_laser_shockwave_splash_damage 15 set g_balance_laser_shockwave_splash_edgedamage 0 set g_balance_laser_shockwave_splash_force 100 -set g_balance_laser_shockwave_splash_force_forwardbias 0.5 +set g_balance_laser_shockwave_splash_force_forwardbias 50 set g_balance_laser_shockwave_splash_multiplier_accuracy 0.5 set g_balance_laser_shockwave_splash_multiplier_distance 0.5 set g_balance_laser_shockwave_splash_multiplier_min 0 diff --git a/balanceXPM.cfg b/balanceXPM.cfg index 6c0a2679d..5809b4389 100644 --- a/balanceXPM.cfg +++ b/balanceXPM.cfg @@ -280,8 +280,9 @@ set g_balance_laser_secondary_force_other_scale 1 set g_balance_laser_shockwave_damage 20 set g_balance_laser_shockwave_distance 2000 set g_balance_laser_shockwave_edgedamage 0 -set g_balance_laser_shockwave_force 250 -set g_balance_laser_shockwave_force_forwardbias 0.5 +set g_balance_laser_shockwave_force 200 +set g_balance_laser_shockwave_force_forwardbias 50 +set g_balance_laser_shockwave_force_zscale 1.5 set g_balance_laser_shockwave_jump_damage 20 set g_balance_laser_shockwave_jump_edgedamage 0 set g_balance_laser_shockwave_jump_force 300 @@ -297,7 +298,7 @@ set g_balance_laser_shockwave_multiplier_min 0 set g_balance_laser_shockwave_splash_damage 15 set g_balance_laser_shockwave_splash_edgedamage 0 set g_balance_laser_shockwave_splash_force 100 -set g_balance_laser_shockwave_splash_force_forwardbias 0.5 +set g_balance_laser_shockwave_splash_force_forwardbias 50 set g_balance_laser_shockwave_splash_multiplier_accuracy 0.5 set g_balance_laser_shockwave_splash_multiplier_distance 0.5 set g_balance_laser_shockwave_splash_multiplier_min 0 diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg index f12f49720..343507d7d 100644 --- a/balanceXonotic.cfg +++ b/balanceXonotic.cfg @@ -280,8 +280,9 @@ set g_balance_laser_secondary_force_other_scale 1 set g_balance_laser_shockwave_damage 20 set g_balance_laser_shockwave_distance 2000 set g_balance_laser_shockwave_edgedamage 0 -set g_balance_laser_shockwave_force 300 +set g_balance_laser_shockwave_force 200 set g_balance_laser_shockwave_force_forwardbias 50 +set g_balance_laser_shockwave_force_zscale 1.5 set g_balance_laser_shockwave_jump_damage 20 set g_balance_laser_shockwave_jump_edgedamage 0 set g_balance_laser_shockwave_jump_force 300 diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index 5833db2c6..9819495f9 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -474,6 +474,7 @@ float autocvar_g_balance_laser_shockwave_distance; float autocvar_g_balance_laser_shockwave_edgedamage; float autocvar_g_balance_laser_shockwave_force; float autocvar_g_balance_laser_shockwave_force_forwardbias; +float autocvar_g_balance_laser_shockwave_force_zscale; float autocvar_g_balance_laser_shockwave_jump_damage; float autocvar_g_balance_laser_shockwave_jump_edgedamage; float autocvar_g_balance_laser_shockwave_jump_force; diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc index c9ea59322..beaebf8a4 100644 --- a/qcsrc/server/w_laser.qc +++ b/qcsrc/server/w_laser.qc @@ -180,7 +180,7 @@ void W_Laser_Shockwave() final_damage = (autocvar_g_balance_laser_shockwave_jump_damage * multiplier + autocvar_g_balance_laser_shockwave_jump_edgedamage * (1 - multiplier)); Damage(head, self, self, final_damage, WEP_LASER, head.origin, final_force); - print("SELF HIT: multiplier = ", ftos(multiplier), strcat(", damage = ", ftos(final_damage), ", force = ", ftos(vlen(final_force))),"... multiplier_from_accuracy = ", ftos(multiplier_from_accuracy), ", multiplier_from_distance = ", ftos(multiplier_from_distance), ".\n"); + //print("SELF HIT: multiplier = ", ftos(multiplier), strcat(", damage = ", ftos(final_damage), ", force = ", ftos(vlen(final_force))),"... multiplier_from_accuracy = ", ftos(multiplier_from_accuracy), ", multiplier_from_distance = ", ftos(multiplier_from_distance), ".\n"); } else if (distance_to_head <= autocvar_g_balance_laser_shockwave_splash_radius) { @@ -189,12 +189,13 @@ void W_Laser_Shockwave() multiplier = max(autocvar_g_balance_laser_shockwave_splash_multiplier_min, ((multiplier_from_accuracy * autocvar_g_balance_laser_shockwave_splash_multiplier_accuracy) + (multiplier_from_distance * autocvar_g_balance_laser_shockwave_splash_multiplier_distance))); final_force = normalize(center - (attack_hitpos - (w_shotdir * autocvar_g_balance_laser_shockwave_splash_force_forwardbias))); - te_lightning2(world, attack_hitpos, (attack_hitpos + (final_force * 200))); + //te_lightning2(world, attack_hitpos, (attack_hitpos + (final_force * 200))); final_force = ((final_force * autocvar_g_balance_laser_shockwave_splash_force) * multiplier); + final_force_z *= autocvar_g_balance_laser_shockwave_force_zscale; final_damage = (autocvar_g_balance_laser_shockwave_splash_damage * multiplier + autocvar_g_balance_laser_shockwave_splash_edgedamage * (1 - multiplier)); if(W_Laser_Shockwave_CheckHit(queue, head, final_force, final_damage)) { ++queue; } - print("SPLASH HIT: multiplier = ", ftos(multiplier), strcat(", damage = ", ftos(final_damage), ", force = ", ftos(vlen(final_force))),"... multiplier_from_accuracy = ", ftos(multiplier_from_accuracy), ", multiplier_from_distance = ", ftos(multiplier_from_distance), ".\n"); + //print("SPLASH HIT: multiplier = ", ftos(multiplier), strcat(", damage = ", ftos(final_damage), ", force = ", ftos(vlen(final_force))),"... multiplier_from_accuracy = ", ftos(multiplier_from_accuracy), ", multiplier_from_distance = ", ftos(multiplier_from_distance), ".\n"); } } head = next; @@ -232,12 +233,13 @@ void W_Laser_Shockwave() multiplier = max(autocvar_g_balance_laser_shockwave_multiplier_min, ((multiplier_from_accuracy * autocvar_g_balance_laser_shockwave_multiplier_accuracy) + (multiplier_from_distance * autocvar_g_balance_laser_shockwave_multiplier_distance))); final_force = normalize(center - (nearest_on_line - (w_shotdir * autocvar_g_balance_laser_shockwave_force_forwardbias))); - te_lightning2(world, nearest_on_line, (attack_hitpos + (final_force * 200))); + //te_lightning2(world, nearest_on_line, (attack_hitpos + (final_force * 200))); final_force = ((final_force * autocvar_g_balance_laser_shockwave_force) * multiplier); + final_force_z *= autocvar_g_balance_laser_shockwave_force_zscale; final_damage = (autocvar_g_balance_laser_shockwave_damage * multiplier + autocvar_g_balance_laser_shockwave_edgedamage * (1 - multiplier)); if(W_Laser_Shockwave_CheckHit(queue, head, final_force, final_damage)) { ++queue; } - print("CONE HIT: multiplier = ", ftos(multiplier), strcat(", damage = ", ftos(final_damage), ", force = ", ftos(vlen(final_force))),"... multiplier_from_accuracy = ", ftos(multiplier_from_accuracy), ", multiplier_from_distance = ", ftos(multiplier_from_distance), ".\n"); + //print("CONE HIT: multiplier = ", ftos(multiplier), strcat(", damage = ", ftos(final_damage), ", force = ", ftos(vlen(final_force))),"... multiplier_from_accuracy = ", ftos(multiplier_from_accuracy), ", multiplier_from_distance = ", ftos(multiplier_from_distance), ".\n"); } } head = next; @@ -250,13 +252,13 @@ void W_Laser_Shockwave() final_damage = shockwave_hit_damage[i]; Damage(head, self, self, final_damage, WEP_LASER, head.origin, final_force); - print("DEQUEING DAMAGE: damage = ", ftos(final_damage), ", force = ", ftos(vlen(final_force)), ".\n"); + print("SHOCKWAVE by ", self.netname, ": damage = ", ftos(final_damage), ", force = ", ftos(vlen(final_force)), ".\n"); shockwave_hit[i] = world; shockwave_hit_force = '0 0 0'; shockwave_hit_damage = 0; } - print("queue was ", ftos(queue), ".\n\n"); + //print("queue was ", ftos(queue), ".\n\n"); } void W_Laser_Melee_Think()