From: LegendaryGuard <rootuser999@gmail.com>
Date: Thu, 24 Nov 2022 23:43:31 +0000 (+0100)
Subject: Add new invisibility and speed powerup icons
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5a6d39064ac7d0a3728378ed6d5751091f16d030;p=xonotic%2Fxonotic-data.pk3dir.git

Add new invisibility and speed powerup icons
---

diff --git a/models/items/g_invisibility_luma.tga b/models/items/g_invisibility_luma.tga
new file mode 100644
index 000000000..cfe5fe3d7
Binary files /dev/null and b/models/items/g_invisibility_luma.tga differ
diff --git a/models/items/g_speed_luma.tga b/models/items/g_speed_luma.tga
new file mode 100644
index 000000000..5b134cea7
Binary files /dev/null and b/models/items/g_speed_luma.tga differ
diff --git a/models/relics/relic_powerup.md3_2.skin b/models/relics/relic_powerup.md3_2.skin
index d38777772..0e53c7c6c 100644
--- a/models/relics/relic_powerup.md3_2.skin
+++ b/models/relics/relic_powerup.md3_2.skin
@@ -2,5 +2,5 @@ cable1,textures/crylink_new
 cable2,textures/electronew
 ring,models/relics/relic_ring
 mesh,models/relics/relic
-sign,models/relics/sign_speed
+sign,models/items/g_speed_luma
 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
index 03b8eb53c..3d2206265 100644
--- a/models/relics/relic_powerup.md3_3.skin
+++ b/models/relics/relic_powerup.md3_3.skin
@@ -2,5 +2,5 @@ cable1,textures/crylink_new
 cable2,textures/electronew
 ring,models/relics/relic_ring
 mesh,models/relics/relic
-sign,models/relics/sign_invisible
+sign,models/items/g_invisibility_luma
 crystal,models/relics/relic_ring
\ No newline at end of file
diff --git a/scripts/simpleitems.shader b/scripts/simpleitems.shader
index 3655f7ef7..71ae5f275 100644
--- a/scripts/simpleitems.shader
+++ b/scripts/simpleitems.shader
@@ -407,84 +407,108 @@ g_h100_simple // 100hp
 
 ////////// POWERUPS //////////
 
-models/items/g_strength_luma
+g_strength_simple // strength
 {
 	deformVertexes autosprite
 	cull none
 	nopicmip
+
 	{
-		map models/items/g_strength_luma
-		blendfunc add
+		map models/items/g_strength_simple
+		blendfunc blend
 	}
 }
 
-models/items/g_invincible_luma
+g_invincible_simple // shield
 {
 	deformVertexes autosprite
 	cull none
 	nopicmip
+
 	{
-		map models/items/g_invincible_luma
-		blendfunc add
+		map models/items/g_invincible_simple
+		blendfunc blend
 	}
 }
 
-g_strength_simple // strength
+g_jetpack_simple // jetpack
 {
 	deformVertexes autosprite
 	cull none
 	nopicmip
 
 	{
-		map models/items/g_strength_simple
+		map models/items/g_jetpack_simple
 		blendfunc blend
 	}
 }
 
-g_invincible_simple // shield
+g_fuel_simple // fuel for jetpack
 {
 	deformVertexes autosprite
 	cull none
 	nopicmip
 
 	{
-		map models/items/g_invincible_simple
+		map models/items/g_fuel_simple
 		blendfunc blend
 	}
 }
 
-g_jetpack_simple // jetpack
+g_fuelregen_simple // fuel regen powerup
 {
 	deformVertexes autosprite
 	cull none
 	nopicmip
 
 	{
-		map models/items/g_jetpack_simple
+		map models/items/g_fuelregen_simple
 		blendfunc blend
 	}
 }
 
-g_fuel_simple // fuel for jetpack
+// relic powerups
+
+models/items/g_strength_luma // strength
 {
 	deformVertexes autosprite
 	cull none
 	nopicmip
-
 	{
-		map models/items/g_fuel_simple
-		blendfunc blend
+		map models/items/g_strength_luma
+		blendfunc add
 	}
 }
 
-g_fuelregen_simple // fuel regen powerup
+models/items/g_invincible_luma // invincible
 {
 	deformVertexes autosprite
 	cull none
 	nopicmip
+	{
+		map models/items/g_invincible_luma
+		blendfunc add
+	}
+}
 
+models/items/g_invisibility_luma // invisibility
+{
+	deformVertexes autosprite
+	cull none
+	nopicmip
 	{
-		map models/items/g_fuelregen_simple
-		blendfunc blend
+		map models/items/g_invisibility_luma
+		blendfunc add
 	}
 }
+
+models/items/g_speed_luma // speed
+{
+	deformVertexes autosprite
+	cull none
+	nopicmip
+	{
+		map models/items/g_speed_luma
+		blendfunc add
+	}
+}
\ No newline at end of file