Add new powerup model source and icon sources for the new Speed and Invisibility...

diff --git a/gfx/luma/gfx/hud/luma/powerup_invisibility b/gfx/luma/gfx/hud/luma/powerup_invisibility
deleted file mode 100644 (file)
index 3c01710..0000000
--- a/gfx/luma/gfx/hud/luma/powerup_invisibility
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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"/>
-</svg>

diff --git a/gfx/luma/gfx/hud/luma/powerup_invisibility.svg b/gfx/luma/gfx/hud/luma/powerup_invisibility.svg
new file mode 100644 (file)
index 0000000..8d5c131
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/powerup_invisibility.svg
@@ -0,0 +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 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_speed b/gfx/luma/gfx/hud/luma/powerup_speed
deleted file mode 100644 (file)
index 39ae360..0000000
--- a/gfx/luma/gfx/hud/luma/powerup_speed
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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="cyan shining" d="m 55,16 -47,81 9,16 94,0 9,-16 -47,-81 -9,0 z"/>
-       <path class="cyan darkened" d="m 54.9,45.1 1.5,7.1 -26.4,38.6 0,11.2 1,1 29.5,-30.6 2.4,10.8 15.9,-36.1 z m 18.8,30.5 0,2 9.3,7.6 10.5,-0.8 z M 97,85.7 47.6,89.4 34.2,103.3 97,93.9 z"/>
-</svg>

diff --git a/gfx/luma/gfx/hud/luma/powerup_speed.svg b/gfx/luma/gfx/hud/luma/powerup_speed.svg
new file mode 100644 (file)
index 0000000..39ae360
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/powerup_speed.svg
@@ -0,0 +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="cyan shining" d="m 55,16 -47,81 9,16 94,0 9,-16 -47,-81 -9,0 z"/>
+       <path class="cyan darkened" d="m 54.9,45.1 1.5,7.1 -26.4,38.6 0,11.2 1,1 29.5,-30.6 2.4,10.8 15.9,-36.1 z m 18.8,30.5 0,2 9.3,7.6 10.5,-0.8 z M 97,85.7 47.6,89.4 34.2,103.3 97,93.9 z"/>
+</svg>

diff --git a/gfx/luma/gfx/hud/luma/powerup_xray b/gfx/luma/gfx/hud/luma/powerup_xray
index 5da537af7f3ae0515e49e63c324896d1a1fee4ba..d451d1d9fbd45a1e7e578e70422037b7b8b54bc5 100644 (file)
--- 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 aa03838fcf3fabb98ccfcc154ffc51d8476e8004..d22324d646dca83e9a88daeb10fc5356144e7a49 100755 (executable)
--- 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 }

diff --git a/gfx/luma/models/items/g_invincible_luma.svg b/gfx/luma/models/items/g_invincible_luma.svg
index 76fe2b8dd5af799125a79d3b8f2340e39a29b23b..17232bb43c9925667a7bf6991098c3a8f73327de 100644 (file)
--- a/gfx/luma/models/items/g_invincible_luma.svg
+++ b/gfx/luma/models/items/g_invincible_luma.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">
-       <path class="shield shining" d="m 114,16 -23,40 4,9 -54,93.5 -10,1.5 -23,40 14,24 46,0 6,-8 108,0 6,8 46,0 14,-24 -23,-40 -10,-1.5 -54,-93.5 4,-9 -23,-40 -28,0 z m -34,53 -18.5,2 -32,55.5 7.5,17 3,0.5 L 82,71.5 80,69 z m 96,0 -2,2.5 42,72.5 3,-0.5 7.5,-17 L 194.5,71 176,69 z m -90,155 -1,3 11,15 64,0 11,-15 -1,-3 -84,0 z"/>
-       <path class="shield darkened" d="m 97.7,199 19,0 0,-15.2 -10.3,0 L 84.8,146 90,137.1 76.9,129.5 67.4,146 Z m 41.6,0 19,0 30.3,-53 -9.5,-16.5 -13.1,7.6 5.2,8.9 -21.6,37.8 -10.3,0 z m -38.2,-81.6 5.3,-9.2 43.2,0 5.3,9.2 13,-7.6 -9.6,-16.8 -60.6,0 -9.6,16.8 z"/>
+       <path class="shield shining" d="M 114 16 L 91 56 L 95 65 L 41 158.5 L 31 160 L 8 200 L 22 224 L 68 224 L 74 216 L 182 216 L 188 224 L 234 224 L 248 200 L 225 160 L 215 158.5 L 161 65 L 165 56 L 142 16 L 114 16 z M 80 69 L 61.5 71 L 29.5 126.5 L 37 143.5 L 40 144 L 82 71.5 L 80 69 z M 176 69 L 174 71.5 L 216 144 L 219 143.5 L 226.5 126.5 L 194.5 71 L 176 69 z M 97.699219 93 L 158.30078 93 L 167.90039 109.80078 L 154.90039 117.40039 L 149.59961 108.19922 L 106.40039 108.19922 L 101.09961 117.40039 L 88.099609 109.80078 L 97.699219 93 z M 76.900391 129.5 L 90 137.09961 L 84.800781 146 L 106.40039 183.80078 L 116.69922 183.80078 L 116.69922 199 L 97.699219 199 L 67.400391 146 L 76.900391 129.5 z M 179.09961 129.5 L 188.59961 146 L 158.30078 199 L 139.30078 199 L 139.30078 183.80078 L 149.59961 183.80078 L 171.19922 146 L 166 137.09961 L 179.09961 129.5 z M 86 224 L 85 227 L 96 242 L 160 242 L 171 227 L 170 224 L 86 224 z " />
 </svg>

diff --git a/gfx/luma/models/items/g_invincible_simple.svg b/gfx/luma/models/items/g_invincible_simple.svg
new file mode 100644 (file)
index 0000000..5a9ba77
--- /dev/null
+++ b/gfx/luma/models/items/g_invincible_simple.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">
+       <path class="shield shining" d="m 70.43,228.7 h 36.1 V 199.82 H 86.96 L 45.92,128 55.8,111.09 30.91,96.65 12.86,128 Z m 79.04,0 h 36.1 L 243.14,128 225.09,96.65 200.2,111.09 210.08,128 169.04,199.82 H 149.47 Z M 76.89,73.66 86.96,56.18 h 82.08 L 179.11,73.66 203.81,59.22 185.57,27.3 H 70.43 L 52.19,59.22 Z"/>
+</svg>

diff --git a/gfx/luma/models/items/g_strength_luma.svg b/gfx/luma/models/items/g_strength_luma.svg
index 90ba154b2f99820bf73ce83042cca395f08df7f7..6a58e52fe9e0e760155322bf26a3e4c70e2932f1 100644 (file)
--- a/gfx/luma/models/items/g_strength_luma.svg
+++ b/gfx/luma/models/items/g_strength_luma.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">
-       <path class="strength shining" d="m 114,16 -23,40 4,9 -54,93.5 -10,1.5 -23,40 14,24 46,0 6,-8 108,0 6,8 46,0 14,-24 -23,-40 -10,-1.5 -54,-93.5 4,-9 -23,-40 -28,0 z m -34,53 -18.5,2 -32,55.5 7.5,17 3,0.5 L 82,71.5 80,69 z m 96,0 -2,2.5 42,72.5 3,-0.5 7.5,-17 L 194.5,71 176,69 z m -90,155 -1,3 11,15 64,0 11,-15 -1,-3 -84,0 z"/>
-       <path class="strength darkened" d="m 129.5,102.1 c 3.8,-0.8 8.3,6.7 11.9,6.1 4.1,-0.7 4.4,-3.4 7.8,-3.9 l 10.7,-1.4 c 2.4,-0.3 8.4,8.6 11,23.2 l 8,45.7 c 0.4,2.3 -19.8,6.1 -20.2,4.1 l -9.5,-44.6 -5.8,1.3 10.5,45.2 c 0.6,2.5 -23,7.3 -23.5,5.2 l -10.3,-44.9 -5.6,1.4 10.7,44.1 c 0.4,1.8 -18.5,5.6 -18.9,4 l -10.5,-43.1 -5.6,1.4 10,35.7 c 0.4,1.5 -13.4,4.8 -14,3 l -13.2,-34.8 c -3.6,-9.4 -3.2,-17.9 -1.2,-19.2 l 6.7,-4.4 c 3,-2 4.9,0.2 8.1,-1.1 3.5,-1.5 3.7,-9.3 8.2,-10.7 l 8.1,-2.4 c 3,-0.9 4.8,1.7 8.5,0.6 3.6,-1 3.9,-7.5 7.8,-8.4 z M 190,144.5 l -1.4,41.5 c -0.1,1.7 -5.6,7.5 -7.8,7.7 L 142.1,197 c -2.9,-0.8 -1.6,-6.6 -0.1,-9.6 l 32.9,-8.2 c 7.2,-1.8 9.6,-5.5 9.3,-7.6 l -6.1,-34.9 z"/>
+       <path class="strength shining" d="M 114 16 L 91 56 L 95 65 L 41 158.5 L 31 160 L 8 200 L 22 224 L 68 224 L 74 216 L 182 216 L 188 224 L 234 224 L 248 200 L 225 160 L 215 158.5 L 161 65 L 165 56 L 142 16 L 114 16 z M 80 69 L 61.5 71 L 29.5 126.5 L 37 143.5 L 40 144 L 82 71.5 L 80 69 z M 176 69 L 174 71.5 L 216 144 L 219 143.5 L 226.5 126.5 L 194.5 71 L 176 69 z M 130.2207 102.04297 C 133.85938 102.20557 138.02539 108.76172 141.40039 108.19922 C 145.50039 107.49922 145.79922 104.80078 149.19922 104.30078 L 159.90039 102.90039 C 162.30039 102.60039 168.30039 111.49961 170.90039 126.09961 L 178.90039 171.80078 C 179.30039 174.10078 159.09922 177.90039 158.69922 175.90039 L 149.19922 131.30078 L 143.40039 132.59961 L 153.90039 177.80078 C 154.50039 180.30078 130.90039 185.1 130.40039 183 L 120.09961 138.09961 L 114.5 139.5 L 125.19922 183.59961 C 125.59922 185.39961 106.70078 189.19961 106.30078 187.59961 L 95.800781 144.5 L 90.199219 145.90039 L 100.19922 181.59961 C 100.59922 183.09961 86.799219 186.39961 86.199219 184.59961 L 73 149.80078 C 69.4 140.40078 69.800781 131.89961 71.800781 130.59961 L 78.5 126.19922 C 81.5 124.19922 83.399609 126.39961 86.599609 125.09961 C 90.099609 123.59961 90.300781 115.80039 94.800781 114.40039 L 102.90039 112 C 105.90039 111.1 107.70039 113.69961 111.40039 112.59961 C 115.00039 111.59961 115.29922 105.09922 119.19922 104.19922 L 129.5 102.09961 C 129.7375 102.04961 129.97813 102.03213 130.2207 102.04297 z M 178.09961 136.69922 L 190 144.5 L 188.59961 186 C 188.49961 187.7 183.00078 193.49922 180.80078 193.69922 L 142.09961 197 C 139.19961 196.2 140.5 190.40039 142 187.40039 L 174.90039 179.19922 C 182.10039 177.39922 184.49922 173.69961 184.19922 171.59961 L 178.09961 136.69922 z M 86 224 L 85 227 L 96 242 L 160 242 L 171 227 L 170 224 L 86 224 z " />
 </svg>

diff --git a/gfx/luma/models/items/g_strength_simple.svg b/gfx/luma/models/items/g_strength_simple.svg
new file mode 100644 (file)
index 0000000..9b5c742
--- /dev/null
+++ b/gfx/luma/models/items/g_strength_simple.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">
+  <path class="strength shining" d="m 126.77528,37.901817 c 7.22,-1.52 15.77,12.73 22.61,11.59 7.79,-1.33 8.36,-6.46 14.82,-7.41 l 20.33,-2.66 c 4.56,-0.57 15.96,16.34 20.9,44.080007 l 15.2,86.830006 c 0.76,4.37 -37.62,11.59 -38.38,7.79 l -18.05,-84.740006 -11.02,2.47 19.95,85.880006 c 1.14,4.75 -43.7,13.87 -44.65,9.88 l -19.57,-85.31 -10.639998,2.66 20.329998,83.79 c 0.76,3.42 -35.149998,10.64 -35.909998,7.6 l -19.949994,-81.89 -10.64,2.66 19,67.83 c 0.76,2.85 -25.46,9.12 -26.6,5.7 l -25.08,-66.12 c -6.84,-17.86 -6.08,-34.010006 -2.28,-36.480006 l 12.73,-8.36 c 5.7,-3.8 9.31,0.38 15.39,-2.09 6.65,-2.85 7.03,-17.670007 15.58,-20.330007 l 15.389994,-4.56 c 5.7,-1.71 9.12,3.23 16.15,1.14 6.84,-1.9 7.41,-14.25 14.819998,-15.96 z m 114.95,80.560013 -2.66,78.85 c -0.19,3.23 -10.64,14.25 -14.82,14.63 l -73.53,6.27 c -5.51,-1.52 -3.04,-12.54 -0.19,-18.24 l 62.51,-15.58 c 13.68,-3.42 18.24,-10.45 17.67,-14.44 l -11.59,-66.31 z"/>
+</svg>

diff --git a/gfx/luma/models/items/powerup_invisibility_luma b/gfx/luma/models/items/powerup_invisibility_luma
deleted file mode 100644 (file)
index 553baf4..0000000
--- a/gfx/luma/models/items/powerup_invisibility_luma
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet href="common.css" type="text/css"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">
-       <path class="invisibility shining" d="m 114,16 -23,40 4,9 -54,93.5 -10,1.5 -23,40 14,24 46,0 6,-8 108,0 6,8 46,0 14,-24 -23,-40 -10,-1.5 -54,-93.5 4,-9 -23,-40 -28,0 z m -34,53 -18.5,2 -32,55.5 7.5,17 3,0.5 L 82,71.5 80,69 z m 96,0 -2,2.5 42,72.5 3,-0.5 7.5,-17 L 194.5,71 176,69 z m -90,155 -1,3 11,15 64,0 11,-15 -1,-3 -84,0 z"/>
-       <path class="invisibility darkened" d="m 68,149 c 6.6,12.3 16.1,21.4 27.3,27.3 l -7,7 7.2,7.3 73.9,-73.9 -7.2,-7.3 -9.4,9.4 c -8.4,-3.3 -17.2,-4.9 -25.95,-4.85 C 103.4,114.1 80.3,126 68,149 Z m 60,-29.3 c 6.7,0 12.9,2.2 17.8,6 l -41.2,41.2 c -3.8,-4.9 -6,-11.1 -6,-17.8 0,-16.2 13.1,-29.4 29.4,-29.4 z m 28.9,24 c 0.3,1.7 0.4,3.5 0.4,5.4 0,16.2 -13.1,29.4 -29.4,29.4 -1.9,0 -3.6,-0.2 -5.4,-0.5 l -5.5,5.5 c 3.2,0.4 6.4,0.8 9.7,0.8 23.5,0.2 47.3,-11.4 61.1,-35.1 -4.6,-7.9 -10.3,-14.5 -16.7,-19.75 z"/>
-</svg>

diff --git a/gfx/luma/models/items/powerup_invisibility_luma.svg b/gfx/luma/models/items/powerup_invisibility_luma.svg
new file mode 100644 (file)
index 0000000..edfecdf
--- /dev/null
+++ b/gfx/luma/models/items/powerup_invisibility_luma.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">
+       <path class="invisibility shining" d="M 114 16 L 91 56 L 95 65 L 41 158.5 L 31 160 L 8 200 L 22 224 L 68 224 L 74 216 L 182 216 L 188 224 L 234 224 L 248 200 L 225 160 L 215 158.5 L 161 65 L 165 56 L 142 16 L 114 16 z M 80 69 L 61.5 71 L 29.5 126.5 L 37 143.5 L 40 144 L 82 71.5 L 80 69 z M 176 69 L 174 71.5 L 216 144 L 219 143.5 L 226.5 126.5 L 194.5 71 L 176 69 z M 162.19922 109.40039 L 169.40039 116.69922 L 95.5 190.59961 L 88.300781 183.30078 L 95.300781 176.30078 C 84.100781 170.40078 74.6 161.3 68 149 C 80.3 126 103.39961 114.09922 126.84961 113.94922 C 135.59961 113.89922 144.40078 115.50078 152.80078 118.80078 L 162.19922 109.40039 z M 128 119.69922 C 111.7 119.69922 98.599609 132.89961 98.599609 149.09961 C 98.599609 155.79961 100.79961 162.00039 104.59961 166.90039 L 145.80078 125.69922 C 140.90078 121.89922 134.7 119.69922 128 119.69922 z M 171.09961 129.44922 C 177.49961 134.69922 183.20078 141.29922 187.80078 149.19922 C 174.00078 172.89922 150.19922 184.50078 126.69922 184.30078 C 123.39922 184.30078 120.2 183.9 117 183.5 L 122.5 178 C 124.3 178.3 126.00039 178.5 127.90039 178.5 C 144.20039 178.5 157.30078 165.29961 157.30078 149.09961 C 157.30078 147.19961 157.20039 145.39922 156.90039 143.69922 L 171.09961 129.44922 z M 86 224 L 85 227 L 96 242 L 160 242 L 171 227 L 170 224 L 86 224 z " />
+</svg>

diff --git a/gfx/luma/models/items/powerup_invisibility_simple.svg b/gfx/luma/models/items/powerup_invisibility_simple.svg
new file mode 100644 (file)
index 0000000..eacd241
--- /dev/null
+++ b/gfx/luma/models/items/powerup_invisibility_simple.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">
+       <path class="invisibility shining" d="m 14.19,126.1 c 12.54,23.37 30.59,40.66 51.87,51.87 l -13.3,13.3 13.68,13.87 L 206.85,64.73 193.17,50.86 175.31,68.72 C 159.35,62.45 142.63,59.41 126.005,59.505 81.45,59.79 37.56,82.4 14.19,126.1 Z m 114,-55.67 c 12.73,0 24.51,4.18 33.82,11.4 l -78.28,78.28 c -7.22,-9.31 -11.4,-21.09 -11.4,-33.82 0,-30.78 24.89,-55.86 55.86,-55.86 z m 54.91,45.6 c 0.57,3.23 0.76,6.65 0.76,10.26 0,30.78 -24.89,55.86 -55.86,55.86 -3.61,0 -6.84,-0.38 -10.26,-0.95 l -10.45,10.45 c 6.08,0.76 12.16,1.52 18.43,1.52 44.65,0.38 89.87,-21.66 116.09,-66.69 -8.74,-15.01 -19.57,-27.55 -31.73,-37.525 z"/>
+</svg>

diff --git a/gfx/luma/models/items/powerup_speed_luma b/gfx/luma/models/items/powerup_speed_luma
deleted file mode 100644 (file)
index ae01edf..0000000
--- a/gfx/luma/models/items/powerup_speed_luma
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet href="common.css" type="text/css"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">
-       <path class="speed shining" d="m 114,16 -23,40 4,9 -54,93.5 -10,1.5 -23,40 14,24 46,0 6,-8 108,0 6,8 46,0 14,-24 -23,-40 -10,-1.5 -54,-93.5 4,-9 -23,-40 -28,0 z m -34,53 -18.5,2 -32,55.5 7.5,17 3,0.5 L 82,71.5 80,69 z m 96,0 -2,2.5 42,72.5 3,-0.5 7.5,-17 L 194.5,71 176,69 z m -90,155 -1,3 11,15 64,0 11,-15 -1,-3 -84,0 z"/>
-       <path class="speed darkened" d="m 111.4,89.4 43,3.7 -28.6,64.8 -4.3,-19.3 -53,55 -1.9,-1.8 0,-20.1 47.6,-69.5 z m 33.8,54.9 35.6,16 -18.9,1.5 -16.7,-13.8 z m 42,18.2 0,14.7 -113,17.1 24.1,-25.1 z"/>
-</svg>

diff --git a/gfx/luma/models/items/powerup_speed_luma.svg b/gfx/luma/models/items/powerup_speed_luma.svg
new file mode 100644 (file)
index 0000000..00f0ae4
--- /dev/null
+++ b/gfx/luma/models/items/powerup_speed_luma.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">
+       <path class="speed shining" d="M 114 16 L 91 56 L 95 65 L 41 158.5 L 31 160 L 8 200 L 22 224 L 68 224 L 74 216 L 182 216 L 188 224 L 234 224 L 248 200 L 225 160 L 215 158.5 L 161 65 L 165 56 L 142 16 L 114 16 z M 80 69 L 61.5 71 L 29.5 126.5 L 37 143.5 L 40 144 L 82 71.5 L 80 69 z M 176 69 L 174 71.5 L 216 144 L 219 143.5 L 226.5 126.5 L 194.5 71 L 176 69 z M 111.40039 89.400391 L 154.40039 93.099609 L 125.80078 157.90039 L 121.5 138.59961 L 68.5 193.59961 L 66.599609 191.80078 L 66.599609 171.69922 L 114.19922 102.19922 L 111.40039 89.400391 z M 145.19922 144.30078 L 180.80078 160.30078 L 161.90039 161.80078 L 145.19922 148 L 145.19922 144.30078 z M 187.19922 162.5 L 187.19922 177.19922 L 74.199219 194.30078 L 98.300781 169.19922 L 187.19922 162.5 z M 86 224 L 85 227 L 96 242 L 160 242 L 171 227 L 170 224 L 86 224 z " />
+</svg>

diff --git a/gfx/luma/models/items/powerup_speed_simple.svg b/gfx/luma/models/items/powerup_speed_simple.svg
new file mode 100644 (file)
index 0000000..6d52f67
--- /dev/null
+++ b/gfx/luma/models/items/powerup_speed_simple.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">
+       <path class="speed shining" d="m 98.55,28.345 81.7,7.03 -54.34,123.12 -8.17,-36.67 -100.7,104.5 -3.61,-3.42 v -38.19 l 90.44,-132.05 z m 64.22,104.31 67.64,30.4 -35.91,2.85 -31.73,-26.22 z m 79.8,34.58 v 27.93 l -214.7,32.49 45.79,-47.69 z"/>
+</svg>

diff --git a/models/items/old_powerups.zip b/models/items/old_powerups.zip
new file mode 100644 (file)
index 0000000..f52cf43
Binary files /dev/null and b/models/items/old_powerups.zip differ

diff --git a/models/relics/When_exported_to_MD3.txt b/models/relics/When_exported_to_MD3.txt
new file mode 100644 (file)
index 0000000..81bb4e5
--- /dev/null
+++ b/models/relics/When_exported_to_MD3.txt
@@ -0,0 +1,4 @@
+The Bounding Box mesh is only used to determine the scale and height of the model, be careful to surpass the box, sometimes the results are ugly. (This object is restricted, cannot be selected in the viewport, used to avoid exportation phase).
+When the model is exported to MD3, you would need to modify the groups, ring[1-6](all rings) should be renamed to "ring" (without numbers), the skin files need to detect this group name.
+
+Also, possibly, you would need to modify the materials to make it work, rename the following ones: relic_ring.tga, ring.tga
\ No newline at end of file

diff --git a/models/relics/relic_powerup.blend b/models/relics/relic_powerup.blend
new file mode 100644 (file)
index 0000000..8dd792f
Binary files /dev/null and b/models/relics/relic_powerup.blend differ