Merge branch 'master' into Mario/balance_v2

diff --git a/bal-wep-nexuiz25.cfg b/bal-wep-nexuiz25.cfg
index c185c5ec72f9a5a393ed0836ab91ac2281e91b1a..bb7ab5f6780738b28e140ba39d829e2725e84206 100644 (file)
--- a/bal-wep-nexuiz25.cfg
+++ b/bal-wep-nexuiz25.cfg
@@ -741,6 +741,7 @@ set g_balance_arc_beam_healing_aps 50
 set g_balance_arc_beam_healing_hmax 150
 set g_balance_arc_beam_healing_hps 50
 set g_balance_arc_cooldown 2.5
+set g_balance_arc_cooldown_release 1
 set g_balance_arc_overheat_max 5
 set g_balance_arc_overheat_min 3
 set g_balance_arc_beam_heat 1

diff --git a/bal-wep-overkill.cfg b/bal-wep-overkill.cfg
index 9f54315588067a8730f05d5f1f75c475b74e4a7f..626ada04eab958e36e003f4ec0f0b8fbe04f2ff9 100644 (file)
--- a/bal-wep-overkill.cfg
+++ b/bal-wep-overkill.cfg
@@ -764,6 +764,7 @@ set g_balance_arc_burst_healing_aps 100
 set g_balance_arc_burst_healing_hps 100
 set g_balance_arc_burst_heat 4
 set g_balance_arc_cooldown 2.5
+set g_balance_arc_cooldown_release 1
 set g_balance_arc_overheat_max 5
 set g_balance_arc_overheat_min 3
 set g_balance_arc_switchdelay_drop 0.3

diff --git a/bal-wep-samual.cfg b/bal-wep-samual.cfg
index e20a8700d49bcaee48064cffe62db86ab7458268..5545c6502cf6bdd38e11c80c7ea0cc852b87241c 100644 (file)
--- a/bal-wep-samual.cfg
+++ b/bal-wep-samual.cfg
@@ -281,6 +281,7 @@ set g_balance_arc_burst_damage 500
 set g_balance_arc_burst_healing_aps 100
 set g_balance_arc_burst_healing_hps 100
 set g_balance_arc_cooldown 2.5
+set g_balance_arc_cooldown_release 1
 set g_balance_arc_overheat_max 5
 set g_balance_arc_overheat_min 3
 set g_balance_arc_beam_heat 1

diff --git a/bal-wep-xdf.cfg b/bal-wep-xdf.cfg
index f2685074653a18c30edd152ca4f065279bf22d7d..cf7a05f6b5b0787fc13555bdc7ce2b8b601d1acf 100644 (file)
--- a/bal-wep-xdf.cfg
+++ b/bal-wep-xdf.cfg
@@ -741,6 +741,7 @@ set g_balance_arc_beam_healing_aps 50
 set g_balance_arc_beam_healing_hmax 150
 set g_balance_arc_beam_healing_hps 50
 set g_balance_arc_cooldown 2.5
+set g_balance_arc_cooldown_release 1
 set g_balance_arc_overheat_max 5
 set g_balance_arc_overheat_min 3
 set g_balance_arc_beam_heat 1

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index 34c5927b8580b759d0a5e93f4f3a600d26a91f30..3a1c6929b72ce8f5a8f00f6ce24e50bfcf291a65 100644 (file)
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -741,6 +741,7 @@ set g_balance_arc_beam_healing_aps 50
 set g_balance_arc_beam_healing_hmax 150
 set g_balance_arc_beam_healing_hps 50
 set g_balance_arc_cooldown 2.5
+set g_balance_arc_cooldown_release 1
 set g_balance_arc_overheat_max 5
 set g_balance_arc_overheat_min 3
 set g_balance_arc_beam_heat 1

diff --git a/bal-wep-xpm.cfg b/bal-wep-xpm.cfg
index 34c5927b8580b759d0a5e93f4f3a600d26a91f30..3a1c6929b72ce8f5a8f00f6ce24e50bfcf291a65 100644 (file)
--- a/bal-wep-xpm.cfg
+++ b/bal-wep-xpm.cfg
@@ -741,6 +741,7 @@ set g_balance_arc_beam_healing_aps 50
 set g_balance_arc_beam_healing_hmax 150
 set g_balance_arc_beam_healing_hps 50
 set g_balance_arc_cooldown 2.5
+set g_balance_arc_cooldown_release 1
 set g_balance_arc_overheat_max 5
 set g_balance_arc_overheat_min 3
 set g_balance_arc_beam_heat 1

diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc
index 96d1a9e7a6b4addb3a0847f0e3714b27ac173cf0..0da3c1df375520f02ab2608b824d6f8afaa4bbe6 100644 (file)
--- a/qcsrc/common/physics/player.qc
+++ b/qcsrc/common/physics/player.qc
@@ -560,7 +560,7 @@ void CheckWaterJump(entity this)
                #ifdef SVQC
                        PHYS_TELEPORT_TIME(this) = time + 2;    // safety net
                #elif defined(CSQC)
-                       pmove_waterjumptime = time + 2;
+                       pmove_waterjumptime = 2;
                #endif
                }
        }
@@ -1472,8 +1472,10 @@ void PM_Main(entity this)
                PM_Footsteps(this);
        }
 
+#ifdef SVQC
        if(IsFlying(this))
                this.wasFlying = 1;
+#endif
 
        if (IS_PLAYER(this))
                CheckPlayerJump(this);
@@ -1482,10 +1484,17 @@ void PM_Main(entity this)
        {
                this.velocity_x = this.movedir.x;
                this.velocity_y = this.movedir.y;
-               if (time > PHYS_TELEPORT_TIME(this) || this.waterlevel == WATERLEVEL_NONE)
+               if (time > PHYS_TELEPORT_TIME(this) || this.waterlevel == WATERLEVEL_NONE
+               #ifdef CSQC
+                       || pmove_waterjumptime <= 0
+               #endif
+                       )
                {
                        this.flags &= ~FL_WATERJUMP;
                        PHYS_TELEPORT_TIME(this) = 0;
+               #ifdef CSQC
+                       pmove_waterjumptime = 0;
+               #endif
                }
        }
 

diff --git a/qcsrc/common/weapons/weapon/arc.qc b/qcsrc/common/weapons/weapon/arc.qc
index 1d6a4a76cec013b552f5054d13b67c5c91bd8144..303c5a25606ce69a669481f47e296b4336d56204 100644 (file)
--- a/qcsrc/common/weapons/weapon/arc.qc
+++ b/qcsrc/common/weapons/weapon/arc.qc
@@ -57,6 +57,7 @@ CLASS(Arc, Weapon)
         P(class, prefix, burst_healing_hps, float, NONE) \
         P(class, prefix, burst_heat, float, NONE) /* heat increase per second (secondary) */ \
         P(class, prefix, cooldown, float, NONE) /* heat decrease per second when resting */ \
+        P(class, prefix, cooldown_release, float, NONE) /* delay weapon re-use when releasing button */ \
         P(class, prefix, overheat_max, float, NONE) /* maximum heat before jamming */ \
         P(class, prefix, overheat_min, float, NONE) /* minimum heat to wait for cooldown */ \
         P(class, prefix, switchdelay_drop, float, NONE) \
@@ -168,6 +169,7 @@ bool W_Arc_Beam_Send(entity this, entity to, int sf)
                WriteByte(MSG_ENTITY, WEP_CVAR(arc, beam_tightness) * 10);
 
                WriteByte(MSG_ENTITY, drawlocal);
+               WriteByte(MSG_ENTITY, etof(this.owner));
        }
        if(sf & ARC_SF_START) // starting location
        {
@@ -349,7 +351,8 @@ void W_Arc_Beam_Think()
 
                        if ( cooldown_speed )
                        {
-                               self.owner.arc_overheat = time + self.beam_heat / cooldown_speed;
+                               if ( WEP_CVAR(arc, cooldown_release) || (WEP_CVAR(arc, overheat_max) > 0 && self.beam_heat >= WEP_CVAR(arc, overheat_max)) )
+                                       self.owner.arc_overheat = time + self.beam_heat / cooldown_speed;
                                self.owner.arc_cooldown = cooldown_speed;
                        }
 
@@ -862,6 +865,8 @@ void Arc_Smoke()
                }
 #endif
 #ifdef CSQC
+bool autocvar_cl_arcbeam_teamcolor = true;
+
                METHOD(Arc, wr_impacteffect, void(entity thiswep))
                {
                        if(w_deathtype & HITTYPE_SECONDARY)
@@ -1316,6 +1321,8 @@ NET_HANDLE(ENT_CLIENT_ARC_BEAM, bool isnew)
                {
                        self.beam_usevieworigin = 0;
                }
+
+               self.sv_entnum = ReadByte();
        }
 
        if(!self.beam_usevieworigin)
@@ -1365,11 +1372,13 @@ NET_HANDLE(ENT_CLIENT_ARC_BEAM, bool isnew)
        if(sf & ARC_SF_BEAMTYPE) // beam type
        {
                self.beam_type = ReadByte();
+
+               vector beamcolor = ((autocvar_cl_arcbeam_teamcolor) ? colormapPaletteColor(stof(getplayerkeyvalue(self.sv_entnum - 1, "colors")) & 0x0F, true) : '1 1 1');
                switch(self.beam_type)
                {
                        case ARC_BT_MISS:
                        {
-                               self.beam_color = '1 1 1';
+                               self.beam_color = beamcolor;
                                self.beam_alpha = 0.5;
                                self.beam_thickness = 8;
                                self.beam_traileffect = (EFFECT_ARC_BEAM);
@@ -1394,7 +1403,7 @@ NET_HANDLE(ENT_CLIENT_ARC_BEAM, bool isnew)
                        }
                        case ARC_BT_WALL: // grenadelauncher_muzzleflash healray_muzzleflash
                        {
-                               self.beam_color = '1 1 1';
+                               self.beam_color = beamcolor;
                                self.beam_alpha = 0.5;
                                self.beam_thickness = 8;
                                self.beam_traileffect = (EFFECT_ARC_BEAM);
@@ -1420,7 +1429,7 @@ NET_HANDLE(ENT_CLIENT_ARC_BEAM, bool isnew)
                        }
                        case ARC_BT_HEAL:
                        {
-                               self.beam_color = '1 1 1';
+                               self.beam_color = beamcolor;
                                self.beam_alpha = 0.5;
                                self.beam_thickness = 8;
                                self.beam_traileffect = (EFFECT_ARC_BEAM_HEAL);
@@ -1446,7 +1455,7 @@ NET_HANDLE(ENT_CLIENT_ARC_BEAM, bool isnew)
                        }
                        case ARC_BT_HIT:
                        {
-                               self.beam_color = '1 1 1';
+                               self.beam_color = beamcolor;
                                self.beam_alpha = 0.5;
                                self.beam_thickness = 8;
                                self.beam_traileffect = (EFFECT_ARC_BEAM);
@@ -1472,7 +1481,7 @@ NET_HANDLE(ENT_CLIENT_ARC_BEAM, bool isnew)
                        }
                        case ARC_BT_BURST_MISS:
                        {
-                               self.beam_color = '1 1 1';
+                               self.beam_color = beamcolor;
                                self.beam_alpha = 0.5;
                                self.beam_thickness = 14;
                                self.beam_traileffect = (EFFECT_ARC_BEAM);
@@ -1498,7 +1507,7 @@ NET_HANDLE(ENT_CLIENT_ARC_BEAM, bool isnew)
                        }
                        case ARC_BT_BURST_WALL:
                        {
-                               self.beam_color = '1 1 1';
+                               self.beam_color = beamcolor;
                                self.beam_alpha = 0.5;
                                self.beam_thickness = 14;
                                self.beam_traileffect = (EFFECT_ARC_BEAM);
@@ -1524,7 +1533,7 @@ NET_HANDLE(ENT_CLIENT_ARC_BEAM, bool isnew)
                        }
                        case ARC_BT_BURST_HEAL:
                        {
-                               self.beam_color = '1 1 1';
+                               self.beam_color = beamcolor;
                                self.beam_alpha = 0.5;
                                self.beam_thickness = 14;
                                self.beam_traileffect = (EFFECT_ARC_BEAM_HEAL);
@@ -1550,7 +1559,7 @@ NET_HANDLE(ENT_CLIENT_ARC_BEAM, bool isnew)
                        }
                        case ARC_BT_BURST_HIT:
                        {
-                               self.beam_color = '1 1 1';
+                               self.beam_color = beamcolor;
                                self.beam_alpha = 0.5;
                                self.beam_thickness = 14;
                                self.beam_traileffect = (EFFECT_ARC_BEAM);

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 00c9982c3db8c8e5d32f77da478dd399432b6803..23897720e3ecf75492058975180c5a4643cd0626 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -163,6 +163,9 @@ void Obituary_SpecialDeath(
                entity deathent = Deathtypes_from(deathtype - DT_FIRST);
                if (!deathent) { backtrace("Obituary_SpecialDeath: Could not find deathtype entity!\n"); return; }
 
+               if(g_cts && deathtype == DEATH_KILL.m_id)
+                       return; // TODO: somehow put this in CTS gamemode file!
+
                if(murder)
                {
                        if(deathent.death_msgmurder)