From: otta8634 Date: Wed, 25 Dec 2024 17:11:39 +0000 (+0800) Subject: Revert most of f498671b X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FTimePath%2Fguide;p=xonotic%2Fxonotic-data.pk3dir.git Revert most of f498671b See https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/181#note_2269460280. --- diff --git a/qcsrc/common/colors.qh b/qcsrc/common/colors.qh deleted file mode 100644 index 899a8e3ae..000000000 --- a/qcsrc/common/colors.qh +++ /dev/null @@ -1,86 +0,0 @@ -#pragma once - -/* - * This file holds all m_color vals for the following, - * to avoid duplicate values, since some are referenced in multiple places - * (e.g. Vortex m_color in common/weapons/weapon/vortex.qh and in the describe method of ./rifle.qh): - * - Weapons - * - Items - * - Buffs, powerups - * - Nades - * - Status effects - * Perhaps in future this file can be converted to something like gfx/menu/luma/skinvalues.txt - */ - -#define COLOR_WEP_ARC '1 1 1' -#define COLOR_WEP_BLASTER '1 0.5 0.5' -#define COLOR_WEP_CRYLINK '1 0.5 1' -#define COLOR_WEP_DEVASTATOR '1 1 0' -#define COLOR_WEP_ELECTRO '0 0.5 1' -#define COLOR_WEP_FIREBALL '1 0.5 0' -#define COLOR_WEP_HAGAR '1 1 0.5' -#define COLOR_WEP_HLAC '0 1 0' -#define COLOR_WEP_HOOK '0 0.5 0' -#define COLOR_WEP_MACHINEGUN '1 1 0' -#define COLOR_WEP_MINELAYER '0.75 1 0' -#define COLOR_WEP_MORTAR '1 0 0' -#define COLOR_WEP_PORTO '0.5 0.5 0.5' -#define COLOR_WEP_RIFLE '0.5 1 0' -#define COLOR_WEP_SEEKER '0.5 1 0' -#define COLOR_WEP_SHOCKWAVE '0.5 0.25 0' -#define COLOR_WEP_SHOTGUN '0.5 0.25 0' -#define COLOR_WEP_TUBA '0 1 0' -#define COLOR_WEP_VAPORIZER '0.5 1 1' -#define COLOR_WEP_VORTEX '0.5 1 1' -#define COLOR_WEP_OKHMG '0.5 0.5 0' -#define COLOR_WEP_OKMACHINEGUN '1 1 0' -#define COLOR_WEP_OKNEX '0.5 1 1' -#define COLOR_WEP_OKRPC '0.5 0.5 0' -#define COLOR_WEP_OKSHOTGUN '0.5 0.25 0' - -#define COLOR_ITEM_ARMOR '0 1 0' -#define COLOR_ITEM_HEALTH '1 0 0' -#define COLOR_ITEM_JETPACK '0.5 0.5 0.5' - -#define COLOR_POWERUP_JETPACKREGEN '1 0.5 0' -#define COLOR_POWERUP_EXTRALIFE '1 0 0' -#define COLOR_POWERUP_INVISIBILITY '0.5 0.5 1' -#define COLOR_POWERUP_SHIELD '1 0 1' -#define COLOR_POWERUP_SPEED '0.1 1 0.84' -#define COLOR_POWERUP_STRENGTH '0 0 1' - -#define COLOR_BUFF_AMMO '0.76 1 0.1' -#define COLOR_BUFF_RESISTANCE '0.36 0 0.07' -#define COLOR_BUFF_MEDIC '1 0.12 0' -#define COLOR_BUFF_BASH '1 0.39 0' -#define COLOR_BUFF_VAMPIRE '1 0 0.24' -#define COLOR_BUFF_DISABILITY '0.94 0.3 1' -#define COLOR_BUFF_VENGEANCE '1 0.23 0.61' -#define COLOR_BUFF_JUMP '0.24 0.78 1' -#define COLOR_BUFF_INFERNO '1 0.62 0' -#define COLOR_BUFF_SWAPPER '0.63 0.36 1' -#define COLOR_BUFF_MAGNET '1 0.95 0.18' -#define COLOR_BUFF_LUCK '1 0.23 0.44' -#define COLOR_BUFF_FLIGHT '0.23 0.44 1' - -#define COLOR_NADE_NORMAL '1 1 1' -#define COLOR_NADE_NAPALM '2 0.5 0' -#define COLOR_NADE_ICE '0 0.5 2' -#define COLOR_NADE_TRANSLOCATE '1 0 1' -#define COLOR_NADE_SPAWN '1 0.9 0' -#define COLOR_NADE_HEAL '1 0 0' -#define COLOR_NADE_MONSTER '0.25 0.75 0' -#define COLOR_NADE_ENTRAP '0.15 0.85 0' -#define COLOR_NADE_VEIL '0.65 0.85 0.65' -#define COLOR_NADE_AMMO '0.66 0.33 0' -#define COLOR_NADE_DARKNESS '0.23 0 0.23' - -#define COLOR_STATUSEFFECT_BURNING '1 0.62 0' -#define COLOR_STATUSEFFECT_SPAWNSHIELD '0.36 1 0.07' -#define COLOR_STATUSEFFECT_STUNNED '0.67 0.84 1' -#define COLOR_STATUSEFFECT_WEBBED '0.94 0.3 1' - -// Useful macros for the guide -#define COLORED_NAME(this) strcat(rgb_to_hexcolor(this.m_color), this.m_name, "^7") -#define COLORED_NAME_WITH_CONCAT(this, concat) strcat(rgb_to_hexcolor(this.m_color), this.m_name, " ", concat, "^7") -// These can't be used everywhere, or else it would cause circular includes by including "class" diff --git a/qcsrc/common/items/item/ammo.qc b/qcsrc/common/items/item/ammo.qc index 090f8ea6f..d72130c84 100644 --- a/qcsrc/common/items/item/ammo.qc +++ b/qcsrc/common/items/item/ammo.qc @@ -1,7 +1,7 @@ #include "ammo.qh" #ifdef MENUQC -#include +#include #include METHOD(Ammo, describe, string(Ammo this)) diff --git a/qcsrc/common/items/item/armor.qc b/qcsrc/common/items/item/armor.qc index 904686a7b..13045e38b 100644 --- a/qcsrc/common/items/item/armor.qc +++ b/qcsrc/common/items/item/armor.qc @@ -1,6 +1,8 @@ #include "armor.qh" #ifdef MENUQC +#include + METHOD(ArmorSmall, describe, string(ArmorSmall this)) { TC(ArmorSmall, this); diff --git a/qcsrc/common/items/item/armor.qh b/qcsrc/common/items/item/armor.qh index 755fd1d32..91b927878 100644 --- a/qcsrc/common/items/item/armor.qh +++ b/qcsrc/common/items/item/armor.qh @@ -1,10 +1,8 @@ #pragma once -#include - #include "pickup.qh" CLASS(Armor, Pickup) -/* color */ ATTRIB(Armor, m_color, vector, COLOR_ITEM_ARMOR); +/* color */ ATTRIB(Armor, m_color, vector, '0 1 0'); #ifdef SVQC /* pickupfunc */ ATTRIB(Armor, m_pickupevalfunc, float(entity player, entity item), healtharmor_pickupevalfunc); /* botvalue */ ATTRIB(Armor, m_botvalue, int, 5000); diff --git a/qcsrc/common/items/item/health.qc b/qcsrc/common/items/item/health.qc index c74e478c1..d9780fd9c 100644 --- a/qcsrc/common/items/item/health.qc +++ b/qcsrc/common/items/item/health.qc @@ -1,6 +1,8 @@ #include "health.qh" #ifdef MENUQC +#include + METHOD(HealthSmall, describe, string(HealthSmall this)) { TC(HealthSmall, this); diff --git a/qcsrc/common/items/item/health.qh b/qcsrc/common/items/item/health.qh index 3dbf93e10..70a4fab54 100644 --- a/qcsrc/common/items/item/health.qh +++ b/qcsrc/common/items/item/health.qh @@ -1,10 +1,8 @@ #pragma once -#include - #include "pickup.qh" CLASS(Health, Pickup) -/* color */ ATTRIB(Health, m_color, vector, COLOR_ITEM_HEALTH); +/* color */ ATTRIB(Health, m_color, vector, '1 0 0'); #ifdef SVQC /* pickupfunc */ ATTRIB(Health, m_pickupevalfunc, float(entity player, entity item), healtharmor_pickupevalfunc); /* botvalue */ ATTRIB(Health, m_botvalue, int, 5000); diff --git a/qcsrc/common/items/item/jetpack.qc b/qcsrc/common/items/item/jetpack.qc index 75f9f1559..69ef59aa0 100644 --- a/qcsrc/common/items/item/jetpack.qc +++ b/qcsrc/common/items/item/jetpack.qc @@ -17,6 +17,8 @@ METHOD(JetpackRegen, m_spawnfunc_hookreplace, GameItem(JetpackRegen this, entity #endif #ifdef MENUQC +#include + METHOD(Jetpack, describe, string(Jetpack this)) { TC(Jetpack, this); diff --git a/qcsrc/common/items/item/jetpack.qh b/qcsrc/common/items/item/jetpack.qh index 5176aed7f..c78f7ab7b 100644 --- a/qcsrc/common/items/item/jetpack.qh +++ b/qcsrc/common/items/item/jetpack.qh @@ -5,7 +5,6 @@ #endif #include "ammo.qh" -#include #include #ifndef SVQC @@ -40,7 +39,7 @@ CLASS(Jetpack, Powerup) /* refnmae */ ATTRIB(Jetpack, netname, string, "jetpack"); /* itemname */ ATTRIB(Jetpack, m_name, string, _("Jetpack")); /* icon */ ATTRIB(Jetpack, m_icon, string, "jetpack"); -/* color */ ATTRIB(Jetpack, m_color, vector, COLOR_ITEM_JETPACK); +/* color */ ATTRIB(Jetpack, m_color, vector, '0.5 0.5 0.5'); /* wptext */ ATTRIB(Jetpack, m_waypoint, string, _("Jetpack")); /* wpblink */ ATTRIB(Jetpack, m_waypointblink, int, 2); #ifdef SVQC @@ -109,7 +108,7 @@ CLASS(JetpackRegen, Powerup) /* refname */ ATTRIB(JetpackRegen, netname, string, "fuel_regen"); /* itemname */ ATTRIB(JetpackRegen, m_name, string, _("Fuel regenerator")); /* icon */ ATTRIB(JetpackRegen, m_icon, string, "fuelregen"); -/* color */ ATTRIB(JetpackRegen, m_color, vector, COLOR_POWERUP_JETPACKREGEN); +/* color */ ATTRIB(JetpackRegen, m_color, vector, '1 0.5 0'); /* wptext */ ATTRIB(JetpackRegen, m_waypoint, string, _("Fuel regen")); /* wpblink */ ATTRIB(JetpackRegen, m_waypointblink, int, 2); #ifdef SVQC diff --git a/qcsrc/common/monsters/monster/spider.qh b/qcsrc/common/monsters/monster/spider.qh index aebbf5275..e0fd001f9 100644 --- a/qcsrc/common/monsters/monster/spider.qh +++ b/qcsrc/common/monsters/monster/spider.qh @@ -1,7 +1,6 @@ #pragma once #include "../all.qh" -#include #ifdef GAMEQC MODEL(MON_SPIDER, M_Model("spider.dpm")); @@ -40,7 +39,7 @@ CLASS(Webbed, StatusEffects) ATTRIB(Webbed, m_name, string, _("Webbed")); ATTRIB(Webbed, m_icon, string, "buff_disability"); #endif - ATTRIB(Webbed, m_color, vector, COLOR_STATUSEFFECT_WEBBED); + ATTRIB(Webbed, m_color, vector, '0.94 0.3 1'); ATTRIB(Webbed, m_hidden, bool, true); ATTRIB(Webbed, m_lifetime, float, 10); ENDCLASS(Webbed) diff --git a/qcsrc/common/mutators/mutator/buffs/all.inc b/qcsrc/common/mutators/mutator/buffs/all.inc index b2feedfc3..8b9d3a63d 100644 --- a/qcsrc/common/mutators/mutator/buffs/all.inc +++ b/qcsrc/common/mutators/mutator/buffs/all.inc @@ -1,4 +1,4 @@ -#include +#include string Buff_CompatName(string buffname) { @@ -22,7 +22,7 @@ CLASS(AmmoBuff, Buff) ATTRIB(AmmoBuff, netname, string, "ammo"); ATTRIB(AmmoBuff, m_icon, string, "buff_ammo"); ATTRIB(AmmoBuff, m_skin, int, 3); - ATTRIB(AmmoBuff, m_color, vector, COLOR_BUFF_AMMO); + ATTRIB(AmmoBuff, m_color, vector, '0.76 1 0.1'); #ifdef MENUQC METHOD(AmmoBuff, describe, string(AmmoBuff this)) { @@ -41,7 +41,7 @@ CLASS(ResistanceBuff, Buff) ATTRIB(ResistanceBuff, netname, string, "resistance"); ATTRIB(ResistanceBuff, m_icon, string, "buff_resistance"); ATTRIB(ResistanceBuff, m_skin, int, 0); - ATTRIB(ResistanceBuff, m_color, vector, COLOR_BUFF_RESISTANCE); + ATTRIB(ResistanceBuff, m_color, vector, '0.36 0 0.07'); #ifdef MENUQC METHOD(ResistanceBuff, describe, string(ResistanceBuff this)) { @@ -61,7 +61,7 @@ CLASS(MedicBuff, Buff) ATTRIB(MedicBuff, netname, string, "medic"); ATTRIB(MedicBuff, m_icon, string, "buff_medic"); ATTRIB(MedicBuff, m_skin, int, 1); - ATTRIB(MedicBuff, m_color, vector, COLOR_BUFF_MEDIC); + ATTRIB(MedicBuff, m_color, vector, '1 0.12 0'); #ifdef MENUQC METHOD(MedicBuff, describe, string(MedicBuff this)) { @@ -82,7 +82,7 @@ CLASS(BashBuff, Buff) ATTRIB(BashBuff, netname, string, "bash"); ATTRIB(BashBuff, m_icon, string, "buff_bash"); ATTRIB(BashBuff, m_skin, int, 5); - ATTRIB(BashBuff, m_color, vector, COLOR_BUFF_BASH); + ATTRIB(BashBuff, m_color, vector, '1 0.39 0'); #ifdef MENUQC METHOD(BashBuff, describe, string(BashBuff this)) { @@ -102,7 +102,7 @@ CLASS(VampireBuff, Buff) ATTRIB(VampireBuff, netname, string, "vampire"); ATTRIB(VampireBuff, m_icon, string, "buff_vampire"); ATTRIB(VampireBuff, m_skin, int, 2); - ATTRIB(VampireBuff, m_color, vector, COLOR_BUFF_VAMPIRE); + ATTRIB(VampireBuff, m_color, vector, '1 0 0.24'); #ifdef MENUQC METHOD(VampireBuff, describe, string(VampireBuff this)) { @@ -121,7 +121,7 @@ CLASS(DisabilityBuff, Buff) ATTRIB(DisabilityBuff, netname, string, "disability"); ATTRIB(DisabilityBuff, m_icon, string, "buff_disability"); ATTRIB(DisabilityBuff, m_skin, int, 7); - ATTRIB(DisabilityBuff, m_color, vector, COLOR_BUFF_DISABILITY); + ATTRIB(DisabilityBuff, m_color, vector, '0.94 0.3 1'); #ifdef MENUQC METHOD(DisabilityBuff, describe, string(DisabilityBuff this)) { @@ -140,7 +140,7 @@ CLASS(VengeanceBuff, Buff) ATTRIB(VengeanceBuff, netname, string, "vengeance"); ATTRIB(VengeanceBuff, m_icon, string, "buff_vengeance"); ATTRIB(VengeanceBuff, m_skin, int, 15); - ATTRIB(VengeanceBuff, m_color, vector, COLOR_BUFF_VENGEANCE); + ATTRIB(VengeanceBuff, m_color, vector, '1 0.23 0.61'); #ifdef MENUQC METHOD(VengeanceBuff, describe, string(VengeanceBuff this)) { @@ -159,7 +159,7 @@ CLASS(JumpBuff, Buff) ATTRIB(JumpBuff, netname, string, "jump"); ATTRIB(JumpBuff, m_icon, string, "buff_jump"); ATTRIB(JumpBuff, m_skin, int, 10); - ATTRIB(JumpBuff, m_color, vector, COLOR_BUFF_JUMP); + ATTRIB(JumpBuff, m_color, vector, '0.24 0.78 1'); #ifdef MENUQC METHOD(JumpBuff, describe, string(JumpBuff this)) { @@ -178,7 +178,7 @@ CLASS(InfernoBuff, Buff) ATTRIB(InfernoBuff, netname, string, "inferno"); ATTRIB(InfernoBuff, m_icon, string, "buff_inferno"); ATTRIB(InfernoBuff, m_skin, int, 16); - ATTRIB(InfernoBuff, m_color, vector, COLOR_BUFF_INFERNO); + ATTRIB(InfernoBuff, m_color, vector, '1 0.62 0'); #ifdef MENUQC METHOD(InfernoBuff, describe, string(InfernoBuff this)) { @@ -197,7 +197,7 @@ CLASS(SwapperBuff, Buff) ATTRIB(SwapperBuff, netname, string, "swapper"); ATTRIB(SwapperBuff, m_icon, string, "buff_swapper"); ATTRIB(SwapperBuff, m_skin, int, 17); - ATTRIB(SwapperBuff, m_color, vector, COLOR_BUFF_SWAPPER); + ATTRIB(SwapperBuff, m_color, vector, '0.63 0.36 1'); #ifdef MENUQC METHOD(SwapperBuff, describe, string(SwapperBuff this)) { @@ -217,7 +217,7 @@ CLASS(MagnetBuff, Buff) ATTRIB(MagnetBuff, netname, string, "magnet"); ATTRIB(MagnetBuff, m_icon, string, "buff_magnet"); ATTRIB(MagnetBuff, m_skin, int, 18); - ATTRIB(MagnetBuff, m_color, vector, COLOR_BUFF_MAGNET); + ATTRIB(MagnetBuff, m_color, vector, '1 0.95 0.18'); #ifdef MENUQC METHOD(MagnetBuff, describe, string(MagnetBuff this)) { @@ -235,7 +235,7 @@ CLASS(LuckBuff, Buff) ATTRIB(LuckBuff, netname, string, "luck"); ATTRIB(LuckBuff, m_icon, string, "buff_luck"); ATTRIB(LuckBuff, m_skin, int, 19); - ATTRIB(LuckBuff, m_color, vector, COLOR_BUFF_LUCK); + ATTRIB(LuckBuff, m_color, vector, '1 0.23 0.44'); #ifdef MENUQC METHOD(LuckBuff, describe, string(LuckBuff this)) { @@ -253,7 +253,7 @@ CLASS(FlightBuff, Buff) ATTRIB(FlightBuff, netname, string, "flight"); ATTRIB(FlightBuff, m_icon, string, "buff_flight"); ATTRIB(FlightBuff, m_skin, int, 11); - ATTRIB(FlightBuff, m_color, vector, COLOR_BUFF_FLIGHT); + ATTRIB(FlightBuff, m_color, vector, '0.23 0.44 1'); #ifdef MENUQC METHOD(FlightBuff, describe, string(FlightBuff this)) { diff --git a/qcsrc/common/mutators/mutator/instagib/items.qc b/qcsrc/common/mutators/mutator/instagib/items.qc index 7b6fa5aa1..123978291 100644 --- a/qcsrc/common/mutators/mutator/instagib/items.qc +++ b/qcsrc/common/mutators/mutator/instagib/items.qc @@ -1,6 +1,7 @@ #include "items.qh" #ifdef MENUQC +#include #include METHOD(VaporizerCells, describe, string(VaporizerCells this)) diff --git a/qcsrc/common/mutators/mutator/instagib/items.qh b/qcsrc/common/mutators/mutator/instagib/items.qh index 39b8eecdf..9858f4b7f 100644 --- a/qcsrc/common/mutators/mutator/instagib/items.qh +++ b/qcsrc/common/mutators/mutator/instagib/items.qh @@ -3,7 +3,6 @@ #include #include #include -#include float instagib_respawntime_ammo = 45; float instagib_respawntimejitter_ammo = 0; @@ -61,7 +60,7 @@ CLASS(ExtraLife, Powerup) /* refname */ ATTRIB(ExtraLife, netname, string, "extralife"); /* itemname */ ATTRIB(ExtraLife, m_name, string, _("Extra life")); /* icon */ ATTRIB(ExtraLife, m_icon, string, "item_mega_health"); -/* color */ ATTRIB(ExtraLife, m_color, vector, COLOR_POWERUP_EXTRALIFE); +/* color */ ATTRIB(ExtraLife, m_color, vector, '1 0 0'); /* wptext */ ATTRIB(ExtraLife, m_waypoint, string, _("Extra life")); /* wpblink */ ATTRIB(ExtraLife, m_waypointblink, int, 2); #ifdef SVQC diff --git a/qcsrc/common/mutators/mutator/nades/all.inc b/qcsrc/common/mutators/mutator/nades/all.inc index 798a166ec..113fd307e 100644 --- a/qcsrc/common/mutators/mutator/nades/all.inc +++ b/qcsrc/common/mutators/mutator/nades/all.inc @@ -1,4 +1,4 @@ -#include +#include #ifdef GAMEQC #define NADE_PROJECTILE(i, projectile, trail) MACRO_BEGIN \ @@ -8,7 +8,7 @@ MACRO_END #endif CLASS(NormalNade, Nade) - ATTRIB(NormalNade, m_color, vector, COLOR_NADE_NORMAL); + ATTRIB(NormalNade, m_color, vector, '1 1 1'); ATTRIB(NormalNade, m_name, string, _("Grenade")); ATTRIB(NormalNade, m_icon, string, "nade_normal"); #ifdef MENUQC @@ -29,7 +29,7 @@ REGISTER_NADE(NORMAL, NEW(NormalNade)) { } CLASS(NapalmNade, Nade) - ATTRIB(NapalmNade, m_color, vector, COLOR_NADE_NAPALM); + ATTRIB(NapalmNade, m_color, vector, '2 0.5 0'); ATTRIB(NapalmNade, m_name, string, _("Napalm grenade")); ATTRIB(NapalmNade, m_icon, string, "nade_napalm"); #ifdef MENUQC @@ -50,7 +50,7 @@ REGISTER_NADE(NAPALM, NEW(NapalmNade)) { } CLASS(IceNade, Nade) - ATTRIB(IceNade, m_color, vector, COLOR_NADE_ICE); + ATTRIB(IceNade, m_color, vector, '0 0.5 2'); ATTRIB(IceNade, m_name, string, _("Ice grenade")); ATTRIB(IceNade, m_icon, string, "nade_ice"); #ifdef MENUQC @@ -71,7 +71,7 @@ REGISTER_NADE(ICE, NEW(IceNade)) { } CLASS(TranslocateNade, Nade) - ATTRIB(TranslocateNade, m_color, vector, COLOR_NADE_TRANSLOCATE); + ATTRIB(TranslocateNade, m_color, vector, '1 0 1'); ATTRIB(TranslocateNade, m_name, string, _("Translocate grenade")); ATTRIB(TranslocateNade, m_icon, string, "nade_translocate"); #ifdef MENUQC @@ -91,7 +91,7 @@ REGISTER_NADE(TRANSLOCATE, NEW(TranslocateNade)) { } CLASS(SpawnNade, Nade) - ATTRIB(SpawnNade, m_color, vector, COLOR_NADE_SPAWN); + ATTRIB(SpawnNade, m_color, vector, '1 0.9 0'); ATTRIB(SpawnNade, m_name, string, _("Spawn grenade")); ATTRIB(SpawnNade, m_icon, string, "nade_spawn"); #ifdef MENUQC @@ -112,7 +112,7 @@ REGISTER_NADE(SPAWN, NEW(SpawnNade)) { } CLASS(HealNade, Nade) - ATTRIB(HealNade, m_color, vector, COLOR_NADE_HEAL); + ATTRIB(HealNade, m_color, vector, '1 0 0'); ATTRIB(HealNade, m_name, string, _("Heal grenade")); ATTRIB(HealNade, m_icon, string, "nade_heal"); #ifdef MENUQC @@ -133,7 +133,7 @@ REGISTER_NADE(HEAL, NEW(HealNade)) { } CLASS(MonsterNade, Nade) - ATTRIB(MonsterNade, m_color, vector, COLOR_NADE_MONSTER); + ATTRIB(MonsterNade, m_color, vector, '0.25 0.75 0'); ATTRIB(MonsterNade, m_name, string, _("Monster grenade")); ATTRIB(MonsterNade, m_icon, string, "nade_monster"); #ifdef MENUQC @@ -153,7 +153,7 @@ REGISTER_NADE(MONSTER, NEW(MonsterNade)) { } CLASS(EntrapNade, Nade) - ATTRIB(EntrapNade, m_color, vector, COLOR_NADE_ENTRAP); + ATTRIB(EntrapNade, m_color, vector, '0.15 0.85 0'); ATTRIB(EntrapNade, m_name, string, _("Entrap grenade")); ATTRIB(EntrapNade, m_icon, string, "nade_entrap"); #ifdef MENUQC @@ -174,7 +174,7 @@ REGISTER_NADE(ENTRAP, NEW(EntrapNade)) { } CLASS(VeilNade, Nade) - ATTRIB(VeilNade, m_color, vector, COLOR_NADE_VEIL); + ATTRIB(VeilNade, m_color, vector, '0.65 0.85 0.65'); ATTRIB(VeilNade, m_name, string, _("Veil grenade")); ATTRIB(VeilNade, m_icon, string, "nade_veil"); ATTRIB(VeilNade, m_alpha, float, 0.45); @@ -196,7 +196,7 @@ REGISTER_NADE(VEIL, NEW(VeilNade)) { } CLASS(AmmoNade, Nade) - ATTRIB(AmmoNade, m_color, vector, COLOR_NADE_AMMO); + ATTRIB(AmmoNade, m_color, vector, '0.66 0.33 0'); ATTRIB(AmmoNade, m_name, string, _("Ammo grenade")); ATTRIB(AmmoNade, m_icon, string, "nade_ammo"); #ifdef MENUQC @@ -218,7 +218,7 @@ REGISTER_NADE(AMMO, NEW(AmmoNade)) { } CLASS(DarknessNade, Nade) - ATTRIB(DarknessNade, m_color, vector, COLOR_NADE_DARKNESS); + ATTRIB(DarknessNade, m_color, vector, '0.23 0 0.23'); ATTRIB(DarknessNade, m_name, string, _("Darkness grenade")); ATTRIB(DarknessNade, m_icon, string, "nade_darkness"); #ifdef MENUQC diff --git a/qcsrc/common/mutators/mutator/overkill/okhmg.qc b/qcsrc/common/mutators/mutator/overkill/okhmg.qc index a35864da7..57966de67 100644 --- a/qcsrc/common/mutators/mutator/overkill/okhmg.qc +++ b/qcsrc/common/mutators/mutator/overkill/okhmg.qc @@ -156,6 +156,7 @@ METHOD(OverkillHeavyMachineGun, wr_impacteffect, void(entity thiswep, entity act #endif #ifdef MENUQC +#include #include #include "okmachinegun.qh" diff --git a/qcsrc/common/mutators/mutator/overkill/okhmg.qh b/qcsrc/common/mutators/mutator/overkill/okhmg.qh index 3c2b26e22..32f4bbcee 100644 --- a/qcsrc/common/mutators/mutator/overkill/okhmg.qh +++ b/qcsrc/common/mutators/mutator/overkill/okhmg.qh @@ -1,7 +1,6 @@ #pragma once #include -#include CLASS(OverkillHeavyMachineGun, Weapon) /* spawnfunc */ ATTRIB(OverkillHeavyMachineGun, m_canonical_spawnfunc, string, "weapon_okhmg"); @@ -9,7 +8,7 @@ CLASS(OverkillHeavyMachineGun, Weapon) /* impulse */ ATTRIB(OverkillHeavyMachineGun, impulse, int, 3); /* flags */ ATTRIB(OverkillHeavyMachineGun, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_SUPERWEAPON | WEP_FLAG_PENETRATEWALLS); /* rating */ ATTRIB(OverkillHeavyMachineGun, bot_pickupbasevalue, float, 10000); -/* color */ ATTRIB(OverkillHeavyMachineGun, m_color, vector, COLOR_WEP_OKHMG); +/* color */ ATTRIB(OverkillHeavyMachineGun, m_color, vector, '0.5 0.5 0'); /* modelname */ ATTRIB(OverkillHeavyMachineGun, mdl, string, "ok_hmg"); #ifdef GAMEQC /* model */ ATTRIB(OverkillHeavyMachineGun, m_model, Model, MDL_HMG_ITEM); diff --git a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc index 53da43bf0..762ed15b2 100644 --- a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc +++ b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc @@ -156,6 +156,7 @@ METHOD(OverkillMachineGun, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC +#include #include METHOD(OverkillMachineGun, describe, string(OverkillMachineGun this)) diff --git a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh index 97af8e400..03210888d 100644 --- a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh +++ b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh @@ -1,14 +1,12 @@ #pragma once -#include - CLASS(OverkillMachineGun, Weapon) /* spawnfunc */ ATTRIB(OverkillMachineGun, m_canonical_spawnfunc, string, "weapon_okmachinegun"); /* ammotype */ ATTRIB(OverkillMachineGun, ammo_type, Resource, RES_BULLETS); /* impulse */ ATTRIB(OverkillMachineGun, impulse, int, 3); /* flags */ ATTRIB(OverkillMachineGun, spawnflags, int, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_PENETRATEWALLS | WEP_FLAG_MUTATORBLOCKED); /* rating */ ATTRIB(OverkillMachineGun, bot_pickupbasevalue, float, 7000); -/* color */ ATTRIB(OverkillMachineGun, m_color, vector, COLOR_WEP_OKMACHINEGUN); +/* color */ ATTRIB(OverkillMachineGun, m_color, vector, '1 1 0'); /* modelname */ ATTRIB(OverkillMachineGun, mdl, string, "ok_mg"); #ifdef GAMEQC /* model */ ATTRIB(OverkillMachineGun, m_model, Model, MDL_OK_MG_ITEM); diff --git a/qcsrc/common/mutators/mutator/overkill/oknex.qc b/qcsrc/common/mutators/mutator/overkill/oknex.qc index 1a567aaa2..2d51d79a7 100644 --- a/qcsrc/common/mutators/mutator/overkill/oknex.qc +++ b/qcsrc/common/mutators/mutator/overkill/oknex.qc @@ -363,6 +363,7 @@ METHOD(OverkillNex, wr_zoomdir, bool(entity thiswep)) #endif #ifdef MENUQC +#include #include METHOD(OverkillNex, describe, string(OverkillNex this)) diff --git a/qcsrc/common/mutators/mutator/overkill/oknex.qh b/qcsrc/common/mutators/mutator/overkill/oknex.qh index e2ed56640..d1c5b425d 100644 --- a/qcsrc/common/mutators/mutator/overkill/oknex.qh +++ b/qcsrc/common/mutators/mutator/overkill/oknex.qh @@ -1,14 +1,12 @@ #pragma once -#include - CLASS(OverkillNex, Weapon) /* spawnfunc */ ATTRIB(OverkillNex, m_canonical_spawnfunc, string, "weapon_oknex"); /* ammotype */ ATTRIB(OverkillNex, ammo_type, Resource, RES_CELLS); /* impulse */ ATTRIB(OverkillNex, impulse, int, 7); /* flags */ ATTRIB(OverkillNex, spawnflags, int, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_MUTATORBLOCKED); /* rating */ ATTRIB(OverkillNex, bot_pickupbasevalue, float, 8000); -/* color */ ATTRIB(OverkillNex, m_color, vector, COLOR_WEP_OKNEX); +/* color */ ATTRIB(OverkillNex, m_color, vector, '0.5 1 1'); /* modelname */ ATTRIB(OverkillNex, mdl, string, "ok_sniper"); #ifdef GAMEQC /* model */ ATTRIB(OverkillNex, m_model, Model, MDL_OK_SNIPER_ITEM); diff --git a/qcsrc/common/mutators/mutator/overkill/okrpc.qc b/qcsrc/common/mutators/mutator/overkill/okrpc.qc index 70566f78e..2f707d1e2 100644 --- a/qcsrc/common/mutators/mutator/overkill/okrpc.qc +++ b/qcsrc/common/mutators/mutator/overkill/okrpc.qc @@ -232,6 +232,7 @@ METHOD(OverkillRocketPropelledChainsaw, wr_impacteffect, void(entity thiswep, en #endif #ifdef MENUQC +#include #include METHOD(OverkillRocketPropelledChainsaw, describe, string(OverkillRocketPropelledChainsaw this)) diff --git a/qcsrc/common/mutators/mutator/overkill/okrpc.qh b/qcsrc/common/mutators/mutator/overkill/okrpc.qh index 26ad75e46..9d7f9079f 100644 --- a/qcsrc/common/mutators/mutator/overkill/okrpc.qh +++ b/qcsrc/common/mutators/mutator/overkill/okrpc.qh @@ -1,7 +1,6 @@ #pragma once #include -#include CLASS(OverkillRocketPropelledChainsaw, Weapon) /* spawnfunc */ ATTRIB(OverkillRocketPropelledChainsaw, m_canonical_spawnfunc, string, "weapon_okrpc"); @@ -9,7 +8,7 @@ CLASS(OverkillRocketPropelledChainsaw, Weapon) /* impulse */ ATTRIB(OverkillRocketPropelledChainsaw, impulse, int, 9); /* flags */ ATTRIB(OverkillRocketPropelledChainsaw, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_CANCLIMB | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH | WEP_FLAG_SUPERWEAPON); /* rating */ ATTRIB(OverkillRocketPropelledChainsaw, bot_pickupbasevalue, float, 10000); -/* color */ ATTRIB(OverkillRocketPropelledChainsaw, m_color, vector, COLOR_WEP_OKRPC); +/* color */ ATTRIB(OverkillRocketPropelledChainsaw, m_color, vector, '0.5 0.5 0'); /* modelname */ ATTRIB(OverkillRocketPropelledChainsaw, mdl, string, "ok_rl"); #ifdef GAMEQC /* model */ ATTRIB(OverkillRocketPropelledChainsaw, m_model, Model, MDL_RPC_ITEM); diff --git a/qcsrc/common/mutators/mutator/overkill/okshotgun.qc b/qcsrc/common/mutators/mutator/overkill/okshotgun.qc index 405cfadd3..0826f236c 100644 --- a/qcsrc/common/mutators/mutator/overkill/okshotgun.qc +++ b/qcsrc/common/mutators/mutator/overkill/okshotgun.qc @@ -121,6 +121,7 @@ METHOD(OverkillShotgun, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC +#include #include METHOD(OverkillShotgun, describe, string(OverkillShotgun this)) diff --git a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh index 731d52b61..a4e37f779 100644 --- a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh +++ b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh @@ -1,14 +1,12 @@ #pragma once -#include - CLASS(OverkillShotgun, Weapon) /* spawnfunc */ ATTRIB(OverkillShotgun, m_canonical_spawnfunc, string, "weapon_okshotgun"); /* ammotype */ ATTRIB(OverkillShotgun, ammo_type, Resource, RES_SHELLS); /* impulse */ ATTRIB(OverkillShotgun, impulse, int, 2); /* flags */ ATTRIB(OverkillShotgun, spawnflags, int, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_MUTATORBLOCKED); /* rating */ ATTRIB(OverkillShotgun, bot_pickupbasevalue, float, 6000); -/* color */ ATTRIB(OverkillShotgun, m_color, vector, COLOR_WEP_OKSHOTGUN); +/* color */ ATTRIB(OverkillShotgun, m_color, vector, '0.5 0.25 0'); /* modelname */ ATTRIB(OverkillShotgun, mdl, string, "ok_shotgun"); #ifdef GAMEQC /* model */ ATTRIB(OverkillShotgun, m_model, Model, MDL_OK_SHOTGUN_ITEM); diff --git a/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qc b/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qc index fa096b5fd..b9e68c0e5 100644 --- a/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qc +++ b/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qc @@ -43,6 +43,8 @@ METHOD(InvisibilityStatusEffect, m_tick, void(StatusEffects this, entity actor)) } #endif #ifdef MENUQC +#include + METHOD(InvisibilityItem, describe, string(InvisibilityItem this)) { TC(InvisibilityItem, this); diff --git a/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh b/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh index feaf47e73..ef814f39c 100644 --- a/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh +++ b/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh @@ -2,7 +2,6 @@ #include #include -#include #ifdef SVQC // For FL_POWERUP #include @@ -47,7 +46,7 @@ CLASS(InvisibilityItem, Powerup) ATTRIB(InvisibilityItem, netname, string, "invisibility"); ATTRIB(InvisibilityItem, m_name, string, _("Invisibility")); ATTRIB(InvisibilityItem, m_icon, string, "buff_invisible"); - ATTRIB(InvisibilityItem, m_color, vector, COLOR_POWERUP_INVISIBILITY); + ATTRIB(InvisibilityItem, m_color, vector, '0.5 0.5 1'); ATTRIB(InvisibilityItem, m_waypoint, string, _("Invisibility")); ATTRIB(InvisibilityItem, m_waypointblink, int, 2); ENDCLASS(InvisibilityItem) @@ -59,7 +58,7 @@ SPAWNFUNC_ITEM(item_buff_invisibility, ITEM_Invisibility) CLASS(InvisibilityStatusEffect, Powerups) ATTRIB(InvisibilityStatusEffect, netname, string, "invisibility"); ATTRIB(InvisibilityStatusEffect, m_name, string, _("Invisibility")); - ATTRIB(InvisibilityStatusEffect, m_color, vector, COLOR_POWERUP_INVISIBILITY); + ATTRIB(InvisibilityStatusEffect, m_color, vector, '0.5 0.5 1'); ATTRIB(InvisibilityStatusEffect, m_icon, string, "buff_invisible"); ENDCLASS(InvisibilityStatusEffect) REGISTER_STATUSEFFECT(Invisibility, NEW(InvisibilityStatusEffect)); diff --git a/qcsrc/common/mutators/mutator/powerups/powerup/shield.qc b/qcsrc/common/mutators/mutator/powerups/powerup/shield.qc index bfbc41433..ea71b6d1f 100644 --- a/qcsrc/common/mutators/mutator/powerups/powerup/shield.qc +++ b/qcsrc/common/mutators/mutator/powerups/powerup/shield.qc @@ -49,6 +49,8 @@ METHOD(ShieldStatusEffect, m_tick, void(StatusEffects this, entity actor)) } #endif #ifdef MENUQC +#include + METHOD(ShieldItem, describe, string(ShieldItem this)) { TC(ShieldItem, this); diff --git a/qcsrc/common/mutators/mutator/powerups/powerup/shield.qh b/qcsrc/common/mutators/mutator/powerups/powerup/shield.qh index 629a2cf3c..280b4a33f 100644 --- a/qcsrc/common/mutators/mutator/powerups/powerup/shield.qh +++ b/qcsrc/common/mutators/mutator/powerups/powerup/shield.qh @@ -2,7 +2,6 @@ #include #include -#include #ifdef SVQC // For FL_POWERUP #include @@ -45,7 +44,7 @@ CLASS(ShieldItem, Powerup) ATTRIB(ShieldItem, netname, string, "invincible"); ATTRIB(ShieldItem, m_name, string, _("Shield")); ATTRIB(ShieldItem, m_icon, string, "shield"); - ATTRIB(ShieldItem, m_color, vector, COLOR_POWERUP_SHIELD); + ATTRIB(ShieldItem, m_color, vector, '1 0 1'); ATTRIB(ShieldItem, m_waypoint, string, _("Shield")); ATTRIB(ShieldItem, m_waypointblink, int, 2); ENDCLASS(ShieldItem) diff --git a/qcsrc/common/mutators/mutator/powerups/powerup/speed.qc b/qcsrc/common/mutators/mutator/powerups/powerup/speed.qc index 5e871367d..5c8507e85 100644 --- a/qcsrc/common/mutators/mutator/powerups/powerup/speed.qc +++ b/qcsrc/common/mutators/mutator/powerups/powerup/speed.qc @@ -31,6 +31,8 @@ METHOD(SpeedStatusEffect, m_tick, void(StatusEffects this, entity actor)) } #endif #ifdef MENUQC +#include + METHOD(SpeedItem, describe, string(SpeedItem this)) { TC(SpeedItem, this); diff --git a/qcsrc/common/mutators/mutator/powerups/powerup/speed.qh b/qcsrc/common/mutators/mutator/powerups/powerup/speed.qh index f52a99e5b..0682f16d6 100644 --- a/qcsrc/common/mutators/mutator/powerups/powerup/speed.qh +++ b/qcsrc/common/mutators/mutator/powerups/powerup/speed.qh @@ -2,7 +2,6 @@ #include #include -#include #ifdef SVQC // For FL_POWERUP #include @@ -48,7 +47,7 @@ CLASS(SpeedItem, Powerup) ATTRIB(SpeedItem, netname, string, "speed"); ATTRIB(SpeedItem, m_name, string, _("Speed")); ATTRIB(SpeedItem, m_icon, string, "buff_speed"); - ATTRIB(SpeedItem, m_color, vector, COLOR_POWERUP_SPEED); + ATTRIB(SpeedItem, m_color, vector, '0.1 1 0.84'); ATTRIB(SpeedItem, m_waypoint, string, _("Speed")); ATTRIB(SpeedItem, m_waypointblink, int, 2); ENDCLASS(SpeedItem) @@ -60,7 +59,7 @@ SPAWNFUNC_ITEM(item_buff_speed, ITEM_Speed) CLASS(SpeedStatusEffect, Powerups) ATTRIB(SpeedStatusEffect, netname, string, "speed"); ATTRIB(SpeedStatusEffect, m_name, string, _("Speed")); - ATTRIB(SpeedStatusEffect, m_color, vector, COLOR_POWERUP_SPEED); + ATTRIB(SpeedStatusEffect, m_color, vector, '0.1 1 0.84'); ATTRIB(SpeedStatusEffect, m_icon, string, "buff_speed"); ENDCLASS(SpeedStatusEffect) REGISTER_STATUSEFFECT(Speed, NEW(SpeedStatusEffect)); diff --git a/qcsrc/common/mutators/mutator/powerups/powerup/strength.qc b/qcsrc/common/mutators/mutator/powerups/powerup/strength.qc index be82b2b89..3340a15d4 100644 --- a/qcsrc/common/mutators/mutator/powerups/powerup/strength.qc +++ b/qcsrc/common/mutators/mutator/powerups/powerup/strength.qc @@ -49,6 +49,8 @@ METHOD(StrengthStatusEffect, m_tick, void(StatusEffects this, entity actor)) } #endif #ifdef MENUQC +#include + METHOD(StrengthItem, describe, string(StrengthItem this)) { TC(StrengthItem, this); diff --git a/qcsrc/common/mutators/mutator/powerups/powerup/strength.qh b/qcsrc/common/mutators/mutator/powerups/powerup/strength.qh index a78d64efc..74fbaf7a6 100644 --- a/qcsrc/common/mutators/mutator/powerups/powerup/strength.qh +++ b/qcsrc/common/mutators/mutator/powerups/powerup/strength.qh @@ -2,7 +2,6 @@ #include #include -#include #ifdef SVQC // For FL_POWERUP #include @@ -47,7 +46,7 @@ CLASS(StrengthItem, Powerup) ATTRIB(StrengthItem, netname, string, "strength"); ATTRIB(StrengthItem, m_name, string, _("Strength")); ATTRIB(StrengthItem, m_icon, string, "strength"); - ATTRIB(StrengthItem, m_color, vector, COLOR_POWERUP_STRENGTH); + ATTRIB(StrengthItem, m_color, vector, '0 0 1'); ATTRIB(StrengthItem, m_waypoint, string, _("Strength")); ATTRIB(StrengthItem, m_waypointblink, int, 2); ENDCLASS(StrengthItem) diff --git a/qcsrc/common/mutators/mutator/status_effects/status_effect/burning.qh b/qcsrc/common/mutators/mutator/status_effects/status_effect/burning.qh index 138b89d42..8935d49a2 100644 --- a/qcsrc/common/mutators/mutator/status_effects/status_effect/burning.qh +++ b/qcsrc/common/mutators/mutator/status_effects/status_effect/burning.qh @@ -1,7 +1,6 @@ #pragma once #include -#include #ifdef SVQC void Fire_ApplyDamage(entity e); @@ -17,7 +16,7 @@ CLASS(Burning, StatusEffects) ATTRIB(Burning, m_name, string, _("Burning")); ATTRIB(Burning, m_icon, string, "buff_inferno"); #endif - ATTRIB(Burning, m_color, vector, COLOR_STATUSEFFECT_BURNING); + ATTRIB(Burning, m_color, vector, '1 0.62 0'); ATTRIB(Burning, m_hidden, bool, true); ATTRIB(Burning, m_lifetime, float, 10); #ifdef GAMEQC diff --git a/qcsrc/common/mutators/mutator/status_effects/status_effect/spawnshield.qh b/qcsrc/common/mutators/mutator/status_effects/status_effect/spawnshield.qh index 638d8552c..14db80807 100644 --- a/qcsrc/common/mutators/mutator/status_effects/status_effect/spawnshield.qh +++ b/qcsrc/common/mutators/mutator/status_effects/status_effect/spawnshield.qh @@ -1,7 +1,6 @@ #pragma once #include -#include CLASS(SpawnShield, StatusEffects) ATTRIB(SpawnShield, netname, string, "spawnshield"); @@ -11,7 +10,7 @@ CLASS(SpawnShield, StatusEffects) ATTRIB(SpawnShield, m_name, string, _("Spawn Shield")); ATTRIB(SpawnShield, m_icon, string, "shield"); #endif - ATTRIB(SpawnShield, m_color, vector, COLOR_STATUSEFFECT_SPAWNSHIELD); + ATTRIB(SpawnShield, m_color, vector, '0.36 1 0.07'); ATTRIB(SpawnShield, m_hidden, bool, true); ATTRIB(SpawnShield, m_lifetime, float, 10); ENDCLASS(SpawnShield) diff --git a/qcsrc/common/mutators/mutator/status_effects/status_effect/stunned.qh b/qcsrc/common/mutators/mutator/status_effects/status_effect/stunned.qh index 43847aba0..1acf49c12 100644 --- a/qcsrc/common/mutators/mutator/status_effects/status_effect/stunned.qh +++ b/qcsrc/common/mutators/mutator/status_effects/status_effect/stunned.qh @@ -1,7 +1,6 @@ #pragma once #include -#include #ifdef SVQC //void Shock_ApplyDamage(entity e); @@ -17,7 +16,7 @@ CLASS(Stunned, StatusEffects) ATTRIB(Stunned, m_name, string, _("Stunned")); ATTRIB(Stunned, m_icon, string, "buff_disability"); #endif - ATTRIB(Stunned, m_color, vector, COLOR_STATUSEFFECT_STUNNED); + ATTRIB(Stunned, m_color, vector, '0.67 0.84 1'); ATTRIB(Stunned, m_hidden, bool, true); ATTRIB(Stunned, m_lifetime, float, 10); #ifdef GAMEQC diff --git a/qcsrc/common/vehicles/vehicle/bumblebee.qc b/qcsrc/common/vehicles/vehicle/bumblebee.qc index 3d73fad23..3f4e72ea1 100644 --- a/qcsrc/common/vehicles/vehicle/bumblebee.qc +++ b/qcsrc/common/vehicles/vehicle/bumblebee.qc @@ -3,7 +3,7 @@ #if defined(SVQC) #include #elif defined(MENUQC) - #include + #include #endif #ifdef GAMEQC diff --git a/qcsrc/common/vehicles/vehicle/racer.qc b/qcsrc/common/vehicles/vehicle/racer.qc index 1fd306028..c53fdbd3e 100644 --- a/qcsrc/common/vehicles/vehicle/racer.qc +++ b/qcsrc/common/vehicles/vehicle/racer.qc @@ -4,7 +4,7 @@ #include #include #elif defined(MENUQC) - #include + #include #endif #ifdef GAMEQC diff --git a/qcsrc/common/vehicles/vehicle/raptor.qc b/qcsrc/common/vehicles/vehicle/raptor.qc index 9129768bd..3f269fc05 100644 --- a/qcsrc/common/vehicles/vehicle/raptor.qc +++ b/qcsrc/common/vehicles/vehicle/raptor.qc @@ -3,7 +3,7 @@ #if defined(SVQC) #include #elif defined(MENUQC) - #include + #include #include "spiderbot.qh" #endif diff --git a/qcsrc/common/vehicles/vehicle/spiderbot.qc b/qcsrc/common/vehicles/vehicle/spiderbot.qc index fdbd0fed1..3d53717a1 100644 --- a/qcsrc/common/vehicles/vehicle/spiderbot.qc +++ b/qcsrc/common/vehicles/vehicle/spiderbot.qc @@ -3,7 +3,7 @@ #if defined(SVQC) #include #elif defined(MENUQC) - #include + #include #include "raptor.qh" #endif diff --git a/qcsrc/common/weapons/weapon/arc.qc b/qcsrc/common/weapons/weapon/arc.qc index ea5a79d59..9ccaa832e 100644 --- a/qcsrc/common/weapons/weapon/arc.qc +++ b/qcsrc/common/weapons/weapon/arc.qc @@ -1510,6 +1510,7 @@ NET_HANDLE(ENT_CLIENT_ARC_BEAM, bool isnew) #endif #ifdef MENUQC +#include #include METHOD(Arc, describe, string(Arc this)) diff --git a/qcsrc/common/weapons/weapon/arc.qh b/qcsrc/common/weapons/weapon/arc.qh index 76abc56b7..bd34f21da 100644 --- a/qcsrc/common/weapons/weapon/arc.qh +++ b/qcsrc/common/weapons/weapon/arc.qh @@ -1,14 +1,12 @@ #pragma once -#include - CLASS(Arc, Weapon) /* spawnfunc */ ATTRIB(Arc, m_canonical_spawnfunc, string, "weapon_arc"); /* ammotype */ ATTRIB(Arc, ammo_type, Resource, RES_CELLS); /* impulse */ ATTRIB(Arc, impulse, int, 3); /* flags */ ATTRIB(Arc, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_TYPE_HITSCAN); /* rating */ ATTRIB(Arc, bot_pickupbasevalue, float, 8000); -/* color */ ATTRIB(Arc, m_color, vector, COLOR_WEP_ARC); +/* color */ ATTRIB(Arc, m_color, vector, '1 1 1'); /* modelname */ ATTRIB(Arc, mdl, string, "arc"); #ifdef GAMEQC /* model */ ATTRIB(Arc, m_model, Model, MDL_ARC_ITEM); diff --git a/qcsrc/common/weapons/weapon/blaster.qc b/qcsrc/common/weapons/weapon/blaster.qc index 1d4c3c9bc..79156bbc6 100644 --- a/qcsrc/common/weapons/weapon/blaster.qc +++ b/qcsrc/common/weapons/weapon/blaster.qc @@ -153,6 +153,7 @@ METHOD(Blaster, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC +#include METHOD(Blaster, describe, string(Blaster this)) { diff --git a/qcsrc/common/weapons/weapon/blaster.qh b/qcsrc/common/weapons/weapon/blaster.qh index f1617d6cd..7dad47586 100644 --- a/qcsrc/common/weapons/weapon/blaster.qh +++ b/qcsrc/common/weapons/weapon/blaster.qh @@ -1,14 +1,12 @@ #pragma once -#include - CLASS(Blaster, Weapon) /* spawnfunc */ ATTRIB(Blaster, m_canonical_spawnfunc, string, "weapon_blaster"); /* ammotype */ //ATTRIB(Blaster, ammo_type, Resource, RES_NONE); /* impulse */ ATTRIB(Blaster, impulse, int, 1); /* flags */ ATTRIB(Blaster, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Blaster, bot_pickupbasevalue, float, 0); -/* color */ ATTRIB(Blaster, m_color, vector, COLOR_WEP_BLASTER); +/* color */ ATTRIB(Blaster, m_color, vector, '1 0.5 0.5'); /* modelname */ ATTRIB(Blaster, mdl, string, "laser"); #ifdef GAMEQC /* model */ ATTRIB(Blaster, m_model, Model, MDL_BLASTER_ITEM); diff --git a/qcsrc/common/weapons/weapon/crylink.qc b/qcsrc/common/weapons/weapon/crylink.qc index 0e1adfe79..536e09d45 100644 --- a/qcsrc/common/weapons/weapon/crylink.qc +++ b/qcsrc/common/weapons/weapon/crylink.qc @@ -629,6 +629,7 @@ METHOD(Crylink, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC +#include #include METHOD(Crylink, describe, string(Crylink this)) diff --git a/qcsrc/common/weapons/weapon/crylink.qh b/qcsrc/common/weapons/weapon/crylink.qh index f27979aba..4dc3ab4b4 100644 --- a/qcsrc/common/weapons/weapon/crylink.qh +++ b/qcsrc/common/weapons/weapon/crylink.qh @@ -1,14 +1,12 @@ #pragma once -#include - CLASS(Crylink, Weapon) /* spawnfunc */ ATTRIB(Crylink, m_canonical_spawnfunc, string, "weapon_crylink"); /* ammotype */ ATTRIB(Crylink, ammo_type, Resource, RES_CELLS); /* impulse */ ATTRIB(Crylink, impulse, int, 6); /* flags */ ATTRIB(Crylink, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH | WEP_FLAG_CANCLIMB); /* rating */ ATTRIB(Crylink, bot_pickupbasevalue, float, 6000); -/* color */ ATTRIB(Crylink, m_color, vector, COLOR_WEP_CRYLINK); +/* color */ ATTRIB(Crylink, m_color, vector, '1 0.5 1'); /* modelname */ ATTRIB(Crylink, mdl, string, "crylink"); #ifdef GAMEQC /* model */ ATTRIB(Crylink, m_model, Model, MDL_CRYLINK_ITEM); diff --git a/qcsrc/common/weapons/weapon/devastator.qc b/qcsrc/common/weapons/weapon/devastator.qc index a49522528..1550ca031 100644 --- a/qcsrc/common/weapons/weapon/devastator.qc +++ b/qcsrc/common/weapons/weapon/devastator.qc @@ -607,8 +607,9 @@ METHOD(Devastator, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC -#include "vortex.qh" +#include #include +#include "vortex.qh" METHOD(Devastator, describe, string(Devastator this)) { diff --git a/qcsrc/common/weapons/weapon/devastator.qh b/qcsrc/common/weapons/weapon/devastator.qh index e8b6898af..1d525ede7 100644 --- a/qcsrc/common/weapons/weapon/devastator.qh +++ b/qcsrc/common/weapons/weapon/devastator.qh @@ -1,14 +1,12 @@ #pragma once -#include - CLASS(Devastator, Weapon) /* spawnfunc */ ATTRIB(Devastator, m_canonical_spawnfunc, string, "weapon_devastator"); /* ammotype */ ATTRIB(Devastator, ammo_type, Resource, RES_ROCKETS); /* impulse */ ATTRIB(Devastator, impulse, int, 9); /* flags */ ATTRIB(Devastator, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Devastator, bot_pickupbasevalue, float, 8000); -/* color */ ATTRIB(Devastator, m_color, vector, COLOR_WEP_DEVASTATOR); +/* color */ ATTRIB(Devastator, m_color, vector, '1 1 0'); /* modelname */ ATTRIB(Devastator, mdl, string, "rl"); #ifdef GAMEQC /* model */ ATTRIB(Devastator, m_model, Model, MDL_DEVASTATOR_ITEM); diff --git a/qcsrc/common/weapons/weapon/electro.qc b/qcsrc/common/weapons/weapon/electro.qc index 04bb7efc9..44e8f49ca 100644 --- a/qcsrc/common/weapons/weapon/electro.qc +++ b/qcsrc/common/weapons/weapon/electro.qc @@ -776,6 +776,7 @@ METHOD(Electro, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC +#include #include METHOD(Electro, describe, string(Electro this)) diff --git a/qcsrc/common/weapons/weapon/electro.qh b/qcsrc/common/weapons/weapon/electro.qh index c00ab54ce..0b492aa5f 100644 --- a/qcsrc/common/weapons/weapon/electro.qh +++ b/qcsrc/common/weapons/weapon/electro.qh @@ -1,14 +1,12 @@ #pragma once -#include - CLASS(Electro, Weapon) /* spawnfunc */ ATTRIB(Electro, m_canonical_spawnfunc, string, "weapon_electro"); /* ammotype */ ATTRIB(Electro, ammo_type, Resource, RES_CELLS); /* impulse */ ATTRIB(Electro, impulse, int, 5); /* flags */ ATTRIB(Electro, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Electro, bot_pickupbasevalue, float, 5000); -/* color */ ATTRIB(Electro, m_color, vector, COLOR_WEP_ELECTRO); +/* color */ ATTRIB(Electro, m_color, vector, '0 0.5 1'); /* modelname */ ATTRIB(Electro, mdl, string, "electro"); #ifdef GAMEQC /* model */ ATTRIB(Electro, m_model, Model, MDL_ELECTRO_ITEM); diff --git a/qcsrc/common/weapons/weapon/fireball.qc b/qcsrc/common/weapons/weapon/fireball.qc index b1c634e2a..c924dde14 100644 --- a/qcsrc/common/weapons/weapon/fireball.qc +++ b/qcsrc/common/weapons/weapon/fireball.qc @@ -434,6 +434,7 @@ METHOD(Fireball, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC +#include METHOD(Fireball, describe, string(Fireball this)) { diff --git a/qcsrc/common/weapons/weapon/fireball.qh b/qcsrc/common/weapons/weapon/fireball.qh index 468cee355..9bff16c15 100644 --- a/qcsrc/common/weapons/weapon/fireball.qh +++ b/qcsrc/common/weapons/weapon/fireball.qh @@ -1,14 +1,12 @@ #pragma once -#include - CLASS(Fireball, Weapon) /* spawnfunc */ ATTRIB(Fireball, m_canonical_spawnfunc, string, "weapon_fireball"); /* ammotype */ //ATTRIB(Fireball, ammo_type, Resource, RES_NONE); /* impulse */ ATTRIB(Fireball, impulse, int, 9); /* flags */ ATTRIB(Fireball, spawnflags, int, WEP_FLAG_SUPERWEAPON | WEP_TYPE_SPLASH | WEP_FLAG_NODUAL); /* rating */ ATTRIB(Fireball, bot_pickupbasevalue, float, 5000); -/* color */ ATTRIB(Fireball, m_color, vector, COLOR_WEP_FIREBALL); +/* color */ ATTRIB(Fireball, m_color, vector, '1 0.5 0'); /* modelname */ ATTRIB(Fireball, mdl, string, "fireball"); #ifdef GAMEQC /* model */ ATTRIB(Fireball, m_model, Model, MDL_FIREBALL_ITEM); diff --git a/qcsrc/common/weapons/weapon/hagar.qc b/qcsrc/common/weapons/weapon/hagar.qc index b47d17d4d..8e268ed55 100644 --- a/qcsrc/common/weapons/weapon/hagar.qc +++ b/qcsrc/common/weapons/weapon/hagar.qc @@ -497,6 +497,7 @@ METHOD(Hagar, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC +#include #include METHOD(Hagar, describe, string(Hagar this)) diff --git a/qcsrc/common/weapons/weapon/hagar.qh b/qcsrc/common/weapons/weapon/hagar.qh index 977a740e7..cb75eb5ae 100644 --- a/qcsrc/common/weapons/weapon/hagar.qh +++ b/qcsrc/common/weapons/weapon/hagar.qh @@ -1,14 +1,12 @@ #pragma once -#include - CLASS(Hagar, Weapon) /* spawnfunc */ ATTRIB(Hagar, m_canonical_spawnfunc, string, "weapon_hagar"); /* ammotype */ ATTRIB(Hagar, ammo_type, Resource, RES_ROCKETS); /* impulse */ ATTRIB(Hagar, impulse, int, 8); /* flags */ ATTRIB(Hagar, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Hagar, bot_pickupbasevalue, float, 6000); -/* color */ ATTRIB(Hagar, m_color, vector, COLOR_WEP_HAGAR); +/* color */ ATTRIB(Hagar, m_color, vector, '1 1 0.5'); /* modelname */ ATTRIB(Hagar, mdl, string, "hagar"); #ifdef GAMEQC /* model */ ATTRIB(Hagar, m_model, Model, MDL_HAGAR_ITEM); diff --git a/qcsrc/common/weapons/weapon/hlac.qc b/qcsrc/common/weapons/weapon/hlac.qc index e1973e142..645df616f 100644 --- a/qcsrc/common/weapons/weapon/hlac.qc +++ b/qcsrc/common/weapons/weapon/hlac.qc @@ -227,8 +227,9 @@ METHOD(HLAC, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC -#include "blaster.qh" +#include #include +#include "blaster.qh" METHOD(HLAC, describe, string(HLAC this)) { diff --git a/qcsrc/common/weapons/weapon/hlac.qh b/qcsrc/common/weapons/weapon/hlac.qh index d1ac35358..4944a1b25 100644 --- a/qcsrc/common/weapons/weapon/hlac.qh +++ b/qcsrc/common/weapons/weapon/hlac.qh @@ -1,14 +1,12 @@ #pragma once -#include - CLASS(HLAC, Weapon) /* spawnfunc */ ATTRIB(HLAC, m_canonical_spawnfunc, string, "weapon_hlac"); /* ammotype */ ATTRIB(HLAC, ammo_type, Resource, RES_CELLS); /* impulse */ ATTRIB(HLAC, impulse, int, 6); /* flags */ ATTRIB(HLAC, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH); /* rating */ ATTRIB(HLAC, bot_pickupbasevalue, float, 4000); -/* color */ ATTRIB(HLAC, m_color, vector, COLOR_WEP_HLAC); +/* color */ ATTRIB(HLAC, m_color, vector, '0 1 0'); /* modelname */ ATTRIB(HLAC, mdl, string, "hlac"); #ifdef GAMEQC /* model */ ATTRIB(HLAC, m_model, Model, MDL_HLAC_ITEM); diff --git a/qcsrc/common/weapons/weapon/hook.qc b/qcsrc/common/weapons/weapon/hook.qc index 890f0c10a..21f22c15a 100644 --- a/qcsrc/common/weapons/weapon/hook.qc +++ b/qcsrc/common/weapons/weapon/hook.qc @@ -511,6 +511,7 @@ NET_HANDLE(ENT_CLIENT_HOOK, bool bIsNew) // TODO: hook: temporarily transform this.origin for drawing the model along warpzones! #endif #ifdef MENUQC +#include #include METHOD(Hook, describe, string(Hook this)) diff --git a/qcsrc/common/weapons/weapon/hook.qh b/qcsrc/common/weapons/weapon/hook.qh index 6f42b9780..f52c39b2f 100644 --- a/qcsrc/common/weapons/weapon/hook.qh +++ b/qcsrc/common/weapons/weapon/hook.qh @@ -1,14 +1,12 @@ #pragma once -#include - CLASS(Hook, Weapon) /* spawnfunc */ ATTRIB(Hook, m_canonical_spawnfunc, string, "weapon_hook"); /* ammotype */ ATTRIB(Hook, ammo_type, Resource, RES_FUEL); /* impulse */ ATTRIB(Hook, impulse, int, 0); /* flags */ ATTRIB(Hook, spawnflags, int, WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH | WEP_FLAG_NOTRUEAIM); /* rating */ ATTRIB(Hook, bot_pickupbasevalue, float, 0); -/* color */ ATTRIB(Hook, m_color, vector, COLOR_WEP_HOOK); +/* color */ ATTRIB(Hook, m_color, vector, '0 0.5 0'); /* modelname */ ATTRIB(Hook, mdl, string, "hookgun"); #ifdef GAMEQC /* model */ ATTRIB(Hook, m_model, Model, MDL_HOOK_ITEM); diff --git a/qcsrc/common/weapons/weapon/machinegun.qc b/qcsrc/common/weapons/weapon/machinegun.qc index 5435b4c76..500dfad98 100644 --- a/qcsrc/common/weapons/weapon/machinegun.qc +++ b/qcsrc/common/weapons/weapon/machinegun.qc @@ -413,6 +413,7 @@ METHOD(MachineGun, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC +#include #include METHOD(MachineGun, describe, string(MachineGun this)) diff --git a/qcsrc/common/weapons/weapon/machinegun.qh b/qcsrc/common/weapons/weapon/machinegun.qh index b9f46c059..4bd64e3e9 100644 --- a/qcsrc/common/weapons/weapon/machinegun.qh +++ b/qcsrc/common/weapons/weapon/machinegun.qh @@ -1,14 +1,12 @@ #pragma once -#include - CLASS(MachineGun, Weapon) /* spawnfunc */ ATTRIB(MachineGun, m_canonical_spawnfunc, string, "weapon_machinegun"); /* ammotype */ ATTRIB(MachineGun, ammo_type, Resource, RES_BULLETS); /* impulse */ ATTRIB(MachineGun, impulse, int, 3); /* flags */ ATTRIB(MachineGun, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_PENETRATEWALLS | WEP_FLAG_BLEED); /* rating */ ATTRIB(MachineGun, bot_pickupbasevalue, float, 7000); -/* color */ ATTRIB(MachineGun, m_color, vector, COLOR_WEP_MACHINEGUN); +/* color */ ATTRIB(MachineGun, m_color, vector, '1 1 0'); /* modelname */ ATTRIB(MachineGun, mdl, string, "uzi"); #ifdef GAMEQC /* model */ ATTRIB(MachineGun, m_model, Model, MDL_MACHINEGUN_ITEM); diff --git a/qcsrc/common/weapons/weapon/minelayer.qc b/qcsrc/common/weapons/weapon/minelayer.qc index ad6408457..e98c393d6 100644 --- a/qcsrc/common/weapons/weapon/minelayer.qc +++ b/qcsrc/common/weapons/weapon/minelayer.qc @@ -513,6 +513,7 @@ METHOD(MineLayer, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC +#include #include METHOD(MineLayer, describe, string(MineLayer this)) diff --git a/qcsrc/common/weapons/weapon/minelayer.qh b/qcsrc/common/weapons/weapon/minelayer.qh index afe76cf6d..d6973a3fb 100644 --- a/qcsrc/common/weapons/weapon/minelayer.qh +++ b/qcsrc/common/weapons/weapon/minelayer.qh @@ -1,14 +1,12 @@ #pragma once -#include - CLASS(MineLayer, Weapon) /* spawnfunc */ ATTRIB(MineLayer, m_canonical_spawnfunc, string, "weapon_minelayer"); /* ammotype */ ATTRIB(MineLayer, ammo_type, Resource, RES_ROCKETS); /* impulse */ ATTRIB(MineLayer, impulse, int, 4); /* flags */ ATTRIB(MineLayer, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH); /* rating */ ATTRIB(MineLayer, bot_pickupbasevalue, float, 7000); -/* color */ ATTRIB(MineLayer, m_color, vector, COLOR_WEP_MINELAYER); +/* color */ ATTRIB(MineLayer, m_color, vector, '0.75 1 0'); /* modelname */ ATTRIB(MineLayer, mdl, string, "minelayer"); #ifdef GAMEQC /* model */ ATTRIB(MineLayer, m_model, Model, MDL_MINELAYER_ITEM); diff --git a/qcsrc/common/weapons/weapon/mortar.qc b/qcsrc/common/weapons/weapon/mortar.qc index 24d0099f0..d93dcec85 100644 --- a/qcsrc/common/weapons/weapon/mortar.qc +++ b/qcsrc/common/weapons/weapon/mortar.qc @@ -373,6 +373,7 @@ METHOD(Mortar, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC +#include #include METHOD(Mortar, describe, string(Mortar this)) diff --git a/qcsrc/common/weapons/weapon/mortar.qh b/qcsrc/common/weapons/weapon/mortar.qh index 149ff8c9c..4da2388a4 100644 --- a/qcsrc/common/weapons/weapon/mortar.qh +++ b/qcsrc/common/weapons/weapon/mortar.qh @@ -1,14 +1,12 @@ #pragma once -#include - CLASS(Mortar, Weapon) /* spawnfunc */ ATTRIB(Mortar, m_canonical_spawnfunc, string, "weapon_mortar"); /* ammotype */ ATTRIB(Mortar, ammo_type, Resource, RES_ROCKETS); /* impulse */ ATTRIB(Mortar, impulse, int, 4); /* flags */ ATTRIB(Mortar, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH | WEP_FLAG_NOTRUEAIM); /* rating */ ATTRIB(Mortar, bot_pickupbasevalue, float, 7000); -/* color */ ATTRIB(Mortar, m_color, vector, COLOR_WEP_MORTAR); +/* color */ ATTRIB(Mortar, m_color, vector, '1 0 0'); /* modelname */ ATTRIB(Mortar, mdl, string, "gl"); #ifdef GAMEQC /* model */ ATTRIB(Mortar, m_model, Model, MDL_MORTAR_ITEM); diff --git a/qcsrc/common/weapons/weapon/porto.qc b/qcsrc/common/weapons/weapon/porto.qc index ea1673c77..4ba376e34 100644 --- a/qcsrc/common/weapons/weapon/porto.qc +++ b/qcsrc/common/weapons/weapon/porto.qc @@ -424,6 +424,7 @@ METHOD(PortoLaunch, wr_impacteffect, void(entity this, entity actor)) { #endif #ifdef MENUQC +#include METHOD(PortoLaunch, describe, string(PortoLaunch this)) { diff --git a/qcsrc/common/weapons/weapon/porto.qh b/qcsrc/common/weapons/weapon/porto.qh index f4e532d30..269152a15 100644 --- a/qcsrc/common/weapons/weapon/porto.qh +++ b/qcsrc/common/weapons/weapon/porto.qh @@ -1,14 +1,12 @@ #pragma once -#include - CLASS(PortoLaunch, Weapon) /* spawnfunc */ ATTRIB(PortoLaunch, m_canonical_spawnfunc, string, "weapon_porto"); /* ammotype */ ATTRIB(PortoLaunch, ammo_type, Resource, RES_NONE); /* impulse */ ATTRIB(PortoLaunch, impulse, int, 0); /* flags */ ATTRIB(PortoLaunch, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_SUPERWEAPON | WEP_FLAG_NODUAL | WEP_FLAG_NOTRUEAIM); /* rating */ ATTRIB(PortoLaunch, bot_pickupbasevalue, float, 0); -/* color */ ATTRIB(PortoLaunch, m_color, vector, COLOR_WEP_PORTO); +/* color */ ATTRIB(PortoLaunch, m_color, vector, '0.5 0.5 0.5'); /* modelname */ ATTRIB(PortoLaunch, mdl, string, "porto"); #ifdef GAMEQC /* model */ ATTRIB(PortoLaunch, m_model, Model, MDL_PORTO_ITEM); diff --git a/qcsrc/common/weapons/weapon/rifle.qc b/qcsrc/common/weapons/weapon/rifle.qc index d9ede71dc..022545e35 100644 --- a/qcsrc/common/weapons/weapon/rifle.qc +++ b/qcsrc/common/weapons/weapon/rifle.qc @@ -260,8 +260,9 @@ METHOD(Rifle, wr_zoomdir, bool(entity thiswep)) #endif #ifdef MENUQC -#include "vortex.qh" +#include #include +#include "vortex.qh" METHOD(Rifle, describe, string(Rifle this)) { diff --git a/qcsrc/common/weapons/weapon/rifle.qh b/qcsrc/common/weapons/weapon/rifle.qh index a3805c77d..bf5633168 100644 --- a/qcsrc/common/weapons/weapon/rifle.qh +++ b/qcsrc/common/weapons/weapon/rifle.qh @@ -1,14 +1,12 @@ #pragma once -#include - CLASS(Rifle, Weapon) /* spawnfunc */ ATTRIB(Rifle, m_canonical_spawnfunc, string, "weapon_rifle"); /* ammotype */ ATTRIB(Rifle, ammo_type, Resource, RES_BULLETS); /* impulse */ ATTRIB(Rifle, impulse, int, 7); /* flags */ ATTRIB(Rifle, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_PENETRATEWALLS); /* rating */ ATTRIB(Rifle, bot_pickupbasevalue, float, 7000); -/* color */ ATTRIB(Rifle, m_color, vector, COLOR_WEP_RIFLE); +/* color */ ATTRIB(Rifle, m_color, vector, '0.5 1 0'); /* modelname */ ATTRIB(Rifle, mdl, string, "campingrifle"); #ifdef GAMEQC /* model */ ATTRIB(Rifle, m_model, Model, MDL_RIFLE_ITEM); diff --git a/qcsrc/common/weapons/weapon/seeker.qc b/qcsrc/common/weapons/weapon/seeker.qc index df34e3d39..5e4574312 100644 --- a/qcsrc/common/weapons/weapon/seeker.qc +++ b/qcsrc/common/weapons/weapon/seeker.qc @@ -680,6 +680,7 @@ METHOD(Seeker, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC +#include #include METHOD(Seeker, describe, string(Seeker this)) diff --git a/qcsrc/common/weapons/weapon/seeker.qh b/qcsrc/common/weapons/weapon/seeker.qh index 546dcb228..f9e8609a0 100644 --- a/qcsrc/common/weapons/weapon/seeker.qh +++ b/qcsrc/common/weapons/weapon/seeker.qh @@ -1,14 +1,12 @@ #pragma once -#include - CLASS(Seeker, Weapon) /* spawnfunc */ ATTRIB(Seeker, m_canonical_spawnfunc, string, "weapon_seeker"); /* ammotype */ ATTRIB(Seeker, ammo_type, Resource, RES_ROCKETS); /* impulse */ ATTRIB(Seeker, impulse, int, 8); /* flags */ ATTRIB(Seeker, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Seeker, bot_pickupbasevalue, float, 5000); -/* color */ ATTRIB(Seeker, m_color, vector, COLOR_WEP_SEEKER); +/* color */ ATTRIB(Seeker, m_color, vector, '0.5 1 0'); /* modelname */ ATTRIB(Seeker, mdl, string, "seeker"); #ifdef GAMEQC /* model */ ATTRIB(Seeker, m_model, Model, MDL_SEEKER_ITEM); diff --git a/qcsrc/common/weapons/weapon/shockwave.qc b/qcsrc/common/weapons/weapon/shockwave.qc index 6b6c141c4..379e316cb 100644 --- a/qcsrc/common/weapons/weapon/shockwave.qc +++ b/qcsrc/common/weapons/weapon/shockwave.qc @@ -814,6 +814,7 @@ METHOD(Shockwave, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC +#include #include "shotgun.qh" METHOD(Shockwave, describe, string(Shockwave this)) diff --git a/qcsrc/common/weapons/weapon/shockwave.qh b/qcsrc/common/weapons/weapon/shockwave.qh index daf8c6a7e..e46c3a8c8 100644 --- a/qcsrc/common/weapons/weapon/shockwave.qh +++ b/qcsrc/common/weapons/weapon/shockwave.qh @@ -1,14 +1,12 @@ #pragma once -#include - CLASS(Shockwave, Weapon) /* spawnfunc */ ATTRIB(Shockwave, m_canonical_spawnfunc, string, "weapon_shockwave"); /* ammotype */ //ATTRIB(Shockwave, ammo_type, Resource, RES_NONE); /* impulse */ ATTRIB(Shockwave, impulse, int, 2); /* flags */ ATTRIB(Shockwave, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_TYPE_HITSCAN | WEP_FLAG_CANCLIMB | WEP_TYPE_MELEE_SEC); /* rating */ ATTRIB(Shockwave, bot_pickupbasevalue, float, 3000); -/* color */ ATTRIB(Shockwave, m_color, vector, COLOR_WEP_SHOCKWAVE); +/* color */ ATTRIB(Shockwave, m_color, vector, '0.5 0.25 0'); /* modelname */ ATTRIB(Shockwave, mdl, string, "shotgun"); #ifdef GAMEQC /* model */ ATTRIB(Shockwave, m_model, Model, MDL_SHOCKWAVE_ITEM); diff --git a/qcsrc/common/weapons/weapon/shotgun.qc b/qcsrc/common/weapons/weapon/shotgun.qc index 4d183f551..7eca72d2a 100644 --- a/qcsrc/common/weapons/weapon/shotgun.qc +++ b/qcsrc/common/weapons/weapon/shotgun.qc @@ -386,6 +386,7 @@ METHOD(Shotgun, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC +#include #include METHOD(Shotgun, describe, string(Shotgun this)) diff --git a/qcsrc/common/weapons/weapon/shotgun.qh b/qcsrc/common/weapons/weapon/shotgun.qh index c90ed2b70..3e4e8e209 100644 --- a/qcsrc/common/weapons/weapon/shotgun.qh +++ b/qcsrc/common/weapons/weapon/shotgun.qh @@ -1,14 +1,12 @@ #pragma once -#include - CLASS(Shotgun, Weapon) /* spawnfunc */ ATTRIB(Shotgun, m_canonical_spawnfunc, string, "weapon_shotgun"); /* ammotype */ ATTRIB(Shotgun, ammo_type, Resource, RES_SHELLS); /* impulse */ ATTRIB(Shotgun, impulse, int, 2); /* flags */ ATTRIB(Shotgun, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_TYPE_MELEE_SEC | WEP_FLAG_BLEED); /* rating */ ATTRIB(Shotgun, bot_pickupbasevalue, float, 6000); -/* color */ ATTRIB(Shotgun, m_color, vector, COLOR_WEP_SHOTGUN); +/* color */ ATTRIB(Shotgun, m_color, vector, '0.5 0.25 0'); /* modelname */ ATTRIB(Shotgun, mdl, string, "shotgun"); #ifdef GAMEQC /* model */ ATTRIB(Shotgun, m_model, Model, MDL_SHOTGUN_ITEM); diff --git a/qcsrc/common/weapons/weapon/tuba.qc b/qcsrc/common/weapons/weapon/tuba.qc index 0566aac87..81426c7cd 100644 --- a/qcsrc/common/weapons/weapon/tuba.qc +++ b/qcsrc/common/weapons/weapon/tuba.qc @@ -594,6 +594,7 @@ PRECACHE(Tuba) #endif #ifdef MENUQC +#include METHOD(Tuba, describe, string(Tuba this)) { diff --git a/qcsrc/common/weapons/weapon/tuba.qh b/qcsrc/common/weapons/weapon/tuba.qh index 070b985db..8d5982914 100644 --- a/qcsrc/common/weapons/weapon/tuba.qh +++ b/qcsrc/common/weapons/weapon/tuba.qh @@ -1,13 +1,11 @@ #pragma once -#include - CLASS(Tuba, Weapon) /* spawnfunc */ ATTRIB(Tuba, m_canonical_spawnfunc, string, "weapon_tuba"); /* impulse */ ATTRIB(Tuba, impulse, int, 1); /* flags */ ATTRIB(Tuba, spawnflags, int, WEP_FLAG_HIDDEN | WEP_TYPE_SPLASH | WEP_FLAG_NODUAL | WEP_FLAG_NOTRUEAIM); /* rating */ ATTRIB(Tuba, bot_pickupbasevalue, float, 2000); -/* color */ ATTRIB(Tuba, m_color, vector, COLOR_WEP_TUBA); +/* color */ ATTRIB(Tuba, m_color, vector, '0 1 0'); /* modelname */ ATTRIB(Tuba, mdl, string, "tuba"); #ifdef GAMEQC /* model */ ATTRIB(Tuba, m_model, Model, MDL_TUBA_ITEM); diff --git a/qcsrc/common/weapons/weapon/vaporizer.qc b/qcsrc/common/weapons/weapon/vaporizer.qc index 9e7b493ad..4c048278d 100644 --- a/qcsrc/common/weapons/weapon/vaporizer.qc +++ b/qcsrc/common/weapons/weapon/vaporizer.qc @@ -408,9 +408,10 @@ METHOD(Vaporizer, wr_zoom, bool(entity thiswep, entity actor)) #endif #ifdef MENUQC -#include "blaster.qh" +#include #include #include +#include "blaster.qh" METHOD(Vaporizer, describe, string(Vaporizer this)) { diff --git a/qcsrc/common/weapons/weapon/vaporizer.qh b/qcsrc/common/weapons/weapon/vaporizer.qh index 9a6e82d1d..ba90525b9 100644 --- a/qcsrc/common/weapons/weapon/vaporizer.qh +++ b/qcsrc/common/weapons/weapon/vaporizer.qh @@ -1,14 +1,12 @@ #pragma once -#include - CLASS(Vaporizer, Weapon) /* spawnfunc */ ATTRIB(Vaporizer, m_canonical_spawnfunc, string, "weapon_vaporizer"); /* ammotype */ ATTRIB(Vaporizer, ammo_type, Resource, RES_CELLS); /* impulse */ ATTRIB(Vaporizer, impulse, int, 7); /* flags */ ATTRIB(Vaporizer, spawnflags, int, WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_FLAG_SUPERWEAPON | WEP_TYPE_HITSCAN | WEP_FLAG_NODUAL); /* rating */ ATTRIB(Vaporizer, bot_pickupbasevalue, float, 10000); -/* color */ ATTRIB(Vaporizer, m_color, vector, COLOR_WEP_VAPORIZER); +/* color */ ATTRIB(Vaporizer, m_color, vector, '0.5 1 1'); /* modelname */ ATTRIB(Vaporizer, mdl, string, "minstanex"); #ifdef GAMEQC /* model */ ATTRIB(Vaporizer, m_model, Model, MDL_VAPORIZER_ITEM); diff --git a/qcsrc/common/weapons/weapon/vortex.qc b/qcsrc/common/weapons/weapon/vortex.qc index 81ff75068..370cdf32f 100644 --- a/qcsrc/common/weapons/weapon/vortex.qc +++ b/qcsrc/common/weapons/weapon/vortex.qc @@ -354,8 +354,9 @@ METHOD(Vortex, wr_zoomdir, bool(entity thiswep)) #endif #ifdef MENUQC -#include "rifle.qh" +#include #include +#include "rifle.qh" METHOD(Vortex, describe, string(Vortex this)) { diff --git a/qcsrc/common/weapons/weapon/vortex.qh b/qcsrc/common/weapons/weapon/vortex.qh index f07d6cc91..43b69ece0 100644 --- a/qcsrc/common/weapons/weapon/vortex.qh +++ b/qcsrc/common/weapons/weapon/vortex.qh @@ -1,14 +1,12 @@ #pragma once -#include - CLASS(Vortex, Weapon) /* spawnfunc */ ATTRIB(Vortex, m_canonical_spawnfunc, string, "weapon_vortex"); /* ammotype */ ATTRIB(Vortex, ammo_type, Resource, RES_CELLS); /* impulse */ ATTRIB(Vortex, impulse, int, 7); /* flags */ ATTRIB(Vortex, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN); /* rating */ ATTRIB(Vortex, bot_pickupbasevalue, float, 8000); -/* color */ ATTRIB(Vortex, m_color, vector, COLOR_WEP_VORTEX); +/* color */ ATTRIB(Vortex, m_color, vector, '0.5 1 1'); /* modelname */ ATTRIB(Vortex, mdl, string, "nex"); #ifdef GAMEQC /* model */ ATTRIB(Vortex, m_model, Model, MDL_VORTEX_ITEM); diff --git a/qcsrc/lib/color.qh b/qcsrc/lib/color.qh index c24369fae..f39e7b93e 100644 --- a/qcsrc/lib/color.qh +++ b/qcsrc/lib/color.qh @@ -189,3 +189,7 @@ string rgb_to_hexcolor(vector rgb) DEC_TO_HEXDIGIT(floor(bound(0, rgb.z, 1) * 15 + 0.5)) ); } + +// useful macros for the guide +#define COLORED_NAME(this) strcat(rgb_to_hexcolor(this.m_color), this.m_name, "^7") +#define COLORED_NAME_WITH_CONCAT(this, concat) strcat(rgb_to_hexcolor(this.m_color), this.m_name, " ", concat, "^7")