From: terencehill <piuntn@gmail.com>
Date: Mon, 3 Jun 2024 12:52:45 +0000 (+0200)
Subject: Merge branch 'master' into LegendaryGuard/new_powerups
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8a829268a8d0e3e6aad13b3425e410e71f7cc99e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into LegendaryGuard/new_powerups

# Conflicts:
#	qcsrc/common/mutators/mutator/powerups/powerups.qh
---

8a829268a8d0e3e6aad13b3425e410e71f7cc99e
diff --cc qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh
index ebae1336e,690abb5ca..110fef86f
--- a/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh
+++ b/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh
@@@ -35,10 -34,12 +33,11 @@@ REGISTER_ITEM(Invisibility, Powerup) 
      this.m_iteminit         =   powerup_invisibility_init;
  #endif
  #ifdef GAMEQC
+     this.spawnflags         =   ITEM_FLAG_NORMAL;
      this.m_itemid           =   IT_INVISIBILITY;
 -    this.m_model            =   MDL_BUFF; // TODO: MDL_Invisibility_ITEM when new model available
 -    this.m_skin             =   12;
 +    this.m_skin             =   3;
      this.m_sound            =   SND_Invisibility;
 -    this.m_glow             =   true;
 +    // this.m_glow             =   true;
      this.m_respawnsound     =   SND_STRENGTH_RESPAWN;
  #endif
      this.netname            =   "invisibility";
diff --cc qcsrc/common/mutators/mutator/powerups/powerup/shield.qh
index a97a0813b,de2f5dc29..f2c03b295
--- a/qcsrc/common/mutators/mutator/powerups/powerup/shield.qh
+++ b/qcsrc/common/mutators/mutator/powerups/powerup/shield.qh
@@@ -34,10 -33,11 +32,11 @@@ REGISTER_ITEM(Shield, Powerup) 
      this.m_iteminit         =   powerup_shield_init;
  #endif
  #ifdef GAMEQC
+     this.spawnflags         =   ITEM_FLAG_NORMAL;
      this.m_itemid           =   IT_INVINCIBLE;
 -    this.m_model            =   MDL_Shield_ITEM;
 +    this.m_skin             =   1;
      this.m_sound            =   SND_Shield;
 -    this.m_glow             =   true;
 +    // this.m_glow             =   true;
      this.m_respawnsound     =   SND_SHIELD_RESPAWN;
  #endif
      this.netname            =   "invincible";
diff --cc qcsrc/common/mutators/mutator/powerups/powerup/speed.qh
index 779745b22,38010e480..2d7ee8856
--- a/qcsrc/common/mutators/mutator/powerups/powerup/speed.qh
+++ b/qcsrc/common/mutators/mutator/powerups/powerup/speed.qh
@@@ -36,10 -35,12 +34,11 @@@ REGISTER_ITEM(Speed, Powerup) 
      this.m_iteminit         =   powerup_speed_init;
  #endif
  #ifdef GAMEQC
+     this.spawnflags         =   ITEM_FLAG_NORMAL;
      this.m_itemid           =   IT_SPEED;
 -    this.m_model            =   MDL_BUFF; // TODO: MDL_Speed_ITEM when new model available
 -    this.m_skin             =   9;
 +    this.m_skin             =   2;
      this.m_sound            =   SND_Speed;
 -    this.m_glow             =   true;
 +    // this.m_glow             =   true;
      this.m_respawnsound     =   SND_SHIELD_RESPAWN;
  #endif
      this.netname            =   "speed";
diff --cc qcsrc/common/mutators/mutator/powerups/powerup/strength.qh
index bede641ee,79ef229f1..c4a080042
--- a/qcsrc/common/mutators/mutator/powerups/powerup/strength.qh
+++ b/qcsrc/common/mutators/mutator/powerups/powerup/strength.qh
@@@ -36,10 -35,11 +34,11 @@@ REGISTER_ITEM(Strength, Powerup) 
      this.m_iteminit         =   powerup_strength_init;
  #endif
  #ifdef GAMEQC
+     this.spawnflags         =   ITEM_FLAG_NORMAL;
      this.m_itemid           =   IT_STRENGTH;
 -    this.m_model            =   MDL_Strength_ITEM;
 +    this.m_skin             =   0;
      this.m_sound            =   SND_Strength;
 -    this.m_glow             =   true;
 +    // this.m_glow             =   true;
      this.m_respawnsound     =   SND_STRENGTH_RESPAWN;
  #endif
      this.netname            =   "strength";
diff --cc qcsrc/common/mutators/mutator/powerups/powerups.qh
index cd0b2cf10,ecd754672..3dfd11935
--- a/qcsrc/common/mutators/mutator/powerups/powerups.qh
+++ b/qcsrc/common/mutators/mutator/powerups/powerups.qh
@@@ -1,20 -1,9 +1,19 @@@
  #pragma once
  
  #include <common/items/item/pickup.qh>
 +
 +#ifdef GAMEQC
 +MODEL(Powerup_ITEM, "models/relics/relic_powerup.md3");
 +#endif
 +
  CLASS(Powerup, Pickup)
  #ifdef SVQC
-     ATTRIB(Powerup, m_mins, vector, '-16 -16 0');
-     ATTRIB(Powerup, m_maxs, vector, '16 16 80');
+     ATTRIB(Powerup, m_maxs, vector, ITEM_L_MAXS);
 +#endif
 +#ifdef GAMEQC
 +    ATTRIB(Powerup, m_model, Model, MDL_Powerup_ITEM);
 +#endif
 +#ifdef SVQC
      ATTRIB(Powerup, m_botvalue, int, 11000);
      ATTRIB(Powerup, m_itemflags, int, FL_POWERUP);
      ATTRIB(Powerup, m_respawntime, float(), GET(g_pickup_respawntime_powerup));