From: terencehill <piuntn@gmail.com>
Date: Wed, 5 Jul 2023 21:22:15 +0000 (+0200)
Subject: Swap xray and invisibility powerup colors: invisibility is now violet and xray blue
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=refs%2Fheads%2Fterencehill%2Fnew_powerups;p=xonotic%2Fmediasource.git

Swap xray and invisibility powerup colors: invisibility is now violet and xray blue
---

diff --git a/gfx/luma/gfx/hud/luma/powerup_invisibility.svg b/gfx/luma/gfx/hud/luma/powerup_invisibility.svg
index 3c01710..8d5c131 100644
--- a/gfx/luma/gfx/hud/luma/powerup_invisibility.svg
+++ b/gfx/luma/gfx/hud/luma/powerup_invisibility.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="blue shining" d="m 55,16 -47,81 9,16 94,0 9,-16 -47,-81 -9,0 z"/>
-	<path class="blue darkened" d="m 30,76 c 3.7,6.9 9.2,12.1 15.4,15.4 l -3.9,3.9 4.1,4.1 41.9,-41.9 -4.1,-4.1 -5.3,5.3 C 73.4,56.9 68.4,56 63.4,56 50.1,56.1 37,62.9 30,76 Z M 64,59.4 c 3.8,0 7.3,1.3 10.1,3.4 L 50.8,86.1 C 48.6,83.3 47.4,79.8 47.4,76 47.4,66.8 54.9,59.4 64,59.4 Z m 24.5,5.5 -8.1,8.1 c 0.1,0.9 0.2,2 0.2,3 0,9.2 -7.5,16.6 -16.6,16.6 -1,0 -2.1,-0.1 -3,-0.3 l -3.1,3.1 c 1.8,0.3 3.7,0.4 5.5,0.4 C 76.7,96 90.2,89.5 98,76 95.4,71.5 92.1,67.8 88.5,64.9 Z"/>
+	<path class="violet shining" d="m 55,16 -47,81 9,16 94,0 9,-16 -47,-81 -9,0 z"/>
+	<path class="violet darkened" d="m 30,76 c 3.7,6.9 9.2,12.1 15.4,15.4 l -3.9,3.9 4.1,4.1 41.9,-41.9 -4.1,-4.1 -5.3,5.3 C 73.4,56.9 68.4,56 63.4,56 50.1,56.1 37,62.9 30,76 Z M 64,59.4 c 3.8,0 7.3,1.3 10.1,3.4 L 50.8,86.1 C 48.6,83.3 47.4,79.8 47.4,76 47.4,66.8 54.9,59.4 64,59.4 Z m 24.5,5.5 -8.1,8.1 c 0.1,0.9 0.2,2 0.2,3 0,9.2 -7.5,16.6 -16.6,16.6 -1,0 -2.1,-0.1 -3,-0.3 l -3.1,3.1 c 1.8,0.3 3.7,0.4 5.5,0.4 C 76.7,96 90.2,89.5 98,76 95.4,71.5 92.1,67.8 88.5,64.9 Z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/powerup_xray b/gfx/luma/gfx/hud/luma/powerup_xray
index 5da537a..d451d1d 100644
--- a/gfx/luma/gfx/hud/luma/powerup_xray
+++ b/gfx/luma/gfx/hud/luma/powerup_xray
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="violet shining" d="m 55,16 -47,81 9,16 94,0 9,-16 -47,-81 -9,0 z"/>
-	<path class="violet darkened" d="M 37.2,55.3 30.8,76.4 c -1,3.2 0.8,5 3.2,6.3 L 50.5,91.2 c 2.7,1.4 4.6,0.2 6.9,-2.8 L 65.8,77.2 71.3,79.4 69.7,93.3 c -0.4,3.8 0.1,5.9 3.1,6.8 l 17.9,5.1 c 2.7,0.8 5.2,0.6 6.6,-2.3 L 107.1,83 z m 10.6,7.2 c 6.4,0 11.6,5.2 11.6,11.6 0,6.4 -5.2,11.6 -11.6,11.6 -6.4,0 -11.6,-5.2 -11.6,-11.6 0,-6.4 5.2,-11.6 11.6,-11.6 z m 0,2.3 c -5.1,0 -9.3,4.2 -9.3,9.3 0,5.1 4.2,9.3 9.3,9.3 5.1,0 9.3,-4.2 9.3,-9.3 0,-5.1 -4.2,-9.3 -9.3,-9.3 z m 0,2.3 c 3.8,0 6.9,3.1 6.9,7 0,3.8 -3.1,7 -6.9,7 -3.8,0 -7,-3.1 -7,-7 0,-3.8 3.1,-7 7,-7 z m 0,2.3 c -2.6,0 -4.7,2.1 -4.7,4.6 0,2.6 2.1,4.7 4.7,4.7 2.6,0 4.6,-2.1 4.6,-4.7 0,-2.6 -2.1,-4.6 -4.6,-4.6 z m 0,2.3 c 1.3,0 2.3,1 2.3,2.3 0,1.3 -1,2.3 -2.3,2.3 -1.3,0 -2.3,-1 -2.3,-2.3 0,-1.3 1.1,-2.3 2.3,-2.3 z m 38.7,6.1 c 6.4,0 11.6,5.2 11.6,11.6 0,6.4 -5.2,11.6 -11.6,11.6 -6.4,0 -11.6,-5.2 -11.6,-11.6 0,-6.4 5.2,-11.6 11.6,-11.6 z m 0,2.3 c -5.1,0 -9.3,4.2 -9.3,9.3 0,5.1 4.2,9.3 9.3,9.3 5.1,0 9.3,-4.2 9.3,-9.3 0,-5.1 -4.2,-9.3 -9.3,-9.3 z m 0,2.3 c 3.8,0 7,3.1 7,7 0,3.8 -3.1,7 -7,7 C 82.6,96.4 79.5,93.3 79.5,89.5 79.5,85.6 82.6,82.5 86.5,82.5 z m 0,2.3 c -2.6,0 -4.7,2.1 -4.7,4.7 0,2.6 2.1,4.6 4.7,4.6 2.6,0 4.6,-2.1 4.6,-4.6 0,-2.6 -2.1,-4.7 -4.6,-4.7 z m 0,2.3 c 1.3,0 2.3,1 2.3,2.3 0,1.3 -1,2.3 -2.3,2.3 -1.3,0 -2.3,-1 -2.3,-2.3 0,-1.3 1,-2.3 2.3,-2.3 z"/>
+	<path class="blue shining" d="m 55,16 -47,81 9,16 94,0 9,-16 -47,-81 -9,0 z"/>
+	<path class="blue darkened" d="M 37.2,55.3 30.8,76.4 c -1,3.2 0.8,5 3.2,6.3 L 50.5,91.2 c 2.7,1.4 4.6,0.2 6.9,-2.8 L 65.8,77.2 71.3,79.4 69.7,93.3 c -0.4,3.8 0.1,5.9 3.1,6.8 l 17.9,5.1 c 2.7,0.8 5.2,0.6 6.6,-2.3 L 107.1,83 z m 10.6,7.2 c 6.4,0 11.6,5.2 11.6,11.6 0,6.4 -5.2,11.6 -11.6,11.6 -6.4,0 -11.6,-5.2 -11.6,-11.6 0,-6.4 5.2,-11.6 11.6,-11.6 z m 0,2.3 c -5.1,0 -9.3,4.2 -9.3,9.3 0,5.1 4.2,9.3 9.3,9.3 5.1,0 9.3,-4.2 9.3,-9.3 0,-5.1 -4.2,-9.3 -9.3,-9.3 z m 0,2.3 c 3.8,0 6.9,3.1 6.9,7 0,3.8 -3.1,7 -6.9,7 -3.8,0 -7,-3.1 -7,-7 0,-3.8 3.1,-7 7,-7 z m 0,2.3 c -2.6,0 -4.7,2.1 -4.7,4.6 0,2.6 2.1,4.7 4.7,4.7 2.6,0 4.6,-2.1 4.6,-4.7 0,-2.6 -2.1,-4.6 -4.6,-4.6 z m 0,2.3 c 1.3,0 2.3,1 2.3,2.3 0,1.3 -1,2.3 -2.3,2.3 -1.3,0 -2.3,-1 -2.3,-2.3 0,-1.3 1.1,-2.3 2.3,-2.3 z m 38.7,6.1 c 6.4,0 11.6,5.2 11.6,11.6 0,6.4 -5.2,11.6 -11.6,11.6 -6.4,0 -11.6,-5.2 -11.6,-11.6 0,-6.4 5.2,-11.6 11.6,-11.6 z m 0,2.3 c -5.1,0 -9.3,4.2 -9.3,9.3 0,5.1 4.2,9.3 9.3,9.3 5.1,0 9.3,-4.2 9.3,-9.3 0,-5.1 -4.2,-9.3 -9.3,-9.3 z m 0,2.3 c 3.8,0 7,3.1 7,7 0,3.8 -3.1,7 -7,7 C 82.6,96.4 79.5,93.3 79.5,89.5 79.5,85.6 82.6,82.5 86.5,82.5 z m 0,2.3 c -2.6,0 -4.7,2.1 -4.7,4.7 0,2.6 2.1,4.6 4.7,4.6 2.6,0 4.6,-2.1 4.6,-4.6 0,-2.6 -2.1,-4.7 -4.6,-4.7 z m 0,2.3 c 1.3,0 2.3,1 2.3,2.3 0,1.3 -1,2.3 -2.3,2.3 -1.3,0 -2.3,-1 -2.3,-2.3 0,-1.3 1,-2.3 2.3,-2.3 z"/>
 </svg>
diff --git a/gfx/luma/models/items/common.css b/gfx/luma/models/items/common.css
index aa03838..d22324d 100755
--- a/gfx/luma/models/items/common.css
+++ b/gfx/luma/models/items/common.css
@@ -13,7 +13,7 @@
 
 /* Powerups */
 .detonator    { fill:#db8247 }
-.invisibility { fill:#5e95e8 }
+.xray         { fill:#5e95e8 }
 .fuelregen    { fill:#c4a93c }
 .resurrection { fill:#f35d68 }
 .shield       { fill:#6ce820 }
@@ -21,7 +21,7 @@
 .strength     { fill:#db8247 }
 .superweapons { fill:#c49f3c }
 .ultrahealing { fill:#f85e46 }
-.xray         { fill:#857bca }
+.invisibility { fill:#857bca }
 
 /* Jetpack */
 .jetpack { fill:#c4a93c }