From 6b3f400a54d573521f844f34ad8a8b223c57c968 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sat, 13 Oct 2007 13:50:13 +0000 Subject: Implementing merfolk monsters. There are two types, merfolk fighters, and mermaids. The latter are more interesting. ;) Whenever a mermaid sings there's a chance you get beheld, meaning you cannot move away from the mermaid, that is cannot increase the distance between you and her. (Because of the distance pecularities this means at dist 1 you can only be NSW or E of the mermaid but not the diagonal directions.) If you manage to be beheld by several mermaids at the same time, your movements have to respect the distance to all of them. I've added a vector beheld_by that keeps track of beholding monsters and makes checking distance and updating beholding status easier. Merfolk are immune to the mermaid song. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2453 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/enum.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'crawl-ref/source/enum.h') diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 01048e2340..b2895d7eaa 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -983,6 +983,7 @@ enum duration_type DUR_CONF, DUR_PARALYSIS, DUR_SLOW, + DUR_BEHELD, DUR_HASTE, DUR_MIGHT, DUR_LEVITATION, @@ -1557,6 +1558,8 @@ enum monster_type // (int) menv[].type MONS_BLACK_BEAR, // 189 MONS_SIMULACRUM_SMALL, MONS_SIMULACRUM_LARGE, + MONS_MERFOLK, + MONS_MERMAID, // 193 //jmf: end new monsters MONS_WHITE_IMP = 220, // 220 MONS_LEMURE, -- cgit v1.2.3-54-g00ecf