From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 29 Dec 2011 22:15:21 +0000 (+0100)
Subject: document conveyor changes
X-Git-Tag: xonotic-v0.6.0~37^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9e1249a93e9229051b71f9b01864f71a71d095b8;p=xonotic%2Fxonotic-maps.pk3dir.git

document conveyor changes
---

diff --git a/scripts/entities.def b/scripts/entities.def
index 4980cc4b..be1dc9fc 100644
--- a/scripts/entities.def
+++ b/scripts/entities.def
@@ -130,11 +130,21 @@ NOSPLASH: if set, splash damage cannot activate the door, only direct damage can
 */
 
 /*QUAKED func_conveyor (0 .5 .8) ? START_ON
-A conveyor.
+A conveyor. Solid brush version.
 -------- KEYS --------
 targetname: if set, it can be turned on/off
 angle: determines the opening direction
-speed: movement speed (200 default, must be above or equal sv_stopspeed)
+speed: movement speed (200 default)
+-------- SPAWNFLAGS --------
+START_ON: the conveyor is turned on if not triggered
+*/
+
+/*QUAKED trigger_conveyor (0 .5 .8) ? START_ON
+A conveyor. Nonsolid trigger version.
+-------- KEYS --------
+targetname: if set, it can be turned on/off
+angle: determines the opening direction
+speed: movement speed (200 default)
 -------- SPAWNFLAGS --------
 START_ON: the conveyor is turned on if not triggered
 */
diff --git a/scripts/entities.ent b/scripts/entities.ent
index 810a0f6e..45f87cb8 100644
--- a/scripts/entities.ent
+++ b/scripts/entities.ent
@@ -132,11 +132,21 @@ When a button is touched by a player, it moves in the direction set by the &quot
 </group>
 
 <group name="func_conveyor" color="0 .5 .8">
-A conveyor.
+A conveyor. Solid brush version.
 -------- KEYS --------
 <targetname key="targetname" name="targetname">if set, it can be turned on/off</targetname>
 <direction key="angle" name="angle">determines the opening direction</direction>
-<real key="speed" name="speed">movement speed (200 default, must be above or equal sv_stopspeed)</real>
+<real key="speed" name="speed">movement speed (200 default)</real>
+-------- SPAWNFLAGS --------
+<flag key="START_ON" name="START_ON" bit="0">the conveyor is turned on if not triggered</flag>
+</group>
+
+<group name="trigger_conveyor" color="0 .5 .8">
+A conveyor. Nonsolid trigger version.
+-------- KEYS --------
+<targetname key="targetname" name="targetname">if set, it can be turned on/off</targetname>
+<direction key="angle" name="angle">determines the opening direction</direction>
+<real key="speed" name="speed">movement speed (200 default)</real>
 -------- SPAWNFLAGS --------
 <flag key="START_ON" name="START_ON" bit="0">the conveyor is turned on if not triggered</flag>
 </group>