From: terencehill <piuntn@gmail.com>
Date: Tue, 11 Jun 2024 10:45:07 +0000 (+0200)
Subject: Move _luma powerup shaders to the appropriate shader file
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ab4e33a739da2ce14b5a2f7e8d74b0eeb4af507c;p=xonotic%2Fxonotic-data.pk3dir.git

Move _luma powerup shaders to the appropriate shader file
---

diff --git a/scripts/luma.shader b/scripts/luma.shader
index b6ee3cd8a..f0164bf45 100644
--- a/scripts/luma.shader
+++ b/scripts/luma.shader
@@ -1,4 +1,4 @@
-// models/items
+////////// ITEMS //////////
 
 a_bullets_luma
 {
@@ -121,88 +121,110 @@ g_h100_luma
 	}
 }
 
-g_invincible_luma
+g_jetpack_luma
 {
 	deformVertexes autosprite
 	cull none
 	nopicmip
 	{
-		map models/items/g_invincible_luma
+		map models/items/g_jetpack_luma
 		blendfunc blend
 	}
 }
 
-g_jetpack_luma
+item_armor_big_luma
 {
 	deformVertexes autosprite
 	cull none
 	nopicmip
 	{
-		map models/items/g_jetpack_luma
+		map models/items/item_armor_big_luma
 		blendfunc blend
 	}
 }
 
-g_strength_luma
+item_armor_large_luma
 {
 	deformVertexes autosprite
 	cull none
 	nopicmip
 	{
-		map models/items/g_strength_luma
+		map models/items/item_armor_large_luma
 		blendfunc blend
 	}
 }
 
-item_armor_big_luma
+item_armor_medium_luma
 {
 	deformVertexes autosprite
 	cull none
 	nopicmip
 	{
-		map models/items/item_armor_big_luma
+		map models/items/item_armor_medium_luma
 		blendfunc blend
 	}
 }
 
-item_armor_large_luma
+item_armor_small_luma
 {
 	deformVertexes autosprite
 	cull none
 	nopicmip
 	{
-		map models/items/item_armor_large_luma
+		map models/items/item_armor_small_luma
 		blendfunc blend
 	}
 }
 
-item_armor_medium_luma
+
+////////// POWERUPS //////////
+
+models/items/g_strength_luma
 {
 	deformVertexes autosprite
 	cull none
 	nopicmip
 	{
-		map models/items/item_armor_medium_luma
+		map models/items/g_strength_luma
 		blendfunc blend
 	}
 }
 
-item_armor_small_luma
+models/items/g_invincible_luma
 {
 	deformVertexes autosprite
 	cull none
 	nopicmip
 	{
-		map models/items/item_armor_small_luma
+		map models/items/g_invincible_luma
 		blendfunc blend
 	}
 }
 
+models/items/g_invisibility_luma
+{
+	deformVertexes autosprite
+	cull none
+	nopicmip
+	{
+		map models/items/g_invisibility_luma
+		blendfunc blend
+	}
+}
 
+models/items/g_speed_luma
+{
+	deformVertexes autosprite
+	cull none
+	nopicmip
+	{
+		map models/items/g_speed_luma
+		blendfunc blend
+	}
+}
 
 
-
-// models/weapons
+////////// WEAPONS //////////
 
 g_arc_luma
 {
diff --git a/scripts/simpleitems.shader b/scripts/simpleitems.shader
index 3e6ff14b3..e01b8c65c 100644
--- a/scripts/simpleitems.shader
+++ b/scripts/simpleitems.shader
@@ -1,6 +1,5 @@
 ////////// AMMO //////////
 
-
 a_cells_simple // cells
 {
 	deformVertexes autosprite
@@ -49,6 +48,7 @@ a_shells_simple // shells
 	}
 }
 
+
 ////////// WEAPONS //////////
 
 g_arc_simple // arc
@@ -303,6 +303,7 @@ g_ok_rl_simple // rocket propelled chainsaw
 	}
 }
 
+
 ////////// ARMOR + HEALTH ITEMS //////////
 
 ///// ARMOR /////
@@ -405,6 +406,7 @@ g_h100_simple // 100hp
 	}
 }
 
+
 ////////// POWERUPS //////////
 
 models/items/g_strength_simple
@@ -488,49 +490,3 @@ g_fuelregen_simple // fuel regen powerup
 		blendfunc blend
 	}
 }
-
-// relic powerups
-
-models/items/g_strength_luma // strength
-{
-	deformVertexes autosprite
-	cull none
-	nopicmip
-	{
-		map models/items/g_strength_luma
-		blendfunc blend
-	}
-}
-
-models/items/g_invincible_luma // invincible
-{
-	deformVertexes autosprite
-	cull none
-	nopicmip
-	{
-		map models/items/g_invincible_luma
-		blendfunc blend
-	}
-}
-
-models/items/g_invisibility_luma // invisibility
-{
-	deformVertexes autosprite
-	cull none
-	nopicmip
-	{
-		map models/items/g_invisibility_luma
-		blendfunc blend
-	}
-}
-
-models/items/g_speed_luma // speed
-{
-	deformVertexes autosprite
-	cull none
-	nopicmip
-	{
-		map models/items/g_speed_luma
-		blendfunc blend
-	}
-}