summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authordploog <dploog@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-04 09:31:15 +0000
committerdploog <dploog@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-04 09:31:15 +0000
commit5a7dc7bf7ad7d06940a8547a14e78020cb59b0c9 (patch)
treefdea1e667aecc197407560a45f27496989d8e0a3 /crawl-ref
parentc11f0970447ed0c44f3aae338544802e1e65d21c (diff)
downloadcrawl-ref-5a7dc7bf7ad7d06940a8547a14e78020cb59b0c9.tar.gz
crawl-ref-5a7dc7bf7ad7d06940a8547a14e78020cb59b0c9.zip
Change display of aptitudes (both !m and ?%) to true values:
take the factors 13/10 (Spc) and 3/4 (Inv, Evo) into account. Hereby the group pressure on Haran is officially removed. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5474 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/docs/aptitudes.txt132
-rw-r--r--crawl-ref/source/skills2.cc14
2 files changed, 66 insertions, 80 deletions
diff --git a/crawl-ref/docs/aptitudes.txt b/crawl-ref/docs/aptitudes.txt
index 9857ee2f6f..bd05a565bc 100644
--- a/crawl-ref/docs/aptitudes.txt
+++ b/crawl-ref/docs/aptitudes.txt
@@ -35,39 +35,39 @@ Exp - Experience Bws - Bows Air - Air Magic
Arm Ddg Sth Stb Shd T&D Inv Evo Exp
---------------------------------------------------------------------
-Human 100 100 100 100 100 100 100 100 100
-High Elf 110 90 90 110 110 100 100 90 150
-Grey Elf 140 75 70 100 140 100 100 90 140
-Deep Elf 140 70 65 80 140 100 100 90 140
-Sludge Elf 140 70 75 100 130 100 100 110 120
-Mountain Dwarf 60 110 150 130 70 80 100 60 130
-Hill Orc 90 140 150 100 80 100 100 100 100
-Merfolk 160 60 90 70 100 120 100 100 120
-Halfling 150 70 60 70 130 100 100 90 100
-Gnome 150 70 70 80 120 70 120 60 110
-Kobold 140 70 60 70 130 100 100 80 100
-Spriggan 170 50 50 50 180 60 130 70 130
-Naga 150 150 40 100 140 100 100 100 120
-Centaur 180 170 200 170 180 150 100 130 140
-Ogre 140 150 200 150 110 200 130 170 140
-Ogre-Mage 170 130 100 130 150 150 100 100 150
-Troll 150 130 250 150 150 200 150 180 150
-Minotaur 80 80 130 100 80 120 130 170 140
-Kenku 90 90 100 80 100 100 160 100 130
-Draconian Red 200 120 120 100 100 100 100 100 130
- White 200 120 120 100 100 100 100 100 130
- Green 200 120 120 100 100 100 100 100 130
- Yellow 200 120 120 100 100 100 100 100 130
- Grey 200 120 120 100 100 100 100 100 130
- Black 200 120 120 100 100 100 100 100 130
- Purple 200 120 120 100 100 100 100 90 130
- Mottled 200 120 120 100 100 100 100 100 130
- Pale 200 120 120 100 100 100 100 90 130
-Demigod 110 110 110 110 110 110 110 110 160
-Demonspawn 110 110 110 110 110 110 80 110 140
-Mummy 140 140 140 140 140 140 140 140 150
-Ghoul 110 110 80 100 110 120 110 130 120
-Vampire 140 90 50 90 110 100 160 100 150
+Human 100 100 100 100 100 100 75 75 100
+High Elf 110 90 90 110 110 100 75 67 150
+Grey Elf 140 75 70 100 140 100 75 67 140
+Deep Elf 140 70 65 80 140 100 75 67 140
+Sludge Elf 140 70 75 100 130 100 75 82 120
+Mountain Dwarf 60 110 150 130 70 80 75 45 130
+Hill Orc 90 140 150 100 80 100 75 75 100
+Merfolk 160 60 90 70 100 120 75 75 120
+Halfling 150 70 60 70 130 100 75 67 100
+Gnome 150 70 70 80 120 70 90 45 110
+Kobold 140 70 60 70 130 100 75 60 100
+Spriggan 170 50 50 50 180 60 97 52 130
+Naga 150 150 40 100 140 100 75 75 120
+Centaur 180 170 200 170 180 150 75 97 140
+Ogre 140 150 200 150 110 200 97 127 140
+Ogre-Mage 170 130 100 130 150 150 75 75 150
+Troll 150 130 250 150 150 200 112 135 150
+Minotaur 80 80 130 100 80 120 97 127 140
+Kenku 90 90 100 80 100 100 120 75 130
+Draconian Red 200 120 120 100 100 100 75 75 130
+ White 200 120 120 100 100 100 75 75 130
+ Green 200 120 120 100 100 100 75 75 130
+ Yellow 200 120 120 100 100 100 75 75 130
+ Grey 200 120 120 100 100 100 75 75 130
+ Black 200 120 120 100 100 100 75 75 130
+ Purple 200 120 120 100 100 100 75 67 130
+ Mottled 200 120 120 100 100 100 75 75 130
+ Pale 200 120 120 100 100 100 75 67 130
+Demigod 110 110 110 110 110 110 82 82 160
+Demonspawn 110 110 110 110 110 110 60 82 140
+Mummy 140 140 140 140 140 140 105 105 150
+Ghoul 110 110 80 100 110 120 82 97 120
+Vampire 140 90 50 90 110 100 120 75 150
---------------------------------------------------------------------
Arm Ddg Sth Stb Shd T&D Inv Evo Exp
@@ -113,38 +113,38 @@ Vampire 110 90 100 110 140 110 140 90 140 140 140 140 140
Spc Coj Enc Sum Nec Trl Trm Div Fir Ice Air Ear Poi
---------------------------------------------------------------------
-Human 100 100 100 100 100 100 100 100 100 100 100 100 100
-High Elf 70 90 70 110 130 90 90 110 100 100 70 130 130
-Grey Elf 60 90 50 90 130 80 80 80 90 90 60 150 110
-Deep Elf 55 80 50 80 70 75 75 75 90 90 80 100 80
-Sludge Elf 70 130 130 90 90 100 60 130 80 80 80 80 80
-Mountain Dwarf 160 120 150 150 160 150 120 130 70 130 150 70 130
-Hill Orc 150 100 120 120 100 150 160 160 100 100 150 100 110
-Merfolk 100 140 90 100 150 140 60 80 160 80 150 150 80
-Halfling 130 130 100 120 150 100 150 140 100 100 90 100 120
-Gnome 120 100 100 110 130 130 120 120 100 100 170 60 130
-Kobold 110 110 110 105 105 100 110 130 100 100 100 100 100
-Spriggan 60 160 50 150 120 50 60 70 140 140 120 120 100
-Naga 100 100 100 100 100 100 100 100 100 100 100 100 60
-Centaur 140 120 110 120 120 120 120 130 120 120 120 120 130
-Ogre 220 180 220 200 150 200 200 200 150 150 200 120 150
-Ogre-Mage 70 100 80 100 100 100 100 100 100 100 100 100 100
-Troll 200 160 200 160 150 160 160 200 160 160 200 120 160
-Minotaur 180 170 170 170 170 170 170 170 170 170 170 170 170
-Kenku 100 60 160 70 80 150 150 180 90 120 90 120 100
-Draconian Red 100 100 120 100 100 100 100 100 70 135 100 100 100
- Green 100 100 120 100 100 100 100 100 100 100 100 100 70
- White 100 100 120 100 100 100 100 100 135 70 100 100 100
- Yellow 100 100 120 100 100 100 100 100 100 100 100 100 100
- Grey 100 100 120 100 100 100 100 100 100 100 100 100 100
- Black 100 100 120 100 100 100 100 100 100 100 70 135 100
- Purple 70 100 90 100 100 100 100 100 100 100 100 100 100
- Mottled 100 100 120 100 100 100 100 100 80 100 100 100 100
- Pale 100 100 120 100 100 100 100 100 90 100 90 100 100
-Demigod 110 110 110 110 110 110 110 110 110 110 110 110 110
-Demonspawn 100 100 110 100 90 110 110 110 100 110 110 110 100
-Mummy 100 140 140 140 100 140 140 140 140 140 140 140 140
-Ghoul 120 130 130 120 100 120 120 120 150 90 150 90 100
-Vampire 100 160 90 100 90 140 90 120 140 100 100 120 120
+Human 130 100 100 100 100 100 100 100 100 100 100 100 100
+High Elf 91 90 70 110 130 90 90 110 100 100 70 130 130
+Grey Elf 78 90 50 90 130 80 80 80 90 90 60 150 110
+Deep Elf 71 80 50 80 70 75 75 75 90 90 80 100 80
+Sludge Elf 91 130 130 90 90 100 60 130 80 80 80 80 80
+Mountain Dwarf 208 120 150 150 160 150 120 130 70 130 150 70 130
+Hill Orc 195 100 120 120 100 150 160 160 100 100 150 100 110
+Merfolk 130 140 90 100 150 140 60 80 160 80 150 150 80
+Halfling 169 130 100 120 150 100 150 140 100 100 90 100 120
+Gnome 156 100 100 110 130 130 120 120 100 100 170 60 130
+Kobold 143 110 110 105 105 100 110 130 100 100 100 100 100
+Spriggan 78 160 50 150 120 50 60 70 140 140 120 120 100
+Naga 130 100 100 100 100 100 100 100 100 100 100 100 60
+Centaur 182 120 110 120 120 120 120 130 120 120 120 120 130
+Ogre 156 180 220 200 150 200 200 200 150 150 200 120 150
+Ogre-Mage 91 100 80 100 100 100 100 100 100 100 100 100 100
+Troll 260 160 200 160 150 160 160 200 160 160 200 120 160
+Minotaur 234 170 170 170 170 170 170 170 170 170 170 170 170
+Kenku 130 60 160 70 80 150 150 180 90 120 90 120 100
+Draconian Red 130 100 120 100 100 100 100 100 70 135 100 100 100
+ Green 130 100 120 100 100 100 100 100 100 100 100 100 70
+ White 130 100 120 100 100 100 100 100 135 70 100 100 100
+ Yellow 130 100 120 100 100 100 100 100 100 100 100 100 100
+ Grey 130 100 120 100 100 100 100 100 100 100 100 100 100
+ Black 130 100 120 100 100 100 100 100 100 100 70 135 100
+ Purple 91 100 90 100 100 100 100 100 100 100 100 100 100
+ Mottled 130 100 120 100 100 100 100 100 80 100 100 100 100
+ Pale 130 100 120 100 100 100 100 100 90 100 90 100 100
+Demigod 143 110 110 110 110 110 110 110 110 110 110 110 110
+Demonspawn 130 100 110 100 90 110 110 110 100 110 110 110 100
+Mummy 130 140 140 140 100 140 140 140 140 140 140 140 140
+Ghoul 156 130 130 120 100 120 120 120 150 90 150 90 100
+Vampire 130 160 90 100 90 140 90 120 140 100 100 120 120
---------------------------------------------------------------------
Spc Coj Enc Sum Nec Trl Trm Div Fir Ice Air Ear Poi \ No newline at end of file
diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc
index c5ba46e013..e7bd806a54 100644
--- a/crawl-ref/source/skills2.cc
+++ b/crawl-ref/source/skills2.cc
@@ -1811,20 +1811,6 @@ static void _display_skill_table(bool show_aptitudes)
else
{
textcolor(RED);
-
- // Modify Spellcasting, Evocations, Invocations for
- // aptitude display.
- if (x == SK_SPELLCASTING)
- {
- spec_abil *= 10;
- spec_abil /= 13;
- }
- else if (x == SK_INVOCATIONS || x == SK_EVOCATIONS)
- {
- spec_abil *= 4;
- spec_abil /= 3;
- }
-
cprintf(" %3d ", spec_abil);
}
}