replace HLAC with machinegun, align some textures, remove cells next to nex

diff --git a/maps/tarx.map b/maps/tarx.map
index 968270bf8ba938c24c78af802985d5a730e30d84..9ed22bcf60fb6605ae851fed2364897964a2fc3e 100644 (file)
--- a/maps/tarx.map
+++ b/maps/tarx.map
@@ -16017,9 +16017,9 @@ patchDef2
 exx/floor-wrn01
 ( 3 3 0 0 0 )
 (
-( ( -1344 2880 1096 14.5 -7.5 ) ( -1344 2880 1096 14.5 -7.5 ) ( -1344 2880 1096 14.5 -7.5 ) )
-( ( -1344 2880 1096 14.5 -7.5 ) ( -1344 2880 1096 14.5 -7.5 ) ( -1344 2880 1096 14.5 -7.5 ) )
-( ( -1408 2880 1096 15 -7.5 ) ( -1408 2816 1096 15 -8 ) ( -1344 2816 1096 14.5 -8 ) )
+( ( -1344 2880 1096 -10.5 -22.5 ) ( -1344 2880 1096 -10.5 -22.5 ) ( -1344 2880 1096 -10.5 -22.5 ) )
+( ( -1344 2880 1096 -10.5 -22.5 ) ( -1344 2880 1096 -10.5 -22.5 ) ( -1344 2880 1096 -10.5 -22.5 ) )
+( ( -1408 2880 1096 -11 -22.5 ) ( -1408 2816 1096 -11 -22 ) ( -1344 2816 1096 -10.5 -22 ) )
 )
 }
 }
@@ -16057,9 +16057,9 @@ patchDef2
 exx/floor-wrn01
 ( 3 3 0 0 0 )
 (
-( ( -1088 2880 1096 12.5 -7.5 ) ( -1088 2880 1096 12.5 -7.5 ) ( -1088 2880 1096 12.5 -7.5 ) )
-( ( -1088 2880 1096 12.5 -7.5 ) ( -1088 2880 1096 12.5 -7.5 ) ( -1088 2880 1096 12.5 -7.5 ) )
-( ( -1088 2816 1096 12.5 -8 ) ( -1024 2816 1096 12 -8 ) ( -1024 2880 1096 12 -7.5 ) )
+( ( -1088 2880 1096 -8.5 -22.5 ) ( -1088 2880 1096 -8.5 -22.5 ) ( -1088 2880 1096 -8.5 -22.5 ) )
+( ( -1088 2880 1096 -8.5 -22.5 ) ( -1088 2880 1096 -8.5 -22.5 ) ( -1088 2880 1096 -8.5 -22.5 ) )
+( ( -1088 2816 1096 -8.5 -22 ) ( -1024 2816 1096 -8 -22 ) ( -1024 2880 1096 -8 -22.5 ) )
 )
 }
 }
@@ -16101,9 +16101,9 @@ patchDef2
 exx/floor-wrn01
 ( 3 3 0 0 0 )
 (
-( ( -1088 3136 1096 12.5 -5.5 ) ( -1088 3136 1096 12.5 -5.5 ) ( -1088 3136 1096 12.5 -5.5 ) )
-( ( -1088 3136 1096 12.5 -5.5 ) ( -1088 3136 1096 12.5 -5.5 ) ( -1088 3136 1096 12.5 -5.5 ) )
-( ( -1024 3136 1096 12 -5.5 ) ( -1024 3200 1096 12 -5 ) ( -1088 3200 1096 12.5 -5 ) )
+( ( -1088 3136 1096 -8.5 -24.5 ) ( -1088 3136 1096 -8.5 -24.5 ) ( -1088 3136 1096 -8.5 -24.5 ) )
+( ( -1088 3136 1096 -8.5 -24.5 ) ( -1088 3136 1096 -8.5 -24.5 ) ( -1088 3136 1096 -8.5 -24.5 ) )
+( ( -1024 3136 1096 -8 -24.5 ) ( -1024 3200 1096 -8 -25 ) ( -1088 3200 1096 -8.5 -25 ) )
 )
 }
 }
@@ -16149,9 +16149,9 @@ patchDef2
 exx/floor-wrn01
 ( 3 3 0 0 0 )
 (
-( ( -1344 3136 1096 14.5 -5.5 ) ( -1344 3136 1096 14.5 -5.5 ) ( -1344 3136 1096 14.5 -5.5 ) )
-( ( -1344 3136 1096 14.5 -5.5 ) ( -1344 3136 1096 14.5 -5.5 ) ( -1344 3136 1096 14.5 -5.5 ) )
-( ( -1344 3200 1096 14.5 -5 ) ( -1408 3200 1096 15 -5 ) ( -1408 3136 1096 15 -5.5 ) )
+( ( -1344 3136 1096 -10.5 -24.5 ) ( -1344 3136 1096 -10.5 -24.5 ) ( -1344 3136 1096 -10.5 -24.5 ) )
+( ( -1344 3136 1096 -10.5 -24.5 ) ( -1344 3136 1096 -10.5 -24.5 ) ( -1344 3136 1096 -10.5 -24.5 ) )
+( ( -1344 3200 1096 -10.5 -25 ) ( -1408 3200 1096 -11 -25 ) ( -1408 3136 1096 -11 -24.5 ) )
 )
 }
 }
@@ -28922,78 +28922,6 @@ exx/floor-simplines
 ( -1408 3000 336 ) ( -1408 2936 336 ) ( -1904 3000 336 ) common/caulk -0 32 90 0.25 0.25 134217728 0 0
 }
 {
-patchDef2
-{
-exx/wall-metal02
-( 3 3 0 0 0 )
-(
-( ( -1480 3000 208 0 0 ) ( -1480 2968 208 0.4999999702 0 ) ( -1480 2936 208 0.9999999404 0 ) )
-( ( -1480 3000 144 0 0.9999999404 ) ( -1480 2968 144 0.4999999404 0.9999999404 ) ( -1480 2936 144 0.9999999404 0.9999999404 ) )
-( ( -1408 3000 144 0 2.125 ) ( -1408 2968 144 0.5000000596 2.125 ) ( -1408 2936 144 1 2.125 ) )
-)
-}
-}
-{
-patchDef2
-{
-exx/floor-simplines
-( 3 3 0 0 0 )
-(
-( ( -1408 3000 208 -7 -5.5 ) ( -1408 3000 208 -7 -5.5 ) ( -1408 3000 208 -7 -5.5 ) )
-( ( -1408 3000 208 -7 -5.5 ) ( -1408 3000 208 -7 -5.5 ) ( -1408 3000 208 -7 -5.5 ) )
-( ( -1408 3000 144 -6.5 -5.5 ) ( -1480 3000 144 -6.5 -6.0625 ) ( -1480 3000 208 -7 -6.0625 ) )
-)
-}
-}
-{
-patchDef2
-{
-exx/floor-simplines
-( 3 3 0 0 0 )
-(
-( ( -1408 2936 208 1.6250004768 15 ) ( -1408 2936 208 1.6250004768 15 ) ( -1408 2936 208 1.6250004768 15 ) )
-( ( -1408 2936 208 1.6250004768 15 ) ( -1408 2936 208 1.6250004768 15 ) ( -1408 2936 208 1.6250004768 15 ) )
-( ( -1480 2936 208 1.6250004768 15.5625 ) ( -1480 2936 144 1.1249995232 15.5624980927 ) ( -1408 2936 144 1.125 15 ) )
-)
-}
-}
-{
-patchDef2
-{
-exx/wall-metal02
-( 3 3 0 0 0 )
-(
-( ( -1480 2936 336 0 0 ) ( -1480 2968 336 0.4999999702 0 ) ( -1480 3000 336 0.9999999404 0 ) )
-( ( -1480 2936 400 0 0.9999999404 ) ( -1480 2968 400 0.4999999404 0.9999999404 ) ( -1480 3000 400 0.9999999404 0.9999999404 ) )
-( ( -1408 2936 400 0 2.125 ) ( -1408 2968 400 0.5000000596 2.125 ) ( -1408 3000 400 1 2.125 ) )
-)
-}
-}
-{
-patchDef2
-{
-exx/floor-simplines
-( 3 3 0 0 0 )
-(
-( ( -1408 2936 336 2.625 15 ) ( -1408 2936 336 2.625 15 ) ( -1408 2936 336 2.625 15 ) )
-( ( -1408 2936 336 2.625 15 ) ( -1408 2936 336 2.625 15 ) ( -1408 2936 336 2.625 15 ) )
-( ( -1408 2936 400 3.1250004768 15 ) ( -1480 2936 400 3.1250009537 15.5624990463 ) ( -1480 2936 336 2.6250004768 15.5625 ) )
-)
-}
-}
-{
-patchDef2
-{
-exx/floor-simplines
-( 3 3 0 0 0 )
-(
-( ( -1408 3000 336 -7 -5.5 ) ( -1408 3000 336 -7 -5.5 ) ( -1408 3000 336 -7 -5.5 ) )
-( ( -1408 3000 336 -7 -5.5 ) ( -1408 3000 336 -7 -5.5 ) ( -1408 3000 336 -7 -5.5 ) )
-( ( -1480 3000 336 -7 -6.0625 ) ( -1480 3000 400 -6.5 -6.0625 ) ( -1408 3000 400 -6.5 -5.5 ) )
-)
-}
-}
-{
 ( -1448 2984 184 ) ( -1448 2984 152 ) ( -1448 2952 184 ) exx/base-metal04 256 256 0 0.03125 0.0625 134217728 0 0
 ( -1434 2984 208 ) ( -1434 2952 208 ) ( -1594 2984 208 ) common/caulk 128 0.0013427734 0 0.125 0.09375 134217728 0 0
 ( -1432 2984 184 ) ( -1592 2984 184 ) ( -1432 2984 152 ) exx/base-metal04 256 0 0 0.03125 0.046875 134217728 0 0
@@ -36533,6 +36461,78 @@ exx/floor-rnd01
 ( -624 3600 -649 ) ( -944 3408 -649 ) ( -944 3600 -649 ) exx/floor-wrn01 0 0 180 0.25 0.25 0 0 0
 ( -1232 3584 -1408 ) ( -1224 3584 -1408 ) ( -1232 3584 -1280 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 }
+{
+patchDef2
+{
+exx/wall-metal02
+( 3 3 0 0 0 )
+(
+( ( -1480 3000 208 0 0 ) ( -1480 2968 208 0.4999999702 0 ) ( -1480 2936 208 0.9999999404 0 ) )
+( ( -1480 3000 144 0 0.9999999404 ) ( -1480 2968 144 0.4999999404 0.9999999404 ) ( -1480 2936 144 0.9999999404 0.9999999404 ) )
+( ( -1408 3000 144 0 2.125 ) ( -1408 2968 144 0.5000000596 2.125 ) ( -1408 2936 144 1 2.125 ) )
+)
+}
+}
+{
+patchDef2
+{
+exx/floor-simplines
+( 3 3 0 0 0 )
+(
+( ( -1408 3000 208 -7 -5.5 ) ( -1408 3000 208 -7 -5.5 ) ( -1408 3000 208 -7 -5.5 ) )
+( ( -1408 3000 208 -7 -5.5 ) ( -1408 3000 208 -7 -5.5 ) ( -1408 3000 208 -7 -5.5 ) )
+( ( -1408 3000 144 -6.5 -5.5 ) ( -1480 3000 144 -6.5 -6.0625 ) ( -1480 3000 208 -7 -6.0625 ) )
+)
+}
+}
+{
+patchDef2
+{
+exx/floor-simplines
+( 3 3 0 0 0 )
+(
+( ( -1408 2936 208 1.6250004768 15 ) ( -1408 2936 208 1.6250004768 15 ) ( -1408 2936 208 1.6250004768 15 ) )
+( ( -1408 2936 208 1.6250004768 15 ) ( -1408 2936 208 1.6250004768 15 ) ( -1408 2936 208 1.6250004768 15 ) )
+( ( -1480 2936 208 1.6250004768 15.5625 ) ( -1480 2936 144 1.1249995232 15.5624980927 ) ( -1408 2936 144 1.125 15 ) )
+)
+}
+}
+{
+patchDef2
+{
+exx/wall-metal02
+( 3 3 0 0 0 )
+(
+( ( -1480 2936 336 0 0 ) ( -1480 2968 336 0.4999999702 0 ) ( -1480 3000 336 0.9999999404 0 ) )
+( ( -1480 2936 400 0 0.9999999404 ) ( -1480 2968 400 0.4999999404 0.9999999404 ) ( -1480 3000 400 0.9999999404 0.9999999404 ) )
+( ( -1408 2936 400 0 2.125 ) ( -1408 2968 400 0.5000000596 2.125 ) ( -1408 3000 400 1 2.125 ) )
+)
+}
+}
+{
+patchDef2
+{
+exx/floor-simplines
+( 3 3 0 0 0 )
+(
+( ( -1408 2936 336 2.625 15 ) ( -1408 2936 336 2.625 15 ) ( -1408 2936 336 2.625 15 ) )
+( ( -1408 2936 336 2.625 15 ) ( -1408 2936 336 2.625 15 ) ( -1408 2936 336 2.625 15 ) )
+( ( -1408 2936 400 3.1250004768 15 ) ( -1480 2936 400 3.1250009537 15.5624990463 ) ( -1480 2936 336 2.6250004768 15.5625 ) )
+)
+}
+}
+{
+patchDef2
+{
+exx/floor-simplines
+( 3 3 0 0 0 )
+(
+( ( -1408 3000 336 -7 -5.5 ) ( -1408 3000 336 -7 -5.5 ) ( -1408 3000 336 -7 -5.5 ) )
+( ( -1408 3000 336 -7 -5.5 ) ( -1408 3000 336 -7 -5.5 ) ( -1408 3000 336 -7 -5.5 ) )
+( ( -1480 3000 336 -7 -6.0625 ) ( -1480 3000 400 -6.5 -6.0625 ) ( -1408 3000 400 -6.5 -5.5 ) )
+)
+}
+}
 }
 {
 "classname" "trigger_push"
@@ -37919,25 +37919,10 @@ exx/floor-rnd01
 {
 "classname" "misc_model"
 "model" "models/jumppads/jumppad01.ase"
-"origin" "288.000000 2976.000000 704.000000"
-"angle" "0.000016"
-}
-{
-"classname" "misc_model"
-"model" "models/jumppads/jumppad01.ase"
 "origin" "1248.000000 4704.000000 -640.000000"
 "angle" "90.000000"
 }
 {
-"classname" "item_cells"
-"origin" "-1312.000000 2912.000000 1104.000000"
-}
-{
-"classname" "item_cells"
-"origin" "1824.000000 4768.000000 1104.000000"
-"angle" "-180.000000"
-}
-{
 "classname" "weapon_nex"
 "origin" "-1216.000000 3008.000000 1096.000000"
 }
@@ -39222,24 +39207,14 @@ exx/floor-rnd01
 "origin" "1368.000000 2080.000000 128.000000"
 }
 {
-"classname" "weapon_hlac"
-"origin" "2144.000000 928.000000 192.000000"
-}
-{
-"classname" "item_cells"
-"origin" "2144.000000 992.000000 192.000000"
-}
-{
-"classname" "item_cells"
-"origin" "2144.000000 864.000000 192.000000"
-}
-{
 "classname" "item_bullets"
-"origin" "32.000000 160.000000 192.000000"
+"origin" "2144.000000 992.000000 192.000000"
+"angle" "-90.000000"
 }
 {
 "classname" "weapon_uzi"
-"origin" "96.000000 160.000000 192.000000"
+"origin" "2144.000000 928.000000 192.000000"
+"angle" "-90.000000"
 }
 {
 "classname" "item_cells"
@@ -39278,29 +39253,14 @@ exx/floor-rnd01
 "origin" "640.000000 2016.000000 704.000000"
 }
 {
-"classname" "weapon_hlac"
-"origin" "-1632.000000 6752.000000 192.000000"
-"angle" "-179.999985"
-}
-{
-"classname" "item_cells"
-"origin" "-1632.000000 6688.000000 192.000000"
-"angle" "-179.999985"
-}
-{
-"classname" "item_cells"
-"origin" "-1632.000000 6816.000000 192.000000"
-"angle" "-179.999985"
-}
-{
 "classname" "item_bullets"
-"origin" "480.000000 7520.000000 192.000000"
-"angle" "-179.999985"
+"origin" "-1632.000000 6752.000000 192.000000"
+"angle" "-90.000000"
 }
 {
 "classname" "weapon_uzi"
-"origin" "416.000000 7520.000000 192.000000"
-"angle" "-179.999985"
+"origin" "-1632.000000 6688.000000 192.000000"
+"angle" "-90.000000"
 }
 {
 "classname" "item_cells"
@@ -39696,11 +39656,17 @@ exx/floor-rnd01
 }
 {
 "classname" "item_cells"
-"origin" "320.000000 3200.000000 128.000000"
+"origin" "160.000000 4448.000000 128.000000"
 "angle" "90.000008"
 }
 {
 "classname" "item_cells"
-"origin" "192.000000 4480.000000 128.000000"
+"origin" "352.000000 3232.000000 128.000000"
 "angle" "-90.000000"
 }
+{
+"classname" "misc_model"
+"model" "models/jumppads/jumppad01.ase"
+"origin" "288.000000 2976.000000 704.000000"
+"angle" "0.000016"
+}