Trident: fix misaligned textures

[xonotic/xonotic-maps.pk3dir.git] / maps / nexballarena.map

diff --git a/maps/nexballarena.map b/maps/nexballarena.map
index e727ce51f9d5bf6a8434c54a557c8cc4879d6d18..4f2c9621b1b794bc003f9300f91ade6843610317 100644 (file)
--- a/maps/nexballarena.map
+++ b/maps/nexballarena.map
@@ -1,5 +1,8 @@
 {
 "classname" "worldspawn"
+"_description" "Small, simple, enclosed arena for finding out who's the true nexball champion! No obstacles in the way..."
+"message" "Nexball Arena"
+"author" "Revenant, Cortez, tZork, CuBe0wL, FruitieX"
 {
 patchDef2
 {
@@ -2056,7 +2059,7 @@ effects_jumppad/jumppadfx1_d
 }
 {
 ( 320 -640 -24 ) ( -320 -640 -24 ) ( 320 -32 -24 ) ex2x/floor-plate1 256 448 0 0.5 -0.5 0 0 0
-( -320 -640 -32 ) ( 320 -640 -32 ) ( -320 -32 -32 ) NULL 0 0 0 0.5 -0.5 0 0 0
+( -320 -640 -32 ) ( 320 -640 -32 ) ( -320 -32 -32 ) common/caulk 0 0 0 0.5 -0.5 0 0 0
 ( -64 -480 64 ) ( 64 -480 -64 ) ( -64 -480 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -224 -64 ) ( 0 -224 -64 ) ( -64 -224 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -128 -416 -64 ) ( -128 -352 -64 ) ( -128 -416 64 ) common/caulk 128 0 0 -0.25 0.25 0 0 0
@@ -2404,15 +2407,15 @@ effects_jumppad/jumppadfx1_d
 }
 {
 ( -48 -464 -4 ) ( 48 -240 -4 ) ( 48 -464 -4 ) trak5x/misc-glass 0 128 0 0.25 -0.25 0 0 0
-( 48 -464 -28 ) ( -48 -464 -4 ) ( 48 -464 -4 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 112 -240 -4 ) ( 112 -464 -28 ) ( 112 -464 -4 ) common/nodraw 128 0 0 -0.25 0.25 0 0 0
-( -48 -464 -8 ) ( 48 -240 -8 ) ( -48 -240 -8 ) common/nodraw 0 128 0 0.25 -0.25 0 0 0
-( 48 -240 -28 ) ( -48 -240 -4 ) ( -48 -240 -28 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( -112 -240 -4 ) ( -112 -464 -28 ) ( -112 -240 -28 ) common/nodraw 128 0 0 -0.25 0.25 0 0 0
-( 48 -464 60 ) ( 112 -400 -68 ) ( 48 -464 -68 ) common/nodraw 128 0 0 -0.25 0.25 0 0 0
-( -48 -464 -68 ) ( -112 -400 -68 ) ( -48 -464 60 ) common/nodraw 128 0 0 -0.25 0.25 0 0 0
-( -112 -304 -68 ) ( -48 -240 -68 ) ( -112 -304 60 ) common/nodraw 128 0 0 -0.25 0.25 0 0 0
-( 48 -240 -68 ) ( 112 -304 -68 ) ( 48 -240 60 ) common/nodraw 128 0 0 -0.25 0.25 0 0 0
+( 48 -464 -28 ) ( -48 -464 -4 ) ( 48 -464 -4 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 112 -240 -4 ) ( 112 -464 -28 ) ( 112 -464 -4 ) common/weapclip 128 0 0 -0.25 0.25 0 0 0
+( -48 -464 -8 ) ( 48 -240 -8 ) ( -48 -240 -8 ) common/weapclip 0 128 0 0.25 -0.25 0 0 0
+( 48 -240 -28 ) ( -48 -240 -4 ) ( -48 -240 -28 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -112 -240 -4 ) ( -112 -464 -28 ) ( -112 -240 -28 ) common/weapclip 128 0 0 -0.25 0.25 0 0 0
+( 48 -464 60 ) ( 112 -400 -68 ) ( 48 -464 -68 ) common/weapclip 128 0 0 -0.25 0.25 0 0 0
+( -48 -464 -68 ) ( -112 -400 -68 ) ( -48 -464 60 ) common/weapclip 128 0 0 -0.25 0.25 0 0 0
+( -112 -304 -68 ) ( -48 -240 -68 ) ( -112 -304 60 ) common/weapclip 128 0 0 -0.25 0.25 0 0 0
+( 48 -240 -68 ) ( 112 -304 -68 ) ( 48 -240 60 ) common/weapclip 128 0 0 -0.25 0.25 0 0 0
 }
 {
 ( 304 -64 0 ) ( 304 -64 -32 ) ( 304 -80 -32 ) common/caulk 0 0 -180 0.25 -0.25 0 0 0
@@ -4066,8 +4069,8 @@ trak5x/base-pipe1b
 }
 {
 ( 0 1024 0 ) ( 0 1008 -32 ) ( 0 1008 0 ) common/caulk 0 18 90 0.125 0.125 0 0 0
-( 0 1024 0 ) ( -192 1024 0 ) ( -192 1024 -32 ) common/caulk 0 146 90 0.125 0.125 0 0 0
-( -192 1024 0 ) ( -176 1008 0 ) ( -176 1008 -32 ) common/caulk 0 18 90 0.125 0.125 0 0 0
+( 32 1024 0 ) ( -160 1024 0 ) ( -160 1024 -32 ) common/caulk 256 146 90 0.125 0.125 0 0 0
+( -160 1024 0 ) ( -144 1008 0 ) ( -144 1008 -32 ) common/caulk 0 18 90 0.125 0.125 0 0 0
 ( 0 1008 0 ) ( -176 1008 -32 ) ( -176 1008 0 ) common/caulk 0 146 90 0.125 0.125 0 0 0
 ( -192 1024 0 ) ( 0 1008 0 ) ( -176 1008 0 ) ex2x/light-beam_red -64 0 0 0.25 0.25 0 0 0
 ( 0 1024 -32 ) ( -176 1008 -32 ) ( 0 1008 -32 ) common/caulk 0 146 90 0.125 0.125 0 0 0
@@ -4422,7 +4425,7 @@ ex2x/base-metalmaterial1
 }
 {
 ( 320 32 -24 ) ( -320 640 -24 ) ( 320 640 -24 ) ex2x/floor-plate1 256 448 0 0.5 0.5 0 0 0
-( -320 32 -32 ) ( 320 640 -32 ) ( -320 640 -32 ) NULL 0 -0 0 0.5 0.5 0 0 0
+( -320 32 -32 ) ( 320 640 -32 ) ( -320 640 -32 ) common/caulk 0 -0 0 0.5 0.5 0 0 0
 ( -64 480 -64 ) ( 64 480 -64 ) ( -64 480 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 224 64 ) ( 0 224 -64 ) ( -64 224 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -128 416 64 ) ( -128 352 -64 ) ( -128 416 -64 ) common/caulk 128 0 0 0.25 0.25 0 0 0
@@ -4643,15 +4646,15 @@ ex2x/base-metalmaterial1
 }
 {
 ( 48 464 -4 ) ( 48 240 -4 ) ( -48 464 -4 ) trak5x/misc-glass 0 128 0 0.25 0.25 0 0 0
-( 48 464 -4 ) ( -48 464 -4 ) ( 48 464 -28 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 112 464 -4 ) ( 112 464 -28 ) ( 112 240 -4 ) common/nodraw 128 0 0 0.25 0.25 0 0 0
-( -48 240 -8 ) ( 48 240 -8 ) ( -48 464 -8 ) common/nodraw 0 128 0 0.25 0.25 0 0 0
-( -48 240 -28 ) ( -48 240 -4 ) ( 48 240 -28 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( -112 240 -28 ) ( -112 464 -28 ) ( -112 240 -4 ) common/nodraw 128 0 0 0.25 0.25 0 0 0
-( 48 464 -68 ) ( 112 400 -68 ) ( 48 464 60 ) common/nodraw 128 0 0 0.25 0.25 0 0 0
-( -48 464 60 ) ( -112 400 -68 ) ( -48 464 -68 ) common/nodraw 128 0 0 0.25 0.25 0 0 0
-( -112 304 60 ) ( -48 240 -68 ) ( -112 304 -68 ) common/nodraw 128 0 0 0.25 0.25 0 0 0
-( 48 240 60 ) ( 112 304 -68 ) ( 48 240 -68 ) common/nodraw 128 0 0 0.25 0.25 0 0 0
+( 48 464 -4 ) ( -48 464 -4 ) ( 48 464 -28 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 112 464 -4 ) ( 112 464 -28 ) ( 112 240 -4 ) common/weapclip 128 0 0 0.25 0.25 0 0 0
+( -48 240 -8 ) ( 48 240 -8 ) ( -48 464 -8 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
+( -48 240 -28 ) ( -48 240 -4 ) ( 48 240 -28 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -112 240 -28 ) ( -112 464 -28 ) ( -112 240 -4 ) common/weapclip 128 0 0 0.25 0.25 0 0 0
+( 48 464 -68 ) ( 112 400 -68 ) ( 48 464 60 ) common/weapclip 128 0 0 0.25 0.25 0 0 0
+( -48 464 60 ) ( -112 400 -68 ) ( -48 464 -68 ) common/weapclip 128 0 0 0.25 0.25 0 0 0
+( -112 304 60 ) ( -48 240 -68 ) ( -112 304 -68 ) common/weapclip 128 0 0 0.25 0.25 0 0 0
+( 48 240 60 ) ( 112 304 -68 ) ( 48 240 -68 ) common/weapclip 128 0 0 0.25 0.25 0 0 0
 }
 {
 ( -352 896 64 ) ( -192 896 64 ) ( -192 864 64 ) trak5x/trim-trim6e 0 255 90 0.125 0.125 0 0 0
@@ -6931,28 +6934,28 @@ ex2x/base-metalmaterial1
 ( -152 752 -32 ) ( -152 768 -32 ) ( -152 752 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 144 776 -8 ) ( 144 808 -8 ) ( 144 808 -16 ) common/nodraw 192 0 0 0.25 0.25 0 12 0
-( -144 808 -8 ) ( 144 808 -16 ) ( 144 808 -8 ) common/nodraw 160 0 0 0.25 0.25 0 12 0
-( -144 776 -8 ) ( -144 808 -16 ) ( -144 808 -8 ) common/nodraw 192 0 0 0.25 0.25 0 12 0
-( -144 776 -8 ) ( 144 776 -8 ) ( 144 776 -16 ) common/nodraw 160 0 0 0.25 0.25 0 12 0
+( 144 776 -8 ) ( 144 808 -8 ) ( 144 808 -16 ) common/weapclip 192 0 0 0.25 0.25 0 12 0
+( -144 808 -8 ) ( 144 808 -16 ) ( 144 808 -8 ) common/weapclip 160 0 0 0.25 0.25 0 12 0
+( -144 776 -8 ) ( -144 808 -16 ) ( -144 808 -8 ) common/weapclip 192 0 0 0.25 0.25 0 12 0
+( -144 776 -8 ) ( 144 776 -8 ) ( 144 776 -16 ) common/weapclip 160 0 0 0.25 0.25 0 12 0
 ( -144 808 -8 ) ( 144 808 -8 ) ( 144 776 -8 ) exx/floor-grate04 64 32 0 0.25 0.25 0 256 0
-( -144 776 -16 ) ( 144 776 -16 ) ( 144 808 -16 ) common/nodraw 160 64 0 0.25 0.25 0 12 0
+( -144 776 -16 ) ( 144 776 -16 ) ( 144 808 -16 ) common/weapclip 160 64 0 0.25 0.25 0 12 0
 }
 {
-( 280 760 -16 ) ( 216 824 -16 ) ( 216 760 -16 ) common/nodraw 0 0 0 0.25 0.25 0 12 0
+( 280 760 -16 ) ( 216 824 -16 ) ( 216 760 -16 ) common/weapclip 0 0 0 0.25 0.25 0 12 0
 ( 280 824 -8 ) ( 216 760 -8 ) ( 216 824 -8 ) exx/floor-grate04 -96 -32 0 0.25 0.25 0 256 0
-( 280 760 -8 ) ( 216 760 -16 ) ( 216 760 -8 ) common/nodraw 0 0 0 0.25 0.25 0 12 0
-( 280 760 -16 ) ( 280 824 -8 ) ( 280 824 -16 ) common/nodraw 0 0 0 0.25 0.25 0 12 0
-( 280 824 -16 ) ( 216 824 -8 ) ( 216 824 -16 ) common/nodraw 0 0 0 0.25 0.25 0 12 0
-( 216 760 -8 ) ( 216 824 -16 ) ( 216 824 -8 ) common/nodraw 0 0 0 0.25 0.25 0 12 0
+( 280 760 -8 ) ( 216 760 -16 ) ( 216 760 -8 ) common/weapclip 0 0 0 0.25 0.25 0 12 0
+( 280 760 -16 ) ( 280 824 -8 ) ( 280 824 -16 ) common/weapclip 0 0 0 0.25 0.25 0 12 0
+( 280 824 -16 ) ( 216 824 -8 ) ( 216 824 -16 ) common/weapclip 0 0 0 0.25 0.25 0 12 0
+( 216 760 -8 ) ( 216 824 -16 ) ( 216 824 -8 ) common/weapclip 0 0 0 0.25 0.25 0 12 0
 }
 {
-( -216 760 -8 ) ( -216 824 -8 ) ( -216 824 -16 ) common/nodraw 0 0 0 0.25 0.25 0 12 0
-( -280 824 -8 ) ( -216 824 -16 ) ( -216 824 -8 ) common/nodraw 192 0 0 0.25 0.25 0 12 0
-( -280 760 -8 ) ( -280 824 -16 ) ( -280 824 -8 ) common/nodraw 0 0 0 0.25 0.25 0 12 0
-( -280 760 -8 ) ( -216 760 -8 ) ( -216 760 -16 ) common/nodraw 192 0 0 0.25 0.25 0 12 0
+( -216 760 -8 ) ( -216 824 -8 ) ( -216 824 -16 ) common/weapclip 0 0 0 0.25 0.25 0 12 0
+( -280 824 -8 ) ( -216 824 -16 ) ( -216 824 -8 ) common/weapclip 192 0 0 0.25 0.25 0 12 0
+( -280 760 -8 ) ( -280 824 -16 ) ( -280 824 -8 ) common/weapclip 0 0 0 0.25 0.25 0 12 0
+( -280 760 -8 ) ( -216 760 -8 ) ( -216 760 -16 ) common/weapclip 192 0 0 0.25 0.25 0 12 0
 ( -216 760 -8 ) ( -280 824 -8 ) ( -216 824 -8 ) exx/floor-grate04 96 -32 0 0.25 0.25 0 256 0
-( -280 760 -16 ) ( -216 824 -16 ) ( -280 824 -16 ) common/nodraw 192 0 0 0.25 0.25 0 12 0
+( -280 760 -16 ) ( -216 824 -16 ) ( -280 824 -16 ) common/weapclip 192 0 0 0.25 0.25 0 12 0
 }
 {
 ( -288 752 -8 ) ( -208 832 -8 ) ( -288 832 -8 ) common/weapclip 192 0 0 0.25 0.25 0 5 0
@@ -7075,28 +7078,28 @@ ex2x/base-metalmaterial1
 ( 152 -752 -32 ) ( 152 -768 -32 ) ( 152 -752 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 }
 {
-( -144 -776 -8 ) ( -144 -808 -8 ) ( -144 -808 -16 ) common/nodraw 192 0 0 -0.25 0.25 0 12 0
-( 144 -808 -8 ) ( -144 -808 -16 ) ( -144 -808 -8 ) common/nodraw 160 0 0 -0.25 0.25 0 12 0
-( 144 -776 -8 ) ( 144 -808 -16 ) ( 144 -808 -8 ) common/nodraw 192 0 0 -0.25 0.25 0 12 0
-( 144 -776 -8 ) ( -144 -776 -8 ) ( -144 -776 -16 ) common/nodraw 160 0 0 -0.25 0.25 0 12 0
+( -144 -776 -8 ) ( -144 -808 -8 ) ( -144 -808 -16 ) common/weapclip 192 0 0 -0.25 0.25 0 12 0
+( 144 -808 -8 ) ( -144 -808 -16 ) ( -144 -808 -8 ) common/weapclip 160 0 0 -0.25 0.25 0 12 0
+( 144 -776 -8 ) ( 144 -808 -16 ) ( 144 -808 -8 ) common/weapclip 192 0 0 -0.25 0.25 0 12 0
+( 144 -776 -8 ) ( -144 -776 -8 ) ( -144 -776 -16 ) common/weapclip 160 0 0 -0.25 0.25 0 12 0
 ( 144 -808 -8 ) ( -144 -808 -8 ) ( -144 -776 -8 ) exx/floor-grate04 64 32 180 0.25 0.25 0 256 0
-( 144 -776 -16 ) ( -144 -776 -16 ) ( -144 -808 -16 ) common/nodraw 160 64 180 0.25 0.25 0 12 0
+( 144 -776 -16 ) ( -144 -776 -16 ) ( -144 -808 -16 ) common/weapclip 160 64 180 0.25 0.25 0 12 0
 }
 {
-( -280 -760 -16 ) ( -216 -824 -16 ) ( -216 -760 -16 ) common/nodraw 0 256 180 0.25 0.25 0 12 0
+( -280 -760 -16 ) ( -216 -824 -16 ) ( -216 -760 -16 ) common/weapclip 0 256 180 0.25 0.25 0 12 0
 ( -280 -824 -8 ) ( -216 -760 -8 ) ( -216 -824 -8 ) exx/floor-grate04 160 224 180 0.25 0.25 0 256 0
-( -280 -760 -8 ) ( -216 -760 -16 ) ( -216 -760 -8 ) common/nodraw 0 0 0 -0.25 0.25 0 12 0
-( -280 -760 -16 ) ( -280 -824 -8 ) ( -280 -824 -16 ) common/nodraw 0 0 0 -0.25 0.25 0 12 0
-( -280 -824 -16 ) ( -216 -824 -8 ) ( -216 -824 -16 ) common/nodraw 0 0 0 -0.25 0.25 0 12 0
-( -216 -760 -8 ) ( -216 -824 -16 ) ( -216 -824 -8 ) common/nodraw 0 0 0 -0.25 0.25 0 12 0
+( -280 -760 -8 ) ( -216 -760 -16 ) ( -216 -760 -8 ) common/weapclip 0 0 0 -0.25 0.25 0 12 0
+( -280 -760 -16 ) ( -280 -824 -8 ) ( -280 -824 -16 ) common/weapclip 0 0 0 -0.25 0.25 0 12 0
+( -280 -824 -16 ) ( -216 -824 -8 ) ( -216 -824 -16 ) common/weapclip 0 0 0 -0.25 0.25 0 12 0
+( -216 -760 -8 ) ( -216 -824 -16 ) ( -216 -824 -8 ) common/weapclip 0 0 0 -0.25 0.25 0 12 0
 }
 {
-( 216 -760 -8 ) ( 216 -824 -8 ) ( 216 -824 -16 ) common/nodraw 0 0 0 -0.25 0.25 0 12 0
-( 280 -824 -8 ) ( 216 -824 -16 ) ( 216 -824 -8 ) common/nodraw 192 0 0 -0.25 0.25 0 12 0
-( 280 -760 -8 ) ( 280 -824 -16 ) ( 280 -824 -8 ) common/nodraw 0 0 0 -0.25 0.25 0 12 0
-( 280 -760 -8 ) ( 216 -760 -8 ) ( 216 -760 -16 ) common/nodraw 192 0 0 -0.25 0.25 0 12 0
+( 216 -760 -8 ) ( 216 -824 -8 ) ( 216 -824 -16 ) common/weapclip 0 0 0 -0.25 0.25 0 12 0
+( 280 -824 -8 ) ( 216 -824 -16 ) ( 216 -824 -8 ) common/weapclip 192 0 0 -0.25 0.25 0 12 0
+( 280 -760 -8 ) ( 280 -824 -16 ) ( 280 -824 -8 ) common/weapclip 0 0 0 -0.25 0.25 0 12 0
+( 280 -760 -8 ) ( 216 -760 -8 ) ( 216 -760 -16 ) common/weapclip 192 0 0 -0.25 0.25 0 12 0
 ( 216 -760 -8 ) ( 280 -824 -8 ) ( 216 -824 -8 ) exx/floor-grate04 96 224 180 0.25 0.25 0 256 0
-( 280 -760 -16 ) ( 216 -824 -16 ) ( 280 -824 -16 ) common/nodraw 192 256 180 0.25 0.25 0 12 0
+( 280 -760 -16 ) ( 216 -824 -16 ) ( 280 -824 -16 ) common/weapclip 192 256 180 0.25 0.25 0 12 0
 }
 {
 ( 288 -752 -8 ) ( 208 -832 -8 ) ( 288 -832 -8 ) common/weapclip 192 256 180 0.25 0.25 0 5 0
@@ -7720,9 +7723,6 @@ ex2x/base-metalmaterial1
 }
 {
 "classname" "func_group"
-}
-{
-"classname" "func_group"
 {
 ( 384 816 224 ) ( 368 848 224 ) ( 368 816 224 ) common/caulk 65 33 -180 0.5 0.5 0 0 0
 ( 384 816 224 ) ( 384 848 256 ) ( 384 848 224 ) common/caulk -95 -95 -180 0.5 0.5 0 0 0
@@ -7907,9 +7907,6 @@ ex2x/base-metalmaterial1
 }
 {
 "classname" "func_group"
-}
-{
-"classname" "func_group"
 {
 ( -384 816 224 ) ( -368 816 256 ) ( -368 816 224 ) common/caulk 65 -95 0 0.5 -0.5 0 0 0
 ( -384 848 256 ) ( -368 848 224 ) ( -368 848 256 ) common/caulk 65 -95 0 0.5 -0.5 0 0 0
@@ -8353,9 +8350,6 @@ ex2x/base-metalmaterial1
 }
 {
 "classname" "func_group"
-}
-{
-"classname" "func_group"
 {
 ( -320 912 224 ) ( -320 896 224 ) ( -304 912 224 ) common/caulk -31 -31 -90 0.5 0.5 0 0 0
 ( -304 928 256 ) ( -320 912 256 ) ( -320 912 224 ) common/caulk -63 -96 0 0.5 -0.5 0 0 0