Replace powerups model code in one attribute, add for invisibility and speed, plus...

diff --git a/models/items/g_invincible_luma_glow.tga b/models/items/g_invincible_luma_glow.tga
new file mode 100644 (file)
index 0000000..fbb31e3
Binary files /dev/null and b/models/items/g_invincible_luma_glow.tga differ

diff --git a/models/items/g_strength_luma_glow.tga b/models/items/g_strength_luma_glow.tga
new file mode 100644 (file)
index 0000000..2f184ae
Binary files /dev/null and b/models/items/g_strength_luma_glow.tga differ

diff --git a/models/relics/relic_powerup.md3_2.skin b/models/relics/relic_powerup.md3_2.skin
new file mode 100644 (file)
index 0000000..d387777
--- /dev/null
+++ b/models/relics/relic_powerup.md3_2.skin
@@ -0,0 +1,6 @@
+cable1,textures/crylink_new
+cable2,textures/electronew
+ring,models/relics/relic_ring
+mesh,models/relics/relic
+sign,models/relics/sign_speed
+crystal,models/relics/relic_ring
\ No newline at end of file

diff --git a/models/relics/relic_powerup.md3_3.skin b/models/relics/relic_powerup.md3_3.skin
new file mode 100644 (file)
index 0000000..03b8eb5
--- /dev/null
+++ b/models/relics/relic_powerup.md3_3.skin
@@ -0,0 +1,6 @@
+cable1,textures/crylink_new
+cable2,textures/electronew
+ring,models/relics/relic_ring
+mesh,models/relics/relic
+sign,models/relics/sign_invisible
+crystal,models/relics/relic_ring
\ No newline at end of file

diff --git a/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh b/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh
index d920aab9f22ed3cf8710e67501e19c054a01b5d2..f9712296b494d9b4601bea19c05f61a4a7673c65 100644 (file)
--- a/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh
+++ b/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh
@@ -9,7 +9,6 @@
 #endif
 
 #ifdef GAMEQC
-//MODEL(Invisibility_ITEM, Item_Model("g_strength.md3")); // TODO: new model required
 SOUND(Invisibility, Item_Sound("powerup"));
 #endif
 
@@ -37,10 +36,9 @@ REGISTER_ITEM(Invisibility, Powerup) {
 #endif
 #ifdef GAMEQC
     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 --git a/qcsrc/common/mutators/mutator/powerups/powerup/shield.qh b/qcsrc/common/mutators/mutator/powerups/powerup/shield.qh
index 56a844dee72a09dce6ae9effb9a962262b51bf02..a7f5e46e217857a92eb89c7e7e9d3dd49748f6d4 100644 (file)
--- a/qcsrc/common/mutators/mutator/powerups/powerup/shield.qh
+++ b/qcsrc/common/mutators/mutator/powerups/powerup/shield.qh
@@ -9,7 +9,6 @@
 #endif
 
 #ifdef GAMEQC
-MODEL(Shield_ITEM, "models/relics/relic_powerup.md3");
 SOUND(Shield, Item_Sound("powerup_shield"));
 #endif
 
@@ -36,7 +35,6 @@ REGISTER_ITEM(Shield, Powerup) {
 #endif
 #ifdef GAMEQC
     this.m_itemid           =   IT_INVINCIBLE;
-    this.m_model            =   MDL_Shield_ITEM;
     this.m_skin             =   1;
     this.m_sound            =   SND_Shield;
     // this.m_glow             =   true;

diff --git a/qcsrc/common/mutators/mutator/powerups/powerup/speed.qh b/qcsrc/common/mutators/mutator/powerups/powerup/speed.qh
index 5b71df8083bd88e45e698fb5b88d6c526280d984..7d8b23a75ab0c2eb1158065553b27c2cc4368396 100644 (file)
--- a/qcsrc/common/mutators/mutator/powerups/powerup/speed.qh
+++ b/qcsrc/common/mutators/mutator/powerups/powerup/speed.qh
@@ -9,7 +9,6 @@
 #endif
 
 #ifdef GAMEQC
-//MODEL(Speed_ITEM, Item_Model("g_invincible.md3")); // TODO: new model required
 SOUND(Speed, Item_Sound("powerup_shield"));
 #endif
 
@@ -38,10 +37,9 @@ REGISTER_ITEM(Speed, Powerup) {
 #endif
 #ifdef GAMEQC
     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 --git a/qcsrc/common/mutators/mutator/powerups/powerup/strength.qh b/qcsrc/common/mutators/mutator/powerups/powerup/strength.qh
index 7af0cef02065055aa11fc8a46b9d00bbc3cbcb5e..dd579b15baf4ed70a4a7711d41ca855ce28478eb 100644 (file)
--- a/qcsrc/common/mutators/mutator/powerups/powerup/strength.qh
+++ b/qcsrc/common/mutators/mutator/powerups/powerup/strength.qh
@@ -9,7 +9,6 @@
 #endif
 
 #ifdef GAMEQC
-MODEL(Strength_ITEM, "models/relics/relic_powerup.md3");
 SOUND(Strength, Item_Sound("powerup"));
 #endif
 
@@ -38,7 +37,6 @@ REGISTER_ITEM(Strength, Powerup) {
 #endif
 #ifdef GAMEQC
     this.m_itemid           =   IT_STRENGTH;
-    this.m_model            =   MDL_Strength_ITEM;
     this.m_skin             =   0;
     this.m_sound            =   SND_Strength;
     // this.m_glow             =   true;

diff --git a/qcsrc/common/mutators/mutator/powerups/powerups.qh b/qcsrc/common/mutators/mutator/powerups/powerups.qh
index 3a614e38829485e838a2fa8c54b5135080424219..cd0b2cf10bee0f4e4c55b2fe6a1d3924e68ca15f 100644 (file)
--- a/qcsrc/common/mutators/mutator/powerups/powerups.qh
+++ b/qcsrc/common/mutators/mutator/powerups/powerups.qh
@@ -1,10 +1,20 @@
 #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');
+#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));