Merge branch 'master' into kuniuthefrogg/boil

diff --git a/maps/_hudsetup.map.options b/maps/_hudsetup.map.options
index cbbbcdb5c4a1178e042a9ac55dd5b586a3fb8509..f3e8a1e9f098f46dd57035b2851382fd17ee3505 100644 (file)
--- a/maps/_hudsetup.map.options
+++ b/maps/_hudsetup.map.options
@@ -3,4 +3,4 @@
 -light + -bounce 8
 -minimap +
 -sRGB
-Version: 5a
+Version: 6

diff --git a/maps/afterslime.map b/maps/afterslime.map
index 07039acb7d03c5feea3833e9326bc155e7ad5b3b..301bedca59a69ab4f7a49312a928cbe01d4ff24f 100644 (file)
--- a/maps/afterslime.map
+++ b/maps/afterslime.map
@@ -57185,7 +57185,7 @@ exx/trim-metalsupp01
 "angle" "90.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "160.000000 -2336.000000 424.000000"
 }
 {

diff --git a/maps/afterslime.map.options b/maps/afterslime.map.options
index 3687a47fe8151bc3f6e575291272f8ad992af60f..9c6b2dd9cd717475cea0cc7b337bdc6be3638e64 100644 (file)
--- a/maps/afterslime.map.options
+++ b/maps/afterslime.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 13
+Version: 14a

diff --git a/maps/atelier.map b/maps/atelier.map
index f0172db143b9c5d53391b943c6261d104f83d138..de090ea46feb32cbe0ad2b84f36997041c80958b 100644 (file)
--- a/maps/atelier.map
+++ b/maps/atelier.map
@@ -36835,7 +36835,7 @@ exx/base-metal01
 "origin" "128.000000 -1152.000000 416.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "-1792.000000 768.000000 320.000000"
 }
 {
@@ -36867,7 +36867,7 @@ exx/base-metal01
 "origin" "-352.000000 -354.000000 512.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "960.000000 -960.000000 192.000000"
 }
 {
@@ -36895,7 +36895,7 @@ exx/base-metal01
 "origin" "800.000000 96.000000 512.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "800.000000 1024.000000 128.000000"
 }
 {

diff --git a/maps/atelier.map.options b/maps/atelier.map.options
index 95cec6220e5e2cc7e28bb24d1c52f1138ac7c295..3d967c35ca9fe455d1b62b18c5dee5b4a3a0164d 100644 (file)
--- a/maps/atelier.map.options
+++ b/maps/atelier.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 4b
\ No newline at end of file
+Version: 5
\ No newline at end of file

diff --git a/maps/catharsis.map b/maps/catharsis.map
index 153041bc5b9c8ac0435b11c88308135174f50553..aa9da7e41488a75480e3844067a5ae5042219217 100644 (file)
--- a/maps/catharsis.map
+++ b/maps/catharsis.map
@@ -41746,7 +41746,7 @@ brushDef
 "light" "300"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "-52.000000 3572.000000 -52.000000"
 }
 {
@@ -41933,7 +41933,7 @@ brushDef
 "origin" "704.000000 5796.000000 -80.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-736.000000 6848.000000 -240.000000"
 }
 {
@@ -42159,7 +42159,7 @@ brushDef
 "origin" "-800.000000 1308.000000 -80.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "640.000000 256.000000 -240.000000"
 }
 {

diff --git a/maps/catharsis.map.options b/maps/catharsis.map.options
index b01354524c28bd8224a4bcd81127b860c932a582..380044549ee7f593e5109a469e7f4f2e4bf61c6a 100644 (file)
--- a/maps/catharsis.map.options
+++ b/maps/catharsis.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap -scale 0.9 +
 -sRGB
-Version: 2c
\ No newline at end of file
+Version: 3a
\ No newline at end of file

diff --git a/maps/courtfun.map b/maps/courtfun.map
index 57f7f5eb4648889f7243c4ad07ecd9968d7d8ba0..fab237e05ed955818e46996becefbab68e196db9 100644 (file)
--- a/maps/courtfun.map
+++ b/maps/courtfun.map
@@ -27492,11 +27492,11 @@ exx/base-metal01
 "origin" "2208.000000 -1024.000000 360.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "96.000000 2080.000000 32.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-2400.000000 192.000000 168.000000"
 }
 {
@@ -27732,7 +27732,7 @@ exx/base-metal01
 "angle" "-49.052025"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-288.000000 1608.000000 88.000000"
 }
 {
@@ -30443,7 +30443,7 @@ exx/base-metal01
 "origin" "512.000000 -3520.000000 256.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "512.000000 -3648.000000 256.000000"
 }
 {
@@ -30907,12 +30907,12 @@ exx/base-metal01
 "angle" "-179.999985"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "-4192.000000 1888.000000 32.000000"
 "angle" "-179.999985"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-1696.000000 3776.000000 168.000000"
 "angle" "-179.999985"
 }
@@ -31100,7 +31100,7 @@ exx/base-metal01
 "angle" "130.947983"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-3808.000000 2360.000000 88.000000"
 "angle" "-179.999985"
 }
@@ -33864,7 +33864,7 @@ exx/base-metal01
 "angle" "-179.999985"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-4608.000000 7616.000000 256.000000"
 "angle" "-179.999985"
 }

diff --git a/maps/courtfun.map.options b/maps/courtfun.map.options
index 72b8e9adb52f9d05c667be65724fc66766e53927..398dd0e9fbea273b806be48eb94c3b663666a311 100644 (file)
--- a/maps/courtfun.map.options
+++ b/maps/courtfun.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 11d
\ No newline at end of file
+Version: 12a
\ No newline at end of file

diff --git a/maps/dance.map b/maps/dance.map
index 50a1f3fe963cf72cf21562588dd9147ca3597b06..28389bfa84c49565c2f7794bcfe398a9de8438ac 100644 (file)
--- a/maps/dance.map
+++ b/maps/dance.map
@@ -20938,18 +20938,6 @@ effects_jumppad/jumppadfx1_a
 "lodmodel1" "models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3"
 }
 {
-"classname" "trigger_impulse"
-"strength" "0.1"
-{
-( 3072 3584 -1024 ) ( 3072 -3584 -1024 ) ( -3072 3584 -1024 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 3072 3584 -768 ) ( -3072 3584 -768 ) ( 3072 3584 -1792 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 3072 3584 -768 ) ( 3072 3584 -1792 ) ( 3072 -3584 -768 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -3072 -3584 -1792 ) ( 3072 -3584 -1792 ) ( -3072 3584 -1792 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -3072 -3584 -1792 ) ( -3072 -3584 -768 ) ( 3072 -3584 -1792 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -3072 -3584 -1792 ) ( -3072 3584 -1792 ) ( -3072 -3584 -768 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-}
-}
-{
 "classname" "weapon_uzi"
 "origin" "1024.000000 -640.000000 -172.000000"
 }

diff --git a/maps/dance.map.options b/maps/dance.map.options
index c48c877b6103dc3a4d630a6cbeb4a753b2833258..cbbb06d0baf2c2f49669ff66150d6f5af98ce900 100644 (file)
--- a/maps/dance.map.options
+++ b/maps/dance.map.options
@@ -3,4 +3,4 @@
 -light + -bounce 8 -dirtscale 2 -gamma 0.7
 -minimap +
 -sRGB
-Version: 5d
+Version: 6b

diff --git a/maps/darkzone.map b/maps/darkzone.map
index cc196593539427d66770a23fb3d90138cc397c8d..a6a55d82df564ff48cec81904176fb8e4e8c81f9 100644 (file)
--- a/maps/darkzone.map
+++ b/maps/darkzone.map
@@ -23701,7 +23701,7 @@ trak5x/trim-trim1a
 "targetname" "t340"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "1120.000000 1024.000000 256.000000"
 }
 {
@@ -28550,7 +28550,7 @@ exx/base-metal04
 "origin" "-152.000000 96.000000 64.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "1248.000000 64.000000 256.000000"
 }
 {

diff --git a/maps/darkzone.map.options b/maps/darkzone.map.options
index 113cba2a56247fa162243d8d5a3534b6e473ebb6..43dc12e28fbb07f967f043046d9d2f2a7f5e4481 100644 (file)
--- a/maps/darkzone.map.options
+++ b/maps/darkzone.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 9b
\ No newline at end of file
+Version: 10
\ No newline at end of file

diff --git a/maps/drain.map.options b/maps/drain.map.options
index 8107138a087e0f52935b37d8feab21dbedfc9128..217f2ce4393248abe7cf15b4aeab625584e413c9 100644 (file)
--- a/maps/drain.map.options
+++ b/maps/drain.map.options
@@ -4,4 +4,4 @@
 -light + -gamma 0.75 -dirtscale 2 -bounce 8  -areascale 1.25 -pointscale 1.3 -randomsamples -samples 128
 -minimap +
 -sRGB
-Version: 13h
+Version: 14

diff --git a/maps/finalrage.map b/maps/finalrage.map
index 569849f6900505a4535e37b05f84725febc545fa..c15e266493482bdd2557d09d630073b551172da1 100644 (file)
--- a/maps/finalrage.map
+++ b/maps/finalrage.map
@@ -15060,7 +15060,7 @@ map_stormkeep/rock
 "netname" "Mega Health room"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "432.000000 1444.000000 312.000000"
 }
 {

diff --git a/maps/finalrage.map.options b/maps/finalrage.map.options
index 89ea9fc14157bf561332a32363db84f7cfab0069..ee03ce97549fc1dd49cbbff8b3726d6535c29a18 100644 (file)
--- a/maps/finalrage.map.options
+++ b/maps/finalrage.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 1f
\ No newline at end of file
+Version: 2
\ No newline at end of file

diff --git a/maps/fuse.map b/maps/fuse.map
index 5ac456099c023009497588dbdaf89fe35efd44c1..15b89fdcda3372648bf69ad25b2801f5d3709210 100644 (file)
--- a/maps/fuse.map
+++ b/maps/fuse.map
@@ -31037,7 +31037,7 @@ brushDef
 }
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-96.000000 -480.000000 -376.000000"
 }
 {

diff --git a/maps/fuse.map.options b/maps/fuse.map.options
index db3f7b25e58b4f54fd5b47486fb11c9e4c7171a5..5740a3edce6bf64fa6aaa9a7292432228ed8fdf1 100644 (file)
--- a/maps/fuse.map.options
+++ b/maps/fuse.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 8e
\ No newline at end of file
+Version: 9
\ No newline at end of file

diff --git a/maps/g-23.map b/maps/g-23.map
index b9001205f2a654a5a51954b87960a39cd59870d5..1dc4ad3805e35f807e1eb866f916254d07155a37 100644 (file)
--- a/maps/g-23.map
+++ b/maps/g-23.map
@@ -13393,7 +13393,7 @@ map_g-23/conveyor_belt
 "origin" "-672.000000 320.000000 -448.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-1312.000000 -1040.000000 -256.000000"
 }
 {
@@ -13706,7 +13706,7 @@ map_g-23/conveyor_belt
 "origin" "160.000000 -512.000000 -312.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "960.000000 -1024.000000 80.000000"
 "spawnflags" "1"
 }

diff --git a/maps/g-23.map.options b/maps/g-23.map.options
index ff357719dda9b560523a4d4884b55baf1379b858..0b5e85dc8473c6c4748bb7302cff785055240e18 100644 (file)
--- a/maps/g-23.map.options
+++ b/maps/g-23.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 9a
\ No newline at end of file
+Version: 10
\ No newline at end of file

diff --git a/maps/glowplant.map b/maps/glowplant.map
index 067fc1d5a099bf5b8e3e1fceadae9e49dcadf465..8e1153063854e75f49458c15097663ecb2830d98 100644 (file)
--- a/maps/glowplant.map
+++ b/maps/glowplant.map
@@ -43444,7 +43444,7 @@ trak5x/base-pipe1a
 "angle" "-135.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "-384 0 -192"
 }
 {
@@ -43541,7 +43541,7 @@ trak5x/base-pipe1a
 "origin" "-64 816 296"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-1472 128 632"
 }
 {

diff --git a/maps/glowplant.map.options b/maps/glowplant.map.options
index 50960af0d94cc0c2bfbebe60e3f80f0b04a2640c..6d57725f983b2281914cfea34decde7853eba2ba 100644 (file)
--- a/maps/glowplant.map.options
+++ b/maps/glowplant.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 14a
+Version: 15

diff --git a/maps/implosion.map b/maps/implosion.map
index 59627b1ff8f1d320691103dcac19c3a31271e1c1..fe54fac39cf13134bfa9d55477be1bded12d16d4 100644 (file)
--- a/maps/implosion.map
+++ b/maps/implosion.map
@@ -77946,11 +77946,11 @@ logos/logo02_yellow_glowy
 "angle" "-90.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "4232.000000 -3552.000000 -384.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "192.000000 -2336.000000 -384.000000"
 }
 {
@@ -78039,7 +78039,7 @@ logos/logo02_yellow_glowy
 "origin" "2112.000000 -2752.000000 8.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-352.000000 -3560.000000 0.000000"
 }
 {
@@ -78048,7 +78048,7 @@ logos/logo02_yellow_glowy
 "angle" "180.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "4776.000000 -2336.000000 0.000000"
 "angle" "180.000000"
 }

diff --git a/maps/implosion.map.options b/maps/implosion.map.options
index fc867f009cc78fda89bc24c3455d2a0e00cbff9e..da5b36646ab15a89c0f4ecf269a42226fcab5586 100644 (file)
--- a/maps/implosion.map.options
+++ b/maps/implosion.map.options
@@ -3,4 +3,4 @@
 -vis + 
 -minimap +
 -sRGB
-Version: 2c
+Version: 3

diff --git a/maps/leave_em_behind.map.options b/maps/leave_em_behind.map.options
index 07af57cf1e1e2fc50b6e60995a54ced2807fdcff..092d59f4ba4679a8bd9b6a7c93abbb62b74433fb 100644 (file)
--- a/maps/leave_em_behind.map.options
+++ b/maps/leave_em_behind.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 6c
+Version: 7

diff --git a/maps/nexballarena.map.options b/maps/nexballarena.map.options
index 8a55ea25a5c2c908851aa029ef2cd02b49741d1a..38598d432c7e81179724669a8b78f33ec38ccec0 100644 (file)
--- a/maps/nexballarena.map.options
+++ b/maps/nexballarena.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 1b
\ No newline at end of file
+Version: 2
\ No newline at end of file

diff --git a/maps/oilrig.map b/maps/oilrig.map
index 06cbef43877233c18fa81b485a9d0992c6b76ad6..57af1f1c8b61012162a806f6bedf81540b63ddc1 100644 (file)
--- a/maps/oilrig.map
+++ b/maps/oilrig.map
@@ -23691,7 +23691,7 @@ exx/wall-bigrib02
 "origin" "960.000000 960.000000 -352.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "296.000000 -384.000000 -320.000000"
 }
 {
@@ -23736,7 +23736,7 @@ exx/wall-bigrib02
 "origin" "760.000000 968.000000 -328.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "1344.000000 576.000000 -328.000000"
 }
 {

diff --git a/maps/oilrig.map.options b/maps/oilrig.map.options
index a0c772e6f3464fb67da3e02aee758bff21bf8605..28e9bd228255a731a23f737aa378a65ce7015523 100644 (file)
--- a/maps/oilrig.map.options
+++ b/maps/oilrig.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 6e
\ No newline at end of file
+Version: 7
\ No newline at end of file

diff --git a/maps/runningman.map b/maps/runningman.map
index b51f37bb64f8c2015018b41cdb62c2f56b0929e2..c83825006f1797c60ebfd4b358feaec13fd4956d 100644 (file)
--- a/maps/runningman.map
+++ b/maps/runningman.map
@@ -14761,12 +14761,12 @@ effects_healpod/healpod1_d
 "origin" "560.000000 -8.000000 -232.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "-896.000000 -208.000000 320.000000"
 "angle" "-90.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "368.000000 384.000000 -256.000000"
 "angle" "-90.000000"
 }

diff --git a/maps/runningman.map.options b/maps/runningman.map.options
index a37f0ee8d0672df3a0f15be62051d69432f3b661..1539c8e7f493473100882240587a2b029ff839b4 100644 (file)
--- a/maps/runningman.map.options
+++ b/maps/runningman.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 5c
\ No newline at end of file
+Version: 6
\ No newline at end of file

diff --git a/maps/runningmanctf.map b/maps/runningmanctf.map
index 41f48ca56d1161d7764094c81a140283d58e1cc7..eb105c3ba856f800e69cda1a82c222b97bc0870f 100644 (file)
--- a/maps/runningmanctf.map
+++ b/maps/runningmanctf.map
@@ -29573,7 +29573,7 @@ exx/base-metal03
 "angle" "-90.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "-160.000000 -208.000000 16.000000"
 "angle" "-90.000000"
 }
@@ -32383,7 +32383,7 @@ exx/base-metal03
 }
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "368.000000 192.000000 -416.000000"
 "angle" "-90.000000"
 }
@@ -35734,7 +35734,7 @@ exx/base-metal03
 }
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "-1472.000000 2032.000000 -416.000000"
 "angle" "0.000003"
 }
@@ -36286,7 +36286,7 @@ effects_healpod/healpod1_d
 "origin" "784.000000 64.000000 -160.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "-2200.000000 -536.000000 128.000000"
 }
 {
@@ -36587,7 +36587,7 @@ effects_healpod/healpod1_d
 "message" " has captured the ^2Red base ^3control point"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "-1872.000000 1504.000000 16.000000"
 "angle" "179.999985"
 }

diff --git a/maps/runningmanctf.map.options b/maps/runningmanctf.map.options
index 8dde173f3edc657f69ce768ed6c6f547deaeec62..11c6b297f4cd2324aa7d0a0b7140c84159459ed8 100644 (file)
--- a/maps/runningmanctf.map.options
+++ b/maps/runningmanctf.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 10f
+Version: 11

diff --git a/maps/silentsiege.map b/maps/silentsiege.map
index d7738fc769254e7236ba5ca974f168cfdeea2c45..690a2eb5a031c54e478681aa0c2e867300fcfcb7 100644 (file)
--- a/maps/silentsiege.map
+++ b/maps/silentsiege.map
@@ -49134,7 +49134,7 @@ brushDef
 "target" "info_null1"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "1064.000000 -752.000000 656.000000"
 }
 {
@@ -54048,7 +54048,7 @@ exx/floor-simple05
 }
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-488.000000 -1248.000000 320.000000"
 }
 {

diff --git a/maps/silentsiege.map.options b/maps/silentsiege.map.options
index 5c73b05799498208c658a59832f5b149a2daa364..34b5aa93df889cef13929eb917bb631968d7d5b8 100644 (file)
--- a/maps/silentsiege.map.options
+++ b/maps/silentsiege.map.options
@@ -4,4 +4,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 14g
\ No newline at end of file
+Version: 15
\ No newline at end of file

diff --git a/maps/solarium.map b/maps/solarium.map
index 8eb061005a1c980cfe1ea766162c6d1268616d8f..2c2087f9c0c4ee281f809b8ce44fdfe6bd5ece37 100644 (file)
--- a/maps/solarium.map
+++ b/maps/solarium.map
@@ -25115,7 +25115,7 @@ trak5x/base-base1a
 "_color" ".3 .7 1"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "672.000000 -2528.000000 184.000000"
 }
 {
@@ -25952,7 +25952,7 @@ trak5x/base-base1a
 "_color" "1 0 0"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "-808.000000 -184.000000 152.000000"
 "angle" "-90.000000"
 }

diff --git a/maps/solarium.map.options b/maps/solarium.map.options
index 6ce937a5979a35995df8a32f71181a31162cfe78..80134b9facc21570ceb539e12eb7cfd1b0e03544 100644 (file)
--- a/maps/solarium.map.options
+++ b/maps/solarium.map.options
@@ -3,4 +3,4 @@
 -light + -bounce 8 -dirty -dirtscale 1 -bouncescale 1 -areascale 0.10
 -minimap +
 -sRGB
-Version: 5b
+Version: 6

diff --git a/maps/space-elevator.map b/maps/space-elevator.map
index 6ca7241c07f7809cf78cabd2808b44456425212c..2adc87e913c94fb8f527f6643ac743ad41eeabfd 100644 (file)
--- a/maps/space-elevator.map
+++ b/maps/space-elevator.map
@@ -28039,7 +28039,7 @@ effects_jumppad/jumppadfx1_a
 "angle" "90.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "704.000000 0.000000 -208.000000"
 "spawnflags" "1"
 }
@@ -28104,7 +28104,7 @@ effects_jumppad/jumppadfx1_a
 "angle" "90.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "0.000000 -3264.000000 544.000000"
 "angle" "90.000000"
 }
@@ -28123,7 +28123,7 @@ effects_jumppad/jumppadfx1_a
 "origin" "0.000000 -320.000000 160.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "0.000000 0.000000 -104.000000"
 "spawnflags" "1"
 }
@@ -28141,7 +28141,7 @@ effects_jumppad/jumppadfx1_a
 "spawnflags" "1"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-704.000000 0.000000 -208.000000"
 "spawnflags" "1"
 }
@@ -29135,7 +29135,7 @@ effects_jumppad/jumppadfx1_a
 "angle" "-90.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "0.000000 3264.000000 544.000000"
 "angle" "-90.000000"
 }

diff --git a/maps/space-elevator.map.options b/maps/space-elevator.map.options
index 6bd94e2ca657505f99c903653ac49abcf2599324..eba85ec9c258e3e120dd4d4abd807a65cff1f612 100644 (file)
--- a/maps/space-elevator.map.options
+++ b/maps/space-elevator.map.options
@@ -3,4 +3,4 @@
 -light + -bounce 8
 -minimap +
 -sRGB
-Version: 6b
+Version: 7

diff --git a/maps/stormkeep.map b/maps/stormkeep.map
index 1aaf2a983d4901cc8d812b2523d1530f341ef9d5..f32b0e2b07277f772bf14934d7d7c80fac07eafc 100644 (file)
--- a/maps/stormkeep.map
+++ b/maps/stormkeep.map
@@ -19803,7 +19803,7 @@ exx/base-metal03
 "origin" "-640.000000 1600.000000 -32.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "-910.000000 -160.000000 72.000000"
 }
 {
@@ -26905,7 +26905,7 @@ exx/base-metal03
 "origin" "-992.000000 1056.000000 -32.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-448.000000 -448.000000 -32.000000"
 }
 {

diff --git a/maps/stormkeep.map.options b/maps/stormkeep.map.options
index cbb7074cc3229bee9af4639578dc532cfd3cc182..40b05044aa1aad985686f9708e3d0472c34df277 100644 (file)
--- a/maps/stormkeep.map.options
+++ b/maps/stormkeep.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 10c
+Version: 11

diff --git a/maps/techassault.map b/maps/techassault.map
index b4d547e7d1155af300f03e437d41f67db1fb1f72..ecde4ee22d9851de36d7f7781a0889606e6fda8a 100644 (file)
--- a/maps/techassault.map
+++ b/maps/techassault.map
@@ -26219,11 +26219,11 @@ exx/base-crete03
 "origin" "-2720.000000 48.000000 -96.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-2392.000000 784.000000 -96.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-3104.000000 -688.000000 -96.000000"
 }
 {
@@ -26744,7 +26744,7 @@ exx/base-crete03
 "origin" "1984.000000 -48.000000 352.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "1984.000000 96.000000 352.000000"
 }
 {
@@ -27728,11 +27728,11 @@ exx/trim-baseboard
 "dmg" "51"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "1984.000000 -960.000000 40.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "1984.000000 960.000000 40.000000"
 }
 {
@@ -27862,12 +27862,12 @@ exx/trim-baseboard
 "respawntime" "5"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "-2176.000000 352.000000 80.000000"
 "respawntime" "5"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-1920.000000 0.000000 80.000000"
 "respawntime" "5"
 }
@@ -28346,7 +28346,7 @@ exx/trim-baseboard
 }
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "-2176.000000 -352.000000 80.000000"
 "respawntime" "5"
 }

diff --git a/maps/techassault.map.options b/maps/techassault.map.options
index e6e6b992172a6d8004aaa75a5017c0a128cbe18b..99effa61ebabb716cdb972db29f55f929102b5d3 100644 (file)
--- a/maps/techassault.map.options
+++ b/maps/techassault.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 5a
+Version: 6

diff --git a/maps/vorix.map b/maps/vorix.map
index dc6b6a25965f44a547c5e8e598e6f1cccc00d022..72b6b3db513b0f623d14e2ac73fb5c1f347be667 100644 (file)
--- a/maps/vorix.map
+++ b/maps/vorix.map
@@ -72097,7 +72097,7 @@ trak5x/base-pipe1a
 "origin" "1232.000000 -1104.000000 240.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-892.000000 -2528.000000 512.000000"
 }
 {
@@ -74056,7 +74056,7 @@ trak5x/base-pipe1a
 "angle" "-90.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "-320.000000 -3584.000000 352.000000"
 }
 {
@@ -74253,7 +74253,7 @@ trak5x/base-pipe1a
 "angle" "-179.999985"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "892.000000 2528.000000 512.000000"
 "angle" "-179.999985"
 }
@@ -76166,7 +76166,7 @@ trak5x/base-pipe1a
 "angle" "90.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "320.000000 3584.000000 352.000000"
 "angle" "-179.999985"
 }
@@ -76186,7 +76186,7 @@ trak5x/base-pipe1a
 "angle" "90.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-1322.000000 -150.000000 345.000000"
 "angle" "-179.999985"
 }
@@ -77267,7 +77267,7 @@ trak5x/base-pipe1a
 "angle" "-66.897697"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "1322.000000 150.000000 345.000000"
 "angle" "0.000009"
 }

diff --git a/maps/vorix.map.options b/maps/vorix.map.options
index af55fe68b8e51b42136c7b972adf8101455e8a32..398ba3f86bd1cab88f64839a841e68be522a1d0b 100644 (file)
--- a/maps/vorix.map.options
+++ b/maps/vorix.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-version: 11b
+version: 12

diff --git a/maps/warfare.map b/maps/warfare.map
index 89f84560d058009734957ef0eef4f47e0ba47e86..8255a71c2090e8668c06e12f753b25ad3f9d3c6e 100644 (file)
--- a/maps/warfare.map
+++ b/maps/warfare.map
@@ -32423,7 +32423,7 @@ exx/base-metal05rust
 "origin" "528.000000 320.000000 496.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "-384.000000 -1024.000000 104.000000"
 }
 {

diff --git a/maps/warfare.map.options b/maps/warfare.map.options
index 7c7591da6e3dc6842950d5cef26813d8a53b2de3..c01234eebcc0de1e3e5cede047c81cf4088eefe6 100644 (file)
--- a/maps/warfare.map.options
+++ b/maps/warfare.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 7
\ No newline at end of file
+Version: 8
\ No newline at end of file

diff --git a/maps/xoylent.map b/maps/xoylent.map
index 4b5b7bf81fedaf552ce0851bb1ebc54609553150..b88cef852be79465b3e79b83dbc5daecff972631 100644 (file)
--- a/maps/xoylent.map
+++ b/maps/xoylent.map
@@ -27992,11 +27992,11 @@ exx/trim-baseboard
 "origin" "170.000000 -496.000000 400.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "32.000000 48.000000 672.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "560.000000 -880.000000 160.000000"
 }
 {

diff --git a/maps/xoylent.map.options b/maps/xoylent.map.options
index 36b27436da2a8636d55c4d62ec6475c97da6ad4c..59736be2040fef3aaadd7e0e6aa0ba923f0e4b39 100644 (file)
--- a/maps/xoylent.map.options
+++ b/maps/xoylent.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 4f
+Version: 5

diff --git a/scripts/entities.ent b/scripts/entities.ent
index c27c2ec3ed2f01634d3d349dae08bbddc6ac917a..0e0fd5c9359cd316372b4875cdba9ef00abc19af 100644 (file)
--- a/scripts/entities.ent
+++ b/scripts/entities.ent
@@ -431,13 +431,13 @@ Pink team's player spawning location, but there is no game mode to use this yet.
 <real key="restriction" name="restriction">when 1, only bots can spawn here; when 2, only humans can spawn here (be careful with these, or the game will crash because someone cannot spawn)</real>
 </point>
 
-<point name="item_armor_large" color=".4 .8 .4" box="-30 -30 0 30 30 32">
+<point name="item_armor_mega" color=".4 .8 .4" box="-30 -30 0 30 30 32">
 Large Armor (default 100 armor points)
 -------- KEYS --------
 <real key="respawntime" name="respawntime">time till it respawns (default: 30)</real>
 <real key="respawntimejitter" name="respawntimejitter">respawn time randomization +/- seconds (default: 0)</real>
-<real key="armorvalue" name="armorvalue">amount of armor it gives (default: 100 (g_pickup_armorlarge))</real>
-<real key="max_armorvalue" name="max_armorvalue">max of armor it increases to (default: 999 (g_pickup_armorlarge_max))</real>
+<real key="armorvalue" name="armorvalue">amount of armor it gives (default: 100 (g_pickup_armormega))</real>
+<real key="max_armorvalue" name="max_armorvalue">max of armor it increases to (default: 999 (g_pickup_armormega_max))</real>
 <integer key="team" name="team">out of items with the same value here, only one (random one) will spawn. Useful to put multiple items on one spot.</integer>
 <real key="cnt" name="cnt">weight of this item for random selection using &quot;team&quot;. Set to a lower value for items you want to see less likely.</real>
 -------- SPAWNFLAGS --------
@@ -451,8 +451,8 @@ Big Armor (default 50 armor points)
 -------- KEYS --------
 <real key="respawntime" name="respawntime">time till it respawns (default: 20)</real>
 <real key="respawntimejitter" name="respawntimejitter">respawn time randomization +/- seconds (default: 0)</real>
-<real key="armorvalue" name="armorvalue">amount of armor it gives (default: 50 (g_pickup_armorlarge))</real>
-<real key="max_armorvalue" name="max_armorvalue">max of armor it increases to (default: 999 (g_pickup_armorlarge_max))</real>
+<real key="armorvalue" name="armorvalue">amount of armor it gives (default: 50 (g_pickup_armorbig))</real>
+<real key="max_armorvalue" name="max_armorvalue">max of armor it increases to (default: 999 (g_pickup_armorbig_max))</real>
 <integer key="team" name="team">out of items with the same value here, only one (random one) will spawn. Useful to put multiple items on one spot.</integer>
 <real key="cnt" name="cnt">weight of this item for random selection using &quot;team&quot;. Set to a lower value for items you want to see less likely.</real>
 -------- SPAWNFLAGS --------
@@ -545,13 +545,13 @@ CTF flag for team two (Blue). Use more than one if you really insist.
 zbqry=&quot;zbqryf/pgs/enqvnag/synt_oyhr_enqvnag.zq3&quot;
 </point>
 
-<point name="item_health_large" color=".9 .3 .3" box="-30 -30 0 30 30 48">
-Large Health (default 50 health points)
+<point name="item_health_big" color=".9 .3 .3" box="-30 -30 0 30 30 48">
+Big Health (default 50 health points)
 -------- KEYS --------
 <real key="respawntime" name="respawntime">time till it respawns (default: 20)</real>
 <real key="respawntimejitter" name="respawntimejitter">respawn time randomization +/- seconds (default: 0)</real>
-<real key="health" name="health">amount of health it gives (default: 50 (g_pickup_healthlarge))</real>
-<real key="max_health" name="max_health">max of health it increases to (default: 999 (g_pickup_healthlarge_max))</real>
+<real key="health" name="health">amount of health it gives (default: 50 (g_pickup_healthbig))</real>
+<real key="max_health" name="max_health">max of health it increases to (default: 999 (g_pickup_healthbig_max))</real>
 <integer key="team" name="team">out of items with the same value here, only one (random one) will spawn. Useful to put multiple items on one spot.</integer>
 <real key="cnt" name="cnt">weight of this item for random selection using &quot;team&quot;. Set to a lower value for items you want to see less likely.</real>
 -------- SPAWNFLAGS --------
@@ -623,7 +623,7 @@ modeldisabled=&quot;models/items/g_invincible.md3&quot;
 <point name="item_key" color="0 .5 .8" box="-16 -16 -24 16 16 32">
 A key entity.
 The itemkeys should contain one of the following key IDs:
-1 - GOLD key - 
+1 - GOLD key -
 2 - SILVER key
 4 - BRONZE key
 8 - RED keycard
@@ -1446,7 +1446,7 @@ modeldisabled=&quot;models/weapons/g_uzi.md3&quot;
 <group name="worldspawn" color="0 0 0">
 The world.
 If you see this, the currently selected brush is not of an entity.
--------- KEYS --------         
+-------- KEYS --------
 <string key="fog" name="fog">fog parameters of the map (density red green blue alpha mindist maxdist maxheight fade-height); works just like the &quot;fog&quot; console command</string>
 <string key="author" name="author">name of the author of the map, if not specified in &quot;message&quot;. Will get copied to the &quot;author&quot; entry of the mapinfo file when none is present.</string>
 <string key="message" name="message">text to print at user logon. Used for name of level. Ideally: &quot;NAMEOFLEVEL by AUTHOR&quot;. Will get copied to the &quot;title&quot; and &quot;author&quot; entries of the mapinfo file when none is present.</string>
@@ -2420,7 +2420,7 @@ model=&quot;../xonotic-data.pk3dir/models/turrets/radiant/mlrs.md3&quot;
 </point>
 
 <point name="turret_hellion" color="1 0 0" box="-32 -32 0 32 32 50">
-2 guided moderate damage accelerating rockets 
+2 guided moderate damage accelerating rockets
 -------- KEYS --------
 <real key="turret_scale_damage" name="turret_scale_damage">2 = double damage, 0.5 = half</real>
 <real key="turret_scale_range" name="turret_scale_range">2 = double range, 0.5 = half</real>