Return all currently removed models and buffs. Maintain g_strength.md3, g_invincible...

diff --git a/gfx/hud/default/buff_bash.tga b/gfx/hud/default/buff_bash.tga
new file mode 100644 (file)
index 0000000..eaf416c
Binary files /dev/null and b/gfx/hud/default/buff_bash.tga differ

diff --git a/gfx/hud/luma/buff_bash.tga b/gfx/hud/luma/buff_bash.tga
new file mode 100644 (file)
index 0000000..c193a15
Binary files /dev/null and b/gfx/hud/luma/buff_bash.tga differ

diff --git a/gfx/hud/luma/buff_invisible.tga b/gfx/hud/luma/buff_invisible.tga
new file mode 100644 (file)
index 0000000..8e65dc4
Binary files /dev/null and b/gfx/hud/luma/buff_invisible.tga differ

diff --git a/gfx/hud/luma/buff_speed.tga b/gfx/hud/luma/buff_speed.tga
new file mode 100644 (file)
index 0000000..ab25069
Binary files /dev/null and b/gfx/hud/luma/buff_speed.tga differ

diff --git a/models/items/g_invincible.md3 b/models/items/g_invincible.md3
new file mode 100644 (file)
index 0000000..7097ec4
Binary files /dev/null and b/models/items/g_invincible.md3 differ

diff --git a/models/items/g_strength.md3 b/models/items/g_strength.md3
new file mode 100644 (file)
index 0000000..6159b5f
Binary files /dev/null and b/models/items/g_strength.md3 differ

diff --git a/models/relics/relic.md3_0.skin b/models/relics/relic.md3_0.skin
index 5a2a694c513e98fa34b51fc08ea27abe901a93bf..f4d914fa281ec0bd0633a66d791a89076b1e382f 100644 (file)
--- a/models/relics/relic.md3_0.skin
+++ b/models/relics/relic.md3_0.skin
@@ -1,3 +1,3 @@
 ring,models/relics/relic_ring
 mesh,models/relics/relic
-sign,models/relics/sign_ammo
\ No newline at end of file
+sign,models/relics/sign_resistance
\ No newline at end of file

diff --git a/models/relics/relic.md3_10.skin b/models/relics/relic.md3_10.skin
index 4b88dde045c18622be83d2f6b96eb5181612569c..8276637c08603c0b0a809e431bbf611a54b26bfa 100644 (file)
--- a/models/relics/relic.md3_10.skin
+++ b/models/relics/relic.md3_10.skin
@@ -1,3 +1,3 @@
 ring,models/relics/relic_ring
 mesh,models/relics/relic
-sign,models/relics/sign_flight
\ No newline at end of file
+sign,models/relics/sign_jump
\ No newline at end of file

diff --git a/models/relics/relic.md3_11.skin b/models/relics/relic.md3_11.skin
index f4d914fa281ec0bd0633a66d791a89076b1e382f..4b88dde045c18622be83d2f6b96eb5181612569c 100644 (file)
--- a/models/relics/relic.md3_11.skin
+++ b/models/relics/relic.md3_11.skin
@@ -1,3 +1,3 @@
 ring,models/relics/relic_ring
 mesh,models/relics/relic
-sign,models/relics/sign_resistance
\ No newline at end of file
+sign,models/relics/sign_flight
\ No newline at end of file

diff --git a/models/relics/relic.md3_12.skin b/models/relics/relic.md3_12.skin
index cfcb99896d9f6ecbf30e676b431798d14eef6891..9f2525884def554ca96194327a32b309b1032b34 100644 (file)
--- a/models/relics/relic.md3_12.skin
+++ b/models/relics/relic.md3_12.skin
@@ -1,3 +1,3 @@
 ring,models/relics/relic_ring
 mesh,models/relics/relic
-sign,textures/common/nodraw
\ No newline at end of file
+sign,models/relics/sign_invisible
\ No newline at end of file

diff --git a/models/relics/relic.md3_14.skin b/models/relics/relic.md3_14.skin
index cfcb99896d9f6ecbf30e676b431798d14eef6891..a8af448f63b6423bf16dd74fe72797568676d8ee 100644 (file)
--- a/models/relics/relic.md3_14.skin
+++ b/models/relics/relic.md3_14.skin
@@ -1,3 +1,3 @@
 ring,models/relics/relic_ring
 mesh,models/relics/relic
-sign,textures/common/nodraw
\ No newline at end of file
+sign,models/relics/sign_blessed
\ No newline at end of file

diff --git a/models/relics/relic.md3_15.skin b/models/relics/relic.md3_15.skin
index cfcb99896d9f6ecbf30e676b431798d14eef6891..5b188bebc2435b186f11c53bfc6fda9d3f4171a8 100644 (file)
--- a/models/relics/relic.md3_15.skin
+++ b/models/relics/relic.md3_15.skin
@@ -1,3 +1,3 @@
 ring,models/relics/relic_ring
 mesh,models/relics/relic
-sign,textures/common/nodraw
\ No newline at end of file
+sign,models/relics/sign_vengeance
\ No newline at end of file

diff --git a/models/relics/relic.md3_16.skin b/models/relics/relic.md3_16.skin
new file mode 100644 (file)
index 0000000..5c30ed6
--- /dev/null
+++ b/models/relics/relic.md3_16.skin
@@ -0,0 +1,3 @@
+ring,models/relics/relic_ring
+mesh,models/relics/relic
+sign,models/relics/sign_inferno
\ No newline at end of file

diff --git a/models/relics/relic.md3_17.skin b/models/relics/relic.md3_17.skin
new file mode 100644 (file)
index 0000000..30fba07
--- /dev/null
+++ b/models/relics/relic.md3_17.skin
@@ -0,0 +1,3 @@
+ring,models/relics/relic_ring
+mesh,models/relics/relic
+sign,models/relics/sign_swapper
\ No newline at end of file

diff --git a/models/relics/relic.md3_18.skin b/models/relics/relic.md3_18.skin
new file mode 100644 (file)
index 0000000..b89d51c
--- /dev/null
+++ b/models/relics/relic.md3_18.skin
@@ -0,0 +1,3 @@
+ring,models/relics/relic_ring
+mesh,models/relics/relic
+sign,models/relics/sign_magnet
\ No newline at end of file

diff --git a/models/relics/relic.md3_19.skin b/models/relics/relic.md3_19.skin
new file mode 100644 (file)
index 0000000..7401d28
--- /dev/null
+++ b/models/relics/relic.md3_19.skin
@@ -0,0 +1,3 @@
+ring,models/relics/relic_ring
+mesh,models/relics/relic
+sign,models/relics/sign_luck
\ No newline at end of file

diff --git a/models/relics/relic.md3_3.skin b/models/relics/relic.md3_3.skin
index ce6fb9f4155b601c0967a72740ce3cd9229901a5..5a2a694c513e98fa34b51fc08ea27abe901a93bf 100644 (file)
--- a/models/relics/relic.md3_3.skin
+++ b/models/relics/relic.md3_3.skin
@@ -1,3 +1,3 @@
 ring,models/relics/relic_ring
 mesh,models/relics/relic
-sign,models/relics/sign_disability
\ No newline at end of file
+sign,models/relics/sign_ammo
\ No newline at end of file

diff --git a/models/relics/relic.md3_4.skin b/models/relics/relic.md3_4.skin
index 5b188bebc2435b186f11c53bfc6fda9d3f4171a8..cfcb99896d9f6ecbf30e676b431798d14eef6891 100644 (file)
--- a/models/relics/relic.md3_4.skin
+++ b/models/relics/relic.md3_4.skin
@@ -1,3 +1,3 @@
 ring,models/relics/relic_ring
 mesh,models/relics/relic
-sign,models/relics/sign_vengeance
\ No newline at end of file
+sign,textures/common/nodraw
\ No newline at end of file

diff --git a/models/relics/relic.md3_5.skin b/models/relics/relic.md3_5.skin
index 8276637c08603c0b0a809e431bbf611a54b26bfa..4edbc24b0cd362659f7986ebcd3ef9ae1681592c 100644 (file)
--- a/models/relics/relic.md3_5.skin
+++ b/models/relics/relic.md3_5.skin
@@ -1,3 +1,3 @@
 ring,models/relics/relic_ring
 mesh,models/relics/relic
-sign,models/relics/sign_jump
\ No newline at end of file
+sign,models/relics/sign_bash
\ No newline at end of file

diff --git a/models/relics/relic.md3_6.skin b/models/relics/relic.md3_6.skin
index 5c30ed67c2359e4d2d6d85efba33ce8a1dbd1a52..cfcb99896d9f6ecbf30e676b431798d14eef6891 100644 (file)
--- a/models/relics/relic.md3_6.skin
+++ b/models/relics/relic.md3_6.skin
@@ -1,3 +1,3 @@
 ring,models/relics/relic_ring
 mesh,models/relics/relic
-sign,models/relics/sign_inferno
\ No newline at end of file
+sign,textures/common/nodraw
\ No newline at end of file

diff --git a/models/relics/relic.md3_7.skin b/models/relics/relic.md3_7.skin
index 30fba072ec7441954c4ffa50e5b703a625fc6424..ce6fb9f4155b601c0967a72740ce3cd9229901a5 100644 (file)
--- a/models/relics/relic.md3_7.skin
+++ b/models/relics/relic.md3_7.skin
@@ -1,3 +1,3 @@
 ring,models/relics/relic_ring
 mesh,models/relics/relic
-sign,models/relics/sign_swapper
\ No newline at end of file
+sign,models/relics/sign_disability
\ No newline at end of file

diff --git a/models/relics/relic.md3_8.skin b/models/relics/relic.md3_8.skin
index b89d51cecca817edbdd2ddb76f6e1c65fb924634..cfcb99896d9f6ecbf30e676b431798d14eef6891 100644 (file)
--- a/models/relics/relic.md3_8.skin
+++ b/models/relics/relic.md3_8.skin
@@ -1,3 +1,3 @@
 ring,models/relics/relic_ring
 mesh,models/relics/relic
-sign,models/relics/sign_magnet
\ No newline at end of file
+sign,textures/common/nodraw
\ No newline at end of file

diff --git a/models/relics/relic.md3_9.skin b/models/relics/relic.md3_9.skin
index 7401d28f9e4e21e1ec09d26742232b3ef740798c..3358e23f74fdc74bb5d8dcdc57af778f7ff0a168 100644 (file)
--- a/models/relics/relic.md3_9.skin
+++ b/models/relics/relic.md3_9.skin
@@ -1,3 +1,3 @@
 ring,models/relics/relic_ring
 mesh,models/relics/relic
-sign,models/relics/sign_luck
\ No newline at end of file
+sign,models/relics/sign_speed
\ No newline at end of file

diff --git a/models/relics/sign_bash.tga b/models/relics/sign_bash.tga
new file mode 100644 (file)
index 0000000..348b286
Binary files /dev/null and b/models/relics/sign_bash.tga differ

diff --git a/models/relics/sign_bash_glow.tga b/models/relics/sign_bash_glow.tga
new file mode 100644 (file)
index 0000000..67b11bb
Binary files /dev/null and b/models/relics/sign_bash_glow.tga differ

diff --git a/models/relics/sign_invisible.tga b/models/relics/sign_invisible.tga
new file mode 100644 (file)
index 0000000..de1745b
Binary files /dev/null and b/models/relics/sign_invisible.tga differ

diff --git a/models/relics/sign_invisible_glow.tga b/models/relics/sign_invisible_glow.tga
new file mode 100644 (file)
index 0000000..929965f
Binary files /dev/null and b/models/relics/sign_invisible_glow.tga differ

diff --git a/models/relics/sign_speed.tga b/models/relics/sign_speed.tga
new file mode 100644 (file)
index 0000000..bca0968
Binary files /dev/null and b/models/relics/sign_speed.tga differ

diff --git a/models/relics/sign_speed_glow.tga b/models/relics/sign_speed_glow.tga
new file mode 100644 (file)
index 0000000..11db4c4
Binary files /dev/null and b/models/relics/sign_speed_glow.tga differ

diff --git a/mutators.cfg b/mutators.cfg
index 443c666dd08b19de668e84990735d0e0f137c59c..8949ed8b8ba3eb987a5cb89f5cc6f2d88e0e00d8 100644 (file)
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -335,6 +335,10 @@ set g_buffs_medic_regen 1.7 "health medic rate multiplier"
 set g_buffs_vengeance 1 "vengeance buff: attackers also take damage"
 set g_buffs_vengeance_time 60 "vengeance buff carry time"
 set g_buffs_vengeance_damage_multiplier 0.4 "amount of damage dealt the attacker takes when hitting a target with vengeance"
+set g_buffs_bash 1 "bash buff: increased knockback force and immunity to knockback"
+set g_buffs_bash_time 60 "bash buff carry time"
+set g_buffs_bash_force 2 "bash force multiplier"
+set g_buffs_bash_force_self 1.2 "bash self force multiplier"
 set g_buffs_disability 0 "disability buff: attacks to players and monsters deal slowness (decreased movement/attack speed) for a few seconds"
 set g_buffs_disability_time 60 "disability buff carry time"
 set g_buffs_disability_slowtime 3 "time in seconds for target disability"

diff --git a/qcsrc/common/effects/effectinfo_buffs.inc b/qcsrc/common/effects/effectinfo_buffs.inc
index 1fe2d8e624a304ec9556444757df75714d2e07a8..8ac9041300c5922ad0fe9b85967dc0f4694ee5e9 100644 (file)
--- a/qcsrc/common/effects/effectinfo_buffs.inc
+++ b/qcsrc/common/effects/effectinfo_buffs.inc
@@ -1,3 +1,21 @@
+DEF(relic_resistance);
+SUB(relic_resistance) {
+    MY(airfriction) = 0.200000;
+    MY(alpha_min) = 128;
+    MY(alpha_max) = 256;
+    MY(alpha_fade) = 256;
+    MY(color_min) = "0x00ff80";
+    MY(color_max) = "0x00ff80";
+    MY(count) = 20;
+    MY(gravity) = -0.100000;
+    MY(liquidfriction) = 0.800000;
+    MY(originjitter) = '8.0 8.0 32.0';
+    MY(size_min) = 1.500000;
+    MY(size_max) = 1.500000;
+    MY(type) = "static";
+    MY(velocityjitter) = '64.0 64.0 32.0';
+}
+
 DEF(relic_regeneration);
 SUB(relic_regeneration) {
     MY(airfriction) = 0.200000;
@@ -285,21 +303,3 @@ SUB(relic_vengeance) {
     MY(type) = "static";
     MY(velocityjitter) = '64.0 64.0 32.0';
 }
-
-DEF(relic_resistance);
-SUB(relic_resistance) {
-    MY(airfriction) = 0.200000;
-    MY(alpha_min) = 128;
-    MY(alpha_max) = 256;
-    MY(alpha_fade) = 256;
-    MY(color_min) = "0x00ff80";
-    MY(color_max) = "0x00ff80";
-    MY(count) = 20;
-    MY(gravity) = -0.100000;
-    MY(liquidfriction) = 0.800000;
-    MY(originjitter) = '8.0 8.0 32.0';
-    MY(size_min) = 1.500000;
-    MY(size_max) = 1.500000;
-    MY(type) = "static";
-    MY(velocityjitter) = '64.0 64.0 32.0';
-}

diff --git a/qcsrc/common/mutators/mutator/buffs/all.inc b/qcsrc/common/mutators/mutator/buffs/all.inc
index 659531a3c42e4a8acc290b80f827ca7d57142eaf..1572a75e55d9d9dc0599b05946f0c7a3eb84a542 100644 (file)
--- a/qcsrc/common/mutators/mutator/buffs/all.inc
+++ b/qcsrc/common/mutators/mutator/buffs/all.inc
@@ -4,6 +4,7 @@ string Buff_UndeprecateName(string buffname)
     {
         case "ammoregen": return "ammo";               // Q3TA ammoregen
         case "doubler": return "inferno";              // Q3TA doubler
+        case "scout": return "bash";                   // Q3TA scout
         case "guard": return "resistance";             // Q3TA guard
         case "revival": case "regen": return "medic";  // WOP revival, Q3A regen
         case "jumper": return "jump";                  // WOP jumper
@@ -18,13 +19,24 @@ CLASS(AmmoBuff, Buff)
     ATTRIB(AmmoBuff, m_name, string, _("Ammo"));
     ATTRIB(AmmoBuff, netname, string, "ammo");
     ATTRIB(AmmoBuff, m_icon, string, "buff_ammo");
-    ATTRIB(AmmoBuff, m_skin, int, 0);
+    ATTRIB(AmmoBuff, m_skin, int, 3);
     ATTRIB(AmmoBuff, m_color, vector, '0.76 1 0.1');
 ENDCLASS(AmmoBuff)
 REGISTER_BUFF(AMMO, NEW(AmmoBuff));
 BUFF_SPAWNFUNCS(ammo, BUFF_AMMO)
 BUFF_SPAWNFUNC_Q3COMPAT(item_ammoregen, BUFF_AMMO)
 
+CLASS(ResistanceBuff, Buff)
+    ATTRIB(ResistanceBuff, m_name, string, _("Resistance"));
+    ATTRIB(ResistanceBuff, netname, string, "resistance");
+    ATTRIB(ResistanceBuff, m_icon, string, "buff_resistance");
+    ATTRIB(ResistanceBuff, m_skin, int, 0);
+    ATTRIB(ResistanceBuff, m_color, vector, '0.36 1 0.07');
+ENDCLASS(ResistanceBuff)
+REGISTER_BUFF(RESISTANCE, NEW(ResistanceBuff));
+BUFF_SPAWNFUNCS(resistance, BUFF_RESISTANCE)
+BUFF_SPAWNFUNC_Q3COMPAT(item_guard, BUFF_RESISTANCE)
+
 CLASS(MedicBuff, Buff)
     ATTRIB(MedicBuff, m_name, string, _("Medic"));
     ATTRIB(MedicBuff, netname, string, "medic");
@@ -37,6 +49,17 @@ BUFF_SPAWNFUNCS(medic, BUFF_MEDIC)
 BUFF_SPAWNFUNC_Q3COMPAT(item_regen, BUFF_MEDIC)
 BUFF_SPAWNFUNC_Q3COMPAT(item_revival, BUFF_MEDIC)
 
+CLASS(BashBuff, Buff)
+    ATTRIB(BashBuff, m_name, string, _("Bash"));
+    ATTRIB(BashBuff, netname, string, "bash");
+    ATTRIB(BashBuff, m_icon, string, "buff_bash");
+    ATTRIB(BashBuff, m_skin, int, 5);
+    ATTRIB(BashBuff, m_color, vector, '1 0.39 0');
+ENDCLASS(BashBuff)
+REGISTER_BUFF(BASH, NEW(BashBuff));
+BUFF_SPAWNFUNCS(bash, BUFF_BASH)
+BUFF_SPAWNFUNC_Q3COMPAT(item_scout, BUFF_BASH)
+
 CLASS(VampireBuff, Buff)
     ATTRIB(VampireBuff, m_name, string, _("Vampire"));
     ATTRIB(VampireBuff, netname, string, "vampire");
@@ -52,7 +75,7 @@ CLASS(DisabilityBuff, Buff)
     ATTRIB(DisabilityBuff, m_name, string, _("Disability"));
     ATTRIB(DisabilityBuff, netname, string, "disability");
     ATTRIB(DisabilityBuff, m_icon, string, "buff_disability");
-    ATTRIB(DisabilityBuff, m_skin, int, 3);
+    ATTRIB(DisabilityBuff, m_skin, int, 7);
     ATTRIB(DisabilityBuff, m_color, vector, '0.94 0.3 1');
 ENDCLASS(DisabilityBuff)
 REGISTER_BUFF(DISABILITY, NEW(DisabilityBuff));
@@ -77,7 +100,7 @@ CLASS(VengeanceBuff, Buff)
     ATTRIB(VengeanceBuff, m_name, string, _("Vengeance"));
     ATTRIB(VengeanceBuff, netname, string, "vengeance");
     ATTRIB(VengeanceBuff, m_icon, string, "buff_vengeance");
-    ATTRIB(VengeanceBuff, m_skin, int, 4);
+    ATTRIB(VengeanceBuff, m_skin, int, 15);
     ATTRIB(VengeanceBuff, m_color, vector, '1 0.23 0.61');
 ENDCLASS(VengeanceBuff)
 REGISTER_BUFF(VENGEANCE, NEW(VengeanceBuff));
@@ -88,7 +111,7 @@ CLASS(JumpBuff, Buff)
     ATTRIB(JumpBuff, m_name, string, _("Jump"));
     ATTRIB(JumpBuff, netname, string, "jump");
     ATTRIB(JumpBuff, m_icon, string, "buff_jump");
-    ATTRIB(JumpBuff, m_skin, int, 5);
+    ATTRIB(JumpBuff, m_skin, int, 10);
     ATTRIB(JumpBuff, m_color, vector, '0.24 0.78 1');
 ENDCLASS(JumpBuff)
 REGISTER_BUFF(JUMP, NEW(JumpBuff));
@@ -99,7 +122,7 @@ CLASS(InfernoBuff, Buff)
     ATTRIB(InfernoBuff, m_name, string, _("Inferno"));
     ATTRIB(InfernoBuff, netname, string, "inferno");
     ATTRIB(InfernoBuff, m_icon, string, "buff_inferno");
-    ATTRIB(InfernoBuff, m_skin, int, 6);
+    ATTRIB(InfernoBuff, m_skin, int, 16);
     ATTRIB(InfernoBuff, m_color, vector, '1 0.62 0');
 ENDCLASS(InfernoBuff)
 REGISTER_BUFF(INFERNO, NEW(InfernoBuff));
@@ -110,7 +133,7 @@ CLASS(SwapperBuff, Buff)
     ATTRIB(SwapperBuff, m_name, string, _("Swapper"));
     ATTRIB(SwapperBuff, netname, string, "swapper");
     ATTRIB(SwapperBuff, m_icon, string, "buff_swapper");
-    ATTRIB(SwapperBuff, m_skin, int, 7);
+    ATTRIB(SwapperBuff, m_skin, int, 17);
     ATTRIB(SwapperBuff, m_color, vector, '0.63 0.36 1');
 ENDCLASS(SwapperBuff)
 REGISTER_BUFF(SWAPPER, NEW(SwapperBuff));
@@ -121,7 +144,7 @@ CLASS(MagnetBuff, Buff)
     ATTRIB(MagnetBuff, m_name, string, _("Magnet"));
     ATTRIB(MagnetBuff, netname, string, "magnet");
     ATTRIB(MagnetBuff, m_icon, string, "buff_magnet");
-    ATTRIB(MagnetBuff, m_skin, int, 8);
+    ATTRIB(MagnetBuff, m_skin, int, 18);
     ATTRIB(MagnetBuff, m_color, vector, '1 0.95 0.18');
 ENDCLASS(MagnetBuff)
 REGISTER_BUFF(MAGNET, NEW(MagnetBuff));
@@ -131,7 +154,7 @@ CLASS(LuckBuff, Buff)
     ATTRIB(LuckBuff, m_name, string, _("Luck"));
     ATTRIB(LuckBuff, netname, string, "luck");
     ATTRIB(LuckBuff, m_icon, string, "buff_luck");
-    ATTRIB(LuckBuff, m_skin, int, 9);
+    ATTRIB(LuckBuff, m_skin, int, 19);
     ATTRIB(LuckBuff, m_color, vector, '1 0.23 0.44');
 ENDCLASS(LuckBuff)
 REGISTER_BUFF(LUCK, NEW(LuckBuff));
@@ -141,20 +164,9 @@ CLASS(FlightBuff, Buff)
     ATTRIB(FlightBuff, m_name, string, _("Flight"));
     ATTRIB(FlightBuff, netname, string, "flight");
     ATTRIB(FlightBuff, m_icon, string, "buff_flight");
-    ATTRIB(FlightBuff, m_skin, int, 10);
+    ATTRIB(FlightBuff, m_skin, int, 11);
     ATTRIB(FlightBuff, m_color, vector, '0.23 0.44 1');
 ENDCLASS(FlightBuff)
 REGISTER_BUFF(FLIGHT, NEW(FlightBuff));
 BUFF_SPAWNFUNCS(flight, BUFF_FLIGHT)
 BUFF_SPAWNFUNC_Q3COMPAT(item_flight, BUFF_FLIGHT)
-
-CLASS(ResistanceBuff, Buff)
-    ATTRIB(ResistanceBuff, m_name, string, _("Resistance"));
-    ATTRIB(ResistanceBuff, netname, string, "resistance");
-    ATTRIB(ResistanceBuff, m_icon, string, "buff_resistance");
-    ATTRIB(ResistanceBuff, m_skin, int, 11);
-    ATTRIB(ResistanceBuff, m_color, vector, '0.36 1 0.07');
-ENDCLASS(ResistanceBuff)
-REGISTER_BUFF(RESISTANCE, NEW(ResistanceBuff));
-BUFF_SPAWNFUNCS(resistance, BUFF_RESISTANCE)
-BUFF_SPAWNFUNC_Q3COMPAT(item_guard, BUFF_RESISTANCE)

diff --git a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
index fa97b421b6dd549c98d8e9825916aafa3f673fb5..6ce016e5681046730193233a5c281c1b7a835165 100644 (file)
--- a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
+++ b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
@@ -694,6 +694,19 @@ MUTATOR_HOOKFUNCTION(buffs, Damage_Calculate)
                dmgent.nextthink = time + 0.1;
        }
 
+       if(StatusEffects_active(BUFF_BASH, frag_target))
+       if(frag_attacker != frag_target)
+               frag_force = '0 0 0';
+
+       if(StatusEffects_active(BUFF_BASH, frag_attacker))
+       if(frag_force)
+       {
+               if(frag_attacker == frag_target)
+                       frag_force *= autocvar_g_buffs_bash_force_self;
+               else
+                       frag_force *= autocvar_g_buffs_bash_force;
+       }
+
        if(StatusEffects_active(BUFF_DISABILITY, frag_attacker))
        if(frag_target != frag_attacker)
                StatusEffects_apply(STATUSEFFECT_Disabled, frag_target, time + autocvar_g_buffs_disability_slowtime, 0);

diff --git a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qh b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qh
index dccb35c869854fe0dddbb27e3a44ad3678e63f21..c8b2b363d12e6e704b214036e6cf33b44cfc0c09 100644 (file)
--- a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qh
+++ b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qh
@@ -37,6 +37,8 @@ float autocvar_g_buffs_medic_rot;
 float autocvar_g_buffs_medic_max;
 float autocvar_g_buffs_medic_regen;
 float autocvar_g_buffs_vengeance_damage_multiplier;
+float autocvar_g_buffs_bash_force;
+float autocvar_g_buffs_bash_force_self;
 float autocvar_g_buffs_disability_slowtime;
 float autocvar_g_buffs_disability_speed;
 float autocvar_g_buffs_disability_rate;

diff --git a/scripts/relics.shader b/scripts/relics.shader
index aa676420e3bbf37e2e2ed1aa25de4f7c8ce60dc3..e070ea2b6c8bd673cb316aa5650370394264cdc1 100644 (file)
--- a/scripts/relics.shader
+++ b/scripts/relics.shader
@@ -27,6 +27,17 @@ models/relics/sign_ammo
        }
 }
 
+models/relics/sign_bash
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/relics/sign_bash
+               blendfunc add
+       }
+}
+
 models/relics/sign_blessed
 {
        deformVertexes autosprite
@@ -71,6 +82,17 @@ models/relics/sign_inferno
        }
 }
 
+models/relics/sign_invisible
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/relics/sign_invisible
+               blendfunc add
+       }
+}
+
 models/relics/sign_jump
 {
        deformVertexes autosprite
@@ -115,6 +137,17 @@ models/relics/sign_resistance
        }
 }
 
+models/relics/sign_speed
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/relics/sign_speed
+               blendfunc add
+       }
+}
+
 models/relics/sign_swapper
 {
        deformVertexes autosprite