From: Freddy <schro.sb@gmail.com>
Date: Mon, 12 Mar 2018 15:03:20 +0000 (+0100)
Subject: improve trigger_heal description, add target_heal
X-Git-Tag: xonotic-v0.8.5~120^2~6
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=6b609484c4af0e5a064f87595675808e2ac67643;p=xonotic%2Fxonotic-maps.pk3dir.git

improve trigger_heal description, add target_heal
---

diff --git a/scripts/entities.ent b/scripts/entities.ent
index 638c2c01..c3c83d16 100644
--- a/scripts/entities.ent
+++ b/scripts/entities.ent
@@ -1923,11 +1923,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 +2381,8 @@ trigger_heal
 trigger_impulse
 trigger_push
 trigger_teleport
+target_heal
+target_kill
 func_rotating
 func_bobbing
 func_button
@@ -2390,6 +2406,8 @@ trigger_heal
 trigger_impulse
 trigger_push
 trigger_teleport
+target_heal
+target_kill
 func_rotating
 func_bobbing
 func_button
@@ -2413,6 +2431,8 @@ trigger_heal
 trigger_impulse
 trigger_push
 trigger_teleport
+target_heal
+target_kill
 func_rotating
 func_bobbing
 func_button