Merge in xonotic/xonotic-maps.pk3dir.git: debugger/courtfun
git-manager created issue #1498 on 2013-04-14T18:46:26Z:
Purpose of the branch:
Added strength on the bridge
Repository: xonotic/xonotic-maps.pk3dir.git Commit: 2090f100 Branch: debugger/courtfun
Merge commands:
cd data/xonotic-maps.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '2090f100784b023034f1579078cffcefefd152fa'..'origin/debugger/courtfun'
# 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/debugger/courtfun'
# 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 'debugger/courtfun'
Diffstat:
maps/courtfun.map | 1624 +++++++++++++++++++++++++++--------------------------
1 files changed, 814 insertions(+), 810 deletions(-)
Revision log:
commit 2090f100784b023034f1579078cffcefefd152fa
Author: Debugger
Commit: Debugger
added strength on the bridge
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/maps/courtfun.map b/maps/courtfun.map
index 96e460b..442210c 100644
— a/maps/courtfun.map
**+ b/maps/courtfun.map
@ -2540,7 +2540,7
@
common/caulk 0 0 0 0.5 0.5 0 0 0
}
{
exx/floor-grate01 170.66650390620 0 0.375 0.375 134217728 0 0
*( 2156 1144 328 ) exx/floor-grate01 170.66650390630 0 0.375 0.375 134217728 0 0
( 2040 1136 320 ) exx/floor-wrn01 128 224 0 0.5 0.5 134217728 0 0
exx/floor-wrn01 136 224 0 0.5 0.5 134217728 0 0
common/caulk 128 128 0 0.5 0.5 134217728 0 0
0 256 90 0.5 0.3125 0 0 0
( @ -3477,7 +3477,7
@ trak4x/base-concrete2a
common/caulk 64 58.1817626953 0 1.25 0.6875 0 0 0
trak5x/trim-basictrim1a1520576 448 ) ( 1520576 64 ) ( 1520648 448 ) common/caulk 69.8182373047 0 0 0.6875 0.5 0 0 0
~~trak4x/base-concrete1a 256 232.7270507812 0 0.3125 0.171875 0 0 0
*trak4x/base-concrete1a 256 232.7270507813 0 0.3125 0.171875 0 0 0
common/caulk 64.0001220703 0 0 1.25 0.5 0 0 0
common/caulk 69.8182373047 0 0 0.6875 0.5 0 0 0
}
@ -4471,7 +4471,7
@ trak4x/base-concrete2a
{
exx/base-metal01 0 0 0 0.25 0.25 0 0 0
exx/base-metal01 0 0 0 0.25 0.25 0 0 0
~~trak5x/light-light2a 64.0166015625 42.6704101562 0 0.2500004768 0.1875000745 0 0 0
*trak5x/light-light2a 64.0166015625 42.6704101563 0 0.2500004768 0.1875000745 0 0 0
exx/base-metal01 0 0 0 0.25 0.25 0 0 0
common/caulk 0 0 0 0.25 0.25 0 0 0
}
@ -4492,7 +4492,7
@ trak4x/base-concrete2a
{
exx/base-metal01 0 0 0 0.25 0.25 0 0 0
exx/base-metal01 0 0 0 0.25 0.25 0 0 0
~~trak5x/light-light2a 127.953125 63.9907226562 0 0.1874992698 0.2499995232 0 0 0
*trak5x/light-light2a 127.953125 63.9907226563 0 0.1874992698 0.2499995232 0 0 0
exx/base-metal01 0 0 0 0.25 0.25 0 0 0
common/caulk 0 0 0 0.25 0.25 0 0 0
}
@ -6186,15 +6186,15
@ trak4x/base-concrete1b
common/weapclip 109.135345459 189.5902099609 ~~33.1214790344 0.25 0.25 0 0 0
common/weapclip 54.5072631836 0 0 0.3057088852 0.25 0 0 0
common/weapclip 236.9738464355 0 0 0.3057088852 0.25 0 0 0
~~ common/weapclip 109.135345459 189.5902099609 ~~33.1214790344 0.25 0.25 0 0 0
~~ common/weapclip 54.5072631836 0 0 0.3057088852 0.25 0 0 0
~~common/weapclip 236.9738464355 0 0 0.3057088852 0.25 0 0 0
*common/weapclip 109.135345459 189.5902099609 ~~33.1214790344 0.25 0.25 0 0 0
*common/weapclip 54.5072631836 0 0 0.3057088852 0.25 0 0 0
- common/weapclip 236.9738464355 0 0 0.3057088852 0.25 0 0 0 } { common/weapclip 65.2109375 105.654296875 31.3072547913 0.2499999702 0.2499999702 0 0 0 common/weapclip 49.2109375 0 0 0.2926053405 0.25 0 0 0 common/weapclip 150.345703125 0 0 0.2926053405 0.25 0 0 0 ~~ common/weapclip 33.2109375 105.654296875 31.3072547913 0.2499999702 0.2499999702 0 0 0
- common/weapclip 33.2109375 105.654296875 31.3072547913 0.2499999702 0.2499999702 0 0 0
common/weapclip 49.2109375 0 0 0.2926053405 0.25 0 0 0
common/weapclip 150.345703125 0 0 0.2926053405 0.25 0 0 0
}
@ -6507,11 +6507,11
@ exx/base-metal05rust } } { ~~ common/weapclip 15.378692627 193.7634887695 ~~29.1059436798 0.2499999702 0.2499999702 0 0 0 *common/weapclip 15.378692627 193.7634887695 ~~29.1059436798 0.2499999702 0.2499999702 0 0 0 common/weapclip 88.341293335 0 0 0.2827774882 0.25 0 0 0 ~~ common/weapclip 70.5596313477 0 0 0.2827774882 0.25 0 0 0common/weapclip 15.378692627 193.763488769529.1059436798 0.2499999702 0.2499999702 0 0 0 ~~common/weapclip 88.341293335 0 0 0.2827774882 0.25 0 0 0 *common/weapclip 70.5596313477 0 0 0.2827774882 0.25 0 0 0 - common/weapclip 15.378692627 193.7634887695~~29.1059436798 0.2499999702 0.2499999702 0 0 0
- common/weapclip 88.341293335 0 0 0.2827774882 0.25 0 0 0
common/weapclip 70.5596313477 0 0 0.2827774882 0.25 0 0 0
}
{
@ -7622,9 +7622,9
@ trak5x/trim-basictrim1a common/nodrawnonsolid 0 160 0~~0.25 0.25 134217728 0 0 } {common/weapclip 109.135345459 189.590209960933.1214790344 0.25 0.25 0 0 0 ~~common/weapclip 54.5072631836 0 0 0.3057088852 0.25 0 0 0 ~~ common/weapclip 236.9738464355 0 0 0.3057088852 0.25 0 0 0 - common/weapclip 109.135345459 189.5902099609~~33.1214790344 0.25 0.25 0 0 0
- common/weapclip 54.5072631836 0 0 0.3057088852 0.25 0 0 0
*common/weapclip 236.9738464355 0 0 0.3057088852 0.25 0 0 0
common/weapclip 109.135345459 189.5902099609
33.1214790344 0.25 0.25 0 0 0 common/weapclip 54.5072631836 0 0 0.3057088852 0.25 0 0 0 common/weapclip 236.9738464355 0 0 0.3057088852 0.25 0 0 039.2282829285 0.25 0.25 0 0 0 common/weapclip 200.1282958984 120.4572753906 ~~39.2282829285 0.25 0.25 0 0 0 ~~ common/weapclip 135.5427246094 0 0 0.3227337301 0.25 0 0 0@ -12291,7 +12291,7
@ trak5x/base-pipe1b { common/weapclip 200.1282958984 120.4572753906 - common/weapclip 135.5427246094 0 0 0.3227337301 0.25 0 0 0
common/weapclip 135.5427246094 0 0 0.3227337301 0.25 0 0 0
common/weapclip 200.1282958984 0 0 0.3227337301 0.25 0 0 0
common/weapclip 135.5427246094 0 0 0.395312041 0.25 0 0 0
@ -12313,14 +12313,14
@ trak5x/base-pipe1b common/weapclip 149.1201171875 0 0 0.3347280622 0.25 0 0 0 } { ~~ common/weapclip 144.4337158203 41.1654167175 70.8230285645 0.25 0.25 0 0 0 ~~common/weapclip 144.4337158203 41.1654167175 70.8230285645 0.25 0.25 0 0 0 *common/weapclip 144.4337158203 41.1654167175 70.8230285645 0.25 0.25 0 0 0 - common/weapclip 144.4337158203 41.1654167175 70.8230285645 0.25 0.25 0 0 0
common/weapclip 51.9050292969 0 0~~0.2646879256 0.25 0 0 0
common/weapclip 51.9050292969 0 0 ~~0.2646879256 0.25 0 0 0
common/weapclip 77.6422424316 0 0 0.2646879256 0.25 0 0 0
common/weapclip 182.7977600098 0 0 0.761064887 0.25 0 0 0
~~ common/weapclip 51.9050292969 0 0 ~~0.2646879256 0.25 0 0 0
~~ common/weapclip 51.9050292969 0 0 ~~0.2646879256 0.25 0 0 0
*common/weapclip 51.9050292969 0 0 ~~0.2646879256 0.25 0 0 0
*common/weapclip 51.9050292969 0 0 ~~0.2646879256 0.25 0 0 0
common/weapclip 77.6422424316 0 0 0.2646879256 0.25 0 0 0
common/weapclip 182.7977600098 0 0 0.761064887 0.25 0 0 0
}
@ -12334,11 +12334,11
@ trak5x/base-pipe1b } { common/weapclip 34.484375 58.9890136719 33.9811515808 0.2500000596 0.2500000596 0 0 0 ~~ common/weapclip 46.1845703125 0 0 1.1261645555 0.25 0 0 0 ~~common/weapclip 16.9907226562 0 0 1.1261645555 0.25 0 0 0 ~~ common/weapclip 50.484375 58.9890136719 33.9811515808 0.2500000596 0.2500000596 0 0 0 - common/weapclip 46.1845703125 0 0 1.1261645555 0.25 0 0 0 *common/weapclip 16.9907226563 0 0 1.1261645555 0.25 0 0 0
- common/weapclip 50.484375 58.9890136719 33.9811515808 0.2500000596 0.2500000596 0 0 0 common/weapclip 46.1845703125 0 0 1.1261645555 0.25 0 0 0 ~~ common/weapclip 16.9907226562 0 0 1.1261645555 0.25 0 0 0
- common/weapclip 16.9907226563 0 0 1.1261645555 0.25 0 0 0
}
{
common/weapclip 199.0439453125 77.6525878906 72.986869812 0.2500000596 0.2500000596 0 0 0
@ -12350,11 +12350,11
@ trak5x/base-pipe1b } { common/weapclip 228.5465698242 154.8723602295~~36.2582244873 0.2500000596 0.2500000596 0 0 0 ~~common/weapclip 239.869430542 0 0 3.3309488297 0.25 0 0 0 ~~ common/weapclip 242.6996765137 0 0 3.3309488297 0.25 0 0 0common/weapclip 244.5465698242 154.872360229536.2582244873 0.2500000596 0.2500000596 0 0 0 ~~common/weapclip 239.869430542 0 0 3.3309488297 0.25 0 0 0 ~~ common/weapclip 242.6996765137 0 0 3.3309488297 0.25 0 0 0 - common/weapclip 239.869430542 0 0 3.3309488297 0.25 0 0 0 *common/weapclip 242.6996765137 0 0 3.3309488297 0.25 0 0 0
- common/weapclip 244.5465698242 154.8723602295~~36.2582244873 0.2500000596 0.2500000596 0 0 0
*common/weapclip 239.869430542 0 0 3.3309488297 0.25 0 0 0
*( 48.5631103516 1738.6743164063 64 ) ( 91.1457519531 1796.7321777344 64 ) ( 48.5631103516 1738.6743164063 72 ) common/weapclip 242.6996765137 0 0 3.3309488297 0.25 0 0 0
}
{
patchDef2
@ -12362,8 +12362,8
@ patchDef2 map_courtfun/screenanim_work ( 3 3 0 0 0 ) ( ~~) ~~( ( 1952.6085205078 670.123046875 532 0.5 1 ) ( 1937.0395507812 651.8580932617 580 0.5 0.5 ) ( 1929.2551269531 642.7255859375 636 0.5 0 ) ) *) *( ( 1952.6085205078 670.123046875 532 0.5 1 ) ( 1937.0395507813 651.8580932617 580 0.5 0.5 ) ( 1929.2551269531 642.7255859375 636 0.5 0 ) ) ( ( 2014.4283447266 617.4281005859 532 1 1 ) ( 1998.859375 599.1631469727 580 1 0.5 ) ( 1991.0749511719 590.0306396484 636 1 0 ) ) ) }@ -13486,10 +13486,10
@ exx/base-metal01 { ( 1108 1932.9313964844 424.4362792969 ) ( 1108 1943.9738769531 454.4706420898 ) ( 1104 1932.9313964844 424.4362792969 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0 ( 1108 1941.2683105469 438.4182128906 ) ( 1104 1941.2683105469 438.4182128906 ) ( 1108 1935.6368408203 440.4886779785 ) 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 exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0 ~~common/caulk 0 0 0 0.25 0.25 134217728 0 0 ~~ exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0 - common/caulk 0 0 0 0.25 0.25 134217728 0 0
*exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
}
{
exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
@ -19652,20 +19652,20
@ trak4x/base-concrete1b common/caulk 0 0 0 0.25 0.25 0 0 0 } { ~~common/weapclip 242.5913085938 201.0537414551 146.8785095215 0.25 0.25 0 0 0 *common/weapclip 242.5913085938 201.0537414551 146.8785095215 0.25 0.25 0 0 0 common/weapclip 224.1410217285 0 0 ~~0.3057088852 0.25 0 0 0 ~~ common/weapclip 160.641784668 0 0 ~~0.3057088852 0.25 0 0 0 ~~ common/weapclip 242.5913085938 201.0537414551 146.8785095215 0.25 0.25 0 0 0common/weapclip 224.1410217285 0 00.3057088852 0.25 0 0 0 - common/weapclip 160.641784668 0 0~~0.3057088852 0.25 0 0 0
- common/weapclip 242.5913085938 201.0537414551 146.8785095215 0.25 0.25 0 0 0
*common/weapclip 224.1410217285 0 0
0.3057088852 0.25 0 0 0 common/weapclip 160.641784668 0 00.3057088852 0.25 0 0 0 } {common/weapclip 202.3586425781 47.1522827148148.6927490234 0.2499999702 0.2499999702 0 0 0common/weapclip 130.8325805664 0 00.2926053107 0.25 0 0 0 - common/weapclip 202.3586425781 47.1522827148~~148.6927490234 0.2499999702 0.2499999702 0 0 0
*common/weapclip 130.8325805664 0 0
0.2926053107 0.25 0 0 0 common/weapclip 143.2762756348 0 00.2926053107 0.25 0 0 0 common/weapclip 170.3586425781 47.1522827148 ~~148.6927490234 0.2499999702 0.2499999702 0 0 0 ~~ common/weapclip 130.8325805664 0 0 ~~0.2926053107 0.25 0 0 0 ~~ common/weapclip 143.2762756348 0 0 ~~0.2926053107 0.25 0 0 0 *common/weapclip 130.8325805664 0 0 ~~0.2926053107 0.25 0 0 0 *common/weapclip 143.2762756348 0 00.2926053107 0.25 0 0 0 } { common/weapclip 6.7661743164 104.231628418156.1338653564 0.25 0.25 0 0 0@ -19976,11 +19976,11
@ exx/base-metal05rust } } { ~~common/weapclip 251.7648620605 183.6544799805 150.8940582275 0.2499999702 0.2499999702 0 0 0 ~~ common/weapclip 195.4547271729 0 0 ~~0.2827774882 0.25 0 0 0 ~~ common/weapclip 22.7936706543 0 0 ~~0.2827774882 0.25 0 0 0 ~~ common/weapclip 251.7648620605 183.6544799805 150.8940582275 0.2499999702 0.2499999702 0 0 0common/weapclip 195.4547271729 0 00.2827774882 0.25 0 0 0 - common/weapclip 251.7648620605 183.6544799805 150.8940582275 0.2499999702 0.2499999702 0 0 0 *common/weapclip 195.4547271729 0 0 ~~0.2827774882 0.25 0 0 0 *common/weapclip 22.7936706543 0 0 ~~0.2827774882 0.25 0 0 0 *common/weapclip 251.7648620605 183.6544799805 150.8940582275 0.2499999702 0.2499999702 0 0 0
- common/weapclip 195.4547271729 0 0~~0.2827774882 0.25 0 0 0
common/weapclip 22.7936706543 0 0
0.2827774882 0.25 0 0 0 } {0.3057088852 0.25 0 0 0 } {@ -21107,10 +21107,10
@ trak5x/trim-basictrim1a common/weapclip 160.641784668 0 0common/weapclip 202.3586425781 47.1522827148148.6927490234 0.2499999702 0.2499999702 0 0 0common/weapclip 130.8325805664 0 00.2926053107 0.25 0 0 0common/weapclip 143.2762756348 0 00.2926053107 0.25 0 0 0common/weapclip 170.3586425781 47.1522827148148.6927490234 0.2499999702 0.2499999702 0 0 0 - common/weapclip 202.3586425781 47.1522827148~~148.6927490234 0.2499999702 0.2499999702 0 0 0
- common/weapclip 130.8325805664 0 0~~0.2926053107 0.25 0 0 0
- common/weapclip 143.2762756348 0 0~~0.2926053107 0.25 0 0 0
*(
1775.1882324219 3699.9331054688 128 ) common/weapclip 170.3586425781 47.1522827148148.6927490234 0.2499999702 0.2499999702 0 0 0 (1771.8151855469 3697.783203125 160 ) common/weapclip 130.8325805664 0 00.2926053107 0.25 0 0 0 (1771.8151855469 3697.783203125 160 ) common/weapclip 143.2762756348 0 00.2926053107 0.25 0 0 0 }@ -22307,15 +22307,15
@ patchDef2 trak5x/base-pipe1a ( 9 3 0 0 0 ) ( ~~) ~~( ( ~~1979 3402 167 0.015625 0 ) ) ~~( ( ~~1979 3402 166 0.03125 0 ) ) ~~( ( ~~1979 3402 165 0.046875 0 ) ) ~~( ( ~~1980 3402 165 0.0625 0 ) ) ~~( ( ~~1981 3402 165 0.078125 0 ) ) ~~( ( ~~1981 3402 166 0.09375 0 ) ) ~~( ( ~~1981 3402 167 0.109375 0 ) ) ~~( ( ~~1980 3402 167 0.125 0 ) ) *) - ) *)
- ) *)
- ) *)
- )
*)
)
}
}
@ -22325,15 +22325,15
@ patchDef2 trak5x/base-pipe1a ) ~~) ~~ ) ~~) ~~ ) ~~) ~~ ) ~~) ~~ ) - ) *)
- ) *)
- ) *)
- ) *)
- )
)
}
}
@ -23189,15 +23189,15
@ patchDef2 trak5x/base-pipe1a ) ~~( ( ~~2627 3226 103 0.015625 0 ) ) ~~( ( ~~2627 3226 102 0.03125 0 ) ) ~~( ( ~~2627 3226 101 0.046875 0 ) ) ~~( ( ~~2628 3226 101 0.0625 0 ) ) ~~( ( ~~2629 3226 101 0.078125 0 ) ) ~~( ( ~~2629 3226 102 0.09375 0 ) ) ~~( ( ~~2629 3226 103 0.109375 0 ) ) ~~( ( ~~2628 3226 103 0.125 0 ) ) *) - ) *)
- ) *)
- ) *)
- )
*)
)
}
}
@ -23207,15 +23207,15
@ patchDef2 trak5x/base-pipe1a ) ~~) ~~ ) ~~) ~~ ) ~~) ~~ ) ~~) ~~ ) - ) *)
- ) *)
- ) *)
- ) *)
- )
)
}
}
@ -23297,15 +23297,15
@ patchDef2 trak5x/base-pipe1a ) ~~( ( ~~2627 3674 103 0.015625 0 ) ) ~~( ( ~~2627 3674 102 0.03125 0 ) ) ~~( ( ~~2627 3674 101 0.046875 0 ) ) ~~( ( ~~2628 3674 101 0.0625 0 ) ) ~~( ( ~~2629 3674 101 0.078125 0 ) ) ~~( ( ~~2629 3674 102 0.09375 0 ) ) ~~( ( ~~2629 3674 103 0.109375 0 ) ) ~~( ( ~~2628 3674 103 0.125 0 ) ) *) - ) *)
- ) *)
- ) *)
- )
*)
)
}
}
@ -23315,15 +23315,15
@ patchDef2 trak5x/base-pipe1a ) ~~) ~~ ) ~~) ~~ ) ~~) ~~ ) ~~) ~~ ) - ) *)
- ) *)
- ) *)
- ) *)
- )
)
}
}
@ -25762,36 +25762,36
@ trak5x/base-pipe1b common/weapclip 254.9114990234 234.928314209 140.7717132568 0.25 0.25 0 0 0 common/weapclip 142.5079650879 0 0~~0.3227337301 0.25 0 0 0 (3555.4775390625 3246.435546875 320 ) common/weapclip 142.5079650879 0 00.3227337301 0.25 0 0 0common/weapclip 52.5516967773 0 00.3227337301 0.25 0 0 0 *common/weapclip 52.5516967773 0 00.3227337301 0.25 0 0 0 common/weapclip 14.107635498 0 00.395312041 0.25 0 0 0common/weapclip 142.5079650879 0 00.3227337301 0.25 0 0 0 *(3527.6059570313 3237.8813476563 320 ) common/weapclip 142.5079650879 0 00.3227337301 0.25 0 0 0 (3524.5224609375 3249.564453125 320 ) common/weapclip 142.5079650879 0 00.3227337301 0.25 0 0 0common/weapclip 52.5516967773 0 00.3227337301 0.25 0 0 0 *common/weapclip 52.5516967773 0 00.3227337301 0.25 0 0 0 common/weapclip 14.107635498 0 00.395312041 0.25 0 0 0 } { ~~common/weapclip 188.4419555664 253.3590393066 131.6796112061 0.2499999702 0.2499999702 0 0 0 ~~ common/weapclip 188.4419555664 253.3590393066 131.6796112061 0.2499999702 0.2499999702 0 0 0 *( ~~3502.5893554688 3261.310546875 364 ) common/weapclip 188.4419555664 253.3590393066 131.6796112061 0.2499999702 0.2499999702 0 0 0 *common/weapclip 188.4419555664 253.3590393066 131.6796112061 0.2499999702 0.2499999702 0 0 0 common/weapclip 200.3218688965 0 0 ~~0.3347280622 0.25 0 0 0 ~~ common/weapclip 207.4387512207 0 0 ~~0.3759598434 0.25 0 0 0 ~~ common/weapclip 75.223815918 0 0 0.3347280622 0.25 0 0 0common/weapclip 200.3218688965 0 00.3347280622 0.25 0 0 0common/weapclip 200.3218688965 0 00.3347280622 0.25 0 0 0common/weapclip 207.4387512207 0 00.3759598434 0.25 0 0 0 - common/weapclip 207.4387512207 0 0~~0.3759598434 0.25 0 0 0
*common/weapclip 75.223815918 0 0 0.3347280622 0.25 0 0 0
*(
3480.9008789063 3244.4697265625 320 ) common/weapclip 200.3218688965 0 00.3347280622 0.25 0 0 0 *common/weapclip 200.3218688965 0 0 ~~0.3347280622 0.25 0 0 0 *common/weapclip 207.4387512207 0 00.3759598434 0.25 0 0 0 common/weapclip 75.223815918 0 0 0.3347280622 0.25 0 0 0 common/weapclip 200.3218688965 0 00.3347280622 0.25 0 0 0 } {common/weapclip 25.7415466309 88.5920715332109.1769714355 0.25 0.25 0 0 0common/weapclip 25.7415466309 88.5920715332109.1769714355 0.25 0.25 0 0 0 ~~common/weapclip 166.7324981689 0 0 0.2646879256 0.25 0 0 0 ~~ common/weapclip 166.7324981689 0 0 0.2646879256 0.25 0 0 0 - common/weapclip 25.7415466309 88.5920715332~~109.1769714355 0.25 0.25 0 0 0
*(
4747.1704101563 2356.58984375 64 ) common/weapclip 25.7415466309 88.5920715332109.1769714355 0.25 0.25 0 0 0 *common/weapclip 166.7324981689 0 0 0.2646879256 0.25 0 0 0 *(4730.5375976563 2322.2189941406 64 ) common/weapclip 166.7324981689 0 0 0.2646879256 0.25 0 0 0 common/weapclip 220.8810119629 0 00.2646879256 0.25 0 0 0common/weapclip 20.5450363159 0 00.761064887 0.25 0 0 0 ~~common/weapclip 166.7324981689 0 0 0.2646879256 0.25 0 0 0 ~~( ~~4744.0903320312 2350.2248535156 64 ) common/weapclip 166.7324981689 0 0 0.2646879256 0.25 0 0 0 ~~(4752.4262695312 2341.4777832031 64 ) common/weapclip 220.8810119629 0 00.2646879256 0.25 0 0 0common/weapclip 20.5450363159 0 00.761064887 0.25 0 0 0 *common/weapclip 20.5450363159 0 0 ~~0.761064887 0.25 0 0 0 *common/weapclip 166.7324981689 0 0 0.2646879256 0.25 0 0 0 - common/weapclip 166.7324981689 0 0 0.2646879256 0.25 0 0 0
*common/weapclip 220.8810119629 0 0 ~~0.2646879256 0.25 0 0 0
*common/weapclip 20.5450363159 0 0
0.761064887 0.25 0 0 0 } { common/weapclip 225.4001464844 18.3984375 140.6613616943 0.2500000298 0.2500000298 0 0 0146.0188446045 0.2500000596 0.2500000596 0 0 0@ -25803,27 +25803,27
@ trak5x/base-pipe1b } { common/weapclip 183.702911377 12.2414550781common/weapclip 249.0605316162 0 01.1261645555 0.25 0 0 0common/weapclip 212.4541320801 0 01.1261645555 0.25 0 0 0common/weapclip 199.702911377 12.2414550781146.0188446045 0.2500000596 0.2500000596 0 0 0common/weapclip 249.0605316162 0 01.1261645555 0.25 0 0 0common/weapclip 212.4541320801 0 01.1261645555 0.25 0 0 0 - common/weapclip 249.0605316162 0 0~~1.1261645555 0.25 0 0 0
- common/weapclip 212.4541320801 0 0~~1.1261645555 0.25 0 0 0
*(
3802.2692871094 2237.9731445313 64 ) common/weapclip 199.702911377 12.2414550781146.0188446045 0.2500000596 0.2500000596 0 0 0 *common/weapclip 249.0605316162 0 0 ~~1.1261645555 0.25 0 0 0 *common/weapclip 212.4541320801 0 0 ~~1.1261645555 0.25 0 0 0 } { ~~ common/weapclip 86.6384887695 246.6575317383 ~~107.013130188 0.2500000596 0.2500000596 0 0 0 ~~ common/weapclip 105.9767303467 0 0 ~~4.3658013344 0.25 0 0 0 *common/weapclip 86.6384887695 246.6575317383 ~~107.013130188 0.2500000596 0.2500000596 0 0 0 *common/weapclip 105.9767303467 0 0 ~~4.3658013344 0.25 0 0 0 common/weapclip 177.1690368652 0 0 4.3658013344 0.25 0 0 0 ~~ common/weapclip 102.6384887695 246.6575317383 ~~107.013130188 0.2500000596 0.2500000596 0 0 0 ~~ common/weapclip 105.9767303467 0 0 ~~4.3658013344 0.25 0 0 0 ~~ common/weapclip 177.1690368652 0 0 4.3658013344 0.25 0 0 0 - common/weapclip 102.6384887695 246.6575317383~~107.013130188 0.2500000596 0.2500000596 0 0 0
- common/weapclip 105.9767303467 0 0~~4.3658013344 0.25 0 0 0
- common/weapclip 177.1690368652 0 0 4.3658013344 0.25 0 0 0
}
{
~~ common/weapclip 158.0513916016 118.2446594238 143.7417755127 0.2500000596 0.2500000596 0 0 0
common/weapclip 34.1897888184 0 03.3309488297 0.25 0 0 0common/weapclip 153.9518432617 0 03.3309488297 0.25 0 0 0 ~~common/weapclip 174.0513916016 118.2446594238 143.7417755127 0.2500000596 0.2500000596 0 0 0 ~~ common/weapclip 34.1897888184 0 0 ~~3.3309488297 0.25 0 0 0 ~~ common/weapclip 153.9518432617 0 0 ~~3.3309488297 0.25 0 0 0 *common/weapclip 158.0513916016 118.2446594238 143.7417755127 0.2500000596 0.2500000596 0 0 0 - common/weapclip 34.1897888184 0 0~~3.3309488297 0.25 0 0 0
*(
4245.2036132813 2213.8503417969 72 ) common/weapclip 153.9518432617 0 03.3309488297 0.25 0 0 0 *common/weapclip 174.0513916016 118.2446594238 143.7417755127 0.2500000596 0.2500000596 0 0 0 *(4144.5629882813 2229.3256835938 64 ) common/weapclip 34.1897888184 0 03.3309488297 0.25 0 0 0 +(4144.5629882813 2229.3256835938 64 ) common/weapclip 153.9518432617 0 03.3309488297 0.25 0 0 0 } { patchDef2@ -25831,9 +25831,9
@ patchDef2 map_courtfun/screenanim_work ( 3 3 0 0 0 ) ( ~~) ~~( ( ~~6048.6083984375 3297.876953125 532 0.5 1 ) ) ~~( ( ~~6110.4282226562 3350.5717773438 532 1 1 ) ) *) - )
*)
)
}
}
@ -26956,7 +26956,7
@ exx/base-metal01 exx/base-metal03 0 0 00.25 0.25 134217728 0 0 common/caulk 0 0 180 0.25 0.25 134217728 0 0 common/caulk0 0 0 ~~0.25 0.25 134217728 0 0 ~~ exx/base-metal03 0 0 0 ~~0.25 0.25 134217728 0 0 *exx/base-metal03 0 0 00.25 0.25 134217728 0 0 common/caulk 0 0 180 0.25 0.25 134217728 0 0 exx/base-metal03 0 0 00.25 0.25 134217728 0 0 }@ -26964,7 +26964,7
@ exx/base-metal01 exx/base-metal03 0 0 180 0.25 0.25 134217728 0 0 common/caulk 0 0 00.25 0.25 134217728 0 0 common/caulk0 0 0 ~~0.25 0.25 134217728 0 0 ~~ exx/base-metal03 0 0 180 0.25 0.25 134217728 0 0 - exx/base-metal03 0 0 180 0.25 0.25 134217728 0 0
common/caulk 0 0 0~~0.25 0.25 134217728 0 0
exx/base-metal03 0 0 0
0.25 0.25 134217728 0 0 }0 0 0@ -26973,8 +26973,8
@ exx/base-metal01 common/caulk 0 0 180 0.25 0.25 134217728 0 0 common/caulk0.25 0.25 134217728 0 0 exx/base-metal03 0 0 00.25 0.25 134217728 0 0 ~~common/caulk 0 0 180 0.25 0.25 134217728 0 0 ~~ exx/base-metal03 0 0 0 ~~0.25 0.25 134217728 0 0 *common/caulk 0 0 180 0.25 0.25 134217728 0 0 - exx/base-metal03 0 0 0~~0.25 0.25 134217728 0 0
}
{
trak4x/base-concrete1b 0 0 180 0.25 0.25 0 0 0
@ -28792,80 +28792,80
@ exx/base-metal01 { “classname” “func_group” { ~~common/weapclip 0 0 0 0.25 0.25 0 0 0 ~~ common/weapclip 0 0 0 0.25 0.25 0 0 0 - common/weapclip 0 0 0 0.25 0.25 0 0 0
- common/weapclip 0 0 0 0.25 0.25 0 0 0
common/weapclip 0 0 0 0.25 0.25 0 0 0
~~(
1264.6617431641399.9994506836 64 ) (1259.4422607422406.0622558594 64 ) (1240.4106445312379.1216430664 64