Merge in xonotic/xonotic-maps.pk3dir.git: Mirio/g-23
Mirio created issue #1550 on 2013-05-05T10:53:58Z:
Purpose of the branch:
Map cleanup
Repository: xonotic/xonotic-maps.pk3dir.git Commit: bdd4ea12 Branch: Mirio/g-23
Merge commands:
cd data/xonotic-maps.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff 'bdd4ea1242d465e5d9005a43eb3865980b7de817'..'origin/Mirio/g-23'
# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes
git merge --no-ff 'origin/Mirio/g-23'
# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out
git push && git push --delete origin 'Mirio/g-23'
Diffstat:
maps/g-23.map | 484 +++++++++++++++++++++++++------------------------
maps/g-23.map.options | 2 +-
maps/g-23.mapinfo | 12 +-
maps/g-23.tga | Bin 786450 -> 769542 bytes
4 files changed, 255 insertions(+), 243 deletions(-)
Revision log:
commit bdd4ea1242d465e5d9005a43eb3865980b7de817
Author: Mirio
Commit: Mirio
Map cleanup, mapinfo, screenshot
User agreed to the GPLv2*.
Diff:
<pre>
diff —git a/maps/g-23.map b/maps/g-23.map
index ba2fc0e..3df0416 100644
— a/maps/g-23.map
**+ b/maps/g-23.map
@ -24,8 +24,8
@
common/caulk 0 0 0 0.25 0.25 134217728 0 0
common/caulk 0 0 0 0.25 0.25 134217728 0 0
common/caulk 0 0 0 0.25 0.25 134217728 0 0
~~trak5x/light-light2a 127.9892578125 106.6665039062 0 0.2499995232 0.3749999106 134217728 0 0
~~ trak5x/light-light2a ~~0 106.6665039062 0 0.25 0.3749999702 134217728 0 0
*trak5x/light-light2a 127.9892578125 106.6665039063 0 0.2499995232 0.3749999106 134217728 0 0
- trak5x/light-light2a~~0 106.6665039063 0 0.25 0.3749999702 134217728 0 0
}
{
patchDef2
@ -149,7 +149,7
@ exx/base-metal02 common/caulk 0 0 0 0.25 0.25 134217728 0 0 common/caulk 0 0 0 0.25 0.25 134217728 0 0 trak5x/light-light2a 127.9892578125 106.6662597656 0 0.2499995232 0.3749999106 134217728 0 0trak5x/light-light2a0 106.6665039062 0 0.25 0.3749999702 134217728 0 0 *( 1632632 48 ) trak5x/light-light2a0 106.6665039063 0 0.25 0.3749999702 134217728 0 0 } { patchDef2@ -925,77 +925,77
@ exx/base-metal03 { (412.4465332031 466.3017578125448 ) (343.1734619141 299.061706543448 ) (461.4300537109 348.0451965332448 ) exx/panel-q201e 66.0125732422 67.8801879883 157.5 0.25 ~~0.25 134217728 0 0 exx/panel-q201e 135.153137207 0 0 0.2309699059 0.25 134217728 0 0 ~~(326.0727539062 361.2514648438288 ) (444.3293457031 410.2349853516576 ) (444.3293457031 410.2349853516288 ) exx/panel-q201e 156.2475585938 0 0 ~~0.2309701443 0.25 134217728 0 0 *exx/panel-q201e 156.2475585938 0 00.2309701443 0.25 134217728 0 0 common/caulk 0 128 00.25 0.25 134217728 0 0 ~~exx/panel-q201e 241.1917724609 0 0 0.2309698761 0.25 134217728 0 0 ~~ exx/panel-q201e 6.2845458984 0 0 ~~0.2309699059 0.25 134217728 0 0 *exx/panel-q201e 241.1917724609 0 0 0.2309698761 0.25 134217728 0 0 - exx/panel-q201e 6.2845458984 0 0~~0.2309699059 0.25 134217728 0 0
}
{
~~exx/panel-q201e 148.6645507812 232.7349243164 22.5 0.25 0.25 134217728 0 0
*exx/panel-q201e 148.6645507813 232.7349243164 22.5 0.25 0.25 134217728 0 0
exx/panel-q201e 190.8821411133 0 0 0.2309699059 0.25 134217728 0 0
exx/panel-q201e 7.2593078613 0 0 0.2309701443 0.25 134217728 0 0
~~common/caulk 160 96 0 0.25 0.25 134217728 0 0
*common/caulk 160 96 0 0.25 0.25 134217728 0 0
exx/panel-q201e 40.9207763672 0 0 0.2309698761 0.25 134217728 0 0
exx/panel-q201e 113.2987518311 0 0 0.2309699059 0.25 134217728 0 0
}
{
~~exx/panel-q201e 117.0668945312 169.3369750977 22.5 0.25 0.25 134217728 0 0
*exx/panel-q201e 117.0668945313 169.3369750977 22.5 0.25 0.25 134217728 0 0
exx/panel-q201e 135.1532287598 0 0 0.2309699059 0.25 134217728 0 0
exx/panel-q201e 55.440246582 0 0 0.2309701443 0.25 134217728 0 0
~~common/caulk 224 128 0 0.25 0.25 134217728 0 0
*common/caulk 224 128 0 0.25 0.25 134217728 0 0
exx/panel-q201e 241.1918334961 0 0 0.2309698761 0.25 134217728 0 0
exx/panel-q201e 161.4794921875 0 0 0.2309699059 0.25 134217728 0 0
}
{
exx/panel-q201e 229.478515625 139.4568481445 157.5 0.25 ~~0.25 134217728 0 0
exx/panel-q201e 25.2475585938 0 0 0.2309699059 0.25 134217728 0 0
~~ exx/panel-q201e 31.2459106445 0 0 ~~0.2309701443 0.25 134217728 0 0
*exx/panel-q201e 31.2459106445 0 0
0.2309701443 0.25 134217728 0 0 common/caulk 160 32 00.25 0.25 134217728 0 0 ~~exx/panel-q201e 131.2862548828 0 0 0.2309698761 0.25 134217728 0 0 ~~ exx/panel-q201e 137.2825164795 0 0 ~~0.2309699059 0.25 134217728 0 0 *exx/panel-q201e 131.2862548828 0 0 0.2309698761 0.25 134217728 0 0 - exx/panel-q201e 137.2825164795 0 0~~0.2309699059 0.25 134217728 0 0
}
{
exx/panel-q201e 60.0023193359 59.9714355469 157.5 0.25 ~~0.25 134217728 0 0
exx/panel-q201e 246.6110076904 0 0 0.2309699059 0.25 134217728 0 0
~~ exx/panel-q201e 190.8840637207 0 0 ~~0.2309701443 0.25 134217728 0 0
*exx/panel-q201e 190.8840637207 0 0
0.2309701443 0.25 134217728 0 0 common/caulk 32 64 00.25 0.25 134217728 0 0 ~~exx/panel-q201e 96.6497039795 0 0 0.2309698761 0.25 134217728 0 0 ~~ exx/panel-q201e 40.921081543 0 0 ~~0.2309699059 0.25 134217728 0 0 *exx/panel-q201e 96.6497039795 0 0 0.2309698761 0.25 134217728 0 0 - exx/panel-q201e 40.921081543 0 0~~0.2309699059 0.25 134217728 0 0 } { exx/panel-q201e 247.4343261719 123.685333252 22.5 0.25 0.25 134217728 0 0 exx/panel-q201e 190.8821411133 0 0 0.2309699059 0.25 134217728 0 0 exx/panel-q201e 166.8974609375 0 0 0.2309701443 0.25 134217728 0 0 ~~common/caulk 32 96 0 0.25 0.25 134217728 0 0 *common/caulk 32 96 0 0.25 0.25 134217728 0 0 exx/panel-q201e 40.9207763672 0 0 0.2309698761 0.25 134217728 0 0 exx/panel-q201e 16.9373168945 0 0 0.2309699059 0.25 134217728 0 0 } { exx/panel-q201e 72.3156738281 62.9426269531 112.5 0.25 0.25 134217728 0 0 exx/panel-q201e 142.7014465332 0 0 ~~0.2309699059 0.25 134217728 0 0 ~~ exx/panel-q201e 204.4289550781 0 0 0.2309701443 0.25 134217728 0 0
- exx/panel-q201e 204.4289550781 0 0 0.2309701443 0.25 134217728 0 0 exx/panel-q201e 72.3196411133 62.9424438477 112.5 0.2500006258 0.2500003576 134217728 0 0 ~~ exx/panel-q201e 248.7401123047 0 0 ~~0.2309698761 0.25 134217728 0 0 ~~ exx/panel-q201e 54.4653930664 0 0 0.2309699059 0.25 134217728 0 0
- exx/panel-q201e 248.7401123047 0 0~~0.2309698761 0.25 134217728 0 0
- exx/panel-q201e 54.4653930664 0 0 0.2309699059 0.25 134217728 0 0
}
{
exx/panel-q201e 249.1154174805 212.6103363037~~22.5 0.25 ~~0.25 134217728 0 0
~~ exx/panel-q201e 14.8078918457 0 0 ~~0.2309699059 0.25 134217728 0 0
~~ exx/panel-q201e 62.9880981445 0 0 0.2309701443 0.25 134217728 0 0
exx/panel-q201e 249.1105651855 212.612258911122.5 0.2500006258 ~~0.2500003576 134217728 0 0 *exx/panel-q201e 14.8078918457 0 0 ~~0.2309699059 0.25 134217728 0 0 *exx/panel-q201e 62.9880981445 0 0 0.2309701443 0.25 134217728 0 0 - exx/panel-q201e 249.1105651855 212.6122589111~~22.5 0.2500006258
0.2500003576 134217728 0 0 exx/panel-q201e 120.8469085693 0 00.2309698761 0.25 134217728 0 0 exx/panel-q201e 169.0275268555 0 0 0.2309699059 0.25 134217728 0 0 } { exx/panel-q201e 35.9614028931 28.3363037109 67.5 0.25 ~~0.25 134217728 0 0 ~~ exx/panel-q201e 180.4424285889 0 0 0.2309699059 0.25 134217728 0 0 ~~exx/panel-q201e 73.4305725098 0 0 0.2309701443 0.25 134217728 0 0 ~~ exx/panel-q201e 35.9624137878 28.3392028809 67.5 0.2500006258 ~~0.2500003576 134217728 0 0 ~~ exx/panel-q201e 30.4814300537 0 0 0.2309698761 0.25 134217728 0 0 ~~exx/panel-q201e 179.4674072266 0 0 0.2309699059 0.25 134217728 0 0 *exx/panel-q201e 180.4424285889 0 0 0.2309699059 0.25 134217728 0 0 - exx/panel-q201e 73.4305725098 0 0 0.2309701443 0.25 134217728 0 0 *exx/panel-q201e 35.9624137878 28.3392028809 67.5 0.2500006258 ~~0.2500003576 134217728 0 0 *exx/panel-q201e 30.4814300537 0 0 0.2309698761 0.25 134217728 0 0
- exx/panel-q201e 179.4674072266 0 0 0.2309699059 0.25 134217728 0 0
}
{
~~ exx/panel-q201e 209.6502990723 19.1119689941 158 0.2500004768 ~~0.2500003874 134217728 0 0
*exx/panel-q201e 209.6502990723 19.1119689941 158 0.2500004768
0.2500003874 134217728 0 0 exx/panel-q201e 158.7070007324 0 0 0.2317957878 0.25 134217728 0 0 exx/panel-q201e 227.6776580811 0 00.2317960709 0.25 134217728 0 0 common/caulk 128 64 0 0.25 0.25 134217728 0 0@ -1004,83 +1004,83
@ exx/base-metal03 } { exx/panel-q201e 84.7792053223 237.034591674822.5 0.250.25 134217728 0 0exx/panel-q201e 28.3520507812 0 00.2309699059 0.25 134217728 0 0 ~~exx/panel-q201e 14.8071899414 0 0 0.2309701443 0.25 134217728 0 0 ~~ exx/panel-q201e 84.7741165161 237.036102294922.5 0.25000062580.2500003576 134217728 0 0 - exx/panel-q201e 28.3520507813 0 0~~0.2309699059 0.25 134217728 0 0
- exx/panel-q201e 14.8071899414 0 0 0.2309701443 0.25 134217728 0 0
*exx/panel-q201e 84.7741165161 237.0361022949
22.5 0.25000062580.2500003576 134217728 0 0 exx/panel-q201e 134.3910827637 0 00.2309698761 0.25 134217728 0 0 exx/panel-q201e 120.846824646 0 0 0.2309699059 0.25 134217728 0 0 } { exx/panel-q201e 139.7728729248 126.686721801822.5 0.25 ~~0.25 134217728 0 0 ~~ exx/panel-q201e 55.4404067993 0 0 ~~0.2309699059 0.25 134217728 0 0 ~~ exx/panel-q201e 236.1706848145 0 0 0.2309701443 0.25 134217728 0 0exx/panel-q201e 139.7682800293 126.687652587922.5 0.2500006258 ~~0.2500003576 134217728 0 0 *exx/panel-q201e 55.4404067993 0 0 ~~0.2309699059 0.25 134217728 0 0 *exx/panel-q201e 236.1706848145 0 0 0.2309701443 0.25 134217728 0 0 - exx/panel-q201e 139.7682800293 126.6876525879~~22.5 0.2500006258
0.2500003576 134217728 0 0 exx/panel-q201e 161.4793701172 0 00.2309698761 0.25 134217728 0 0 exx/panel-q201e 86.2102813721 0 0 0.2309699059 0.25 134217728 0 0 } { exx/panel-q201e 158.4196472168 244.6948699951 ~~157.5 0.25 0.25 134217728 0 0 ~~ exx/panel-q201e 14.8079223633 0 0 ~~0.2309699059 0.25 134217728 0 0 ~~ exx/panel-q201e 73.4307556152 0 0 ~~0.2309701443 0.25 134217728 0 0 ~~ exx/panel-q201e 158.4208374023 244.6982116699 ~~157.5 0.2500006258 0.2500003576 134217728 0 0 ~~ exx/panel-q201e 120.8469543457 0 0 ~~0.2309698761 0.25 134217728 0 0 ~~ exx/panel-q201e 179.4672241211 0 0 ~~0.2309699059 0.25 134217728 0 0 *exx/panel-q201e 14.8079223633 0 0 ~~0.2309699059 0.25 134217728 0 0 *exx/panel-q201e 73.4307556152 0 0 ~~0.2309701443 0.25 134217728 0 0 *exx/panel-q201e 158.4208374023 244.6982116699 ~~157.5 0.2500006258 0.2500003576 134217728 0 0 *exx/panel-q201e 120.8469543457 0 0 ~~0.2309698761 0.25 134217728 0 0 *exx/panel-q201e 179.4672241211 0 00.2309699059 0.25 134217728 0 0 } { exx/panel-q201e 197.2281036377 119.715789794922.5 0.25 ~~0.25 134217728 0 0 ~~ exx/panel-q201e 236.1713562012 0 0 ~~0.2309699059 0.25 134217728 0 0 ~~ exx/panel-q201e 228.6229858398 0 0 0.2309701443 0.25 134217728 0 0exx/panel-q201e 197.2239990234 119.717834472722.5 0.2500006258 ~~0.2500003576 134217728 0 0 *exx/panel-q201e 236.1713562012 0 0 ~~0.2309699059 0.25 134217728 0 0 *exx/panel-q201e 228.6229858398 0 0 0.2309701443 0.25 134217728 0 0 - exx/panel-q201e 197.2239990234 119.7178344727~~22.5 0.2500006258
0.2500003576 134217728 0 0 exx/panel-q201e 86.210357666 0 00.2309698761 0.25 134217728 0 0 exx/panel-q201e 78.6620635986 0 0 0.2309699059 0.25 134217728 0 0 } { exx/panel-q201e 252.1542663574 232.832443237322.5 0.250.25 134217728 0 0exx/panel-q201e 145.8058776855 0 00.2309699059 0.25 134217728 0 0 ~~exx/panel-q201e 180.4420623779 0 0 0.2309701443 0.25 134217728 0 0 ~~ exx/panel-q201e 252.1500244141 232.833953857422.5 0.25000062580.2500003576 134217728 0 0 - exx/panel-q201e 145.8058776855 0 0~~0.2309699059 0.25 134217728 0 0
- exx/panel-q201e 180.4420623779 0 0 0.2309701443 0.25 134217728 0 0
*exx/panel-q201e 252.1500244141 232.8339538574
22.5 0.25000062580.2500003576 134217728 0 0 exx/panel-q201e 251.8448791504 0 00.2309698761 0.25 134217728 0 0 exx/panel-q201e 30.4813613892 0 0 0.2309699059 0.25 134217728 0 0 } { exx/panel-q201e 118.7781829834 122.2361907959157.5 0.25 0.25 134217728 0 0exx/panel-q201e 14.8078918457 0 00.2309699059 0.25 134217728 0 0exx/panel-q201e 239.0656433105 0 00.2309701443 0.25 134217728 0 0exx/panel-q201e 118.7801437378 122.2397155762157.5 0.2500006258 0.2500003576 134217728 0 0exx/panel-q201e 120.8469390869 0 00.2309698761 0.25 134217728 0 0exx/panel-q201e 89.1017303467 0 00.2309699059 0.25 134217728 0 0 - exx/panel-q201e 14.8078918457 0 0~~0.2309699059 0.25 134217728 0 0
- exx/panel-q201e 239.0656433105 0 0~~0.2309701443 0.25 134217728 0 0
- exx/panel-q201e 118.7801437378 122.2397155762~~157.5 0.2500006258 0.2500003576 134217728 0 0
- exx/panel-q201e 120.8469390869 0 0~~0.2309698761 0.25 134217728 0 0
- exx/panel-q201e 89.1017303467 0 0~~0.2309699059 0.25 134217728 0 0
}
{
exx/panel-q201e 144.1402282715 223.1069793701 ~~157.5 0.25 0.25 134217728 0 0
~~ exx/panel-q201e 180.4424285889 0 0 ~~0.2309699059 0.25 134217728 0 0
~~ exx/panel-q201e 156.2481994629 0 0 ~~0.2309701443 0.25 134217728 0 0
~~ exx/panel-q201e 144.1420898438 223.1099700928 ~~157.5 0.2500006258 0.2500003576 134217728 0 0
~~ exx/panel-q201e 30.4814453125 0 0 ~~0.2309698761 0.25 134217728 0 0
~~ exx/panel-q201e 6.2844848633 0 0 ~~0.2309699059 0.25 134217728 0 0
*exx/panel-q201e 180.4424285889 0 0 ~~0.2309699059 0.25 134217728 0 0
*exx/panel-q201e 156.2481994629 0 0 ~~0.2309701443 0.25 134217728 0 0
*exx/panel-q201e 144.1420898438 223.1099700928 ~~157.5 0.2500006258 0.2500003576 134217728 0 0
*exx/panel-q201e 30.4814453125 0 0 ~~0.2309698761 0.25 134217728 0 0
*exx/panel-q201e 6.2844848633 0 0
0.2309699059 0.25 134217728 0 0 } { exx/panel-q201e 220.4725189209 236.348983764667.5 0.25 0.25 134217728 0 0 exx/panel-q201e 107.8511962891 64 0 0.2309699059 0.25 134217728 0 0exx/panel-q201e 116.9586410522 64 00.2309701443 0.25 134217728 0 0 - exx/panel-q201e 116.9586410522 64 0~~0.2309701443 0.25 134217728 0 0
exx/panel-q201e 220.4898529053 236.3437194824 ~~67.5 0.2500006258 0.2500003576 134217728 0 0
~~ exx/panel-q201e 213.8902893066 64 0 0.2309698761 0.25 134217728 0 0
exx/panel-q201e 222.9915618896 64 00.2309699059 0.25 134217728 0 0 - exx/panel-q201e 213.8902893066 64 0 0.2309698761 0.25 134217728 0 0 *exx/panel-q201e 222.9915618896 64 0 ~~0.2309699059 0.25 134217728 0 0 } { ~~ exx/panel-q201e 113.3254394531 222.7473144531 22.5 0.1250003129 0.1250000596 134217728 0 0
- exx/panel-q201e 113.3254394531 222.7473144531 22.5 0.1250003129 0.1250000596 134217728 0 0 exx/panel-q201e 204.4273681641~~0 0 0.1154850274 0.125 134217728 0 0 exx/panel-q201e 29.9016113281 ~~0 0 0.1154850721 0.125 134217728 0 0 ~~ common/caulk 39.3364257812 23.6030273438 0 0.163320601 0.163320452 134217728 0 0
- common/caulk 39.3364257813 23.6030273438 0 0.163320601 0.163320452 134217728 0 0
exx/panel-q201e 54.46484375~~0 0 0.115484938 0.125 134217728 0 0
exx/panel-q201e 135.93774414060 0 0.115485169 0.125 134217728 0 0 - exx/panel-q201e 135.9377441406~~0 0 0.115485169 0.125 134217728 0 0 } { exx/panel-q201e 4.6480712891 150.6296386719 112.5 0.25 0.25 134217728 0 0 exx/panel-q201e 239.0627441406 0 0 ~~0.2309699059 0.25 134217728 0 0 ~~ exx/panel-q201e 129.1591796875 0 0 0.2309701443 0.25 134217728 0 0
- exx/panel-q201e 129.1591796875 0 0 0.2309701443 0.25 134217728 0 0 exx/panel-q201e 4.6510620117 150.62890625 112.5 0.2500006258 0.2500003576 134217728 0 0 ~~ exx/panel-q201e 89.1015625 0 0 ~~0.2309698761 0.25 134217728 0 0 ~~ exx/panel-q201e 235.1963195801 0 0 0.2309699059 0.25 134217728 0 0
- exx/panel-q201e 89.1015625 0 0~~0.2309698761 0.25 134217728 0 0
- exx/panel-q201e 235.1963195801 0 0 0.2309699059 0.25 134217728 0 0
}
{
exx/trim-horz01 0~~0 0
0.25 0.25 0 0 022.4999980927 0.2500007749 0.2500000298 134217728 0 0 exx/panel-q201e 117.7427368164 0 0 0.2309700102 0.25 134217728 0 0 ~~exx/panel-q201e 115.4140625 0 0 0.2309703827 0.25 134217728 0 0 ~~ common/caulk 58.0825195312 203.8013916016 0 0.3266410828 0.3266408741 134217728 0 0 ~~exx/panel-q201e 11.7036132812 0 0 0.2309699059 0.25 134217728 0 0 ~~ exx/panel-q201e 221.4526367188 0 0 0.2309703827 0.25 134217728 0 0@ -1743,10 +1743,10
@ exx/base-metal03 { exx/panel-q201e 151.166015625 104.5002441406 - exx/panel-q201e 115.4140625 0 0 0.2309703827 0.25 134217728 0 0 *common/caulk 58.0825195313 203.8013916016 0 0.3266410828 0.3266408741 134217728 0 0
- exx/panel-q201e 11.7036132813 0 0 0.2309699059 0.25 134217728 0 0
*exx/panel-q201e 221.4526367188 0 0 0.2309703827 0.25 134217728 0 0
}
{
common/caulk 0 0 0 0.25 0.25 0 0 0
@ -1942,7 +1942,7
@ exx/base-metal03 exx/panel-q201e 36.1849365234 112 0 0.177739203 0.25 134217728 0 0 exx/panel-q201e 104.129699707 201.3624267578 44.6871986389 0.250000447 0.2500001192 134217728 0 0 exx/panel-q201e 160.4155273438 112 0 0.1777391434 0.25 134217728 0 0 ~~exx/panel-q201e 33.4028320312 112 0 0.177739501 0.25 134217728 0 0 *exx/panel-q201e 33.4028320313 112 0 0.177739501 0.25 134217728 0 0 } { exx/floor-crete01 256 090 0.25 0.25 0 0 022.5 0.25 ~~0.25 134217728 0 0 ~~ exx/panel-q201e 201.5347900391 0 0 ~~0.2309699059 0.25 134217728 0 0 ~~ exx/panel-q201e 180.4421386719 0 0 0.2309701443 0.25 134217728 0 0@ -3951,35 +3951,35
@ exx/base-metal03 } { exx/panel-q201e 106.3671875 222.7551269531exx/panel-q201e 106.3627929688 222.757080078122.5 0.2500006258 ~~0.2500003576 134217728 0 0 *exx/panel-q201e 201.5347900391 0 0 ~~0.2309699059 0.25 134217728 0 0 *exx/panel-q201e 180.4421386719 0 0 0.2309701443 0.25 134217728 0 0 - exx/panel-q201e 106.3627929688 222.7570800781~~22.5 0.2500006258
0.2500003576 134217728 0 0 exx/panel-q201e 51.5738525391 0 00.2309698761 0.25 134217728 0 0 exx/panel-q201e 30.4814453125 0 0 0.2309699059 0.25 134217728 0 0 } { exx/panel-q201e 74.9368896484 88.4045410156 ~~157.5 0.2500004172 0.2500001788 134217728 0 0 ~~ exx/panel-q201e 180.44128417970 00.2309700549 0.25 134217728 0 0exx/panel-q201e 31.24548339840 0 ~~0.2309701443 0.25 134217728 0 0 ~~ exx/panel-q201e 74.9379272461 88.4036865234 ~~157.5 0.2500007153 0.2500000894 134217728 0 0 ~~ exx/panel-q201e 30.48132324220 00.2309698761 0.25 134217728 0 0exx/panel-q201e 137.28564453120 0 ~~0.230970338 0.25 134217728 0 0 *exx/panel-q201e 180.44128417970 00.2309700549 0.25 134217728 0 0 - exx/panel-q201e 31.2454833984~~0 0 ~~0.2309701443 0.25 134217728 0 0
*exx/panel-q201e 74.9379272461 88.4036865234 ~~157.5 0.2500007153 0.2500000894 134217728 0 0
*exx/panel-q201e 30.4813232422
0 00.2309698761 0.25 134217728 0 0 - exx/panel-q201e 137.2856445313~~0 0
0.230970338 0.25 134217728 0 0 } { exx/panel-q201e 125.4133605957 25.889251709112.5 0.25 ~~0.25 134217728 0 0 ~~ exx/panel-q201e 201.7474060059 64 0 ~~0.2309699059 0.25 134217728 0 0 ~~ exx/panel-q201e 220.8680114746 64 0 ~~0.2309701443 0.25 134217728 0 0 ~~ exx/panel-q201e 125.4178924561 25.9013977051112.5 0.25000062580.2500003576 134217728 0 0exx/panel-q201e 51.7874450684 64 00.2309698761 0.25 134217728 0 0exx/panel-q201e 70.9010772705 64 00.2309699059 0.25 134217728 0 0 - exx/panel-q201e 201.7474060059 64 0~~0.2309699059 0.25 134217728 0 0
- exx/panel-q201e 220.8680114746 64 0~~0.2309701443 0.25 134217728 0 0
- exx/panel-q201e 125.4178924561 25.9013977051~~112.5 0.2500006258 ~~0.2500003576 134217728 0 0
*exx/panel-q201e 51.7874450684 64 0 ~~0.2309698761 0.25 134217728 0 0
*exx/panel-q201e 70.9010772705 64 0 ~~0.2309699059 0.25 134217728 0 0
}
{
~~ exx/panel-q201e 119.3188476562 126.5202636719
112.5 0.250.25 134217728 0 0exx/panel-q201e 186.4378356934 64 00.2309699059 0.25 134217728 0 0exx/panel-q201e 91.4208984375 64 00.2309701443 0.25 134217728 0 0exx/panel-q201e 119.3251953125 126.5231933594112.5 0.2500006258 ~~0.2500003576 134217728 0 0 ~~ exx/panel-q201e 36.4773864746 64 0 ~~0.2309698761 0.25 134217728 0 0 ~~ exx/panel-q201e 197.455078125 64 0 ~~0.2309699059 0.25 134217728 0 0 *exx/panel-q201e 119.3188476563 126.5202636719112.5 0.250.25 134217728 0 0 - exx/panel-q201e 186.4378356934 64 0~~0.2309699059 0.25 134217728 0 0
- exx/panel-q201e 91.4208984375 64 0~~0.2309701443 0.25 134217728 0 0
- exx/panel-q201e 119.3251953125 126.5231933594~~112.5 0.2500006258 ~~0.2500003576 134217728 0 0
*exx/panel-q201e 36.4773864746 64 0 ~~0.2309698761 0.25 134217728 0 0
*exx/panel-q201e 197.455078125 64 0
0.2309699059 0.25 134217728 0 0 } { exx/base-metal03 0 0 0 0.25 0.25 134217728 0 068 0.2500009239 0.2500000298 134217728 0 0 exx/panel-q201e 26.0208740234 0 0 0.2317958921 0.25 134217728 0 0 exx/panel-q201e 40.0309448242 0 0 ~~0.2317962497 0.25 134217728 0 0 ~~ common/caulk 224 224 0 0.25 0.25 134217728 0 0@ -4042,20 +4042,20
@ exx/base-metal03 exx/panel-q201e 92.9505615234 233.8619384766 - common/caulk 224 224 0 0.25 0.25 134217728 0 0
exx/panel-q201e 129.4518127441 0 0 0.2317958623 0.25 134217728 0 0
exx/panel-q201e 143.4437255859 0 0~~0.2317969948 0.25 134217728 0 0
}
{
exx/panel-q201e 5.3866271973 209.490692138722 0.2500005662 ~~0.2500002682 134217728 0 0 *exx/panel-q201e 5.3866271973 209.490692138722 0.25000056620.2500002682 134217728 0 0 exx/panel-q201e 255.5546875 0 0 ~~0.2317958921 0.25 134217728 0 0 exx/panel-q201e 221.9808807373 0 0 0.2317960262 0.25 134217728 0 0 common/caulk 128 0 0 0.25 0.25 134217728 0 0 ~~ exx/panel-q201e 102.9956359863 0 0 ~~0.2317954451 0.25 134217728 0 0 *exx/panel-q201e 102.9956359863 0 0 ~~0.2317954451 0.25 134217728 0 0 exx/panel-q201e 69.4133300781 0 0 0.2317963243 0.25 134217728 0 0 } { ~~ exx/panel-q201e 135.393447876 245.7683563232 22 0.2500003278 0.2499997914 134217728 0 0 - exx/panel-q201e 135.393447876 245.7683563232 22 0.2500003278 0.2499997914 134217728 0 0
exx/panel-q201e 49.4760742188 0 0 0.2317961305 0.25 134217728 0 0
exx/panel-q201e 141.5616912842 0 0 0.2317960262 0.25 134217728 0 0
common/caulk 32 64 0 0.25 0.25 134217728 0 0
@ -4063,7 +4063,7
@ exx/base-metal03 exx/panel-q201e 244.9953918457 0 0 0.2317963243 0.25 134217728 0 0 } { ~~ exx/panel-q201e 152.4785003662 203.7500915527 22 0.2500003278 0.2499997914 134217728 0 0 - exx/panel-q201e 152.4785003662 203.7500915527 22 0.2500003278 0.2499997914 134217728 0 0
exx/panel-q201e 98.3975601196 0 0 0.2317961305 0.25 134217728 0 0
exx/panel-q201e 245.1005096436 0 0 0.2317960262 0.25 134217728 0 0
exx/panel-q201e 152.4787445068 203.7447052002 21.9999961853 0.2500003576 0.2500002682 134217728 0 0
@ -4071,7 +4071,7
@ exx/base-metal03 exx/panel-q201e 92.5345458984 0 0 0.2317963243 0.25 134217728 0 0 } { ~~ exx/panel-q201e 247.4576721191 141.7643585205 158 0.3534998 ~~0.3534999788 134217728 0 0
- exx/panel-q201e 247.4576721191 141.7643585205 158 0.3534998~~0.3534999788 134217728 0 0
exx/panel-q201e 158.7153015137 0 0 0.2317963243 0.25 134217728 0 0
exx/panel-q201e 180.7832489014 0 0
0.2317960262 0.25 134217728 0 0 common/caulk 1280 0 0.25 0.25 134217728 0 0@ -4262,9 +4262,9
@ exx/base-metal03 } { exx/panel-q201e 181.5457305908 196.4449157715 158 0.2500003278 ~~0.2499997914 134217728 0 0 ~~ exx/panel-q201e 132.9106445312 0 0 0.2317961305 0.25 134217728 0 0
- exx/panel-q201e 132.9106445313 0 0 0.2317961305 0.25 134217728 0 0
exx/panel-q201e 123.804107666 0 0~~0.2317960262 0.25 134217728 0 0
~~common/caulk 32 64 0 0.25 0.25 134217728 0 0
*common/caulk 32 64 0 0.25 0.25 134217728 0 0
exx/panel-q201e 236.341796875 0 0 0.2317961305 0.25 134217728 0 0
exx/panel-q201e 227.2320709229 0 0
0.2317963243 0.25 134217728 0 0 }0.2499997914 134217728 0 0 exx/panel-q201e 112.8059463501 0 0 0.2317961305 0.25 134217728 0 0 exx/panel-q201e 178.4220123291 0 0 ~~0.2317960262 0.25 134217728 0 0 ~~ common/caulk 32 64 0 0.25 0.25 134217728 0 0@ -4272,7 +4272,7
@ exx/base-metal03 exx/panel-q201e 96.6751556396 29.6909790039 158 0.2500003278 - common/caulk 32 64 0 0.25 0.25 134217728 0 0
exx/panel-q201e 216.2370910645 0 0 0.2317961305 0.25 134217728 0 0
exx/panel-q201e 25.8496131897 0 0~~0.2317963243 0.25 134217728 0 0
}
@ -7890,18 +7890,18
@ exx/base-metal01 { exx/panel-q201e 88.470703125 213.5995635986 112.5 0.25 0.25 134217728 0 0 exx/panel-q201e 148.6972808838 0 0 ~~0.2309699059 0.25 134217728 0 0 ~~ exx/panel-q201e 239.0654602051 0 0 0.2309701443 0.25 134217728 0 0 - exx/panel-q201e 239.0654602051 0 0 0.2309701443 0.25 134217728 0 0 exx/panel-q201e 88.4753417969 213.5987701416 112.5 0.2500006258 0.2500003576 134217728 0 0 ~~ exx/panel-q201e 254.736038208 0 0 ~~0.2309698761 0.25 134217728 0 0 ~~ exx/panel-q201e 89.1019897461 0 0 0.2309699059 0.25 134217728 0 0
- exx/panel-q201e 254.736038208 0 0~~0.2309698761 0.25 134217728 0 0
- exx/panel-q201e 89.1019897461 0 0 0.2309699059 0.25 134217728 0 0 } { exx/panel-q201e 27.1740112305 72.8848876953 112.5 0.25 0.25 134217728 0 0 exx/panel-q201e 114.0610046387 0 0~~0.2309699059 0.25 134217728 0 0 ~~exx/panel-q201e 225.5209960938 0 0 0.2309701443 0.25 134217728 0 0
- exx/panel-q201e 225.5209960938 0 0 0.2309701443 0.25 134217728 0 0 common/caulk 64 128 90 0.25 0.25 134217728 0 0 ~~ exx/panel-q201e 220.0994110107 0 0 ~~0.2309698761 0.25 134217728 0 0 ~~ exx/panel-q201e 75.5576782227 0 0 0.2309699059 0.25 134217728 0 0
- exx/panel-q201e 220.0994110107 0 0~~0.2309698761 0.25 134217728 0 0
- exx/panel-q201e 75.5576782227 0 0 0.2309699059 0.25 134217728 0 0
}
{
exx/panel-metal04 0 0 0 0.25 0.25 0 0 0
@ -7913,25 +7913,25
@ exx/base-metal01 } { exx/panel-q201e 130.1620941162 20.6665649414~~22.5000019073 0.2500004172 0.2500006258 134217728 0 0exx/panel-q201e 105.5478515625 0 00.2309703529 0.25 134217728 0 0 ~~exx/panel-q201e 38.9979248047 0 0 0.2309702635 0.25 134217728 0 0 ~~ exx/panel-q201e 130.1620941162 20.6707763672 ~~22.5000019073 0.2500004172 0.2500007749 134217728 0 0 *exx/panel-q201e 105.5478515625 0 0 ~~0.2309703529 0.25 134217728 0 0 *exx/panel-q201e 38.9979248047 0 0 0.2309702635 0.25 134217728 0 0 - exx/panel-q201e 130.1620941162 20.6707763672~~22.5000019073 0.2500004172 0.2500007749 134217728 0 0
exx/panel-q201e 255.498046875 0 0
0.2309698761 0.25 134217728 0 0 exx/panel-q201e 145.0347900391 0 0 0.230970338 0.25 134217728 0 0 } { exx/panel-q201e 5.4811096191 143.9935302734 157.5 0.25000050660.2500005364 134217728 0 0 ~~exx/panel-q201e 121.8215942383 0 0 0.2309699059 0.25 134217728 0 0 ~~ exx/panel-q201e 186.2252349854 0 0 ~~0.2309699059 0.25 134217728 0 0 ~~ common/caulk 245.2547149658 89.5527954102 0 ~~0.3266406953 0.3266411424 134217728 0 0 ~~ exx/panel-q201e 227.8612060547 0 0 0.2309698761 0.25 134217728 0 0exx/panel-q201e 36.2763442993 0 00.2309704423 0.25 134217728 0 0 - exx/panel-q201e 121.8215942383 0 0 0.2309699059 0.25 134217728 0 0
- exx/panel-q201e 186.2252349854 0 0~~0.2309699059 0.25 134217728 0 0
- (~~1177.2514648438 –1006.0727539