Fix invisible ledge

[xonotic/xonotic-maps.pk3dir.git] / scripts / entities.ent

diff --git a/scripts/entities.ent b/scripts/entities.ent
index 0827c12e148b8d8d59db16c58498ae1f8a359a8a..bb7bbdb0f785e0e24236f467503ffeb5d3d11973 100644 (file)
--- a/scripts/entities.ent
+++ b/scripts/entities.ent
@@ -130,6 +130,7 @@ When a button is touched by a player, it moves in the direction set by the &quot
 <real key="health" name="health">(default 0) if set to any non-zero value, the button must take damage (any amount) to activate.</real>
 -------- SPAWNFLAGS --------
 <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>
+<flag key="DONTACCUMULATEDMG" name="DONTACCUMULATEDMG" bit="7">if set, all the damage needs to be done in one hit (requires health to be set)</flag>
 </group>
 
 <group name="func_conveyor" color="0 .5 .8">
@@ -433,6 +434,12 @@ Pink team's player spawning location, but there is no game mode to use this yet.
 <real key="restriction" name="restriction">when 1, only bots can spawn here; when 2, only humans can spawn here (be careful with these, or the game will crash because someone cannot spawn)</real>
 </point>
 
+<point name="target_spawnpoint" color=".5 .5 .5" box="-16 -16 -24 16 16 45">
+Acts as a checkpoint to re-spawn at
+-------- KEYS --------
+<targetname key="targetname" name="targetname">when targeted, this will set the activator's spawn point temporarily to this entity. It is reset upon re-spawn.</targetname>
+</point>
+
 <point name="item_armor_mega" color=".4 .8 .4" box="-30 -30 0 30 30 32">
 Large Armor (default 100 armor points)
 -------- KEYS --------
@@ -1609,6 +1616,29 @@ Triggers once when the game starts, then no longer does anything.
 <real key="wait" name="wait">wait so many seconds before triggering</real>
 </point>
 
+<group name="trigger_viewlocation" color=".5 .5 .5" box="-8 -8 -8 8 8 8">
+A brush that when entered changes the player's view to a position between target and target2, useful for side-scrolling stages
+-------- KEYS --------
+<target key="target" name="target">should point to a target_viewlocation_start entity</target>
+<target key="target2" name="target">should point to a target_viewlocation_end entity</target>
+-------- SPAWNFLAGS --------
+<flag key="NOSIDESCROLL" name="NOSIDESCROLL" bit="0">allow regular aiming and movement while forcing the camera between the viewlocation points</flag>
+<flag key="FREEAIM" name="FREEAIM" bit="1">show a crosshair on screen and allow 2d aiming instead of only forward</flag>
+<flag key="FREEMOVE" name="FREEMOVE" bit="2">allow moving up and down as well in side-scrolling mode, useful for brawlers</flag>
+</group>
+
+<point name="target_viewlocation_start" color="0 .5 0" box="-8 -8 -8 8 8 8">
+Starting position for the area of viewing in a view location area, viewing position is bounded between this and a target_viewlocation_end
+-------- KEYS --------
+<targetname key="targetname" name="targetname">the trigger_viewlocation should point its target to this.</targetname>
+</point>
+
+<point name="target_viewlocation_end" color="0 .5 0" box="-8 -8 -8 8 8 8">
+Ending position for the view location area, should be higher up but on the same plane as the target_viewlocation_start           
+-------- KEYS --------
+<targetname key="targetname" name="targetname">the trigger_viewlocation should point its target2 to this.</targetname>
+</point>
+
 <point name="misc_follow" color=".5 .5 .5" box="-8 -8 -8 8 8 8">
 Makes one entity follow another. Will not work with all entities.
 -------- KEYS --------