From 81d0290bfef1be6a5755fa330cb99bd7eaecfd4f Mon Sep 17 00:00:00 2001 From: LegendaryGuard Date: Mon, 28 Nov 2022 03:41:06 +0100 Subject: [PATCH] Fix buffs order --- models/relics/relic.md3_0.skin | 2 +- models/relics/relic.md3_1.skin | 2 +- models/relics/relic.md3_10.skin | 2 +- models/relics/relic.md3_11.skin | 2 +- models/relics/relic.md3_12.skin | 2 +- models/relics/relic.md3_13.skin | 2 +- models/relics/relic.md3_14.skin | 2 +- models/relics/relic.md3_15.skin | 2 +- models/relics/relic.md3_2.skin | 2 +- models/relics/relic.md3_3.skin | 2 +- models/relics/relic.md3_4.skin | 2 +- models/relics/relic.md3_5.skin | 2 +- models/relics/relic.md3_6.skin | 2 +- models/relics/relic.md3_7.skin | 2 +- models/relics/relic.md3_8.skin | 2 +- models/relics/relic.md3_9.skin | 2 +- qcsrc/common/mutators/mutator/buffs/all.inc | 18 +++++++++--------- 17 files changed, 25 insertions(+), 25 deletions(-) diff --git a/models/relics/relic.md3_0.skin b/models/relics/relic.md3_0.skin index cbba2916f..5a2a694c5 100644 --- 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_medic \ No newline at end of file +sign,models/relics/sign_ammo \ No newline at end of file diff --git a/models/relics/relic.md3_1.skin b/models/relics/relic.md3_1.skin index 299176685..cbba2916f 100644 --- a/models/relics/relic.md3_1.skin +++ b/models/relics/relic.md3_1.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_vampire \ No newline at end of file +sign,models/relics/sign_medic \ No newline at end of file diff --git a/models/relics/relic.md3_10.skin b/models/relics/relic.md3_10.skin index a8af448f6..4b88dde04 100644 --- 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_blessed \ No newline at end of file +sign,models/relics/sign_flight \ No newline at end of file diff --git a/models/relics/relic.md3_11.skin b/models/relics/relic.md3_11.skin index 5b188bebc..cfcb99896 100644 --- 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_vengeance \ No newline at end of file +sign,textures/common/nodraw \ No newline at end of file diff --git a/models/relics/relic.md3_12.skin b/models/relics/relic.md3_12.skin index 5c30ed67c..cfcb99896 100644 --- 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,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_13.skin b/models/relics/relic.md3_13.skin index 30fba072e..cfcb99896 100644 --- a/models/relics/relic.md3_13.skin +++ b/models/relics/relic.md3_13.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,textures/common/nodraw \ No newline at end of file diff --git a/models/relics/relic.md3_14.skin b/models/relics/relic.md3_14.skin index b89d51cec..cfcb99896 100644 --- 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,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_15.skin b/models/relics/relic.md3_15.skin index 7401d28f9..cfcb99896 100644 --- 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,models/relics/sign_luck \ No newline at end of file +sign,textures/common/nodraw \ No newline at end of file diff --git a/models/relics/relic.md3_2.skin b/models/relics/relic.md3_2.skin index 5a2a694c5..299176685 100644 --- a/models/relics/relic.md3_2.skin +++ b/models/relics/relic.md3_2.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_vampire \ No newline at end of file diff --git a/models/relics/relic.md3_3.skin b/models/relics/relic.md3_3.skin index cfcb99896..ce6fb9f41 100644 --- 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,textures/common/nodraw \ No newline at end of file +sign,models/relics/sign_disability \ No newline at end of file diff --git a/models/relics/relic.md3_4.skin b/models/relics/relic.md3_4.skin index cfcb99896..5b188bebc 100644 --- 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,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_5.skin b/models/relics/relic.md3_5.skin index ce6fb9f41..8276637c0 100644 --- 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_disability \ No newline at end of file +sign,models/relics/sign_jump \ No newline at end of file diff --git a/models/relics/relic.md3_6.skin b/models/relics/relic.md3_6.skin index cfcb99896..5c30ed67c 100644 --- 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,textures/common/nodraw \ No newline at end of file +sign,models/relics/sign_inferno \ No newline at end of file diff --git a/models/relics/relic.md3_7.skin b/models/relics/relic.md3_7.skin index 8276637c0..30fba072e 100644 --- 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_jump \ No newline at end of file +sign,models/relics/sign_swapper \ No newline at end of file diff --git a/models/relics/relic.md3_8.skin b/models/relics/relic.md3_8.skin index 4b88dde04..b89d51cec 100644 --- 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_flight \ No newline at end of file +sign,models/relics/sign_magnet \ No newline at end of file diff --git a/models/relics/relic.md3_9.skin b/models/relics/relic.md3_9.skin index cfcb99896..7401d28f9 100644 --- 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,textures/common/nodraw \ No newline at end of file +sign,models/relics/sign_luck \ No newline at end of file diff --git a/qcsrc/common/mutators/mutator/buffs/all.inc b/qcsrc/common/mutators/mutator/buffs/all.inc index 4cb193769..0930498f8 100644 --- a/qcsrc/common/mutators/mutator/buffs/all.inc +++ b/qcsrc/common/mutators/mutator/buffs/all.inc @@ -17,7 +17,7 @@ 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, 3); + ATTRIB(AmmoBuff, m_skin, int, 0); ATTRIB(AmmoBuff, m_color, vector, '0.76 1 0.1'); ENDCLASS(AmmoBuff) REGISTER_BUFF(AMMO, NEW(AmmoBuff)); @@ -51,7 +51,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, 7); + ATTRIB(DisabilityBuff, m_skin, int, 3); ATTRIB(DisabilityBuff, m_color, vector, '0.94 0.3 1'); ENDCLASS(DisabilityBuff) REGISTER_BUFF(DISABILITY, NEW(DisabilityBuff)); @@ -76,7 +76,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, 15); + ATTRIB(VengeanceBuff, m_skin, int, 4); ATTRIB(VengeanceBuff, m_color, vector, '1 0.23 0.61'); ENDCLASS(VengeanceBuff) REGISTER_BUFF(VENGEANCE, NEW(VengeanceBuff)); @@ -87,7 +87,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, 10); + ATTRIB(JumpBuff, m_skin, int, 5); ATTRIB(JumpBuff, m_color, vector, '0.24 0.78 1'); ENDCLASS(JumpBuff) REGISTER_BUFF(JUMP, NEW(JumpBuff)); @@ -98,7 +98,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, 16); + ATTRIB(InfernoBuff, m_skin, int, 6); ATTRIB(InfernoBuff, m_color, vector, '1 0.62 0'); ENDCLASS(InfernoBuff) REGISTER_BUFF(INFERNO, NEW(InfernoBuff)); @@ -109,7 +109,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, 17); + ATTRIB(SwapperBuff, m_skin, int, 7); ATTRIB(SwapperBuff, m_color, vector, '0.63 0.36 1'); ENDCLASS(SwapperBuff) REGISTER_BUFF(SWAPPER, NEW(SwapperBuff)); @@ -120,7 +120,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, 18); + ATTRIB(MagnetBuff, m_skin, int, 8); ATTRIB(MagnetBuff, m_color, vector, '1 0.95 0.18'); ENDCLASS(MagnetBuff) REGISTER_BUFF(MAGNET, NEW(MagnetBuff)); @@ -130,7 +130,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, 19); + ATTRIB(LuckBuff, m_skin, int, 9); ATTRIB(LuckBuff, m_color, vector, '1 0.23 0.44'); ENDCLASS(LuckBuff) REGISTER_BUFF(LUCK, NEW(LuckBuff)); @@ -140,7 +140,7 @@ 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, 11); + ATTRIB(FlightBuff, m_skin, int, 10); ATTRIB(FlightBuff, m_color, vector, '0.23 0.44 1'); ENDCLASS(FlightBuff) REGISTER_BUFF(FLIGHT, NEW(FlightBuff)); -- 2.39.2