Merge branch 'master' into wizlab

26 files changed, 26 insertions, 5 deletions

diff --git a/crawl-ref/source/rltiles/UNUSED/monsters/giant_leech.png b/crawl-ref/source/rltiles/UNUSED/monsters/giant_leech.png
new file mode 100644
index 0000000000..7bb57ead17
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/monsters/giant_leech.png
diff --git a/crawl-ref/source/rltiles/dc-mon/guardian_naga.png b/crawl-ref/source/rltiles/UNUSED/monsters/guardian_naga.png
index aa7aed8e08..aa7aed8e08 100644
--- a/crawl-ref/source/rltiles/dc-mon/guardian_naga.png
+++ b/crawl-ref/source/rltiles/UNUSED/monsters/guardian_naga.png
diff --git a/crawl-ref/source/rltiles/UNUSED/monsters/naga_warrior_unique.png b/crawl-ref/source/rltiles/UNUSED/monsters/naga_warrior_unique.png
new file mode 100644
index 0000000000..dc580c3c57
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/monsters/naga_warrior_unique.png
diff --git a/crawl-ref/source/rltiles/dc-corpse.txt b/crawl-ref/source/rltiles/dc-corpse.txt
index 14b7bf8b06..f947bf65b0 100644
--- a/crawl-ref/source/rltiles/dc-corpse.txt
+++ b/crawl-ref/source/rltiles/dc-corpse.txt
@@ -107,7 +107,7 @@ small_snake CORPSE_SMALL_SNAKE
 snake CORPSE_SNAKE
 black_mamba CORPSE_BLACK_MAMBA
 water_moccasin CORPSE_WATER_MOCCASIN
-grey_snake CORPSE_GREY_SNAKE
+anaconda CORPSE_ANACONDA
 viper CORPSE_VIPER
 
 ## Bears ('U')
@@ -224,7 +224,7 @@ big_kobold CORPSE_BIG_KOBOLD
 
 ## Nagas ('N')
 naga CORPSE_NAGA
-guardian_naga CORPSE_GUARDIAN_NAGA
+guardian_serpent CORPSE_GUARDIAN_SERPENT
 
 ## Ogres ('O')
 ogre CORPSE_OGRE
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/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index 0b1d2f1a80..b162e9ad2a 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -129,7 +129,7 @@ small_snake MONS_SMALL_SNAKE
 snake MONS_SNAKE
 black_mamba MONS_BLACK_MAMBA
 water_moccasin MONS_WATER_MOCCASIN
-grey_snake MONS_GREY_SNAKE
+anaconda MONS_ANACONDA
 lava_snake MONS_LAVA_SNAKE
 viper MONS_VIPER
 salamander MONS_SALAMANDER
@@ -309,6 +309,7 @@ kirke MONS_KIRKE
 louise MONS_LOUISE
 margery MONS_MARGERY
 maud MONS_MAUD
+maurice MONS_MAURICE
 norbert MONS_NORBERT
 norris MONS_NORRIS
 psyche MONS_PSYCHE
@@ -438,11 +439,14 @@ greater_mummy MONS_GREATER_MUMMY
 mummy_priest MONS_MUMMY_PRIEST
 
 ## Nagas ('N')
+%sdir dc-mon/unique
+aizul MONS_AIZUL
+%sdir dc-mon
 naga MONS_NAGA
-guardian_naga MONS_GUARDIAN_NAGA
 naga_mage MONS_NAGA_MAGE
 naga_warrior MONS_NAGA_WARRIOR
 greater_naga MONS_GREATER_NAGA
+guardian_serpent MONS_GUARDIAN_SERPENT
 
 ## Ogres ('O')
 %sdir dc-mon/unique
@@ -528,6 +532,7 @@ wandering_mushroom MONS_WANDERING_MUSHROOM
 ## Goblins ('g')
 %sdir dc-mon/unique
 ijyb MONS_IJYB
+crazy_yiuf MONS_CRAZY_YIUF
 grum MONS_GRUM
 %sdir dc-mon
 goblin MONS_GOBLIN
@@ -636,3 +641,6 @@ lich TRAN_LICH
 
 dc-misc/unseen_monster MONS_UNKNOWN
 dc-misc/unseen_monster MCACHE_START
+%sdir dc-misc
+todo TODO
+error ERROR
diff --git a/crawl-ref/source/rltiles/dc-mon/animals/grey_snake.png b/crawl-ref/source/rltiles/dc-mon/animals/anaconda.png
index 2da9df3b93..2da9df3b93 100644
--- a/crawl-ref/source/rltiles/dc-mon/animals/grey_snake.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/anaconda.png
diff --git a/crawl-ref/source/rltiles/dc-mon/animals/giant_leech.png b/crawl-ref/source/rltiles/dc-mon/animals/giant_leech.png
index 7bb57ead17..fd886aecbc 100644
--- a/crawl-ref/source/rltiles/dc-mon/animals/giant_leech.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/giant_leech.png
diff --git a/crawl-ref/source/rltiles/dc-mon/guardian_serpent.png b/crawl-ref/source/rltiles/dc-mon/guardian_serpent.png
new file mode 100644
index 0000000000..dcddb5e2e9
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/guardian_serpent.png
diff --git a/crawl-ref/source/rltiles/dc-mon/unique/aizul.png b/crawl-ref/source/rltiles/dc-mon/unique/aizul.png
new file mode 100644
index 0000000000..89098d2f68
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/unique/aizul.png
diff --git a/crawl-ref/source/rltiles/dc-mon/unique/crazy_yiuf.png b/crawl-ref/source/rltiles/dc-mon/unique/crazy_yiuf.png
new file mode 100644
index 0000000000..4f2ea63dd9
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/unique/crazy_yiuf.png
diff --git a/crawl-ref/source/rltiles/dc-mon/unique/maurice.png b/crawl-ref/source/rltiles/dc-mon/unique/maurice.png
new file mode 100644
index 0000000000..284ad4645c
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/unique/maurice.png
diff --git a/crawl-ref/source/rltiles/dc-player.txt b/crawl-ref/source/rltiles/dc-player.txt
index 2cfc521901..7118b954a2 100644
--- a/crawl-ref/source/rltiles/dc-player.txt
+++ b/crawl-ref/source/rltiles/dc-player.txt
@@ -6,7 +6,6 @@
 %include dc-mon.txt
 
 effect/net_trap TRAP_NET
-dc-misc/error ERROR
 dc-misc/cursor CURSOR
 
 %rim 1
diff --git a/crawl-ref/source/rltiles/dc-unrand.txt b/crawl-ref/source/rltiles/dc-unrand.txt
index 82f5f3bafc..37c833f358 100644
--- a/crawl-ref/source/rltiles/dc-unrand.txt
+++ b/crawl-ref/source/rltiles/dc-unrand.txt
@@ -28,6 +28,7 @@ urand_starlight UNRAND_STARLIGHT
 urand_ratskin_cloak UNRAND_RATSKIN_CLOAK
 urand_gong UNRAND_GONG
 urand_clouds UNRAND_RCLOUDS
+urand_pondering UNRAND_PONDERING
 
 %sdir item/weapon/artefact
 spwpn_singing_sword UNRAND_SINGING_SWORD
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/effect/cloud_mutagenic_large1.png
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/effect/cloud_mutagenic_large2.png
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/effect/cloud_mutagenic_large3.png
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/effect/cloud_mutagenic_large4.png
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/effect/cloud_mutagenic_medium1.png
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/effect/cloud_mutagenic_medium2.png
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/effect/cloud_mutagenic_small1.png
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/effect/cloud_mutagenic_small2.png
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/effect/cloud_rain1.png
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/effect/cloud_rain2.png
diff --git a/crawl-ref/source/rltiles/item/armour/artefact/urand_pondering.png b/crawl-ref/source/rltiles/item/armour/artefact/urand_pondering.png
new file mode 100644
index 0000000000..2112c795bf
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/armour/artefact/urand_pondering.png
diff --git a/crawl-ref/source/rltiles/tiledef-unrand.cc b/crawl-ref/source/rltiles/tiledef-unrand.cc
index d94fb597a4..fc02792ad8 100644
--- a/crawl-ref/source/rltiles/tiledef-unrand.cc
+++ b/crawl-ref/source/rltiles/tiledef-unrand.cc
@@ -94,6 +94,7 @@ int unrandart_to_tile(int unrand)
     case UNRAND_MAGE:              return TILE_UNRAND_MAGE;
     case UNRAND_SHIELDING:         return TILE_UNRAND_SHIELDING;
     case UNRAND_RCLOUDS:           return TILE_UNRAND_RCLOUDS;
+    case UNRAND_PONDERING:         return TILE_UNRAND_PONDERING;
     default: return -1;
     }
 }
@@ -179,6 +180,7 @@ int unrandart_to_doll_tile(int unrand)
     case UNRAND_BEAR_SPIRIT:       return TILEP_HELM_BEAR;
     case UNRAND_DRAGONMASK:        return TILEP_HELM_ART_DRAGONHELM;
     case UNRAND_ALCHEMIST:         return TILEP_HELM_TURBAN_PURPLE;
+    case UNRAND_PONDERING:         return TILEP_HELM_WIZARD_BLUEGREEN;
     default: return -1;
     }
 }