From 11b086105f15c5bfaf429b9715b02ad65c7c0539 Mon Sep 17 00:00:00 2001 From: Johanna Ploog Date: Fri, 15 Jan 2010 17:35:58 +0100 Subject: 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. --- crawl-ref/source/rltiles/dc-corpse.txt | 2 +- crawl-ref/source/rltiles/dc-mon.txt | 10 +++++++-- .../source/rltiles/dc-mon/merfolk_aquamancer.png | Bin 0 -> 655 bytes .../rltiles/dc-mon/merfolk_aquamancer_water.png | Bin 0 -> 706 bytes .../source/rltiles/dc-mon/merfolk_fighter.png | Bin 632 -> 663 bytes .../rltiles/dc-mon/merfolk_fighter_water.png | Bin 628 -> 651 bytes .../source/rltiles/dc-mon/merfolk_impaler.png | Bin 0 -> 859 bytes .../rltiles/dc-mon/merfolk_impaler_water.png | Bin 0 -> 841 bytes .../source/rltiles/dc-mon/merfolk_javelineer.png | Bin 0 -> 730 bytes .../rltiles/dc-mon/merfolk_javelineer_water.png | Bin 0 -> 705 bytes crawl-ref/source/rltiles/dc-mon/merfolk_plain.png | Bin 0 -> 573 bytes .../source/rltiles/dc-mon/merfolk_plain_water.png | Bin 0 -> 548 bytes crawl-ref/source/tilemcache.cc | 10 +++++++-- crawl-ref/source/tilepick.cc | 24 +++++++++++++++------ 14 files changed, 35 insertions(+), 11 deletions(-) create mode 100644 crawl-ref/source/rltiles/dc-mon/merfolk_aquamancer.png create mode 100644 crawl-ref/source/rltiles/dc-mon/merfolk_aquamancer_water.png create mode 100644 crawl-ref/source/rltiles/dc-mon/merfolk_impaler.png create mode 100644 crawl-ref/source/rltiles/dc-mon/merfolk_impaler_water.png create mode 100644 crawl-ref/source/rltiles/dc-mon/merfolk_javelineer.png create mode 100644 crawl-ref/source/rltiles/dc-mon/merfolk_javelineer_water.png create mode 100644 crawl-ref/source/rltiles/dc-mon/merfolk_plain.png create mode 100644 crawl-ref/source/rltiles/dc-mon/merfolk_plain_water.png (limited to 'crawl-ref') 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 new file mode 100644 index 0000000000..99d25bb2ab Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/merfolk_aquamancer.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/merfolk_aquamancer_water.png b/crawl-ref/source/rltiles/dc-mon/merfolk_aquamancer_water.png new file mode 100644 index 0000000000..2f0864ee19 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/merfolk_aquamancer_water.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/merfolk_fighter.png b/crawl-ref/source/rltiles/dc-mon/merfolk_fighter.png index 4e0222ad7f..0d07b67013 100644 Binary files a/crawl-ref/source/rltiles/dc-mon/merfolk_fighter.png and b/crawl-ref/source/rltiles/dc-mon/merfolk_fighter.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/merfolk_fighter_water.png b/crawl-ref/source/rltiles/dc-mon/merfolk_fighter_water.png index 9f2d185c9e..0ae6bfccc5 100644 Binary files a/crawl-ref/source/rltiles/dc-mon/merfolk_fighter_water.png and b/crawl-ref/source/rltiles/dc-mon/merfolk_fighter_water.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/merfolk_impaler.png b/crawl-ref/source/rltiles/dc-mon/merfolk_impaler.png new file mode 100644 index 0000000000..53ae9833f5 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/merfolk_impaler.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/merfolk_impaler_water.png b/crawl-ref/source/rltiles/dc-mon/merfolk_impaler_water.png new file mode 100644 index 0000000000..0eade1d50a Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/merfolk_impaler_water.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/merfolk_javelineer.png b/crawl-ref/source/rltiles/dc-mon/merfolk_javelineer.png new file mode 100644 index 0000000000..1efe385506 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/merfolk_javelineer.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/merfolk_javelineer_water.png b/crawl-ref/source/rltiles/dc-mon/merfolk_javelineer_water.png new file mode 100644 index 0000000000..789fe94387 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/merfolk_javelineer_water.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/merfolk_plain.png b/crawl-ref/source/rltiles/dc-mon/merfolk_plain.png new file mode 100644 index 0000000000..ddc4c9f6e5 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/merfolk_plain.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/merfolk_plain_water.png b/crawl-ref/source/rltiles/dc-mon/merfolk_plain_water.png new file mode 100644 index 0000000000..22f8436586 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/merfolk_plain_water.png differ diff --git a/crawl-ref/source/tilemcache.cc b/crawl-ref/source/tilemcache.cc index 7ba28a8f0e..23900dea30 100644 --- a/crawl-ref/source/tilemcache.cc +++ b/crawl-ref/source/tilemcache.cc @@ -355,10 +355,16 @@ bool mcache_monster::get_weapon_offset(int mon_tile, int &ofs_x, int &ofs_y) case TILEP_MONS_RAKSHASA_FAKE: case TILEP_MONS_VAMPIRE_KNIGHT: case TILEP_MONS_SKELETAL_WARRIOR: + case TILEP_MONS_MERFOLK: + case TILEP_MONS_MERFOLK_WATER: + case TILEP_MONS_MERFOLK_JAVELINEER: + case TILEP_MONS_MERFOLK_JAVELINEER_WATER: + case TILEP_MONS_MERFOLK_IMPALER: + case TILEP_MONS_MERFOLK_IMPALER_WATER: + case TILEP_MONS_MERFOLK_AQUAMANCER: + case TILEP_MONS_MERFOLK_AQUAMANCER_WATER: case TILEP_MONS_MERMAID: case TILEP_MONS_MERMAID_WATER: - case TILEP_MONS_MERFOLK_FIGHTER: - case TILEP_MONS_MERFOLK_FIGHTER_WATER: case TILEP_MONS_SIREN: case TILEP_MONS_SIREN_WATER: case TILEP_MONS_ILSUIW: diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index ec4b758bdc..d516e20b73 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -276,13 +276,25 @@ int tileidx_monster_base(const monsters *mon, bool detected) // merfolk ('m') case MONS_MERFOLK: - case MONS_MERFOLK_IMPALER: // TODO - case MONS_MERFOLK_AQUAMANCER: // TODO - case MONS_MERFOLK_JAVELINEER: // TODO if (in_water) - return TILEP_MONS_MERFOLK_FIGHTER_WATER; + return TILEP_MONS_MERFOLK_WATER; else - return TILEP_MONS_MERFOLK_FIGHTER; + return TILEP_MONS_MERFOLK; + case MONS_MERFOLK_IMPALER: + if (in_water) + return TILEP_MONS_MERFOLK_IMPALER_WATER; + else + return TILEP_MONS_MERFOLK_IMPALER; + case MONS_MERFOLK_AQUAMANCER: + if (in_water) + return TILEP_MONS_MERFOLK_AQUAMANCER_WATER; + else + return TILEP_MONS_MERFOLK_AQUAMANCER; + case MONS_MERFOLK_JAVELINEER: + if (in_water) + return TILEP_MONS_MERFOLK_JAVELINEER_WATER; + else + return TILEP_MONS_MERFOLK_JAVELINEER; case MONS_MERMAID: if (in_water) return TILEP_MONS_MERMAID_WATER; @@ -1811,7 +1823,7 @@ static int _tileidx_corpse(const item_def &item) // merfolk ('m') case MONS_MERFOLK: - return TILE_CORPSE_MERFOLK_FIGHTER; + return TILE_CORPSE_MERFOLK; case MONS_MERMAID: return TILE_CORPSE_MERMAID; case MONS_SIREN: -- cgit v1.2.3-54-g00ecf