From: SpiKe Date: Wed, 8 Dec 2021 12:18:55 +0000 (+0000) Subject: Glowplant: clip two fan ducts X-Git-Tag: xonotic-v0.8.5~26^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=876eb78a2bf70652bdff66dd7b99f3985745cf4f;p=xonotic%2Fxonotic-maps.pk3dir.git Glowplant: clip two fan ducts --- diff --git a/maps/glowplant.map b/maps/glowplant.map index aac8b8fd..194b62b8 100644 --- a/maps/glowplant.map +++ b/maps/glowplant.map @@ -13516,9 +13516,9 @@ trak5x/base-pipe1a ( 9 7 0 0 0 ) ( ( ( -141.469329834 215 27.7594337463 0 0 ) ( -146.4503173828 215 27.3236579895 0 -0.078125 ) ( -146.9732666016 215 33.3008270264 0 -0.171875 ) ( -147.1475524902 215 35.2932167053 0 -0.203125 ) ( -147.3218688965 215 37.2855987549 0 -0.234375 ) ( -147.8448181152 215 43.2627716064 0 -0.328125 ) ( -142.8638305664 215 43.698551178 0 -0.40625 ) ) -( ( -141.5564880371 215 28.7556285858 0.0220970009 0 ) ( -145.5412750244 215 28.4070034027 0.0220970009 -0.078125 ) ( -145.9770507813 215 33.3879776001 0.0220970009 -0.171875 ) ( -146.1513671875 215 35.3803710938 0.0220970009 -0.203125 ) ( -146.3256835938 215 37.3727531433 0.0220970009 -0.234375 ) ( -146.7614440918 215 42.3537330627 0.0220970009 -0.328125 ) ( -142.7766723633 215 42.7023544312 0.0220970009 -0.40625 ) ) -( ( -141.5564880371 216 28.7556285858 0.037721999 0 ) ( -145.5412750244 216 28.4070034027 0.037721999 -0.078125 ) ( -145.9770507813 216 33.3879776001 0.037721999 -0.171875 ) ( -146.1513671875 216 35.3803710938 0.037721999 -0.203125 ) ( -146.3256835938 216 37.3727531433 0.037721999 -0.234375 ) ( -146.7614440918 216 42.3537330627 0.037721999 -0.328125 ) ( -142.7766723633 216 42.7023544312 0.037721999 -0.40625 ) ) -( ( -141.5564880371 217 28.7556285858 0.053346999 0 ) ( -145.5412750244 217 28.4070034027 0.053346999 -0.078125 ) ( -145.9770507813 217 33.3879776001 0.053346999 -0.171875 ) ( -146.1513671875 217 35.3803710938 0.053346999 -0.203125 ) ( -146.3256835938 217 37.3727531433 0.053346999 -0.234375 ) ( -146.7614440918 217 42.3537330627 0.053346999 -0.328125 ) ( -142.7766723633 217 42.7023544312 0.053346999 -0.40625 ) ) +( ( -141.5564880371 215 28.7556285858 0.0220970009 0 ) ( -145.5412750244 215 28.4070034027 0.0220970009 -0.078125 ) ( -145.9770507812 215 33.3879776001 0.0220970009 -0.171875 ) ( -146.1513671875 215 35.3803710938 0.0220970009 -0.203125 ) ( -146.3256835938 215 37.3727531433 0.0220970009 -0.234375 ) ( -146.7614440918 215 42.3537330627 0.0220970009 -0.328125 ) ( -142.7766723633 215 42.7023544312 0.0220970009 -0.40625 ) ) +( ( -141.5564880371 216 28.7556285858 0.037721999 0 ) ( -145.5412750244 216 28.4070034027 0.037721999 -0.078125 ) ( -145.9770507812 216 33.3879776001 0.037721999 -0.171875 ) ( -146.1513671875 216 35.3803710938 0.037721999 -0.203125 ) ( -146.3256835938 216 37.3727531433 0.037721999 -0.234375 ) ( -146.7614440918 216 42.3537330627 0.037721999 -0.328125 ) ( -142.7766723633 216 42.7023544312 0.037721999 -0.40625 ) ) +( ( -141.5564880371 217 28.7556285858 0.053346999 0 ) ( -145.5412750244 217 28.4070034027 0.053346999 -0.078125 ) ( -145.9770507812 217 33.3879776001 0.053346999 -0.171875 ) ( -146.1513671875 217 35.3803710938 0.053346999 -0.203125 ) ( -146.3256835938 217 37.3727531433 0.053346999 -0.234375 ) ( -146.7614440918 217 42.3537330627 0.053346999 -0.328125 ) ( -142.7766723633 217 42.7023544312 0.053346999 -0.40625 ) ) ( ( -141.469329834 217 27.7594337463 0.075443998 0 ) ( -146.4503173828 217 27.3236579895 0.075443998 -0.078125 ) ( -146.9732666016 217 33.3008270264 0.075443998 -0.171875 ) ( -147.1475524902 217 35.2932167053 0.075443998 -0.203125 ) ( -147.3218688965 217 37.2855987549 0.075443998 -0.234375 ) ( -147.8448181152 217 43.2627716064 0.075443998 -0.328125 ) ( -142.8638305664 217 43.698551178 0.075443998 -0.40625 ) ) ( ( -141.3821868896 217 26.7632369995 0.097540997 0 ) ( -147.3593444824 217 26.2403049469 0.097540997 -0.078125 ) ( -147.9694519043 217 33.2136650085 0.097540997 -0.171875 ) ( -148.143737793 217 35.2060546875 0.097540997 -0.203125 ) ( -148.318069458 217 37.1984443665 0.097540997 -0.234375 ) ( -148.9281616211 217 44.1718101501 0.097540997 -0.328125 ) ( -142.9509887695 217 44.6947441101 0.097540997 -0.40625 ) ) ( ( -141.3821868896 216 26.7632369995 0.113165997 0 ) ( -147.3593444824 216 26.2403049469 0.113165997 -0.078125 ) ( -147.9694519043 216 33.2136650085 0.113165997 -0.171875 ) ( -148.143737793 216 35.2060546875 0.113165997 -0.203125 ) ( -148.318069458 216 37.1984443665 0.113165997 -0.234375 ) ( -148.9281616211 216 44.1718101501 0.113165997 -0.328125 ) ( -142.9509887695 216 44.6947441101 0.113165997 -0.40625 ) ) @@ -22032,9 +22032,9 @@ trak5x/base-base1b ( ( ( 293.854309082 -329.7939147949 353.8482971191 0 0 ) ( 293.354309082 -328.9279174805 352.1162414551 0 -0.03125 ) ( 292.8543395996 -328.0618896484 350.384185791 0 -0.0625 ) ) ( ( 294.2604064941 -323.4972839355 356.8793640137 0.125 0 ) ( 293.7604064941 -322.6312561035 355.1473083496 0.125 -0.03125 ) ( 293.2604064941 -321.7652587891 353.4153137207 0.125 -0.0625 ) ) -( ( 301.0260009766 -323.091217041 355.1293945313 0.25 0 ) ( 300.5260009766 -322.225189209 353.3973388672 0.25 -0.03125 ) ( 300.0260009766 -321.3591308594 351.6652832031 0.25 -0.0625 ) ) +( ( 301.0260009766 -323.091217041 355.1293945312 0.25 0 ) ( 300.5260009766 -322.225189209 353.3973388672 0.25 -0.03125 ) ( 300.0260009766 -321.3591308594 351.6652832031 0.25 -0.0625 ) ) ( ( 307.7914733887 -322.6851196289 353.3793334961 0.375 0 ) ( 307.2915344238 -321.8190917969 351.6473388672 0.375 -0.03125 ) ( 306.7915344238 -320.9530639648 349.9152832031 0.375 -0.0625 ) ) -( ( 307.385345459 -328.9817199707 350.3482666016 0.5 0 ) ( 306.8854370117 -328.1157226563 348.6162719727 0.5 -0.03125 ) ( 306.3854370117 -327.2496948242 346.8842163086 0.5 -0.0625 ) ) +( ( 307.385345459 -328.9817199707 350.3482666016 0.5 0 ) ( 306.8854370117 -328.1157226562 348.6162719727 0.5 -0.03125 ) ( 306.3854370117 -327.2496948242 346.8842163086 0.5 -0.0625 ) ) ( ( 306.9792785645 -335.2783508301 347.3171691895 0.625 0 ) ( 306.4793395996 -334.4123535156 345.5851745605 0.625 -0.03125 ) ( 305.9793395996 -333.5463256836 343.8531188965 0.625 -0.0625 ) ) ( ( 300.2138366699 -335.6844787598 349.067199707 0.75 0 ) ( 299.7138366699 -334.8184509277 347.3351745605 0.75 -0.03125 ) ( 299.2138366699 -333.9524230957 345.6031188965 0.75 -0.0625 ) ) ( ( 293.4482116699 -336.0905761719 350.817199707 0.875 0 ) ( 292.9482116699 -335.2245178223 349.085144043 0.875 -0.03125 ) ( 292.4482116699 -334.3585205078 347.3531188965 0.875 -0.0625 ) ) @@ -22251,15 +22251,15 @@ patchDef2 trak5x/base-base1b ( 9 3 0 0 0 ) ( -( ( 301.2344970703 -306.451385498 414.1320495605 0 -0.0625 ) ( 299.5024414063 -307.4513549805 414.1320495605 0 -0.03125 ) ( 297.7703857422 -308.451385498 414.1320495605 0 0 ) ) +( ( 301.2344970703 -306.451385498 414.1320495605 0 -0.0625 ) ( 299.5024414062 -307.4513549805 414.1320495605 0 -0.03125 ) ( 297.7703857422 -308.451385498 414.1320495605 0 0 ) ) ( ( 298.2033996582 -301.2013549805 410.6320495605 0.125 -0.0625 ) ( 296.4713745117 -302.2013549805 410.6320495605 0.125 -0.03125 ) ( 294.7393188477 -303.2013549805 410.6320495605 0.125 0 ) ) ( ( 299.9533996582 -304.2324523926 404.5698547363 0.25 -0.0625 ) ( 298.2213745117 -305.2324523926 404.5698547363 0.25 -0.03125 ) ( 296.4893188477 -306.2324523926 404.5698547363 0.25 0 ) ) ( ( 301.7033996582 -307.2635498047 398.5076904297 0.375 -0.0625 ) ( 299.9713745117 -308.2635498047 398.5076904297 0.375 -0.03125 ) ( 298.2393188477 -309.2635498047 398.5076904297 0.375 0 ) ) -( ( 304.7344970703 -312.5135803223 402.0076904297 0.5 -0.0625 ) ( 303.0024414063 -313.5135192871 402.0076904297 0.5 -0.03125 ) ( 301.2703857422 -314.5135803223 402.0076904297 0.5 0 ) ) +( ( 304.7344970703 -312.5135803223 402.0076904297 0.5 -0.0625 ) ( 303.0024414062 -313.5135192871 402.0076904297 0.5 -0.03125 ) ( 301.2703857422 -314.5135803223 402.0076904297 0.5 0 ) ) ( ( 307.7655944824 -317.7635498047 405.5076904297 0.625 -0.0625 ) ( 306.0335388184 -318.7635498047 405.5076904297 0.625 -0.03125 ) ( 304.3014831543 -319.7635498047 405.5076904297 0.625 0 ) ) ( ( 306.0155944824 -314.7324523926 411.5698547363 0.75 -0.0625 ) ( 304.2835388184 -315.7324523926 411.5698547363 0.75 -0.03125 ) ( 302.5514831543 -316.7324523926 411.5698547363 0.75 0 ) ) ( ( 304.2655944824 -311.7013549805 417.6320495605 0.875 -0.0625 ) ( 302.5335388184 -312.7013549805 417.6320495605 0.875 -0.03125 ) ( 300.8014831543 -313.7013549805 417.6320495605 0.875 0 ) ) -( ( 301.2344970703 -306.451385498 414.1320495605 1 -0.0625 ) ( 299.5024414063 -307.4513549805 414.1320495605 1 -0.03125 ) ( 297.7703857422 -308.451385498 414.1320495605 1 0 ) ) +( ( 301.2344970703 -306.451385498 414.1320495605 1 -0.0625 ) ( 299.5024414062 -307.4513549805 414.1320495605 1 -0.03125 ) ( 297.7703857422 -308.451385498 414.1320495605 1 0 ) ) ) } } @@ -22271,11 +22271,11 @@ trak5x/base-base1b ( ( ( 311.9807434082 -325.0644226074 369.4556274414 0 -0.0625 ) ( 310.2486877441 -326.0643920898 369.4555969238 0 -0.03125 ) ( 308.5166320801 -327.0644226074 369.4556274414 0 0 ) ) ( ( 310.2307434082 -322.0332946777 363.3934326172 0.125 -0.0625 ) ( 308.4986877441 -323.0332946777 363.3934326172 0.125 -0.03125 ) ( 306.7666320801 -324.0332946777 363.3934326172 0.125 0 ) ) -( ( 313.2618408203 -327.2833251953 359.8934326172 0.25 -0.0625 ) ( 311.5297851563 -328.2833251953 359.8934326172 0.25 -0.03125 ) ( 309.7977294922 -329.2833251953 359.8934326172 0.25 0 ) ) +( ( 313.2618408203 -327.2833251953 359.8934326172 0.25 -0.0625 ) ( 311.5297851562 -328.2833251953 359.8934326172 0.25 -0.03125 ) ( 309.7977294922 -329.2833251953 359.8934326172 0.25 0 ) ) ( ( 316.2929077148 -332.5332946777 356.3934326172 0.375 -0.0625 ) ( 314.5608825684 -333.5332946777 356.3934326172 0.375 -0.03125 ) ( 312.8288269043 -334.5332946777 356.3934326172 0.375 0 ) ) ( ( 318.0429077148 -335.564453125 362.4556274414 0.5 -0.0625 ) ( 316.3108825684 -336.5643920898 362.4555969238 0.5 -0.03125 ) ( 314.5787963867 -337.564453125 362.4556274414 0.5 0 ) ) ( ( 319.7929077148 -338.595489502 368.517791748 0.625 -0.0625 ) ( 318.0608825684 -339.595489502 368.517791748 0.625 -0.03125 ) ( 316.3288269043 -340.595489502 368.517791748 0.625 0 ) ) -( ( 316.7618408203 -333.345489502 372.017791748 0.75 -0.0625 ) ( 315.0297851563 -334.345489502 372.017791748 0.75 -0.03125 ) ( 313.2977294922 -335.345489502 372.017791748 0.75 0 ) ) +( ( 316.7618408203 -333.345489502 372.017791748 0.75 -0.0625 ) ( 315.0297851562 -334.345489502 372.017791748 0.75 -0.03125 ) ( 313.2977294922 -335.345489502 372.017791748 0.75 0 ) ) ( ( 313.7307434082 -328.095489502 375.517791748 0.875 -0.0625 ) ( 311.9986877441 -329.095489502 375.517791748 0.875 -0.03125 ) ( 310.2666320801 -330.095489502 375.517791748 0.875 0 ) ) ( ( 311.9807434082 -325.0644226074 369.4556274414 1 -0.0625 ) ( 310.2486877441 -326.0643920898 369.4555969238 1 -0.03125 ) ( 308.5166320801 -327.0644226074 369.4556274414 1 0 ) ) ) @@ -29232,7 +29232,7 @@ trak5x/base-base1b } } { -( -1144 1344 616 ) ( -1144 1168 616 ) ( -1408 1344 616 ) exx/panel-metal01c 170.6667480469 73.1430664063 0 0.515625 0.4375 0 0 0 +( -1144 1344 616 ) ( -1144 1168 616 ) ( -1408 1344 616 ) exx/panel-metal01c 170.6667480469 73.1430664062 0 0.515625 0.4375 0 0 0 ( -1144 1376 616 ) ( -1408 1376 616 ) ( -1144 1376 600 ) common/caulk 0 0 0 0.25 0.25 0 0 0 ( -1144 1328 616 ) ( -1144 1328 600 ) ( -1144 1152 616 ) common/caulk 64 0 0 0.25 0.25 0 0 0 ( -1408 1168 600 ) ( -1144 1168 600 ) ( -1408 1344 600 ) common/caulk 0 0 0 0.25 0.25 0 0 0 @@ -29496,7 +29496,7 @@ trak5x/base-pipe1c { ( -136 456 872 ) ( -136 488 872 ) ( -136 488 1000 ) exx/panel-q201b 96 352 180 0.25 0.25 134217728 0 0 ( -88 600 880 ) ( -88 600 864 ) ( -88 472 880 ) exx/panel-q201b 96 352 180 0.25 0.25 134217728 0 0 -( -80 472 962 ) ( -144 472 962 ) ( -144 510 1000 ) exx/panel-q201e 147.9614257813 42.3333511353 90 0.1484339982 -0.1875 134217728 0 0 +( -80 472 962 ) ( -144 472 962 ) ( -144 510 1000 ) exx/panel-q201e 147.9614257812 42.3333511353 90 0.1484339982 -0.1875 134217728 0 0 ( -80 600 910 ) ( -144 600 910 ) ( -144 562 872 ) exx/panel-q201e 53.4042816162 42.3333511353 90 0.1484369934 -0.1875 134217728 0 0 ( -80 562 1000 ) ( -144 562 1000 ) ( -144 600 962 ) exx/panel-q201e 202.0268859863 42.3333511353 -90 0.1484339982 0.1875 134217728 0 0 ( -80 510 872 ) ( -144 510 872 ) ( -144 472 910 ) exx/panel-q201e 107.3666992188 42.3333511353 -90 0.1484339982 0.1875 134217728 0 0 @@ -29580,8 +29580,8 @@ trak5x/base-pipe1c ( 1262 -104 584 ) ( 1262 -40 584 ) ( 1224 -40 622 ) exx/panel-q201e 53.5911865234 255.6667480469 180 0.1484339982 0.1875 134217728 0 0 ( 1314 -40 584 ) ( 1262 -40 584 ) ( 1262 -104 584 ) exx/panel-q201e 186.3849182129 255.6667480469 -0 0.2031249851 -0.1875 134217728 0 0 ( 1262 -40 712 ) ( 1314 -40 712 ) ( 1314 -104 712 ) exx/panel-q201e 186.3849182129 255.6667480469 -0 0.2031249851 -0.1875 134217728 0 0 -( 1224 -40 622 ) ( 1224 -40 674 ) ( 1224 -104 674 ) exx/panel-q201e 9.6921691895 255.6665039063 90 0.2031249851 0.1875 134217728 0 0 -( 1352 -40 674 ) ( 1352 -40 622 ) ( 1352 -104 622 ) exx/panel-q201e 9.6921691895 255.6665039063 90 0.2031249851 0.1875 134217728 0 0 +( 1224 -40 622 ) ( 1224 -40 674 ) ( 1224 -104 674 ) exx/panel-q201e 9.6921691895 255.6665039062 90 0.2031249851 0.1875 134217728 0 0 +( 1352 -40 674 ) ( 1352 -40 622 ) ( 1352 -104 622 ) exx/panel-q201e 9.6921691895 255.6665039062 90 0.2031249851 0.1875 134217728 0 0 } { ( 1352 -88 584 ) ( 1352 -104 584 ) ( 1224 -88 584 ) exx/base-metal04 0 0 0 0.25 0.25 0 0 0 @@ -30109,6 +30109,22 @@ exx/trim-01 ( 320 512 808 ) ( 320 512 832 ) ( 512 512 808 ) common/caulk 0 0 0 0.25 0.25 0 0 0 ( 320 512 808 ) ( 320 752 808 ) ( 320 512 832 ) common/caulk 0 0 0 0.25 0.25 0 0 0 } +{ +( 192 1056 608 ) ( 192 1032 608 ) ( 64 1056 608 ) common/clip 0 0 0 0.25 0.25 0 0 0 +( 192 1056 608 ) ( 64 1056 608 ) ( 192 1056 480 ) common/clip 0 0 0 0.25 0.25 0 0 0 +( 192 1056 608 ) ( 192 1056 480 ) ( 192 1032 608 ) common/clip 0 0 0 0.25 0.25 0 0 0 +( 64 1032 480 ) ( 192 1032 480 ) ( 64 1056 480 ) common/clip 0 0 0 0.25 0.25 0 0 0 +( 64 1032 480 ) ( 64 1032 608 ) ( 192 1032 480 ) common/clip 0 0 0 0.25 0.25 0 0 0 +( 64 1032 480 ) ( 64 1056 480 ) ( 64 1032 608 ) common/clip 0 0 0 0.25 0.25 0 0 0 +} +{ +( -64 1056 608 ) ( -64 1032 608 ) ( -192 1056 608 ) common/clip 0 0 0 0.25 0.25 0 0 0 +( -64 1056 608 ) ( -192 1056 608 ) ( -64 1056 480 ) common/clip 0 0 0 0.25 0.25 0 0 0 +( -64 1056 608 ) ( -64 1056 480 ) ( -64 1032 608 ) common/clip 0 0 0 0.25 0.25 0 0 0 +( -192 1032 480 ) ( -64 1032 480 ) ( -192 1056 480 ) common/clip 0 0 0 0.25 0.25 0 0 0 +( -192 1032 480 ) ( -192 1032 608 ) ( -64 1032 480 ) common/clip 0 0 0 0.25 0.25 0 0 0 +( -192 1032 480 ) ( -192 1056 480 ) ( -192 1032 608 ) common/clip 0 0 0 0.25 0.25 0 0 0 +} } { "classname" "trigger_push" diff --git a/maps/glowplant.map.options b/maps/glowplant.map.options index 406340a0..d3dd7166 100644 --- a/maps/glowplant.map.options +++ b/maps/glowplant.map.options @@ -3,4 +3,4 @@ -vis + -minimap + -sRGB -Version: 17d \ No newline at end of file +Version: 17e