From 86e253afdc5b7ba741543457b63331a51d194c4f Mon Sep 17 00:00:00 2001 From: Johanna Ploog Date: Sat, 12 Dec 2009 22:43:58 +0100 Subject: Add tiles for rain clouds and mutagenic fog. --- crawl-ref/source/rltiles/dc-misc.txt | 11 +++++++++++ .../source/rltiles/effect/cloud_mutagenic_large1.png | Bin 0 -> 1979 bytes .../source/rltiles/effect/cloud_mutagenic_large2.png | Bin 0 -> 2253 bytes .../source/rltiles/effect/cloud_mutagenic_large3.png | Bin 0 -> 2115 bytes .../source/rltiles/effect/cloud_mutagenic_large4.png | Bin 0 -> 2298 bytes .../source/rltiles/effect/cloud_mutagenic_medium1.png | Bin 0 -> 1737 bytes .../source/rltiles/effect/cloud_mutagenic_medium2.png | Bin 0 -> 1852 bytes .../source/rltiles/effect/cloud_mutagenic_small1.png | Bin 0 -> 1518 bytes .../source/rltiles/effect/cloud_mutagenic_small2.png | Bin 0 -> 1593 bytes crawl-ref/source/rltiles/effect/cloud_rain1.png | Bin 0 -> 1350 bytes crawl-ref/source/rltiles/effect/cloud_rain2.png | Bin 0 -> 1373 bytes crawl-ref/source/tilepick.cc | 15 +++++++++++++++ 12 files changed, 26 insertions(+) create mode 100644 crawl-ref/source/rltiles/effect/cloud_mutagenic_large1.png create mode 100644 crawl-ref/source/rltiles/effect/cloud_mutagenic_large2.png create mode 100644 crawl-ref/source/rltiles/effect/cloud_mutagenic_large3.png create mode 100644 crawl-ref/source/rltiles/effect/cloud_mutagenic_large4.png create mode 100644 crawl-ref/source/rltiles/effect/cloud_mutagenic_medium1.png create mode 100644 crawl-ref/source/rltiles/effect/cloud_mutagenic_medium2.png create mode 100644 crawl-ref/source/rltiles/effect/cloud_mutagenic_small1.png create mode 100644 crawl-ref/source/rltiles/effect/cloud_mutagenic_small2.png create mode 100644 crawl-ref/source/rltiles/effect/cloud_rain1.png create mode 100644 crawl-ref/source/rltiles/effect/cloud_rain2.png (limited to 'crawl-ref') diff --git a/crawl-ref/source/rltiles/dc-misc.txt b/crawl-ref/source/rltiles/dc-misc.txt index 082d35c8a0..653b614435 100644 --- a/crawl-ref/source/rltiles/dc-misc.txt +++ b/crawl-ref/source/rltiles/dc-misc.txt @@ -24,6 +24,17 @@ cloud_blue_smoke CLOUD_BLUE_SMOKE cloud_grey_smoke CLOUD_GREY_SMOKE cloud_miasma CLOUD_MIASMA cloud_tloc_energy CLOUD_TLOC_ENERGY +cloud_mutagenic_small1 CLOUD_MUTAGENIC_0 +cloud_mutagenic_small2 +cloud_mutagenic_medium1 CLOUD_MUTAGENIC_1 +cloud_mutagenic_medium2 +cloud_mutagenic_large1 CLOUD_MUTAGENIC_2 +cloud_mutagenic_large2 +cloud_mutagenic_large3 +cloud_mutagenic_large4 +cloud_rain1 CLOUD_RAIN +cloud_rain2 +cloud_grey_smoke CLOUD_MIST #########MAP %sdir dc-misc diff --git a/crawl-ref/source/rltiles/effect/cloud_mutagenic_large1.png b/crawl-ref/source/rltiles/effect/cloud_mutagenic_large1.png new file mode 100644 index 0000000000..4981568033 Binary files /dev/null and b/crawl-ref/source/rltiles/effect/cloud_mutagenic_large1.png differ diff --git a/crawl-ref/source/rltiles/effect/cloud_mutagenic_large2.png b/crawl-ref/source/rltiles/effect/cloud_mutagenic_large2.png new file mode 100644 index 0000000000..dd8be346e9 Binary files /dev/null and b/crawl-ref/source/rltiles/effect/cloud_mutagenic_large2.png differ diff --git a/crawl-ref/source/rltiles/effect/cloud_mutagenic_large3.png b/crawl-ref/source/rltiles/effect/cloud_mutagenic_large3.png new file mode 100644 index 0000000000..3ccb9310c4 Binary files /dev/null and b/crawl-ref/source/rltiles/effect/cloud_mutagenic_large3.png differ diff --git a/crawl-ref/source/rltiles/effect/cloud_mutagenic_large4.png b/crawl-ref/source/rltiles/effect/cloud_mutagenic_large4.png new file mode 100644 index 0000000000..84c4361773 Binary files /dev/null and b/crawl-ref/source/rltiles/effect/cloud_mutagenic_large4.png differ diff --git a/crawl-ref/source/rltiles/effect/cloud_mutagenic_medium1.png b/crawl-ref/source/rltiles/effect/cloud_mutagenic_medium1.png new file mode 100644 index 0000000000..270ac1fe87 Binary files /dev/null and b/crawl-ref/source/rltiles/effect/cloud_mutagenic_medium1.png differ diff --git a/crawl-ref/source/rltiles/effect/cloud_mutagenic_medium2.png b/crawl-ref/source/rltiles/effect/cloud_mutagenic_medium2.png new file mode 100644 index 0000000000..0eab442177 Binary files /dev/null and b/crawl-ref/source/rltiles/effect/cloud_mutagenic_medium2.png differ diff --git a/crawl-ref/source/rltiles/effect/cloud_mutagenic_small1.png b/crawl-ref/source/rltiles/effect/cloud_mutagenic_small1.png new file mode 100644 index 0000000000..84581c10ca Binary files /dev/null and b/crawl-ref/source/rltiles/effect/cloud_mutagenic_small1.png differ diff --git a/crawl-ref/source/rltiles/effect/cloud_mutagenic_small2.png b/crawl-ref/source/rltiles/effect/cloud_mutagenic_small2.png new file mode 100644 index 0000000000..3ca327c057 Binary files /dev/null and b/crawl-ref/source/rltiles/effect/cloud_mutagenic_small2.png differ diff --git a/crawl-ref/source/rltiles/effect/cloud_rain1.png b/crawl-ref/source/rltiles/effect/cloud_rain1.png new file mode 100644 index 0000000000..58a2e0970f Binary files /dev/null and b/crawl-ref/source/rltiles/effect/cloud_rain1.png differ diff --git a/crawl-ref/source/rltiles/effect/cloud_rain2.png b/crawl-ref/source/rltiles/effect/cloud_rain2.png new file mode 100644 index 0000000000..b4086d81a7 Binary files /dev/null and b/crawl-ref/source/rltiles/effect/cloud_rain2.png differ diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 1fbbb89ccd..68a93a214a 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -2622,6 +2622,21 @@ static int _tileidx_cloud(int type, int decay) ch = TILE_CLOUD_BLACK_SMOKE; break; + case CLOUD_MUTAGENIC: + ch = (dur == 0 ? TILE_CLOUD_MUTAGENIC_0 : + dur == 1 ? TILE_CLOUD_MUTAGENIC_1 + : TILE_CLOUD_MUTAGENIC_2); + ch += random2(tile_main_count(ch)); + break; + + case CLOUD_MIST: + ch = TILE_CLOUD_MIST; + break; + + case CLOUD_RAIN: + ch = TILE_CLOUD_RAIN + random2(tile_main_count(TILE_CLOUD_RAIN)); + break; + default: ch = TILE_CLOUD_GREY_SMOKE; break; -- cgit v1.2.3-54-g00ecf