X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=blobdiff_plain;f=scripts%2Fentities.ent;h=3d1afe381e482fa8c671b3d0a2f8deb0d5dd627f;hp=638c2c01d8a55feb0e506a8154939140b61efddf;hb=169e5c98b3c87996dfeb653f28274480e79806d6;hpb=07a18a6d360f1e9b4e34bba1989da5ad8a55444a

diff --git a/scripts/entities.ent b/scripts/entities.ent
index 638c2c01..3d1afe38 100644
--- a/scripts/entities.ent
+++ b/scripts/entities.ent
@@ -805,7 +805,7 @@ Laser beam emitter. Note that for the laser to be deadly, it has to start OUTSID
 <color key="beam_color" name="beam_color">color of the laser beam (default: red, that is, 1 0 0)</color>
 <real key="dmg" name="dmg">damage inflicted by the beam per second, or -1 for an instant-death ray</real>
 <targetname key="targetname" name="targetname">name to target this (then its state is toggled)</targetname>
-<real key="alpha" name="alpha">when set, makes a dark laser of the given strength; may be combined with colormod</real>
+<real key="alpha" name="alpha">when set, makes a dark laser of the given strength; may be combined with beam_color</real>
 <real key="scale" name="scale">scales the beam thickness (default 1)</real>
 <real key="modelscale" name="modelscale">scales the dynamic light radius at the endpoint (default 1, -1 to turn off)</real>
 <integer key="team" name="team">team that gets hurt (5 = red, 14 = blue, etc) (when set, only this team can get hurt)</integer>
@@ -1202,6 +1202,8 @@ Can be used in two ways:
 <target key="target" name="target">&quot;wind field&quot;: points to the target_position to which the player will get pushed.</target>
 <real key="strength" name="strength">&quot;wind field&quot;, &quot;gravity field&quot;: amount of force per second to apply. &quot;dampener/accelerator field&quot;: slowdown/speedup factor.</real>
 <real key="falloff" name="falloff">&quot;gravity field&quot;: 0 means no falloff, 1 means linear falloff (zero at the outside), 2 means inverted linear falloff (zero at the inside)</real>
+-------- SPAWNFLAGS --------
+<flag key="DIRECTIONAL_SPEEDTARGET" name="DIRECTIONAL_SPEEDTARGET" bit="6">treat strength as a target value for speed in the desired direction (directional mode only)</flag>
 </group>
 
 <group name="trigger_keylock" color=".0 .5 .8">
@@ -1923,11 +1925,25 @@ modeldisabled=&quot;models/weapons/g_hookgun.md3&quot;
 <group name="trigger_heal" color=".5 .5 .5">
 Any object touching this will be healed.
 -------- KEYS --------
-<real key="health" name="health">health to give per second (default 10)</real>
+<real key="health" name="health">health to give per heal (default 10)</real>
 <real key="max_health" name="max_health">max health this trigger will give (default 200)</real>
+<real key="delay" name="delay">delay between the heals in seconds (default 1)</real>
 <sound key="noise" name="noise">sound file to play (use misc/null.wav to make it silent), default = item_health_medium sound</sound>
+-------- SPAWNFLAGS --------
+<flag key="SOUND_ALWAYS" name="SOUND_ALWAYS" bit="2">play the sound even if the player is fully healed</flag>
 </group>
 
+<point name="target_heal" color=".5 .5 .5">
+Target version of trigger_heal. Heals the activator.
+-------- KEYS --------
+<real key="health" name="health">health to give per heal (default 10)</real>
+<real key="max_health" name="max_health">max health this target will give (default 200)</real>
+<real key="delay" name="delay">delay between the heals in seconds (default 1)</real>
+<sound key="noise" name="noise">sound file to play (use misc/null.wav to make it silent), default = item_health_medium sound</sound>
+-------- SPAWNFLAGS --------
+<flag key="SOUND_ALWAYS" name="SOUND_ALWAYS" bit="2">play the sound even if the player is fully healed</flag>
+</point>
+
 <point name="weapon_rifle" color="1 0 .5" box="-30 -30 0 30 30 32">
 the Sniper Rifle.
 -------- KEYS --------
@@ -2367,6 +2383,8 @@ trigger_heal
 trigger_impulse
 trigger_push
 trigger_teleport
+target_heal
+target_kill
 func_rotating
 func_bobbing
 func_button
@@ -2390,6 +2408,8 @@ trigger_heal
 trigger_impulse
 trigger_push
 trigger_teleport
+target_heal
+target_kill
 func_rotating
 func_bobbing
 func_button
@@ -2413,6 +2433,8 @@ trigger_heal
 trigger_impulse
 trigger_push
 trigger_teleport
+target_heal
+target_kill
 func_rotating
 func_bobbing
 func_button