diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-09 20:26:13 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-09 20:26:13 +0000 |
| commit | 79158e1cdfc196ad84e38a84faaf40c4c4c99c63 (patch) | |
| tree | 4469116ea4a3a1f854ce84f37323e0adf24f421e /crawl-ref | |
| parent | f182d494b51c6c4b7f398e4c9be3926807514ab6 (diff) | |
| download | crawl-ref-79158e1cdfc196ad84e38a84faaf40c4c4c99c63.tar.gz crawl-ref-79158e1cdfc196ad84e38a84faaf40c4c4c99c63.zip | |
Forward-port 0.5 r9932 to trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9933 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/newgame.cc | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 69c16be599..e168fcd94c 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -5646,30 +5646,32 @@ bool _give_items_skills() break; case JOB_ARTIFICER: - // Equipment. Knife and armor or robe. - _newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_KNIFE); + // Equipment. Dagger, and armour or robe. + _newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_DAGGER); _newgame_make_item(1, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_LEATHER_ARMOUR, ARM_ROBE); + // Choice of lesser wands, 15 charges plus wand of random // effects: confusion, enslavement, slowing, magic dart, frost, // flame; OR a rod of striking, 8 charges and no random effects. if (!_choose_wand()) return (false); - // If a supporting wand was chosen, hand out a dagger instead of - // the knife. - if (you.inv[3].sub_type == WAND_CONFUSION - || you.inv[3].sub_type == WAND_ENSLAVEMENT) + // If an offensive wand or the rod of striking was chosen, + // don't hand out a weapon. + if (you.inv[3].base_type != OBJ_WANDS + || you.inv[3].sub_type != WAND_CONFUSION + && you.inv[3].sub_type != WAND_ENSLAVEMENT) { - you.inv[0].sub_type = WPN_DAGGER; + _newgame_clear_item(0); } // Skills - you.skills[SK_EVOCATIONS] = 4; + you.skills[SK_EVOCATIONS] = 4; you.skills[SK_TRAPS_DOORS] = 3; - you.skills[SK_DODGING] = 2; - you.skills[SK_FIGHTING] = 1; - you.skills[SK_STEALTH] = 1; + you.skills[SK_DODGING] = 2; + you.skills[SK_FIGHTING] = 1; + you.skills[SK_STEALTH] = 1; break; default: |