From e3e05b162240e9d39e0360541d807f092ce0688b Mon Sep 17 00:00:00 2001 From: Johanna Ploog Date: Wed, 6 Jan 2010 19:29:33 +0100 Subject: 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. --- crawl-ref/source/rltiles/dc-item.txt | 48 ++++++++++----------- crawl-ref/source/rltiles/item/gem/gold_piece.png | Bin 642 -> 0 bytes crawl-ref/source/rltiles/item/gem/rock.png | Bin 277 -> 0 bytes crawl-ref/source/rltiles/item/gem/stone.png | Bin 247 -> 0 bytes crawl-ref/source/rltiles/item/misc/gold_pile.png | Bin 0 -> 642 bytes crawl-ref/source/rltiles/item/weapon/arrow.png | Bin 329 -> 0 bytes crawl-ref/source/rltiles/item/weapon/blowgun.png | Bin 254 -> 0 bytes crawl-ref/source/rltiles/item/weapon/blowgun2.png | Bin 309 -> 0 bytes crawl-ref/source/rltiles/item/weapon/bow.png | Bin 406 -> 0 bytes crawl-ref/source/rltiles/item/weapon/bow2.png | Bin 412 -> 0 bytes crawl-ref/source/rltiles/item/weapon/crossbow.png | Bin 602 -> 0 bytes crawl-ref/source/rltiles/item/weapon/crossbow2.png | Bin 726 -> 0 bytes .../source/rltiles/item/weapon/crossbow_bolt.png | Bin 276 -> 0 bytes crawl-ref/source/rltiles/item/weapon/dart-p.png | Bin 279 -> 0 bytes crawl-ref/source/rltiles/item/weapon/dart.png | Bin 252 -> 0 bytes crawl-ref/source/rltiles/item/weapon/javelin.png | Bin 321 -> 0 bytes crawl-ref/source/rltiles/item/weapon/longbow.png | Bin 391 -> 0 bytes crawl-ref/source/rltiles/item/weapon/needle-p.png | Bin 184 -> 0 bytes crawl-ref/source/rltiles/item/weapon/needle.png | Bin 179 -> 0 bytes .../source/rltiles/item/weapon/ranged/arrow.png | Bin 0 -> 329 bytes .../source/rltiles/item/weapon/ranged/blowgun.png | Bin 0 -> 254 bytes .../source/rltiles/item/weapon/ranged/blowgun2.png | Bin 0 -> 309 bytes .../source/rltiles/item/weapon/ranged/bow.png | Bin 0 -> 406 bytes .../source/rltiles/item/weapon/ranged/bow2.png | Bin 0 -> 412 bytes .../source/rltiles/item/weapon/ranged/crossbow.png | Bin 0 -> 602 bytes .../rltiles/item/weapon/ranged/crossbow2.png | Bin 0 -> 726 bytes .../rltiles/item/weapon/ranged/crossbow_bolt.png | Bin 0 -> 276 bytes .../source/rltiles/item/weapon/ranged/dart-p.png | Bin 0 -> 279 bytes .../source/rltiles/item/weapon/ranged/dart.png | Bin 0 -> 252 bytes .../source/rltiles/item/weapon/ranged/javelin.png | Bin 0 -> 321 bytes .../source/rltiles/item/weapon/ranged/longbow.png | Bin 0 -> 391 bytes .../source/rltiles/item/weapon/ranged/needle-p.png | Bin 0 -> 184 bytes .../source/rltiles/item/weapon/ranged/needle.png | Bin 0 -> 179 bytes .../source/rltiles/item/weapon/ranged/rock.png | Bin 0 -> 277 bytes .../source/rltiles/item/weapon/ranged/sling.png | Bin 0 -> 666 bytes .../rltiles/item/weapon/ranged/sling_bullet.png | Bin 0 -> 245 bytes .../source/rltiles/item/weapon/ranged/stone.png | Bin 0 -> 247 bytes .../rltiles/item/weapon/ranged/throwing_net.png | Bin 0 -> 315 bytes crawl-ref/source/rltiles/item/weapon/sling.png | Bin 666 -> 0 bytes .../source/rltiles/item/weapon/sling_bullet.png | Bin 245 -> 0 bytes .../source/rltiles/item/weapon/throwing_net.png | Bin 315 -> 0 bytes 41 files changed, 23 insertions(+), 25 deletions(-) delete mode 100644 crawl-ref/source/rltiles/item/gem/gold_piece.png delete mode 100644 crawl-ref/source/rltiles/item/gem/rock.png delete mode 100644 crawl-ref/source/rltiles/item/gem/stone.png create mode 100644 crawl-ref/source/rltiles/item/misc/gold_pile.png delete mode 100644 crawl-ref/source/rltiles/item/weapon/arrow.png delete mode 100644 crawl-ref/source/rltiles/item/weapon/blowgun.png delete mode 100644 crawl-ref/source/rltiles/item/weapon/blowgun2.png delete mode 100644 crawl-ref/source/rltiles/item/weapon/bow.png delete mode 100644 crawl-ref/source/rltiles/item/weapon/bow2.png delete mode 100644 crawl-ref/source/rltiles/item/weapon/crossbow.png delete mode 100644 crawl-ref/source/rltiles/item/weapon/crossbow2.png delete mode 100644 crawl-ref/source/rltiles/item/weapon/crossbow_bolt.png delete mode 100644 crawl-ref/source/rltiles/item/weapon/dart-p.png delete mode 100644 crawl-ref/source/rltiles/item/weapon/dart.png delete mode 100644 crawl-ref/source/rltiles/item/weapon/javelin.png delete mode 100644 crawl-ref/source/rltiles/item/weapon/longbow.png delete mode 100644 crawl-ref/source/rltiles/item/weapon/needle-p.png delete mode 100644 crawl-ref/source/rltiles/item/weapon/needle.png create mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/arrow.png create mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/blowgun.png create mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/blowgun2.png create mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/bow.png create mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/bow2.png create mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/crossbow.png create mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/crossbow2.png create mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/crossbow_bolt.png create mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/dart-p.png create mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/dart.png create mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/javelin.png create mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/longbow.png create mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/needle-p.png create mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/needle.png create mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/rock.png create mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/sling.png create mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/sling_bullet.png create mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/stone.png create mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/throwing_net.png delete mode 100644 crawl-ref/source/rltiles/item/weapon/sling.png delete mode 100644 crawl-ref/source/rltiles/item/weapon/sling_bullet.png delete mode 100644 crawl-ref/source/rltiles/item/weapon/throwing_net.png 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/gem/gold_piece.png deleted file mode 100644 index 672c46991e..0000000000 Binary files a/crawl-ref/source/rltiles/item/gem/gold_piece.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/item/gem/rock.png b/crawl-ref/source/rltiles/item/gem/rock.png deleted file mode 100644 index 4431e94667..0000000000 Binary files a/crawl-ref/source/rltiles/item/gem/rock.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/item/gem/stone.png b/crawl-ref/source/rltiles/item/gem/stone.png deleted file mode 100644 index e86079c302..0000000000 Binary files a/crawl-ref/source/rltiles/item/gem/stone.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/item/misc/gold_pile.png b/crawl-ref/source/rltiles/item/misc/gold_pile.png new file mode 100644 index 0000000000..672c46991e Binary files /dev/null and b/crawl-ref/source/rltiles/item/misc/gold_pile.png differ diff --git a/crawl-ref/source/rltiles/item/weapon/arrow.png b/crawl-ref/source/rltiles/item/weapon/arrow.png deleted file mode 100644 index ac56cc0aba..0000000000 Binary files a/crawl-ref/source/rltiles/item/weapon/arrow.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/item/weapon/blowgun.png b/crawl-ref/source/rltiles/item/weapon/blowgun.png deleted file mode 100644 index a126f66351..0000000000 Binary files a/crawl-ref/source/rltiles/item/weapon/blowgun.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/item/weapon/blowgun2.png b/crawl-ref/source/rltiles/item/weapon/blowgun2.png deleted file mode 100644 index 3da29b5dee..0000000000 Binary files a/crawl-ref/source/rltiles/item/weapon/blowgun2.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/item/weapon/bow.png b/crawl-ref/source/rltiles/item/weapon/bow.png deleted file mode 100644 index 86e65d6d16..0000000000 Binary files a/crawl-ref/source/rltiles/item/weapon/bow.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/item/weapon/bow2.png b/crawl-ref/source/rltiles/item/weapon/bow2.png deleted file mode 100644 index 61a9d29ef2..0000000000 Binary files a/crawl-ref/source/rltiles/item/weapon/bow2.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/item/weapon/crossbow.png b/crawl-ref/source/rltiles/item/weapon/crossbow.png deleted file mode 100644 index 5ed789b8f9..0000000000 Binary files a/crawl-ref/source/rltiles/item/weapon/crossbow.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/item/weapon/crossbow2.png b/crawl-ref/source/rltiles/item/weapon/crossbow2.png deleted file mode 100644 index f6eda6f23f..0000000000 Binary files a/crawl-ref/source/rltiles/item/weapon/crossbow2.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/item/weapon/crossbow_bolt.png b/crawl-ref/source/rltiles/item/weapon/crossbow_bolt.png deleted file mode 100644 index fffbbe409a..0000000000 Binary files a/crawl-ref/source/rltiles/item/weapon/crossbow_bolt.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/item/weapon/dart-p.png b/crawl-ref/source/rltiles/item/weapon/dart-p.png deleted file mode 100644 index ecc2c68386..0000000000 Binary files a/crawl-ref/source/rltiles/item/weapon/dart-p.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/item/weapon/dart.png b/crawl-ref/source/rltiles/item/weapon/dart.png deleted file mode 100644 index 183090921e..0000000000 Binary files a/crawl-ref/source/rltiles/item/weapon/dart.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/item/weapon/javelin.png b/crawl-ref/source/rltiles/item/weapon/javelin.png deleted file mode 100644 index 7b5196011a..0000000000 Binary files a/crawl-ref/source/rltiles/item/weapon/javelin.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/item/weapon/longbow.png b/crawl-ref/source/rltiles/item/weapon/longbow.png deleted file mode 100644 index 9138b72f67..0000000000 Binary files a/crawl-ref/source/rltiles/item/weapon/longbow.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/item/weapon/needle-p.png b/crawl-ref/source/rltiles/item/weapon/needle-p.png deleted file mode 100644 index 624ea9dc82..0000000000 Binary files a/crawl-ref/source/rltiles/item/weapon/needle-p.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/item/weapon/needle.png b/crawl-ref/source/rltiles/item/weapon/needle.png deleted file mode 100644 index 31751aee17..0000000000 Binary files a/crawl-ref/source/rltiles/item/weapon/needle.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/arrow.png b/crawl-ref/source/rltiles/item/weapon/ranged/arrow.png new file mode 100644 index 0000000000..ac56cc0aba Binary files /dev/null and b/crawl-ref/source/rltiles/item/weapon/ranged/arrow.png differ diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/blowgun.png b/crawl-ref/source/rltiles/item/weapon/ranged/blowgun.png new file mode 100644 index 0000000000..a126f66351 Binary files /dev/null and b/crawl-ref/source/rltiles/item/weapon/ranged/blowgun.png differ diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/blowgun2.png b/crawl-ref/source/rltiles/item/weapon/ranged/blowgun2.png new file mode 100644 index 0000000000..3da29b5dee Binary files /dev/null and b/crawl-ref/source/rltiles/item/weapon/ranged/blowgun2.png differ diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/bow.png b/crawl-ref/source/rltiles/item/weapon/ranged/bow.png new file mode 100644 index 0000000000..86e65d6d16 Binary files /dev/null and b/crawl-ref/source/rltiles/item/weapon/ranged/bow.png differ diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/bow2.png b/crawl-ref/source/rltiles/item/weapon/ranged/bow2.png new file mode 100644 index 0000000000..61a9d29ef2 Binary files /dev/null and b/crawl-ref/source/rltiles/item/weapon/ranged/bow2.png differ diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/crossbow.png b/crawl-ref/source/rltiles/item/weapon/ranged/crossbow.png new file mode 100644 index 0000000000..5ed789b8f9 Binary files /dev/null and b/crawl-ref/source/rltiles/item/weapon/ranged/crossbow.png differ diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/crossbow2.png b/crawl-ref/source/rltiles/item/weapon/ranged/crossbow2.png new file mode 100644 index 0000000000..f6eda6f23f Binary files /dev/null and b/crawl-ref/source/rltiles/item/weapon/ranged/crossbow2.png differ diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/crossbow_bolt.png b/crawl-ref/source/rltiles/item/weapon/ranged/crossbow_bolt.png new file mode 100644 index 0000000000..fffbbe409a Binary files /dev/null and b/crawl-ref/source/rltiles/item/weapon/ranged/crossbow_bolt.png differ diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/dart-p.png b/crawl-ref/source/rltiles/item/weapon/ranged/dart-p.png new file mode 100644 index 0000000000..ecc2c68386 Binary files /dev/null and b/crawl-ref/source/rltiles/item/weapon/ranged/dart-p.png differ diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/dart.png b/crawl-ref/source/rltiles/item/weapon/ranged/dart.png new file mode 100644 index 0000000000..183090921e Binary files /dev/null and b/crawl-ref/source/rltiles/item/weapon/ranged/dart.png differ diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/javelin.png b/crawl-ref/source/rltiles/item/weapon/ranged/javelin.png new file mode 100644 index 0000000000..7b5196011a Binary files /dev/null and b/crawl-ref/source/rltiles/item/weapon/ranged/javelin.png differ diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/longbow.png b/crawl-ref/source/rltiles/item/weapon/ranged/longbow.png new file mode 100644 index 0000000000..9138b72f67 Binary files /dev/null and b/crawl-ref/source/rltiles/item/weapon/ranged/longbow.png differ diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/needle-p.png b/crawl-ref/source/rltiles/item/weapon/ranged/needle-p.png new file mode 100644 index 0000000000..624ea9dc82 Binary files /dev/null and b/crawl-ref/source/rltiles/item/weapon/ranged/needle-p.png differ diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/needle.png b/crawl-ref/source/rltiles/item/weapon/ranged/needle.png new file mode 100644 index 0000000000..31751aee17 Binary files /dev/null and b/crawl-ref/source/rltiles/item/weapon/ranged/needle.png differ diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/rock.png b/crawl-ref/source/rltiles/item/weapon/ranged/rock.png new file mode 100644 index 0000000000..4431e94667 Binary files /dev/null and b/crawl-ref/source/rltiles/item/weapon/ranged/rock.png differ diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/sling.png b/crawl-ref/source/rltiles/item/weapon/ranged/sling.png new file mode 100644 index 0000000000..9d240a1b76 Binary files /dev/null and b/crawl-ref/source/rltiles/item/weapon/ranged/sling.png differ diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/sling_bullet.png b/crawl-ref/source/rltiles/item/weapon/ranged/sling_bullet.png new file mode 100644 index 0000000000..b57078ac78 Binary files /dev/null and b/crawl-ref/source/rltiles/item/weapon/ranged/sling_bullet.png differ diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/stone.png b/crawl-ref/source/rltiles/item/weapon/ranged/stone.png new file mode 100644 index 0000000000..e86079c302 Binary files /dev/null and b/crawl-ref/source/rltiles/item/weapon/ranged/stone.png differ diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/throwing_net.png b/crawl-ref/source/rltiles/item/weapon/ranged/throwing_net.png new file mode 100644 index 0000000000..11d164b1ea Binary files /dev/null and b/crawl-ref/source/rltiles/item/weapon/ranged/throwing_net.png differ diff --git a/crawl-ref/source/rltiles/item/weapon/sling.png b/crawl-ref/source/rltiles/item/weapon/sling.png deleted file mode 100644 index 9d240a1b76..0000000000 Binary files a/crawl-ref/source/rltiles/item/weapon/sling.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/item/weapon/sling_bullet.png b/crawl-ref/source/rltiles/item/weapon/sling_bullet.png deleted file mode 100644 index b57078ac78..0000000000 Binary files a/crawl-ref/source/rltiles/item/weapon/sling_bullet.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/item/weapon/throwing_net.png b/crawl-ref/source/rltiles/item/weapon/throwing_net.png deleted file mode 100644 index 11d164b1ea..0000000000 Binary files a/crawl-ref/source/rltiles/item/weapon/throwing_net.png and /dev/null differ -- cgit v1.2.3-54-g00ecf