From: packer <packer@devfull.de>
Date: Fri, 10 Apr 2020 15:50:34 +0000 (+0200)
Subject: Fix caulk, machinegun position and update entitiy names.
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=refs%2Fheads%2Fitsme%2Ftarx

Fix caulk, machinegun position and update entitiy names.
---

diff --git a/maps/tarx.map b/maps/tarx.map
index 603af7f0..0bbf6b28 100644
--- a/maps/tarx.map
+++ b/maps/tarx.map
@@ -27578,7 +27578,7 @@ ex2x/base-stone_metal
 ( -192 4448 160 ) ( -192 3744 160 ) ( -192 4448 96 ) common/caulk -0 0 0 0.25 0.25 0 0 0
 ( -192 3736 120 ) ( -128 4440 120 ) ( -128 3736 120 ) common/caulk -0 0 0 0.25 0.25 0 0 0
 ( -128 3616 -64 ) ( -192 3616 -64 ) ( -128 3616 64 ) common/caulk 0 0 0 -0.5 0.5 0 0 0
-( 640 3616 32 ) ( -256 3872 32 ) ( -256 3616 32 ) common/caulk -0 0 0 0.25 0.25 0 0 0
+( 640 3616 32 ) ( -256 3872 32 ) ( -256 3616 32 ) exx/floor-wrn01 -0 0 0 0.25 0.25 0 0 0
 ( -176 3776 -64 ) ( -160 3776 -64 ) ( -176 3776 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -36137,7 +36137,7 @@ exx/floor-rnd01
 ( 1944 3616 -64 ) ( 1904 3616 -64 ) ( 1944 3616 64 ) common/caulk 0 0 0 -0.5 0.5 0 0 0
 ( 704 3232 160 ) ( 704 3936 160 ) ( 704 3232 96 ) common/caulk -0 0 0 0.25 0.25 0 0 0
 ( 704 3944 120 ) ( 640 3240 120 ) ( 640 3944 120 ) common/caulk -0 0 0 0.25 0.25 0 0 0
-( -128 4064 32 ) ( 768 3808 32 ) ( 768 4064 32 ) common/caulk -0 0 0 0.25 0.25 0 0 0
+( -128 4064 32 ) ( 768 3808 32 ) ( 768 4064 32 ) exx/floor-wrn01 -0 0 0 0.25 0.25 0 0 0
 ( -176 3776 -64 ) ( -160 3776 -64 ) ( -176 3776 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -39355,7 +39355,7 @@ exx/floor-rnd01
 ( -1408 4064 -64 ) ( -1368 4064 -64 ) ( -1408 4064 64 ) common/caulk 0 0 0 -0.5 0.5 0 0 0
 ( -192 4448 160 ) ( -192 3744 160 ) ( -192 4448 96 ) common/caulk -0 0 0 0.25 0.25 0 0 0
 ( -192 3736 120 ) ( -128 4440 120 ) ( -128 3736 120 ) common/caulk -0 0 0 0.25 0.25 0 0 0
-( 640 3616 32 ) ( -256 3872 32 ) ( -256 3616 32 ) common/caulk -0 0 0 0.25 0.25 0 0 0
+( 640 3616 32 ) ( -256 3872 32 ) ( -256 3616 32 ) exx/floor-wrn01 -0 0 0 0.25 0.25 0 0 0
 ( -176 3904 64 ) ( -160 3904 -64 ) ( -176 3904 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -39363,7 +39363,7 @@ exx/floor-rnd01
 ( 704 3232 160 ) ( 704 3936 160 ) ( 704 3232 96 ) common/caulk -0 0 0 0.25 0.25 0 0 0
 ( 704 3944 120 ) ( 640 3240 120 ) ( 640 3944 120 ) common/caulk -0 0 0 0.25 0.25 0 0 0
 ( 648 4064 -64 ) ( 712 4064 -64 ) ( 648 4064 64 ) common/caulk 0 0 0 -0.5 0.5 0 0 0
-( -128 4064 32 ) ( 768 3808 32 ) ( 768 4064 32 ) common/caulk -0 0 0 0.25 0.25 0 0 0
+( -128 4064 32 ) ( 768 3808 32 ) ( 768 4064 32 ) exx/floor-wrn01 -0 0 0 0.25 0.25 0 0 0
 ( -176 3904 64 ) ( -160 3904 -64 ) ( -176 3904 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -41815,15 +41815,6 @@ exx/floor-rnd01
 "angle" "90.000008"
 }
 {
-"classname" "item_health_large"
-"origin" "864.000000 2976.000000 -640.000000"
-}
-{
-"classname" "item_health_large"
-"origin" "-352.000000 4704.000000 -640.000000"
-"angle" "-179.999985"
-}
-{
 "classname" "item_armor_small"
 "origin" "640.000000 4800.000000 -640.000000"
 "angle" "90.000008"
@@ -42101,14 +42092,6 @@ exx/floor-rnd01
 "origin" "1152.000000 128.000000 192.000000"
 }
 {
-"classname" "item_armor_large"
-"origin" "-1248.000000 2592.000000 512.000000"
-}
-{
-"classname" "item_armor_large"
-"origin" "1760.000000 5088.000000 512.000000"
-}
-{
 "classname" "item_armor_small"
 "origin" "-128.000000 416.000000 192.000000"
 "angle" "-90.000000"
@@ -42295,11 +42278,6 @@ exx/floor-rnd01
 "angle" "-179.999985"
 }
 {
-"classname" "weapon_uzi"
-"origin" "2144.000000 928.000000 192.000000"
-"angle" "-90.000000"
-}
-{
 "classname" "item_cells"
 "origin" "-1632.000000 4704.000000 128.000000"
 "angle" "-89.999992"
@@ -42335,12 +42313,7 @@ exx/floor-rnd01
 {
 "classname" "item_bullets"
 "origin" "-1632.000000 6752.000000 192.000000"
-"angle" "-90.000000"
-}
-{
-"classname" "weapon_uzi"
-"origin" "-1632.000000 6688.000000 192.000000"
-"angle" "-90.000000"
+"angle" "-89.999992"
 }
 {
 "classname" "item_cells"
@@ -42410,14 +42383,6 @@ exx/floor-rnd01
 "_receiveshadows" "1"
 }
 {
-"classname" "item_health_large"
-"origin" "1664.000000 1920.000000 640.000000"
-}
-{
-"classname" "item_health_large"
-"origin" "-1152.000000 5760.000000 640.000000"
-}
-{
 "classname" "item_armor_small"
 "origin" "-608.000000 2944.000000 704.000000"
 "angle" "-90.000000"
@@ -42763,8 +42728,8 @@ exx/floor-rnd01
 }
 {
 "classname" "item_bullets"
-"origin" "2144.000000 992.000000 192.000000"
-"angle" "-90.000000"
+"origin" "2144.000000 928.000000 192.000000"
+"angle" "90.000000"
 }
 {
 "classname" "item_bullets"
@@ -43223,3 +43188,38 @@ exx/floor-rnd01
 "target" "deactivate_12"
 "wait" "4"
 }
+{
+"classname" "weapon_machinegun"
+"origin" "2144.000000 992.000000 192.000000"
+"angle" "90.000000"
+}
+{
+"classname" "weapon_machinegun"
+"origin" "-1632.000000 6688.000000 192.000000"
+"angle" "-89.999992"
+}
+{
+"classname" "item_health_big"
+"origin" "1664.000000 1920.000000 640.000000"
+}
+{
+"classname" "item_health_big"
+"origin" "864.000000 2976.000000 -640.000000"
+}
+{
+"classname" "item_health_big"
+"origin" "-352.000000 4704.000000 -640.000000"
+"angle" "-179.999985"
+}
+{
+"classname" "item_health_big"
+"origin" "-1152.000000 5760.000000 640.000000"
+}
+{
+"classname" "item_armor_mega"
+"origin" "-1248.000000 2592.000000 512.000000"
+}
+{
+"classname" "item_armor_mega"
+"origin" "1760.000000 5088.000000 512.000000"
+}