fiddlerwoaroof/crawl - Change O5246XJ6P3R726D64X4F2BUNIVP7ZLWA5VMP6FYE72P3GIBTKZQQC

If a map marker has the property "connected_exclude" then it will be

excluded from find_connected_xyz() unless it's the starting square. Used in the "Evil zoo" mini-vault (minivault_9) so that each door opens and closes separately rather than all of them forming a huge gate which opens all at once.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6461 c06c8d41-db1a-0410-9941-cceddc491573

Created by zelgadis on July 8, 2008

O5246XJ6P3R726D64X4F2BUNIVP7ZLWA5VMP6FYE72P3GIBTKZQQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/terrain.cc at line 238 [5.26938]

[4.599]


    std::string prop = env.markers.property_at(d, MAT_ANY,
                                               "connected_exclude");
    if (!prop.empty())
    {
        // Even if this square is excluded from being a part of connected
        // cells, add it if it's the starting square.
        if (out.size() == 0)
            out.insert(d);
        return;
    }

Insertion in crawl-ref/source/terrain.cc at line 266 [5.26938]

[3.636]


    std::string prop = env.markers.property_at(d, MAT_ANY,
                                               "connected_exclude");
    if (!prop.empty())
    {
        // Even if this square is excluded from being a part of connected
        // cells, add it if it's the starting square.
        if (out.size() == 0)
            out.insert(d);
        return;
    }

Deletion in crawl-ref/source/dat/mini.des at line 678 [6.75280]

B:BD[6.86144] → [7.2916:2989]

B:BD[7.2989] → [2.2672:2788]

#
# FIXME This vault is somewhat problematic as the doors are treated as
#       gateways. The ideal fix would be make sure that (formerly)
#       secret doors are never part of gateways.

Insertion in crawl-ref/source/dat/mini.des at line 679 [6.75280]

[6.86146]

# The marker affects find_connected_range() so that each door opens and
# closes separately rather than all of them joining together into a huge
# gate that opens all at once.

Insertion in crawl-ref/source/dat/mini.des at line 685 [6.75280]
[7.3159]
[6.86206]
```
MARKER: X = lua: props_marker { connected_exclude="true" }
SUBST: X = =
```

Replacement in crawl-ref/source/dat/mini.des at line 688 [6.75280]

B:BD[6.86210] → [8.1113:1223]

==========
=x========
==========
===8888===
===8998===
===8998===
===8888===
==========
==========
==========

[6.86210]

[6.86366]

XXXXXXXXXX
XxXXXXXXXX
XXXXXXXXXX
XXX8888XXX
XXX8998XXX
XXX8998XXX
XXX8888XXX
XXXXXXXXXX
XXXXXXXXXX
XXXXXXXXXX

Insertion in crawl-ref/source/dat/clua/luamark.lua at line 11 [10.25993]
[9.10371]
[10.26252]
```
dofile('clua/lm_props.lua')
```

File addition: lm_props.lua (----------)

[11.951]

------------------------------------------------------------------------------
-- lm_props.lua:
-- Property markers.
------------------------------------------------------------------------------
PropertiesDescriptor = { }
PropertiesDescriptor.__index = PropertiesDescriptor
function PropertiesDescriptor:new(properties)
  local pd = { }
  setmetatable(pd, self)
  pd.props = properties
  return pd
end
function PropertiesDescriptor:write(marker, th)
  lmark.marshall_table(th, self.props)
end
function PropertiesDescriptor:read(marker, th)
  self.props = lmark.unmarshall_table(th)
  setmetatable(self, PropertiesDescriptor)
  return self
end
function PropertiesDescriptor:property(marker, pname)
  return self.props and self.props[pname] or ''
end
function props_marker(props)
  return PropertiesDescriptor:new(props)
end