Merge branch 'master' into wizlab

11 files changed, 10 insertions, 1 deletions

diff --git a/crawl-ref/source/rltiles/UNUSED/other/reaping-2.png b/crawl-ref/source/rltiles/UNUSED/other/reaping-2.png
new file mode 100644
index 0000000000..e5974b13b7
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/other/reaping-2.png
diff --git a/crawl-ref/source/rltiles/UNUSED/other/reaping-3.png b/crawl-ref/source/rltiles/UNUSED/other/reaping-3.png
new file mode 100644
index 0000000000..5cf630aac5
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/other/reaping-3.png
diff --git a/crawl-ref/source/rltiles/dc-dngn.txt b/crawl-ref/source/rltiles/dc-dngn.txt
index 37937cb390..0f49bf72cc 100644
--- a/crawl-ref/source/rltiles/dc-dngn.txt
+++ b/crawl-ref/source/rltiles/dc-dngn.txt
@@ -492,7 +492,7 @@ dngn_altar_jiyva DNGN_ALTAR_JIYVA
 %rim 1
 dngn_altar_fedhas DNGN_ALTAR_FEDHAS
 %rim 0
-dngn_altar DNGN_ALTAR_CHEIBRIADOS
+dngn_altar_cheibriados DNGN_ALTAR_CHEIBRIADOS
 
 %sdir dc-dngn
 dngn_blue_fountain DNGN_BLUE_FOUNTAIN
diff --git a/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_cheibriados.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_cheibriados.png
new file mode 100644
index 0000000000..bfebb6344b
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_cheibriados.png
diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt
index 12de4422f8..8d775bcb29 100644
--- a/crawl-ref/source/rltiles/dc-item.txt
+++ b/crawl-ref/source/rltiles/dc-item.txt
@@ -137,6 +137,8 @@ lajatang2
 %sdir item/weapon/brands
 %shrink 0
 %rim 0
+# The order of weapon brands must be identical to the one defined
+# in itemprop-enum.h.
 i-flaming BRAND_FLAMING
 i-freezing BRAND_FREEZING
 i-holy_wrath BRAND_HOLY_WRATH
@@ -156,6 +158,10 @@ i-distortion BRAND_DISTORTION
 i-reaching BRAND_REACHING
 i-returning BRAND_RETURNING
 i-chaos BRAND_CHAOS
+# confuse
+# penetration
+i-reaping BRAND_REAPING
+# missile-only brands
 i-venom BRAND_POISONED
 i-curare BRAND_CURARE
 %rim 1
diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index 7a6867737b..e87d129684 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -312,6 +312,7 @@ louise MONS_LOUISE
 margery MONS_MARGERY
 maud MONS_MAUD
 maurice MONS_MAURICE
+nikola MONS_NIKOLA
 norbert MONS_NORBERT
 norris MONS_NORRIS
 psyche MONS_PSYCHE
@@ -436,6 +437,7 @@ ancient_lich MONS_ANCIENT_LICH
 ## Mummies ('M')
 %sdir dc-mon/unique
 menkaure MONS_MENKAURE
+khufu MONS_KHUFU
 %sdir dc-mon
 mummy MONS_MUMMY
 guardian_mummy MONS_GUARDIAN_MUMMY
diff --git a/crawl-ref/source/rltiles/dc-mon/unique/khufu.png b/crawl-ref/source/rltiles/dc-mon/unique/khufu.png
new file mode 100644
index 0000000000..09fe0876da
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/unique/khufu.png
diff --git a/crawl-ref/source/rltiles/dc-mon/unique/nikola.png b/crawl-ref/source/rltiles/dc-mon/unique/nikola.png
new file mode 100644
index 0000000000..3d2e235670
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/unique/nikola.png
diff --git a/crawl-ref/source/rltiles/dc-player.txt b/crawl-ref/source/rltiles/dc-player.txt
index 7118b954a2..92e218a444 100644
--- a/crawl-ref/source/rltiles/dc-player.txt
+++ b/crawl-ref/source/rltiles/dc-player.txt
@@ -481,6 +481,7 @@ sabre SABRE
 sword3 SWORD3
 sword_breaker SWORD_BREAKER
 sword_jag SWORD_JAG
+demonblade DEMON_BLADE
 
 ## blunt
 club CLUB
diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-reaping.png b/crawl-ref/source/rltiles/item/weapon/brands/i-reaping.png
new file mode 100644
index 0000000000..28e5fc42df
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/weapon/brands/i-reaping.png
diff --git a/crawl-ref/source/rltiles/player/hand1/demonblade.png b/crawl-ref/source/rltiles/player/hand1/demonblade.png
new file mode 100644
index 0000000000..8a670e6e94
--- /dev/null
+++ b/crawl-ref/source/rltiles/player/hand1/demonblade.png