From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 6 Dec 2010 11:37:47 +0000 (+0100)
Subject: update to xonotic-data
X-Git-Tag: xonotic-v0.1.0preview~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fa6e459682be8157ff4d37b5640e0196df5d74cd;p=xonotic%2Fxonotic-maps.pk3dir.git

update to xonotic-data
---

diff --git a/scripts/entities.def b/scripts/entities.def
index 7abe5494..76e9d249 100644
--- a/scripts/entities.def
+++ b/scripts/entities.def
@@ -1036,7 +1036,7 @@ strength: "wind field", "gravity field": amount of force per second to apply. "d
 falloff: "gravity field": 0 means no falloff, 1 means linear falloff (zero at the outside), 2 means inverted linear falloff (zero at the inside)
 */
 
-/*QUAKED trigger_multiple (.5 .5 .5) ? NOTOUCH ALLENTS - - - - - - NOSPLASH
+/*QUAKED trigger_multiple (.5 .5 .5) ? NOTOUCH ALLENTS INVERT_TEAM - - - - - NOSPLASH
 Variable sized repeatable trigger.  Must be targeted at one or more entities.  If "health" is set, the trigger must be killed to activate each time.
 -------- KEYS --------
 health: amount of damage that has to be dealt to the trigger to activate (it then won't respond to merely touching it)
@@ -1051,9 +1051,11 @@ targetname: name that identifies this entity so it can be triggered
 delay: delay the triggering by the given time
 message: print this message to the player who activated the trigger
 killtarget: remove all entities with this targetname when triggered
+team: team that owns this trigger (5 = red, 14 = blue, etc) (when set, only this team can trigger)
 -------- SPAWNFLAGS --------
 NOTOUCH: the trigger can only be triggered by other entities, not by touching or firing (you should probably use trigger_relay or trigger_delay instead)
 ALLENTS: the trigger responds to all entities, not just players (useful for targetting trigger_items)
+INVERT_TEAM: the team that owns the trigger will NOT trigger when touching this
 NOSPLASH: if set, splash damage cannot activate the door, only direct damage can (requires health to be set)
 */
 
diff --git a/scripts/entities.ent b/scripts/entities.ent
index d340a49c..0bdb7300 100644
--- a/scripts/entities.ent
+++ b/scripts/entities.ent
@@ -1053,9 +1053,11 @@ Variable sized repeatable trigger.  Must be targeted at one or more entities.  I
 <real key="delay" name="delay">delay the triggering by the given time</real>
 <string key="message" name="message">print this message to the player who activated the trigger</string>
 <target key="killtarget" name="killtarget">remove all entities with this targetname when triggered</target>
+<real key="team" name="team">team that owns this trigger (5 = red, 14 = blue, etc) (when set, only this team can trigger)</real>
 -------- SPAWNFLAGS --------
 <flag key="NOTOUCH" name="NOTOUCH" bit="0">the trigger can only be triggered by other entities, not by touching or firing (you should probably use trigger_relay or trigger_delay instead)</flag>
 <flag key="ALLENTS" name="ALLENTS" bit="1">the trigger responds to all entities, not just players (useful for targetting trigger_items)</flag>
+<flag key="INVERT_TEAM" name="INVERT_TEAM" bit="2">the team that owns the trigger will NOT trigger when touching this</flag>
 <flag key="NOSPLASH" name="NOSPLASH" bit="8">if set, splash damage cannot activate the door, only direct damage can (requires health to be set)</flag>
 </group>