Merge branch 'master' into packer/warpzones

diff --git a/maps/erbium.map b/maps/erbium.map
index 0d4ac94409d0990fb21bb8ee1a76f7e502c03834..10ee72346ac729a941ba88f3468a80dd2d828f20 100644 (file)
--- a/maps/erbium.map
+++ b/maps/erbium.map
@@ -4959,17 +4959,6 @@ brushDef
 {
 brushDef
 {
-( 2144 416 660 ) ( 2144 384 660 ) ( 2128 416 660 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( 2144 416 660 ) ( 2144 416 636 ) ( 2144 384 660 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( 2128 384 636 ) ( 2144 384 636 ) ( 2128 416 636 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
-( 2128 384 636 ) ( 2128 416 636 ) ( 2128 384 660 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
-( 2144 388 -64 ) ( 2128 404 -64 ) ( 2144 388 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( 2140 500 -64 ) ( 2144 500 -64 ) ( 2140 500 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-}
-}
-{
-brushDef
-{
 ( 1008 248 272 ) ( 1036 174 272 ) ( 1008 174 272 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 1036 248 272 ) ( 1036 174 268 ) ( 1036 174 272 ) ( ( 0.0131578948 0 509.5263366699 ) ( 0 0.25 4 ) ) exx/trim-horz01 134217728 0 0
 ( 1036 248 268 ) ( 1008 174 268 ) ( 1036 174 268 ) ( ( 0.0135135138 0 125.648651123 ) ( 0 0.0357142873 37 ) ) phillipk2x/lights-pk02_light01a-surfacelight 134217728 0 0
@@ -7537,7 +7526,7 @@ brushDef
 ( 1968 388 660 ) ( 2288 404 660 ) ( 2296 388 660 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
 ( 1968 388 636 ) ( 2288 404 636 ) ( 1968 404 636 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
 ( 2052 388 -132 ) ( 2044 404 -132 ) ( 2052 388 -4 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( 2128 404 -64 ) ( 2132 400 -64 ) ( 2128 404 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 2128 400 -64 ) ( 2128 392 -64 ) ( 2128 400 64 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
 }
 }
 {
@@ -11609,8 +11598,8 @@ brushDef
 ( 2144 596 144 ) ( 2144 580 144 ) ( 2144 596 272 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
 ( 2128 556 160 ) ( 2128 564 160 ) ( 2128 556 288 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
 ( 2128 404 288 ) ( 2112 404 160 ) ( 2128 404 160 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
-( 2136 380 160 ) ( 2128 380 160 ) ( 2136 380 288 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
-( 1924 400 636 ) ( 1924 392 636 ) ( 1796 400 636 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 2136 384 160 ) ( 2128 384 160 ) ( 2136 384 288 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
+( 1924 400 636 ) ( 1924 392 636 ) ( 1796 400 636 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
 ( 1924 348 496 ) ( 1924 356 496 ) ( 1796 348 496 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 }
 }
@@ -21130,6 +21119,17 @@ brushDef
 ( -488 -972 64 ) ( -487 -973 -64 ) ( -488 -972 -64 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
 }
 }
+{
+brushDef
+{
+( 2144 416 660 ) ( 2144 384 660 ) ( 2128 416 660 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 2144 416 660 ) ( 2144 416 636 ) ( 2144 384 660 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
+( 2128 384 636 ) ( 2144 384 636 ) ( 2128 416 636 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
+( 2128 384 636 ) ( 2128 416 636 ) ( 2128 384 660 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
+( 2140 500 -64 ) ( 2144 500 -64 ) ( 2140 500 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 2129 384 64 ) ( 2137 384 -64 ) ( 2129 384 -64 ) ( ( 0.0078125 0 511.9921875 ) ( 0 0.0078125 0 ) ) exx/base-metal03 0 0 0
+}
+}
 }
 {
 "classname" "info_player_deathmatch"

diff --git a/maps/erbium.map.options b/maps/erbium.map.options
index 5960e6bfbe91b14cc367723a8794b5600d014b5b..3a25e7f6c56e45153e3e8c698e43d945c91ff988 100644 (file)
--- a/maps/erbium.map.options
+++ b/maps/erbium.map.options
@@ -2,4 +2,4 @@
 -light + -bounce 8 -dirtscale 2
 -vis +
 -minimap +
-Version: 7
\ No newline at end of file
+Version: 7b
\ No newline at end of file

diff --git a/models/map_erbium/armor-room-rock.ase b/models/map_erbium/armor-room-rock.ase
index 78544a5c0f0ef64aefe0a59a6a7bf2dd1714537f..3f9ce3865946abfe52428e6ab73804360e3b8a81 100644 (file)
--- a/models/map_erbium/armor-room-rock.ase
+++ b/models/map_erbium/armor-room-rock.ase
@@ -12,7 +12,7 @@
 *MATERIAL_LIST {\r
        *MATERIAL_COUNT 1\r
        *MATERIAL 0 {\r
-               *MATERIAL_NAME "rocktomoss"\r
+               *MATERIAL_NAME "textures/map_erbium/rocktomoss"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_AMBIENT 0.5882        0.5882  0.5882\r
                *MATERIAL_DIFFUSE 0.5882        0.5882  0.5882\r

diff --git a/models/map_erbium/armor-room-terrain.ase b/models/map_erbium/armor-room-terrain.ase
index ca186e8024d85f2eb20eb89948f88bb91c07cd53..dfed274b1f1b039d73f59c44dd3eb43526ac19cf 100644 (file)
--- a/models/map_erbium/armor-room-terrain.ase
+++ b/models/map_erbium/armor-room-terrain.ase
@@ -12,7 +12,7 @@
 *MATERIAL_LIST {\r
        *MATERIAL_COUNT 1\r
        *MATERIAL 0 {\r
-               *MATERIAL_NAME "rocktomoss"\r
+               *MATERIAL_NAME "textures/map_erbium/rocktomoss"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_AMBIENT 0.5882        0.5882  0.5882\r
                *MATERIAL_DIFFUSE 0.5882        0.5882  0.5882\r

diff --git a/models/map_erbium/bottom-corridor.ase b/models/map_erbium/bottom-corridor.ase
index d041a9cfead2ae79cdab8b7f9d6f1e30cab95f06..00f704081ba7c47b3bdb3b688438a4e50f48e5ba 100644 (file)
--- a/models/map_erbium/bottom-corridor.ase
+++ b/models/map_erbium/bottom-corridor.ase
@@ -12,7 +12,7 @@
 *MATERIAL_LIST {\r
        *MATERIAL_COUNT 1\r
        *MATERIAL 0 {\r
-               *MATERIAL_NAME "rocktomoss"\r
+               *MATERIAL_NAME "textures/map_erbium/rocktomoss"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_AMBIENT 0.5882        0.5882  0.5882\r
                *MATERIAL_DIFFUSE 0.5882        0.5882  0.5882\r

diff --git a/models/map_erbium/corridor-rock.ase b/models/map_erbium/corridor-rock.ase
index dacb34c15354767b1c454fa2bccd53d8ff8ffd5e..8aea855167a092a8c8e121c26e5cb2211ba54493 100644 (file)
--- a/models/map_erbium/corridor-rock.ase
+++ b/models/map_erbium/corridor-rock.ase
@@ -12,7 +12,7 @@
 *MATERIAL_LIST {\r
        *MATERIAL_COUNT 1\r
        *MATERIAL 0 {\r
-               *MATERIAL_NAME "rocktomoss"\r
+               *MATERIAL_NAME "textures/map_erbium/rocktomoss"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_AMBIENT 0.5882        0.5882  0.5882\r
                *MATERIAL_DIFFUSE 0.5882        0.5882  0.5882\r

diff --git a/models/map_erbium/litlle-cave.ase b/models/map_erbium/litlle-cave.ase
index be8cb60d560f357ca082ec54ad150c332cad1a5d..c3796008d592ba8c23c623d67e24edccd4257a1f 100644 (file)
--- a/models/map_erbium/litlle-cave.ase
+++ b/models/map_erbium/litlle-cave.ase
@@ -12,7 +12,7 @@
 *MATERIAL_LIST {\r
        *MATERIAL_COUNT 1\r
        *MATERIAL 0 {\r
-               *MATERIAL_NAME "rocktomoss"\r
+               *MATERIAL_NAME "textures/map_erbium/rocktomoss"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_AMBIENT 0.5882        0.5882  0.5882\r
                *MATERIAL_DIFFUSE 0.5882        0.5882  0.5882\r

diff --git a/models/map_erbium/mega-rock-close.ase b/models/map_erbium/mega-rock-close.ase
index becd0ef1110e9e1886a3cd409ea2754d28fb9266..4c4b67fe6cfde0656d9cf4f01a7a05b039ae6edd 100644 (file)
--- a/models/map_erbium/mega-rock-close.ase
+++ b/models/map_erbium/mega-rock-close.ase
@@ -12,7 +12,7 @@
 *MATERIAL_LIST {\r
        *MATERIAL_COUNT 1\r
        *MATERIAL 0 {\r
-               *MATERIAL_NAME "rocktomoss"\r
+               *MATERIAL_NAME "textures/map_erbium/rocktomoss"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_AMBIENT 0.5882        0.5882  0.5882\r
                *MATERIAL_DIFFUSE 0.5882        0.5882  0.5882\r

diff --git a/models/map_erbium/mega-rock-main.ase b/models/map_erbium/mega-rock-main.ase
index bb89d171251821351f9ce8829bf3d143d60c5542..b8c7434f14fa83f5ea787e97c138dff416a2ca4c 100644 (file)
--- a/models/map_erbium/mega-rock-main.ase
+++ b/models/map_erbium/mega-rock-main.ase
@@ -12,7 +12,7 @@
 *MATERIAL_LIST {\r
        *MATERIAL_COUNT 1\r
        *MATERIAL 0 {\r
-               *MATERIAL_NAME "rocktomoss"\r
+               *MATERIAL_NAME "textures/map_erbium/rocktomoss"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_AMBIENT 0.5882        0.5882  0.5882\r
                *MATERIAL_DIFFUSE 0.5882        0.5882  0.5882\r

diff --git a/models/map_erbium/waterfall-room-rock-small.ase b/models/map_erbium/waterfall-room-rock-small.ase
index f8d5721fae6586b75c6d6e79e679742d44174687..ed40a7e8aea92603ef8a5c26adb7313ca519bbd6 100644 (file)
--- a/models/map_erbium/waterfall-room-rock-small.ase
+++ b/models/map_erbium/waterfall-room-rock-small.ase
@@ -12,7 +12,7 @@
 *MATERIAL_LIST {\r
        *MATERIAL_COUNT 1\r
        *MATERIAL 0 {\r
-               *MATERIAL_NAME "rocktomoss"\r
+               *MATERIAL_NAME "textures/map_erbium/rocktomoss"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_AMBIENT 0.5882        0.5882  0.5882\r
                *MATERIAL_DIFFUSE 0.5882        0.5882  0.5882\r

diff --git a/models/map_erbium/waterfall-room-rock.ase b/models/map_erbium/waterfall-room-rock.ase
index e61ce63e387cea33732a0277db77b61ad1b8f94a..2bae021d2211680f10a2a9caae8aad008846ea8c 100644 (file)
--- a/models/map_erbium/waterfall-room-rock.ase
+++ b/models/map_erbium/waterfall-room-rock.ase
@@ -12,7 +12,7 @@
 *MATERIAL_LIST {\r
        *MATERIAL_COUNT 1\r
        *MATERIAL 0 {\r
-               *MATERIAL_NAME "rocktomoss"\r
+               *MATERIAL_NAME "textures/map_erbium/rocktomoss"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_AMBIENT 0.5882        0.5882  0.5882\r
                *MATERIAL_DIFFUSE 0.5882        0.5882  0.5882\r

diff --git a/scripts/entities.ent b/scripts/entities.ent
index a9fd1957cb0c46a4bd4c84806e05d1867c017ec4..f06d5075c488949740c5022ee776302e5557e9cb 100644 (file)
--- a/scripts/entities.ent
+++ b/scripts/entities.ent
@@ -545,6 +545,32 @@ CTF flag for team two (Blue). Use more than one if you really insist.
 zbqry="zbqryf/pgs/enqvnag/synt_oyhr_enqvnag.zq3"
 </point>
 
+<point name="item_flag_team3" color="1 1 0" box="-32 -32 0 32 32 74">
+CTF flag for team three (Yellow). Use more than one if you really insist.
+-------- KEYS --------
+<model key="model" name="model">model to use</model>
+<real key="scale" name="scale">scaling factor (DO set this when using your own model!)</real>
+<sound key="noise" name="noise">sound played when flag is picked up</sound>
+<sound key="noise1" name="noise1">sound played when flag is returned</sound>
+<sound key="noise2" name="noise2">sound played when flag is captured</sound>
+<sound key="noise3" name="noise3">sound played when flag is lost in the field and respawns itself</sound>
+-------- ZBQRY SBE ENQVNAG BAYL - QB ABG FRG GUVF NF N XRL --------
+zbqry=&quot;zbqryf/pgs/enqvnag/synt_erq_enqvnag.zq3&quot;
+</point>
+
+<point name="item_flag_team4" color="1 0 1" box="-32 -32 0 32 32 74">
+CTF flag for team four (Pink). Use more than one if you really insist.
+-------- KEYS --------
+<model key="model" name="model">model to use</model>
+<real key="scale" name="scale">scaling factor (DO set this when using your own model!)</real>
+<sound key="noise" name="noise">sound played when flag is picked up</sound>
+<sound key="noise1" name="noise1">sound played when flag is returned</sound>
+<sound key="noise2" name="noise2">sound played when flag is captured</sound>
+<sound key="noise3" name="noise3">sound played when flag is lost in the field and respawns itself</sound>
+-------- ZBQRY SBE ENQVNAG BAYL - QB ABG FRG GUVF NF N XRL --------
+zbqry=&quot;zbqryf/pgs/enqvnag/synt_oyhr_enqvnag.zq3&quot;
+</point>
+
 <point name="item_health_big" color=".9 .3 .3" box="-30 -30 0 30 30 48">
 Big Health (default 50 health points)
 -------- KEYS --------
@@ -1057,11 +1083,6 @@ All path_corner entities of a train have to connect in a circular manner, while
 <real key="wait" name="wait">number of seconds func_train will pause on this path corner before moving to next path corner (default: 0.1; to not wait, set this to -1</real>
 </point>
 
-<point name="runematch_spawn_point" color=".3 .3 1" box="-16 -16 -16 16 16 16">
-Spawn point for runes in a runematch.
-Runematch can work without runes also, it then spawn runes at random safe locations.
-</point>
-
 <point name="target_assault_roundend" color="1 0 0" box="-8 -8 -8 8 8 8">
 This entity ends the current assault round if triggered or if the timelimit is reached.
 Ending a round means swapping attacker/defender teams, resetting objectives and rewarding the winning team.
@@ -1933,7 +1954,7 @@ Mage. Master of dark magic
 <target key="target" name="target">disable/enable all relays with this targetname when killed</target>
 <target key="target2" name="target2">follow this target</target>
 <targetname key="targetname" name="targetname">name that identifies this entity so it can be triggered</targetname>
-<integer key="team" name="team">5=red, 14=blue</integer>
+<integer key="team" name="team">5=red, 14=blue, 13=yellow, 10=pink</integer>
 -------- SPAWNFLAGS --------
 <flag key="MONSTERFLAG_MINIBOSS" name="MINIBOSS" bit="6">Spawn as mini-boss (slightly more powerful)</flag>
 <flag key="MONSTERFLAG_APPEAR" name="APPEAR" bit="1">Spawn when triggered</flag>
@@ -1955,7 +1976,7 @@ Shambler. Summons lightning bolts with its large meat cleaving claws
 <target key="target" name="target">disable/enable all relays with this targetname when killed</target>
 <target key="target2" name="target2">follow this target</target>
 <targetname key="targetname" name="targetname">name that identifies this entity so it can be triggered</targetname>
-<integer key="team" name="team">5=red, 14=blue</integer>
+<integer key="team" name="team">5=red, 14=blue, 13=yellow, 10=pink</integer>
 -------- SPAWNFLAGS --------
 <flag key="MONSTERFLAG_MINIBOSS" name="MINIBOSS" bit="6">Spawn as mini-boss (slightly more powerful)</flag>
 <flag key="MONSTERFLAG_APPEAR" name="APPEAR" bit="1">Spawn when triggered</flag>
@@ -1978,7 +1999,7 @@ Spider. Freezing ice or burning fire web, both lead to an 8-legged grave
 <target key="target" name="target">disable/enable all relays with this targetname when killed</target>
 <target key="target2" name="target2">follow this target</target>
 <targetname key="targetname" name="targetname">name that identifies this entity so it can be triggered</targetname>
-<integer key="team" name="team">5=red, 14=blue</integer>
+<integer key="team" name="team">5=red, 14=blue, 13=yellow, 10=pink</integer>
 -------- SPAWNFLAGS --------
 <flag key="MONSTERFLAG_MINIBOSS" name="MINIBOSS" bit="6">Spawn as mini-boss (slightly more powerful)</flag>
 <flag key="MONSTERFLAG_APPEAR" name="APPEAR" bit="1">Spawn when triggered</flag>
@@ -2000,7 +2021,7 @@ Wyvern. Flies around shooting fireballs
 <target key="target" name="target">disable/enable all relays with this targetname when killed</target>
 <target key="target2" name="target2">follow this target</target>
 <targetname key="targetname" name="targetname">name that identifies this entity so it can be triggered</targetname>
-<integer key="team" name="team">5=red, 14=blue</integer>
+<integer key="team" name="team">5=red, 14=blue, 13=yellow, 10=pink</integer>
 -------- SPAWNFLAGS --------
 <flag key="MONSTERFLAG_MINIBOSS" name="MINIBOSS" bit="6">Spawn as mini-boss (slightly more powerful)</flag>
 <flag key="MONSTERFLAG_APPEAR" name="APPEAR" bit="1">Spawn when triggered</flag>
@@ -2022,7 +2043,7 @@ Braaaiins!
 <target key="target" name="target">disable/enable all relays with this targetname when killed</target>
 <target key="target2" name="target2">follow this target</target>
 <targetname key="targetname" name="targetname">name that identifies this entity so it can be triggered</targetname>
-<integer key="team" name="team">5=red, 14=blue</integer>
+<integer key="team" name="team">5=red, 14=blue, 13=yellow, 10=pink</integer>
 -------- SPAWNFLAGS --------
 <flag key="MONSTERFLAG_MINIBOSS" name="MINIBOSS" bit="6">Spawn as mini-boss (slightly more powerful)</flag>
 <flag key="MONSTERFLAG_APPEAR" name="APPEAR" bit="1">Spawn when triggered</flag>
@@ -2343,7 +2364,7 @@ Fast firing moderate damage bullet (hitscan) turret.
 <real key="turret_scale_aim" name="turret_scale_aim">2 = aim twice as fast, 0,5 = aim at half speed</real>
 <real key="turret_scale_health" name="turret_scale_health">2 = double health, 0.5 = half</real>
 <target key="target" name="target">Defend the position of this entity</target>
-<integer key="team" name="team">5=red, 14=blue</integer>
+<integer key="team" name="team">5=red, 14=blue, 13=yellow, 10=pink</integer>
 -------- SPAWNFLAGS --------
 <flag key="PILLAR" name="PILLAR" bit="1">Adds a supporting pillar under this turret, for turrets on terrain/uneven surfaces. (only for visuals)</flag>
 -------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
@@ -2359,7 +2380,7 @@ model=&quot;../xonotic-data.pk3dir/models/turrets/radiant/mg.md3&quot;
 <real key="turret_scale_aim" name="turret_scale_aim">2 = aim twice as fast, 0,5 = aim at half speed</real>
 <real key="turret_scale_health" name="turret_scale_health">2 = double health, 0.5 = half</real>
 <target key="target" name="target">Defend the position of this entity</target>
-<integer key="team" name="team">5=red, 14=blue</integer>
+<integer key="team" name="team">5=red, 14=blue, 13=yellow, 10=pink</integer>
 -------- SPAWNFLAGS --------
 <flag key="PILLAR" name="PILLAR" bit="1">Adds a supporting pillar under this turret, for turrets on terrain/uneven surfaces. (only for visuals)</flag>
 ---------NOTES----------
@@ -2378,7 +2399,7 @@ basic energy cannon * 2
 <real key="turret_scale_aim" name="turret_scale_aim">2 = aim twice as fast, 0,5 = aim at half speed</real>
 <real key="turret_scale_health" name="turret_scale_health">2 = double health, 0.5 = half</real>
 <target key="target" name="target">Defend the position of this entity</target>
-<integer key="team" name="team">5=red, 14=blue</integer>
+<integer key="team" name="team">5=red, 14=blue, 13=yellow, 10=pink</integer>
 -------- SPAWNFLAGS --------
 <flag key="PILLAR" name="PILLAR" bit="1">Adds a supporting pillar under this turret, for turrets on terrain/uneven surfaces. (only for visuals)</flag>
 -------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
@@ -2395,7 +2416,7 @@ Only kills missiles, rockets, grenadelauncher &amp; electro secondaries to be pr
 <real key="turret_scale_aim" name="turret_scale_aim">2 = aim twice as fast, 0,5 = aim at half speed</real>
 <real key="turret_scale_health" name="turret_scale_health">2 = double health, 0.5 = half</real>
 <target key="target" name="target">Defend the position of this entity</target>
-<integer key="team" name="team">5=red, 14=blue</integer>
+<integer key="team" name="team">5=red, 14=blue, 13=yellow, 10=pink</integer>
 -------- SPAWNFLAGS --------
 <flag key="PILLAR" name="PILLAR" bit="1">Adds a supporting pillar under this turret, for turrets on terrain/uneven surfaces. (only for visuals)</flag>
 -------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
@@ -2412,7 +2433,7 @@ model=&quot;../xonotic-data.pk3dir/models/turrets/radiant/flac.md3&quot;
 <real key="turret_scale_aim" name="turret_scale_aim">2 = aim twice as fast, 0,5 = aim at half speed</real>
 <real key="turret_scale_health" name="turret_scale_health">2 = double health, 0.5 = half</real>
 <target key="target" name="target">Defend the position of this entity</target>
-<integer key="team" name="team">5=red, 14=blue</integer>
+<integer key="team" name="team">5=red, 14=blue, 13=yellow, 10=pink</integer>
 -------- SPAWNFLAGS --------
 <flag key="PILLAR" name="PILLAR" bit="1">Adds a supporting pillar under this turret, for turrets on terrain/uneven surfaces. (only for visuals)</flag>
 -------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
@@ -2429,7 +2450,7 @@ model=&quot;../xonotic-data.pk3dir/models/turrets/radiant/mlrs.md3&quot;
 <real key="turret_scale_aim" name="turret_scale_aim">2 = aim twice as fast, 0,5 = aim at half speed</real>
 <real key="turret_scale_health" name="turret_scale_health">2 = double health, 0.5 = half</real>
 <target key="target" name="target">Defend the position of this entity</target>
-<integer key="team" name="team">5=red, 14=blue</integer>
+<integer key="team" name="team">5=red, 14=blue, 13=yellow, 10=pink</integer>
 -------- SPAWNFLAGS --------
 <flag key="PILLAR" name="PILLAR" bit="1">Adds a supporting pillar under this turret, for turrets on terrain/uneven surfaces. (only for visuals)</flag>
 -------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
@@ -2447,7 +2468,7 @@ Single powerful rocket with the ability to evade obstacles to find its target. V
 <real key="turret_scale_aim" name="turret_scale_aim">2 = aim twice as fast, 0,5 = aim at half speed</real>
 <real key="turret_scale_health" name="turret_scale_health">2 = double health, 0.5 = half</real>
 <target key="target" name="target">Defend the position of this entity</target>
-<integer key="team" name="team">5=red, 14=blue</integer>
+<integer key="team" name="team">5=red, 14=blue, 13=yellow, 10=pink</integer>
 -------- SPAWNFLAGS --------
 <flag key="PILLAR" name="PILLAR" bit="1">Adds a supporting pillar under this turret, for turrets on terrain/uneven surfaces. (only for visuals)</flag>
 -------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
@@ -2464,7 +2485,7 @@ Fires a lightning bolt that will jump to up to 10 targets if they are close enou
 <real key="turret_scale_aim" name="turret_scale_aim">2 = aim twice as fast, 0,5 = aim at half speed</real>
 <real key="turret_scale_health" name="turret_scale_health">2 = double health, 0.5 = half</real>
 <target key="target" name="target">Defend the position of this entity</target>
-<integer key="team" name="team">5=red, 14=blue</integer>
+<integer key="team" name="team">5=red, 14=blue, 13=yellow, 10=pink</integer>
 -------- SPAWNFLAGS --------
 <flag key="PILLAR" name="PILLAR" bit="1">Adds a supporting pillar under this turret, for turrets on terrain/uneven surfaces. (only for visuals)</flag>
 -------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
@@ -2481,7 +2502,7 @@ Constant beam weapon that will considerably slow its target down while dealing l
 <real key="turret_scale_aim" name="turret_scale_aim">2 = aim twice as fast, 0,5 = aim at half speed</real>
 <real key="turret_scale_health" name="turret_scale_health">2 = double health, 0.5 = half</real>
 <target key="target" name="target">Defend the position of this entity</target>
-<integer key="team" name="team">5=red, 14=blue</integer>
+<integer key="team" name="team">5=red, 14=blue, 13=yellow, 10=pink</integer>
 -------- SPAWNFLAGS --------
 <flag key="PILLAR" name="PILLAR" bit="1">Adds a supporting pillar under this turret, for turrets on terrain/uneven surfaces. (only for visuals)</flag>
 -------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
@@ -2497,7 +2518,7 @@ model=&quot;../xonotic-data.pk3dir/models/turrets/radiant/phaser.md3&quot;
 <real key="turret_scale_ammo" name="turret_scale_ammo">2 = double ammo carry &amp; regen, 0.5 = half ammo carry &amp; regen</real>
 <real key="turret_scale_aim" name="turret_scale_aim">2 = aim twice as fast, 0,5 = aim at half speed</real>
 <real key="turret_scale_health" name="turret_scale_health">2 = double health, 0.5 = half</real>
-<integer key="team" name="team">5=red, 14=blue</integer>
+<integer key="team" name="team">5=red, 14=blue, 13=yellow, 10=pink</integer>
 -------- SPAWNFLAGS --------
 <flag key="PILLAR" name="PILLAR" bit="1">Adds a supporting pillar under this turret, for turrets on terrain/uneven surfaces. (only for visuals)</flag>
 ---------NOTES----------
@@ -2519,7 +2540,7 @@ Used to feed turrets capable of it with remote target info. currently only turre
 <real key="turret_scale_ammo" name="turret_scale_ammo">2 = doubble ammo carry &amp; regen, 0.5 = half ammo carry &amp; regen</real>
 <real key="turret_scale_aim" name="turret_scale_aim">2 = aim twice as fast, 0,5 = aim at half speed</real>
 <real key="turret_scale_health" name="turret_scale_health">2 = double health, 0.5 = half</real>
-<integer key="team" name="team">5=red, 14=blue</integer>
+<integer key="team" name="team">5=red, 14=blue, 13=yellow, 10=pink</integer>
 -----------SPAWNFLAGS-----------
 ---------NOTES----------
 
@@ -2538,7 +2559,7 @@ model=&quot;../xonotic-data.pk3dir/models/turrets/radiant/walker.md3&quot;
 <real key="turret_scale_ammo" name="turret_scale_ammo">2 = doubble ammo carry &amp; regen, 0.5 = half ammo carry &amp; regen</real>
 <real key="turret_scale_aim" name="turret_scale_aim">2 = aim twice as fast, 0,5 = aim at half speed</real>
 <real key="turret_scale_health" name="turret_scale_health">2 = double health, 0.5 = half</real>
-<integer key="team" name="team">5=red, 14=blue</integer>
+<integer key="team" name="team">5=red, 14=blue, 13=yellow, 10=pink</integer>
 -----------SPAWNFLAGS-----------
 ---------NOTES----------
 
@@ -2563,7 +2584,7 @@ If the checkpoint chain in not looped, the unit will go &quot;Roaming&quot; when
 Fast moving hover type vehicle, with low shield &amp; health.
 Primary weapon is a rapid fire energy cannon, secondary lockable rockets.
 -------- KEYS --------
-<integer key="team" name="team">5=red, 14=blue</integer>
+<integer key="team" name="team">5=red, 14=blue, 13=yellow, 10=pink</integer>
 -------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
 model=&quot;models/vehicles-static/wakazachi.md3&quot;
 </point>
@@ -2572,7 +2593,7 @@ model=&quot;models/vehicles-static/wakazachi.md3&quot;
 A slow moving 6 legged mech type vehicle that has plenty of health and shield.
 Primary weapon is twin miniguns, secondary eight rockets that can be guided by the pilot.
 -------- KEYS --------
-<integer key="team" name="team">5=red, 14=blue</integer>
+<integer key="team" name="team">5=red, 14=blue, 13=yellow, 10=pink</integer>
 -------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
 model=&quot;models/vehicles-static/spiderbot.md3&quot;
 </point>
@@ -2582,8 +2603,16 @@ The raptor is primarily an air to ground fighter, it's quite lightly armored or
 Its main weapon is four rapid fire energy cannons, wich can be locked to track a target by aming at it for some time.
 Secondary is a pair of very powerful clusterbombs.
 -------- KEYS --------
-<integer key="team" name="team">5=red, 14=blue</integer>
+<integer key="team" name="team">5=red, 14=blue, 13=yellow, 10=pink</integer>
 -------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
 model=&quot;models/vehicles-static/raptor.md3&quot;
 </point>
+
+<point name="vehicle_bumblebee" color="0 0 1" box="-48 -48 0 48 48 32">
+The bumblebee is a slow flying healer with 2 gunner slots.
+Its main weapon is a healing ray that can heal teammates and their vehicles.
+Secondary matches primary, but the vehicle can hold 2 extra players who act as gunners with the side cannons.
+-------- KEYS --------
+<integer key="team" name="team">5=red, 14=blue, 13=yellow, 10=pink</integer>
+</point>
 </classes>