[ViewVC] Diff of: cvs/deliantra/Deliantra/Deliantra/Data.pm

Comparing deliantra/Deliantra/Deliantra/Data.pm (file contents):
Revision 1.13 by root, Thu Mar 16 22:16:06 2006 UTC vs.
Revision 1.14 by root, Mon Mar 20 03:31:45 2006 UTC

     9 => 'Liquid',
     10 => 'Soft Metal',
     11 => 'Bone',
     12 => 'Ice',
     13 => '(supress name on display)'
+  },
+  movement_type => {
+    0 => 'Walk',
+    1 => 'Fly Low',
+    2 => 'Fly High',
+    3 => 'Swim',
+    4 => 'Boat'
   },
   pick_up => {
     0 => 'Nothing',
     1 => 'Wealth',
     2 => 'Food',
 	  type => 'fixed',
 	  value => 1
 	}
       ],
       [
-	'walk_on',
+	'move_on',
 	{
+	  desc => 'Which movement types automatically (as opposed to manually) activate this object.',
+	  name => 'movement type',
-	  type => 'fixed',
+	  type => 'bitmask',
-	  value => 1
+	  value => $BITMASK{movement_type}
 	}
       ],
       [
 	'slaying',
 	{
 	  name => 'ignore reset',
 	  type => 'bool'
 	}
       ],
       [
-	'walk_on',
+	'move_on',
 	{
+	  desc => 'Which movement types automatically (as opposed to manually) activate this object.',
+	  name => 'movement type',
-	  type => 'fixed',
+	  type => 'bitmask',
-	  value => 1
+	  value => $BITMASK{movement_type}
 	}
       ],
       [
 	'msg',
 	{
 	      name => 'reflect missiles',
 	      type => 'bool'
 	    }
 	  ],
 	  [
-	    'flying',
+	    'move_type',
 	    {
-	      desc => 'As soon as the player applies a piece of equipment with <levitate> set, the player will start to float in the air.',
+	      desc => 'Determines which kinds of movement this object can use (e.g. for monsters) or grants (e.g. for amulets).',
-	      name => 'levitate',
+	      name => 'movement type',
-	      type => 'bool'
+	      type => 'bitmask',
+	      value => $BITMASK{movement_type}
 	    }
 	  ],
 	  [
 	    'path_attuned',
 	    {
 	  desc => 'This is the text that appears "written" in the book.',
 	  end => 'endmsg',
 	  name => 'book content',
 	  type => 'text'
 	}
+      ],
+      [
+	'slaying',
+	{
+	  desc => 'This is the key string of the book. The key string is checked by an inventory checker. (This is used eg. for the gate/port passes in scorn)',
+	  name => 'key string',
+	  type => 'string'
+	}
       ]
     ],
     desc => 'Applying a book, the containing message is displayed to the player.',
     name => 'Book'
   },
     use => 'Feel free to create your own special artifacts. However, it is very important that you keep your artifact in balance with existing maps.'
   },
   Button => {
     attr => [
       [
-	'walk_on',
+	'move_on',
 	{
+	  desc => 'Which movement types automatically (as opposed to manually) activate this object.',
+	  name => 'movement type',
-	  type => 'fixed',
+	  type => 'bitmask',
-	  value => 1
+	  value => $BITMASK{movement_type}
 	}
-      ],
-      [
+      ],
-	'walk_off',
+      [
+	'move_off',
 	{
+	  desc => 'Which movement types deactivate this object (e.g. button).',
+	  name => 'movement type',
-	  type => 'fixed',
+	  type => 'bitmask',
-	  value => 1
+	  value => $BITMASK{movement_type}
 	}
       ],
       [
 	'no_pick',
 	{
 	  type => 'list',
 	  value => $LIST{direction}
 	}
       ],
       [
-	'walk_on',
+	'move_on',
 	{
+	  desc => 'Which movement types automatically (as opposed to manually) activate this object.',
+	  name => 'movement type',
-	  type => 'fixed',
+	  type => 'bitmask',
-	  value => 1
+	  value => $BITMASK{movement_type}
-	}
-      ],
-      [
-	'fly_on',
-	{
-	  type => 'fixed',
-	  value => 1
 	}
       ]
     ],
     desc => 'Directors change the direction of spell objects and other projectiles that fly past. Unlike spinners, directors always move objects in the same direction. It does not make a difference from what angle you shoot into it.<br> Directors are visible per default.',
     ignore => [
 	  type => 'fixed',
 	  value => 1
 	}
       ],
       [
-	'no_pass',
+	'move_block',
 	{
-	  desc => 'If set, a player must defeat the door to enter.',
+	  desc => 'Objects using these movement types cannot move over this space.',
-	  name => 'blocking passage',
+	  name => 'blocked movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_allow',
+	{
+	  desc => 'Objects using these movement types are allowed to move over this space. Takes precedence over \'blocked movements\'.',
+	  name => 'allowed movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_slow',
+	{
+	  desc => 'The types of movement that should by slowed down by the \'slow movement penalty\'.',
+	  name => 'slowed movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_slow_penalty',
+	{
+	  desc => 'If <slow movement> is set to a value greater zero, all creatures matching \'slow move\' will be slower than normal on this spot. <slow movement> 1 - rough terrain <slow movement> 2 - very rough terrain ... <slow movement> 5 - default for deep swamp ... <slow movement> 7 - spider web (sticky as hell)',
+	  name => 'slow movement penalty',
-	  type => 'bool'
+	  type => 'int'
 	}
       ],
       [
 	'hp',
 	{
 	  name => 'destination Y',
 	  type => 'int'
 	}
       ],
       [
-	'walk_on',
+	'move_on',
 	{
-	  desc => 'If set, the player will apply the exit by just walking into it. This must be set for the invisible exits for example. If unset, the player has to step onto the exit and press \'a\' to get transferred.',
+	  desc => 'Which movement types automatically (as opposed to manually) activate this object.',
-	  name => 'apply by walking',
+	  name => 'movement type',
-	  type => 'bool'
+	  type => 'bitmask',
-	}
+	  value => $BITMASK{movement_type}
-      ],
-      [
-	'fly_on',
-	{
-	  desc => 'If set, the player will apply the exit by "flying into it". Flying means the player is levitating. E.g. wearing levitation boots.',
-	  name => 'apply by flying',
-	  type => 'bool'
 	}
       ],
       [
 	'msg',
 	{
       [
 	'no_pick',
 	{
 	  type => 'fixed',
 	  value => 1
-	}
-      ],
-      [
-	'no_pass',
-	{
-	  desc => 'If set, the object cannot be passed by players nor monsters.',
-	  name => 'blocking passage',
-	  type => 'bool'
 	}
       ],
       [
 	'no_magic',
 	{
     section => [
       [
 	'terrain',
 	[
 	  [
-	    'slow_move',
+	    'move_block',
+	    {
+	      desc => 'Objects using these movement types cannot move over this space.',
+	      name => 'blocked movement',
+	      type => 'bitmask',
+	      value => $BITMASK{movement_type}
-	    {
+	    }
-	      desc => 'If <slow movement> is set to a value greater zero, all creatures moving over this spot will be slower than normal. <slow movement> 1 - rough terrain <slow movement> 2 - very rough terrain ... <slow movement> 7 - spider web (sticky as hell)',
+	  ],
+	  [
+	    'move_allow',
+	    {
+	      desc => 'Objects using these movement types are allowed to move over this space. Takes precedence over \'blocked movements\'.',
+	      name => 'allowed movement',
+	      type => 'bitmask',
+	      value => $BITMASK{movement_type}
+	    }
+	  ],
+	  [
+	    'move_slow',
+	    {
+	      desc => 'The types of movement that should by slowed down by the \'slow movement penalty\'.',
-	      name => 'slow movement',
+	      name => 'slowed movement',
+	      type => 'bitmask',
+	      value => $BITMASK{movement_type}
+	    }
+	  ],
+	  [
+	    'move_slow_penalty',
+	    {
+	      desc => 'If <slow movement> is set to a value greater zero, all creatures matching \'slow move\' will be slower than normal on this spot. <slow movement> 1 - rough terrain <slow movement> 2 - very rough terrain ... <slow movement> 5 - default for deep swamp ... <slow movement> 7 - spider web (sticky as hell)',
+	      name => 'slow movement penalty',
 	      type => 'int'
 	    }
 	  ],
 	  [
 	    'is_wooded',
       [
 	'no_pick',
 	{
 	  type => 'fixed',
 	  value => 1
-	}
-      ],
-      [
-	'no_pass',
-	{
-	  desc => 'If set, the object cannot be passed by players nor monsters.',
-	  name => 'blocking passage',
-	  type => 'bool'
 	}
       ],
       [
 	'no_magic',
 	{
     section => [
       [
 	'terrain',
 	[
 	  [
-	    'slow_move',
+	    'move_block',
+	    {
+	      desc => 'Objects using these movement types cannot move over this space.',
+	      name => 'blocked movement',
+	      type => 'bitmask',
+	      value => $BITMASK{movement_type}
-	    {
+	    }
-	      desc => 'If <slow movement> is set to a value greater zero, all creatures moving over this spot will be slower than normal. <slow movement> 1 - rough terrain <slow movement> 2 - very rough terrain ... <slow movement> 7 - spider web (sticky as hell)',
+	  ],
+	  [
+	    'move_allow',
+	    {
+	      desc => 'Objects using these movement types are allowed to move over this space. Takes precedence over \'blocked movements\'.',
+	      name => 'allowed movement',
+	      type => 'bitmask',
+	      value => $BITMASK{movement_type}
+	    }
+	  ],
+	  [
+	    'move_slow',
+	    {
+	      desc => 'The types of movement that should by slowed down by the \'slow movement penalty\'.',
-	      name => 'slow movement',
+	      name => 'slowed movement',
+	      type => 'bitmask',
+	      value => $BITMASK{movement_type}
+	    }
+	  ],
+	  [
+	    'move_slow_penalty',
+	    {
+	      desc => 'If <slow movement> is set to a value greater zero, all creatures matching \'slow move\' will be slower than normal on this spot. <slow movement> 1 - rough terrain <slow movement> 2 - very rough terrain ... <slow movement> 5 - default for deep swamp ... <slow movement> 7 - spider web (sticky as hell)',
+	      name => 'slow movement penalty',
 	      type => 'int'
 	    }
 	  ],
 	  [
 	    'is_wooded',
 	  name => 'position state',
 	  type => 'int'
 	}
       ],
       [
-	'no_pass',
+	'move_block',
 	{
-	  desc => 'For open gates, <blocking passage> should be unset. For closed gates it must be set.',
+	  desc => 'Objects using these movement types cannot move over this space.',
-	  name => 'blocking passage',
+	  name => 'blocked movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_allow',
+	{
+	  desc => 'Objects using these movement types are allowed to move over this space. Takes precedence over \'blocked movements\'.',
+	  name => 'allowed movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_slow',
+	{
+	  desc => 'The types of movement that should by slowed down by the \'slow movement penalty\'.',
+	  name => 'slowed movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_slow_penalty',
+	{
+	  desc => 'If <slow movement> is set to a value greater zero, all creatures matching \'slow move\' will be slower than normal on this spot. <slow movement> 1 - rough terrain <slow movement> 2 - very rough terrain ... <slow movement> 5 - default for deep swamp ... <slow movement> 7 - spider web (sticky as hell)',
+	  name => 'slow movement penalty',
-	  type => 'bool'
+	  type => 'int'
 	}
       ],
       [
 	'no_magic',
 	{
 	  type => 'fixed',
 	  value => 1
 	}
       ],
       [
-	'walk_on',
+	'move_on',
 	{
+	  desc => 'Which movement types automatically (as opposed to manually) activate this object.',
+	  name => 'movement type',
-	  type => 'fixed',
+	  type => 'bitmask',
-	  value => 1
+	  value => $BITMASK{movement_type}
 	}
       ],
       [
 	'no_pick',
 	{
     section => [
       [
 	'terrain',
 	[
 	  [
-	    'slow_move',
+	    'move_block',
+	    {
+	      desc => 'Objects using these movement types cannot move over this space.',
+	      name => 'blocked movement',
+	      type => 'bitmask',
+	      value => $BITMASK{movement_type}
-	    {
+	    }
-	      desc => 'If <slow movement> is set to a value greater zero, all creatures moving over this spot will be slower than normal. <slow movement> 1 - rough terrain <slow movement> 2 - very rough terrain ... <slow movement> 7 - spider web (sticky as hell)',
+	  ],
+	  [
+	    'move_allow',
+	    {
+	      desc => 'Objects using these movement types are allowed to move over this space. Takes precedence over \'blocked movements\'.',
+	      name => 'allowed movement',
+	      type => 'bitmask',
+	      value => $BITMASK{movement_type}
+	    }
+	  ],
+	  [
+	    'move_slow',
+	    {
+	      desc => 'The types of movement that should by slowed down by the \'slow movement penalty\'.',
-	      name => 'slow movement',
+	      name => 'slowed movement',
+	      type => 'bitmask',
+	      value => $BITMASK{movement_type}
+	    }
+	  ],
+	  [
+	    'move_slow_penalty',
+	    {
+	      desc => 'If <slow movement> is set to a value greater zero, all creatures matching \'slow move\' will be slower than normal on this spot. <slow movement> 1 - rough terrain <slow movement> 2 - very rough terrain ... <slow movement> 5 - default for deep swamp ... <slow movement> 7 - spider web (sticky as hell)',
+	      name => 'slow movement penalty',
 	      type => 'int'
 	    }
 	  ],
 	  [
 	    'is_wooded',
 	  name => 'connection',
 	  type => 'int'
 	}
       ],
       [
-	'no_pass',
+	'move_block',
 	{
-	  desc => 'If set, only players meeting the match criteria can pass through that space. If unset (default), the inventory checker acts like a trigger/button.',
+	  desc => 'Objects using these movement types cannot move over this space.',
-	  name => 'blocking passage',
+	  name => 'blocked movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_allow',
+	{
+	  desc => 'Objects using these movement types are allowed to move over this space. Takes precedence over \'blocked movements\'.',
+	  name => 'allowed movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_slow',
+	{
+	  desc => 'The types of movement that should by slowed down by the \'slow movement penalty\'.',
+	  name => 'slowed movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_slow_penalty',
+	{
+	  desc => 'If <slow movement> is set to a value greater zero, all creatures matching \'slow move\' will be slower than normal on this spot. <slow movement> 1 - rough terrain <slow movement> 2 - very rough terrain ... <slow movement> 5 - default for deep swamp ... <slow movement> 7 - spider web (sticky as hell)',
+	  name => 'slow movement penalty',
-	  type => 'bool'
+	  type => 'int'
 	}
       ],
       [
 	'last_heal',
 	{
 	  name => 'remove match',
 	  type => 'bool'
 	}
       ]
     ],
-    desc => 'Inventory checkers passively check the players inventory for a specific object. You can set a connected value that is triggered either if that object is present or missing (-&gt; "last_sp") when a player walks over the inv. checker. A valid option is to remove the matching object (usually not recommended, see "last_heal"). <br><br> Alternatively, you can set your inv. checker to block all players that do/don\'t carry the matching object (-&gt; "no_pass"). <br><br> As you can see, inv. checkers are quite powerful, holding a great variety of possibilities.',
+    desc => 'Inventory checkers passively check the players inventory for a specific object. You can set a connected value that is triggered either if that object is present or missing (-&gt; "last_sp") when a player walks over the inv. checker. A valid option is to remove the matching object (usually not recommended, see "last_heal"). <br><br> Alternatively, you can set your inv. checker to block all players that do/don\'t carry the matching object. <br><br> As you can see, inv. checkers are quite powerful, holding a great variety of possibilities.',
     ignore => [
       $IGNORE_LIST{system_object}
     ],
     name => 'Inventory Checker',
     use => 'Putting a check_inventory space in front of a gate (one below) and one on the opposite side works reasonably well as a control mechanism. Unlike the key/door-combo, this one works infinite since it is independant from map reset. Use it to put a "structure" into your maps: Player must solve area A to gain access to area B. This concept can be found in nearly every RPG - simple but effective.'
     name => 'Key'
   },
   'Locked Door' => {
     attr => [
       [
-	'no_pass',
+	'move_type',
 	{
 	  type => 'fixed',
-	  value => 1
+	  value => 0
 	}
       ],
       [
 	'no_pick',
 	{
 	  type => 'list',
 	  value => $LIST{direction}
 	}
       ],
       [
-	'no_pass',
+	'move_block',
 	{
-	  desc => 'If set, the object cannot be passed by players nor monsters.',
+	  desc => 'Objects using these movement types cannot move over this space.',
-	  name => 'blocking passage',
+	  name => 'blocked movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_allow',
+	{
+	  desc => 'Objects using these movement types are allowed to move over this space. Takes precedence over \'blocked movements\'.',
+	  name => 'allowed movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_slow',
+	{
+	  desc => 'The types of movement that should by slowed down by the \'slow movement penalty\'.',
+	  name => 'slowed movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_slow_penalty',
+	{
+	  desc => 'If <slow movement> is set to a value greater zero, all creatures matching \'slow move\' will be slower than normal on this spot. <slow movement> 1 - rough terrain <slow movement> 2 - very rough terrain ... <slow movement> 5 - default for deep swamp ... <slow movement> 7 - spider web (sticky as hell)',
+	  name => 'slow movement penalty',
-	  type => 'bool'
+	  type => 'int'
 	}
       ]
     ],
     desc => 'Magic walls fire spells in a given direction, in regular intervals. Magic walls can contain any spell. However, some spells do not operate very successfully in them. The only way to know is to test the spell you want to use with a wall. <br><br> Several types of magical walls are predefined for you in the archetypes, and can be found on the "connected" Pickmap.',
     ignore => [
     use => 'Markers hold real cool possibilities for map-making. I encourage you to use them frequently. However there is one negative point about markers: Players don\'t "see" what\'s going on with them. It is your task, as map-creator, to make sure the player is always well informed and never confused. <br><br> Please avoid infinite markers when they aren\'t needed. They\'re using a little space in the player file after all, so if there is no real purpose, set an expire time.'
   },
   Misc => {
     attr => [
       [
-	'no_pass',
+	'move_block',
 	{
-	  desc => 'If set, the object cannot be passed by players nor monsters.',
+	  desc => 'Objects using these movement types cannot move over this space.',
-	  name => 'blocking passage',
+	  name => 'blocked movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_allow',
+	{
+	  desc => 'Objects using these movement types are allowed to move over this space. Takes precedence over \'blocked movements\'.',
+	  name => 'allowed movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_slow',
+	{
+	  desc => 'The types of movement that should by slowed down by the \'slow movement penalty\'.',
+	  name => 'slowed movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_slow_penalty',
+	{
+	  desc => 'If <slow movement> is set to a value greater zero, all creatures matching \'slow move\' will be slower than normal on this spot. <slow movement> 1 - rough terrain <slow movement> 2 - very rough terrain ... <slow movement> 5 - default for deep swamp ... <slow movement> 7 - spider web (sticky as hell)',
+	  name => 'slow movement penalty',
-	  type => 'bool'
+	  type => 'int'
 	}
       ],
       [
 	'cursed',
 	{
 	  name => 'template generation',
 	  type => 'bool'
 	}
       ],
       [
-	'flying',
+	'move_type',
 	{
-	  desc => 'Flying monsters won\'t get slowed down in rough terrain and they won\'t be affected by movers.',
+	  desc => 'Determines which kinds of movement this object can use (e.g. for monsters) or grants (e.g. for amulets).',
-	  name => 'flying',
+	  name => 'movement type',
-	  type => 'bool'
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
 	}
       ],
       [
 	'undead',
 	{
 	      name => 'move players',
 	      type => 'bool'
 	    }
 	  ],
 	  [
-	    'walk_on',
+	    'move_on',
-	    {
-	      desc => 'This should always be set.',
-	      name => 'move walking creatures',
-	      type => 'bool'
-	    }
+	    {
-	  ],
+	      desc => 'Which movement types activate the mover.',
-	  [
+	      name => 'movement type',
-	    'fly_on',
+	      type => 'movement_type'
-	    {
-	      desc => 'Move flying creatures enabled means all flying (living) objects will get moved too. If disabled, only walking (non-flying) creatures will get moved.',
-	      name => 'move flying creatures',
-	      type => 'bool'
 	    }
 	  ]
 	]
       ]
     ],
 	  name => 'connection',
 	  type => 'int'
 	}
       ],
       [
-	'walk_on',
+	'move_on',
 	{
+	  desc => 'Which movement types automatically (as opposed to manually) activate this object.',
+	  name => 'movement type',
-	  type => 'fixed',
+	  type => 'bitmask',
-	  value => 1
+	  value => $BITMASK{movement_type}
-	}
-      ],
-      [
-	'walk_off',
-	{
-	  type => 'fixed',
-	  value => 1
 	}
       ]
     ],
     desc => 'Pedestals are designed to detect certain types of living objects. When a predefined type of living creature steps on the pedestal, the connected value is triggered.',
     ignore => [
 	  name => 'position state',
 	  type => 'int'
 	}
       ],
       [
-	'walk_on',
+	'move_on',
 	{
-	  desc => 'If set, all walking creatures will fall into the pit. This does NOT need to be set for closed pits!',
+	  desc => 'Which movement types automatically (as opposed to manually) activate this object.',
-	  name => 'swallow walking',
+	  name => 'movement type',
-	  type => 'bool'
+	  type => 'bitmask',
-	}
+	  value => $BITMASK{movement_type}
-      ],
-      [
-	'fly_on',
-	{
-	  desc => 'If set, all flying creatures will fall into the pit as well. This is not the behaviour expected from a pit, and it should only be used for map-mechanisms (e.g. for transporting flying monsters). An interesting side-effect: If this flag is enabled, spell effects like fire/snow also make their way through the pit.',
-	  name => 'swallow flying',
-	  type => 'bool'
 	}
       ]
     ],
     desc => 'Pits are holes, transporting the player when he walks (and falls) into them. A speciality about pits is that they don\'t transport the player to the exact destination, but within a two-square radius of the destination (never on blocked squares).<br> Optionally, pits can get closed and opened, similar to gates.<br><br> Monsters and items are affected by pits just as well as players. Even multipart monsters can fall through them, given enough space.',
     ignore => [
 	  type => 'fixed',
 	  value => 1
 	}
       ],
       [
-	'walk_on',
+	'move_on',
 	{
+	  desc => 'Which movement types automatically (as opposed to manually) activate this object.',
+	  name => 'movement type',
-	  type => 'fixed',
+	  type => 'bitmask',
-	  value => 1
+	  value => $BITMASK{movement_type}
 	}
       ],
       [
 	'level',
 	{
 	  type => 'fixed',
 	  value => 1
 	}
       ],
       [
-	'walk_on',
+	'move_on',
 	{
-	  desc => 'If set, the player can enter/leave the shop by just walking into the shop mat.',
+	  desc => 'Which movement types automatically (as opposed to manually) activate this object.',
-	  name => 'apply by walking',
+	  name => 'movement type',
-	  type => 'bool'
+	  type => 'bitmask',
-	}
+	  value => $BITMASK{movement_type}
-      ],
-      [
-	'fly_on',
-	{
-	  desc => 'If set, the player can enter/leave the shop by "flying" into the shop mat.',
-	  name => 'apply by flying',
-	  type => 'bool'
 	}
       ]
     ],
     desc => 'Shop mats are used for entering/leaving shops. You should always have exactly TWO shop mats on your shop-map: One inside the "shopping-area" and one outside. Shop mats don\'t use exit paths/ or -destinations. When stepping onto a shopmat the player gets beamed to the nearest other mat. If the player has unpaid items in his inventory, the price gets charged from his coins automatically. If the player has insufficient coins to buy his unpaid items, he is unable to pass any shopmat (So he has to drop unpaid items).',
     ignore => [
 	  name => 'connection',
 	  type => 'int'
 	}
       ],
       [
-	'walk_on',
+	'move_on',
 	{
-	  desc => 'If set, the player gets the message when walking ontop of the object. "invisible 1" should be set in this case. This is the typical configuration for a "magic_mouth": The player walks through a dungeon and suddenly he gets a message. Use this to create some roleplay atmosphere, and to inform the player about possible dangers or secrets.',
+	  desc => 'Which movement types automatically (as opposed to manually) activate this object.',
-	  name => 'activate by walking',
+	  name => 'movement type',
-	  type => 'bool'
+	  type => 'bitmask',
-	}
+	  value => $BITMASK{movement_type}
-      ],
-      [
-	'fly_on',
-	{
-	  desc => 'If set, the player gets the message when flying (=levitating) ontop of the object. Usually this should be set together with walk_on.',
-	  name => 'activate by flying',
-	  type => 'bool'
 	}
       ],
       [
 	'food',
 	{
 	  name => 'direction number',
 	  type => 'int'
 	}
       ],
       [
-	'walk_on',
+	'move_on',
 	{
+	  desc => 'Which movement types automatically (as opposed to manually) activate this object.',
+	  name => 'movement type',
-	  type => 'fixed',
+	  type => 'bitmask',
-	  value => 1
+	  value => $BITMASK{movement_type}
-	}
-      ],
-      [
-	'fly_on',
-	{
-	  type => 'fixed',
-	  value => 1
 	}
       ]
     ],
     desc => 'Spinners change the direction of spell objects and other projectiles that fly past. Unlike directors, it does make a difference from what angle you shoot into the spinner. The direction of objects flying past is always changed by a certain degree.',
     ignore => [
     use => 'Spinners are very rarely used. I believe they are quite confusing and pointless. The only use I can think of is building some puzzle about where to shoot into spinners to shoot somewhere you otherwise couldn\'t. When placing spinners on a map with magic walls, make sure the spell- projectiles from magic walls don\'t get to fly in loops.'
   },
   Swamp => {
     attr => [
       [
-	'walk_on',
-	{
-	  type => 'fixed',
-	  value => 1
-	}
-      ],
-      [
 	'is_floor',
 	{
 	  type => 'fixed',
 	  value => 1
 	}
 	  name => 'drowning speed',
 	  type => 'float'
 	}
       ],
       [
-	'slow_move',
+	'move_on',
 	{
-	  desc => 'If <slow movement> is set to a value greater zero, all creatures moving over this spot will be slower than normal. <slow movement> 1 - rough terrain <slow movement> 2 - very rough terrain ... <slow movement> 5 - default for deep swamp',
+	  desc => 'Which movement types automatically (as opposed to manually) activate this object.',
+	  name => 'movement type',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_block',
+	{
+	  desc => 'Objects using these movement types cannot move over this space.',
+	  name => 'blocked movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_allow',
+	{
+	  desc => 'Objects using these movement types are allowed to move over this space. Takes precedence over \'blocked movements\'.',
+	  name => 'allowed movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_slow',
+	{
+	  desc => 'The types of movement that should by slowed down by the \'slow movement penalty\'.',
-	  name => 'slow movement',
+	  name => 'slowed movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_slow_penalty',
+	{
+	  desc => 'If <slow movement> is set to a value greater zero, all creatures matching \'slow move\' will be slower than normal on this spot. <slow movement> 1 - rough terrain <slow movement> 2 - very rough terrain ... <slow movement> 5 - default for deep swamp ... <slow movement> 7 - spider web (sticky as hell)',
+	  name => 'slow movement penalty',
 	  type => 'int'
 	}
       ],
       [
 	'no_magic',
 	  name => 'position state',
 	  type => 'int'
 	}
       ],
       [
-	'no_pass',
+	'move_block',
 	{
-	  desc => 'For open gates, <blocking passage> should be unset. For closed gates it must be set.',
+	  desc => 'Objects using these movement types cannot move over this space.',
-	  name => 'blocking passage',
+	  name => 'blocked movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_allow',
+	{
+	  desc => 'Objects using these movement types are allowed to move over this space. Takes precedence over \'blocked movements\'.',
+	  name => 'allowed movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_slow',
+	{
+	  desc => 'The types of movement that should by slowed down by the \'slow movement penalty\'.',
+	  name => 'slowed movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_slow_penalty',
+	{
+	  desc => 'If <slow movement> is set to a value greater zero, all creatures matching \'slow move\' will be slower than normal on this spot. <slow movement> 1 - rough terrain <slow movement> 2 - very rough terrain ... <slow movement> 5 - default for deep swamp ... <slow movement> 7 - spider web (sticky as hell)',
+	  name => 'slow movement penalty',
-	  type => 'bool'
+	  type => 'int'
 	}
       ],
       [
 	'no_magic',
 	{
 	  type => 'fixed',
 	  value => 1
 	}
       ],
       [
-	'walk_on',
+	'move_on',
 	{
+	  desc => 'Which movement types automatically (as opposed to manually) activate this object.',
+	  name => 'movement type',
-	  type => 'fixed',
+	  type => 'bitmask',
-	  value => 1
+	  value => $BITMASK{movement_type}
 	}
       ],
       [
 	'level',
 	{
 	  type => 'fixed',
 	  value => 1
 	}
       ],
       [
-	'walk_on',
+	'move_on',
 	{
+	  desc => 'Which movement types automatically (as opposed to manually) activate this object.',
+	  name => 'movement type',
-	  type => 'fixed',
+	  type => 'bitmask',
-	  value => 1
+	  value => $BITMASK{movement_type}
 	}
       ],
       [
 	'weight',
 	{
     use => 'Markers hold real cool possibilities for map-making. I encourage you to use them frequently. However there is one negative point about markers: Players don\'t "see" what\'s going on with them. It is your task, as map-creator, to make sure the player is always well informed and never confused. <br><br> Please avoid infinite markers when they aren\'t needed. They\'re using a little space in the player file after all, so if there is no real purpose, set an expire time.'
   },
   Wall => {
     attr => [
       [
-	'no_pass',
+	'move_block',
 	{
-	  desc => 'If set, the object cannot be passed by players nor monsters.',
+	  desc => 'Objects using these movement types cannot move over this space.',
-	  name => 'blocking passage',
+	  name => 'blocked movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_allow',
+	{
+	  desc => 'Objects using these movement types are allowed to move over this space. Takes precedence over \'blocked movements\'.',
+	  name => 'allowed movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_slow',
+	{
+	  desc => 'The types of movement that should by slowed down by the \'slow movement penalty\'.',
+	  name => 'slowed movement',
+	  type => 'bitmask',
+	  value => $BITMASK{movement_type}
+	}
+      ],
+      [
+	'move_slow_penalty',
+	{
+	  desc => 'If <slow movement> is set to a value greater zero, all creatures matching \'slow move\' will be slower than normal on this spot. <slow movement> 1 - rough terrain <slow movement> 2 - very rough terrain ... <slow movement> 5 - default for deep swamp ... <slow movement> 7 - spider web (sticky as hell)',
+	  name => 'slow movement penalty',
-	  type => 'bool'
+	  type => 'int'
 	}
       ],
       [
 	'can_roll',
 	{
     ],
     name => 'Wall',
     required => {
       alive => 0,
       is_floor => 0,
-      no_pass => 1
+      move_block => 255
     }
   },
   'Wand & Staff' => {
     attr => [
       [

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra/Deliantra/Data.pm (file contents): Revision 1.13 by root, Thu Mar 16 22:16:06 2006 UTC vs. Revision 1.14 by root, Mon Mar 20 03:31:45 2006 UTC

Diff Legend

Comparing deliantra/Deliantra/Deliantra/Data.pm (file contents):
Revision 1.13 by root, Thu Mar 16 22:16:06 2006 UTC vs.
Revision 1.14 by root, Mon Mar 20 03:31:45 2006 UTC