X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=scripts%2Fentities.ent;h=638c2c01d8a55feb0e506a8154939140b61efddf;hb=07a18a6d360f1e9b4e34bba1989da5ad8a55444a;hp=36c164c89b375ee3f258e21f19eb8b645843ef20;hpb=82d7822174abd90c2f5352da8f68a8cd37702c6e;p=xonotic%2Fxonotic-maps.pk3dir.git

diff --git a/scripts/entities.ent b/scripts/entities.ent
index 36c164c8..638c2c01 100644
--- a/scripts/entities.ent
+++ b/scripts/entities.ent
@@ -1141,7 +1141,6 @@ The sound name may also be of the form *soundname, and in that case the respecti
 -------- SPAWNFLAGS --------
 <flag key="LOOPED_ON" name="LOOPED_ON" bit="0">the sound is looped and initially plays (the sound file MUST have the LOOP_START vorbis comment then!). It can be toggled by a trigger.</flag>
 <flag key="LOOPED_OFF" name="LOOPED_OFF" bit="1">the sound is looped and initially does not play (the sound file MUST have the LOOP_START vorbis comment then!). It can be toggled by a trigger.</flag>
-<flag key="GLOBAL" name="GLOBAL" bit="2">the sound plays with no attenuation (same as setting atten to -1)</flag>
 <flag key="ACTIVATOR" name="ACTIVATOR" bit="3">the sound is played to the activator only when triggered (cannot be combined with LOOPED_ON and LOOPED_OFF)</flag>
 </point>
 
@@ -1156,7 +1155,7 @@ Monster spawnpoint for Invasion
 
 <group name="trigger_counter" color=".5 .5 .5">
 Acts as an intermediary for an action that takes multiple inputs.
-After the counter has been triggered &quot;count&quot; times, it will fire all of its targets and remove itself.
+After the counter has been triggered &quot;count&quot; times, it will fire all of its targets.
 -------- KEYS --------
 <real key="count" name="count">how many times this needs to be triggered to activate its targets</real>
 <target key="target" name="target">trigger all entities with this targetname when triggered</target>
@@ -1166,6 +1165,7 @@ After the counter has been triggered &quot;count&quot; times, it will fire all o
 <target key="killtarget" name="killtarget">remove all entities with this targetname when triggered</target>
 -------- SPAWNFLAGS --------
 <flag key="NOMESSAGE" name="NOMESSAGE" bit="0">don't print a &quot;2 more to go...&quot;-like message when triggered</flag>
+<flag key="FIRE_AT_COUNT" name="FIRE_AT_COUNT" bit="2">fire at every count (behaves like trigger_multiple with limited shots)</flag>
 </group>
 
 <point name="trigger_delay" color=".5 .5 .5" box="-8 -8 -8 8 8 8">
@@ -2349,18 +2349,19 @@ When triggered, its effect is turned off until triggered again.
 An area where gravity differs from the rest of the map.
 This acts as a modifier over the normal gravity (sv_gravity). e.g.: 0.5 is half the normal gravity, 2 is twice the normal gravity.
 -------- KEYS --------
-<real key="gravity" name="gravity">gravity offset in this area, defaults to 0 if not set</real>
+<real key="gravity" name="gravity">gravity multiplier in this area, defaults to 0 if not set</real>
 <sound key="noise" name="noise">sound to play when an entity enters the gravity zone, leave empty to disable</sound>
-<targetname key="targetname" name="targetname">you can use this to target the gravity zone with a trigger, which will toggle it when activated</targetname>
+<targetname key="targetname" name="targetname">you can use this to target the gravity zone with a relay to (de)activate the gravity multiplier</targetname>
 -------- SPAWNFLAGS --------
 <flag key="STICKY" name="STICKY" bit="0">entities keep their gravity after leaving the gravity zone</flag>
-<flag key="START_OFF" name="START_OFF" bit="1">when targeted, the gravity zone starts off and is enabled upon triggering</flag>
+<flag key="START_OFF" name="START_OFF" bit="1">when targeted, the gravity zone starts disabled</flag>
 </group>
 
 <point name="relay_activate" color="0 1 0" box="-8 -8 -8 8 8 8">
 Activates all targets
 List of currently supported target ents:
 trigger_conveyor
+trigger_gravity
 trigger_hurt
 trigger_heal
 trigger_impulse
@@ -2383,6 +2384,7 @@ misc_laser
 Deactivates all targets
 List of currently supported target ents:
 trigger_conveyor
+trigger_gravity
 trigger_hurt
 trigger_heal
 trigger_impulse
@@ -2405,6 +2407,7 @@ misc_laser
 Toggles all targets de/active
 List of currently supported target ents:
 trigger_conveyor
+trigger_gravity
 trigger_hurt
 trigger_heal
 trigger_impulse