From 6da1f70ade33a70cbaaa128f05a5b477711d5025 Mon Sep 17 00:00:00 2001 From: Mirio Date: Thu, 27 Aug 2015 17:20:30 +0200 Subject: [PATCH] Shaders work now plz --- maps/erbium.map.options | 2 +- models/map_erbium/bub.ase | 4 ++-- models/map_erbium/circle-edge.ase | 8 ++++---- models/map_erbium/circle.ase | 4 ++-- models/map_erbium/circle2.ase | 4 ++-- models/map_erbium/engine.ase | 4 ++-- models/map_erbium/fern.ase | 6 +++--- models/map_erbium/gear-full.ase | 4 ++-- models/map_erbium/gear.ase | 4 ++-- models/map_erbium/ivy-down.ase | 2 +- models/map_erbium/large-turbine.ase | 4 ++-- models/map_erbium/leaves-ceiling.ase | 2 +- models/map_erbium/leaves-ledge.ase | 2 +- models/map_erbium/mechanizm-1.ase | 4 ++-- models/map_erbium/pickup.ase | 4 ++-- models/map_erbium/plant1.ase | 6 +++--- models/map_erbium/tree1.ase | 14 +++++++------- models/map_erbium/wall-plant.ase | 6 +++--- models/map_erbium/waterfall.ase | 2 +- 19 files changed, 43 insertions(+), 43 deletions(-) diff --git a/maps/erbium.map.options b/maps/erbium.map.options index bd43224e..5f35806a 100644 --- a/maps/erbium.map.options +++ b/maps/erbium.map.options @@ -2,4 +2,4 @@ -light + -bounce 8 -dirtscale 2 -vis + -minimap + -Version: 1g \ No newline at end of file +Version: 1h \ No newline at end of file diff --git a/models/map_erbium/bub.ase b/models/map_erbium/bub.ase index 30910ad1..aa9d5c55 100644 --- a/models/map_erbium/bub.ase +++ b/models/map_erbium/bub.ase @@ -12,7 +12,7 @@ *MATERIAL_LIST { *MATERIAL_COUNT 1 *MATERIAL 0 { - *MATERIAL_NAME "textures/map_evolution/engine" + *MATERIAL_NAME "textures/map_erbium/engine" *MATERIAL_CLASS "Standard" *MATERIAL_AMBIENT 0.5880 0.5880 0.5880 *MATERIAL_DIFFUSE 0.5880 0.5880 0.5880 @@ -31,7 +31,7 @@ *MAP_CLASS "Bitmap" *MAP_SUBNO 1 *MAP_AMOUNT 1.0000 - *BITMAP "textures/map_evolution/engine.tga" + *BITMAP "textures/map_erbium/engine.jpg" *MAP_TYPE Screen *UVW_U_OFFSET 0.0000 *UVW_V_OFFSET 0.0000 diff --git a/models/map_erbium/circle-edge.ase b/models/map_erbium/circle-edge.ase index 30fe04c4..ee618f04 100644 --- a/models/map_erbium/circle-edge.ase +++ b/models/map_erbium/circle-edge.ase @@ -23,7 +23,7 @@ *MATERIAL_WIRESIZE 1.0000 *NUMSUBMTLS 2 *SUBMATERIAL 0 { - *MATERIAL_NAME "textures/map_evolution/large-turbine" + *MATERIAL_NAME "textures/map_erbium/large-turbine" *MATERIAL_CLASS "Standard" *MATERIAL_AMBIENT 0.5880 0.5880 0.5880 *MATERIAL_DIFFUSE 0.5880 0.5880 0.5880 @@ -42,7 +42,7 @@ *MAP_CLASS "Bitmap" *MAP_SUBNO 1 *MAP_AMOUNT 1.0000 - *BITMAP "textures/map_evolution/large-turbine.tga" + *BITMAP "textures/map_erbium/large-turbine.jpg" *MAP_TYPE Screen *UVW_U_OFFSET 0.0000 *UVW_V_OFFSET 0.0000 @@ -59,7 +59,7 @@ } } *SUBMATERIAL 1 { - *MATERIAL_NAME "textures/map_evolution/engine" + *MATERIAL_NAME "textures/map_erbium/engine" *MATERIAL_CLASS "Standard" *MATERIAL_AMBIENT 0.5880 0.5880 0.5880 *MATERIAL_DIFFUSE 0.5880 0.5880 0.5880 @@ -78,7 +78,7 @@ *MAP_CLASS "Bitmap" *MAP_SUBNO 1 *MAP_AMOUNT 1.0000 - *BITMAP "textures/map_evolution/engine.tga" + *BITMAP "textures/map_erbium/engine.jpg" *MAP_TYPE Screen *UVW_U_OFFSET 0.0000 *UVW_V_OFFSET 0.0000 diff --git a/models/map_erbium/circle.ase b/models/map_erbium/circle.ase index 1bd74ed7..99d552f9 100644 --- a/models/map_erbium/circle.ase +++ b/models/map_erbium/circle.ase @@ -12,7 +12,7 @@ *MATERIAL_LIST { *MATERIAL_COUNT 1 *MATERIAL 0 { - *MATERIAL_NAME "textures/map_evolution/circle" + *MATERIAL_NAME "textures/map_erbium/circle" *MATERIAL_CLASS "Standard" *MATERIAL_AMBIENT 0.5880 0.5880 0.5880 *MATERIAL_DIFFUSE 0.5880 0.5880 0.5880 @@ -31,7 +31,7 @@ *MAP_CLASS "Bitmap" *MAP_SUBNO 1 *MAP_AMOUNT 1.0000 - *BITMAP "textures/map_evolution/circle.tga" + *BITMAP "textures/map_erbium/circle.jpg" *MAP_TYPE Screen *UVW_U_OFFSET 0.0000 *UVW_V_OFFSET 0.0000 diff --git a/models/map_erbium/circle2.ase b/models/map_erbium/circle2.ase index 6636c0a3..717872eb 100644 --- a/models/map_erbium/circle2.ase +++ b/models/map_erbium/circle2.ase @@ -12,7 +12,7 @@ *MATERIAL_LIST { *MATERIAL_COUNT 1 *MATERIAL 0 { - *MATERIAL_NAME "textures/map_evolution/large-turbine" + *MATERIAL_NAME "textures/map_erbium/large-turbine" *MATERIAL_CLASS "Standard" *MATERIAL_AMBIENT 0.5880 0.5880 0.5880 *MATERIAL_DIFFUSE 0.5880 0.5880 0.5880 @@ -31,7 +31,7 @@ *MAP_CLASS "Bitmap" *MAP_SUBNO 1 *MAP_AMOUNT 1.0000 - *BITMAP "textures/map_evolution/large-turbine.tga" + *BITMAP "textures/map_erbium/large-turbine.jpg" *MAP_TYPE Screen *UVW_U_OFFSET 0.0000 *UVW_V_OFFSET 0.0000 diff --git a/models/map_erbium/engine.ase b/models/map_erbium/engine.ase index 131da213..efaa194d 100644 --- a/models/map_erbium/engine.ase +++ b/models/map_erbium/engine.ase @@ -12,7 +12,7 @@ *MATERIAL_LIST { *MATERIAL_COUNT 1 *MATERIAL 0 { - *MATERIAL_NAME "textures/map_evolution/engine" + *MATERIAL_NAME "textures/map_erbium/engine" *MATERIAL_CLASS "Standard" *MATERIAL_AMBIENT 0.5880 0.5880 0.5880 *MATERIAL_DIFFUSE 0.5880 0.5880 0.5880 @@ -31,7 +31,7 @@ *MAP_CLASS "Bitmap" *MAP_SUBNO 1 *MAP_AMOUNT 1.0000 - *BITMAP "textures/map_evolution/engine.tga" + *BITMAP "textures/map_erbium/engine.jpg" *MAP_TYPE Screen *UVW_U_OFFSET 0.0000 *UVW_V_OFFSET 0.0000 diff --git a/models/map_erbium/fern.ase b/models/map_erbium/fern.ase index 917df041..637baff5 100644 --- a/models/map_erbium/fern.ase +++ b/models/map_erbium/fern.ase @@ -12,7 +12,7 @@ *MATERIAL_LIST { *MATERIAL_COUNT 1 *MATERIAL 0 { - *MATERIAL_NAME "textures/map_evolution/fern" + *MATERIAL_NAME "textures/map_erbium/fern" *MATERIAL_CLASS "Standard" *MATERIAL_AMBIENT 0.5880 0.5880 0.5880 *MATERIAL_DIFFUSE 0.5880 0.5880 0.5880 @@ -32,7 +32,7 @@ *MAP_CLASS "Bitmap" *MAP_SUBNO 1 *MAP_AMOUNT 1.0000 - *BITMAP "textures/map_evolution/fern.tga" + *BITMAP "textures/map_erbium/fern.jpg" *MAP_TYPE Screen *UVW_U_OFFSET 0.0000 *UVW_V_OFFSET 0.0000 @@ -52,7 +52,7 @@ *MAP_CLASS "Bitmap" *MAP_SUBNO 6 *MAP_AMOUNT 1.0000 - *BITMAP "textures/map_evolution/fern.tga" + *BITMAP "textures/map_erbium/fern.jpg" *MAP_TYPE Screen *UVW_U_OFFSET 0.0000 *UVW_V_OFFSET 0.0000 diff --git a/models/map_erbium/gear-full.ase b/models/map_erbium/gear-full.ase index de7a897d..c2f9405c 100644 --- a/models/map_erbium/gear-full.ase +++ b/models/map_erbium/gear-full.ase @@ -12,7 +12,7 @@ *MATERIAL_LIST { *MATERIAL_COUNT 1 *MATERIAL 0 { - *MATERIAL_NAME "textures/map_evolution/gears" + *MATERIAL_NAME "textures/map_erbium/gears" *MATERIAL_CLASS "Standard" *MATERIAL_AMBIENT 0.5880 0.5880 0.5880 *MATERIAL_DIFFUSE 0.5880 0.5880 0.5880 @@ -31,7 +31,7 @@ *MAP_CLASS "Bitmap" *MAP_SUBNO 1 *MAP_AMOUNT 1.0000 - *BITMAP "textures/map_evolution/gears.tga" + *BITMAP "textures/map_erbium/gears.jpg" *MAP_TYPE Screen *UVW_U_OFFSET 0.0000 *UVW_V_OFFSET 0.0000 diff --git a/models/map_erbium/gear.ase b/models/map_erbium/gear.ase index 2a2f675d..b2594e74 100644 --- a/models/map_erbium/gear.ase +++ b/models/map_erbium/gear.ase @@ -12,7 +12,7 @@ *MATERIAL_LIST { *MATERIAL_COUNT 1 *MATERIAL 0 { - *MATERIAL_NAME "textures/map_evolution/gears" + *MATERIAL_NAME "textures/map_erbium/gears" *MATERIAL_CLASS "Standard" *MATERIAL_AMBIENT 0.5880 0.5880 0.5880 *MATERIAL_DIFFUSE 0.5880 0.5880 0.5880 @@ -31,7 +31,7 @@ *MAP_CLASS "Bitmap" *MAP_SUBNO 1 *MAP_AMOUNT 1.0000 - *BITMAP "textures/map_evolution/gears.tga" + *BITMAP "textures/map_erbium/gears.jpg" *MAP_TYPE Screen *UVW_U_OFFSET 0.0000 *UVW_V_OFFSET 0.0000 diff --git a/models/map_erbium/ivy-down.ase b/models/map_erbium/ivy-down.ase index 74bc9530..3b8c5af9 100644 --- a/models/map_erbium/ivy-down.ase +++ b/models/map_erbium/ivy-down.ase @@ -12,7 +12,7 @@ *MATERIAL_LIST { *MATERIAL_COUNT 1 *MATERIAL 0 { - *MATERIAL_NAME "textures/map_evolution/ivy" + *MATERIAL_NAME "textures/map_erbium/ivy" *MATERIAL_CLASS "Standard" *MATERIAL_AMBIENT 0.5880 0.5880 0.5880 *MATERIAL_DIFFUSE 0.5880 0.5880 0.5880 diff --git a/models/map_erbium/large-turbine.ase b/models/map_erbium/large-turbine.ase index dea98164..c4ba2a14 100644 --- a/models/map_erbium/large-turbine.ase +++ b/models/map_erbium/large-turbine.ase @@ -12,7 +12,7 @@ *MATERIAL_LIST { *MATERIAL_COUNT 1 *MATERIAL 0 { - *MATERIAL_NAME "textures/map_evolution/large-turbine" + *MATERIAL_NAME "textures/map_erbium/large-turbine" *MATERIAL_CLASS "Standard" *MATERIAL_AMBIENT 0.5880 0.5880 0.5880 *MATERIAL_DIFFUSE 0.5880 0.5880 0.5880 @@ -31,7 +31,7 @@ *MAP_CLASS "Bitmap" *MAP_SUBNO 1 *MAP_AMOUNT 1.0000 - *BITMAP "textures/map_evolution/large-turbine.tga" + *BITMAP "textures/map_erbium/large-turbine.jpg" *MAP_TYPE Screen *UVW_U_OFFSET 0.0000 *UVW_V_OFFSET 0.0000 diff --git a/models/map_erbium/leaves-ceiling.ase b/models/map_erbium/leaves-ceiling.ase index 814c3a42..f7cc8631 100644 --- a/models/map_erbium/leaves-ceiling.ase +++ b/models/map_erbium/leaves-ceiling.ase @@ -12,7 +12,7 @@ *MATERIAL_LIST { *MATERIAL_COUNT 1 *MATERIAL 0 { - *MATERIAL_NAME "textures/map_evolution/leaves" + *MATERIAL_NAME "textures/map_erbium/leaves" *MATERIAL_CLASS "Standard" *MATERIAL_AMBIENT 0.5880 0.5880 0.5880 *MATERIAL_DIFFUSE 0.5880 0.5880 0.5880 diff --git a/models/map_erbium/leaves-ledge.ase b/models/map_erbium/leaves-ledge.ase index 05be1af5..85f08c9b 100644 --- a/models/map_erbium/leaves-ledge.ase +++ b/models/map_erbium/leaves-ledge.ase @@ -12,7 +12,7 @@ *MATERIAL_LIST { *MATERIAL_COUNT 1 *MATERIAL 0 { - *MATERIAL_NAME "textures/map_evolution/leaves" + *MATERIAL_NAME "textures/map_erbium/leaves" *MATERIAL_CLASS "Standard" *MATERIAL_AMBIENT 0.5880 0.5880 0.5880 *MATERIAL_DIFFUSE 0.5880 0.5880 0.5880 diff --git a/models/map_erbium/mechanizm-1.ase b/models/map_erbium/mechanizm-1.ase index 963e71cf..d44ec53c 100644 --- a/models/map_erbium/mechanizm-1.ase +++ b/models/map_erbium/mechanizm-1.ase @@ -12,7 +12,7 @@ *MATERIAL_LIST { *MATERIAL_COUNT 1 *MATERIAL 0 { - *MATERIAL_NAME "textures/map_evolution/large-turbine" + *MATERIAL_NAME "textures/map_erbium/large-turbine" *MATERIAL_CLASS "Standard" *MATERIAL_AMBIENT 0.5880 0.5880 0.5880 *MATERIAL_DIFFUSE 0.5880 0.5880 0.5880 @@ -31,7 +31,7 @@ *MAP_CLASS "Bitmap" *MAP_SUBNO 1 *MAP_AMOUNT 1.0000 - *BITMAP "textures/map_evolution/large-turbine.tga" + *BITMAP "textures/map_erbium/large-turbine.jpg" *MAP_TYPE Screen *UVW_U_OFFSET 0.0000 *UVW_V_OFFSET 0.0000 diff --git a/models/map_erbium/pickup.ase b/models/map_erbium/pickup.ase index cc8f53a9..b708525b 100644 --- a/models/map_erbium/pickup.ase +++ b/models/map_erbium/pickup.ase @@ -12,7 +12,7 @@ *MATERIAL_LIST { *MATERIAL_COUNT 1 *MATERIAL 0 { - *MATERIAL_NAME "textures/map_evolution/pickup" + *MATERIAL_NAME "textures/map_erbium/pickup" *MATERIAL_CLASS "Standard" *MATERIAL_AMBIENT 0.5880 0.5880 0.5880 *MATERIAL_DIFFUSE 0.5880 0.5880 0.5880 @@ -31,7 +31,7 @@ *MAP_CLASS "Bitmap" *MAP_SUBNO 1 *MAP_AMOUNT 1.0000 - *BITMAP "textures/map_evolution/pickup.tga" + *BITMAP "textures/map_erbium/pickup.jpg" *MAP_TYPE Screen *UVW_U_OFFSET 0.0000 *UVW_V_OFFSET 0.0000 diff --git a/models/map_erbium/plant1.ase b/models/map_erbium/plant1.ase index 7889f2a8..37bc58e6 100644 --- a/models/map_erbium/plant1.ase +++ b/models/map_erbium/plant1.ase @@ -12,7 +12,7 @@ *MATERIAL_LIST { *MATERIAL_COUNT 1 *MATERIAL 0 { - *MATERIAL_NAME "textures/map_evolution/leaves2" + *MATERIAL_NAME "textures/map_erbium/leaves2" *MATERIAL_CLASS "Standard" *MATERIAL_AMBIENT 0.5882 0.5882 0.5882 *MATERIAL_DIFFUSE 0.5882 0.5882 0.5882 @@ -32,7 +32,7 @@ *MAP_CLASS "Bitmap" *MAP_SUBNO 1 *MAP_AMOUNT 1.0000 - *BITMAP "textures/map_evolution/leaves2" + *BITMAP "textures/map_erbium/leaves2" *MAP_TYPE Screen *UVW_U_OFFSET 0.0000 *UVW_V_OFFSET 0.0000 @@ -52,7 +52,7 @@ *MAP_CLASS "Bitmap" *MAP_SUBNO 6 *MAP_AMOUNT 1.0000 - *BITMAP "textures/map_evolution/leaves2" + *BITMAP "textures/map_erbium/leaves2" *MAP_TYPE Screen *UVW_U_OFFSET 0.0000 *UVW_V_OFFSET 0.0000 diff --git a/models/map_erbium/tree1.ase b/models/map_erbium/tree1.ase index 5d8ad597..7b43b14e 100644 --- a/models/map_erbium/tree1.ase +++ b/models/map_erbium/tree1.ase @@ -12,7 +12,7 @@ *MATERIAL_LIST { *MATERIAL_COUNT 3 *MATERIAL 0 { - *MATERIAL_NAME "textures/map_evolution/tree-bark" + *MATERIAL_NAME "textures/map_erbium/tree-bark" *MATERIAL_CLASS "Standard" *MATERIAL_AMBIENT 0.5880 0.5880 0.5880 *MATERIAL_DIFFUSE 0.5880 0.5880 0.5880 @@ -31,7 +31,7 @@ *MAP_CLASS "Bitmap" *MAP_SUBNO 1 *MAP_AMOUNT 1.0000 - *BITMAP "textures/map_evolution/tree-bark" + *BITMAP "textures/map_erbium/tree-bark" *MAP_TYPE Screen *UVW_U_OFFSET 0.0000 *UVW_V_OFFSET 0.0000 @@ -59,7 +59,7 @@ *MATERIAL_WIRESIZE 1.0000 *NUMSUBMTLS 2 *SUBMATERIAL 0 { - *MATERIAL_NAME "textures/map_evolution/tree-bark" + *MATERIAL_NAME "textures/map_erbium/tree-bark" *MATERIAL_CLASS "Standard" *MATERIAL_AMBIENT 0.5880 0.5880 0.5880 *MATERIAL_DIFFUSE 0.5880 0.5880 0.5880 @@ -78,7 +78,7 @@ *MAP_CLASS "Bitmap" *MAP_SUBNO 1 *MAP_AMOUNT 1.0000 - *BITMAP "textures/map_evolution/tree-bark.tga" + *BITMAP "textures/map_erbium/tree-bark.jpg" *MAP_TYPE Screen *UVW_U_OFFSET 0.0000 *UVW_V_OFFSET 0.0000 @@ -95,7 +95,7 @@ } } *SUBMATERIAL 1 { - *MATERIAL_NAME "textures/map_evolution/branches" + *MATERIAL_NAME "textures/map_erbium/branches" *MATERIAL_CLASS "Standard" *MATERIAL_AMBIENT 0.5880 0.5880 0.5880 *MATERIAL_DIFFUSE 0.5880 0.5880 0.5880 @@ -114,7 +114,7 @@ *MAP_CLASS "Bitmap" *MAP_SUBNO 1 *MAP_AMOUNT 1.0000 - *BITMAP "textures/map_evolution/branches.tga" + *BITMAP "textures/map_erbium/branches.jpg" *MAP_TYPE Screen *UVW_U_OFFSET 0.0000 *UVW_V_OFFSET 0.0000 @@ -151,7 +151,7 @@ *MAP_CLASS "Bitmap" *MAP_SUBNO 1 *MAP_AMOUNT 1.0000 - *BITMAP "textures/map_evolution/branches.tga" + *BITMAP "textures/map_erbium/branches.jpg" *MAP_TYPE Screen *UVW_U_OFFSET 0.0000 *UVW_V_OFFSET 0.0000 diff --git a/models/map_erbium/wall-plant.ase b/models/map_erbium/wall-plant.ase index fe006b30..0dcff835 100644 --- a/models/map_erbium/wall-plant.ase +++ b/models/map_erbium/wall-plant.ase @@ -12,7 +12,7 @@ *MATERIAL_LIST { *MATERIAL_COUNT 1 *MATERIAL 0 { - *MATERIAL_NAME "textures/map_evolution/singular-leaf" + *MATERIAL_NAME "textures/map_erbium/singular-leaf" *MATERIAL_CLASS "Standard" *MATERIAL_AMBIENT 0.5882 0.5882 0.5882 *MATERIAL_DIFFUSE 0.5882 0.5882 0.5882 @@ -32,7 +32,7 @@ *MAP_CLASS "Bitmap" *MAP_SUBNO 1 *MAP_AMOUNT 1.0000 - *BITMAP "textures/map_evolution/singular-leaf" + *BITMAP "textures/map_erbium/singular-leaf" *MAP_TYPE Screen *UVW_U_OFFSET 0.0000 *UVW_V_OFFSET 0.0000 @@ -52,7 +52,7 @@ *MAP_CLASS "Bitmap" *MAP_SUBNO 6 *MAP_AMOUNT 1.0000 - *BITMAP "textures/map_evolution/singular-leaf" + *BITMAP "textures/map_erbium/singular-leaf" *MAP_TYPE Screen *UVW_U_OFFSET 0.0000 *UVW_V_OFFSET 0.0000 diff --git a/models/map_erbium/waterfall.ase b/models/map_erbium/waterfall.ase index 9d64b1bd..a4aebf76 100644 --- a/models/map_erbium/waterfall.ase +++ b/models/map_erbium/waterfall.ase @@ -12,7 +12,7 @@ *MATERIAL_LIST { *MATERIAL_COUNT 1 *MATERIAL 0 { - *MATERIAL_NAME "textures/map_evolution/waterfall" + *MATERIAL_NAME "textures/map_erbium/waterfall" *MATERIAL_CLASS "Standard" *MATERIAL_AMBIENT 0.5880 0.5880 0.5880 *MATERIAL_DIFFUSE 0.5880 0.5880 0.5880 -- 2.39.2