From 5bbfb3bae5fca6de837c1f1617404889952045b2 Mon Sep 17 00:00:00 2001 From: dolorous Date: Sat, 24 Jan 2009 20:31:51 +0000 Subject: Tweak vampires' being given Unarmed Combat skill when they lack it to be like that of spellcasters' being given Spellcasting skill when they lack it. They now get two levels of Unarmed Combat unmodified by their above-average aptitude, i.e. level 2 at 0% instead of level 2 at 15%. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8719 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/newgame.cc | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'crawl-ref/source/newgame.cc') diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 495bc7ebce..0d760180e8 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -906,8 +906,11 @@ static void _reassess_starting_skills() { for (int i = 0; i < NUM_SKILLS; i++) { - if (!you.skills[i]) + if (you.skills[i] == 0 + && (you.species != SP_VAMPIRE || i != SK_UNARMED_COMBAT)) + { continue; + } // Grant the amount of skill points required for a human. const int points = skill_exp_needed( you.skills[i] ); @@ -926,11 +929,19 @@ static void _reassess_starting_skills() } // Spellcasters should always have Spellcasting skill. - if (i == SK_SPELLCASTING && you.skills[i] == 0) + if (i == SK_SPELLCASTING && you.skills[i] < 1) { you.skill_points[i] = (skill_exp_needed(1) * sp_diff) / 100; you.skills[i] = 1; } + + // Vampires should always have Unarmed Combat skill. + if (you.species == SP_VAMPIRE && i == SK_UNARMED_COMBAT + && you.skills[i] < 2) + { + you.skill_points[i] = (skill_exp_needed(2) * sp_diff) / 100; + you.skills[i] = 2; + } } } @@ -5643,10 +5654,6 @@ bool _give_items_skills() break; } - // Vampires always start with unarmed combat skill. - if (you.species == SP_VAMPIRE && you.skills[SK_UNARMED_COMBAT] < 2) - you.skills[SK_UNARMED_COMBAT] = 2; - if (weap_skill) { if (you.equip[EQ_WEAPON] == -1) -- cgit v1.2.3-54-g00ecf