diff options
author | Johanna Ploog <j-p-e-g@users.sourceforge.net> | 2010-01-15 17:35:58 +0100 |
---|---|---|
committer | Johanna Ploog <j-p-e-g@users.sourceforge.net> | 2010-01-15 17:40:12 +0100 |
commit | 11b086105f15c5bfaf429b9715b02ad65c7c0539 (patch) | |
tree | 29427a93702a941205c6735c5ba63ec5e98349da /crawl-ref/source/rltiles | |
parent | 27a4db5c21d92e71ea158d8f0f9f8c9eec9c2770 (diff) | |
download | crawl-ref-11b086105f15c5bfaf429b9715b02ad65c7c0539.tar.gz crawl-ref-11b086105f15c5bfaf429b9715b02ad65c7c0539.zip |
Add tiles for the new merfolk monsters.
The plain merfolk is only used for the corpse tile but I decided to add
it anyway, especially as I'm considering using that for the base merfolk
and the current fighter one for the impaler.
Diffstat (limited to 'crawl-ref/source/rltiles')
-rw-r--r-- | crawl-ref/source/rltiles/dc-corpse.txt | 2 | ||||
-rw-r--r-- | crawl-ref/source/rltiles/dc-mon.txt | 10 | ||||
-rw-r--r-- | crawl-ref/source/rltiles/dc-mon/merfolk_aquamancer.png | bin | 0 -> 655 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-mon/merfolk_aquamancer_water.png | bin | 0 -> 706 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-mon/merfolk_fighter.png | bin | 632 -> 663 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-mon/merfolk_fighter_water.png | bin | 628 -> 651 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-mon/merfolk_impaler.png | bin | 0 -> 859 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-mon/merfolk_impaler_water.png | bin | 0 -> 841 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-mon/merfolk_javelineer.png | bin | 0 -> 730 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-mon/merfolk_javelineer_water.png | bin | 0 -> 705 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-mon/merfolk_plain.png | bin | 0 -> 573 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-mon/merfolk_plain_water.png | bin | 0 -> 548 bytes |
12 files changed, 9 insertions, 3 deletions
diff --git a/crawl-ref/source/rltiles/dc-corpse.txt b/crawl-ref/source/rltiles/dc-corpse.txt index d09ab1bde0..a84382fe81 100644 --- a/crawl-ref/source/rltiles/dc-corpse.txt +++ b/crawl-ref/source/rltiles/dc-corpse.txt @@ -155,7 +155,7 @@ hobgoblin CORPSE_HOBGOBLIN gnoll CORPSE_GNOLL ## Merfolk ('m') -merfolk_fighter_water CORPSE_MERFOLK_FIGHTER +merfolk_plain_water CORPSE_MERFOLK mermaid_water CORPSE_MERMAID siren_water CORPSE_SIREN diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt index 6556218d27..ba9a1893e6 100644 --- a/crawl-ref/source/rltiles/dc-mon.txt +++ b/crawl-ref/source/rltiles/dc-mon.txt @@ -611,8 +611,14 @@ boggart MONS_BOGGART ilsuiw MONS_ILSUIW ilsuiw_water MONS_ILSUIW_WATER %sdir dc-mon -merfolk_fighter MONS_MERFOLK_FIGHTER -merfolk_fighter_water MONS_MERFOLK_FIGHTER_WATER +merfolk_fighter MONS_MERFOLK +merfolk_fighter_water MONS_MERFOLK_WATER +merfolk_javelineer MONS_MERFOLK_JAVELINEER +merfolk_javelineer_water MONS_MERFOLK_JAVELINEER_WATER +merfolk_impaler MONS_MERFOLK_IMPALER +merfolk_impaler_water MONS_MERFOLK_IMPALER_WATER +merfolk_aquamancer MONS_MERFOLK_AQUAMANCER +merfolk_aquamancer_water MONS_MERFOLK_AQUAMANCER_WATER mermaid MONS_MERMAID mermaid_water MONS_MERMAID_WATER siren MONS_SIREN diff --git a/crawl-ref/source/rltiles/dc-mon/merfolk_aquamancer.png b/crawl-ref/source/rltiles/dc-mon/merfolk_aquamancer.png Binary files differnew file mode 100644 index 0000000000..99d25bb2ab --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/merfolk_aquamancer.png diff --git a/crawl-ref/source/rltiles/dc-mon/merfolk_aquamancer_water.png b/crawl-ref/source/rltiles/dc-mon/merfolk_aquamancer_water.png Binary files differnew file mode 100644 index 0000000000..2f0864ee19 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/merfolk_aquamancer_water.png diff --git a/crawl-ref/source/rltiles/dc-mon/merfolk_fighter.png b/crawl-ref/source/rltiles/dc-mon/merfolk_fighter.png Binary files differindex 4e0222ad7f..0d07b67013 100644 --- a/crawl-ref/source/rltiles/dc-mon/merfolk_fighter.png +++ b/crawl-ref/source/rltiles/dc-mon/merfolk_fighter.png diff --git a/crawl-ref/source/rltiles/dc-mon/merfolk_fighter_water.png b/crawl-ref/source/rltiles/dc-mon/merfolk_fighter_water.png Binary files differindex 9f2d185c9e..0ae6bfccc5 100644 --- a/crawl-ref/source/rltiles/dc-mon/merfolk_fighter_water.png +++ b/crawl-ref/source/rltiles/dc-mon/merfolk_fighter_water.png diff --git a/crawl-ref/source/rltiles/dc-mon/merfolk_impaler.png b/crawl-ref/source/rltiles/dc-mon/merfolk_impaler.png Binary files differnew file mode 100644 index 0000000000..53ae9833f5 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/merfolk_impaler.png diff --git a/crawl-ref/source/rltiles/dc-mon/merfolk_impaler_water.png b/crawl-ref/source/rltiles/dc-mon/merfolk_impaler_water.png Binary files differnew file mode 100644 index 0000000000..0eade1d50a --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/merfolk_impaler_water.png diff --git a/crawl-ref/source/rltiles/dc-mon/merfolk_javelineer.png b/crawl-ref/source/rltiles/dc-mon/merfolk_javelineer.png Binary files differnew file mode 100644 index 0000000000..1efe385506 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/merfolk_javelineer.png diff --git a/crawl-ref/source/rltiles/dc-mon/merfolk_javelineer_water.png b/crawl-ref/source/rltiles/dc-mon/merfolk_javelineer_water.png Binary files differnew file mode 100644 index 0000000000..789fe94387 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/merfolk_javelineer_water.png diff --git a/crawl-ref/source/rltiles/dc-mon/merfolk_plain.png b/crawl-ref/source/rltiles/dc-mon/merfolk_plain.png Binary files differnew file mode 100644 index 0000000000..ddc4c9f6e5 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/merfolk_plain.png diff --git a/crawl-ref/source/rltiles/dc-mon/merfolk_plain_water.png b/crawl-ref/source/rltiles/dc-mon/merfolk_plain_water.png Binary files differnew file mode 100644 index 0000000000..22f8436586 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/merfolk_plain_water.png |