diff options
-rw-r--r-- | crawl-ref/docs/aptitudes.txt | 4 | ||||
-rw-r--r-- | crawl-ref/docs/changes.stone_soup | 1 | ||||
-rw-r--r-- | crawl-ref/source/dat/database/randbook.txt | 12 | ||||
-rw-r--r-- | crawl-ref/source/enum.h | 2 | ||||
-rw-r--r-- | crawl-ref/source/newgame.cc | 14 | ||||
-rw-r--r-- | crawl-ref/source/skills2.cc | 70 | ||||
-rw-r--r-- | crawl-ref/source/spells2.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/spells4.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/spl-book.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/spl-util.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/tutorial.cc | 2 |
11 files changed, 59 insertions, 58 deletions
diff --git a/crawl-ref/docs/aptitudes.txt b/crawl-ref/docs/aptitudes.txt index 1638b6407a..ef5bd5d0ae 100644 --- a/crawl-ref/docs/aptitudes.txt +++ b/crawl-ref/docs/aptitudes.txt @@ -8,7 +8,7 @@ is good at which tasks) can be obtained in two other, less sophisticated ways: - look which combinations of race and class are recommended (lightgrey). If you consider figuring out such things yourself to be fun, stop reading now. -Otherwise, just go ahead. The lower a value, the better the aptitude. 100 is +Otherwise, just go ahead. The lower a value, the better the aptitude. 100 is the Human standard. Please note that many things affect how quick a character will actually learn a skill. Thus the numbers below are good enough for comparisons among races, but not necessarily among skills. @@ -23,7 +23,7 @@ Sth - Stealth LBl - Long Blades Enc - Enchantments Stb - Stabbing Axs - Axes Sum - Summonings Shd - Shields M&F - Maces & Flails Nec - Necromancy T&D - Traps & Doors Pla - Polearms Trl - Translocations - Stv - Staves Trm - Transmutation + Stv - Staves Trm - Transmutations Inv - Invocations U C - Unarmed Combat Div - Divinations Evo - Evocations Thr - Throwing Fir - Fire Magic diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup index 59b6840cf2..9767cf2392 100644 --- a/crawl-ref/docs/changes.stone_soup +++ b/crawl-ref/docs/changes.stone_soup @@ -80,6 +80,7 @@ Items ----- * New scroll: ?vulnerability, applying to all creatures in LoS including you. * Introduce randart spellbooks with random spell selections. +* Book acquirements are now more random and may yield manuals. * Make missile enchantment decrease chance of item destruction. * Freezing weapons can now slow cold-blooded monsters. * The staff of channeling now trains Evocations. diff --git a/crawl-ref/source/dat/database/randbook.txt b/crawl-ref/source/dat/database/randbook.txt index 0bc397000c..9d3b2aada1 100644 --- a/crawl-ref/source/dat/database/randbook.txt +++ b/crawl-ref/source/dat/database/randbook.txt @@ -382,11 +382,11 @@ the Glacier the Frostbite %%%% -Transmutation +Transmutations Transmigration -Transmutation +Transmutations Transformation @@ -593,7 +593,7 @@ Congealing Frigorific %%%% -Transmutation adj +Transmutations adj Shifting @@ -764,7 +764,7 @@ Lom Lobon __NONE %%%% -Earth Transmutation owner +Earth Transmutations owner Roxanne @@ -788,7 +788,7 @@ Gloorx Vloq __NONE %%%% -Necromancy Transmutation owner +Necromancy Transmutations owner Cigotuvi @@ -878,7 +878,7 @@ Ozocubu __NONE %%%% -Transmutation owner +Transmutations owner Cigotuvi diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index cd00fccf46..a570a0546a 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -2560,7 +2560,7 @@ enum skill_type SK_SUMMONINGS, SK_NECROMANCY, SK_TRANSLOCATIONS, // 30 - SK_TRANSMUTATION, + SK_TRANSMUTATIONS, SK_DIVINATIONS, SK_FIRE_MAGIC, SK_ICE_MAGIC, diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 06875f9eea..f3626662a0 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -2888,7 +2888,7 @@ void give_basic_mutations(species_type speci) you.mutation[MUT_CARNIVOROUS] = 3; break; case SP_KENKU: - you.mutation[MUT_BEAK] = 1; + you.mutation[MUT_BEAK] = 1; you.mutation[MUT_TALONS] = 1; break; case SP_TROLL: @@ -3553,7 +3553,7 @@ static void _create_wanderer( void ) SK_INVOCATIONS, SK_EVOCATIONS }; const skill_type all_skills[] = - { SK_SUMMONINGS, SK_NECROMANCY, SK_TRANSLOCATIONS, SK_TRANSMUTATION, + { SK_SUMMONINGS, SK_NECROMANCY, SK_TRANSLOCATIONS, SK_TRANSMUTATIONS, SK_DIVINATIONS, SK_POISON_MAGIC, SK_SLINGS, SK_BOWS, SK_CROSSBOWS, SK_SPELLCASTING, SK_CONJURATIONS, SK_ENCHANTMENTS, @@ -5398,10 +5398,10 @@ bool _give_items_skills() else you.skills[SK_UNARMED_COMBAT] += 2; - you.skills[SK_FIGHTING] = 1; - you.skills[SK_DODGING] = 2; - you.skills[SK_SPELLCASTING] = 2; - you.skills[SK_TRANSMUTATION] = 2; + you.skills[SK_FIGHTING] = 1; + you.skills[SK_DODGING] = 2; + you.skills[SK_SPELLCASTING] = 2; + you.skills[SK_TRANSMUTATIONS] = 2; break; case JOB_FIRE_ELEMENTALIST: @@ -5448,7 +5448,7 @@ bool _give_items_skills() _newgame_make_item(2, EQ_NONE, OBJ_BOOKS, BOOK_GEOMANCY); _newgame_make_item(3, EQ_NONE, OBJ_MISSILES, MI_STONE, -1, 20); - you.skills[SK_TRANSMUTATION] = 1; + you.skills[SK_TRANSMUTATIONS] = 1; you.skills[SK_EARTH_MAGIC] = 3; you.skills[SK_SPELLCASTING] = 1; you.skills[SK_DODGING] = 2; diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc index 7ff53d8054..3be089eb18 100644 --- a/crawl-ref/source/skills2.cc +++ b/crawl-ref/source/skills2.cc @@ -112,7 +112,7 @@ const char *skills[50][6] = {"Summonings", "Caller", "Summoner", "Convoker", "Demonologist", "Hellbinder"}, {"Necromancy", "Grave Robber", "Reanimator", "Necromancer", "Thanatomancer", "@Genus_Short@ of Death"}, {"Translocations", "Grasshopper", "Placeless @Genus@", "Blinker", "Portalist", "Plane @Walker@"}, // 30 - {"Transmutation", "Changer", "Transmogrifier", "Alchemist", "Malleable", "Shapeless @Genus@"}, + {"Transmutations", "Changer", "Transmogrifier", "Alchemist", "Malleable", "Shapeless @Genus@"}, {"Divinations", "Seer", "Clairvoyant", "Diviner", "Augur", "Oracle"}, {"Fire Magic", "Firebug", "Arsonist", "Scorcher", "Pyromancer", "Infernalist"}, @@ -184,7 +184,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 100, // SK_SUMMONINGS 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS - 100, // SK_TRANSMUTATION + 100, // SK_TRANSMUTATIONS 100, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC @@ -227,7 +227,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 110, // SK_SUMMONINGS 130, // SK_NECROMANCY 90, // SK_TRANSLOCATIONS - 90, // SK_TRANSMUTATION + 90, // SK_TRANSMUTATIONS 110, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC @@ -270,7 +270,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 90, // SK_SUMMONINGS 130, // SK_NECROMANCY 80, // SK_TRANSLOCATIONS - 80, // SK_TRANSMUTATION + 80, // SK_TRANSMUTATIONS 80, // SK_DIVINATIONS 90, // SK_FIRE_MAGIC 90, // SK_ICE_MAGIC @@ -313,7 +313,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 80, // SK_SUMMONINGS 70, // SK_NECROMANCY 75, // SK_TRANSLOCATIONS - 75, // SK_TRANSMUTATION + 75, // SK_TRANSMUTATIONS 75, // SK_DIVINATIONS 90, // SK_FIRE_MAGIC 90, // SK_ICE_MAGIC @@ -356,7 +356,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 90, // SK_SUMMONINGS 90, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS - 60, // SK_TRANSMUTATION + 60, // SK_TRANSMUTATIONS 130, // SK_DIVINATIONS 80, // SK_FIRE_MAGIC 80, // SK_ICE_MAGIC @@ -399,7 +399,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 150, // SK_SUMMONINGS 160, // SK_NECROMANCY 150, // SK_TRANSLOCATIONS - 120, // SK_TRANSMUTATION + 120, // SK_TRANSMUTATIONS 130, // SK_DIVINATIONS 70, // SK_FIRE_MAGIC 130, // SK_ICE_MAGIC @@ -442,7 +442,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 120, // SK_SUMMONINGS 150, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS - 150, // SK_TRANSMUTATION + 150, // SK_TRANSMUTATIONS 140, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC @@ -485,7 +485,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 120, // SK_SUMMONINGS 100, // SK_NECROMANCY 150, // SK_TRANSLOCATIONS - 160, // SK_TRANSMUTATION + 160, // SK_TRANSMUTATIONS 160, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC @@ -528,7 +528,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 105, // SK_SUMMONINGS 105, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS - 110, // SK_TRANSMUTATION + 110, // SK_TRANSMUTATIONS 130, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC @@ -571,7 +571,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 140, // SK_SUMMONINGS 100, // SK_NECROMANCY 140, // SK_TRANSLOCATIONS - 140, // SK_TRANSMUTATION + 140, // SK_TRANSMUTATIONS 140, // SK_DIVINATIONS 140, // SK_FIRE_MAGIC 140, // SK_ICE_MAGIC @@ -614,7 +614,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 100, // SK_SUMMONINGS 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS - 100, // SK_TRANSMUTATION + 100, // SK_TRANSMUTATIONS 100, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC @@ -657,7 +657,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 110, // SK_SUMMONINGS 130, // SK_NECROMANCY 130, // SK_TRANSLOCATIONS - 120, // SK_TRANSMUTATION + 120, // SK_TRANSMUTATIONS 120, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC @@ -700,7 +700,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 180, // SK_SUMMONINGS 180, // SK_NECROMANCY 180, // SK_TRANSLOCATIONS - 180, // SK_TRANSMUTATION + 180, // SK_TRANSMUTATIONS 180, // SK_DIVINATIONS 180, // SK_FIRE_MAGIC 180, // SK_ICE_MAGIC @@ -743,7 +743,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 160, // SK_SUMMONINGS 150, // SK_NECROMANCY 160, // SK_TRANSLOCATIONS - 160, // SK_TRANSMUTATION + 160, // SK_TRANSMUTATIONS 200, // SK_DIVINATIONS 160, // SK_FIRE_MAGIC 160, // SK_ICE_MAGIC @@ -786,7 +786,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 100, // SK_SUMMONINGS 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS - 100, // SK_TRANSMUTATION + 100, // SK_TRANSMUTATIONS 100, // SK_DIVINATIONS 70, // SK_FIRE_MAGIC 135, // SK_ICE_MAGIC @@ -829,7 +829,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 100, // SK_SUMMONINGS 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS - 100, // SK_TRANSMUTATION + 100, // SK_TRANSMUTATIONS 100, // SK_DIVINATIONS 135, // SK_FIRE_MAGIC 70, // SK_ICE_MAGIC @@ -872,7 +872,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 100, // SK_SUMMONINGS 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS - 100, // SK_TRANSMUTATION + 100, // SK_TRANSMUTATIONS 100, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC @@ -915,7 +915,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 100, // SK_SUMMONINGS 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS - 100, // SK_TRANSMUTATION + 100, // SK_TRANSMUTATIONS 100, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC @@ -958,7 +958,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 100, // SK_SUMMONINGS 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS - 100, // SK_TRANSMUTATION + 100, // SK_TRANSMUTATIONS 100, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC @@ -1001,7 +1001,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 100, // SK_SUMMONINGS 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS - 100, // SK_TRANSMUTATION + 100, // SK_TRANSMUTATIONS 100, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC @@ -1044,7 +1044,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 100, // SK_SUMMONINGS 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS - 100, // SK_TRANSMUTATION + 100, // SK_TRANSMUTATIONS 100, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC @@ -1087,7 +1087,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 100, // SK_SUMMONINGS 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS - 100, // SK_TRANSMUTATION + 100, // SK_TRANSMUTATIONS 100, // SK_DIVINATIONS 80, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC @@ -1130,7 +1130,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 100, // SK_SUMMONINGS 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS - 100, // SK_TRANSMUTATION + 100, // SK_TRANSMUTATIONS 100, // SK_DIVINATIONS 90, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC @@ -1173,7 +1173,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 100, // SK_SUMMONINGS 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS - 100, // SK_TRANSMUTATION + 100, // SK_TRANSMUTATIONS 100, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC @@ -1216,7 +1216,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 120, // SK_SUMMONINGS 120, // SK_NECROMANCY 120, // SK_TRANSLOCATIONS - 120, // SK_TRANSMUTATION + 120, // SK_TRANSMUTATIONS 130, // SK_DIVINATIONS 120, // SK_FIRE_MAGIC 120, // SK_ICE_MAGIC @@ -1259,7 +1259,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 110, // SK_SUMMONINGS 110, // SK_NECROMANCY 110, // SK_TRANSLOCATIONS - 110, // SK_TRANSMUTATION + 110, // SK_TRANSMUTATIONS 110, // SK_DIVINATIONS 110, // SK_FIRE_MAGIC 110, // SK_ICE_MAGIC @@ -1302,7 +1302,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 150, // SK_SUMMONINGS 120, // SK_NECROMANCY 50, // SK_TRANSLOCATIONS - 60, // SK_TRANSMUTATION + 60, // SK_TRANSMUTATIONS 70, // SK_DIVINATIONS 140, // SK_FIRE_MAGIC 140, // SK_ICE_MAGIC @@ -1345,7 +1345,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 170, // SK_SUMMONINGS 170, // SK_NECROMANCY 170, // SK_TRANSLOCATIONS - 170, // SK_TRANSMUTATION + 170, // SK_TRANSMUTATIONS 170, // SK_DIVINATIONS 170, // SK_FIRE_MAGIC 170, // SK_ICE_MAGIC @@ -1388,7 +1388,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 100, // SK_SUMMONINGS 90, // SK_NECROMANCY 110, // SK_TRANSLOCATIONS - 110, // SK_TRANSMUTATION + 110, // SK_TRANSMUTATIONS 110, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 110, // SK_ICE_MAGIC @@ -1431,7 +1431,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 120, // SK_SUMMONINGS 100, // SK_NECROMANCY 120, // SK_TRANSLOCATIONS - 120, // SK_TRANSMUTATION + 120, // SK_TRANSMUTATIONS 120, // SK_DIVINATIONS 150, // SK_FIRE_MAGIC 90, // SK_ICE_MAGIC @@ -1474,7 +1474,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 70, // SK_SUMMONINGS 80, // SK_NECROMANCY 150, // SK_TRANSLOCATIONS - 150, // SK_TRANSMUTATION + 150, // SK_TRANSMUTATIONS 180, // SK_DIVINATIONS 90, // SK_FIRE_MAGIC 120, // SK_ICE_MAGIC @@ -1517,7 +1517,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 100, // SK_SUMMONINGS 150, // SK_NECROMANCY 140, // SK_TRANSLOCATIONS - 60, // SK_TRANSMUTATION + 60, // SK_TRANSMUTATIONS 80, // SK_DIVINATIONS 160, // SK_FIRE_MAGIC 80, // SK_ICE_MAGIC @@ -1560,7 +1560,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 100, // SK_SUMMONINGS 90, // SK_NECROMANCY 140, // SK_TRANSLOCATIONS - 90, // SK_TRANSMUTATION + 90, // SK_TRANSMUTATIONS 120, // SK_DIVINATIONS 140, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC @@ -1623,7 +1623,7 @@ static const skill_type skill_display_order[] = SK_COLUMN_BREAK, SK_SPELLCASTING, SK_CONJURATIONS, SK_ENCHANTMENTS, SK_SUMMONINGS, - SK_NECROMANCY, SK_TRANSLOCATIONS, SK_TRANSMUTATION, SK_DIVINATIONS, + SK_NECROMANCY, SK_TRANSLOCATIONS, SK_TRANSMUTATIONS, SK_DIVINATIONS, SK_FIRE_MAGIC, SK_ICE_MAGIC, SK_AIR_MAGIC, SK_EARTH_MAGIC, SK_POISON_MAGIC, SK_BLANK_LINE, diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index 1f6e008d1b..7e46afc98d 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -1040,7 +1040,7 @@ bool cast_sticks_to_snakes(int pow, god_type god) monster_type mon = MONS_PROGRAM_BUG; const int dur = std::min(3 + random2(pow) / 20, 5); - int how_many_max = 1 + random2(1 + you.skills[SK_TRANSMUTATION]) / 4; + int how_many_max = 1 + random2(1 + you.skills[SK_TRANSMUTATIONS]) / 4; const bool friendly = (!item_cursed(wpn)); const beh_type beha = (friendly) ? BEH_FRIENDLY : BEH_HOSTILE; @@ -1186,7 +1186,7 @@ bool cast_summon_swarm(int pow, god_type god, MONS_BUTTERFLY, MONS_YELLOW_WASP, MONS_GIANT_ANT, MONS_GIANT_ANT, MONS_GIANT_ANT }; - + const monster_type mon = RANDOM_ELEMENT(swarmers); const bool friendly = force_hostile ? false : (random2(pow) > 7); diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index a0222a7fc1..6129c2d4ef 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -1,6 +1,6 @@ /* * File: spells4.cc - * Summary: new spells, focusing on Transmutation, Divination, + * Summary: new spells, focusing on Transmutations, Divinations, * and other neglected areas of Crawl magic ;^) * Written by: Copyleft Josh Fishman 1999-2000, All Rights Preserved * diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc index 21e71c5c65..f35903dfdb 100644 --- a/crawl-ref/source/spl-book.cc +++ b/crawl-ref/source/spl-book.cc @@ -2626,7 +2626,7 @@ bool make_book_theme_randart(item_def &book, int disc1, int disc2, return (true); } -// Give Roxanne a randart spellbook of the disciplines Transmutation/Earth +// Give Roxanne a randart spellbook of the disciplines Transmutations/Earth // that includes Statue Form and is named after her. void make_book_Roxanne_special(item_def *book) { diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc index 5b4ab85812..5d16fa60ab 100644 --- a/crawl-ref/source/spl-util.cc +++ b/crawl-ref/source/spl-util.cc @@ -883,7 +883,7 @@ int spell_type2skill(unsigned int spelltype) case SPTYP_ENCHANTMENT: return (SK_ENCHANTMENTS); case SPTYP_FIRE: return (SK_FIRE_MAGIC); case SPTYP_ICE: return (SK_ICE_MAGIC); - case SPTYP_TRANSMUTATION: return (SK_TRANSMUTATION); + case SPTYP_TRANSMUTATION: return (SK_TRANSMUTATIONS); case SPTYP_NECROMANCY: return (SK_NECROMANCY); case SPTYP_SUMMONING: return (SK_SUMMONINGS); case SPTYP_DIVINATION: return (SK_DIVINATIONS); @@ -910,7 +910,7 @@ int spell_skill2type(unsigned int skill) case SK_ENCHANTMENTS: return (SPTYP_ENCHANTMENT); case SK_FIRE_MAGIC: return (SPTYP_FIRE); case SK_ICE_MAGIC: return (SPTYP_ICE); - case SK_TRANSMUTATION: return (SPTYP_TRANSMUTATION); + case SK_TRANSMUTATIONS: return (SPTYP_TRANSMUTATION); case SK_NECROMANCY: return (SPTYP_NECROMANCY); case SK_SUMMONINGS: return (SPTYP_SUMMONING); case SK_DIVINATIONS: return (SPTYP_DIVINATION); diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc index fb131a5d56..b56cf483ab 100644 --- a/crawl-ref/source/tutorial.cc +++ b/crawl-ref/source/tutorial.cc @@ -1071,7 +1071,7 @@ void tut_gained_new_skill(int skill) case SK_SUMMONINGS: case SK_NECROMANCY: case SK_TRANSLOCATIONS: - case SK_TRANSMUTATION: + case SK_TRANSMUTATIONS: case SK_DIVINATIONS: case SK_FIRE_MAGIC: case SK_ICE_MAGIC: |