Attempt to make everything playable

diff --git a/_hud_common.cfg b/_hud_common.cfg
index 4a499970697335a23c1c0a2d6d5b7d91c31e73bc..5aa1bbfeea3203469aedb2a4b248d08951d12617 100644 (file)
--- 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 fc8b00cc72c6afa729d5d3adb2305386c69cad19..61e079346ac9da0c88e09773b0532c2d735b6fc3 100644 (file)
--- 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 976b026a102c5fcb326f57f17cd16b23b8f62388..f637d41bf10c1d7fddd7197c4fbcd37aba1dd653 100644 (file)
--- 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 eae3ff0d4e95471711e24905f0758a24fb902998..aa8d0a89b665bbbcd18a58bf3db6887fc98c00f8 100644 (file)
--- 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 f37e2d49376a62f0004f74c6a09aa6e75b541dbe..d17826a9247908f7c1bceb42dcfc2d91645d585c 100644 (file)
--- 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 60e8d8436de69a3fb3fc4a835c25a9a7f843bbea..c5b3ce139335d848d405985197d70cd43bae288d 100644 (file)
--- 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 784f2056ad5f7ad96d151a53f9f44c299ad7d9e8..6512d0430809ffdff549f8834460c49b0d254ad5 100644 (file)
--- 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 6f0b0e439395af19a78958908d26a636d5ec2a03..eadba3c16290355b9a88fd1939a924da5c83908a 100644 (file)
--- 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;