From: cbrutail Date: Fri, 30 Sep 2011 06:40:28 +0000 (+0200) Subject: Added deformVertexes wave function to slime coming out from pipes, so they look... X-Git-Tag: xonotic-v0.6.0~74^2~1^2 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=55bad4d251fc487eed959969484ca4208d9f1881;hp=fd8baced8cb681c2cefefc365b894c9ca4d39561;ds=inline Added deformVertexes wave function to slime coming out from pipes, so they look more realistic. Also, gave Cortez proper credit. --- diff --git a/maps/leave_em_behind.map b/maps/leave_em_behind.map index fa05ee14..c36ebb5d 100644 --- a/maps/leave_em_behind.map +++ b/maps/leave_em_behind.map @@ -1,7 +1,7 @@ { "classname" "worldspawn" -"message" "Leave'em behind by C.Brutail" -"author" "C.Brutail" +"message" "Leave'em behind" +"author" "C.Brutail, Cortez" "_description" "A very small race map." { ( 256 160 64 ) ( 160 -256 64 ) ( 160 256 64 ) exx/floor-clang01 0 0 0 0.25 0.25 0 0 0 @@ -4278,7 +4278,7 @@ exx/wall-metalrib01 ( -924 -64 304 ) ( -912 64 304 ) ( -924 64 304 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 } { -( -392 1064 288 ) ( -1015 1064 288 ) ( -1015 1304 288 ) map_leave_em_behind/biolumi2_yellow 0 0 90 0.25 0.25 0 0 0 +( -392 1064 288 ) ( -1015 1064 288 ) ( -1015 1304 288 ) map_leave_em_behind/biolumi2_yellow_wave 0 0 90 0.25 0.25 0 0 0 ( -392 1304 288 ) ( -1015 1304 192 ) ( -392 1304 192 ) common/caulk 0 128 0 0.25 0.25 0 0 0 ( -392 1064 288 ) ( -392 1304 192 ) ( -392 1064 192 ) common/caulk 0 128 0 0.25 0.25 0 0 0 ( -1015 1064 192 ) ( -392 1064 192 ) ( -392 1304 192 ) common/caulk 0 0 0 0.25 0.25 0 0 0 @@ -4826,7 +4826,7 @@ map_leave_em_behind/biolumi2_green ( 1024 208 16 ) ( 992 688 16 ) ( 992 208 16 ) common/caulk 212 0 180 0.5 0.5 0 0 0 ( 1024 688 48 ) ( 992 688 16 ) ( 1024 688 16 ) common/caulk 212 32 0 -0.5 0.5 0 0 0 ( 1024 688 48 ) ( 1024 688 16 ) ( 1024 208 16 ) common/caulk 190.6666259766 182.857208252 0 -0.4687499702 0.4374999702 0 0 0 -( 1024 208 48 ) ( 992 208 48 ) ( 992 688 48 ) map_leave_em_behind/biolumi2_green 52 0 180 0.125 0.125 0 0 0 +( 1024 208 48 ) ( 992 208 48 ) ( 992 688 48 ) map_leave_em_behind/biolumi2_green_wave 52 0 180 0.125 0.125 0 0 0 } { ( 960 240 288 ) ( 992 208 16 ) ( 960 240 16 ) exx/base-metal01 468 0 0 -0.5 0.5 0 0 0 @@ -5255,7 +5255,7 @@ trak5x/base-pipe1d ( 1696 448 64 ) ( 1696 448 256 ) ( 1696 608 256 ) common/caulk 0 0 0 -0.5 0.5 0 0 0 } { -( -1664 -608 272 ) ( -1696 -608 272 ) ( -1696 -448 272 ) map_leave_em_behind/biolumi2_yellow 384 0 180 0.25 0.25 134217728 0 0 +( -1664 -608 272 ) ( -1696 -608 272 ) ( -1696 -448 272 ) map_leave_em_behind/biolumi2_yellow_wave 384 0 180 0.25 0.25 134217728 0 0 ( -1664 -448 272 ) ( -1696 -448 256 ) ( -1664 -448 256 ) common/caulk 64 32 0 0.5 0.5 134217728 0 0 ( -1664 -608 272 ) ( -1664 -448 256 ) ( -1664 -608 256 ) common/caulk 0 32 0 0.5 0.5 134217728 0 0 ( -1664 -608 256 ) ( -1696 -448 256 ) ( -1696 -608 256 ) common/caulk 64 0 0 0.5 0.5 134217728 0 0 @@ -5265,7 +5265,7 @@ trak5x/base-pipe1d { patchDef2 { -map_leave_em_behind/biolumi2_green +map_leave_em_behind/biolumi2_green_wave ( 9 3 0 0 0 ) ( ( ( 1008 644 112.0001220703 0 0 ) ( 1008 644 80.0001220703 0 -0.200000003 ) ( 1008 644 48.0001220703 0 -0.400000006 ) ) @@ -5301,18 +5301,18 @@ trak5x/base-pipe1d { patchDef2 { -map_leave_em_behind/biolumi2_yellow +map_leave_em_behind/biolumi2_yellow_wave ( 9 3 0 0 0 ) ( -( ( -1680 -608 312.0001220703 0 0 ) ( -1680 -608 288.0001220703 0 -0.25 ) ( -1680 -608 272.0001220703 0 -0.5 ) ) -( ( -1696 -608 312.0001220703 0.25 0 ) ( -1696 -608 288.0001220703 0.25 -0.25 ) ( -1696 -608 272.0001220703 0.25 -0.5 ) ) -( ( -1696 -592 312.0001220703 0.5 0 ) ( -1696 -592 288.0001220703 0.5 -0.25 ) ( -1696 -592 272.0001220703 0.5 -0.5 ) ) -( ( -1696 -576 312.0001220703 0.75 0 ) ( -1696 -576 288.0001220703 0.75 -0.25 ) ( -1696 -576 272.0001220703 0.75 -0.5 ) ) -( ( -1680 -576 312.0001220703 1 0 ) ( -1680 -576 288.0001220703 1 -0.25 ) ( -1680 -576 272.0001220703 1 -0.5 ) ) -( ( -1664 -576 312.0001220703 1.25 0 ) ( -1664 -576 288.0001220703 1.25 -0.25 ) ( -1664 -576 272.0001220703 1.25 -0.5 ) ) -( ( -1664 -592 312.0001220703 1.5 0 ) ( -1664 -592 288.0001220703 1.5 -0.25 ) ( -1664 -592 272.0001220703 1.5 -0.5 ) ) -( ( -1664 -608 312.0001220703 1.75 0 ) ( -1664 -608 288.0001220703 1.75 -0.25 ) ( -1664 -608 272.0001220703 1.75 -0.5 ) ) -( ( -1680 -608 312.0001220703 2 0 ) ( -1680 -608 288.0001220703 2 -0.25 ) ( -1680 -608 272.0001220703 2 -0.5 ) ) +( ( -1680 -604 312.0001220703 0 0 ) ( -1680 -604 288.0001220703 0 -0.25 ) ( -1680 -604 272.0001220703 0 -0.5 ) ) +( ( -1692 -604 312.0001220703 0.25 0 ) ( -1692 -604 288.0001220703 0.25 -0.25 ) ( -1692 -604 272.0001220703 0.25 -0.5 ) ) +( ( -1692 -592 312.0001220703 0.5 0 ) ( -1692 -592 288.0001220703 0.5 -0.25 ) ( -1692 -592 272.0001220703 0.5 -0.5 ) ) +( ( -1692 -580 312.0001220703 0.75 0 ) ( -1692 -580 288.0001220703 0.75 -0.25 ) ( -1692 -580 272.0001220703 0.75 -0.5 ) ) +( ( -1680 -580 312.0001220703 1 0 ) ( -1680 -580 288.0001220703 1 -0.25 ) ( -1680 -580 272.0001220703 1 -0.5 ) ) +( ( -1668 -580 312.0001220703 1.25 0 ) ( -1668 -580 288.0001220703 1.25 -0.25 ) ( -1668 -580 272.0001220703 1.25 -0.5 ) ) +( ( -1668 -592 312.0001220703 1.5 0 ) ( -1668 -592 288.0001220703 1.5 -0.25 ) ( -1668 -592 272.0001220703 1.5 -0.5 ) ) +( ( -1668 -604 312.0001220703 1.75 0 ) ( -1668 -604 288.0001220703 1.75 -0.25 ) ( -1668 -604 272.0001220703 1.75 -0.5 ) ) +( ( -1680 -604 312.0001220703 2 0 ) ( -1680 -604 288.0001220703 2 -0.25 ) ( -1680 -604 272.0001220703 2 -0.5 ) ) ) } } @@ -5337,18 +5337,18 @@ trak5x/base-pipe1a { patchDef2 { -map_leave_em_behind/biolumi2_yellow +map_leave_em_behind/biolumi2_yellow_wave ( 9 3 0 0 0 ) ( -( ( -1680 -480 312.0001220703 0 0 ) ( -1680 -480 288.0001220703 0 -0.25 ) ( -1680 -480 272.0001220703 0 -0.5 ) ) -( ( -1696 -480 312.0001220703 0.25 0 ) ( -1696 -480 288.0001220703 0.25 -0.25 ) ( -1696 -480 272.0001220703 0.25 -0.5 ) ) -( ( -1696 -464 312.0001220703 0.5 0 ) ( -1696 -464 288.0001220703 0.5 -0.25 ) ( -1696 -464 272.0001220703 0.5 -0.5 ) ) -( ( -1696 -448 312.0001220703 0.75 0 ) ( -1696 -448 288.0001220703 0.75 -0.25 ) ( -1696 -448 272.0001220703 0.75 -0.5 ) ) -( ( -1680 -448 312.0001220703 1 0 ) ( -1680 -448 288.0001220703 1 -0.25 ) ( -1680 -448 272.0001220703 1 -0.5 ) ) -( ( -1664 -448 312.0001220703 1.25 0 ) ( -1664 -448 288.0001220703 1.25 -0.25 ) ( -1664 -448 272.0001220703 1.25 -0.5 ) ) -( ( -1664 -464 312.0001220703 1.5 0 ) ( -1664 -464 288.0001220703 1.5 -0.25 ) ( -1664 -464 272.0001220703 1.5 -0.5 ) ) -( ( -1664 -480 312.0001220703 1.75 0 ) ( -1664 -480 288.0001220703 1.75 -0.25 ) ( -1664 -480 272.0001220703 1.75 -0.5 ) ) -( ( -1680 -480 312.0001220703 2 0 ) ( -1680 -480 288.0001220703 2 -0.25 ) ( -1680 -480 272.0001220703 2 -0.5 ) ) +( ( -1680 -476 312.0001220703 0 0 ) ( -1680 -476 288.0001220703 0 -0.25 ) ( -1680 -476 272.0001220703 0 -0.5 ) ) +( ( -1692 -476 312.0001220703 0.25 0 ) ( -1692 -476 288.0001220703 0.25 -0.25 ) ( -1692 -476 272.0001220703 0.25 -0.5 ) ) +( ( -1692 -464 312.0001220703 0.5 0 ) ( -1692 -464 288.0001220703 0.5 -0.25 ) ( -1692 -464 272.0001220703 0.5 -0.5 ) ) +( ( -1692 -452 312.0001220703 0.75 0 ) ( -1692 -452 288.0001220703 0.75 -0.25 ) ( -1692 -452 272.0001220703 0.75 -0.5 ) ) +( ( -1680 -452 312.0001220703 1 0 ) ( -1680 -452 288.0001220703 1 -0.25 ) ( -1680 -452 272.0001220703 1 -0.5 ) ) +( ( -1668 -452 312.0001220703 1.25 0 ) ( -1668 -452 288.0001220703 1.25 -0.25 ) ( -1668 -452 272.0001220703 1.25 -0.5 ) ) +( ( -1668 -464 312.0001220703 1.5 0 ) ( -1668 -464 288.0001220703 1.5 -0.25 ) ( -1668 -464 272.0001220703 1.5 -0.5 ) ) +( ( -1668 -476 312.0001220703 1.75 0 ) ( -1668 -476 288.0001220703 1.75 -0.25 ) ( -1668 -476 272.0001220703 1.75 -0.5 ) ) +( ( -1680 -476 312.0001220703 2 0 ) ( -1680 -476 288.0001220703 2 -0.25 ) ( -1680 -476 272.0001220703 2 -0.5 ) ) ) } } @@ -5577,7 +5577,7 @@ trak5x/base-pipe1a ( 1728 448 320 ) ( 1728 608 288 ) ( 1728 448 288 ) common/caulk 0 128 0 -0.5 0.5 0 0 0 } { -( 1664 608 272 ) ( 1696 608 272 ) ( 1696 448 272 ) map_leave_em_behind/biolumi2_yellow 64 0 -0 0.25 0.25 134217728 0 0 +( 1664 608 272 ) ( 1696 608 272 ) ( 1696 448 272 ) map_leave_em_behind/biolumi2_yellow_wave 64 0 -0 0.25 0.25 134217728 0 0 ( 1664 448 272 ) ( 1696 448 256 ) ( 1664 448 256 ) common/caulk 64 32 0 -0.5 0.5 134217728 0 0 ( 1664 608 272 ) ( 1664 448 256 ) ( 1664 608 256 ) common/caulk 0 32 0 -0.5 0.5 134217728 0 0 ( 1664 608 256 ) ( 1696 448 256 ) ( 1696 608 256 ) common/caulk 64 0 180 0.5 0.5 134217728 0 0 @@ -5587,18 +5587,18 @@ trak5x/base-pipe1a { patchDef2 { -map_leave_em_behind/biolumi2_yellow +map_leave_em_behind/biolumi2_yellow_wave ( 9 3 0 0 0 ) ( -( ( 1680 608 312.0001220703 0 0 ) ( 1680 608 288.0001220703 0 -0.25 ) ( 1680 608 272.0001220703 0 -0.5 ) ) -( ( 1696 608 312.0001220703 0.25 0 ) ( 1696 608 288.0001220703 0.25 -0.25 ) ( 1696 608 272.0001220703 0.25 -0.5 ) ) -( ( 1696 592 312.0001220703 0.5 0 ) ( 1696 592 288.0001220703 0.5 -0.25 ) ( 1696 592 272.0001220703 0.5 -0.5 ) ) -( ( 1696 576 312.0001220703 0.75 0 ) ( 1696 576 288.0001220703 0.75 -0.25 ) ( 1696 576 272.0001220703 0.75 -0.5 ) ) -( ( 1680 576 312.0001220703 1 0 ) ( 1680 576 288.0001220703 1 -0.25 ) ( 1680 576 272.0001220703 1 -0.5 ) ) -( ( 1664 576 312.0001220703 1.25 0 ) ( 1664 576 288.0001220703 1.25 -0.25 ) ( 1664 576 272.0001220703 1.25 -0.5 ) ) -( ( 1664 592 312.0001220703 1.5 0 ) ( 1664 592 288.0001220703 1.5 -0.25 ) ( 1664 592 272.0001220703 1.5 -0.5 ) ) -( ( 1664 608 312.0001220703 1.75 0 ) ( 1664 608 288.0001220703 1.75 -0.25 ) ( 1664 608 272.0001220703 1.75 -0.5 ) ) -( ( 1680 608 312.0001220703 2 0 ) ( 1680 608 288.0001220703 2 -0.25 ) ( 1680 608 272.0001220703 2 -0.5 ) ) +( ( 1680 604 312.0001220703 0 0 ) ( 1680 604 288.0001220703 0 -0.25 ) ( 1680 604 272.0001220703 0 -0.5 ) ) +( ( 1692 604 312.0001220703 0.25 0 ) ( 1692 604 288.0001220703 0.25 -0.25 ) ( 1692 604 272.0001220703 0.25 -0.5 ) ) +( ( 1692 592 312.0001220703 0.5 0 ) ( 1692 592 288.0001220703 0.5 -0.25 ) ( 1692 592 272.0001220703 0.5 -0.5 ) ) +( ( 1692 580 312.0001220703 0.75 0 ) ( 1692 580 288.0001220703 0.75 -0.25 ) ( 1692 580 272.0001220703 0.75 -0.5 ) ) +( ( 1680 580 312.0001220703 1 0 ) ( 1680 580 288.0001220703 1 -0.25 ) ( 1680 580 272.0001220703 1 -0.5 ) ) +( ( 1668 580 312.0001220703 1.25 0 ) ( 1668 580 288.0001220703 1.25 -0.25 ) ( 1668 580 272.0001220703 1.25 -0.5 ) ) +( ( 1668 592 312.0001220703 1.5 0 ) ( 1668 592 288.0001220703 1.5 -0.25 ) ( 1668 592 272.0001220703 1.5 -0.5 ) ) +( ( 1668 604 312.0001220703 1.75 0 ) ( 1668 604 288.0001220703 1.75 -0.25 ) ( 1668 604 272.0001220703 1.75 -0.5 ) ) +( ( 1680 604 312.0001220703 2 0 ) ( 1680 604 288.0001220703 2 -0.25 ) ( 1680 604 272.0001220703 2 -0.5 ) ) ) } } @@ -5623,18 +5623,18 @@ trak5x/base-pipe1a { patchDef2 { -map_leave_em_behind/biolumi2_yellow +map_leave_em_behind/biolumi2_yellow_wave ( 9 3 0 0 0 ) ( -( ( 1680 480 312.0001220703 0 0 ) ( 1680 480 288.0001220703 0 -0.25 ) ( 1680 480 272.0001220703 0 -0.5 ) ) -( ( 1696 480 312.0001220703 0.25 0 ) ( 1696 480 288.0001220703 0.25 -0.25 ) ( 1696 480 272.0001220703 0.25 -0.5 ) ) -( ( 1696 464 312.0001220703 0.5 0 ) ( 1696 464 288.0001220703 0.5 -0.25 ) ( 1696 464 272.0001220703 0.5 -0.5 ) ) -( ( 1696 448 312.0001220703 0.75 0 ) ( 1696 448 288.0001220703 0.75 -0.25 ) ( 1696 448 272.0001220703 0.75 -0.5 ) ) -( ( 1680 448 312.0001220703 1 0 ) ( 1680 448 288.0001220703 1 -0.25 ) ( 1680 448 272.0001220703 1 -0.5 ) ) -( ( 1664 448 312.0001220703 1.25 0 ) ( 1664 448 288.0001220703 1.25 -0.25 ) ( 1664 448 272.0001220703 1.25 -0.5 ) ) -( ( 1664 464 312.0001220703 1.5 0 ) ( 1664 464 288.0001220703 1.5 -0.25 ) ( 1664 464 272.0001220703 1.5 -0.5 ) ) -( ( 1664 480 312.0001220703 1.75 0 ) ( 1664 480 288.0001220703 1.75 -0.25 ) ( 1664 480 272.0001220703 1.75 -0.5 ) ) -( ( 1680 480 312.0001220703 2 0 ) ( 1680 480 288.0001220703 2 -0.25 ) ( 1680 480 272.0001220703 2 -0.5 ) ) +( ( 1680 476 312.0001220703 0 0 ) ( 1680 476 288.0001220703 0 -0.25 ) ( 1680 476 272.0001220703 0 -0.5 ) ) +( ( 1692 476 312.0001220703 0.25 0 ) ( 1692 476 288.0001220703 0.25 -0.25 ) ( 1692 476 272.0001220703 0.25 -0.5 ) ) +( ( 1692 464 312.0001220703 0.5 0 ) ( 1692 464 288.0001220703 0.5 -0.25 ) ( 1692 464 272.0001220703 0.5 -0.5 ) ) +( ( 1692 452 312.0001220703 0.75 0 ) ( 1692 452 288.0001220703 0.75 -0.25 ) ( 1692 452 272.0001220703 0.75 -0.5 ) ) +( ( 1680 452 312.0001220703 1 0 ) ( 1680 452 288.0001220703 1 -0.25 ) ( 1680 452 272.0001220703 1 -0.5 ) ) +( ( 1668 452 312.0001220703 1.25 0 ) ( 1668 452 288.0001220703 1.25 -0.25 ) ( 1668 452 272.0001220703 1.25 -0.5 ) ) +( ( 1668 464 312.0001220703 1.5 0 ) ( 1668 464 288.0001220703 1.5 -0.25 ) ( 1668 464 272.0001220703 1.5 -0.5 ) ) +( ( 1668 476 312.0001220703 1.75 0 ) ( 1668 476 288.0001220703 1.75 -0.25 ) ( 1668 476 272.0001220703 1.75 -0.5 ) ) +( ( 1680 476 312.0001220703 2 0 ) ( 1680 476 288.0001220703 2 -0.25 ) ( 1680 476 272.0001220703 2 -0.5 ) ) ) } } diff --git a/scripts/map_leave_em_behind.shader b/scripts/map_leave_em_behind.shader index 5e24f756..6f8d0641 100644 --- a/scripts/map_leave_em_behind.shader +++ b/scripts/map_leave_em_behind.shader @@ -1,4 +1,4 @@ -textures/map_leave_em_behind/biolumi2_yellow +textures/map_leave_em_behind/biolumi2_yellow_wave { q3map_lightimage textures/map_leave_em_behind/biolumi2_yellow.tga qer_editorimage textures/map_leave_em_behind/biolumi2_yellow.tga @@ -6,6 +6,7 @@ textures/map_leave_em_behind/biolumi2_yellow surfaceparm nolightmap surfaceparm trans surfaceparm nomarks + deformVertexes wave 10 sin 1 2 0.25 0.1 cull disable qer_trans 0.5 q3map_lightsubdivide 16 @@ -15,7 +16,7 @@ textures/map_leave_em_behind/biolumi2_yellow map textures/map_leave_em_behind/biolumi2_yellow.tga } } -textures/map_leave_em_behind/biolumi2_green +textures/map_leave_em_behind/biolumi2_green_wave { q3map_lightimage textures/map_leave_em_behind/biolumi2_green.tga qer_editorimage textures/map_leave_em_behind/biolumi2_green.tga @@ -23,6 +24,7 @@ textures/map_leave_em_behind/biolumi2_green surfaceparm nolightmap surfaceparm trans surfaceparm nomarks + deformVertexes wave 10 sin 1 2 0.25 0.1 cull disable qer_trans 0.5 q3map_lightsubdivide 16 @@ -34,3 +36,22 @@ textures/map_leave_em_behind/biolumi2_green } +textures/map_leave_em_behind/biolumi2_green +{ + q3map_lightimage textures/map_leave_em_behind/biolumi2_green.tga + qer_editorimage textures/map_leave_em_behind/biolumi2_green.tga + q3map_lightmapFilterRadius 0 4 + surfaceparm nolightmap + surfaceparm trans + surfaceparm nomarks +// deformVertexes wave 50 sin 2 5 0.25 0.1 + cull disable + qer_trans 0.5 + q3map_lightsubdivide 16 + q3map_surfacelight 2500 + { + tcMod scroll 0 0.05 + map textures/map_leave_em_behind/biolumi2_green.tga + } + +}