From: itsme Date: Thu, 5 Jan 2012 22:39:06 +0000 (+0100) Subject: fix http://dev.xonotic.org/issues/966 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0f623274eaa47f2ba3bfc5805d291a7406dbb35b;p=xonotic%2Fxonotic-maps.pk3dir.git fix http://dev.xonotic.org/issues/966 --- diff --git a/maps/strength.map b/maps/strength.map index 7193302a..5b64c683 100644 --- a/maps/strength.map +++ b/maps/strength.map @@ -9141,14 +9141,6 @@ ( 1344 1920 736 ) ( 1200 1920 736 ) ( 1200 1792 736 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0 } { -( 1328 1872 736 ) ( 1328 1840 736 ) ( 1328 1840 720 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0 -( 1344 1872 736 ) ( 1328 1872 736 ) ( 1328 1872 720 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0 -( 1344 1840 736 ) ( 1344 1872 736 ) ( 1344 1872 720 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0 -( 1328 1840 736 ) ( 1344 1840 736 ) ( 1344 1840 720 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0 -( 1328 1840 736 ) ( 1328 1872 736 ) ( 1344 1872 736 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0 -( 1344 1872 720 ) ( 1328 1872 720 ) ( 1328 1840 720 ) exx/base-metal02 256 0 -180 0.25 -0.25 134217728 0 0 -} -{ ( 1200 1872 720 ) ( 1184 1872 720 ) ( 1184 1840 720 ) exx/base-metal02 -128 0 0 0.25 -0.25 134217728 0 0 ( 1184 1840 736 ) ( 1184 1872 736 ) ( 1200 1872 736 ) common/caulk 32 0 0 0.5 0.5 134217728 0 0 ( 1184 1840 736 ) ( 1200 1840 736 ) ( 1200 1840 720 ) common/caulk 32 0 0 0.5 0.5 134217728 0 0 @@ -15686,6 +15678,14 @@ map_strength/sand ( 472 0 1952 ) ( 472 0 1984 ) ( 600 0 1952 ) common/clip 0 0 0 0.5 0.5 0 0 0 ( 480 -16 1952 ) ( 480 48 1952 ) ( 480 -16 1984 ) common/clip 0 0 0 0.5 0.5 0 0 0 } +{ +( 1344 1872 720 ) ( 1328 1872 720 ) ( 1328 1840 720 ) exx/base-metal02 256 0 0 -0.25 0.25 134217728 0 0 +( 1328 1840 736 ) ( 1328 1872 736 ) ( 1344 1872 736 ) common/caulk 192 0 0 0.5 0.5 134217728 0 0 +( 1328 1840 736 ) ( 1344 1840 736 ) ( 1344 1840 720 ) common/caulk 192 0 0 0.5 0.5 134217728 0 0 +( 1344 1840 736 ) ( 1344 1872 736 ) ( 1344 1872 720 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0 +( 1344 1872 736 ) ( 1328 1872 736 ) ( 1328 1872 720 ) common/caulk 192 0 0 0.5 0.5 134217728 0 0 +( 1328 1872 736 ) ( 1328 1840 736 ) ( 1328 1840 720 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0 +} } { "classname" "weapon_railgun" @@ -22399,14 +22399,6 @@ exx/base-metal07rust { "classname" "func_group" { -( 1312 1872 720 ) ( 1344 1872 720 ) ( 1344 1920 720 ) exx/base-metal02 256 0 -180 0.25 -0.25 134217728 0 0 -( 1344 1920 736 ) ( 1344 1792 736 ) ( 1312 1792 736 ) common/caulk 0 -63 -180 0.5 0.5 134217728 0 0 -( 1344 1904 736 ) ( 1312 1904 736 ) ( 1312 1904 720 ) exx/base-metal02 256 257 -180 0.25 0.25 134217728 0 0 -( 1344 1792 736 ) ( 1344 1920 736 ) ( 1344 1920 720 ) common/caulk 0 63 -180 0.5 -0.5 134217728 0 0 -( 1344 1872 720 ) ( 1312 1872 720 ) ( 1312 1888 736 ) common/caulk 0 -63 -180 0.5 0.5 134217728 0 0 -( 1312 1872 736 ) ( 1328 1872 720 ) ( 1312 1920 736 ) exx/base-metal02 256 0 -180 0.25 -0.25 134217728 0 0 -} -{ ( 1360 1680 704 ) ( 1392 1680 704 ) ( 1392 2016 704 ) exx/panel-q201e 0 -252 0 0.125 -0.125 134217728 0 0 ( 1392 1920 736 ) ( 1360 1920 736 ) ( 1360 1920 704 ) exx/panel-q201e 0 4 0 0.125 0.125 134217728 0 0 ( 1344 2016 736 ) ( 1344 1680 736 ) ( 1344 1680 704 ) exx/panel-q201e 0 4 0 0.125 0.125 134217728 0 0 @@ -22414,38 +22406,6 @@ exx/base-metal07rust ( 1376 1824 704 ) ( 1344 1824 736 ) ( 1344 1888 736 ) common/caulk 32 -63 -180 0.5 0.5 134217728 0 0 } { -( 1312 1792 736 ) ( 1328 1840 720 ) ( 1312 1840 736 ) exx/base-metal02 256 0 -180 0.25 -0.25 134217728 0 0 -( 1312 1824 736 ) ( 1312 1840 720 ) ( 1344 1840 720 ) common/caulk 0 -63 -180 0.5 0.5 134217728 0 0 -( 1344 1792 720 ) ( 1344 1792 736 ) ( 1344 1920 736 ) common/caulk 0 63 -180 0.5 -0.5 134217728 0 0 -( 1312 1808 720 ) ( 1312 1808 736 ) ( 1344 1808 736 ) exx/base-metal02 256 257 -180 0.25 0.25 134217728 0 0 -( 1312 1920 736 ) ( 1344 1920 736 ) ( 1344 1792 736 ) common/caulk 0 -63 -180 0.5 0.5 134217728 0 0 -( 1344 1792 720 ) ( 1344 1840 720 ) ( 1312 1840 720 ) exx/base-metal02 256 0 -180 0.25 -0.25 134217728 0 0 -} -{ -( 1184 1920 720 ) ( 1184 1872 720 ) ( 1216 1872 720 ) exx/base-metal02 -128 0 0 0.25 -0.25 134217728 0 0 -( 1216 1792 736 ) ( 1184 1792 736 ) ( 1184 1920 736 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0 -( 1216 1904 720 ) ( 1216 1904 736 ) ( 1184 1904 736 ) exx/base-metal02 -128 256 0 0.25 -0.25 134217728 0 0 -( 1184 1920 720 ) ( 1184 1920 736 ) ( 1184 1792 736 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0 -( 1216 1888 736 ) ( 1216 1872 720 ) ( 1184 1872 720 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0 -( 1216 1920 736 ) ( 1200 1872 720 ) ( 1216 1872 736 ) exx/base-metal02 -128 0 0 0.25 -0.25 134217728 0 0 -} -{ -( 1200 1872 736 ) ( 1200 1840 736 ) ( 1200 1840 688 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0 -( 1328 1888 736 ) ( 1200 1888 736 ) ( 1200 1872 720 ) exx/base-metal02 -192 0 0 0.25 -0.25 134217728 0 0 -( 1328 1840 736 ) ( 1328 1872 736 ) ( 1328 1872 688 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0 -( 1200 1824 736 ) ( 1328 1824 736 ) ( 1328 1840 720 ) exx/base-metal02 -192 0 0 0.25 -0.25 134217728 0 0 -( 1328 1824 736 ) ( 1200 1824 736 ) ( 1200 1888 736 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0 -( 1328 1872 720 ) ( 1200 1872 720 ) ( 1200 1840 720 ) exx/light-panel01-surfacelight 64 192 90 0.25 -0.25 134217728 0 0 -} -{ -( 1216 1840 736 ) ( 1200 1840 720 ) ( 1216 1792 736 ) exx/base-metal02 -128 0 0 0.25 -0.25 134217728 0 0 -( 1184 1840 720 ) ( 1216 1840 720 ) ( 1216 1824 736 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0 -( 1184 1920 736 ) ( 1184 1792 736 ) ( 1184 1792 720 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0 -( 1184 1808 736 ) ( 1216 1808 736 ) ( 1216 1808 720 ) exx/base-metal02 -128 256 0 0.25 -0.25 134217728 0 0 -( 1184 1792 736 ) ( 1184 1920 736 ) ( 1216 1920 736 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0 -( 1216 1840 720 ) ( 1184 1840 720 ) ( 1184 1792 720 ) exx/base-metal02 -128 0 0 0.25 -0.25 134217728 0 0 -} -{ ( 1152 1888 704 ) ( 1184 1888 736 ) ( 1184 1824 736 ) common/caulk 32 0 0 0.5 0.5 134217728 0 0 ( 1184 1920 736 ) ( 1152 1920 736 ) ( 1152 1920 704 ) exx/panel-q201e 0 2 -180 0.125 -0.1249980032 134217728 0 0 ( 1184 1696 736 ) ( 1184 2032 736 ) ( 1184 2032 704 ) exx/panel-q201e 0 0 -180 0.125 -0.1249980032 134217728 0 0 @@ -26073,3 +26033,46 @@ exx/base-metal07rust "light" "150" "_color" "0.769665 0.881132 1.000000" } +{ +"classname" "func_group" +{ +( 1312 1872 736 ) ( 1328 1872 720 ) ( 1312 1920 736 ) exx/base-metal02 256 0 0 -0.25 0.25 134217728 0 0 +( 1344 1872 720 ) ( 1312 1872 720 ) ( 1312 1888 736 ) common/caulk 64 194 180 0.5 0.5 134217728 0 0 +( 1344 1792 736 ) ( 1344 1920 736 ) ( 1344 1920 720 ) common/caulk 0 63 0 -0.5 0.5 134217728 0 0 +( 1344 1904 736 ) ( 1312 1904 736 ) ( 1312 1904 720 ) exx/base-metal02 256 257 180 0.25 0.25 134217728 0 0 +( 1344 1920 736 ) ( 1344 1792 736 ) ( 1312 1792 736 ) common/caulk 64 194 180 0.5 0.5 134217728 0 0 +( 1312 1872 720 ) ( 1344 1872 720 ) ( 1344 1920 720 ) exx/base-metal02 256 0 0 -0.25 0.25 134217728 0 0 +} +{ +( 1344 1792 720 ) ( 1344 1840 720 ) ( 1312 1840 720 ) exx/base-metal02 256 0 0 -0.25 0.25 134217728 0 0 +( 1312 1920 736 ) ( 1344 1920 736 ) ( 1344 1792 736 ) common/caulk 64 194 180 0.5 0.5 134217728 0 0 +( 1312 1808 720 ) ( 1312 1808 736 ) ( 1344 1808 736 ) exx/base-metal02 256 257 180 0.25 0.25 134217728 0 0 +( 1344 1792 720 ) ( 1344 1792 736 ) ( 1344 1920 736 ) common/caulk 0 63 0 -0.5 0.5 134217728 0 0 +( 1312 1824 736 ) ( 1312 1840 720 ) ( 1344 1840 720 ) common/caulk 64 194 180 0.5 0.5 134217728 0 0 +( 1312 1792 736 ) ( 1328 1840 720 ) ( 1312 1840 736 ) exx/base-metal02 256 0 0 -0.25 0.25 134217728 0 0 +} +{ +( 1216 1920 736 ) ( 1200 1872 720 ) ( 1216 1872 736 ) exx/base-metal02 384 0 0 0.25 -0.25 134217728 0 0 +( 1216 1888 736 ) ( 1216 1872 720 ) ( 1184 1872 720 ) common/caulk 192 0 0 0.5 0.5 134217728 0 0 +( 1184 1920 720 ) ( 1184 1920 736 ) ( 1184 1792 736 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0 +( 1216 1904 720 ) ( 1216 1904 736 ) ( 1184 1904 736 ) exx/base-metal02 384 256 0 0.25 -0.25 134217728 0 0 +( 1216 1792 736 ) ( 1184 1792 736 ) ( 1184 1920 736 ) common/caulk 192 0 0 0.5 0.5 134217728 0 0 +( 1184 1920 720 ) ( 1184 1872 720 ) ( 1216 1872 720 ) exx/base-metal02 384 0 0 0.25 -0.25 134217728 0 0 +} +{ +( 1328 1872 720 ) ( 1200 1872 720 ) ( 1200 1840 720 ) exx/light-panel01-surfacelight 64 192 90 0.25 -0.25 134217728 0 0 +( 1328 1824 736 ) ( 1200 1824 736 ) ( 1200 1888 736 ) common/caulk 192 0 0 0.5 0.5 134217728 0 0 +( 1200 1824 736 ) ( 1328 1824 736 ) ( 1328 1840 720 ) exx/base-metal02 320 0 0 0.25 -0.25 134217728 0 0 +( 1328 1840 736 ) ( 1328 1872 736 ) ( 1328 1872 688 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0 +( 1328 1888 736 ) ( 1200 1888 736 ) ( 1200 1872 720 ) exx/base-metal02 320 0 0 0.25 -0.25 134217728 0 0 +( 1200 1872 736 ) ( 1200 1840 736 ) ( 1200 1840 688 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0 +} +{ +( 1216 1840 720 ) ( 1184 1840 720 ) ( 1184 1792 720 ) exx/base-metal02 384 0 0 0.25 -0.25 134217728 0 0 +( 1184 1792 736 ) ( 1184 1920 736 ) ( 1216 1920 736 ) common/caulk 192 0 0 0.5 0.5 134217728 0 0 +( 1184 1808 736 ) ( 1216 1808 736 ) ( 1216 1808 720 ) exx/base-metal02 384 256 0 0.25 -0.25 134217728 0 0 +( 1184 1920 736 ) ( 1184 1792 736 ) ( 1184 1792 720 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0 +( 1184 1840 720 ) ( 1216 1840 720 ) ( 1216 1824 736 ) common/caulk 192 0 0 0.5 0.5 134217728 0 0 +( 1216 1840 736 ) ( 1200 1840 720 ) ( 1216 1792 736 ) exx/base-metal02 384 0 0 0.25 -0.25 134217728 0 0 +} +}