X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fitems%2Fitem%2Fpowerup.qh;h=df9315e2c838e72d7153fbcc9e81450c16d8bd91;hp=0a3d907288a203cee53c8e61575de30ebd0cfb87;hb=49617b0bdeca75ad4da9456065fae6c64bff236d;hpb=7bcb3a89b3271e018da4d92437dc5ba125ea8698 diff --git a/qcsrc/common/items/item/powerup.qh b/qcsrc/common/items/item/powerup.qh index 0a3d907288..df9315e2c8 100644 --- a/qcsrc/common/items/item/powerup.qh +++ b/qcsrc/common/items/item/powerup.qh @@ -8,11 +8,51 @@ #include "pickup.qh" CLASS(Powerup, Pickup) #ifdef SVQC - ATTRIB(Powerup, m_mins, vector, '-16 -16 0') - ATTRIB(Powerup, m_maxs, vector, '16 16 48') - ATTRIB(Powerup, m_botvalue, int, 100000) - ATTRIB(Powerup, m_itemflags, int, FL_POWERUP) - ATTRIB(Powerup, m_respawntime, float(), GET(g_pickup_respawntime_powerup)) - ATTRIB(Powerup, m_respawntimejitter, float(), GET(g_pickup_respawntimejitter_powerup)) + ATTRIB(Powerup, m_mins, vector, '-16 -16 0'); + ATTRIB(Powerup, m_maxs, vector, '16 16 80'); + ATTRIB(Powerup, m_botvalue, int, 100000); + ATTRIB(Powerup, m_itemflags, int, FL_POWERUP); + ATTRIB(Powerup, m_respawntime, float(), GET(g_pickup_respawntime_powerup)); + ATTRIB(Powerup, m_respawntimejitter, float(), GET(g_pickup_respawntimejitter_powerup)); #endif ENDCLASS(Powerup) + +#ifdef GAMEQC +MODEL(Strength_ITEM, Item_Model("g_strength.md3")); +SOUND(Strength, "misc/powerup"); +#endif + +REGISTER_ITEM(Strength, Powerup) { +#ifdef GAMEQC + this.m_model = MDL_Strength_ITEM; + this.m_sound = SND_Strength; + this.m_glow = true; + this.m_respawnsound = SND_STRENGTH_RESPAWN; +#endif + this.m_name = "Strength Powerup"; + this.m_icon = "strength"; + this.m_color = '0 0 1'; + this.m_waypoint = _("Strength"); + this.m_waypointblink = 2; + this.m_itemid = IT_STRENGTH; +} + +#ifdef GAMEQC +MODEL(Shield_ITEM, Item_Model("g_invincible.md3")); +SOUND(Shield, "misc/powerup_shield"); +#endif + +REGISTER_ITEM(Shield, Powerup) { +#ifdef GAMEQC + this.m_model = MDL_Shield_ITEM; + this.m_sound = SND_Shield; + this.m_glow = true; + this.m_respawnsound = SND_SHIELD_RESPAWN; +#endif + this.m_name = "Shield"; + this.m_icon = "shield"; + this.m_color = '1 0 1'; + this.m_waypoint = _("Shield"); + this.m_waypointblink = 2; + this.m_itemid = IT_INVINCIBLE; +}