Move ranged weapon tiles into new weapon/ranged folder.

Also reorder weapon tiles in dc-item.txt by skills and distribute the gem tiles
(gold, stone, rock) as appropriate into the misc and weapon/ranged folders.

21 files changed, 23 insertions, 25 deletions

diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt
index e839cbc267..16a6ba82a3 100644
--- a/crawl-ref/source/rltiles/dc-item.txt
+++ b/crawl-ref/source/rltiles/dc-item.txt
@@ -81,6 +81,9 @@ katana3
 double_sword WPN_DOUBLE_SWORD
 triple_sword WPN_TRIPLE_SWORD
 demon_blade WPN_DEMON_BLADE
+%rim 0
+blessed_blade WPN_BLESSED_BLADE
+%rim 1
 
 ##Axe
 hand_axe WPN_HAND_AXE
@@ -96,22 +99,12 @@ battle_axe3
 executioner_axe WPN_EXECUTIONERS_AXE
 executioner_axe2
 
-##Ranged
-blowgun WPN_BLOWGUN
-blowgun2
-sling WPN_SLING
-bow WPN_BOW
-bow2
-crossbow WPN_CROSSBOW
-crossbow2
-
-##Pole
-quarterstaff WPN_QUARTERSTAFF
-
+##Polearm
 elven_spear WPN_SPEAR
 spear2
 trident WPN_TRIDENT
 trident2
+demon_trident WPN_DEMON_TRIDENT
 halberd WPN_HALBERD
 halberd2
 scythe WPN_SCYTHE
@@ -122,16 +115,23 @@ orcish_glaive WPN_GLAIVE_ORC
 bardiche WPN_BARDICHE
 bardiche2
 
-demon_trident WPN_DEMON_TRIDENT
-
-# SS new weapons
-%rim 0
-blessed_blade WPN_BLESSED_BLADE
-%rim 1
-longbow WPN_LONGBOW
+##Staff
+quarterstaff WPN_QUARTERSTAFF
 lajatang WPN_LAJATANG
 lajatang2
 
+
+##Ranged
+%sdir item/weapon/ranged
+blowgun WPN_BLOWGUN
+blowgun2
+sling WPN_SLING
+bow WPN_BOW
+bow2
+crossbow WPN_CROSSBOW
+crossbow2
+longbow WPN_LONGBOW
+
 %sdir item/weapon/brands
 %shrink 0
 %rim 0
@@ -169,10 +169,10 @@ i-paralysis BRAND_PARALYSIS
 i-berserk-rage BRAND_RAGE
 %rim 1
 %shrink 1
-%sdir item/weapon
+%sdir item/weapon/ranged
 
 ######OBJ_MISSILES
-item/gem/stone MI_STONE
+stone MI_STONE
 effect/stone0 MI_STONE0
 sling_bullet MI_SLING_BULLET
 effect/sling_bullet0 MI_SLING_BULLET0
@@ -238,7 +238,7 @@ effect/throwing_net5 MI_THROWING_NET5
 effect/throwing_net6 MI_THROWING_NET6
 effect/throwing_net7 MI_THROWING_NET7
 
-item/gem/rock MI_LARGE_ROCK
+rock MI_LARGE_ROCK
 effect/rock0 MI_LARGE_ROCK0
 
 ######OBJ_ARMOUR
@@ -874,6 +874,4 @@ runes/rune_lom_lobon MISC_RUNE_LOM_LOBON
 #handled in dc-corpse.txt
 
 #OBJ_GOLD
-%sdir item/gem
-gold_piece GOLD
-#OBJ_GEMSTONES
+gold_pile GOLD
diff --git a/crawl-ref/source/rltiles/item/gem/gold_piece.png b/crawl-ref/source/rltiles/item/misc/gold_pile.png
index 672c46991e..672c46991e 100644
--- a/crawl-ref/source/rltiles/item/gem/gold_piece.png
+++ b/crawl-ref/source/rltiles/item/misc/gold_pile.png
diff --git a/crawl-ref/source/rltiles/item/weapon/arrow.png b/crawl-ref/source/rltiles/item/weapon/ranged/arrow.png
index ac56cc0aba..ac56cc0aba 100644
--- a/crawl-ref/source/rltiles/item/weapon/arrow.png
+++ b/crawl-ref/source/rltiles/item/weapon/ranged/arrow.png
diff --git a/crawl-ref/source/rltiles/item/weapon/blowgun.png b/crawl-ref/source/rltiles/item/weapon/ranged/blowgun.png
index a126f66351..a126f66351 100644
--- a/crawl-ref/source/rltiles/item/weapon/blowgun.png
+++ b/crawl-ref/source/rltiles/item/weapon/ranged/blowgun.png
diff --git a/crawl-ref/source/rltiles/item/weapon/blowgun2.png b/crawl-ref/source/rltiles/item/weapon/ranged/blowgun2.png
index 3da29b5dee..3da29b5dee 100644
--- a/crawl-ref/source/rltiles/item/weapon/blowgun2.png
+++ b/crawl-ref/source/rltiles/item/weapon/ranged/blowgun2.png
diff --git a/crawl-ref/source/rltiles/item/weapon/bow.png b/crawl-ref/source/rltiles/item/weapon/ranged/bow.png
index 86e65d6d16..86e65d6d16 100644
--- a/crawl-ref/source/rltiles/item/weapon/bow.png
+++ b/crawl-ref/source/rltiles/item/weapon/ranged/bow.png
diff --git a/crawl-ref/source/rltiles/item/weapon/bow2.png b/crawl-ref/source/rltiles/item/weapon/ranged/bow2.png
index 61a9d29ef2..61a9d29ef2 100644
--- a/crawl-ref/source/rltiles/item/weapon/bow2.png
+++ b/crawl-ref/source/rltiles/item/weapon/ranged/bow2.png
diff --git a/crawl-ref/source/rltiles/item/weapon/crossbow.png b/crawl-ref/source/rltiles/item/weapon/ranged/crossbow.png
index 5ed789b8f9..5ed789b8f9 100644
--- a/crawl-ref/source/rltiles/item/weapon/crossbow.png
+++ b/crawl-ref/source/rltiles/item/weapon/ranged/crossbow.png
diff --git a/crawl-ref/source/rltiles/item/weapon/crossbow2.png b/crawl-ref/source/rltiles/item/weapon/ranged/crossbow2.png
index f6eda6f23f..f6eda6f23f 100644
--- a/crawl-ref/source/rltiles/item/weapon/crossbow2.png
+++ b/crawl-ref/source/rltiles/item/weapon/ranged/crossbow2.png
diff --git a/crawl-ref/source/rltiles/item/weapon/crossbow_bolt.png b/crawl-ref/source/rltiles/item/weapon/ranged/crossbow_bolt.png
index fffbbe409a..fffbbe409a 100644
--- a/crawl-ref/source/rltiles/item/weapon/crossbow_bolt.png
+++ b/crawl-ref/source/rltiles/item/weapon/ranged/crossbow_bolt.png
diff --git a/crawl-ref/source/rltiles/item/weapon/dart-p.png b/crawl-ref/source/rltiles/item/weapon/ranged/dart-p.png
index ecc2c68386..ecc2c68386 100644
--- a/crawl-ref/source/rltiles/item/weapon/dart-p.png
+++ b/crawl-ref/source/rltiles/item/weapon/ranged/dart-p.png
diff --git a/crawl-ref/source/rltiles/item/weapon/dart.png b/crawl-ref/source/rltiles/item/weapon/ranged/dart.png
index 183090921e..183090921e 100644
--- a/crawl-ref/source/rltiles/item/weapon/dart.png
+++ b/crawl-ref/source/rltiles/item/weapon/ranged/dart.png
diff --git a/crawl-ref/source/rltiles/item/weapon/javelin.png b/crawl-ref/source/rltiles/item/weapon/ranged/javelin.png
index 7b5196011a..7b5196011a 100644
--- a/crawl-ref/source/rltiles/item/weapon/javelin.png
+++ b/crawl-ref/source/rltiles/item/weapon/ranged/javelin.png
diff --git a/crawl-ref/source/rltiles/item/weapon/longbow.png b/crawl-ref/source/rltiles/item/weapon/ranged/longbow.png
index 9138b72f67..9138b72f67 100644
--- a/crawl-ref/source/rltiles/item/weapon/longbow.png
+++ b/crawl-ref/source/rltiles/item/weapon/ranged/longbow.png
diff --git a/crawl-ref/source/rltiles/item/weapon/needle-p.png b/crawl-ref/source/rltiles/item/weapon/ranged/needle-p.png
index 624ea9dc82..624ea9dc82 100644
--- a/crawl-ref/source/rltiles/item/weapon/needle-p.png
+++ b/crawl-ref/source/rltiles/item/weapon/ranged/needle-p.png
diff --git a/crawl-ref/source/rltiles/item/weapon/needle.png b/crawl-ref/source/rltiles/item/weapon/ranged/needle.png
index 31751aee17..31751aee17 100644
--- a/crawl-ref/source/rltiles/item/weapon/needle.png
+++ b/crawl-ref/source/rltiles/item/weapon/ranged/needle.png
diff --git a/crawl-ref/source/rltiles/item/gem/rock.png b/crawl-ref/source/rltiles/item/weapon/ranged/rock.png
index 4431e94667..4431e94667 100644
--- a/crawl-ref/source/rltiles/item/gem/rock.png
+++ b/crawl-ref/source/rltiles/item/weapon/ranged/rock.png
diff --git a/crawl-ref/source/rltiles/item/weapon/sling.png b/crawl-ref/source/rltiles/item/weapon/ranged/sling.png
index 9d240a1b76..9d240a1b76 100644
--- a/crawl-ref/source/rltiles/item/weapon/sling.png
+++ b/crawl-ref/source/rltiles/item/weapon/ranged/sling.png
diff --git a/crawl-ref/source/rltiles/item/weapon/sling_bullet.png b/crawl-ref/source/rltiles/item/weapon/ranged/sling_bullet.png
index b57078ac78..b57078ac78 100644
--- a/crawl-ref/source/rltiles/item/weapon/sling_bullet.png
+++ b/crawl-ref/source/rltiles/item/weapon/ranged/sling_bullet.png
diff --git a/crawl-ref/source/rltiles/item/gem/stone.png b/crawl-ref/source/rltiles/item/weapon/ranged/stone.png
index e86079c302..e86079c302 100644
--- a/crawl-ref/source/rltiles/item/gem/stone.png
+++ b/crawl-ref/source/rltiles/item/weapon/ranged/stone.png
diff --git a/crawl-ref/source/rltiles/item/weapon/throwing_net.png b/crawl-ref/source/rltiles/item/weapon/ranged/throwing_net.png
index 11d164b1ea..11d164b1ea 100644
--- a/crawl-ref/source/rltiles/item/weapon/throwing_net.png
+++ b/crawl-ref/source/rltiles/item/weapon/ranged/throwing_net.png