From: LegendaryGuard <rootuser999@gmail.com>
Date: Tue, 15 Nov 2022 21:14:44 +0000 (+0100)
Subject: Add new powerup models
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8f13a51a8c93d163bbc03ec642813da9d590eaf9;p=xonotic%2Fxonotic-data.pk3dir.git

Add new powerup models
---

diff --git a/models/items/g_invincible.md3 b/models/items/g_invincible.md3
deleted file mode 100644
index 7097ec459..000000000
Binary files a/models/items/g_invincible.md3 and /dev/null differ
diff --git a/models/items/g_strength.md3 b/models/items/g_strength.md3
deleted file mode 100644
index 6159b5ff7..000000000
Binary files a/models/items/g_strength.md3 and /dev/null differ
diff --git a/models/relics/relic_powerup.md3 b/models/relics/relic_powerup.md3
new file mode 100644
index 000000000..58979a12e
Binary files /dev/null and b/models/relics/relic_powerup.md3 differ
diff --git a/models/relics/relic_powerup.md3.framegroups b/models/relics/relic_powerup.md3.framegroups
new file mode 100644
index 000000000..4e33f6f0d
--- /dev/null
+++ b/models/relics/relic_powerup.md3.framegroups
@@ -0,0 +1 @@
+0 99 30 1
\ No newline at end of file
diff --git a/models/relics/relic_powerup.md3_0.skin b/models/relics/relic_powerup.md3_0.skin
new file mode 100644
index 000000000..204627458
--- /dev/null
+++ b/models/relics/relic_powerup.md3_0.skin
@@ -0,0 +1,6 @@
+cable1,textures/crylink_new
+cable2,textures/electronew
+ring,models/relics/relic_ring
+mesh,models/relics/relic
+sign,models/items/g_strength_luma
+crystal,models/relics/relic_ring
\ No newline at end of file
diff --git a/models/relics/relic_powerup.md3_1.skin b/models/relics/relic_powerup.md3_1.skin
new file mode 100644
index 000000000..5731050f9
--- /dev/null
+++ b/models/relics/relic_powerup.md3_1.skin
@@ -0,0 +1,6 @@
+cable1,textures/crylink_new
+cable2,textures/electronew
+ring,models/relics/relic_ring
+mesh,models/relics/relic
+sign,models/items/g_invincible_luma
+crystal,models/relics/relic_ring
\ No newline at end of file
diff --git a/qcsrc/common/mutators/mutator/powerups/powerup/shield.qh b/qcsrc/common/mutators/mutator/powerups/powerup/shield.qh
index 508a39487..56a844dee 100644
--- a/qcsrc/common/mutators/mutator/powerups/powerup/shield.qh
+++ b/qcsrc/common/mutators/mutator/powerups/powerup/shield.qh
@@ -9,7 +9,7 @@
 #endif
 
 #ifdef GAMEQC
-MODEL(Shield_ITEM, Item_Model("g_invincible.md3"));
+MODEL(Shield_ITEM, "models/relics/relic_powerup.md3");
 SOUND(Shield, Item_Sound("powerup_shield"));
 #endif
 
@@ -37,14 +37,15 @@ REGISTER_ITEM(Shield, Powerup) {
 #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;
+    // this.m_glow             =   true;
     this.m_respawnsound     =   SND_SHIELD_RESPAWN;
 #endif
     this.netname            =   "invincible";
     this.m_name             =   _("Shield");
     this.m_icon             =   "shield";
-    this.m_color            =   '1 0 1';
+    this.m_color            =   '0.5 1 0';
     this.m_waypoint         =   _("Shield");
     this.m_waypointblink    =   2;
 }
diff --git a/qcsrc/common/mutators/mutator/powerups/powerup/strength.qh b/qcsrc/common/mutators/mutator/powerups/powerup/strength.qh
index 9392a6a2d..7af0cef02 100644
--- a/qcsrc/common/mutators/mutator/powerups/powerup/strength.qh
+++ b/qcsrc/common/mutators/mutator/powerups/powerup/strength.qh
@@ -9,7 +9,7 @@
 #endif
 
 #ifdef GAMEQC
-MODEL(Strength_ITEM, Item_Model("g_strength.md3"));
+MODEL(Strength_ITEM, "models/relics/relic_powerup.md3");
 SOUND(Strength, Item_Sound("powerup"));
 #endif
 
@@ -39,14 +39,15 @@ REGISTER_ITEM(Strength, Powerup) {
 #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;
+    // this.m_glow             =   true;
     this.m_respawnsound     =   SND_STRENGTH_RESPAWN;
 #endif
     this.netname            =   "strength";
     this.m_name             =   _("Strength");
     this.m_icon             =   "strength";
-    this.m_color            =   '0 0 1';
+    this.m_color            =   '1 0.5 0';
     this.m_waypoint         =   _("Strength");
     this.m_waypointblink    =   2;
 }
diff --git a/scripts/simpleitems.shader b/scripts/simpleitems.shader
index 76edd6dd3..3655f7ef7 100644
--- a/scripts/simpleitems.shader
+++ b/scripts/simpleitems.shader
@@ -407,6 +407,28 @@ g_h100_simple // 100hp
 
 ////////// POWERUPS //////////
 
+models/items/g_strength_luma
+{
+	deformVertexes autosprite
+	cull none
+	nopicmip
+	{
+		map models/items/g_strength_luma
+		blendfunc add
+	}
+}
+
+models/items/g_invincible_luma
+{
+	deformVertexes autosprite
+	cull none
+	nopicmip
+	{
+		map models/items/g_invincible_luma
+		blendfunc add
+	}
+}
+
 g_strength_simple // strength
 {
 	deformVertexes autosprite