Merge remote branch 'refs/remotes/origin/fruitiex/waypoints'

diff --git a/maps/g-23.map.options b/maps/g-23.map.options
index 4335921744354cdd3d5ea62530b117d1d995efc2..7203897c061b5e70a4ef1cd3b5faf3276a09e52f 100644 (file)
--- a/maps/g-23.map.options
+++ b/maps/g-23.map.options
@@ -1,5 +1,5 @@
 -bsp + -samplesize 4
--light + -bounce 8 -dirtscale 2 -randomsamples -samples 64
+-light + -bounce 8 -dirtscale 2
 -vis +
 -minimap +
-Version: 3
+Version: 4

diff --git a/maps/g-23.mapinfo b/maps/g-23.mapinfo
index 24f7f05f89ff7dd9d2f2924623eb0eb4fec5fd86..8538a65dc7e83becb2870852ac97289a064cd50d 100644 (file)
--- a/maps/g-23.mapinfo
+++ b/maps/g-23.mapinfo
@@ -2,7 +2,9 @@ title Docking Station G-23
 description You and your expert team of soldiers have docked Docking Station G-23 for retrieving a package and letting no one stand in your way.
 author Moo
 has weapons
-type dm 30 20
-type lms 9 20
-type arena 10 20
+gametype dm
+gametype lms
+gametype arena
+gametype rune
+gametype kh
 cdtrack 6

diff --git a/maps/glowplant.map b/maps/glowplant.map
index 1e7159b5a53b866169b19ba4879956998af927f4..65396ca6f833d9291c268de5154503e41a46292f 100644 (file)
--- a/maps/glowplant.map
+++ b/maps/glowplant.map
@@ -38174,3 +38174,18 @@ exx/floor-panel01
 "origin" "240.000000 -576.000000 192.000000"
 "noise" "sound/machines/Big_machine.wav"
 }
+{
+"classname" "dom_controlpoint"
+"origin" "-1408.000000 -32.000000 48.000000"
+"message" " has captured the outside control point"
+}
+{
+"classname" "dom_controlpoint"
+"origin" "544.000000 0.000000 528.000000"
+"message" " has captured the top control point"
+}
+{
+"classname" "dom_controlpoint"
+"origin" "160.000000 960.000000 320.000000"
+"message" " has captured the side control point"
+}

diff --git a/maps/glowplant.map.options b/maps/glowplant.map.options
index 0b5e9eafee13d6e7bbc8eaff97ae92b87b211e58..7e335a93deb403f58e8fde097539645ba0b0b21f 100644 (file)
--- a/maps/glowplant.map.options
+++ b/maps/glowplant.map.options
@@ -1,5 +1,5 @@
 -bsp + -samplesize 4 -minsamplesize 2
--light + -bounce 8 -dirtscale 2 -randomsamples -samples 128
+-light + -bounce 8 -dirtscale 2
 -vis +
 -minimap +
-Version: 7
+Version: 8

diff --git a/maps/glowplant.mapinfo b/maps/glowplant.mapinfo
index bf256a38ccf59f4deabdb303c21ecdcbe705461f..73100a20aeafdd69a361fe8e30c16a0d69753ec9 100644 (file)
--- a/maps/glowplant.mapinfo
+++ b/maps/glowplant.mapinfo
@@ -3,12 +3,14 @@ description A nuclear power plant with a LOT of blue glowy stuff...
 author tZork, Cuinnton
 cdtrack 4
 has weapons
-type dm 30 20 0
-type tdm 50 20 2 0
-type rune 200 20 0
-type lms 9 20 0
-type ca 10 20 0
-type kh 1000 20 3 0
+gametype dm
+gametype tdm
+gametype dom
+gametype rune
+gametype lms
+gametype arena
+gametype ca
+gametype kh
 // 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

diff --git a/maps/red-planet.map.options b/maps/red-planet.map.options
index 5c2836f0cdfeb90ca77a7c98efedbc6d37fd2d6f..fff7a0ded8b2e88596340ccf1970c318255656b3 100644 (file)
--- a/maps/red-planet.map.options
+++ b/maps/red-planet.map.options
@@ -1,4 +1,5 @@
 -bsp + -samplesize 6
 -vis +
--light + -bounce 8 -randomsamples -samples 128 -dirtscale 2 -bouncescale 1.15 -exposure 150 -areascale 1.25 -pointscale 1.4
+-light + -bounce 8 -dirtscale 2 -bouncescale 1.15 -exposure 150 -areascale 1.25 -pointscale 1.4
 -minimap +
+Version: 1

diff --git a/maps/red-planet.mapinfo b/maps/red-planet.mapinfo
index 85c4f661d88c2d40097803f1e728eb3a69aafea2..8a0d986f2be0b2a783753524b5c29da61a8585c9 100644 (file)
--- a/maps/red-planet.mapinfo
+++ b/maps/red-planet.mapinfo
@@ -3,11 +3,11 @@ description A large facility on a red dusty planet
 author Mircea Kitsune, Cuinnton, FruitieX
 cdtrack 1
 has weapons
-type dm 30 20
-type tdm 50 20 2
-type rune 200 20
-type lms 9 20
-type arena 10 20
-type ca 10 20
-type dom 200 20 0
-type kh 1000 20 2
+gametype dm
+gametype tdm
+gametype rune
+gametype lms
+gametype arena
+gametype ca
+gametype dom
+gametype kh

diff --git a/maps/stormkeep.map b/maps/stormkeep.map
index 358cdedd0b2f7590424b84d4d70212444a3ba4e5..43b8890d5db8640cc0e674508e9b5f327d21e7ac 100644 (file)
--- a/maps/stormkeep.map
+++ b/maps/stormkeep.map
@@ -6057,16 +6057,16 @@ map_stormkeep/largebrick1a
 ( -16 -352 72 ) ( 32 -352 -56 ) ( -16 -352 -56 ) common/caulk 0 16 0 0.5 0.5 0 0 0
 }
 {
-( 96 576 -16 ) ( -32 576 -16 ) ( 96 576 -32 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( 96 576 -16 ) ( 96 576 -32 ) ( 96 448 -16 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( -32 448 -32 ) ( 96 448 -32 ) ( -32 576 -32 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -32 448 -32 ) ( -32 448 -16 ) ( 96 448 -32 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( -32 448 -32 ) ( -32 576 -32 ) ( -32 448 -16 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( 64 448 48 ) ( 80 464 -80 ) ( 64 448 -80 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( 96 544 48 ) ( 80 560 -80 ) ( 96 544 -80 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( 0 576 48 ) ( -16 560 -80 ) ( 0 576 -80 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( -32 480 48 ) ( -16 464 -80 ) ( -32 480 -80 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( -26 64 -26 ) ( -20 64 -26 ) ( -26 -64 -26 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( 96 576 -16 ) ( -32 576 -16 ) ( 96 576 -32 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( 96 576 -16 ) ( 96 576 -32 ) ( 96 448 -16 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( -32 448 -32 ) ( 96 448 -32 ) ( -32 576 -32 ) exx/floor-wrn01-blue 0 0 0 0.5 0.5 134217728 0 0
+( -32 448 -32 ) ( -32 448 -16 ) ( 96 448 -32 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( -32 448 -32 ) ( -32 576 -32 ) ( -32 448 -16 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( 64 448 48 ) ( 80 464 -80 ) ( 64 448 -80 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( 96 544 48 ) ( 80 560 -80 ) ( 96 544 -80 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( 0 576 48 ) ( -16 560 -80 ) ( 0 576 -80 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( -32 480 48 ) ( -16 464 -80 ) ( -32 480 -80 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( -26 64 -26 ) ( -20 64 -26 ) ( -26 -64 -26 ) exx/floor-wrn01-blue 0 0 0 0.5 0.5 134217728 0 0
 }
 {
 ( 96 576 -24 ) ( 96 448 -24 ) ( -32 576 -24 ) exx/floor-clang01 0 0 0 0.25 0.25 134217728 0 0
@@ -11647,15 +11647,15 @@ patchDef2
 effects_jumppad/jumppadfx1_b
 ( 9 3 0 0 0 )
 (
-( ( -504 -848 -192 0 0 ) ( -504 -848 -168 0 0.5 ) ( -504 -848 -144 0 1 ) )
-( ( -504 -864 -192 0.125 0 ) ( -504 -864 -168 0.125 0.5 ) ( -504 -864 -144 0.125 1 ) )
-( ( -488 -864 -192 0.25 0 ) ( -488 -864 -168 0.25 0.5 ) ( -488 -864 -144 0.25 1 ) )
-( ( -472 -864 -192 0.375 0 ) ( -472 -864 -168 0.375 0.5 ) ( -472 -864 -144 0.375 1 ) )
-( ( -472 -848 -192 0.5 0 ) ( -472 -848 -168 0.5 0.5 ) ( -472 -848 -144 0.5 1 ) )
-( ( -472 -832 -192 0.625 0 ) ( -472 -832 -168 0.625 0.5 ) ( -472 -832 -144 0.625 1 ) )
-( ( -488 -832 -192 0.75 0 ) ( -488 -832 -168 0.75 0.5 ) ( -488 -832 -144 0.75 1 ) )
-( ( -504 -832 -192 0.875 0 ) ( -504 -832 -168 0.875 0.5 ) ( -504 -832 -144 0.875 1 ) )
-( ( -504 -848 -192 1 0 ) ( -504 -848 -168 1 0.5 ) ( -504 -848 -144 1 1 ) )
+( ( -504 -848 -192 0 0 ) ( -504 -848 -168 -0 -0.5 ) ( -504 -848 -144 -0 -1 ) )
+( ( -504 -864 -192 -0.125 0 ) ( -504 -864 -168 -0.125 -0.5 ) ( -504 -864 -144 -0.125 -1 ) )
+( ( -488 -864 -192 -0.25 0 ) ( -488 -864 -168 -0.25 -0.5 ) ( -488 -864 -144 -0.25 -1 ) )
+( ( -472 -864 -192 -0.375 0 ) ( -472 -864 -168 -0.375 -0.5 ) ( -472 -864 -144 -0.375 -1 ) )
+( ( -472 -848 -192 -0.5 0 ) ( -472 -848 -168 -0.5 -0.5 ) ( -472 -848 -144 -0.5 -1 ) )
+( ( -472 -832 -192 -0.625 0 ) ( -472 -832 -168 -0.625 -0.5 ) ( -472 -832 -144 -0.625 -1 ) )
+( ( -488 -832 -192 -0.75 0 ) ( -488 -832 -168 -0.75 -0.5 ) ( -488 -832 -144 -0.75 -1 ) )
+( ( -504 -832 -192 -0.875 0 ) ( -504 -832 -168 -0.875 -0.5 ) ( -504 -832 -144 -0.875 -1 ) )
+( ( -504 -848 -192 -1 0 ) ( -504 -848 -168 -1 -0.5 ) ( -504 -848 -144 -1 -1 ) )
 )
 }
 }
@@ -11665,15 +11665,15 @@ patchDef2
 effects_jumppad/jumppadfx1_b
 ( 9 3 0 0 0 )
 (
-( ( -1160 1590.1029052734 -10.1343383789 0 0 ) ( -1160 1583.8623046875 13.0401000977 0 0.5 ) ( -1160 1577.6215820312 36.2145080566 0 1 ) )
-( ( -1160 1570.7908935547 -15.3348999023 0.125 0 ) ( -1160 1564.5502929688 7.8395385742 0.125 0.5 ) ( -1160 1558.3095703125 31.0139465332 0.125 1 ) )
-( ( -1144 1570.7908935547 -15.3348999023 0.25 0 ) ( -1144 1564.5502929688 7.8395385742 0.25 0.5 ) ( -1144 1558.3095703125 31.0139465332 0.25 1 ) )
-( ( -1128 1570.7908935547 -15.3348999023 0.375 0 ) ( -1128 1564.5502929688 7.8395385742 0.375 0.5 ) ( -1128 1558.3095703125 31.0139465332 0.375 1 ) )
-( ( -1128 1590.1029052734 -10.1343383789 0.5 0 ) ( -1128 1583.8623046875 13.0401000977 0.5 0.5 ) ( -1128 1577.6215820312 36.2145080566 0.5 1 ) )
-( ( -1128 1609.4149169922 -4.9337768555 0.625 0 ) ( -1128 1603.1743164062 18.2406616211 0.625 0.5 ) ( -1128 1596.93359375 41.4150695801 0.625 1 ) )
-( ( -1144 1609.4149169922 -4.9337768555 0.75 0 ) ( -1144 1603.1743164062 18.2406616211 0.75 0.5 ) ( -1144 1596.93359375 41.4150695801 0.75 1 ) )
-( ( -1160 1609.4149169922 -4.9337768555 0.875 0 ) ( -1160 1603.1743164062 18.2406616211 0.875 0.5 ) ( -1160 1596.93359375 41.4150695801 0.875 1 ) )
-( ( -1160 1590.1029052734 -10.1343383789 1 0 ) ( -1160 1583.8623046875 13.0401000977 1 0.5 ) ( -1160 1577.6215820312 36.2145080566 1 1 ) )
+( ( -1160 1590.1029052734 -10.1343383789 0 0 ) ( -1160 1583.8623046875 13.0401000977 -0 -0.5 ) ( -1160 1577.6215820312 36.2145080566 -0 -1 ) )
+( ( -1160 1570.7908935547 -15.3348999023 -0.125 0 ) ( -1160 1564.5502929688 7.8395385742 -0.125 -0.5 ) ( -1160 1558.3095703125 31.0139465332 -0.125 -1 ) )
+( ( -1144 1570.7908935547 -15.3348999023 -0.25 0 ) ( -1144 1564.5502929688 7.8395385742 -0.25 -0.5 ) ( -1144 1558.3095703125 31.0139465332 -0.25 -1 ) )
+( ( -1128 1570.7908935547 -15.3348999023 -0.375 0 ) ( -1128 1564.5502929688 7.8395385742 -0.375 -0.5 ) ( -1128 1558.3095703125 31.0139465332 -0.375 -1 ) )
+( ( -1128 1590.1029052734 -10.1343383789 -0.5 0 ) ( -1128 1583.8623046875 13.0401000977 -0.5 -0.5 ) ( -1128 1577.6215820312 36.2145080566 -0.5 -1 ) )
+( ( -1128 1609.4149169922 -4.9337768555 -0.625 0 ) ( -1128 1603.1743164062 18.2406616211 -0.625 -0.5 ) ( -1128 1596.93359375 41.4150695801 -0.625 -1 ) )
+( ( -1144 1609.4149169922 -4.9337768555 -0.75 0 ) ( -1144 1603.1743164062 18.2406616211 -0.75 -0.5 ) ( -1144 1596.93359375 41.4150695801 -0.75 -1 ) )
+( ( -1160 1609.4149169922 -4.9337768555 -0.875 0 ) ( -1160 1603.1743164062 18.2406616211 -0.875 -0.5 ) ( -1160 1596.93359375 41.4150695801 -0.875 -1 ) )
+( ( -1160 1590.1029052734 -10.1343383789 -1 0 ) ( -1160 1583.8623046875 13.0401000977 -1 -0.5 ) ( -1160 1577.6215820312 36.2145080566 -1 -1 ) )
 )
 }
 }

diff --git a/maps/stormkeep.map.options b/maps/stormkeep.map.options
index 737171dfb48dbc3ea23bc9140f77fc51585d6acc..a12b7f4684bbbeb0d4fa0bf5c2d44e84f54698e0 100644 (file)
--- a/maps/stormkeep.map.options
+++ b/maps/stormkeep.map.options
@@ -2,4 +2,4 @@
 -light + -bounce 8 -dirtscale 2
 -vis +
 -minimap +
-Version: 4
+Version: 5

diff --git a/maps/stormkeep.mapinfo b/maps/stormkeep.mapinfo
index 737637aab4e8dc79c4a4e1da5d1670890f9ea40d..f26dd789f28fc7b7e35d0999545b8e8b6fbce4b4 100644 (file)
--- a/maps/stormkeep.mapinfo
+++ b/maps/stormkeep.mapinfo
@@ -2,14 +2,15 @@ title Stormkeep
 description <DESCRIPTION>
 author ..., FruitieX
 has weapons
-type dm 30 20 0
-type dom 200 20 0
-type rune 200 20 0
-type lms 9 20 0
-type arena 10 20 0
-type rc 20 5 7 15 0
-type kh 1000 20 3 0
-type ca 10 20 0
+gametype dm
+gametype tdm
+gametype dom
+gametype rune
+gametype lms
+gametype arena
+gametype rc
+gametype kh
+gametype ca
 cdtrack 5
 // optional: fog density red green blue alpha mindist maxdist
 // optional: settemp_for_type (all|gametypename) cvarname value