Turrets on Arahia

diff --git a/data/maps/arahia.bsp b/data/maps/arahia.bsp
index 901c58b264286f9e558da0dfecb183a78809e14a..91ed8abe7a663b6fefbc1d5a3fe3474b5e3b0c13 100644 (file)
Binary files a/data/maps/arahia.bsp and b/data/maps/arahia.bsp differ

diff --git a/data/maps/arahia.map b/data/maps/arahia.map
index f16196111c9bdded4b0c777409b12960030338c3..5389748f2327337466675492749d8497606bb6e0 100644 (file)
--- a/data/maps/arahia.map
+++ b/data/maps/arahia.map
@@ -14635,8 +14635,8 @@
 // entity 103\r
 {\r
 "classname" "info_player_deathmatch"\r
-"origin" "-368 -656 4032"\r
-"angle" "90"\r
+"origin" "-384.000000 -544.000000 4032.000000"\r
+"angle" "90.000000"\r
 "targetname" "factory"\r
 }\r
 // entity 104\r
@@ -18597,3 +18597,179 @@
 "classname" "weapon_grabber"\r
 "origin" "-8128.000000 7936.000000 4136.000000"\r
 }\r
+// entity 396\r
+{\r
+"classname" "turret_phaser"\r
+"origin" "7664.000000 -8368.000000 4288.000000"\r
+"angle" "135.000000"\r
+"team" "14"\r
+}\r
+// entity 397\r
+{\r
+"classname" "turret_phaser"\r
+"origin" "-7488.000000 7824.000000 4288.000000"\r
+"team" "5"\r
+}\r
+// entity 398\r
+{\r
+"classname" "turret_tesla"\r
+"origin" "-8256.000000 7824.000000 4416.000000"\r
+"team" "5"\r
+}\r
+// entity 399\r
+{\r
+"classname" "turret_fusionreactor"\r
+"origin" "-7744.000000 8000.000000 4416.000000"\r
+"team" "5"\r
+}\r
+// entity 400\r
+{\r
+"classname" "turret_fusionreactor"\r
+"origin" "-7744.000000 7648.000000 4416.000000"\r
+"team" "5"\r
+}\r
+// entity 401\r
+{\r
+"classname" "turret_fusionreactor"\r
+"origin" "8384.000000 -8384.000000 4288.000000"\r
+"team" "14"\r
+}\r
+// entity 402\r
+{\r
+"classname" "turret_fusionreactor"\r
+"origin" "7680.000000 -8704.000000 4288.000000"\r
+"team" "14"\r
+}\r
+// entity 403\r
+{\r
+"classname" "turret_tesla"\r
+"origin" "8384.000000 -8768.000000 4288.000000"\r
+"team" "14"\r
+}\r
+// entity 404\r
+{\r
+"classname" "turret_phaser"\r
+"origin" "-384.000000 64.000000 4160.000000"\r
+"angle" "90.000000"\r
+"targetname" "factory"\r
+}\r
+// entity 405\r
+{\r
+"classname" "turret_phaser"\r
+"origin" "-384.000000 -1088.000000 4224.000000"\r
+"angle" "-90.000000"\r
+"targetname" "factory"\r
+}\r
+// entity 406\r
+{\r
+"classname" "turret_phaser"\r
+"origin" "-5295.999023 -8144.000000 6272.000000"\r
+"angle" "45.000000"\r
+"targetname" "lumbermill"\r
+}\r
+// entity 407\r
+{\r
+"classname" "turret_phaser"\r
+"origin" "4336.000000 5168.000000 2560.000000"\r
+"angle" "-135.000000"\r
+"targetname" "mine"\r
+}\r
+// entity 408\r
+{\r
+"classname" "turret_tesla"\r
+"origin" "3968.000000 5952.000000 2304.000000"\r
+"targetname" "mine"\r
+}\r
+// entity 409\r
+{\r
+"classname" "turret_tesla"\r
+"origin" "-5328.000000 -7248.000000 5952.000000"\r
+"angle" "-135.000000"\r
+"targetname" "lumbermill"\r
+}\r
+// entity 410\r
+{\r
+"classname" "turret_fusionreactor"\r
+"origin" "4016.000000 5664.000000 2496.000000"\r
+"targetname" "mine"\r
+}\r
+// entity 411\r
+{\r
+"classname" "turret_fusionreactor"\r
+"origin" "-5871.999512 -8143.999023 6272.000000"\r
+"angle" "135.000000"\r
+"targetname" "lumbermill"\r
+}\r
+// entity 412\r
+{\r
+"classname" "turret_tesla"\r
+"origin" "-384.000000 -640.000000 3968.000000"\r
+"angle" "90.000000"\r
+"targetname" "factory"\r
+}\r
+// entity 413\r
+{\r
+"classname" "turret_fusionreactor"\r
+"origin" "-384.000000 -704.000000 4352.000000"\r
+"angle" "90.000000"\r
+"targetname" "factory"\r
+}\r
+// entity 414\r
+{\r
+"classname" "turret_fusionreactor"\r
+"origin" "-384.000000 -192.000000 4256.000000"\r
+"angle" "90.000000"\r
+"targetname" "factory"\r
+}\r
+// entity 415\r
+{\r
+"classname" "turret_fusionreactor"\r
+"origin" "-4288.000000 5184.000000 4224.000000"\r
+"angle" "180.000000"\r
+"targetname" "rhf"\r
+}\r
+// entity 416\r
+{\r
+"classname" "turret_tesla"\r
+"origin" "-3376.000000 7744.000000 4224.000000"\r
+"targetname" "rhf"\r
+}\r
+// entity 417\r
+{\r
+"classname" "turret_phaser"\r
+"origin" "-4032.000000 5856.000000 3988.000000"\r
+"targetname" "rhf"\r
+"angle" "180.000000"\r
+}\r
+// entity 418\r
+{\r
+"classname" "turret_fusionreactor"\r
+"origin" "-3760.000000 5728.000000 3968.000000"\r
+"angle" "180.000000"\r
+"targetname" "rhf"\r
+}\r
+// entity 419\r
+{\r
+"classname" "turret_phaser"\r
+"origin" "3088.000244 -5904.000488 4224.000000"\r
+"angle" "-45.000000"\r
+"targetname" "bhf"\r
+}\r
+// entity 420\r
+{\r
+"classname" "turret_fusionreactor"\r
+"origin" "2624.000000 -6016.000000 4224.000000"\r
+"targetname" "bhf"\r
+}\r
+// entity 421\r
+{\r
+"classname" "turret_fusionreactor"\r
+"origin" "3200.000244 -5632.000488 4224.000000"\r
+"targetname" "bhf"\r
+}\r
+// entity 422\r
+{\r
+"classname" "turret_tesla"\r
+"origin" "3488.000000 -7768.000000 4368.000000"\r
+"targetname" "bhf"\r
+}\r

diff --git a/data/maps/arahia/lm_0000.tga b/data/maps/arahia/lm_0000.tga
index 1703f0568a2ae0e6d0c9bb73e8db91d16e8f4426..e14a31d1c19624fcf2bf38528a0dedc882ca3d29 100644 (file)
Binary files a/data/maps/arahia/lm_0000.tga and b/data/maps/arahia/lm_0000.tga differ

diff --git a/data/maps/arahia/lm_0004.tga b/data/maps/arahia/lm_0004.tga
index c4f0cef696a4eb3dcced9c2e2eeec975bcbaab82..e20e488cecbbbaa8af701c4615be39afc33ac5ff 100644 (file)
Binary files a/data/maps/arahia/lm_0004.tga and b/data/maps/arahia/lm_0004.tga differ

diff --git a/data/maps/arahia/lm_0006.tga b/data/maps/arahia/lm_0006.tga
index c0b5438ccc698fbe62385b33a162215ebe88e775..915f1d0883777e739c1963f22aa7c0ed369128ff 100644 (file)
Binary files a/data/maps/arahia/lm_0006.tga and b/data/maps/arahia/lm_0006.tga differ

diff --git a/data/maps/arahia/lm_0007.tga b/data/maps/arahia/lm_0007.tga
index 06d9f7af9e47871aa83bb60941d0437335043a6c..78695c75437ed3cc58d7a279a240fbb6b2e636a1 100644 (file)
Binary files a/data/maps/arahia/lm_0007.tga and b/data/maps/arahia/lm_0007.tga differ

diff --git a/data/maps/arahia/lm_0010.tga b/data/maps/arahia/lm_0010.tga
index 25121116af05e96e8ba79e889a6eae3a79c3f52f..a666acec90f4e3d9c095d5907d286303a6b93769 100644 (file)
Binary files a/data/maps/arahia/lm_0010.tga and b/data/maps/arahia/lm_0010.tga differ

diff --git a/data/maps/arahia/lm_0040.tga b/data/maps/arahia/lm_0040.tga
index ae243a90329dbe3a38477dd2553f5c117800b909..8fd037003963c29bf4c8edd4b7aee64267de1a93 100644 (file)
Binary files a/data/maps/arahia/lm_0040.tga and b/data/maps/arahia/lm_0040.tga differ

diff --git a/data/maps/arahia/lm_0053.tga b/data/maps/arahia/lm_0053.tga
index 878d060f88b426ec4112acc321b8d6f03fc77ca4..28b195f93e2800731cd6b6d853bbb071fa4d566d 100644 (file)
Binary files a/data/maps/arahia/lm_0053.tga and b/data/maps/arahia/lm_0053.tga differ