diff options
-rw-r--r-- | crawl-ref/source/rltiles/dc-item.txt | 48 | ||||
-rw-r--r-- | crawl-ref/source/rltiles/item/misc/gold_pile.png (renamed from crawl-ref/source/rltiles/item/gem/gold_piece.png) | bin | 642 -> 642 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/item/weapon/ranged/arrow.png (renamed from crawl-ref/source/rltiles/item/weapon/arrow.png) | bin | 329 -> 329 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/item/weapon/ranged/blowgun.png (renamed from crawl-ref/source/rltiles/item/weapon/blowgun.png) | bin | 254 -> 254 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/item/weapon/ranged/blowgun2.png (renamed from crawl-ref/source/rltiles/item/weapon/blowgun2.png) | bin | 309 -> 309 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/item/weapon/ranged/bow.png (renamed from crawl-ref/source/rltiles/item/weapon/bow.png) | bin | 406 -> 406 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/item/weapon/ranged/bow2.png (renamed from crawl-ref/source/rltiles/item/weapon/bow2.png) | bin | 412 -> 412 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/item/weapon/ranged/crossbow.png (renamed from crawl-ref/source/rltiles/item/weapon/crossbow.png) | bin | 602 -> 602 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/item/weapon/ranged/crossbow2.png (renamed from crawl-ref/source/rltiles/item/weapon/crossbow2.png) | bin | 726 -> 726 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/item/weapon/ranged/crossbow_bolt.png (renamed from crawl-ref/source/rltiles/item/weapon/crossbow_bolt.png) | bin | 276 -> 276 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/item/weapon/ranged/dart-p.png (renamed from crawl-ref/source/rltiles/item/weapon/dart-p.png) | bin | 279 -> 279 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/item/weapon/ranged/dart.png (renamed from crawl-ref/source/rltiles/item/weapon/dart.png) | bin | 252 -> 252 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/item/weapon/ranged/javelin.png (renamed from crawl-ref/source/rltiles/item/weapon/javelin.png) | bin | 321 -> 321 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/item/weapon/ranged/longbow.png (renamed from crawl-ref/source/rltiles/item/weapon/longbow.png) | bin | 391 -> 391 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/item/weapon/ranged/needle-p.png (renamed from crawl-ref/source/rltiles/item/weapon/needle-p.png) | bin | 184 -> 184 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/item/weapon/ranged/needle.png (renamed from crawl-ref/source/rltiles/item/weapon/needle.png) | bin | 179 -> 179 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/item/weapon/ranged/rock.png (renamed from crawl-ref/source/rltiles/item/gem/rock.png) | bin | 277 -> 277 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/item/weapon/ranged/sling.png (renamed from crawl-ref/source/rltiles/item/weapon/sling.png) | bin | 666 -> 666 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/item/weapon/ranged/sling_bullet.png (renamed from crawl-ref/source/rltiles/item/weapon/sling_bullet.png) | bin | 245 -> 245 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/item/weapon/ranged/stone.png (renamed from crawl-ref/source/rltiles/item/gem/stone.png) | bin | 247 -> 247 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/item/weapon/ranged/throwing_net.png (renamed from crawl-ref/source/rltiles/item/weapon/throwing_net.png) | bin | 315 -> 315 bytes |
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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 11d164b1ea..11d164b1ea 100644 --- a/crawl-ref/source/rltiles/item/weapon/throwing_net.png +++ b/crawl-ref/source/rltiles/item/weapon/ranged/throwing_net.png |