make jumppad/launchpad use trak5x textures, fix the shaders

diff --git a/models/xonotic_jumppad01/xonotic_jumppad01.md3_0.skin b/models/xonotic_jumppad01/xonotic_jumppad01.md3_0.skin
index d4b65404282c834e7410a3912044d340862eb8cd..e5692977d0f9aa51c62892a60176707c740a59b1 100644 (file)
--- a/models/xonotic_jumppad01/xonotic_jumppad01.md3_0.skin
+++ b/models/xonotic_jumppad01/xonotic_jumppad01.md3_0.skin
@@ -1,6 +1,6 @@
 flame,textures/xonotic_jumppad01/jumpglow_red
 energy,textures/xonotic_jumppad01/energy_red_anim
-1,textures/trak5/grate1a.tga
-2,textures/trak5/wall1a.tga
-3,textures/trak5/pipez1a.tga
-4,textures/trak5/ceil1a.tga
\ No newline at end of file
+1,textures/trak5x/panel-grate1a
+2,textures/trak5x/wall-wall1a
+3,textures/trak5x/base-pipe1a
+4,textures/trak5x/panel-ceil1a

diff --git a/models/xonotic_jumppad01/xonotic_jumppad01.md3_1.skin b/models/xonotic_jumppad01/xonotic_jumppad01.md3_1.skin
index af40c324eb72163f94621517c1e106653fa8da28..b3cf0955f0a9eb49454d7b308b28385cf7915d11 100644 (file)
--- a/models/xonotic_jumppad01/xonotic_jumppad01.md3_1.skin
+++ b/models/xonotic_jumppad01/xonotic_jumppad01.md3_1.skin
@@ -1,6 +1,6 @@
 flame,textures/xonotic_jumppad01/jumpglow_blue
 energy,textures/xonotic_jumppad01/energy_blue_anim
-1,textures/trak5/grate1a.tga
-2,textures/trak5/wall1a.tga
-3,textures/trak5/pipez1a.tga
-4,textures/trak5/ceil1a.tga
\ No newline at end of file
+1,textures/trak5x/panel-grate1a
+2,textures/trak5x/wall-wall1a
+3,textures/trak5x/base-pipe1a
+4,textures/trak5x/panel-ceil1a

diff --git a/models/xonotic_jumppad01/xonotic_launchpad01.md3_0.skin b/models/xonotic_jumppad01/xonotic_launchpad01.md3_0.skin
index d4b65404282c834e7410a3912044d340862eb8cd..e5692977d0f9aa51c62892a60176707c740a59b1 100644 (file)
--- a/models/xonotic_jumppad01/xonotic_launchpad01.md3_0.skin
+++ b/models/xonotic_jumppad01/xonotic_launchpad01.md3_0.skin
@@ -1,6 +1,6 @@
 flame,textures/xonotic_jumppad01/jumpglow_red
 energy,textures/xonotic_jumppad01/energy_red_anim
-1,textures/trak5/grate1a.tga
-2,textures/trak5/wall1a.tga
-3,textures/trak5/pipez1a.tga
-4,textures/trak5/ceil1a.tga
\ No newline at end of file
+1,textures/trak5x/panel-grate1a
+2,textures/trak5x/wall-wall1a
+3,textures/trak5x/base-pipe1a
+4,textures/trak5x/panel-ceil1a

diff --git a/models/xonotic_jumppad01/xonotic_launchpad01.md3_1.skin b/models/xonotic_jumppad01/xonotic_launchpad01.md3_1.skin
index af40c324eb72163f94621517c1e106653fa8da28..b3cf0955f0a9eb49454d7b308b28385cf7915d11 100644 (file)
--- a/models/xonotic_jumppad01/xonotic_launchpad01.md3_1.skin
+++ b/models/xonotic_jumppad01/xonotic_launchpad01.md3_1.skin
@@ -1,6 +1,6 @@
 flame,textures/xonotic_jumppad01/jumpglow_blue
 energy,textures/xonotic_jumppad01/energy_blue_anim
-1,textures/trak5/grate1a.tga
-2,textures/trak5/wall1a.tga
-3,textures/trak5/pipez1a.tga
-4,textures/trak5/ceil1a.tga
\ No newline at end of file
+1,textures/trak5x/panel-grate1a
+2,textures/trak5x/wall-wall1a
+3,textures/trak5x/base-pipe1a
+4,textures/trak5x/panel-ceil1a

diff --git a/scripts/xonotic_jumppad01.shader b/scripts/xonotic_jumppad01.shader
index 62e933f410bba80d4b8247f5d5779a7627085a45..d0c16452c0e29c54df31b1f6fb45b69c6c3d39cb 100644 (file)
--- a/scripts/xonotic_jumppad01.shader
+++ b/scripts/xonotic_jumppad01.shader
@@ -1,9 +1,9 @@
 textures/xonotic_jumppad01/jumpglow_orange\r
 {\r
-       qer_editorimage models/mapobjects/xonotic_jumppad01/jumpglow_o.tga\r
+       qer_editorimage models/xonotic_jumppad01/jumpglow_o.tga\r
        cull none\r
  {\r
-       map models/mapobjects/xonotic_jumppad01/jumpglow_o.tga\r
+       map models/xonotic_jumppad01/jumpglow_o.tga\r
        blendfunc add\r
        tcmod page 3 1 0.02\r
  }\r
@@ -11,10 +11,10 @@ textures/xonotic_jumppad01/jumpglow_orange
 \r
 textures/xonotic_jumppad01/jumpglow_red\r
 {\r
-       qer_editorimage models/mapobjects/xonotic_jumppad01/jumpglow_r.tga\r
+       qer_editorimage models/xonotic_jumppad01/jumpglow_r.tga\r
        cull none\r
  {\r
-       map models/mapobjects/xonotic_jumppad01/jumpglow_r.tga\r
+       map models/xonotic_jumppad01/jumpglow_r.tga\r
        blendfunc add\r
        tcmod page 3 1 0.02\r
  }\r
@@ -24,7 +24,7 @@ textures/xonotic_jumppad01/jumpglow_green
 {\r
        cull none\r
  {\r
-       map models/mapobjects/xonotic_jumppad01/jumpglow_g.tga\r
+       map models/xonotic_jumppad01/jumpglow_g.tga\r
        blendfunc add\r
        tcmod page 3 1 0.02\r
  }\r
@@ -34,7 +34,7 @@ textures/xonotic_jumppad01/jumpglow_blue
 {\r
        cull none\r
  {\r
-       map models/mapobjects/xonotic_jumppad01/jumpglow_b.tga\r
+       map models/xonotic_jumppad01/jumpglow_b.tga\r
        blendfunc add\r
        tcmod page 3 1 0.02\r
  }\r
@@ -42,7 +42,7 @@ textures/xonotic_jumppad01/jumpglow_blue
 \r
 textures/xonotic_jumppad01/energy_red_anim\r
 {\r
-       qer_editorimage models/mapobjects/xonotic_jumppad01/energy_red.tga\r
+       qer_editorimage models/xonotic_jumppad01/energy_red.tga\r
        nopicmip\r
        surfaceparm nolightmap\r
 //     surfaceparm nonsolid\r
@@ -56,7 +56,7 @@ textures/xonotic_jumppad01/energy_red_anim
 //     alphaFunc GE128\r
        \r
        {\r
-               map models/mapobjects/xonotic_jumppad01/energy_red.tga\r
+               map models/xonotic_jumppad01/energy_red.tga\r
                tcGen environment\r
 //                tcmod scale .6 .6\r
                blendfunc GL_ONE GL_ONE\r
@@ -67,7 +67,7 @@ textures/xonotic_jumppad01/energy_red_anim
 \r
 textures/xonotic_jumppad01/energy_blue_anim\r
 {\r
-       qer_editorimage models/mapobjects/xonotic_jumppad01/energy_blue.tga\r
+       qer_editorimage models/xonotic_jumppad01/energy_blue.tga\r
        nopicmip\r
        surfaceparm nolightmap\r
 //     surfaceparm nonsolid\r
@@ -81,11 +81,11 @@ textures/xonotic_jumppad01/energy_blue_anim
 //     alphaFunc GE128\r
        \r
        {\r
-               map models/mapobjects/xonotic_jumppad01/energy_blue.tga\r
+               map models/xonotic_jumppad01/energy_blue.tga\r
                tcGen environment\r
 //                tcmod scale .6 .6\r
                blendfunc GL_ONE GL_ONE\r
                tcMod turb 0 0.25 0 0.5\r
                tcMod scroll -.5 -.3\r
        }\r
-}
\ No newline at end of file
+}\r