From: Mario Date: Thu, 6 Nov 2014 10:04:49 +0000 (+1100) Subject: Attempt to make everything playable X-Git-Tag: xonotic-v0.8.0~152^2~21 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3c3971dccfa86d3efc8c15e0ad8b591ee3370aae;p=xonotic%2Fxonotic-data.pk3dir.git Attempt to make everything playable --- diff --git a/_hud_common.cfg b/_hud_common.cfg index 4a4999706..5aa1bbfee 100644 --- a/_hud_common.cfg +++ b/_hud_common.cfg @@ -23,6 +23,7 @@ seta hud_colorset_background "7" "neutral/unimportant text" seta hud_panel_weapons_ammo_full_shells 60 "show 100% of the status bar at this ammo count" seta hud_panel_weapons_ammo_full_nails 320 "show 100% of the status bar at this ammo count" seta hud_panel_weapons_ammo_full_cells 180 "show 100% of the status bar at this ammo count" +seta hud_panel_weapons_ammo_full_plasma 180 "show 100% of the status bar at this ammo count" seta hud_panel_weapons_ammo_full_rockets 160 "show 100% of the status bar at this ammo count" seta hud_panel_weapons_ammo_full_fuel 100 "show 100% of the status bar at this ammo count" diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg index fc8b00cc7..61e079346 100644 --- a/bal-wep-xonotic.cfg +++ b/bal-wep-xonotic.cfg @@ -4,6 +4,7 @@ set g_balance_blaster_primary_damage 25 set g_balance_blaster_primary_delay 0 set g_balance_blaster_primary_edgedamage 12.5 set g_balance_blaster_primary_force 300 +set g_balance_blaster_primary_force_zscale 1.2 set g_balance_blaster_primary_lifetime 5 set g_balance_blaster_primary_radius 70 set g_balance_blaster_primary_refire 0.7 @@ -16,6 +17,7 @@ set g_balance_blaster_secondary_damage 25 set g_balance_blaster_secondary_delay 0 set g_balance_blaster_secondary_edgedamage 12.5 set g_balance_blaster_secondary_force 300 +set g_balance_blaster_secondary_force_zscale 1.2 set g_balance_blaster_secondary_lifetime 5 set g_balance_blaster_secondary_radius 70 set g_balance_blaster_secondary_refire 0.7 @@ -320,8 +322,8 @@ set g_balance_vortex_secondary_damagefalloff_maxdist 0 set g_balance_vortex_secondary_damagefalloff_mindist 0 set g_balance_vortex_secondary_force 0 set g_balance_vortex_secondary_refire 0 -set g_balance_vortex_switchdelay_drop 0.3 -set g_balance_vortex_switchdelay_raise 0.25 +set g_balance_vortex_switchdelay_drop 0.2 +set g_balance_vortex_switchdelay_raise 0.2 set g_balance_vortex_weaponreplace "" set g_balance_vortex_weaponstart 0 set g_balance_vortex_weaponstartoverride -1 @@ -393,16 +395,16 @@ set g_balance_devastator_reload_time 2 set g_balance_devastator_remote_damage 70 set g_balance_devastator_remote_edgedamage 35 set g_balance_devastator_remote_force 400 -set g_balance_devastator_remote_jump_damage 40 +set g_balance_devastator_remote_jump_damage 70 set g_balance_devastator_remote_jump_radius 200 -set g_balance_devastator_remote_jump_velocity_z_add 500 +set g_balance_devastator_remote_jump_velocity_z_add 400 set g_balance_devastator_remote_jump_velocity_z_max 1500 -set g_balance_devastator_remote_jump_velocity_z_min 500 +set g_balance_devastator_remote_jump_velocity_z_min 400 set g_balance_devastator_remote_radius 110 set g_balance_devastator_speed 1300 set g_balance_devastator_speedaccel 1300 set g_balance_devastator_speedstart 1000 -set g_balance_devastator_switchdelay_drop 0.3 +set g_balance_devastator_switchdelay_drop 0.2 set g_balance_devastator_switchdelay_raise 0.2 set g_balance_devastator_weaponreplace "" set g_balance_devastator_weaponstart 0 @@ -717,7 +719,7 @@ set g_balance_shockwave_weaponstartoverride -1 set g_balance_shockwave_weaponthrowable 0 // }}} // {{{ #20: Arc -set g_balance_arc_beam_ammo 0 +set g_balance_arc_beam_ammo 10 set g_balance_arc_beam_animtime 0.2 set g_balance_arc_beam_botaimlifetime 0 set g_balance_arc_beam_botaimspeed 0 @@ -738,7 +740,7 @@ set g_balance_arc_beam_range 1000 set g_balance_arc_beam_refire 0.5 set g_balance_arc_beam_returnspeed 8 set g_balance_arc_beam_tightness 0.5 -set g_balance_arc_burst_ammo 0 +set g_balance_arc_burst_ammo 15 set g_balance_arc_burst_damage 500 set g_balance_arc_burst_healing_aps 100 set g_balance_arc_burst_healing_hps 100 diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc index 976b026a1..f637d41bf 100644 --- a/qcsrc/common/weapons/w_arc.qc +++ b/qcsrc/common/weapons/w_arc.qc @@ -641,7 +641,9 @@ float W_Arc(float req) } case WR_CHECKAMMO2: { - return ((!WEP_CVAR(arc, burst_ammo)) || (self.WEP_AMMO(ARC) > 0)); + // arc currently has no secondary attack + return FALSE; + //return ((!WEP_CVAR(arc, burst_ammo)) || (self.WEP_AMMO(ARC) > 0)); } case WR_CONFIG: { diff --git a/qcsrc/common/weapons/w_blaster.qc b/qcsrc/common/weapons/w_blaster.qc index eae3ff0d4..aa8d0a89b 100644 --- a/qcsrc/common/weapons/w_blaster.qc +++ b/qcsrc/common/weapons/w_blaster.qc @@ -22,6 +22,7 @@ REGISTER_WEAPON( w_cvar(id, sn, BOTH, delay) \ w_cvar(id, sn, BOTH, edgedamage) \ w_cvar(id, sn, BOTH, force) \ + w_cvar(id, sn, BOTH, force_zscale) \ w_cvar(id, sn, BOTH, lifetime) \ w_cvar(id, sn, BOTH, radius) \ w_cvar(id, sn, BOTH, refire) \ diff --git a/qcsrc/common/weapons/w_crylink.qc b/qcsrc/common/weapons/w_crylink.qc index f37e2d493..d17826a92 100644 --- a/qcsrc/common/weapons/w_crylink.qc +++ b/qcsrc/common/weapons/w_crylink.qc @@ -2,7 +2,7 @@ REGISTER_WEAPON( /* WEP_##id */ CRYLINK, /* function */ W_Crylink, -/* ammotype */ ammo_plasma, +/* ammotype */ ammo_cells, /* impulse */ 6, /* flags */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, /* rating */ BOT_PICKUP_RATING_MID, diff --git a/qcsrc/common/weapons/w_shockwave.qc b/qcsrc/common/weapons/w_shockwave.qc index 60e8d8436..c5b3ce139 100644 --- a/qcsrc/common/weapons/w_shockwave.qc +++ b/qcsrc/common/weapons/w_shockwave.qc @@ -94,7 +94,7 @@ void spawnfunc_weapon_shockwave(void) } #define MAX_SHOCKWAVE_HITS 10 -#define DEBUG_SHOCKWAVE +//#define DEBUG_SHOCKWAVE .float swing_prev; .entity swing_alreadyhit; diff --git a/qcsrc/common/weapons/w_vortex.qc b/qcsrc/common/weapons/w_vortex.qc index 784f2056a..6512d0430 100644 --- a/qcsrc/common/weapons/w_vortex.qc +++ b/qcsrc/common/weapons/w_vortex.qc @@ -2,7 +2,7 @@ REGISTER_WEAPON( /* WEP_##id */ VORTEX, /* function */ W_Vortex, -/* ammotype */ ammo_plasma, +/* ammotype */ ammo_cells, /* impulse */ 7, /* flags */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN, /* rating */ BOT_PICKUP_RATING_HIGH, diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 6f0b0e439..eadba3c16 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -904,6 +904,9 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in force = force * (finaldmg / coredamage) * forceintensity; hitloc = nearest; + if(deathtype & WEP_BLASTER) + force *= WEP_CVAR_BOTH(blaster, !(deathtype & HITTYPE_SECONDARY), force_zscale); + if(targ != directhitentity) { float hits;