X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fmapdef%2Fmapdef.txt;h=91453e0f7128fa452c7c08bc0f6aeb0c3cbc8eac;hb=9783b17e63c73acf68388c661a34accccd9a1d7a;hp=afa87222a21dd5c5312a1f45f26f2be0cc0c435b;hpb=dd969f579db2bf70f6ddfcb5d377b2b95b994a6e;p=d2df-sdl.git diff --git a/src/mapdef/mapdef.txt b/src/mapdef/mapdef.txt index afa8722..91453e0 100644 --- a/src/mapdef/mapdef.txt +++ b/src/mapdef/mapdef.txt @@ -175,6 +175,7 @@ enum EffectAction { EFFECT_FIRE, // 3 } +//WARNING! max allowed items types is 127 enum Item { ITEM_NONE, // 0 ITEM_MEDKIT_SMALL, // 1 @@ -288,6 +289,7 @@ enum TriggerShot { TRIGGER_SHOT_BFG, // 12 TRIGGER_SHOT_EXPL, // 13 TRIGGER_SHOT_BFGEXPL, // 14 + TRIGGER_SHOT_FLAME, // 15 // TRIGGER_SHOT_MAX = MAX, } @@ -375,6 +377,20 @@ bitset Key { KEY_BLUETEAM, // 16 } +enum HitType { + HIT_SOME, // 0 + HIT_ROCKET, // 1 + HIT_BFG, // 2 + HIT_TRAP, // 3 + HIT_FALL, // 4 + HIT_WATER, // 5 + HIT_ACID, // 6 + HIT_ELECTRO, // 7 + HIT_FLAME, // 8 + HIT_SELF, // 9 + HIT_DISCON, // 10 +} + //////////////////////////////////////////////////////////////////////////////// // various triggers @@ -498,7 +514,7 @@ TriggerData for TRIGGER_SHOT { "position" type point offset 0 as txy writedefault; "type" alias shotType type ubyte offset 8 enum TriggerShot writedefault; "target" alias shotTarget type ubyte offset 9 enum TriggerShotTarget writedefault; - "quiet" type negbool offset 10; // negbool! + "sound" alias shotSound type negbool offset 10; // negbool! "aim" type byte offset 11 enum TriggerShotAim default TRIGGER_SHOT_AIM_DEFAULT; "panelid" type int offset 12 panel default null writedefault; "sight" type ushort offset 16;