From b2f8c7c8b8b10ef1dfa704ed06612416f39ce858 Mon Sep 17 00:00:00 2001 From: ennewalker Date: Fri, 11 Jan 2008 13:40:58 +0000 Subject: Adding merfolk monster tiles. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3246 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/rltiles/dc-co.txt | 4 +++ crawl-ref/source/rltiles/dc-mon.txt | 5 +++ .../source/rltiles/dc-mon/merfolk_fighter.bmp | Bin 0 -> 2102 bytes .../rltiles/dc-mon/merfolk_fighter_water.bmp | Bin 0 -> 2102 bytes crawl-ref/source/rltiles/dc-mon/mermaid.bmp | Bin 0 -> 2102 bytes crawl-ref/source/rltiles/dc-mon/mermaid_water.bmp | Bin 0 -> 2102 bytes crawl-ref/source/rltiles/player/base/merfolk_f.bmp | Bin 2102 -> 2102 bytes .../source/rltiles/player/base/merfolk_fs.bmp | Bin 2102 -> 0 bytes .../source/rltiles/player/base/merfolk_ms.bmp | Bin 2102 -> 0 bytes .../source/rltiles/player/base/merfolk_water_f.bmp | Bin 2102 -> 2102 bytes crawl-ref/source/tile1.cc | 36 ++++++++++----------- 11 files changed, 27 insertions(+), 18 deletions(-) create mode 100644 crawl-ref/source/rltiles/dc-mon/merfolk_fighter.bmp create mode 100644 crawl-ref/source/rltiles/dc-mon/merfolk_fighter_water.bmp create mode 100644 crawl-ref/source/rltiles/dc-mon/mermaid.bmp create mode 100644 crawl-ref/source/rltiles/dc-mon/mermaid_water.bmp delete mode 100644 crawl-ref/source/rltiles/player/base/merfolk_fs.bmp delete mode 100644 crawl-ref/source/rltiles/player/base/merfolk_ms.bmp (limited to 'crawl-ref/source') diff --git a/crawl-ref/source/rltiles/dc-co.txt b/crawl-ref/source/rltiles/dc-co.txt index ab1fbe20ff..c367256a31 100644 --- a/crawl-ref/source/rltiles/dc-co.txt +++ b/crawl-ref/source/rltiles/dc-co.txt @@ -254,3 +254,7 @@ yellow_wasp CORPSE_YELLOW_WASP /* y */ %compose drchead/drchead_yellow %finish CORPSE_DRACONIAN_YELLOW +%sdir dc-mon +%back dc-misc/blood_red +mermaid_water CORPSE_MERMAID +merfolk_fighter_water CORPSE_MERFOLK_FIGHTER diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt index e5d8a41e25..53814cc490 100644 --- a/crawl-ref/source/rltiles/dc-mon.txt +++ b/crawl-ref/source/rltiles/dc-mon.txt @@ -492,3 +492,8 @@ murray MONS_MURRAY water_elemental MONS_WATER_ELEMENTAL /*'{'*/ ####nh-mon0/m/large_mimic MONS_MOLLUSC_LORD + +merfolk_fighter MONS_MERFOLK_FIGHTER +merfolk_fighter_water MONS_MERFOLK_FIGHTER_WATER +mermaid MONS_MERMAID +mermaid_water MONS_MERMAID_WATER diff --git a/crawl-ref/source/rltiles/dc-mon/merfolk_fighter.bmp b/crawl-ref/source/rltiles/dc-mon/merfolk_fighter.bmp new file mode 100644 index 0000000000..a8b8168fe9 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/merfolk_fighter.bmp differ diff --git a/crawl-ref/source/rltiles/dc-mon/merfolk_fighter_water.bmp b/crawl-ref/source/rltiles/dc-mon/merfolk_fighter_water.bmp new file mode 100644 index 0000000000..65d11fa2ab Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/merfolk_fighter_water.bmp differ diff --git a/crawl-ref/source/rltiles/dc-mon/mermaid.bmp b/crawl-ref/source/rltiles/dc-mon/mermaid.bmp new file mode 100644 index 0000000000..8475a2a897 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/mermaid.bmp differ diff --git a/crawl-ref/source/rltiles/dc-mon/mermaid_water.bmp b/crawl-ref/source/rltiles/dc-mon/mermaid_water.bmp new file mode 100644 index 0000000000..83f5c48533 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/mermaid_water.bmp differ diff --git a/crawl-ref/source/rltiles/player/base/merfolk_f.bmp b/crawl-ref/source/rltiles/player/base/merfolk_f.bmp index 365375dfd3..2ea19fb6b7 100644 Binary files a/crawl-ref/source/rltiles/player/base/merfolk_f.bmp and b/crawl-ref/source/rltiles/player/base/merfolk_f.bmp differ diff --git a/crawl-ref/source/rltiles/player/base/merfolk_fs.bmp b/crawl-ref/source/rltiles/player/base/merfolk_fs.bmp deleted file mode 100644 index ceb382faa9..0000000000 Binary files a/crawl-ref/source/rltiles/player/base/merfolk_fs.bmp and /dev/null differ diff --git a/crawl-ref/source/rltiles/player/base/merfolk_ms.bmp b/crawl-ref/source/rltiles/player/base/merfolk_ms.bmp deleted file mode 100644 index ddf196aeef..0000000000 Binary files a/crawl-ref/source/rltiles/player/base/merfolk_ms.bmp and /dev/null differ diff --git a/crawl-ref/source/rltiles/player/base/merfolk_water_f.bmp b/crawl-ref/source/rltiles/player/base/merfolk_water_f.bmp index 5785b9ddf8..52f41c81d6 100644 Binary files a/crawl-ref/source/rltiles/player/base/merfolk_water_f.bmp and b/crawl-ref/source/rltiles/player/base/merfolk_water_f.bmp differ diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc index 98d4d7e2f8..e6cbed30a2 100644 --- a/crawl-ref/source/tile1.cc +++ b/crawl-ref/source/tile1.cc @@ -55,9 +55,11 @@ int tile_unseen_flag(const coord_def& gc) int tileidx_monster_base(int mon_idx) { - int mons = menv[mon_idx].type; + const monsters* mon = &menv[mon_idx]; + int grid = grd[mon->x][mon->y]; + bool in_water = (grid == DNGN_SHALLOW_WATER || grid == DNGN_DEEP_WATER); - switch(mons) + switch (mon->type) { case MONS_GIANT_ANT: return TILE_MONS_GIANT_ANT; @@ -155,14 +157,8 @@ int tileidx_monster_base(int mon_idx) return TILE_MONS_VAMPIRE; case MONS_WRAITH: return TILE_MONS_WRAITH; - case MONS_ABOMINATION_LARGE: - { - // 7 different colours - struct monsters *mon = &menv[mon_idx]; return TILE_MONS_ABOMINATION_LARGE + ((mon->colour)%7); - } - case MONS_YAK: return TILE_MONS_YAK; case MONS_ZOMBIE_LARGE: @@ -193,14 +189,8 @@ int tileidx_monster_base(int mon_idx) return TILE_MONS_HUNGRY_GHOST; case MONS_EYE_OF_DRAINING: return TILE_MONS_EYE_OF_DRAINING; - case MONS_BUTTERFLY: - { - // 7 different colours - struct monsters *mon = &menv[mon_idx]; return TILE_MONS_BUTTERFLY + ((mon->colour)%7); - } - case MONS_WANDERING_MUSHROOM: return TILE_MONS_WANDERING_MUSHROOM; case MONS_EFREET: @@ -267,7 +257,6 @@ int tileidx_monster_base(int mon_idx) case MONS_HYDRA: { // Number of heads - struct monsters *mon = &menv[mon_idx]; int heads = mon->number; if (heads > 7) heads = 7; return TILE_MONS_HYDRA + heads - 1; @@ -713,7 +702,6 @@ int tileidx_monster_base(int mon_idx) { // Use item tile item_def item; - struct monsters *mon = &menv[mon_idx]; get_mimic_item( mon, item ); return tileidx_item(item); } @@ -775,9 +763,15 @@ int tileidx_monster_base(int mon_idx) case MONS_DEATH_DRAKE: return TILE_MONS_DEATH_DRAKE; case MONS_MERFOLK: - return TILE_TODO; + if (in_water) + return TILE_MONS_MERFOLK_FIGHTER_WATER; + else + return TILE_MONS_MERFOLK_FIGHTER; case MONS_MERMAID: - return TILE_TODO; + if (in_water) + return TILE_MONS_MERMAID_WATER; + else + return TILE_MONS_MERMAID; } return TILE_ERROR; @@ -1416,6 +1410,8 @@ int tileidx_corpse(int mon) case MONS_WHITE_DRACONIAN: ch=TILE_CORPSE_DRACONIAN_WHITE; break; case MONS_DEATH_DRAKE: ch=TILE_CORPSE_DEATH_DRAKE; break; + case MONS_MERMAID: ch=TILE_CORPSE_MERMAID; break; + case MONS_MERFOLK: ch=TILE_CORPSE_MERFOLK_FIGHTER; break; } return ch; } @@ -3686,6 +3682,10 @@ void tile_place_monster(int gx, int gy, int idx, bool foreground) case TILE_MONS_VAMPIRE_KNIGHT: case TILE_MONS_SKELETAL_WARRIOR: + case TILE_MONS_MERMAID: + case TILE_MONS_MERMAID_WATER: + case TILE_MONS_MERFOLK_FIGHTER: + case TILE_MONS_MERFOLK_FIGHTER_WATER: if (eq != 0 ) t = flag | TileMcacheFind(t0, eq); -- cgit v1.2.3-54-g00ecf