Merge remote branch 'origin/divVerent/map-weapon-rebalance'

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.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/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.map b/maps/stormkeep.map
index 2e385dac8f13b0032893b13c71d81df5bd4cef49..8580812262b485da9419e239c27113932c37a3e7 100644 (file)
--- a/maps/stormkeep.map
+++ b/maps/stormkeep.map
@@ -12280,9 +12280,9 @@ effects_jumppad/jumppadfx1_b
 ( 32 1472 -34 ) ( 32 1152 -34 ) ( -384 1472 -34 ) exx/floor-grate01 0 0 90 0.25 0.25 134217728 0 0
 ( 32 1408 -32 ) ( -384 1408 -32 ) ( 32 1408 -64 ) exx/base-metal03 128 192 0 0.25 0.25 134217728 0 0
 ( -256 1472 -32 ) ( -256 1472 -64 ) ( -256 1152 -32 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -384 1152 -48 ) ( 32 1152 -48 ) ( -384 1472 -48 ) common/caulk 128 0 0 0.25 0.25 134217728 0 0
+( -384 1152 -40 ) ( 32 1152 -40 ) ( -384 1472 -40 ) common/caulk 128 0 0 0.25 0.25 134217728 0 0
 ( -384 1152 -64 ) ( -384 1152 -32 ) ( 32 1152 -64 ) common/caulk 128 0 0 0.25 0.25 134217728 0 0
-( -384 1152 -64 ) ( -384 1472 -64 ) ( -384 1152 -32 ) common/caulk -0 0 0 0.25 0.25 134217728 0 0
+( -384 1152 -56 ) ( -384 1472 -56 ) ( -384 1152 -24 ) common/caulk 0 32 0 0.25 0.25 134217728 0 0
 }
 {
 ( -576 448 -64 ) ( -576 432 -64 ) ( -1088 448 -64 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
@@ -12521,9 +12521,9 @@ effects_jumppad/jumppadfx1_b
 ( -256 1152 -34 ) ( -256 1024 -34 ) ( -528 1152 -34 ) exx/floor-grate01 0 0 90 0.25 0.25 134217728 0 0
 ( -256 1152 -32 ) ( -528 1152 -32 ) ( -256 1152 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -256 1152 -32 ) ( -256 1152 -64 ) ( -256 1024 -32 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -528 1024 -48 ) ( -256 1024 -48 ) ( -528 1152 -48 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( -528 1024 -40 ) ( -256 1024 -40 ) ( -528 1152 -40 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -528 1024 -64 ) ( -528 1024 -32 ) ( -256 1024 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -832 1024 -66 ) ( -832 1152 -66 ) ( -832 1024 -34 ) common/caulk 0 248 0 0.25 0.25 134217728 0 0
+( -832 1024 -58 ) ( -832 1152 -58 ) ( -832 1024 -26 ) common/caulk 0 24 0 0.25 0.25 134217728 0 0
 }
 {
 ( -840 448 -32 ) ( -840 432 -32 ) ( -896 448 -32 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
@@ -13002,8 +13002,8 @@ exx/base-metal03
 {
 ( -320 1600 -34 ) ( -320 1472 -34 ) ( -592 1600 -34 ) exx/floor-grate01 0 0 90 0.25 0.25 134217728 0 0
 ( -320 1152 -32 ) ( -592 1152 -32 ) ( -320 1152 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -832 1600 -34 ) ( -832 1600 -66 ) ( -832 1472 -34 ) common/caulk 0 248 0 0.25 0.25 134217728 0 0
-( -592 1472 -48 ) ( -320 1472 -48 ) ( -592 1600 -48 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( -832 1600 -26 ) ( -832 1600 -58 ) ( -832 1472 -26 ) common/caulk 0 24 0 0.25 0.25 134217728 0 0
+( -592 1472 -40 ) ( -320 1472 -40 ) ( -592 1600 -40 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -592 448 -64 ) ( -592 448 -32 ) ( -320 448 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -896 1472 -64 ) ( -896 1600 -64 ) ( -896 1472 -32 ) common/caulk -0 0 0 0.25 0.25 134217728 0 0
 }
@@ -13411,6 +13411,14 @@ exx/base-metal03
 ( 832 832 512 ) ( 912 960 512 ) ( 960 832 512 ) common/caulk 156.4449462891 213.3328857422 -90 0.1875 -0.1875 134217728 0 0
 ( 864 64 576 ) ( 976 64 464 ) ( 864 -64 576 ) map_stormkeep/rock 512 0 0 0.25 0.25 134217728 0 0
 }
+{
+( -256 1552 128 ) ( -256 1472 128 ) ( -384 1552 128 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -256 1600 128 ) ( -384 1600 128 ) ( -256 1600 96 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -224 1552 128 ) ( -224 1552 96 ) ( -224 1472 128 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -384 1472 96 ) ( -256 1472 96 ) ( -384 1552 96 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -384 1472 96 ) ( -384 1472 128 ) ( -256 1472 96 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -416 1472 96 ) ( -416 1552 96 ) ( -416 1472 128 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "func_group"

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