diff --git a/src/mapdef/mapdef.txt b/src/mapdef/mapdef.txt
index 889feeefde60632f2a317c1a5f5c9d9734a0a8de..25590ccea4300b8235e42114951f07e8e9f39beb 100644 (file)
--- a/src/mapdef/mapdef.txt
+++ b/src/mapdef/mapdef.txt
"keys" type ubyte offset 19 bitset Key default KEY_NONE;
//WARNING: "trigdata" MUST be defined before "type", and "type" MUST be named "type" (for now, can be changed later)
"triggerdata" type trigdata[128] offset 20; // the only special nested structure
+ //DO NOT USE! experimental feature! will be removed!
+ "exoma_init" type string default "" tip "will be called on trigger creation";
+ "exoma_think" type string default "" tip "will be called on each think step";
+ "exoma_check" type string default "" tip "will be called before activation";
+ "exoma_action" type string default "" tip "will be called on activation";
}
enum DirType {
DIR_LEFT, // 0
DIR_RIGHT, // 1
- DIR_SOMETHING2, // 2
+ DIR_PRESERVE, // 2
+ DIR_REVERSE, // 3
}
// triggers
EFFECT_FIRE, // 3
}
+//WARNING! max allowed items types is 127
enum Item {
ITEM_NONE, // 0
ITEM_MEDKIT_SMALL, // 1
ITEM_WEAPON_ROCKETLAUNCHER, // 15
ITEM_WEAPON_PLASMA, // 16
ITEM_WEAPON_BFG, // 17
- ITEM_WEAPON_SUPERPULEMET, // 18
+ ITEM_WEAPON_SUPERCHAINGUN, // 18
ITEM_AMMO_BULLETS, // 19
ITEM_AMMO_BULLETS_BOX, // 20
ITEM_AMMO_SHELLS, // 21
ITEM_KEY_RED, // 28
ITEM_KEY_GREEN, // 29
ITEM_KEY_BLUE, // 30
- ITEM_WEAPON_KASTET, // 31
+ ITEM_WEAPON_IRONFIST, // 31
ITEM_WEAPON_PISTOL, // 32
ITEM_BOTTLE, // 33
ITEM_HELMET, // 34
ITEM_INVIS, // 36
ITEM_WEAPON_FLAMETHROWER, // 37
ITEM_AMMO_FUELCAN, // 38
+ // backward compatibility aliases
+ ITEM_WEAPON_SUPERPULEMET = 18, // ITEM_WEAPON_SUPERCHAINGUN
//
ITEM_MAX = MAX, // store the last item's id in here use this in for loops
}
TRIGGER_SHOT_BFG, // 12
TRIGGER_SHOT_EXPL, // 13
TRIGGER_SHOT_BFGEXPL, // 14
+ TRIGGER_SHOT_FLAME, // 15
//
TRIGGER_SHOT_MAX = MAX,
}
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
TriggerData for TRIGGER_DAMAGE {
"amount" type ushort offset 0 writedefault;
"interval" type ushort offset 2 writedefault;
+ "kind" type ubyte offset 4 enum HitType default HIT_SOME writedefault;
}
TriggerData for TRIGGER_HEALTH {
"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;