diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-11 13:40:58 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-11 13:40:58 +0000 |
| commit | b2f8c7c8b8b10ef1dfa704ed06612416f39ce858 (patch) | |
| tree | 21b2560c49d594bb198750cc989ca929a5cbe815 /crawl-ref/source/rltiles | |
| parent | 2ca53ae21f30a3917f7e2920474c81eec0c29bab (diff) | |
| download | crawl-ref-b2f8c7c8b8b10ef1dfa704ed06612416f39ce858.tar.gz crawl-ref-b2f8c7c8b8b10ef1dfa704ed06612416f39ce858.zip | |
Adding merfolk monster tiles.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3246 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/rltiles')
| -rw-r--r-- | crawl-ref/source/rltiles/dc-co.txt | 4 | ||||
| -rw-r--r-- | crawl-ref/source/rltiles/dc-mon.txt | 5 | ||||
| -rw-r--r-- | crawl-ref/source/rltiles/dc-mon/merfolk_fighter.bmp | bin | 0 -> 2102 bytes | |||
| -rw-r--r-- | crawl-ref/source/rltiles/dc-mon/merfolk_fighter_water.bmp | bin | 0 -> 2102 bytes | |||
| -rw-r--r-- | crawl-ref/source/rltiles/dc-mon/mermaid.bmp (renamed from crawl-ref/source/rltiles/player/base/merfolk_fs.bmp) | bin | 2102 -> 2102 bytes | |||
| -rw-r--r-- | crawl-ref/source/rltiles/dc-mon/mermaid_water.bmp | bin | 0 -> 2102 bytes | |||
| -rw-r--r-- | crawl-ref/source/rltiles/player/base/merfolk_f.bmp | bin | 2102 -> 2102 bytes | |||
| -rw-r--r-- | crawl-ref/source/rltiles/player/base/merfolk_ms.bmp | bin | 2102 -> 0 bytes | |||
| -rw-r--r-- | crawl-ref/source/rltiles/player/base/merfolk_water_f.bmp | bin | 2102 -> 2102 bytes |
9 files changed, 9 insertions, 0 deletions
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 Binary files differnew file mode 100644 index 0000000000..a8b8168fe9 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/merfolk_fighter.bmp diff --git a/crawl-ref/source/rltiles/dc-mon/merfolk_fighter_water.bmp b/crawl-ref/source/rltiles/dc-mon/merfolk_fighter_water.bmp Binary files differnew file mode 100644 index 0000000000..65d11fa2ab --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/merfolk_fighter_water.bmp diff --git a/crawl-ref/source/rltiles/player/base/merfolk_fs.bmp b/crawl-ref/source/rltiles/dc-mon/mermaid.bmp Binary files differindex ceb382faa9..8475a2a897 100644 --- a/crawl-ref/source/rltiles/player/base/merfolk_fs.bmp +++ b/crawl-ref/source/rltiles/dc-mon/mermaid.bmp diff --git a/crawl-ref/source/rltiles/dc-mon/mermaid_water.bmp b/crawl-ref/source/rltiles/dc-mon/mermaid_water.bmp Binary files differnew file mode 100644 index 0000000000..83f5c48533 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/mermaid_water.bmp diff --git a/crawl-ref/source/rltiles/player/base/merfolk_f.bmp b/crawl-ref/source/rltiles/player/base/merfolk_f.bmp Binary files differindex 365375dfd3..2ea19fb6b7 100644 --- a/crawl-ref/source/rltiles/player/base/merfolk_f.bmp +++ b/crawl-ref/source/rltiles/player/base/merfolk_f.bmp diff --git a/crawl-ref/source/rltiles/player/base/merfolk_ms.bmp b/crawl-ref/source/rltiles/player/base/merfolk_ms.bmp Binary files differdeleted file mode 100644 index ddf196aeef..0000000000 --- a/crawl-ref/source/rltiles/player/base/merfolk_ms.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/player/base/merfolk_water_f.bmp b/crawl-ref/source/rltiles/player/base/merfolk_water_f.bmp Binary files differindex 5785b9ddf8..52f41c81d6 100644 --- a/crawl-ref/source/rltiles/player/base/merfolk_water_f.bmp +++ b/crawl-ref/source/rltiles/player/base/merfolk_water_f.bmp |
