diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-07 15:06:00 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-07 15:06:00 +0000 |
| commit | 60d8e93b1adada2500c8f282bc31dd04b17b0935 (patch) | |
| tree | 4d19cffddfc4d11d7ab0e27e58fa0b701bd65f1e /crawl-ref/source/newgame.cc | |
| parent | 3df5b1d3140e461c40fa88ab4f80554b9912372c (diff) | |
| download | crawl-ref-60d8e93b1adada2500c8f282bc31dd04b17b0935.tar.gz crawl-ref-60d8e93b1adada2500c8f282bc31dd04b17b0935.zip | |
Apply Haran's commits 6773 and 6777-6784 to 0.4.
* Fix 2037104: amulet of Controlled Flight not autoIDing.
* Fix 2038973: explosive tracers leaking information about invisible
monsters.
* Fix 2039217: check shield status for non-weapons before wielding
* Fix 2039734: non-Spriggan transmuters being cheated on UC
* Fix 2037845: unstackedness was overriding finishing a deck
* Fix 2038476: semicontrolled blink.
* Fix 2038962: casting Divine Shield wasn't refreshing AC.
* Fix 2038651: real/fake rakshasa identity being leaked in descriptions.
* Fix 2035976: doubled inscriptions in equipped items in dump.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6792 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/newgame.cc')
| -rw-r--r-- | crawl-ref/source/newgame.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 750d171260..7c89bc1810 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -5071,6 +5071,9 @@ bool _give_items_skills() _newgame_make_item(4, EQ_NONE, OBJ_POTIONS, POT_CONFUSION, -1, 2); _newgame_make_item(5, EQ_NONE, OBJ_POTIONS, POT_POISON); + // Do this early because it might be increased later. + you.skills[SK_UNARMED_COMBAT] = 1; + if (you.species == SP_SPRIGGAN) { _make_rod(you.inv[0], STAFF_STRIKING); @@ -5082,7 +5085,6 @@ bool _give_items_skills() you.skills[SK_UNARMED_COMBAT] += 2; you.skills[SK_FIGHTING] = 1; - you.skills[SK_UNARMED_COMBAT] = 1; you.skills[SK_DODGING] = 2; you.skills[SK_SPELLCASTING] = 2; you.skills[SK_TRANSMIGRATION] = 2; |