Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2013-10-06 16:04:27 +0000
committerStijn Buys <ingar@osirion.org>2013-10-06 16:04:27 +0000
commit5d3bae323ffd1bda0946c829701867e9d5a8ecd8 (patch)
treee0d8f6819d03a43985818bdd2e159a1990d85a3d /base/maps/common
parent7970caf01aee2fd32aab8ef63987f3d374b2f70c (diff)
More solar panel corrections.
Diffstat (limited to 'base/maps/common')
-rw-r--r--base/maps/common/solarunit.map137
1 files changed, 107 insertions, 30 deletions
diff --git a/base/maps/common/solarunit.map b/base/maps/common/solarunit.map
index 765854f..8680be8 100644
--- a/base/maps/common/solarunit.map
+++ b/base/maps/common/solarunit.map
@@ -123,15 +123,15 @@ patchDef2
kuroto/metal_03b_noborder_secondary
( 9 3 0 0 0 )
(
-( ( -80 32 -144 0 0 ) ( -80 32 -136 0 -0.015625 ) ( -80 32 -128 0 -0.03125 ) )
-( ( -80 -16 -144 0.09375 0 ) ( -80 -16 -136 0.09375 -0.015625 ) ( -80 -16 -128 0.09375 -0.03125 ) )
-( ( -32 -16 -144 0.1875 0 ) ( -32 -16 -136 0.1875 -0.015625 ) ( -32 -16 -128 0.1875 -0.03125 ) )
-( ( 16 -16 -144 0.28125 0 ) ( 16 -16 -136 0.28125 -0.015625 ) ( 16 -16 -128 0.28125 -0.03125 ) )
-( ( 16 32 -144 0.375 0 ) ( 16 32 -136 0.375 -0.015625 ) ( 16 32 -128 0.375 -0.03125 ) )
-( ( 16 80 -144 0.46875 0 ) ( 16 80 -136 0.46875 -0.015625 ) ( 16 80 -128 0.46875 -0.03125 ) )
-( ( -32 80 -144 0.5625 0 ) ( -32 80 -136 0.5625 -0.015625 ) ( -32 80 -128 0.5625 -0.03125 ) )
-( ( -80 80 -144 0.65625 0 ) ( -80 80 -136 0.65625 -0.015625 ) ( -80 80 -128 0.65625 -0.03125 ) )
-( ( -80 32 -144 0.75 0 ) ( -80 32 -136 0.75 -0.015625 ) ( -80 32 -128 0.75 -0.03125 ) )
+( ( -80 32 -160 0 0 ) ( -80 32 -144 0 -0.03125 ) ( -80 32 -128 0 -0.0625 ) )
+( ( -80 -16 -160 0.09375 0 ) ( -80 -16 -144 0.09375 -0.03125 ) ( -80 -16 -128 0.09375 -0.0625 ) )
+( ( -32 -16 -160 0.1875 0 ) ( -32 -16 -144 0.1875 -0.03125 ) ( -32 -16 -128 0.1875 -0.0625 ) )
+( ( 16 -16 -160 0.28125 0 ) ( 16 -16 -144 0.28125 -0.03125 ) ( 16 -16 -128 0.28125 -0.0625 ) )
+( ( 16 32 -160 0.375 0 ) ( 16 32 -144 0.375 -0.03125 ) ( 16 32 -128 0.375 -0.0625 ) )
+( ( 16 80 -160 0.46875 0 ) ( 16 80 -144 0.46875 -0.03125 ) ( 16 80 -128 0.46875 -0.0625 ) )
+( ( -32 80 -160 0.5625 0 ) ( -32 80 -144 0.5625 -0.03125 ) ( -32 80 -128 0.5625 -0.0625 ) )
+( ( -80 80 -160 0.65625 0 ) ( -80 80 -144 0.65625 -0.03125 ) ( -80 80 -128 0.65625 -0.0625 ) )
+( ( -80 32 -160 0.75 0 ) ( -80 32 -144 0.75 -0.03125 ) ( -80 32 -128 0.75 -0.0625 ) )
)
}
}
@@ -142,15 +142,15 @@ patchDef2
kuroto/metal_03b_noborder_secondary
( 9 3 0 0 0 )
(
-( ( -32 32 -152 0 0 ) ( -80 32 -144 0 -0.09375 ) ( -80 32 -144 0 -0.09375 ) )
-( ( -32 32 -152 0.09375 0 ) ( -80 -16 -144 0.09375 -0.09375 ) ( -80 -16 -144 0.09375 -0.09375 ) )
-( ( -32 32 -152 0.1875 0 ) ( -32 -16 -144 0.1875 -0.09375 ) ( -32 -16 -144 0.1875 -0.09375 ) )
-( ( -32 32 -152 0.28125 0 ) ( 16 -16 -144 0.28125 -0.09375 ) ( 16 -16 -144 0.28125 -0.09375 ) )
-( ( -32 32 -152 0.375 0 ) ( 16 32 -144 0.375 -0.09375 ) ( 16 32 -144 0.375 -0.09375 ) )
-( ( -32 32 -152 0.46875 0 ) ( 16 80 -144 0.46875 -0.09375 ) ( 16 80 -144 0.46875 -0.09375 ) )
-( ( -32 32 -152 0.5625 0 ) ( -32 80 -144 0.5625 -0.09375 ) ( -32 80 -144 0.5625 -0.09375 ) )
-( ( -32 32 -152 0.65625 0 ) ( -80 80 -144 0.65625 -0.09375 ) ( -80 80 -144 0.65625 -0.09375 ) )
-( ( -32 32 -152 0.75 0 ) ( -80 32 -144 0.75 -0.09375 ) ( -80 32 -144 0.75 -0.09375 ) )
+( ( -32 32 -168 0 0 ) ( -80 32 -160 0 -0.0950431675 ) ( -80 32 -160 0 -0.0950431675 ) )
+( ( -32 32 -168 0.09375 0 ) ( -80 -16 -160 0.09375 -0.0950431675 ) ( -80 -16 -160 0.09375 -0.0950431675 ) )
+( ( -32 32 -168 0.1875 0 ) ( -32 -16 -160 0.1875 -0.0950431675 ) ( -32 -16 -160 0.1875 -0.0950431675 ) )
+( ( -32 32 -168 0.28125 0 ) ( 16 -16 -160 0.28125 -0.0950431675 ) ( 16 -16 -160 0.28125 -0.0950431675 ) )
+( ( -32 32 -168 0.375 0 ) ( 16 32 -160 0.375 -0.0950431675 ) ( 16 32 -160 0.375 -0.0950431675 ) )
+( ( -32 32 -168 0.46875 0 ) ( 16 80 -160 0.46875 -0.0950431675 ) ( 16 80 -160 0.46875 -0.0950431675 ) )
+( ( -32 32 -168 0.5625 0 ) ( -32 80 -160 0.5625 -0.0950431675 ) ( -32 80 -160 0.5625 -0.0950431675 ) )
+( ( -32 32 -168 0.65625 0 ) ( -80 80 -160 0.65625 -0.0950431675 ) ( -80 80 -160 0.65625 -0.0950431675 ) )
+( ( -32 32 -168 0.75 0 ) ( -80 32 -160 0.75 -0.0950431675 ) ( -80 32 -160 0.75 -0.0950431675 ) )
)
}
}
@@ -309,29 +309,107 @@ kuroto/metal_03b_noborder_secondary
( -35 82 -142 ) ( -35 82 -130 ) ( -29 82 -142 ) common/caulk 0 0 0 1 1 134217728 0 0
( -35 81 -142 ) ( -35 82 -142 ) ( -35 81 -130 ) colors/white_bright 13.2548341751 12 0 1 1 134217728 0 0
}
+// brush 23
+{
+( -33 81 -156 ) ( -32 81 -156 ) ( -33 79 -156 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -34 81 -156 ) ( -34 79 -156 ) ( -34 81 -161 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -33 81 -156 ) ( -33 81 -161 ) ( -32 81 -156 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -34 79 -163 ) ( -30 79 -163 ) ( -30 81 -161 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -30 79 -161 ) ( -30 79 -156 ) ( -30 81 -161 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -30 79 -163 ) ( -34 79 -163 ) ( -34 79 -156 ) common/caulk 0 0 0 1 1 134217728 0 0
+}
+// brush 24
+{
+( -30 34 -160 ) ( -34 34 -160 ) ( -30 79 -160 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -34 34 -160 ) ( -34 34 -170 ) ( -34 79 -163 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -34 79 -163 ) ( -30 79 -163 ) ( -30 79 -160 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -34 34 -170 ) ( -30 34 -170 ) ( -30 79 -163 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -30 34 -170 ) ( -30 34 -160 ) ( -30 79 -160 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -34 34 -160 ) ( -30 34 -160 ) ( -34 34 -170 ) common/caulk 0 0 0 1 1 134217728 0 0
+}
+// brush 25
+{
+( -31 34 -160 ) ( -31 30 -160 ) ( -34 34 -160 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -31 34 -160 ) ( -34 34 -160 ) ( -31 34 -170 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -30 34 -160 ) ( -30 34 -170 ) ( -30 30 -160 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -34 30 -170 ) ( -31 30 -170 ) ( -34 34 -170 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -34 30 -170 ) ( -34 30 -160 ) ( -31 30 -170 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -34 30 -170 ) ( -34 34 -170 ) ( -34 30 -160 ) common/caulk 0 0 0 1 1 134217728 0 0
+}
+// brush 26
+{
+( -31 -17 -156 ) ( -32 -17 -156 ) ( -31 -15 -156 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -30 -17 -156 ) ( -30 -15 -156 ) ( -30 -17 -161 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -31 -17 -156 ) ( -31 -17 -161 ) ( -32 -17 -156 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -30 -15 -163 ) ( -34 -15 -163 ) ( -34 -17 -161 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -34 -15 -161 ) ( -34 -15 -156 ) ( -34 -17 -161 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -34 -15 -163 ) ( -30 -15 -163 ) ( -30 -15 -156 ) common/caulk 0 0 0 1 1 134217728 0 0
+}
+// brush 27
+{
+( -34 30 -160 ) ( -30 30 -160 ) ( -34 -15 -160 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -30 30 -160 ) ( -30 30 -170 ) ( -30 -15 -163 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -30 -15 -163 ) ( -34 -15 -163 ) ( -34 -15 -160 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -30 30 -170 ) ( -34 30 -170 ) ( -34 -15 -163 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -34 30 -170 ) ( -34 30 -160 ) ( -34 -15 -160 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -30 30 -160 ) ( -34 30 -160 ) ( -30 30 -170 ) common/caulk 0 0 0 1 1 134217728 0 0
+}
+// brush 28
+{
+( -81 31 -156 ) ( -81 32 -156 ) ( -79 31 -156 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -81 30 -156 ) ( -79 30 -156 ) ( -81 30 -161 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -81 31 -156 ) ( -81 31 -161 ) ( -81 32 -156 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -79 30 -163 ) ( -79 34 -163 ) ( -81 34 -161 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -79 34 -161 ) ( -79 34 -156 ) ( -81 34 -161 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -79 34 -163 ) ( -79 30 -163 ) ( -79 30 -156 ) common/caulk 0 0 0 1 1 134217728 0 0
+}
+// brush 29
+{
+( -34 34 -160 ) ( -34 30 -160 ) ( -79 34 -160 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -34 30 -160 ) ( -34 30 -170 ) ( -79 30 -163 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -79 30 -163 ) ( -79 34 -163 ) ( -79 34 -160 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -34 30 -170 ) ( -34 34 -170 ) ( -79 34 -163 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -34 34 -170 ) ( -34 34 -160 ) ( -79 34 -160 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -34 30 -160 ) ( -34 34 -160 ) ( -34 30 -170 ) common/caulk 0 0 0 1 1 134217728 0 0
+}
+// brush 30
+{
+( -30 30 -160 ) ( -30 34 -160 ) ( 15 30 -160 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -30 34 -160 ) ( -30 34 -170 ) ( 15 34 -163 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( 15 34 -163 ) ( 15 30 -163 ) ( 15 30 -160 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -30 34 -170 ) ( -30 30 -170 ) ( 15 30 -163 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -30 30 -170 ) ( -30 30 -160 ) ( 15 30 -160 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( -30 34 -160 ) ( -30 30 -160 ) ( -30 34 -170 ) common/caulk 0 0 0 1 1 134217728 0 0
+}
+// brush 31
+{
+( 17 33 -156 ) ( 17 32 -156 ) ( 15 33 -156 ) common/caulk 0 0 0 1 1 134217728 0 0
+( 17 34 -156 ) ( 15 34 -156 ) ( 17 34 -161 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( 17 33 -156 ) ( 17 33 -161 ) ( 17 32 -156 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( 15 34 -163 ) ( 15 30 -163 ) ( 17 30 -161 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( 15 30 -161 ) ( 15 30 -156 ) ( 17 30 -161 ) colors/grey25_shiny 0 0 0 1 1 134217728 0 0
+( 15 30 -163 ) ( 15 34 -163 ) ( 15 34 -156 ) common/caulk 0 0 0 1 1 134217728 0 0
+}
}
// entity 1
{
"classname" "misc_model"
-"origin" "-32.000000 -16.000000 -136.000000"
+"origin" "-32.000000 -16.000000 -152.000000"
"model" "models/solar_panel/solar_panel_01.obj"
-"modelscale" "1"
"angles" "-0.000000 0.000000 15.000000"
}
// entity 2
{
"classname" "misc_model"
-"origin" "-32.000000 80.000000 -136.000000"
+"origin" "-32.000000 80.000000 -152.000000"
"model" "models/solar_panel/solar_panel_01.obj"
-"modelscale" "1"
"angles" "-0.000000 -179.999985 15.000000"
}
// entity 3
{
"classname" "misc_model"
-"origin" "-80.000000 31.999996 -136.000000"
+"origin" "-80.000000 31.999996 -152.000000"
"model" "models/solar_panel/solar_panel_01.obj"
-"modelscale" "1"
"angles" "-0.000000 -90.000000 15.000000"
}
// entity 4
@@ -347,33 +425,32 @@ kuroto/metal_03b_noborder_secondary
// entity 5
{
"classname" "light"
-"origin" "-32.000000 368.000000 -216.000000"
+"origin" "-32.000000 368.000000 -232.000000"
"light" "8"
}
// entity 6
{
"classname" "light"
-"origin" "-32.000000 -304.000000 -216.000000"
+"origin" "-32.000000 -304.000000 -232.000000"
"light" "8"
}
// entity 7
{
"classname" "light"
-"origin" "-368.000000 32.000000 -216.000000"
+"origin" "-368.000000 32.000000 -232.000000"
"light" "8"
}
// entity 8
{
"classname" "light"
-"origin" "304.000000 32.000000 -216.000000"
+"origin" "304.000000 32.000000 -232.000000"
"light" "8"
}
// entity 9
{
"classname" "misc_model"
-"origin" "16.000008 31.999998 -135.999985"
+"origin" "16.000008 31.999998 -151.999985"
"model" "models/solar_panel/solar_panel_01.obj"
-"modelscale" "1"
"angles" "-0.000000 90.000000 15.000000"
}
// entity 10