[crawl-ref-commits] master branch updated: 0.13-a0-2586-gd3544ab

[<gi...@cr...>]

       via  d3544abd7c0bef0f23132b9d889896e47958649a (commit)
      from  68e23464dc679fddf4598c3a61e504d75e18a316 (commit)

-----------------------------------------------------------------------
commit d3544abd7c0bef0f23132b9d889896e47958649a
Author: ontoclasm <yok...@gm...>
Date:   Wed Jul 31 22:47:15 2013 +0100

    Undead ugly things

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/rltiles/dc-zombie.txt             |    2 ++
 .../mon/undead/skeletons/skeleton_ugly_thing.png   |  Bin 0 -> 294 bytes
 .../mon/undead/zombies/zombie_ugly_thing.png       |  Bin 0 -> 1068 bytes
 crawl-ref/source/tilepick.cc                       |    7 +++++++
 4 files changed, 9 insertions(+), 0 deletions(-)
 create mode 100644 crawl-ref/source/rltiles/mon/undead/skeletons/skeleton_ugly_thing.png
 create mode 100644 crawl-ref/source/rltiles/mon/undead/zombies/zombie_ugly_thing.png

diff --git a/crawl-ref/source/rltiles/dc-zombie.txt b/crawl-ref/source/rltiles/dc-zombie.txt
index 4fb2716..f48e003 100644
--- a/crawl-ref/source/rltiles/dc-zombie.txt
+++ b/crawl-ref/source/rltiles/dc-zombie.txt
@@ -33,6 +33,7 @@ zombie_quadruped_winged MONS_ZOMBIE_QUADRUPED_WINGED
 zombie_harpy MONS_ZOMBIE_HARPY
 zombie_octopode MONS_ZOMBIE_OCTOPODE
 %rim 0
+zombie_ugly_thing MONS_ZOMBIE_UGLY_THING
 zombie_turtle MONS_ZOMBIE_TURTLE
 zombie_crab MONS_ZOMBIE_CRAB
 %rim 1
@@ -59,6 +60,7 @@ skeleton_hydra2
 skeleton_hydra3
 skeleton_hydra4
 skeleton_hydra5
+skeleton_ugly_thing MONS_SKELETON_UGLY_THING
 
 ## Simulacra
 %sdir mon/undead/simulacra
diff --git a/crawl-ref/source/rltiles/mon/undead/skeletons/skeleton_ugly_thing.png b/crawl-ref/source/rltiles/mon/undead/skeletons/skeleton_ugly_thing.png
new file mode 100644
index 0000000..8dc23eb
Binary files /dev/null and b/crawl-ref/source/rltiles/mon/undead/skeletons/skeleton_ugly_thing.png differ
diff --git a/crawl-ref/source/rltiles/mon/undead/zombies/zombie_ugly_thing.png b/crawl-ref/source/rltiles/mon/undead/zombies/zombie_ugly_thing.png
new file mode 100644
index 0000000..d7e4dab
Binary files /dev/null and b/crawl-ref/source/rltiles/mon/undead/zombies/zombie_ugly_thing.png differ
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 2805ae4..5a9b7d2 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -754,6 +754,8 @@ static tileidx_t _zombie_tile_to_skeleton(const tileidx_t z_tile)
         return TILEP_MONS_SKELETON_DRAGON;
     case TILEP_MONS_ZOMBIE_DRAKE:
         return TILEP_MONS_SKELETON_DRAKE;
+    case TILEP_MONS_ZOMBIE_UGLY_THING:
+        return TILEP_MONS_SKELETON_UGLY_THING;
     default:
         if (tile_player_basetile(z_tile) == TILEP_MONS_ZOMBIE_HYDRA)
         {
@@ -906,6 +908,11 @@ static tileidx_t _tileidx_monster_zombified(const monster_info& mon)
             z_tile = TILEP_MONS_ZOMBIE_OCTOPODE;
             break;
         }
+        else if (mons_genus(subtype) == MONS_UGLY_THING)
+        {
+            z_tile = TILEP_MONS_ZOMBIE_UGLY_THING;
+            break;
+        }
     default:
         z_tile = TILEP_ERROR;
     }


-- 
Dungeon Crawl Stone Soup