Merge branch 'bones_was_here/mapinfoupdate' into 'master'

Remove blacklisted r_water clientsettemps and add gametype duel to appropriate maps

See merge request xonotic/xonotic-maps.pk3dir!142

diff --git a/maps/boil.mapinfo b/maps/boil.mapinfo
index 31ab176e8b128bd2c74e674eeebd41cd6b05ad1a..468df41c6162ed85554055e5a612036e7c64ad88 100644 (file)
--- a/maps/boil.mapinfo
+++ b/maps/boil.mapinfo
@@ -9,4 +9,5 @@ gametype lms
 gametype ca
 gametype ft
 gametype kh
-gametype ka
\ No newline at end of file
+gametype ka
+gametype duel

diff --git a/maps/courtfun.mapinfo b/maps/courtfun.mapinfo
index 2c0dcebcf12c6689ff52b6c1d20727e58eefa6bc..0e12b710b6a817b62102db1d7e8315cbcb3c5c4e 100644 (file)
--- a/maps/courtfun.mapinfo
+++ b/maps/courtfun.mapinfo
@@ -34,5 +34,3 @@ settemp_for_type cts g_cts_finish_kill_delay 0
 
 settemp_for_type ons g_powerups 0
 
-clientsettemp_for_type all r_water 1
-clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file

diff --git a/maps/darkzone.mapinfo b/maps/darkzone.mapinfo
index a6918fc927c52a853cc6dab2c89c41ef0026ae04..91e126da25e3cd2e0d7660e3aa24fe371034bac3 100644 (file)
--- a/maps/darkzone.mapinfo
+++ b/maps/darkzone.mapinfo
@@ -9,4 +9,5 @@ gametype ka
 gametype tdm
 gametype ca
 gametype kh
-gametype ft
\ No newline at end of file
+gametype ft
+gametype duel
\ No newline at end of file

diff --git a/maps/drain.mapinfo b/maps/drain.mapinfo
index 50a96fa869ef16b503d945c5058400773e5c158a..8ba754982d92ef074397c62602f087b2a966eb29 100644 (file)
--- a/maps/drain.mapinfo
+++ b/maps/drain.mapinfo
@@ -10,4 +10,5 @@ gametype kh
 gametype ft
 gametype ka
 gametype tdm
+gametype duel
 hidden
\ No newline at end of file

diff --git a/maps/erbium.mapinfo b/maps/erbium.mapinfo
index fbd2d37ec89110e25265d560d6aebc0c29980354..cbadd9fb1a54395aef049aef0cde04a6d2fdf925 100644 (file)
--- a/maps/erbium.mapinfo
+++ b/maps/erbium.mapinfo
@@ -11,6 +11,4 @@ gametype ft
 gametype ka
 gametype kh
 gametype dom
-
-clientsettemp_for_type all r_water 1
-clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file
+gametype duel

diff --git a/maps/finalrage.mapinfo b/maps/finalrage.mapinfo
index 631232ae44b32fcb2e0cb1ae30570f125e9128e2..40c9e21ccdbd9e1a934adf07c4319de746ea3c0b 100644 (file)
--- a/maps/finalrage.mapinfo
+++ b/maps/finalrage.mapinfo
@@ -11,6 +11,4 @@ gametype ca
 gametype ft
 gametype kh
 gametype ka
-
-clientsettemp_for_type all r_water 1
-clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file
+gametype duel

diff --git a/maps/fuse.mapinfo b/maps/fuse.mapinfo
index d346019fd67837565e82416a29ff00e777ff8109..9effd1c5c4ecda4c19b09172a5fa787bdcf0ea3d 100644 (file)
--- a/maps/fuse.mapinfo
+++ b/maps/fuse.mapinfo
@@ -9,4 +9,5 @@ gametype ka
 gametype kh
 gametype ft
 gametype ca
-gametype tdm
\ No newline at end of file
+gametype tdm
+gametype duel

diff --git a/maps/geoplanetary.mapinfo b/maps/geoplanetary.mapinfo
index df86efcb9eae26858709fac621b7286108e88095..1d9884ec5c5f6227476d0f07276a3bf6890448ba 100644 (file)
--- a/maps/geoplanetary.mapinfo
+++ b/maps/geoplanetary.mapinfo
@@ -6,5 +6,3 @@ has weapons
 gametype ctf
 gametype dom
 
-clientsettemp_for_type all r_water 1
-clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file

diff --git a/maps/glowplant.mapinfo b/maps/glowplant.mapinfo
index 6b507e372f6029676710e799bf8150e6a9661a19..a6c638acb77ce0e9317bc951d7626513b969a8c3 100644 (file)
--- a/maps/glowplant.mapinfo
+++ b/maps/glowplant.mapinfo
@@ -12,5 +12,3 @@ gametype kh
 gametype ft
 gametype ka
 
-clientsettemp_for_type all r_water 1
-clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file

diff --git a/maps/runningman.mapinfo b/maps/runningman.mapinfo
index 17ff3fcf459f39e9e4183779a770f23657cc91ea..934250857e69a702637cca4b108422a1b6cef689 100644 (file)
--- a/maps/runningman.mapinfo
+++ b/maps/runningman.mapinfo
@@ -6,6 +6,4 @@ has weapons
 gametype dm
 gametype lms
 gametype ka
-
-clientsettemp_for_type all r_water 1
-clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file
+gametype duel

diff --git a/maps/runningmanctf.mapinfo b/maps/runningmanctf.mapinfo
index 17accddbd2094afc5d422c6a63db79ece2aa327b..97192f86b95cbf1528eb1e7f9a9cd6a8132a725f 100644 (file)
--- a/maps/runningmanctf.mapinfo
+++ b/maps/runningmanctf.mapinfo
@@ -11,5 +11,3 @@ gametype dom
 gametype ft
 gametype kh
 
-clientsettemp_for_type all r_water 1
-clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file

diff --git a/maps/silentsiege.mapinfo b/maps/silentsiege.mapinfo
index 079d4eb5037e77d07442ec67084593863bce5042..0bf99735f1e69ebc5093c19cb1624942708e55a9 100644 (file)
--- a/maps/silentsiege.mapinfo
+++ b/maps/silentsiege.mapinfo
@@ -10,4 +10,5 @@ gametype ca
 gametype ft
 gametype ka
 gametype kh
-gametype dom
\ No newline at end of file
+gametype dom
+gametype duel

diff --git a/maps/solarium.mapinfo b/maps/solarium.mapinfo
index ed254a94498ecaccb26bed31e5822d28a5e6784b..3ad540b261697c360667c8386c43e3e7abc02112 100644 (file)
--- a/maps/solarium.mapinfo
+++ b/maps/solarium.mapinfo
@@ -9,4 +9,5 @@ gametype lms
 gametype ca
 gametype ka
 gametype ft
-gametype kh
\ No newline at end of file
+gametype kh
+gametype duel
\ No newline at end of file

diff --git a/maps/space-elevator.mapinfo b/maps/space-elevator.mapinfo
index 006909522a7d1c72b6c0b3e997eae87c1f5dd431..1138d315cda34e038402473865846c1d92163fdb 100644 (file)
--- a/maps/space-elevator.mapinfo
+++ b/maps/space-elevator.mapinfo
@@ -5,5 +5,3 @@ has weapons
 gametype ctf
 cdtrack 4
 
-clientsettemp_for_type all r_water 1
-clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file

diff --git a/maps/stormkeep.mapinfo b/maps/stormkeep.mapinfo
index ed03ff106c288db03d673daadbd6c6a0cb67b9a0..4a9527276449d0062c4c12123d46d544b93fbb3f 100644 (file)
--- a/maps/stormkeep.mapinfo
+++ b/maps/stormkeep.mapinfo
@@ -12,6 +12,4 @@ gametype kh
 gametype ca
 gametype ft
 gametype ka
-
-clientsettemp_for_type all r_water 1
-clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file
+gametype duel

diff --git a/maps/warfare.mapinfo b/maps/warfare.mapinfo
index f7714ec99b768a1860e46394f5f61ac6ddd6661f..79d6600d8ba9b45a61554a995486f897c33bce1b 100644 (file)
--- a/maps/warfare.mapinfo
+++ b/maps/warfare.mapinfo
@@ -9,4 +9,5 @@ gametype lms
 gametype ca
 gametype ka
 gametype kh
-gametype ft
\ No newline at end of file
+gametype ft
+gametype duel

diff --git a/maps/xoylent.mapinfo b/maps/xoylent.mapinfo
index d515a80b675935df98ab22c3a2f2ed3e5e20912d..8a0cccaad3efce6105272cf457519d94a490486d 100644 (file)
--- a/maps/xoylent.mapinfo
+++ b/maps/xoylent.mapinfo
@@ -8,4 +8,5 @@ gametype lms
 gametype tdm
 gametype ca
 gametype ft
-gametype ka
\ No newline at end of file
+gametype ka
+gametype duel