Fix #99 and make the jumppad triggers universal

diff --git a/maps/atelier.map b/maps/atelier.map
index 07c04cc33b3c6c9f00931f87d0fcece08e13d55c..b6a8f4597a9befe16ddf4ccb73cb59fad7a75ede 100644 (file)
--- a/maps/atelier.map
+++ b/maps/atelier.map
@@ -6400,7 +6400,7 @@ exx/wall-crete02
 ( 760 8 64 ) ( 824 -56 64 ) ( 760 8 192 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
 ( 1024 -256 -64 ) ( 896 -384 -64 ) ( 1024 -256 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 640 -128 64 ) ( 656 -144 -64 ) ( 640 -128 -64 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
-( -448 -184 724 ) ( -576 -144 724 ) ( -576 -184 724 ) exx/wall-bigrib02 51.0100097656 44.0200004578 135 0.25 0.25 0 0 0
+( -448 -184 724 ) ( -576 -144 724 ) ( -576 -184 724 ) exx/wall-bigrib02 51.0100097656 5.0199999809 135 0.25 0.25 0 0 0
 }
 {
 ( 408 -416 724 ) ( 408 -664 724 ) ( 248 -416 724 ) common/caulk 32 96 0 0.25 0.25 134217728 0 0
@@ -6423,7 +6423,7 @@ exx/wall-crete02
 ( 376 -648 -20 ) ( 504 -520 -20 ) ( 376 -648 108 ) common/caulk 250.22265625 176 0 0.25 0.25 134217728 0 0
 ( 1024 -256 -84 ) ( 896 -384 -84 ) ( 1024 -256 44 ) common/caulk 0 176 0 0.25 0.25 134217728 0 0
 ( 644 -104 44 ) ( 660 -120 -84 ) ( 644 -104 -84 ) exx/wall-bigrib02 250.22265625 256 0 0.25 0.25 134217728 0 0
-( -448 -184 704 ) ( -576 -144 704 ) ( -576 -184 704 ) exx/wall-bigrib02 51.0100097656 13.0193252563 135 0.25 0.25 134217728 0 0
+( -448 -184 704 ) ( -576 -144 704 ) ( -576 -184 704 ) exx/wall-bigrib02 51.0099983215 13.0193252563 135 0.25 0.25 134217728 0 0
 ( 924 -356 64 ) ( 916 -348 -64 ) ( 924 -356 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 {
@@ -11851,12 +11851,12 @@ common/weapclip
 "classname" "trigger_push"
 "target" "target_position1"
 {
-( 1432 472 344 ) ( 1432 432 344 ) ( 1392 472 344 ) common/trigger 160 96 0 0.25 0.25 0 0 0
-( 1420 436 384 ) ( 1420 436 320 ) ( 1444 460 280 ) common/trigger 208 96 0 0.25 0.25 0 0 0
-( 1504 416 280 ) ( 1504 416 344 ) ( 1440 480 344 ) common/trigger 128 96 0 0.25 0.25 0 0 0
+( 1432.5 472 341.375 ) ( 1432.5 432 341.375 ) ( 1392.5 472 341.375 ) common/trigger 158 96 0 0.25 0.25 0 0 0
+( 1420.625 435.5 384 ) ( 1420.625 435.5 320 ) ( 1444.625 459.5 280 ) common/trigger 210 96 0 0.25 0.25 0 0 0
+( 1502.25 414.125 280 ) ( 1502.25 414.125 344 ) ( 1438.25 478.125 344 ) common/trigger 135.5 96 0 0.25 0.25 0 0 0
 ( 1392 432 320 ) ( 1432 432 320 ) ( 1392 472 320 ) common/trigger 160 96 0 0.25 0.25 0 0 0
-( 1456 396 280 ) ( 1456 396 344 ) ( 1480 420 344 ) common/trigger 112 96 0 0.25 0.25 0 0 0
-( 1376 416 320 ) ( 1376 416 384 ) ( 1440 352 344 ) common/trigger 32 96 0 0.25 0.25 0 0 0
+( 1457 394.875 280 ) ( 1457 394.875 344 ) ( 1481 418.875 344 ) common/trigger 116.5 96 0 0.25 0.25 0 0 0
+( 1380.5 417.5 320 ) ( 1380.5 417.5 384 ) ( 1444.5 353.5 344 ) common/trigger 26 96 0 0.25 0.25 0 0 0
 }
 }
 {

diff --git a/maps/atelier.map.options b/maps/atelier.map.options
index ac30f3e5aee0c391dbbbfe82f8012e32f27ae70f..2df4df97a53ab4ac982627f74c3c2b4748eec736 100644 (file)
--- a/maps/atelier.map.options
+++ b/maps/atelier.map.options
@@ -2,4 +2,4 @@
 -light + -bounce 8 -dirtscale 2
 -vis +
 -minimap +
-Version: 3a
\ No newline at end of file
+Version: 3b
\ No newline at end of file

diff --git a/maps/courtfun.map b/maps/courtfun.map
index cef741330672b3e8076e5fbd24118a0938e9fb3c..ae5afefc83fdb5aac1b1cdda50501f8318ac45b0 100644 (file)
--- a/maps/courtfun.map
+++ b/maps/courtfun.map
@@ -35204,12 +35204,12 @@ map_courtfun/screen_obey
 "height" "64"
 "gametypefilter" "+rc,cts"
 {
-( -1536 2656 352 ) ( -1536 2560 352 ) ( -1776 2656 352 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -1536 2656 336 ) ( -1776 2656 336 ) ( -1536 2656 320 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -1600 2656 336 ) ( -1600 2656 320 ) ( -1600 2560 336 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -1776 2560 320 ) ( -1536 2560 320 ) ( -1776 2656 320 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -1776 2576 320 ) ( -1776 2576 336 ) ( -1536 2576 320 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -1728 2560 320 ) ( -1728 2656 320 ) ( -1728 2560 336 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -1533.1952362061 2623.405960083 362.625 ) ( -1578.2645111084 2538.6429901123 362.625 ) ( -1745.1026611328 2736.0791320801 362.625 ) common/trigger 101.3819351196 114.1533508301 -28.0000019073 0.25 0.25 0 0 0
+( -1530.47605896 2627.2758331299 336 ) ( -1742.3834838867 2739.9490203857 336 ) ( -1530.47605896 2627.2758331299 320 ) common/trigger 184.6893310547 0 0 0.2588757277 0.25 0 0 0
+( -1595.0788879395 2655.2021331787 336 ) ( -1595.0788879395 2655.2021331787 320 ) ( -1640.148147583 2570.439163208 336 ) common/trigger 93.0182189941 0 0 0.2588757277 0.25 0 0 0
+( -1789.6719360352 2651.3161621094 320 ) ( -1577.7645111084 2538.6429901123 320 ) ( -1744.6026611328 2736.0791320801 320 ) common/trigger 99.6160430908 115.0922927856 -28.0000019073 0.25 0.25 0 0 0
+( -1812.2853851318 2587.5683288574 320 ) ( -1812.2853851318 2587.5683288574 336 ) ( -1600.3779602051 2474.8951416016 320 ) common/trigger 52.7878227234 0 0 0.2588757277 0.25 0 0 0
+( -1735.6654510498 2623.0315246582 320 ) ( -1690.5961761475 2707.7944946289 320 ) ( -1735.6654510498 2623.0315246582 336 ) common/trigger 121.9896469116 0 0 0.2588757277 0.25 0 0 0
 }
 }
 {

diff --git a/maps/courtfun.map.options b/maps/courtfun.map.options
index e0458a1c1e71599fcfe1a3204443f9a0ab1bf373..ef814fe7c67a2a341d9067bcc5fcb297cb5bd36c 100644 (file)
--- a/maps/courtfun.map.options
+++ b/maps/courtfun.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 11a
+Version: 11b

diff --git a/maps/drain.map b/maps/drain.map
index 80dd550fbbb6382a179cdf5a18fba1a03e4318c7..b1f0fd6d15a0b305d5760d225fe27df7c5566ff8 100644 (file)
--- a/maps/drain.map
+++ b/maps/drain.map
@@ -9808,12 +9808,12 @@ trak5x/base-pipe1d
 "classname" "trigger_push"
 "target" "target_position1"
 {
-( 228 348 176 ) ( 228 296 176 ) ( 180 348 176 ) common/trigger 240 0 0 0.25 0.25 0 0 0
-( 248 376 132 ) ( 200 376 132 ) ( 248 376 128 ) common/trigger 160 0 0 0.25 0.25 0 0 0
-( 244 380 132 ) ( 244 380 128 ) ( 244 328 132 ) common/trigger 128 0 0 0.25 0.25 0 0 0
-( 176 296 128 ) ( 224 296 128 ) ( 176 348 128 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 164 292 128 ) ( 164 292 132 ) ( 212 292 128 ) common/trigger 48 0 0 0.25 0.25 0 0 0
-( 168 288 128 ) ( 168 340 128 ) ( 168 288 132 ) common/trigger 32 0 0 0.25 0.25 0 0 0
+( 249.1302947998 342.8143920898 160 ) ( 212.6830291748 305.7253875732 160 ) ( 214.8942871094 376.4580230713 160 ) common/trigger 122.3580856323 28.5217342377 -44.5000076294 0.2499998659 0.2499998659 0 0 0
+( 283.1425018311 347.8944396973 132 ) ( 248.9064941406 381.5380706787 132 ) ( 283.1425018311 347.8944396973 128 ) common/trigger 137.2804107666 245.80418396 90 8731.0458984375 0.250005424 0 0 0
+( 283.2213897705 354.6738586426 132 ) ( 283.2213897705 354.6738586426 128 ) ( 246.7741241455 317.584854126 132 ) common/trigger 43.7611083984 0 0 0.2659956217 0.25 0 0 0
+( 176.0940246582 342.1726531982 128 ) ( 210.3300323486 308.5290222168 128 ) ( 212.5412902832 379.2616577148 128 ) common/trigger 136.9316101074 29.9235534668 -44.5000076294 0.2499998659 0.2499998659 0 0 0
+( 136.3563842773 316.2305603027 128 ) ( 136.3563842773 316.2305603027 132 ) ( 170.5923919678 282.5869293213 128 ) common/trigger 23.8868045807 103.8016891479 90 8731.0458984375 0.250005424 0 0 0
+( 159.78074646 345.448928833 128 ) ( 196.228012085 382.5379333496 128 ) ( 159.78074646 345.448928833 132 ) common/trigger 192.0127716064 0 0 0.2659956217 0.25 0 0 0
 }
 }
 {
@@ -11721,7 +11721,7 @@ trak5x/base-pipe1d
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "-73.953918 -188.056213 -255.521118"
+"origin" "-73.953918 -185.306213 -255.896118"
 "model" "models/containers/barrel01.md3"
 "modelscale" "1.200000"
 "count" "1"

diff --git a/maps/drain.map.options b/maps/drain.map.options
index 5fd71631dcccd9ca3ca36d77e5bf97c8129fb733..6889422c7ea4916aa99ed40212bda61540646c26 100644 (file)
--- a/maps/drain.map.options
+++ b/maps/drain.map.options
@@ -4,4 +4,4 @@
 -vis +
 -minimap +
 -nosRGB
-Version: 13b
+Version: 13c

diff --git a/maps/implosion.map b/maps/implosion.map
index 94ca7cc64deef4fcdd1acb0934867f3d637cf644..a0c3fb6f23913517e7aed66b70970bf9884b9d28 100644 (file)
--- a/maps/implosion.map
+++ b/maps/implosion.map
@@ -78719,53 +78719,47 @@ logos/logo02_yellow_glowy
 "classname" "trigger_push"
 "target" "t6"
 {
-( 758.0822143555 -3412.6670532227 640 ) ( 665.3533172607 -3437.5136871338 640 ) ( 758.0822143555 -3412.6670532227 632 ) common/trigger 49.5389404297 224 0 0.2528758645 0.25 0 0 0
-( 679.8471984863 -3491.6055450439 632 ) ( 772.5760803223 -3466.7589111328 632 ) ( 665.3533172607 -3437.5136871338 632 ) common/trigger 92.0480957031 237.6434783936 15 0.2500000298 0.2500000298 0 0 0
-( 679.8471984863 -3491.6055450439 632 ) ( 679.8471984863 -3491.6055450439 640 ) ( 772.5760803223 -3466.7589111328 632 ) common/trigger 49.5389404297 224 0 0.2528758645 0.25 0 0 0
-( 674 64 639 ) ( 767 64 663 ) ( 674 -64 639 ) common/trigger 24 0 0 0.25 0.25 0 0 0
-( 672 -64 638 ) ( 672 64 632 ) ( 672 64 638 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 754 -3414 -64 ) ( 770 -3468 -64 ) ( 754 -3414 64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 64 -3414 656 ) ( -64 -3468 656 ) ( -64 -3414 656 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 672 -3436 64 ) ( 687 -3489 -64 ) ( 672 -3436 -64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 757.3387908936 -3411.6563110352 653.375 ) ( 774.0533447266 -3473.1761016846 653.375 ) ( 655.167678833 -3439.4155883789 653.375 ) common/trigger 136.1206359863 215.5160522461 15.200003624 0.2499999702 0.2499999702 0 0 0
+( 758.7137908936 -3413.1563110352 656 ) ( 656.542678833 -3440.9155883789 656 ) ( 758.7137908936 -3413.1563110352 632 ) common/trigger 64.6598892212 0 0 0.2660715878 0.25 0 0 0
+( 752.8846893311 -3414.640411377 656 ) ( 752.8846893311 -3414.640411377 632 ) ( 769.5992584229 -3476.1602172852 656 ) common/trigger 185.08984375 0 0 0.2660715878 0.25 0 0 0
+( 671.882232666 -3500.9353790283 632 ) ( 774.0533447266 -3473.1761016846 632 ) ( 655.167678833 -3439.4155883789 632 ) common/trigger 136.1206359863 215.5160522461 15.2000026703 0.2499999702 0.2499999702 0 0 0
+( 668.382232666 -3494.1853790283 632 ) ( 668.382232666 -3494.1853790283 656 ) ( 770.5533447266 -3466.4261016846 632 ) common/trigger 82.9820175171 0 0 0.2660715878 0.25 0 0 0
+( 688.632232666 -3497.4353790283 632 ) ( 671.917678833 -3435.9155883789 632 ) ( 688.632232666 -3497.4353790283 656 ) common/trigger 159.7107391357 0 0 0.2660715878 0.25 0 0 0
 }
 }
 {
 "classname" "trigger_push"
 "target" "t7"
 {
-( 3657.9177856445 -2469.3329467773 640 ) ( 3750.6466827393 -2444.4863128662 640 ) ( 3657.9177856445 -2469.3329467773 632 ) common/trigger 104.6521759033 224 0 -0.2528758645 0.25 0 0 0
-( 3736.1528015137 -2390.3944549561 632 ) ( 3643.4239196777 -2415.2410888672 632 ) ( 3750.6466827393 -2444.4863128662 632 ) common/trigger 56.6656112671 143.7222900391 -165 0.2500000298 0.2500000298 0 0 0
-( 3736.1528015137 -2390.3944549561 632 ) ( 3736.1528015137 -2390.3944549561 640 ) ( 3643.4239196777 -2415.2410888672 632 ) common/trigger 104.6521759033 224 0 -0.2528758645 0.25 0 0 0
-( 3742 -5946 639 ) ( 3649 -5946 663 ) ( 3742 -5818 639 ) common/trigger 24 232 180 0.25 0.25 0 0 0
-( 3744 -5818 638 ) ( 3744 -5946 632 ) ( 3744 -5946 638 ) common/trigger 24 0 0 -0.25 0.25 0 0 0
-( 3662 -2468 -64 ) ( 3646 -2414 -64 ) ( 3662 -2468 64 ) common/trigger 24 0 0 -0.25 0.25 0 0 0
-( 4352 -2468 656 ) ( 4480 -2414 656 ) ( 4480 -2468 656 ) common/trigger 0 232 180 0.25 0.25 0 0 0
-( 3744 -2446 64 ) ( 3729 -2392 -64 ) ( 3744 -2446 -64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 3735.7573852539 -2377.1903381348 653.375 ) ( 3754.8711853027 -2439.7087554932 653.375 ) ( 3638.3338317871 -2406.9757080078 653.375 ) common/trigger 152.0035400391 195.8085479736 17 0.25 0.25 0 0 0
+( 3741.0073852539 -2386.3153381348 656 ) ( 3643.5838317871 -2416.1007080078 656 ) ( 3741.0073852539 -2386.3153381348 632 ) common/trigger 252.0869903564 0 0 0.2541275322 0.25 0 0 0
+( 3726.5073852539 -2383.4403381348 656 ) ( 3726.5073852539 -2383.4403381348 632 ) ( 3745.6211853027 -2445.9587554932 656 ) common/trigger 117.5079803467 0 0 0.2541275322 0.25 0 0 0
+( 3657.4476318359 -2469.4941253662 632 ) ( 3754.8711853027 -2439.7087554932 632 ) ( 3638.3338317871 -2406.9757080078 632 ) common/trigger 152.0035400391 195.8085479736 17 0.25 0.25 0 0 0
+( 3656.9476318359 -2468.9941253662 632 ) ( 3656.9476318359 -2468.9941253662 656 ) ( 3754.3711853027 -2439.2087554932 632 ) common/trigger 18.71342659 0 0 0.2541275322 0.25 0 0 0
+( 3665.0483093262 -2468.7618560791 632 ) ( 3645.9344940186 -2406.2434234619 632 ) ( 3665.0483093262 -2468.7618560791 656 ) common/trigger 91.4378967285 0 0 0.2541275322 0.25 0 0 0
 }
 }
 {
 "classname" "trigger_push"
 "target" "t14"
 {
-( 2772.6678466797 -2905.9981994629 -376 ) ( 2677.0331268311 -2914.3651580811 -376 ) ( 2772.6678466797 -2905.9981994629 -384 ) common/trigger 252.6207275391 0 0 0.2567618787 0.25 0 0 0
-( 2681.9138641357 -2970.1520690918 -384 ) ( 2777.5485687256 -2961.7851257324 -384 ) ( 2677.0331268311 -2914.3651580811 -384 ) common/trigger 204.6313476563 125.6262207031 5.0000009537 0.2500000596 0.2500000596 0 0 0
-( 2681.9138641357 -2970.1520690918 -384 ) ( 2681.9138641357 -2970.1520690918 -376 ) ( 2777.5485687256 -2961.7851257324 -384 ) common/trigger 252.6207275391 0 0 0.2567618787 0.25 0 0 0
-( 3293.5799713135 532.4514923096 -377 ) ( 3385.167098999 516.3022155762 -353 ) ( 3271.353012085 406.3960876465 -377 ) common/trigger 99.6654052734 33.1457519531 -9.9999990463 0.25 0.25 0 0 0
-( 2768.4161834717 -2906.6020202637 -1080 ) ( 2774.7961120605 -2962.5600280762 -1080 ) ( 2768.4161834717 -2906.6020202637 -952 ) common/trigger 237.7098388672 32 0 0.2538418174 0.25 0 0 0
-( 2088.8987731934 -2786.7847747803 -360 ) ( 1953.4663696289 -2817.7374267578 -360 ) ( 1962.8433685303 -2764.557800293 -360 ) common/trigger 75.6654052734 33.1457519531 -9.9999990463 0.25 0.25 0 0 0
-( 2684 -2914 64 ) ( 2689 -2969 -64 ) ( 2684 -2914 -64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 2775.1009674072 -2906.0535888672 -362.625 ) ( 2780.3245391846 -2969.5892181396 -362.625 ) ( 2674.3160095215 -2914.339630127 -362.625 ) common/trigger 232.3933410645 169.3223266602 4.7000002861 0.2500000298 0.2500000298 0 0 0
+( 2775.3509674072 -2911.8035888672 -360 ) ( 2674.5660095215 -2920.089630127 -360 ) ( 2775.3509674072 -2911.8035888672 -384 ) common/trigger 120.2731704712 0 0 0.2540512681 0.25 0 0 0
+( 2767.1937713623 -2907.3882904053 -360 ) ( 2767.1937713623 -2907.3882904053 -384 ) ( 2772.4173583984 -2970.9239196777 -360 ) common/trigger 207.5123596191 0 0 0.2540512681 0.25 0 0 0
+( 2679.4145965576 -2977.8752593994 -384 ) ( 2780.1995391846 -2969.5892181396 -384 ) ( 2674.1910095215 -2914.339630127 -384 ) common/trigger 232.8916625977 169.3632965088 4.7000002861 0.2500000298 0.2500000298 0 0 0
+( 2678.9145965576 -2974.3752593994 -384 ) ( 2678.9145965576 -2974.3752593994 -360 ) ( 2779.6995391846 -2966.0892181396 -384 ) common/trigger 123.7173614502 0 0 0.2540512681 0.25 0 0 0
+( 2688.9145965576 -2977.5002593994 -384 ) ( 2683.6910095215 -2913.964630127 -384 ) ( 2688.9145965576 -2977.5002593994 -360 ) common/trigger 200.1310424805 0 0 0.2540512681 0.25 0 0 0
 }
 }
 {
 "classname" "trigger_push"
 "target" "t12"
 {
-( 1643.3321533203 -2982.0018005371 -376 ) ( 1738.9668731689 -2973.6348419189 -376 ) ( 1643.3321533203 -2982.0018005371 -384 ) common/trigger 43.4349060059 0 0 -0.2567618787 0.25 0 0 0
-( 1734.0861358643 -2917.8479309082 -384 ) ( 1638.4514312744 -2926.2148742676 -384 ) ( 1738.9668731689 -2973.6348419189 -384 ) common/trigger 132.720413208 39.517414093 -175 0.2500000596 0.2500000596 0 0 0
-( 1734.0861358643 -2917.8479309082 -384 ) ( 1734.0861358643 -2917.8479309082 -376 ) ( 1638.4514312744 -2926.2148742676 -384 ) common/trigger 43.4349060059 0 0 -0.2567618787 0.25 0 0 0
-( 1122.4200286865 -6420.4514923096 -377 ) ( 1030.832901001 -6404.3022155762 -353 ) ( 1144.646987915 -6294.3960876465 -377 ) common/trigger 81.0716629028 192.0152893066 170 0.25 0.25 0 0 0
-( 1647.5838165283 -2981.3979797363 -1080 ) ( 1641.2038879395 -2925.4399719238 -1080 ) ( 1647.5838165283 -2981.3979797363 -952 ) common/trigger 82.1626586914 32 0 -0.2538418174 0.25 0 0 0
-( 2327.1012268066 -3101.2152252197 -360 ) ( 2462.5336303711 -3070.2625732422 -360 ) ( 2453.1566314697 -3123.442199707 -360 ) common/trigger 57.0716629028 192.0152893066 170 0.25 0.25 0 0 0
-( 1732 -2974 64 ) ( 1729 -2919 -64 ) ( 1732 -2974 -64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 1736.6657104492 -2911.0578155518 -362.625 ) ( 1740.8074951172 -2970.288192749 -362.625 ) ( 1631.048614502 -2918.4432830811 -362.625 ) common/trigger 70.0195617676 71.0594177246 3.9999992847 0.25 0.25 0 0 0
+( 1736.6657104492 -2914.1828155518 -360 ) ( 1631.048614502 -2921.5682830811 -360 ) ( 1736.6657104492 -2914.1828155518 -384 ) common/trigger 93.3744049072 0 0 0.2514536679 0.25 0 0 0
+( 1727.6657104492 -2913.0578155518 -360 ) ( 1727.6657104492 -2913.0578155518 -384 ) ( 1731.8074951172 -2972.288192749 -360 ) common/trigger 153.915802002 0 0 0.2514536679 0.25 0 0 0
+( 1635.1903991699 -2977.6736602783 -384 ) ( 1740.8074951172 -2970.288192749 -384 ) ( 1631.048614502 -2918.4432830811 -384 ) common/trigger 70.0195617676 71.0594177246 3.9999995232 0.25 0.25 0 0 0
+( 1634.9403991699 -2975.7986602783 -384 ) ( 1634.9403991699 -2975.7986602783 -360 ) ( 1740.5574951172 -2968.413192749 -384 ) common/trigger 94.3686218262 0 0 0.2514536679 0.25 0 0 0
+( 1647.8755645752 -2972.5652618408 -384 ) ( 1643.7337799072 -2913.3348846436 -384 ) ( 1647.8755645752 -2972.5652618408 -360 ) common/trigger 124.082572937 0 0 0.2514536679 0.25 0 0 0
 }
 }

diff --git a/maps/implosion.map.options b/maps/implosion.map.options
index 1f5ccb0958ad8f3791a82929a4a85926aed6a8e8..e07e0cecf8a8ebf249e47c6f2fe0cefcdb71bd30 100644 (file)
--- a/maps/implosion.map.options
+++ b/maps/implosion.map.options
@@ -2,4 +2,4 @@
 -vis -fast +
 -light -fast -deluxe -patchshadows -samples 3 -lightmapsize 512 -bounce 1 -fastbounce -bouncegrid -dirty -dirtscale 2
 -minimap +
-Version: 1b
\ No newline at end of file
+Version: 1c
\ No newline at end of file

diff --git a/maps/oilrig.map b/maps/oilrig.map
index 86bf6fe521d384a305248a297815f71d43eca030..167fa2cd55998a77bd6c5c0c4fdf95bef15e5a8e 100644 (file)
--- a/maps/oilrig.map
+++ b/maps/oilrig.map
@@ -23671,12 +23671,12 @@ exx/wall-bigrib02
 "classname" "trigger_push"
 "target" "target_position4"
 {
-( 1296 184 -328 ) ( 1296 120 -328 ) ( 1232 184 -328 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 1232 120 -344 ) ( 1296 120 -344 ) ( 1232 184 -344 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 1232 152 -64 ) ( 1240 184 -64 ) ( 1232 152 64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 1240 176 -64 ) ( 1272 168 -64 ) ( 1240 176 64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 1288 176 -64 ) ( 1280 144 -64 ) ( 1288 176 64 ) common/trigger 160 0 0 0.25 0.25 0 0 0
-( 1280 112 -64 ) ( 1248 120 -64 ) ( 1280 112 64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 1291.7127075195 184.835357666 -328 ) ( 1290.9308319092 120.8401489258 -328 ) ( 1227.7174987793 185.6172485352 -328 ) common/trigger 26.5663566589 66.4098205566 -0.6999996901 0.2499999255 0.2499999255 0 0 0
+( 1226.4356536865 121.6281433105 -352.5 ) ( 1290.4308624268 120.8462524414 -352.5 ) ( 1227.2175445557 185.6233520508 -352.5 ) common/trigger 28.5663604736 66.4098205566 -0.6999996901 0.2499999255 0.2499999255 0 0 0
+( 1228.9564208984 153.7904205322 -64 ) ( 1237.3467712402 185.6902923584 -64 ) ( 1228.9564208984 153.7904205322 64 ) common/trigger 189.0574493408 0 0 0.2501268983 0.25 0 0 0
+( 1237.5629577637 182.7452697754 -64 ) ( 1269.4628295898 174.3549346924 -64 ) ( 1237.5629577637 182.7452697754 64 ) common/trigger 21.1590995789 0 0 0.2501268983 0.25 0 0 0
+( 1291.110824585 175.5312347412 -64 ) ( 1282.720489502 143.631362915 -64 ) ( 1291.110824585 175.5312347412 64 ) common/trigger 99.0558853149 0 0 0.2501268983 0.25 0 0 0
+( 1267.1574707031 88.3781738281 -64 ) ( 1235.257598877 96.7685089111 -64 ) ( 1267.1574707031 88.3781738281 64 ) common/trigger 58.1593589783 0 0 0.2501268983 0.25 0 0 0
 }
 }
 {

diff --git a/maps/oilrig.map.options b/maps/oilrig.map.options
index ab6af9a2bc98e909799b526d0de5ae0f18fe7e1d..a6eb8e0a69b2f617122866a8a268e548fd40f1c1 100644 (file)
--- a/maps/oilrig.map.options
+++ b/maps/oilrig.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -nosRGB
-Version: 6a
+Version: 6b

diff --git a/maps/space-elevator.map b/maps/space-elevator.map
index 1befaf330ba7be46689509e19ba5d616215df385..e4e34fa066437a7ec9601e7da0ee77387d8173f3 100644 (file)
--- a/maps/space-elevator.map
+++ b/maps/space-elevator.map
@@ -1,8 +1,6 @@
 {
 "classname" "worldspawn"
-"author" "FruitieX & Cuinnton"
 "license" "GPL"
-"message" "Space Elevator"
 "description" "Small space elevator with 3 platforms."
 "_blocksize" "2048 2048 2048"
 {
@@ -28770,30 +28768,6 @@ effects_jumppad/jumppadfx1_a
 "skin" "0"
 }
 {
-"classname" "trigger_push"
-"target" "t14"
-{
-( -480 -768 -112 ) ( -352 -896 -48 ) ( -480 -896 -48 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-( -480 -832 -112 ) ( -480 -832 -80 ) ( -352 -832 -112 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-( -416 -768 -144 ) ( -416 -896 -48 ) ( -416 -896 -80 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-( -352 -736 -144 ) ( -480 -864 -80 ) ( -352 -864 -80 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-( -352 -768 -112 ) ( -480 -768 -144 ) ( -352 -768 -144 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-( -352 -768 -112 ) ( -352 -896 -80 ) ( -352 -896 -48 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-}
-}
-{
-"classname" "trigger_push"
-"target" "t13"
-{
-( 304 -768 -112 ) ( 432 -896 -48 ) ( 304 -896 -48 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-( 304 -832 -112 ) ( 304 -832 -80 ) ( 432 -832 -112 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-( 352 -768 -128 ) ( 352 -896 -32 ) ( 352 -896 -64 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-( 432 -768 -128 ) ( 304 -896 -64 ) ( 432 -896 -64 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-( 432 -768 -96 ) ( 304 -768 -128 ) ( 432 -768 -128 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-( 416 -768 -96 ) ( 416 -896 -64 ) ( 416 -896 -32 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-}
-}
-{
 "classname" "target_position"
 "origin" "-384.000000 -1792.000000 256.000000"
 "targetname" "t14"
@@ -29746,30 +29720,6 @@ effects_jumppad/jumppadfx1_a
 "angle" "-179.999985"
 }
 {
-"classname" "trigger_push"
-"target" "t12"
-{
-( 480 768 -112 ) ( 352 896 -48 ) ( 480 896 -48 ) common/trigger 256 -0 180 0.25 0.25 134217728 0 0
-( 480 832 -112 ) ( 480 832 -80 ) ( 352 832 -112 ) common/trigger 0 0 0 -0.25 0.25 134217728 0 0
-( 416 768 -144 ) ( 416 896 -48 ) ( 416 896 -80 ) common/trigger 0 0 0 -0.25 0.25 134217728 0 0
-( 352 736 -144 ) ( 480 864 -80 ) ( 352 864 -80 ) common/trigger 256 -0 180 0.25 0.25 134217728 0 0
-( 352 768 -112 ) ( 480 768 -144 ) ( 352 768 -144 ) common/trigger 0 0 0 -0.25 0.25 134217728 0 0
-( 352 768 -112 ) ( 352 896 -80 ) ( 352 896 -48 ) common/trigger 0 0 0 -0.25 0.25 134217728 0 0
-}
-}
-{
-"classname" "trigger_push"
-"target" "t10"
-{
-( -304 768 -112 ) ( -432 896 -48 ) ( -304 896 -48 ) common/trigger 256 -0 180 0.25 0.25 134217728 0 0
-( -304 832 -112 ) ( -304 832 -80 ) ( -432 832 -112 ) common/trigger 0 0 0 -0.25 0.25 134217728 0 0
-( -352 768 -128 ) ( -352 896 -32 ) ( -352 896 -64 ) common/trigger 0 0 0 -0.25 0.25 134217728 0 0
-( -432 768 -128 ) ( -304 896 -64 ) ( -432 896 -64 ) common/trigger 256 -0 180 0.25 0.25 134217728 0 0
-( -432 768 -96 ) ( -304 768 -128 ) ( -432 768 -128 ) common/trigger 0 0 0 -0.25 0.25 134217728 0 0
-( -416 768 -96 ) ( -416 896 -64 ) ( -416 896 -32 ) common/trigger 0 0 0 -0.25 0.25 134217728 0 0
-}
-}
-{
 "classname" "target_position"
 "origin" "384.000000 1792.000000 256.000000"
 "targetname" "t12"
@@ -30564,3 +30514,51 @@ effects_jumppad/jumppadfx1_a
 "origin" "1993.48645 -4134.79639 1074.40051"
 "angles" "22.0440674 123.793945 0"
 }
+{
+"classname" "trigger_push"
+"target" "t14"
+{
+( -351.125 -709.5 -106.625 ) ( -351.125 -805.875 -106.625 ) ( -421.25 -709.5 -106.625 ) common/trigger 3 0 0 0.25 0.25 0 0 0
+( -350.25 -726.25 -80 ) ( -420.375 -726.25 -80 ) ( -350.25 -726.25 -128 ) common/trigger 255.5 0 0 0.25 0.25 0 0 0
+( -356.375 -710 -80 ) ( -356.375 -710 -128 ) ( -356.375 -806.375 -80 ) common/trigger 2 0 0 0.25 0.25 0 0 0
+( -420.5 -805.875 -128 ) ( -350.375 -805.875 -128 ) ( -420.5 -709.5 -128 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -420.625 -810 -128 ) ( -420.625 -810 -80 ) ( -350.5 -810 -128 ) common/trigger 0.5 0 0 0.25 0.25 0 0 0
+( -411.5 -805.625 -128 ) ( -411.5 -709.25 -128 ) ( -411.5 -805.625 -80 ) common/trigger 255 0 0 0.25 0.25 0 0 0
+}
+}
+{
+"classname" "trigger_push"
+"target" "t13"
+{
+( 416.875 -709.5 -106.625 ) ( 416.875 -805.875 -106.625 ) ( 346.75 -709.5 -106.625 ) common/trigger 3 0 0 0.25 0.25 0 0 0
+( 417.75 -726.25 -80 ) ( 347.625 -726.25 -80 ) ( 417.75 -726.25 -128 ) common/trigger 255.5 0 0 0.25 0.25 0 0 0
+( 411.625 -710 -80 ) ( 411.625 -710 -128 ) ( 411.625 -806.375 -80 ) common/trigger 2 0 0 0.25 0.25 0 0 0
+( 347.5 -805.875 -128 ) ( 417.625 -805.875 -128 ) ( 347.5 -709.5 -128 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 347.375 -810 -128 ) ( 347.375 -810 -80 ) ( 417.5 -810 -128 ) common/trigger 0.5 0 0 0.25 0.25 0 0 0
+( 356.5 -805.625 -128 ) ( 356.5 -709.25 -128 ) ( 356.5 -805.625 -80 ) common/trigger 255 0 0 0.25 0.25 0 0 0
+}
+}
+{
+"classname" "trigger_push"
+"target" "t10"
+{
+( -354.25 811.375 -106.625 ) ( -354.25 724.375 -106.625 ) ( -416.375 811.375 -106.625 ) common/trigger 1.5 222 0 0.25 0.25 0 0 0
+( -353.875 810 -79.875 ) ( -416 810 -79.875 ) ( -353.875 810 -127.875 ) common/trigger 0 0.5 0 0.25 0.25 0 0 0
+( -356.375 811.125 -79.875 ) ( -356.375 811.125 -127.875 ) ( -356.375 724.125 -79.875 ) common/trigger 35 0.5 0 0.25 0.25 0 0 0
+( -416 724.375 -127.875 ) ( -353.875 724.375 -127.875 ) ( -416 811.375 -127.875 ) common/trigger 0 222 0 0.25 0.25 0 0 0
+( -416.125 726.25 -127.875 ) ( -416.125 726.25 -79.875 ) ( -354 726.25 -127.875 ) common/trigger 0.5 0.5 0 0.25 0.25 0 0 0
+( -411.5 724.375 -128 ) ( -411.5 811.375 -128 ) ( -411.5 724.375 -80 ) common/trigger 34 0 0 0.25 0.25 0 0 0
+}
+}
+{
+"classname" "trigger_push"
+"target" "t12"
+{
+( 413.75 811.75 -106.625 ) ( 413.75 724.75 -106.625 ) ( 351.625 811.75 -106.625 ) common/trigger 1.5 223.5 0 0.25 0.25 0 0 0
+( 414.125 810 -79.875 ) ( 352 810 -79.875 ) ( 414.125 810 -127.875 ) common/trigger 0 0.5 0 0.25 0.25 0 0 0
+( 411.625 811.5 -79.875 ) ( 411.625 811.5 -127.875 ) ( 411.625 724.5 -79.875 ) common/trigger 33.5 0.5 0 0.25 0.25 0 0 0
+( 352 724.75 -127.875 ) ( 414.125 724.75 -127.875 ) ( 352 811.75 -127.875 ) common/trigger 0 223.5 0 0.25 0.25 0 0 0
+( 351.875 726.25 -127.875 ) ( 351.875 726.25 -79.875 ) ( 414 726.25 -127.875 ) common/trigger 0.5 0.5 0 0.25 0.25 0 0 0
+( 356.5 724.75 -128 ) ( 356.5 811.75 -128 ) ( 356.5 724.75 -80 ) common/trigger 32.5 0 0 0.25 0.25 0 0 0
+}
+}

diff --git a/maps/space-elevator.map.options b/maps/space-elevator.map.options
index 99dfc9ef5193a3263cd0520a34dbf0058671d207..c981e0f046e06b460a89645648679ae4f5ceec2e 100644 (file)
--- a/maps/space-elevator.map.options
+++ b/maps/space-elevator.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -nosRGB
-Version: 5
+Version: 5a
\ No newline at end of file