Give Lugonu Banishment and Corruption. I've left the old Bend Space in, because

there needs to be an invocation that can train Invocations, and Banishment is
too costly to use for everyday training.

Corruption is still a first-cut, needs more work and playtesting:
- Terrain modification is one-time only. Creeping modification requires too
  much savegame magic.
- The monsters gated in during the corruption effect are occasionally hostile,
  but mostly neutral. Neutrals will attack hostile monsters and also pets,
  but will leave other neutrals and the player alone (in general). A neutral
  that wants to go somewhere, but finds the player in the way will still take
  a swing at the player.
- Beams are still not fixed to handle neutrals correctly (so neutrals do not
  target and shoot right yet), will fix soon.

Breaks save compatibility.

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

1 files changed, 20 insertions, 2 deletions

diff --git a/crawl-ref/source/mapmark.h b/crawl-ref/source/mapmark.h
index f8137d4308..cc7e2ee5ee 100644
--- a/crawl-ref/source/mapmark.h
+++ b/crawl-ref/source/mapmark.h
@@ -14,7 +14,7 @@ enum map_marker_type
 {
     MAT_FEATURE,              // Stock marker.
     MAT_LUA_MARKER,
-    MAT_FEATURE_NAME,
+    MAT_CORRUPTION_NEXUS,
     NUM_MAP_MARKER_TYPES,
     MAT_ANY
 };
@@ -69,6 +69,23 @@ public:
     dungeon_feature_type feat;
 };
 
+class map_corruption_marker : public map_marker
+{
+public:
+    map_corruption_marker(const coord_def &pos = coord_def(0, 0),
+                          int dur = 0);
+
+    void write(tagHeader &) const;
+    void read(tagHeader &);
+
+    std::string debug_describe() const;
+
+    static map_marker *read(tagHeader &, map_marker_type);
+
+public:
+    int duration, radius;
+};
+
 // A marker powered by Lua.
 class map_lua_marker : public map_marker, public dgn_event_listener
 {
@@ -104,8 +121,9 @@ void env_activate_markers();
 void env_add_marker(map_marker *);
 void env_remove_marker(map_marker *);
 void env_remove_markers_at(const coord_def &c, map_marker_type);
-std::vector<map_marker*> env_get_all_markers();
+std::vector<map_marker*> env_get_all_markers(map_marker_type = MAT_ANY);
 map_marker *env_find_marker(const coord_def &c, map_marker_type);
+map_marker *env_find_marker(map_marker_type type);
 std::vector<map_marker*> env_get_markers(const coord_def &c);
 void env_clear_markers();
 std::string env_property_at(const coord_def &c, map_marker_type,