Merge remote branch 'origin/fruitiex/stormkeep_playerclip'

diff --git a/maps/campaignxonoticbeta.txt b/maps/campaignxonoticbeta.txt
new file mode 100644 (file)
index 0000000..d6ae77b
--- /dev/null
+++ b/maps/campaignxonoticbeta.txt
@@ -0,0 +1,8 @@
+"//campaign:Xonotic Beta Campaign"
+//"game","mapname","bots","skill","fraglimit","timelimit","mutator-sets","description","long description"
+"dm","red-planet","3","1","15",,,"DM: Red Planet","Welcome to Xonotic!\nWe'll start off easy with Deathmatch against 3 beginner bots on Red Planet. Xonotic is mainly a multiplayer game, but before jumping into online games it can be a good idea to practice a bit against bots. After finishing the campaign you should be set for online play, either on special beginners-only servers or regular servers, that's up to you. :)"
+"tdm","stormkeep","3","3",,"10",,"TDM: Stormkeep","Next we'll try some 2on2 Team Deathmatch on Stormkeep.\nYou'll have to do your best for ten minutes, because the team with the highest score after this time limit will be the winning team! The opponents are also slightly more difficult now. Don't let the warpzone get you lost!"
+"dm","glowplant","1","5",,"10",,"1v1 Duel: Glowplant","Now it's time for you to show what you've learnt so far!\nIn a duel, it is important to collect and control items, especially the bigger powerups such as the Mega Health. They all spawn at regular intervals, learning to time them is the key... This is a 10 minute match, the player who ends up with the highest score wins."
+"ctf","dance","5","7","5",,,"CTF: Dance","By now you are expected to know the basics so let's try something entirely new, namely Capture the Flag! In CTF you're supposed to bring the enemy flag to your own base, but that's not enough: both flags have to be in your base for a successful capture. First team to reach 5 flag captures wins."
+"ctf","space-elevator","5","9","5",,,"CTF: Space Elevator","More CTF!\nThis map is way more open than Dance, it is a space floater after all. Be careful not to fall down! Use the launchpads to your advantage to get up to huge speeds quick. Same story as before, 5 caps to win."
+"dm","g-23","3","14",,"10",,"DM: G-23","Let's end this with a real challenge!\nYou'll face three Godlike bots in a 10-minute Deathmatch on the G-23 docking station. Can you prove that you are the best?

diff --git a/maps/dance.map b/maps/dance.map
index 6d8fcaf12f407bab6fd73579ceed5033a7a88f8f..4d542fe420e2e2cc322b08e53cc3e1a9d935a89d 100644 (file)
--- a/maps/dance.map
+++ b/maps/dance.map
@@ -477,14 +477,6 @@
 ( 320 -1280 64 ) ( 384 -1344 0 ) ( 384 -1344 64 ) common/caulk -0 0 0 0.25 0.25 0 0 0
 }
 {
-( -1600 384 128 ) ( -1544 440 128 ) ( -1544 428.625 128 ) exx/base-metal04 512 256 180 0.25 0.25 0 0 0
-( -1600 384 120 ) ( -1544 428.625 120 ) ( -1544 440 120 ) exx/base-metal04 512 256 180 0.25 0.25 0 0 0
-( -1600 384 128 ) ( -1544 440 120 ) ( -1544 440 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1600 372.625 120 ) ( -1544 428.625 128 ) ( -1544 428.625 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1544 440 128 ) ( -1544 428.625 120 ) ( -1544 428.625 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1600 384 120 ) ( -1600 372.625 128 ) ( -1600 372.625 120 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-}
-{
 ( 608 -480 -128 ) ( 608 96 -128 ) ( 992 -480 -128 ) exx/base-metal04 0 256 0 0.25 0.25 0 0 0
 ( 992 96 -192 ) ( 608 96 -192 ) ( 992 -480 -192 ) exx/base-metal04 0 256 0 0.25 0.25 0 0 0
 ( 608 -96 -176 ) ( 672 -32 -176 ) ( 608 -96 -48 ) exx/base-metal04 256 0 0 0.25 0.25 0 0 0
@@ -7119,14 +7111,6 @@ exx/base-metal01
 ( -1608 264 120 ) ( -1608 376 96 ) ( -1608 376 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
 }
 {
-( -1632 384 64 ) ( -1536 160 64 ) ( -1536 480 64 ) narmorx/base-concrete05_blue 1024 256 180 0.25 0.25 0 0 0
-( -1632 256 96 ) ( -1536 160 96 ) ( -1536 160 64 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
-( -1536 480 96 ) ( -1536 160 64 ) ( -1536 160 96 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
-( -1536 480 96 ) ( -1632 384 96 ) ( -1632 384 64 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
-( -1536 480 96 ) ( -1536 160 96 ) ( -1632 384 96 ) narmorx/base-concrete05_blue 1024 256 180 0.25 0.25 0 0 0
-( -1632 384 64 ) ( -1632 256 96 ) ( -1632 256 64 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
-}
-{
 ( -1544 428.625 128 ) ( -1544 211.375 128 ) ( -1600 372.625 128 ) exx/floor-rnd02 512 256 180 0.25 0.25 0 0 0
 ( -1600 372.625 120 ) ( -1544 211.375 120 ) ( -1544 428.625 120 ) exx/floor-rnd02 512 256 180 0.25 0.25 0 0 0
 ( -1544 428.625 128 ) ( -1544 211.375 120 ) ( -1544 211.375 128 ) exx/floor-rnd02 256 0 0 -0.25 0.25 0 0 0
@@ -10123,14 +10107,6 @@ facility114x/misc-tube
 ( -544 -32 -64 ) ( -576 0 -64 ) ( -544 -32 64 ) exx/floor-rnd02 506.6711425781 506.6711425781 135 0.25 -0.25 0 0 0
 }
 {
-( -1600 256 128 ) ( -1544 211.375 128 ) ( -1544 200 128 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1600 256 120 ) ( -1544 200 120 ) ( -1544 211.375 120 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1600 256 120 ) ( -1544 200 128 ) ( -1544 200 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1600 267.375 128 ) ( -1544 211.375 120 ) ( -1544 211.375 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1544 211.375 128 ) ( -1544 200 120 ) ( -1544 200 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1600 256 128 ) ( -1600 267.375 120 ) ( -1600 267.375 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-}
-{
 ( -960 1664 64 ) ( -896 1664 64 ) ( -960 1600 64 ) exx/floor-simple05 0 -0 180 0.25 0.25 0 0 0
 ( -896 1664 0 ) ( -960 1600 0 ) ( -896 1600 0 ) exx/base-metal02 0 256 180 0.25 0.25 0 0 0
 ( -896 1600 64 ) ( -896 1664 0 ) ( -896 1600 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
@@ -17011,14 +16987,6 @@ exx/base-metal01
 ( -960 1440 64 ) ( -1344 1312 64 ) ( -960 1312 64 ) narmorx/base-concrete05_blue 0 256 180 0.25 0.25 0 0 0
 }
 {
-( -1608 376 120 ) ( -1536 448 96 ) ( -1536 448 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1536 448 120 ) ( -1536 192 96 ) ( -1536 192 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1536 448 120 ) ( -1536 192 120 ) ( -1608 376 120 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1608 264 120 ) ( -1536 192 120 ) ( -1536 192 96 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1608 264 96 ) ( -1536 192 96 ) ( -1608 376 96 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1608 264 120 ) ( -1608 376 96 ) ( -1608 376 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-}
-{
 ( -1632 384 64 ) ( -1536 160 64 ) ( -1536 480 64 ) narmorx/base-concrete05_blue 0 256 180 0.25 0.25 0 0 0
 ( -1632 256 96 ) ( -1536 160 96 ) ( -1536 160 64 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
 ( -1536 480 96 ) ( -1536 160 64 ) ( -1536 160 96 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
@@ -17027,22 +16995,6 @@ exx/base-metal01
 ( -1632 384 64 ) ( -1632 256 96 ) ( -1632 256 64 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
 }
 {
-( -1544 428.625 128 ) ( -1544 211.375 128 ) ( -1600 372.625 128 ) exx/floor-rnd02 0 256 180 0.25 0.25 0 0 0
-( -1600 372.625 120 ) ( -1544 211.375 120 ) ( -1544 428.625 120 ) exx/floor-rnd02 0 256 180 0.25 0.25 0 0 0
-( -1544 428.625 128 ) ( -1544 211.375 120 ) ( -1544 211.375 128 ) exx/floor-rnd02 256 0 0 -0.25 0.25 0 0 0
-( -1600 267.375 128 ) ( -1544 211.375 128 ) ( -1544 211.375 120 ) exx/floor-rnd02 256 0 0 -0.25 0.25 0 0 0
-( -1600 372.625 120 ) ( -1544 428.625 120 ) ( -1544 428.625 128 ) exx/floor-rnd02 256 0 0 -0.25 0.25 0 0 0
-( -1600 267.375 128 ) ( -1600 372.625 120 ) ( -1600 372.625 128 ) exx/floor-rnd02 256 0 0 -0.25 0.25 0 0 0
-}
-{
-( -1664 -640 128 ) ( -1664 320 128 ) ( -1600 -640 128 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1728 320 120 ) ( -1792 320 120 ) ( -1728 -640 120 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1792 448 64 ) ( -1728 384 -64 ) ( -1792 448 -64 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1536 -1152 64 ) ( -1536 -768 128 ) ( -1536 -768 64 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1544 -896 64 ) ( -1544 -896 128 ) ( -1544 -1280 64 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1792 192 -64 ) ( -1728 256 -64 ) ( -1792 192 64 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-}
-{
 ( -1504 1408 64 ) ( -1536 992 64 ) ( -1536 1408 64 ) exx/floor-simple05 0 -0 180 0.25 0.25 0 0 0
 ( -1504 1408 64 ) ( -1536 1408 0 ) ( -1504 1408 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -1504 1408 0 ) ( -1536 992 0 ) ( -1504 992 0 ) exx/base-metal02 0 256 180 0.25 0.25 0 0 0
@@ -17723,70 +17675,6 @@ exx/base-metal01
 ( 0 -64 -320 ) ( -16 -64 -320 ) ( 0 64 -320 ) common/caulk 0 -0 180 0.25 0.25 0 0 0
 }
 {
-( -1600 256 128 ) ( -1608 376 128 ) ( -1600 384 128 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1600 256 128 ) ( -1600 384 128 ) ( -1600 384 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1600 256 120 ) ( -1600 384 120 ) ( -1608 376 120 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1608 264 128 ) ( -1608 376 120 ) ( -1608 376 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1600 256 128 ) ( -1608 264 120 ) ( -1608 264 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1600 384 120 ) ( -1608 376 128 ) ( -1608 376 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-}
-{
-( -1376 219.375 128 ) ( -1376 208 128 ) ( -1464 131.375 128 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1464 120 120 ) ( -1376 208 120 ) ( -1464 131.375 120 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1464 120 128 ) ( -1376 208 128 ) ( -1376 208 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1376 219.375 120 ) ( -1464 131.375 128 ) ( -1464 131.375 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1464 120 128 ) ( -1464 131.375 120 ) ( -1464 131.375 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1376 219.375 128 ) ( -1376 208 120 ) ( -1376 208 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-}
-{
-( -1376 432 128 ) ( -1464 508.625 128 ) ( -1464 520 128 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1376 420.625 120 ) ( -1464 520 120 ) ( -1464 508.625 120 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1376 432 120 ) ( -1464 520 128 ) ( -1464 520 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1376 420.625 128 ) ( -1464 508.625 120 ) ( -1464 508.625 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1464 520 120 ) ( -1464 508.625 128 ) ( -1464 508.625 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1376 420.625 128 ) ( -1376 432 128 ) ( -1376 432 120 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-}
-{
-( -1368 424 120 ) ( -1472 528 120 ) ( -1472 528 96 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1472 528 120 ) ( -1472 112 120 ) ( -1472 112 96 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1472 528 120 ) ( -1368 216 120 ) ( -1472 112 120 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1472 112 96 ) ( -1368 216 120 ) ( -1368 216 96 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1472 528 96 ) ( -1472 112 96 ) ( -1368 216 96 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1368 424 120 ) ( -1368 216 96 ) ( -1368 216 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-}
-{
-( -1536 64 64 ) ( -1536 0 64 ) ( -576 64 64 ) narmorx/base-concrete05_blue 0 256 180 0.25 0.25 0 0 0
-( -1536 16 64 ) ( -1472 80 -64 ) ( -1536 16 -64 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
-( -1472 1792 64 ) ( -1472 1408 128 ) ( -1472 1408 64 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
-( -1216 304 64 ) ( -1280 368 -64 ) ( -1216 304 -64 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
-( 1088 224 96 ) ( 1088 208 96 ) ( 960 224 96 ) narmorx/base-concrete05_blue 0 256 180 0.25 0.25 0 0 0
-( -1344 248 64 ) ( -1344 312 -64 ) ( -1344 248 -64 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
-}
-{
-( -1464 508.625 128 ) ( -1376 219.375 128 ) ( -1464 131.375 128 ) exx/floor-rnd02 0 256 180 0.25 0.25 0 0 0
-( -1464 508.625 120 ) ( -1464 131.375 120 ) ( -1376 219.375 120 ) common/caulk 0 -0 180 0.25 0.25 0 0 0
-( -1464 508.625 128 ) ( -1464 131.375 128 ) ( -1464 131.375 120 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -1376 219.375 120 ) ( -1464 131.375 120 ) ( -1464 131.375 128 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -1376 420.625 128 ) ( -1464 508.625 128 ) ( -1464 508.625 120 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -1376 420.625 128 ) ( -1376 219.375 120 ) ( -1376 219.375 128 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-}
-{
-( -1376 432 128 ) ( -1368 216 128 ) ( -1376 208 128 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1376 432 120 ) ( -1376 208 128 ) ( -1376 208 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1376 432 120 ) ( -1376 208 120 ) ( -1368 216 120 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1368 424 128 ) ( -1368 216 120 ) ( -1368 216 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1368 216 128 ) ( -1376 208 120 ) ( -1376 208 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1368 424 120 ) ( -1376 432 128 ) ( -1376 432 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-}
-{
-( -1472 528 128 ) ( -1464 120 128 ) ( -1472 112 128 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1472 528 120 ) ( -1472 112 120 ) ( -1464 120 120 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1472 112 120 ) ( -1464 120 128 ) ( -1464 120 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1472 528 128 ) ( -1472 112 128 ) ( -1472 112 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1464 520 128 ) ( -1464 120 120 ) ( -1464 120 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1472 528 128 ) ( -1464 520 120 ) ( -1464 520 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-}
-{
 ( 640 -832 -192 ) ( -576 640 -192 ) ( -576 -832 -192 ) ex2x/light-beam_blue 0 -0 180 0.25 0.25 0 0 0
 ( -1280 -832 64 ) ( -64 -832 -64 ) ( -1280 -832 -64 ) ex2x/light-beam_blue 0 0 0 -0.25 0.25 0 0 0
 ( 784 -800 64 ) ( 752 -800 -64 ) ( 784 -800 -64 ) ex2x/light-beam_blue 0 0 0 -0.25 0.25 0 0 0
@@ -20062,14 +19950,6 @@ effects_jumppad/jumppadfx1_a
 ( -1528 240 96 ) ( -1528 192 96 ) ( -1528 240 128 ) ex2x/trim-warn1 0 256 0 0.25 0.25 0 0 0
 }
 {
-( -1480 112 128 ) ( -1480 160 128 ) ( -1472 112 128 ) ex2x/trim-warn1 0 256 0 0.25 0.25 0 0 0
-( -1480 112 128 ) ( -1472 112 128 ) ( -1480 112 96 ) ex2x/trim-warn1 0 256 90 0.25 0.25 0 0 0
-( -1480 112 128 ) ( -1480 112 96 ) ( -1480 160 128 ) ex2x/trim-warn1 0 256 0 0.25 0.25 0 0 0
-( -1472 160 96 ) ( -1480 160 96 ) ( -1472 112 96 ) ex2x/trim-warn1 0 256 0 0.25 0.25 0 0 0
-( -1488 528 96 ) ( -1488 528 128 ) ( -1496 528 96 ) ex2x/trim-warn1 0 256 0 0.25 0.25 0 0 0
-( -1472 160 96 ) ( -1472 112 96 ) ( -1472 160 128 ) ex2x/trim-warn1 0 256 0 0.25 0.25 0 0 0
-}
-{
 ( -1480 112 128 ) ( -1480 160 128 ) ( -1472 112 128 ) ex2x/trim-warn1 64 256 180 0.25 0.25 0 0 0
 ( -1480 112 128 ) ( -1472 112 128 ) ( -1480 112 96 ) ex2x/trim-warn1 0 256 90 0.25 -0.25 0 0 0
 ( -1480 112 128 ) ( -1480 112 96 ) ( -1480 160 128 ) ex2x/trim-warn1 0 256 0 -0.25 0.25 0 0 0
@@ -20078,14 +19958,6 @@ effects_jumppad/jumppadfx1_a
 ( -1472 160 96 ) ( -1472 112 96 ) ( -1472 160 128 ) ex2x/trim-warn1 0 256 0 -0.25 0.25 0 0 0
 }
 {
-( -1536 192 128 ) ( -1536 240 128 ) ( -1528 192 128 ) ex2x/trim-warn1 64 256 180 0.25 0.25 0 0 0
-( -1536 192 128 ) ( -1528 192 128 ) ( -1536 192 96 ) ex2x/trim-warn1 0 256 90 0.25 -0.25 0 0 0
-( -1536 192 128 ) ( -1536 192 96 ) ( -1536 240 128 ) ex2x/trim-warn1 0 256 0 -0.25 0.25 0 0 0
-( -1528 240 96 ) ( -1536 240 96 ) ( -1528 192 96 ) ex2x/trim-warn1 64 256 180 0.25 0.25 0 0 0
-( -1552 448 96 ) ( -1552 448 128 ) ( -1560 448 96 ) ex2x/trim-warn1 0 256 0 -0.25 0.25 0 0 0
-( -1528 240 96 ) ( -1528 192 96 ) ( -1528 240 128 ) ex2x/trim-warn1 0 256 0 -0.25 0.25 0 0 0
-}
-{
 ( -1536 1280 96 ) ( -1472 -736 96 ) ( -1472 1216 96 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1536 1280 224 ) ( -1472 -736 224 ) ( -1536 -800 224 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1536 1280 96 ) ( -1536 -800 224 ) ( -1536 -800 96 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
@@ -20772,10 +20644,6 @@ effects_jumppad/jumppadfx1_a
 "angle" "180.000000"
 }
 {
-"classname" "weapon_nex"
-"origin" "0.000000 0.000000 -176.000000"
-}
-{
 "classname" "item_flag_team1"
 "origin" "1440.000000 -2080.000000 -288.000000"
 }
@@ -23872,3 +23740,7 @@ effects_jumppad/jumppadfx1_a
 "_castshadows" "1"
 "angles" "18.369183 11.335669 90.000000"
 }
+{
+"classname" "weapon_campingrifle"
+"origin" "0.000000 0.000000 -176.000000"
+}

diff --git a/maps/dance.mapinfo b/maps/dance.mapinfo
index 32b6298332a0ca77cb9784de7baf27ed69082d4c..753f75c7d4099df48eeeddef84e8c7057a9644f6 100644 (file)
--- a/maps/dance.mapinfo
+++ b/maps/dance.mapinfo
@@ -1,6 +1,6 @@
-title FIXME
-description FIXME
-author FIXME
+title Dance
+description Very open, small sized CTF map floating above an ocean.
+author ..., FruitieX
 cdtrack 3
 has weapons
 gametype ctf

diff --git a/maps/dance.tga b/maps/dance.tga
new file mode 100644 (file)
index 0000000..e372358
Binary files /dev/null and b/maps/dance.tga differ

diff --git a/maps/g-23.map b/maps/g-23.map
index d7c96510690b8db11652b8efdea265ca439c643b..522232a36807bc5c3ef44b78350f4909897cc815 100644 (file)
--- a/maps/g-23.map
+++ b/maps/g-23.map
@@ -12510,10 +12510,6 @@ exx/wall-metalrib01
 "origin" "256.000000 0.000000 0.000000"
 }
 {
-"classname" "item_cells"
-"origin" "192.000000 0.000000 0.000000"
-}
-{
 "classname" "weapon_grenadelauncher"
 "origin" "-256.000000 -1024.000000 -448.000000"
 }
@@ -13091,18 +13087,6 @@ exx/wall-metalrib01
 "angle" "-90.000000"
 }
 {
-"classname" "weapon_uzi"
-"origin" "-864.000000 -768.000000 -256.000000"
-}
-{
-"classname" "item_bullets"
-"origin" "-864.000000 -704.000000 -256.000000"
-}
-{
-"classname" "item_bullets"
-"origin" "-864.000000 -640.000000 -256.000000"
-}
-{
 "classname" "info_player_deathmatch"
 "origin" "-1344.000000 512.000000 -424.000000"
 "angle" "-90.000000"
@@ -14859,3 +14843,11 @@ exx/wall-metalrib01
 "light" "32"
 "_color" "1 0.151965 0"
 }
+{
+"classname" "weapon_hlac"
+"origin" "-864.000000 -704.000000 -256.000000"
+}
+{
+"classname" "item_cells"
+"origin" "-864.000000 -640.000000 -256.000000"
+}

diff --git a/maps/g-23.mapinfo b/maps/g-23.mapinfo
index 8538a65dc7e83becb2870852ac97289a064cd50d..9e43f359cd2ab3370b490605c37e80fc857650f3 100644 (file)
--- a/maps/g-23.mapinfo
+++ b/maps/g-23.mapinfo
@@ -6,5 +6,4 @@ gametype dm
 gametype lms
 gametype arena
 gametype rune
-gametype kh
 cdtrack 6

diff --git a/maps/nexballarena.mapinfo b/maps/nexballarena.mapinfo
new file mode 100644 (file)
index 0000000..40667a5
--- /dev/null
+++ b/maps/nexballarena.mapinfo
@@ -0,0 +1,5 @@
+title Nexball Arena
+description Small, simple, enclosed arena for finding out who's the true nexball champion! No obstacles in the way...
+author Revenant, Cortez, tZork, CuBe0wL, FruitieX
+cdtrack 4
+gametype nexball

diff --git a/maps/nexballarena.tga b/maps/nexballarena.tga
new file mode 100644 (file)
index 0000000..f6bd23c
Binary files /dev/null and b/maps/nexballarena.tga differ

diff --git a/maps/red-planet.map b/maps/red-planet.map
index 2036871195bd9663e33ed1fb04ad4c3d517f8e4d..a129d4b4688b9d8175873a7ff26c8a536595530e 100644 (file)
--- a/maps/red-planet.map
+++ b/maps/red-planet.map
@@ -46600,10 +46600,6 @@ exx/trim-vert01
 "angle" "7.999371"
 }
 {
-"classname" "item_bullets"
-"origin" "-2408.000000 -360.000000 472.000000"
-}
-{
 "classname" "item_shells"
 "origin" "-2456.000000 -360.000000 472.000000"
 "angle" "90.000000"
@@ -46652,14 +46648,6 @@ exx/trim-vert01
 "_color" "1 0.75 0.75"
 }
 {
-"classname" "weapon_nex"
-"origin" "-2800.000000 448.000000 416.000000"
-}
-{
-"classname" "item_cells"
-"origin" "-2800.000000 -448.000000 416.000000"
-}
-{
 "classname" "item_health_small"
 "origin" "-1808.000000 0.000000 480.000000"
 }
@@ -46676,10 +46664,6 @@ exx/trim-vert01
 "origin" "640.000000 -224.000000 48.000000"
 }
 {
-"classname" "weapon_hagar"
-"origin" "-2660.000000 1176.000000 120.000000"
-}
-{
 "classname" "misc_gamemodel"
 "origin" "-2888.000000 -1040.000000 396.000000"
 "model" "models/fans/bigfan01.md3"
@@ -47107,3 +47091,19 @@ exx/trim-vert01
 "classname" "weapon_grenadelauncher"
 "origin" "-3584.000000 0.000000 80.000000"
 }
+{
+"classname" "weapon_seeker"
+"origin" "-2660.000000 1176.000000 120.000000"
+}
+{
+"classname" "weapon_campingrifle"
+"origin" "-2800.000000 448.000000 416.000000"
+}
+{
+"classname" "item_bullets"
+"origin" "-2800.000000 -448.000000 416.000000"
+}
+{
+"classname" "item_cells"
+"origin" "-2408.000000 -360.000000 472.000000"
+}

diff --git a/maps/space-elevator.map b/maps/space-elevator.map
index 47db21048ffe4f2a51bb32f01896612008454611..252562ff0cdab814f9bfe7a77f3eb1479499d097 100644 (file)
--- a/maps/space-elevator.map
+++ b/maps/space-elevator.map
@@ -4457,7 +4457,7 @@ map_space-elevator/beam-purple
 ( 32 -3584 -48 ) ( -32 -3584 -48 ) ( 32 -3584 -80 ) exx/floor-wrn01-red 0 0 0 0.25 0.25 0 0 0
 ( 32 -3488 -48 ) ( 32 -3488 -80 ) ( 32 -3616 -48 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -32 -3616 -128 ) ( 32 -3616 -128 ) ( -32 -3488 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -32 -3616 -80 ) ( -32 -3616 -48 ) ( 32 -3616 -80 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -32 -3616 -80 ) ( -32 -3616 -48 ) ( 32 -3616 -80 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( -32 -3616 -80 ) ( -32 -3488 -80 ) ( -32 -3616 -48 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -112 ) ( -64 -3616 -112 ) ( 64 -3632 -112 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
@@ -4502,7 +4502,7 @@ map_space-elevator/beam-purple
 ( 32 -3632 0 ) ( 32 -3600 -128 ) ( 32 -3600 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 -3600 -128 ) ( 32 -3632 -128 ) ( 64 -3632 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 -3632 0 ) ( 64 -3600 -128 ) ( 64 -3632 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 32 -3616 0 ) ( 64 -3648 -128 ) ( 32 -3616 -128 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 32 -3616 0 ) ( 64 -3648 -128 ) ( 32 -3616 -128 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -112 ) ( -64 -3616 -112 ) ( 64 -3632 -112 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -4510,7 +4510,7 @@ map_space-elevator/beam-purple
 ( -32 -3600 0 ) ( -32 -3600 -128 ) ( -32 -3632 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -128 ) ( -32 -3632 -128 ) ( -64 -3600 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -128 ) ( -64 -3600 -128 ) ( -64 -3632 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -32 -3616 -128 ) ( -64 -3648 -128 ) ( -32 -3616 0 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -32 -3616 -128 ) ( -64 -3648 -128 ) ( -32 -3616 0 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -112 ) ( -64 -3616 -112 ) ( 64 -3632 -112 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -4518,7 +4518,7 @@ map_space-elevator/beam-purple
 ( 32 -3632 64 ) ( 32 -3600 -64 ) ( 32 -3600 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 -3600 -64 ) ( 32 -3632 -64 ) ( 64 -3632 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 -3632 64 ) ( 64 -3600 -64 ) ( 64 -3632 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 32 -3616 64 ) ( 64 -3648 -64 ) ( 32 -3616 -64 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 32 -3616 64 ) ( 64 -3648 -64 ) ( 32 -3616 -64 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( 32 64 0 ) ( 48 64 -16 ) ( 32 -64 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -4540,7 +4540,7 @@ map_space-elevator/beam-purple
 ( 32 -3584 16 ) ( -32 -3584 16 ) ( 32 -3584 -16 ) proceduralx/wall-fruitconcrete 0 0 0 0.25 0.25 0 0 0
 ( 32 -3488 16 ) ( 32 -3488 -16 ) ( 32 -3616 16 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -32 -3616 -64 ) ( 32 -3616 -64 ) ( -32 -3488 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -32 -3616 -16 ) ( -32 -3616 16 ) ( 32 -3616 -16 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -32 -3616 -16 ) ( -32 -3616 16 ) ( 32 -3616 -16 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( -32 -3616 -16 ) ( -32 -3488 -16 ) ( -32 -3616 16 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 0 ) ( -64 -3616 0 ) ( 64 -3632 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
@@ -12991,7 +12991,7 @@ trak5x/base-pipe1b
 }
 {
 ( 72 -3840 656 ) ( 72 -3856 656 ) ( -56 -3840 656 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
-( 64 -3840 624 ) ( -64 -3840 624 ) ( 64 -3840 512 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 64 -3840 624 ) ( -64 -3840 624 ) ( 64 -3840 512 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( 64 -3840 624 ) ( 64 -3840 512 ) ( 64 -3856 624 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( -64 -3856 512 ) ( 64 -3856 512 ) ( -64 -3840 512 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( -64 -3842 512 ) ( -64 -3842 624 ) ( 64 -3842 512 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
@@ -13099,14 +13099,14 @@ trak5x/base-pipe1b
 ( -32 -3600 64 ) ( -32 -3600 -64 ) ( -32 -3632 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -64 ) ( -32 -3632 -64 ) ( -64 -3600 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -64 ) ( -64 -3600 -64 ) ( -64 -3632 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -32 -3616 -64 ) ( -64 -3648 -64 ) ( -32 -3616 64 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -32 -3616 -64 ) ( -64 -3648 -64 ) ( -32 -3616 64 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( -32 -64 0 ) ( -48 64 -16 ) ( -32 64 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 32 -3488 -64 ) ( 32 -3616 -64 ) ( -32 -3488 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 32 -3584 -48 ) ( -32 -3584 -48 ) ( 32 -3584 -80 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( 32 -3488 -48 ) ( 32 -3488 -80 ) ( 32 -3616 -48 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -32 -3616 -80 ) ( -32 -3616 -48 ) ( 32 -3616 -80 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -32 -3616 -80 ) ( -32 -3616 -48 ) ( 32 -3616 -80 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( -32 -3616 -80 ) ( -32 -3488 -80 ) ( -32 -3616 -48 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 -3632 -112 ) ( -64 -3616 -112 ) ( -64 -3632 -112 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
@@ -13115,7 +13115,7 @@ trak5x/base-pipe1b
 ( 32 -3584 -128 ) ( 64 -3584 0 ) ( 32 -3584 0 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( 32 -3632 0 ) ( 32 -3600 -128 ) ( 32 -3600 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 -3632 0 ) ( 64 -3600 -128 ) ( 64 -3632 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 32 -3616 0 ) ( 64 -3648 -128 ) ( 32 -3616 -128 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 32 -3616 0 ) ( 64 -3648 -128 ) ( 32 -3616 -128 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( 64 -3632 -112 ) ( -64 -3616 -112 ) ( -64 -3632 -112 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -13123,7 +13123,7 @@ trak5x/base-pipe1b
 ( -32 -3584 0 ) ( -64 -3584 0 ) ( -32 -3584 -128 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( -32 -3600 0 ) ( -32 -3600 -128 ) ( -32 -3632 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -128 ) ( -64 -3600 -128 ) ( -64 -3632 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -32 -3616 -128 ) ( -64 -3648 -128 ) ( -32 -3616 0 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -32 -3616 -128 ) ( -64 -3648 -128 ) ( -32 -3616 0 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( 64 -3632 -112 ) ( -64 -3616 -112 ) ( -64 -3632 -112 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -18722,7 +18722,7 @@ proceduralx/wall-fruitconcrete
 ( -32 3584 -48 ) ( 32 3584 -48 ) ( -32 3584 -80 ) exx/floor-wrn01-blue 0 0 0 -0.25 0.25 0 0 0
 ( -32 3488 -48 ) ( -32 3488 -80 ) ( -32 3616 -48 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 32 3616 -128 ) ( -32 3616 -128 ) ( 32 3488 -128 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
-( 32 3616 -80 ) ( 32 3616 -48 ) ( -32 3616 -80 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( 32 3616 -80 ) ( 32 3616 -48 ) ( -32 3616 -80 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( 32 3616 -80 ) ( 32 3488 -80 ) ( 32 3616 -48 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 64 3632 -112 ) ( 64 3616 -112 ) ( -64 3632 -112 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
@@ -18767,7 +18767,7 @@ proceduralx/wall-fruitconcrete
 ( -32 3632 0 ) ( -32 3600 -128 ) ( -32 3600 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -64 3600 -128 ) ( -32 3632 -128 ) ( -64 3632 -128 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 ( -64 3632 0 ) ( -64 3600 -128 ) ( -64 3632 -128 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -32 3616 0 ) ( -64 3648 -128 ) ( -32 3616 -128 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( -32 3616 0 ) ( -64 3648 -128 ) ( -32 3616 -128 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( 64 3632 -112 ) ( 64 3616 -112 ) ( -64 3632 -112 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
 {
@@ -18775,7 +18775,7 @@ proceduralx/wall-fruitconcrete
 ( 32 3600 0 ) ( 32 3600 -128 ) ( 32 3632 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 64 3632 -128 ) ( 32 3632 -128 ) ( 64 3600 -128 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 ( 64 3632 -128 ) ( 64 3600 -128 ) ( 64 3632 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 32 3616 -128 ) ( 64 3648 -128 ) ( 32 3616 0 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( 32 3616 -128 ) ( 64 3648 -128 ) ( 32 3616 0 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( 64 3632 -112 ) ( 64 3616 -112 ) ( -64 3632 -112 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
 {
@@ -18783,7 +18783,7 @@ proceduralx/wall-fruitconcrete
 ( -32 3632 64 ) ( -32 3600 -64 ) ( -32 3600 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -64 3600 -64 ) ( -32 3632 -64 ) ( -64 3632 -64 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 ( -64 3632 64 ) ( -64 3600 -64 ) ( -64 3632 -64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -32 3616 64 ) ( -64 3648 -64 ) ( -32 3616 -64 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( -32 3616 64 ) ( -64 3648 -64 ) ( -32 3616 -64 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( -32 -64 0 ) ( -48 -64 -16 ) ( -32 64 0 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
 {
@@ -18805,7 +18805,7 @@ proceduralx/wall-fruitconcrete
 ( -32 3584 16 ) ( 32 3584 16 ) ( -32 3584 -16 ) proceduralx/wall-fruitconcrete 0 0 0 -0.25 0.25 0 0 0
 ( -32 3488 16 ) ( -32 3488 -16 ) ( -32 3616 16 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 32 3616 -64 ) ( -32 3616 -64 ) ( 32 3488 -64 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
-( 32 3616 -16 ) ( 32 3616 16 ) ( -32 3616 -16 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( 32 3616 -16 ) ( 32 3616 16 ) ( -32 3616 -16 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( 32 3616 -16 ) ( 32 3488 -16 ) ( 32 3616 16 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 64 3632 0 ) ( 64 3616 0 ) ( -64 3632 0 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
@@ -27267,7 +27267,7 @@ trak5x/base-pipe1c
 }
 {
 ( -72 3840 656 ) ( -72 3856 656 ) ( 56 3840 656 ) exx/base-metal03 512 -0 180 0.25 0.25 0 0 0
-( -64 3840 624 ) ( 64 3840 624 ) ( -64 3840 512 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( -64 3840 624 ) ( 64 3840 624 ) ( -64 3840 512 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( -64 3840 624 ) ( -64 3840 512 ) ( -64 3856 624 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
 ( 64 3856 512 ) ( -64 3856 512 ) ( 64 3840 512 ) exx/base-metal03 512 -0 180 0.25 0.25 0 0 0
 ( 64 3842 512 ) ( 64 3842 624 ) ( -64 3842 512 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
@@ -27375,14 +27375,14 @@ trak5x/base-pipe1c
 ( 32 3600 64 ) ( 32 3600 -64 ) ( 32 3632 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 64 3632 -64 ) ( 32 3632 -64 ) ( 64 3600 -64 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 ( 64 3632 -64 ) ( 64 3600 -64 ) ( 64 3632 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 32 3616 -64 ) ( 64 3648 -64 ) ( 32 3616 64 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( 32 3616 -64 ) ( 64 3648 -64 ) ( 32 3616 64 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( 32 64 0 ) ( 48 -64 -16 ) ( 32 -64 0 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
 {
 ( -32 3488 -64 ) ( -32 3616 -64 ) ( 32 3488 -64 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 ( -32 3584 -48 ) ( 32 3584 -48 ) ( -32 3584 -80 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
 ( -32 3488 -48 ) ( -32 3488 -80 ) ( -32 3616 -48 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 32 3616 -80 ) ( 32 3616 -48 ) ( -32 3616 -80 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( 32 3616 -80 ) ( 32 3616 -48 ) ( -32 3616 -80 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( 32 3616 -80 ) ( 32 3488 -80 ) ( 32 3616 -48 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -64 3632 -112 ) ( 64 3616 -112 ) ( 64 3632 -112 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
@@ -27391,7 +27391,7 @@ trak5x/base-pipe1c
 ( -32 3584 -128 ) ( -64 3584 0 ) ( -32 3584 0 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
 ( -32 3632 0 ) ( -32 3600 -128 ) ( -32 3600 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -64 3632 0 ) ( -64 3600 -128 ) ( -64 3632 -128 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -32 3616 0 ) ( -64 3648 -128 ) ( -32 3616 -128 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( -32 3616 0 ) ( -64 3648 -128 ) ( -32 3616 -128 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( -64 3632 -112 ) ( 64 3616 -112 ) ( 64 3632 -112 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
 {
@@ -27399,7 +27399,7 @@ trak5x/base-pipe1c
 ( 32 3584 0 ) ( 64 3584 0 ) ( 32 3584 -128 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
 ( 32 3600 0 ) ( 32 3600 -128 ) ( 32 3632 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 64 3632 -128 ) ( 64 3600 -128 ) ( 64 3632 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 32 3616 -128 ) ( 64 3648 -128 ) ( 32 3616 0 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( 32 3616 -128 ) ( 64 3648 -128 ) ( 32 3616 0 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( -64 3632 -112 ) ( 64 3616 -112 ) ( 64 3632 -112 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
 {
@@ -33151,3 +33151,31 @@ effects_jumppad/jumppadfx1_a
 "origin" "0.000000 0.000000 704.000000"
 "height" "64"
 }
+{
+"classname" "misc_model"
+"origin" "0.000000 -3778.000000 576.000000"
+"model" "models/effects_warpzone/rededge.md3"
+"angle" "89.999992"
+"modelscale_vec" "1.000000 3.000000 4.000000"
+}
+{
+"classname" "misc_model"
+"origin" "0.000000 -3678.000000 -64.000000"
+"model" "models/effects_warpzone/rededge.md3"
+"angle" "-90.000000"
+"modelscale_vec" "1.000000 3.000000 4.000000"
+}
+{
+"classname" "misc_model"
+"origin" "0.000000 3778.000000 576.000000"
+"model" "models/effects_warpzone/blueedge.md3"
+"angle" "89.999992"
+"modelscale_vec" "1.000000 3.000000 4.000000"
+}
+{
+"classname" "misc_model"
+"origin" "0.000000 3678.000000 -64.000000"
+"model" "models/effects_warpzone/blueedge.md3"
+"angle" "-90.000000"
+"modelscale_vec" "1 3 4"
+}

diff --git a/maps/space-elevator.mapinfo b/maps/space-elevator.mapinfo
index 0498f818ae06478f5ba9b473c682c0864b7b34f3..f31852ae5dbd518b551b11ca28bdf6f2a19b2ef5 100644 (file)
--- a/maps/space-elevator.mapinfo
+++ b/maps/space-elevator.mapinfo
@@ -1,11 +1,6 @@
 title Space Elevator
-description <DESCRIPTION>
-author FruitieX & Cuinnton
+description Medium sized CTF space floater
+author FruitieX, Cuinnton
 has weapons
-type ctf 300 20 10 0
+type ctf
 cdtrack jumpinginspace
-// optional: fog density red green blue alpha mindist maxdist
-// optional: settemp_for_type (all|gametypename) cvarname value
-// optional: clientsettemp_for_type (all|gametypename) cvarname value
-// optional: size mins_x mins_y mins_z maxs_x maxs_y maxs_z
-// optional: hidden

diff --git a/maps/space-elevator.tga b/maps/space-elevator.tga
new file mode 100644 (file)
index 0000000..09999db
Binary files /dev/null and b/maps/space-elevator.tga differ

diff --git a/maps/stormkeep.mapinfo b/maps/stormkeep.mapinfo
index f26dd789f28fc7b7e35d0999545b8e8b6fbce4b4..70a18670dd9f5522e03438ab9d166db94d29585f 100644 (file)
--- a/maps/stormkeep.mapinfo
+++ b/maps/stormkeep.mapinfo
@@ -1,5 +1,5 @@
 title Stormkeep
-description <DESCRIPTION>
+description Medium sized indoors map, well suited for team games.
 author ..., FruitieX
 has weapons
 gametype dm