From 8f607a6f41f4261a25dc2ef46c6a5fdee8a9b110 Mon Sep 17 00:00:00 2001 From: elviz Date: Mon, 17 Mar 2008 12:07:34 +0000 Subject: [PATCH] hole.map: Fixed T-intersections git-svn-id: https://s.snth.net/svn/neverball/trunk@1913 78b8d119-cf0a-0410-b17c-f493084dd1d7 --- data/map-easy/hole.map | 102 ++++++++++++++++-------------------------------- 1 file changed, 33 insertions(+), 69 deletions(-) diff --git a/data/map-easy/hole.map b/data/map-easy/hole.map index 5c762ca..e15cc4a 100644 --- a/data/map-easy/hole.map +++ b/data/map-easy/hole.map @@ -519,60 +519,6 @@ } // brush 56 { -( -64 704 0 ) ( -64 448 0 ) ( -64 448 -16 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 -( -56 696 -16 ) ( -56 456 -16 ) ( -56 456 0 ) mtrl/caution 0 0 0 0.5 0.5 0 0 0 -( -64 448 0 ) ( -56 456 0 ) ( -56 456 -16 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 -( -64 448 0 ) ( -64 704 0 ) ( -56 704 0 ) mtrl/caution 0 0 0 0.5 0.5 0 0 0 -( -56 704 -16 ) ( -64 704 -16 ) ( -64 448 -16 ) mtrl/caution 0 0 0 0.5 0.5 0 0 0 -( -64 512 -16 ) ( -56 512 -16 ) ( -64 512 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 -} -// brush 57 -{ -( -64 704 0 ) ( -64 448 0 ) ( -64 448 -16 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 -( -56 696 -16 ) ( -56 456 -16 ) ( -56 456 0 ) mtrl/caution 0 0 0 0.5 0.5 0 0 0 -( -64 448 0 ) ( -64 704 0 ) ( -56 704 0 ) mtrl/caution 0 0 0 0.5 0.5 0 0 0 -( -56 704 -16 ) ( -64 704 -16 ) ( -64 448 -16 ) mtrl/caution 0 0 0 0.5 0.5 0 0 0 -( -56 512 -16 ) ( -64 512 -16 ) ( -64 512 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 -( -64 640 -16 ) ( -56 640 -16 ) ( -64 640 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 -} -// brush 58 -{ -( -64 704 0 ) ( -64 448 0 ) ( -64 448 -16 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 -( -64 704 -16 ) ( -56 696 -16 ) ( -56 696 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 -( -56 696 -16 ) ( -56 456 -16 ) ( -56 456 0 ) mtrl/caution 0 0 0 0.5 0.5 0 0 0 -( -64 448 0 ) ( -64 704 0 ) ( -56 704 0 ) mtrl/caution 0 0 0 0.5 0.5 0 0 0 -( -56 704 -16 ) ( -64 704 -16 ) ( -64 448 -16 ) mtrl/caution 0 0 0 0.5 0.5 0 0 0 -( -56 640 -16 ) ( -64 640 -16 ) ( -64 640 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 -} -// brush 59 -{ -( 192 512 0 ) ( 184 512 -16 ) ( 192 512 -16 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 -( 192 448 -16 ) ( 192 704 -16 ) ( 184 704 -16 ) mtrl/caution 0 0 0 0.5 0.5 0 0 0 -( 184 704 0 ) ( 192 704 0 ) ( 192 448 0 ) mtrl/caution 0 0 0 0.5 0.5 0 0 0 -( 184 456 -16 ) ( 184 456 0 ) ( 192 448 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 -( 184 456 0 ) ( 184 456 -16 ) ( 184 696 -16 ) mtrl/caution 0 0 90 0.5 0.5 0 0 0 -( 192 448 -16 ) ( 192 448 0 ) ( 192 704 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 -} -// brush 60 -{ -( 192 640 0 ) ( 184 640 -16 ) ( 192 640 -16 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 -( 192 512 0 ) ( 192 512 -16 ) ( 184 512 -16 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 -( 192 448 -16 ) ( 192 704 -16 ) ( 184 704 -16 ) mtrl/caution 0 0 0 0.5 0.5 0 0 0 -( 184 704 0 ) ( 192 704 0 ) ( 192 448 0 ) mtrl/caution 0 0 0 0.5 0.5 0 0 0 -( 184 456 0 ) ( 184 456 -16 ) ( 184 696 -16 ) mtrl/caution 0 0 90 0.5 0.5 0 0 0 -( 192 448 -16 ) ( 192 448 0 ) ( 192 704 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 -} -// brush 61 -{ -( 192 640 0 ) ( 192 640 -16 ) ( 184 640 -16 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 -( 192 448 -16 ) ( 192 704 -16 ) ( 184 704 -16 ) mtrl/caution 0 0 0 0.5 0.5 0 0 0 -( 184 704 0 ) ( 192 704 0 ) ( 192 448 0 ) mtrl/caution 0 0 0 0.5 0.5 0 0 0 -( 184 456 0 ) ( 184 456 -16 ) ( 184 696 -16 ) mtrl/caution 0 0 90 0.5 0.5 0 0 0 -( 184 696 0 ) ( 184 696 -16 ) ( 192 704 -16 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 -( 192 448 -16 ) ( 192 448 0 ) ( 192 704 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 -} -// brush 62 -{ ( 0 1152 0 ) ( 0 1024 0 ) ( 0 1024 -16 ) mtrl/invisible 0 0 0 0.5 0.5 134217728 0 0 ( 128 1152 0 ) ( 0 1152 0 ) ( 0 1152 -16 ) mtrl/invisible 0 0 0 0.5 0.5 134217728 0 0 ( 128 1024 0 ) ( 128 1152 0 ) ( 128 1152 -16 ) mtrl/invisible 0 0 0 0.5 0.5 134217728 0 0 @@ -580,7 +526,7 @@ ( 0 1024 0 ) ( 0 1152 0 ) ( 128 1152 0 ) mtrl/goal 0 0 0 0.5 0.5 134217728 0 0 ( 128 1152 -16 ) ( 0 1152 -16 ) ( 0 1024 -16 ) mtrl/invisible 0 0 0 0.5 0.5 134217728 0 0 } -// brush 63 +// brush 57 { ( -72 -72 24 ) ( -72 -72 0 ) ( -64 -64 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 ( 192 -64 4 ) ( -64 -64 4 ) ( -64 -64 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 @@ -589,7 +535,7 @@ ( -64 -72 24 ) ( -64 -64 24 ) ( 192 -64 24 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 ( 192 -64 0 ) ( -64 -64 0 ) ( -64 -72 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 } -// brush 64 +// brush 58 { ( 56 192 0 ) ( -200 192 0 ) ( -200 184 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 ( -200 184 24 ) ( -200 192 24 ) ( 56 192 24 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 @@ -598,7 +544,7 @@ ( -64 192 0 ) ( -64 192 24 ) ( -200 192 24 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 ( -200 192 4 ) ( -200 184 4 ) ( -200 184 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 } -// brush 65 +// brush 59 { ( -72 -72 24 ) ( -72 -72 0 ) ( -72 184 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 ( -64 192 0 ) ( -64 192 24 ) ( -72 184 24 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 @@ -607,7 +553,7 @@ ( -72 88 24 ) ( -72 184 24 ) ( -64 184 24 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 ( -64 184 0 ) ( -72 184 0 ) ( -72 88 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 } -// brush 66 +// brush 60 { ( 328 184 0 ) ( 328 184 4 ) ( 328 192 4 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 ( 328 192 24 ) ( 192 192 24 ) ( 192 192 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 @@ -616,7 +562,7 @@ ( 72 192 24 ) ( 328 192 24 ) ( 328 184 24 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 ( 328 184 0 ) ( 328 192 0 ) ( 72 192 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 } -// brush 67 +// brush 61 { ( 200 88 0 ) ( 200 184 0 ) ( 192 184 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 ( 192 184 24 ) ( 200 184 24 ) ( 200 88 24 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 @@ -625,7 +571,7 @@ ( 200 184 24 ) ( 192 192 24 ) ( 192 192 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 ( 200 184 0 ) ( 200 -72 0 ) ( 200 -72 24 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 } -// brush 68 +// brush 62 { ( -64 1216 0 ) ( 192 1216 0 ) ( 192 1224 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 ( 192 1224 24 ) ( 192 1216 24 ) ( -64 1216 24 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 @@ -634,7 +580,7 @@ ( -64 1216 4 ) ( 192 1216 4 ) ( 192 1216 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 ( 200 1224 24 ) ( 200 1224 0 ) ( 192 1216 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 } -// brush 69 +// brush 63 { ( 328 960 4 ) ( 328 968 4 ) ( 328 968 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 ( 192 960 0 ) ( 192 960 24 ) ( 328 960 24 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 @@ -643,7 +589,7 @@ ( 328 968 24 ) ( 328 960 24 ) ( 72 960 24 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 ( 72 960 0 ) ( 328 960 0 ) ( 328 968 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 } -// brush 70 +// brush 64 { ( 192 968 0 ) ( 200 968 0 ) ( 200 1064 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 ( 200 1064 24 ) ( 200 968 24 ) ( 192 968 24 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 @@ -652,7 +598,7 @@ ( 192 960 0 ) ( 192 960 24 ) ( 200 968 24 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 ( 200 1224 24 ) ( 200 1224 0 ) ( 200 968 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 } -// brush 71 +// brush 65 { ( -200 968 0 ) ( -200 960 0 ) ( 56 960 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 ( 56 960 24 ) ( -200 960 24 ) ( -200 968 24 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 @@ -661,7 +607,7 @@ ( -200 960 24 ) ( -64 960 24 ) ( -64 960 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 ( -200 968 0 ) ( -200 968 4 ) ( -200 960 4 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 } -// brush 72 +// brush 66 { ( -72 968 0 ) ( -72 1224 0 ) ( -72 1224 24 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 ( -72 968 24 ) ( -64 960 24 ) ( -64 960 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 @@ -670,7 +616,7 @@ ( -64 968 24 ) ( -72 968 24 ) ( -72 1064 24 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 ( -72 1064 0 ) ( -72 968 0 ) ( -64 968 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 } -// brush 73 +// brush 67 { ( -72 1152 64 ) ( -64 1152 -64 ) ( -72 1152 -64 ) mtrl/invisible 0 0 0 0.5 0.5 0 0 0 ( -72 968 -16 ) ( -72 1224 -16 ) ( -72 1224 0 ) mtrl/turf-grey 0 0 0 0.5 0.5 0 0 0 @@ -679,7 +625,7 @@ ( -64 1216 0 ) ( -64 968 0 ) ( -72 968 0 ) mtrl/edge-green-offset 0 0 0 0.5 0.5 0 0 0 ( -72 1216 -16 ) ( -72 968 -16 ) ( -64 968 -16 ) mtrl/turf-grey 0 0 0 0.5 0.5 0 0 0 } -// brush 74 +// brush 68 { ( 0 1216 64 ) ( 0 1224 -64 ) ( 0 1216 -64 ) mtrl/invisible 0 0 0 0.5 0.5 0 0 0 ( -64 1224 -16 ) ( -64 1216 -16 ) ( 200 1216 -16 ) mtrl/turf-grey 0 0 0 0.5 0.5 0 0 0 @@ -688,7 +634,7 @@ ( -64 1216 -16 ) ( -64 1216 0 ) ( 200 1216 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 ( -64 1216 -16 ) ( -72 1224 -16 ) ( -72 1224 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 } -// brush 75 +// brush 69 { ( 128 1216 64 ) ( 128 1224 -64 ) ( 128 1216 -64 ) mtrl/invisible 0 0 0 0.5 0.5 0 0 0 ( 0 1216 -64 ) ( 0 1224 -64 ) ( 0 1216 64 ) mtrl/invisible 0 0 0 0.5 0.5 0 0 0 @@ -697,7 +643,7 @@ ( -72 1224 -16 ) ( 200 1224 -16 ) ( 200 1224 0 ) mtrl/turf-grey 0 0 0 0.5 0.5 0 0 0 ( -64 1216 -16 ) ( -64 1216 0 ) ( 200 1216 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 } -// brush 76 +// brush 70 { ( 192 1152 64 ) ( 200 1152 -64 ) ( 192 1152 -64 ) mtrl/invisible 0 0 0 0.5 0.5 0 0 0 ( 192 968 -16 ) ( 200 968 -16 ) ( 200 1216 -16 ) mtrl/turf-grey 0 0 0 0.5 0.5 0 0 0 @@ -706,7 +652,7 @@ ( 192 960 0 ) ( 192 960 -16 ) ( 192 1216 -16 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 ( 200 1224 0 ) ( 200 1224 -16 ) ( 200 968 -16 ) mtrl/turf-grey 0 0 0 0.5 0.5 0 0 0 } -// brush 77 +// brush 71 { ( 192 192 -16 ) ( -64 192 -16 ) ( -64 -64 -16 ) mtrl/turf-grey 0 0 0 0.5 0.5 0 0 0 ( -64 -64 0 ) ( -64 192 0 ) ( 192 192 0 ) mtrl/turf-green-dark 0 0 0 0.5 0.5 0 0 0 @@ -715,6 +661,24 @@ ( 192 128 0 ) ( -64 128 0 ) ( -64 128 -64 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 ( 0 192 48 ) ( 0 -64 48 ) ( 0 -64 -16 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 } +// brush 72 +{ +( -64 704 0 ) ( -64 448 0 ) ( -64 448 -16 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 +( -64 704 -16 ) ( -56 696 -16 ) ( -56 696 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 +( -56 696 -16 ) ( -56 456 -16 ) ( -56 456 0 ) mtrl/caution 0 0 0 0.5 0.5 0 0 0 +( -64 448 0 ) ( -64 704 0 ) ( -56 704 0 ) mtrl/caution 0 0 0 0.5 0.5 0 0 0 +( -56 704 -16 ) ( -64 704 -16 ) ( -64 448 -16 ) mtrl/caution 0 0 0 0.5 0.5 0 0 0 +( -64 448 0 ) ( -56 456 0 ) ( -56 456 -16 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 +} +// brush 73 +{ +( 192 448 -16 ) ( 192 704 -16 ) ( 184 704 -16 ) mtrl/caution 0 0 0 0.5 0.5 0 0 0 +( 184 704 0 ) ( 192 704 0 ) ( 192 448 0 ) mtrl/caution 0 0 0 0.5 0.5 0 0 0 +( 184 456 0 ) ( 184 456 -16 ) ( 184 696 -16 ) mtrl/caution 0 0 90 0.5 0.5 0 0 0 +( 192 448 -16 ) ( 192 448 0 ) ( 192 704 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 +( 184 696 0 ) ( 184 696 -16 ) ( 192 704 -16 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 +( 184 456 -16 ) ( 184 456 0 ) ( 192 448 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0 +} } // entity 1 { -- 1.7.9.5