From 2dd7f14dcfbe77a389638e948e21d5a6db272935 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Tue, 1 Jul 2008 14:42:09 +0000 Subject: Implement the first part of the overhauled starting equipment and skills (non-magic characters): Fighter, Gladiator, Berserker, Paladin, Priest, Chaos Knight (*), Death Knight, Healer, Thief, Assassin, Hunter *: Other than in the final layout (v4?) Trolls and Ghouls don't get "claws" as a weapon choice here because I had no idea what to do with the to-be-distributed enchantment points if they don't get a weapon. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6293 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/itemprop.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/itemprop.cc') diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index 4bf5b79575..88d89636ce 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -240,10 +240,10 @@ static weapon_def Weapon_prop[NUM_WEAPONS] = // Long blades { WPN_FALCHION, "falchion", 8, 2, 13, 170, 4, - SK_LONG_BLADES, HANDS_ONE, SIZE_MEDIUM, MI_NONE, false, + SK_LONG_BLADES, HANDS_ONE, SIZE_SMALL, MI_NONE, false, DAMV_SLICING, 10 }, // or perhaps DAMV_CHOPPING is more apt? { WPN_BLESSED_FALCHION, "blessed falchion", 10, 2, 11, 170, 4, - SK_LONG_BLADES, HANDS_ONE, SIZE_MEDIUM, MI_NONE, false, + SK_LONG_BLADES, HANDS_ONE, SIZE_SMALL, MI_NONE, false, DAMV_SLICING, 10 }, // or perhaps DAMV_CHOPPING is more apt? { WPN_LONG_SWORD, "long sword", 10, 1, 14, 160, 3, SK_LONG_BLADES, HANDS_ONE, SIZE_MEDIUM, MI_NONE, false, @@ -2058,7 +2058,7 @@ bool is_range_weapon_type( weapon_type wtype ) const char *ammo_name(missile_type ammo) { - return (ammo < 0 || ammo >= NUM_MISSILES? "eggplant" + return (ammo < 0 || ammo >= NUM_MISSILES ? "eggplant" : Missile_prop[ Missile_index[ammo] ].name); } -- cgit v1.2.3-54-g00ecf