More solar panel corrections.

2 files changed, 128 insertions, 51 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
diff --git a/base/models/solar_panel/solar_panel_02.obj b/base/models/solar_panel/solar_panel_02.obj
index 1f437ca..f6a801a 100644
--- a/base/models/solar_panel/solar_panel_02.obj
+++ b/base/models/solar_panel/solar_panel_02.obj
@@ -213,7 +213,7 @@ vn -0.000000 0.447214 0.894427
 vn 0.000000 -0.447214 0.894427
 vn -0.000000 -0.447214 -0.894427
 vn 0.000000 0.447214 -0.894427
-vn 0.000000 -0.382683 -0.923880
+vn 0.000000 -0.382684 -0.923879
 vn -0.000000 -0.923879 -0.382684
 vn 0.000000 -0.923880 0.382682
 vn -0.000000 -0.382683 0.923880
@@ -223,15 +223,15 @@ vn -0.000000 0.923879 -0.382685
 vn 0.000000 0.382683 -0.923880
 vn -0.000000 0.382682 -0.923880
 vn -0.000000 0.923880 -0.382683
-vn 0.000000 0.923880 0.382683
 vn -0.000000 -0.923880 -0.382683
+vn 0.000000 -0.382683 -0.923880
 vn 0.000015 1.000000 0.000000
 vn 1.000000 -0.000001 0.000000
 vn -0.000002 -1.000000 -0.000000
-vn -0.000000 -0.382684 -0.923879
 vn -0.000000 -0.923880 0.382684
+vn 0.000000 0.923880 0.382683
 vn 0.000000 -0.923880 0.382683
-g Panel.001_Cube.003_grey25
+g Cylinder.001_Cube.002_grey25
 usemtl textures/colors/grey25
 s off
 f 19/1/1 17/2/1 9/3/1
@@ -374,8 +374,8 @@ f 89/4/6 90/1/6 91/3/6
 f 93/4/6 94/1/6 95/3/6
 f 97/4/6 98/1/6 99/3/6
 f 104/4/6 103/1/6 102/3/6
-g Panel.001_Cube.003_grey25_NONE
-usemtl grey25_NONE
+g Cylinder.001_Cube.002_grey25_NONE
+usemtl textures/colors/grey25
 f 121/1/2 105/1/2 106/1/2
 f 122/1/4 114/1/4 113/1/4
 f 121/1/2 106/1/2 107/1/2
@@ -392,7 +392,7 @@ f 121/1/2 111/1/2 112/1/2
 f 122/1/4 120/1/4 119/1/4
 f 112/1/2 105/1/2 121/1/2
 f 122/1/4 113/1/4 120/1/4
-f 105/1/11 113/1/11 114/1/11
+f 105/1/11 113/1/11 106/1/11
 f 106/1/12 114/1/12 115/1/12
 f 107/1/13 115/1/13 116/1/13
 f 108/1/14 116/1/14 117/1/14
@@ -402,12 +402,12 @@ f 111/1/17 119/1/17 120/1/17
 f 113/1/18 105/1/18 112/1/18
 f 133/1/19 125/1/19 132/1/19
 f 134/1/20 126/1/20 125/1/20
-f 135/1/21 127/1/21 134/1/21
+f 135/1/16 127/1/16 126/1/16
 f 136/1/15 128/1/15 127/1/15
 f 137/1/14 129/1/14 128/1/14
 f 138/1/13 130/1/13 129/1/13
-f 139/1/22 131/1/22 130/1/22
-f 140/1/11 132/1/11 131/1/11
+f 139/1/21 131/1/21 130/1/21
+f 140/1/22 132/1/22 131/1/22
 f 123/1/4 132/1/4 125/1/4
 f 124/1/2 133/1/2 140/1/2
 f 123/1/4 125/1/4 126/1/4
@@ -431,7 +431,7 @@ f 154/1/15 146/1/15 145/1/15
 f 155/1/14 147/1/14 146/1/14
 f 156/1/13 148/1/13 147/1/13
 f 157/1/12 149/1/12 148/1/12
-f 158/1/11 150/1/11 149/1/11
+f 158/1/22 150/1/22 149/1/22
 f 141/1/4 150/1/4 143/1/4
 f 151/1/2 158/1/2 142/1/2
 f 141/1/4 143/1/4 144/1/4
@@ -460,29 +460,29 @@ f 174/1/25 167/1/25 168/1/25
 f 171/1/24 170/1/24 167/1/24
 f 172/1/23 169/1/23 170/1/23
 f 172/1/6 171/1/6 173/1/6
-f 106/1/26 105/1/26 114/1/26
 f 107/1/12 106/1/12 115/1/12
-f 108/1/27 107/1/27 116/1/27
+f 108/1/26 107/1/26 116/1/26
 f 109/1/14 108/1/14 117/1/14
 f 110/1/15 109/1/15 118/1/15
-f 111/1/21 110/1/21 119/1/21
+f 111/1/27 110/1/27 119/1/27
 f 112/1/20 111/1/20 120/1/20
 f 120/1/18 113/1/18 112/1/18
 f 140/1/18 133/1/18 132/1/18
 f 133/1/20 134/1/20 125/1/20
+f 134/1/27 135/1/27 126/1/27
 f 135/1/15 136/1/15 127/1/15
 f 136/1/14 137/1/14 128/1/14
 f 137/1/28 138/1/28 129/1/28
-f 138/1/22 139/1/22 130/1/22
-f 139/1/11 140/1/11 131/1/11
+f 138/1/21 139/1/21 130/1/21
+f 139/1/22 140/1/22 131/1/22
 f 143/1/18 150/1/18 151/1/18
 f 151/1/20 152/1/20 143/1/20
-f 152/1/21 153/1/21 144/1/21
+f 152/1/27 153/1/27 144/1/27
 f 153/1/15 154/1/15 145/1/15
 f 154/1/14 155/1/14 146/1/14
-f 155/1/27 156/1/27 147/1/27
+f 155/1/26 156/1/26 147/1/26
 f 156/1/12 157/1/12 148/1/12
-f 157/1/26 158/1/26 149/1/26
+f 157/1/11 158/1/11 149/1/11
 f 162/1/6 159/1/6 160/1/6
 f 162/1/23 161/1/23 163/1/23
 f 159/1/24 162/1/24 166/1/24
@@ -495,8 +495,8 @@ f 173/1/25 174/1/25 168/1/25
 f 174/1/24 171/1/24 167/1/24
 f 171/1/23 172/1/23 170/1/23
 f 171/1/6 174/1/6 173/1/6
-f 127/1/16 126/1/16 134/1/16
-g Panel.001_Cube.003_metal_05
+f 113/1/22 114/1/22 106/1/22
+g Cylinder.001_Cube.002_metal_05
 usemtl textures/kuroto/metal_05
 f 45/5/5 46/6/5 64/7/5
 f 61/8/5 62/9/5 57/10/5