diff options
25 files changed, 95 insertions, 93 deletions
diff --git a/crawl-ref/docs/aptitudes.txt b/crawl-ref/docs/aptitudes.txt index e768c0045c..1638b6407a 100644 --- a/crawl-ref/docs/aptitudes.txt +++ b/crawl-ref/docs/aptitudes.txt @@ -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 - Transmigration + Stv - Staves Trm - Transmutation Inv - Invocations U C - Unarmed Combat Div - Divinations Evo - Evocations Thr - Throwing Fir - Fire Magic diff --git a/crawl-ref/source/chardump.cc b/crawl-ref/source/chardump.cc index e65ee6143f..579069cd04 100644 --- a/crawl-ref/source/chardump.cc +++ b/crawl-ref/source/chardump.cc @@ -911,7 +911,7 @@ static void _sdump_spells(dump_params &par) SPTYP_DIVINATION, SPTYP_TRANSLOCATION, SPTYP_SUMMONING, - SPTYP_TRANSMIGRATION, + SPTYP_TRANSMUTATION, SPTYP_NECROMANCY, 0 }; diff --git a/crawl-ref/source/dat/database/randname.txt b/crawl-ref/source/dat/database/randname.txt index 75dbd5ef9e..abc1a7979f 100644 --- a/crawl-ref/source/dat/database/randname.txt +++ b/crawl-ref/source/dat/database/randname.txt @@ -1063,7 +1063,7 @@ the Glacier the Frostbite %%%% -Transmigration +Transmutation Transmigration @@ -1268,7 +1268,7 @@ Congealing Frigorific %%%% -Transmigration adj +Transmutation adj Shifting diff --git a/crawl-ref/source/dat/descript/skills.txt b/crawl-ref/source/dat/descript/skills.txt index 760b5732b5..a1a3601d7a 100644 --- a/crawl-ref/source/dat/descript/skills.txt +++ b/crawl-ref/source/dat/descript/skills.txt @@ -197,14 +197,14 @@ on spellcasting success and power. Translocations focus on spatial movement of beings or objects. %%%% -Transmigration +Transmutation Being skilled in a magical "school" makes it easier to learn and cast spells of this school. Many spells belong to a combination of several schools, in which case the average skill in these schools will decide on spellcasting success and power. -Transmigrations deal with changing shapes. It is possible to become a +Transmutations deal with changing shapes. It is possible to become a powerful dragon, for example. %%%% Divinations diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index 34fb13bc91..523c72da81 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -1245,7 +1245,7 @@ static int _find_acquirement_subtype(object_class_type class_wanted, type_wanted = BOOK_WARP; break; - case SK_TRANSMIGRATION: + case SK_TRANSMUTATION: if (!you.had_book[BOOK_CHANGES]) type_wanted = BOOK_CHANGES; else if (!you.had_book[BOOK_TRANSFIGURATIONS]) diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 59ae2824c9..0db2d35711 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -2544,7 +2544,7 @@ enum skill_type SK_SUMMONINGS, SK_NECROMANCY, SK_TRANSLOCATIONS, // 30 - SK_TRANSMIGRATION, + SK_TRANSMUTATION, SK_DIVINATIONS, SK_FIRE_MAGIC, SK_ICE_MAGIC, @@ -2792,9 +2792,9 @@ enum spell_type SPELL_INTOXICATE, // confusion but only "smart" creatures SPELL_EVAPORATE, // 190, turn a potion into a cloud SPELL_FRAGMENTATION, // replacement for "orb of frag" - SPELL_AIR_WALK, // "dematerialise" (air/transmigration) + SPELL_AIR_WALK, // "dematerialise" (air/transmutation) SPELL_SANDBLAST, // mini-frag; can use stones for material comp - SPELL_ROTTING, // evil god power or necromantic transmigration + SPELL_ROTTING, // evil god power or necromantic transmutation SPELL_MAXWELLS_SILVER_HAMMER, // 195, vorpal-brand maces etc. SPELL_CONDENSATION_SHIELD, // "shield" of icy vapour SPELL_SEMI_CONTROLLED_BLINK, //jmf: to test effect diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 746a1360d2..8ad13595b7 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -3481,7 +3481,7 @@ static void _create_wanderer( void ) SK_INVOCATIONS, SK_EVOCATIONS }; const skill_type all_skills[] = - { SK_SUMMONINGS, SK_NECROMANCY, SK_TRANSLOCATIONS, SK_TRANSMIGRATION, + { SK_SUMMONINGS, SK_NECROMANCY, SK_TRANSLOCATIONS, SK_TRANSMUTATION, SK_DIVINATIONS, SK_POISON_MAGIC, SK_SLINGS, SK_BOWS, SK_CROSSBOWS, SK_SPELLCASTING, SK_CONJURATIONS, SK_ENCHANTMENTS, @@ -5191,7 +5191,7 @@ bool _give_items_skills() you.skills[SK_FIGHTING] = 1; you.skills[SK_DODGING] = 2; you.skills[SK_SPELLCASTING] = 2; - you.skills[SK_TRANSMIGRATION] = 2; + you.skills[SK_TRANSMUTATION] = 2; break; case JOB_FIRE_ELEMENTALIST: @@ -5238,7 +5238,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_TRANSMIGRATION] = 1; + you.skills[SK_TRANSMUTATION] = 1; you.skills[SK_EARTH_MAGIC] = 3; you.skills[SK_SPELLCASTING] = 1; you.skills[SK_DODGING] = 2; diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt index e73c726e23..10ce7bf7a1 100644 --- a/crawl-ref/source/rltiles/dc-item.txt +++ b/crawl-ref/source/rltiles/dc-item.txt @@ -670,6 +670,7 @@ metal_green ############papyrus 1
cloth BOOK_PAPYRUS
# randarts
+%sdir item/book/artefact
wrinkled BOOK_RANDART_OFFSET
vellum
velvet
@@ -677,6 +678,7 @@ thick buckle
bookmark
thin
+
#####################OBJ_STAVES
%sdir item/staff
staff00 STAFF_OFFSET /*curved*/
diff --git a/crawl-ref/source/rltiles/item/book/bookmark.png b/crawl-ref/source/rltiles/item/book/artefact/bookmark.png Binary files differindex bbd9fd0084..bbd9fd0084 100644 --- a/crawl-ref/source/rltiles/item/book/bookmark.png +++ b/crawl-ref/source/rltiles/item/book/artefact/bookmark.png diff --git a/crawl-ref/source/rltiles/item/book/buckle.png b/crawl-ref/source/rltiles/item/book/artefact/buckle.png Binary files differindex 5e03070d4f..5e03070d4f 100644 --- a/crawl-ref/source/rltiles/item/book/buckle.png +++ b/crawl-ref/source/rltiles/item/book/artefact/buckle.png diff --git a/crawl-ref/source/rltiles/item/book/thick.png b/crawl-ref/source/rltiles/item/book/artefact/thick.png Binary files differindex 699d6ba71e..699d6ba71e 100644 --- a/crawl-ref/source/rltiles/item/book/thick.png +++ b/crawl-ref/source/rltiles/item/book/artefact/thick.png diff --git a/crawl-ref/source/rltiles/item/book/thin.png b/crawl-ref/source/rltiles/item/book/artefact/thin.png Binary files differindex 519c6e9398..519c6e9398 100644 --- a/crawl-ref/source/rltiles/item/book/thin.png +++ b/crawl-ref/source/rltiles/item/book/artefact/thin.png diff --git a/crawl-ref/source/rltiles/item/book/vellum.png b/crawl-ref/source/rltiles/item/book/artefact/vellum.png Binary files differindex 5b75d44faf..5b75d44faf 100644 --- a/crawl-ref/source/rltiles/item/book/vellum.png +++ b/crawl-ref/source/rltiles/item/book/artefact/vellum.png diff --git a/crawl-ref/source/rltiles/item/book/velvet.png b/crawl-ref/source/rltiles/item/book/artefact/velvet.png Binary files differindex 28bcd734ac..28bcd734ac 100644 --- a/crawl-ref/source/rltiles/item/book/velvet.png +++ b/crawl-ref/source/rltiles/item/book/artefact/velvet.png diff --git a/crawl-ref/source/rltiles/item/book/wrinkled.png b/crawl-ref/source/rltiles/item/book/artefact/wrinkled.png Binary files differindex f3812133ba..f3812133ba 100644 --- a/crawl-ref/source/rltiles/item/book/wrinkled.png +++ b/crawl-ref/source/rltiles/item/book/artefact/wrinkled.png diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc index 9419ee72ac..df8a11a05e 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 - {"Transmigration", "Changer", "Transmogrifier", "Alchemist", "Malleable", "Shapeless @Genus@"}, + {"Transmutation", "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_TRANSMIGRATION + 100, // SK_TRANSMUTATION 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_TRANSMIGRATION + 90, // SK_TRANSMUTATION 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_TRANSMIGRATION + 80, // SK_TRANSMUTATION 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_TRANSMIGRATION + 75, // SK_TRANSMUTATION 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_TRANSMIGRATION + 60, // SK_TRANSMUTATION 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_TRANSMIGRATION + 120, // SK_TRANSMUTATION 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_TRANSMIGRATION + 150, // SK_TRANSMUTATION 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_TRANSMIGRATION + 160, // SK_TRANSMUTATION 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_TRANSMIGRATION + 110, // SK_TRANSMUTATION 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_TRANSMIGRATION + 140, // SK_TRANSMUTATION 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_TRANSMIGRATION + 100, // SK_TRANSMUTATION 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_TRANSMIGRATION + 120, // SK_TRANSMUTATION 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_TRANSMIGRATION + 180, // SK_TRANSMUTATION 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_TRANSMIGRATION + 160, // SK_TRANSMUTATION 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_TRANSMIGRATION + 100, // SK_TRANSMUTATION 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_TRANSMIGRATION + 100, // SK_TRANSMUTATION 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_TRANSMIGRATION + 100, // SK_TRANSMUTATION 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_TRANSMIGRATION + 100, // SK_TRANSMUTATION 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_TRANSMIGRATION + 100, // SK_TRANSMUTATION 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_TRANSMIGRATION + 100, // SK_TRANSMUTATION 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_TRANSMIGRATION + 100, // SK_TRANSMUTATION 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_TRANSMIGRATION + 100, // SK_TRANSMUTATION 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_TRANSMIGRATION + 100, // SK_TRANSMUTATION 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_TRANSMIGRATION + 100, // SK_TRANSMUTATION 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_TRANSMIGRATION + 120, // SK_TRANSMUTATION 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_TRANSMIGRATION + 110, // SK_TRANSMUTATION 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_TRANSMIGRATION + 60, // SK_TRANSMUTATION 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_TRANSMIGRATION + 170, // SK_TRANSMUTATION 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_TRANSMIGRATION + 110, // SK_TRANSMUTATION 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_TRANSMIGRATION + 120, // SK_TRANSMUTATION 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_TRANSMIGRATION + 150, // SK_TRANSMUTATION 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_TRANSMIGRATION + 60, // SK_TRANSMUTATION 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_TRANSMIGRATION + 90, // SK_TRANSMUTATION 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_TRANSMIGRATION, SK_DIVINATIONS, + SK_NECROMANCY, SK_TRANSLOCATIONS, SK_TRANSMUTATION, 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 896c25c864..22a99236c8 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -1047,7 +1047,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_TRANSMIGRATION]) / 4; + int how_many_max = 1 + random2(1 + you.skills[SK_TRANSMUTATION]) / 4; const bool friendly = (!item_cursed(wpn)); const beh_type beha = (friendly) ? BEH_FRIENDLY : BEH_HOSTILE; const unsigned short hitting = (friendly) ? you.pet_target : MHITYOU; diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index 6c4163d07e..9fe008401d 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -1,7 +1,7 @@ /* * File: spells4.cc - * Summary: new spells, focusing on transmigration, divination and - * other neglected areas of Crawl magic ;^) + * Summary: new spells, focusing on Transmutation, Divination, + * and other neglected areas of Crawl magic ;^) * Written by: Copyleft Josh Fishman 1999-2000, All Rights Preserved * * Modified for Crawl Reference by $Author$ on $Date$ diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc index 574436b063..93e291ba93 100644 --- a/crawl-ref/source/spl-book.cc +++ b/crawl-ref/source/spl-book.cc @@ -2477,11 +2477,11 @@ bool make_book_theme_randart(item_def &book, int disc1, int disc2, return (true); } -// Give Roxanne a randart spellbook of the disciplines Transmigration/Earth +// Give Roxanne a randart spellbook of the disciplines Transmutation/Earth // that includes Statue Form and is named after her. void make_book_Roxanne_special(item_def *book) { - int disc = coinflip() ? SPTYP_TRANSMIGRATION : SPTYP_EARTH; + int disc = coinflip() ? SPTYP_TRANSMUTATION : SPTYP_EARTH; make_book_theme_randart(*book, disc, 0, 5, 19, SPELL_STATUE_FORM, "Roxanne"); } diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 56bc4b7e4b..d80f0b5ec1 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -2558,7 +2558,7 @@ void MiscastEffect::do_miscast() case SPTYP_TRANSLOCATION: _translocation(severity); break; case SPTYP_SUMMONING: _summoning(severity); break; case SPTYP_NECROMANCY: _necromancy(severity); break; - case SPTYP_TRANSMIGRATION: _transmigration(severity); break; + case SPTYP_TRANSMUTATION: _transmutation(severity); break; case SPTYP_FIRE: _fire(severity); break; case SPTYP_ICE: _ice(severity); break; case SPTYP_EARTH: _earth(severity); break; @@ -3933,7 +3933,7 @@ void MiscastEffect::_necromancy(int severity) } } -void MiscastEffect::_transmigration(int severity) +void MiscastEffect::_transmutation(int severity) { int num; switch (severity) diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h index ae668b289f..0b498d9ab7 100644 --- a/crawl-ref/source/spl-data.h +++ b/crawl-ref/source/spl-data.h @@ -26,7 +26,7 @@ migrations in that the latter cause a permanent alteration in something which persists even after the magic has faded, while the effects of the former last only so long as the magic does. Sometimes enchantments may take - advantage of the more powerful aspects of transmigration to induce some + advantage of the more powerful aspects of transmutation to induce some kind of radical change (eg polymorph). Some enchantments would also fall under the description of 'meta-magic' spells, like Selective Amnesia and Remove Curse (and if I ever implement @@ -53,7 +53,7 @@ Especially because having a fire specialisation basically removes any chance of ever using ice spells effectively, and vice versa. - Transmigration + Transmutation See enchantments. Necromancy @@ -313,7 +313,7 @@ { SPELL_DIG, "Dig", - SPTYP_TRANSMIGRATION | SPTYP_EARTH, + SPTYP_TRANSMUTATION | SPTYP_EARTH, SPFLAG_DIR_OR_TARGET | SPFLAG_NOT_SELF | SPFLAG_NEUTRAL, 4, 200, @@ -378,7 +378,7 @@ { SPELL_POLYMORPH_OTHER, "Polymorph Other", - SPTYP_TRANSMIGRATION, // removed enchantment, wasn't needed -- bwr + SPTYP_TRANSMUTATION, // removed enchantment, wasn't needed -- bwr SPFLAG_DIR_OR_TARGET | SPFLAG_NOT_SELF, 5, 200, @@ -1344,7 +1344,7 @@ { SPELL_FULSOME_DISTILLATION, "Fulsome Distillation", - SPTYP_TRANSMIGRATION | SPTYP_NECROMANCY, + SPTYP_TRANSMUTATION | SPTYP_NECROMANCY, SPFLAG_NONE, 1, 50, @@ -1422,7 +1422,7 @@ { SPELL_CIGOTUVIS_DEGENERATION, "Cigotuvi's Degeneration", - SPTYP_TRANSMIGRATION | SPTYP_NECROMANCY, + SPTYP_TRANSMUTATION | SPTYP_NECROMANCY, SPFLAG_DIR_OR_TARGET | SPFLAG_NOT_SELF, 5, 200, @@ -1813,7 +1813,7 @@ { SPELL_ALTER_SELF, "Alter Self", - SPTYP_TRANSMIGRATION, + SPTYP_TRANSMUTATION, SPFLAG_NONE, 7, 0, @@ -1878,7 +1878,7 @@ { SPELL_SPIDER_FORM, "Spider Form", - SPTYP_TRANSMIGRATION | SPTYP_POISON, + SPTYP_TRANSMUTATION | SPTYP_POISON, SPFLAG_HELPFUL, 3, 200, @@ -1891,7 +1891,7 @@ { SPELL_DISRUPT, "Disrupt", - SPTYP_TRANSMIGRATION, + SPTYP_TRANSMUTATION, SPFLAG_DIR_OR_TARGET | SPFLAG_BATTLE | SPFLAG_DEVEL, 1, 25, @@ -1904,7 +1904,7 @@ { SPELL_DISINTEGRATE, "Disintegrate", - SPTYP_TRANSMIGRATION, + SPTYP_TRANSMUTATION, SPFLAG_DIR_OR_TARGET | SPFLAG_NOT_SELF | SPFLAG_CARD, 6, 200, @@ -1917,7 +1917,7 @@ { SPELL_BLADE_HANDS, "Blade Hands", - SPTYP_TRANSMIGRATION, + SPTYP_TRANSMUTATION, SPFLAG_HELPFUL | SPFLAG_BATTLE, 5, // only removes weapon, so I raised this from 4 -- bwr 200, @@ -1930,7 +1930,7 @@ { SPELL_STATUE_FORM, "Statue Form", - SPTYP_TRANSMIGRATION | SPTYP_EARTH, + SPTYP_TRANSMUTATION | SPTYP_EARTH, SPFLAG_HELPFUL, 6, 200, @@ -1943,7 +1943,7 @@ { SPELL_ICE_FORM, "Ice Form", - SPTYP_ICE | SPTYP_TRANSMIGRATION, + SPTYP_ICE | SPTYP_TRANSMUTATION, SPFLAG_HELPFUL, 4, // doesn't allow for equipment, so I lowered this from 5 -- bwr 200, @@ -1956,7 +1956,7 @@ { SPELL_DRAGON_FORM, "Dragon Form", - SPTYP_FIRE | SPTYP_TRANSMIGRATION, + SPTYP_FIRE | SPTYP_TRANSMUTATION, SPFLAG_HELPFUL, 8, 200, @@ -1969,7 +1969,7 @@ { SPELL_NECROMUTATION, "Necromutation", - SPTYP_TRANSMIGRATION | SPTYP_NECROMANCY, + SPTYP_TRANSMUTATION | SPTYP_NECROMANCY, SPFLAG_HELPFUL, 8, 200, @@ -2138,7 +2138,7 @@ { SPELL_PASSWALL, "Passwall", - SPTYP_TRANSMIGRATION | SPTYP_EARTH, + SPTYP_TRANSMUTATION | SPTYP_EARTH, SPFLAG_ESCAPE, 3, 200, @@ -2151,7 +2151,7 @@ { SPELL_IGNITE_POISON, "Ignite Poison", - SPTYP_FIRE | SPTYP_TRANSMIGRATION, + SPTYP_FIRE | SPTYP_TRANSMUTATION, SPFLAG_AREA | SPFLAG_BATTLE, 6, 200, @@ -2164,7 +2164,7 @@ { SPELL_STICKS_TO_SNAKES, "Sticks to Snakes", - SPTYP_TRANSMIGRATION | SPTYP_SUMMONING, + SPTYP_TRANSMUTATION | SPTYP_SUMMONING, SPFLAG_BATTLE, 2, 200, @@ -2333,7 +2333,7 @@ { SPELL_SHATTER, "Shatter", - SPTYP_TRANSMIGRATION | SPTYP_EARTH, + SPTYP_TRANSMUTATION | SPTYP_EARTH, SPFLAG_AREA, 9, 200, @@ -2398,7 +2398,7 @@ { SPELL_INTOXICATE, "Alistair's Intoxication", - SPTYP_TRANSMIGRATION | SPTYP_POISON, + SPTYP_TRANSMUTATION | SPTYP_POISON, SPFLAG_NONE, 4, 0, @@ -2411,7 +2411,7 @@ { SPELL_EVAPORATE, "Evaporate", - SPTYP_FIRE | SPTYP_TRANSMIGRATION, + SPTYP_FIRE | SPTYP_TRANSMUTATION, SPFLAG_DIR_OR_TARGET | SPFLAG_AREA, 2, // XXX: level 2 or 3, what should it be now? -- bwr 200, @@ -2424,7 +2424,7 @@ { SPELL_FRAGMENTATION, "Lee's Rapid Deconstruction", - SPTYP_TRANSMIGRATION | SPTYP_EARTH, + SPTYP_TRANSMUTATION | SPTYP_EARTH, SPFLAG_GRID, 5, 200, @@ -2437,7 +2437,7 @@ { SPELL_AIR_WALK, "Air Walk", - SPTYP_TRANSMIGRATION | SPTYP_AIR, + SPTYP_TRANSMUTATION | SPTYP_AIR, SPFLAG_HELPFUL, 9, 200, @@ -2450,7 +2450,7 @@ { SPELL_SANDBLAST, "Sandblast", - SPTYP_TRANSMIGRATION | SPTYP_EARTH, + SPTYP_TRANSMUTATION | SPTYP_EARTH, SPFLAG_DIR_OR_TARGET | SPFLAG_NOT_SELF | SPFLAG_BATTLE, 1, 50, @@ -2463,7 +2463,7 @@ { SPELL_ROTTING, "Rotting", - SPTYP_TRANSMIGRATION | SPTYP_NECROMANCY, + SPTYP_TRANSMUTATION | SPTYP_NECROMANCY, SPFLAG_AREA, 5, 200, @@ -2476,7 +2476,7 @@ { SPELL_MAXWELLS_SILVER_HAMMER, "Maxwell's Silver Hammer", - SPTYP_TRANSMIGRATION | SPTYP_EARTH, + SPTYP_TRANSMUTATION | SPTYP_EARTH, SPFLAG_HELPFUL | SPFLAG_BATTLE, 2, 200, @@ -2489,7 +2489,7 @@ { SPELL_CONDENSATION_SHIELD, "Condensation Shield", - SPTYP_ICE | SPTYP_TRANSMIGRATION, + SPTYP_ICE | SPTYP_TRANSMUTATION, SPFLAG_HELPFUL, 4, 200, @@ -2515,7 +2515,7 @@ { SPELL_STONESKIN, "Stoneskin", - SPTYP_EARTH | SPTYP_TRANSMIGRATION, // was ench -- bwr + SPTYP_EARTH | SPTYP_TRANSMUTATION, // was ench -- bwr SPFLAG_HELPFUL, 2, 200, diff --git a/crawl-ref/source/spl-mis.h b/crawl-ref/source/spl-mis.h index c1f3dee006..9c8a14b9b8 100644 --- a/crawl-ref/source/spl-mis.h +++ b/crawl-ref/source/spl-mis.h @@ -131,7 +131,7 @@ private: void _divination_you(int severity); void _divination_mon(int severity); void _necromancy(int severity); - void _transmigration(int severity); + void _transmutation(int severity); void _fire(int severity); void _ice(int severity); void _earth(int severity); diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc index 4b99df98fc..be1be5ae5b 100644 --- a/crawl-ref/source/spl-util.cc +++ b/crawl-ref/source/spl-util.cc @@ -766,7 +766,7 @@ const char* spelltype_short_name( int which_spelltype ) return ("Fire"); case SPTYP_ICE: return ("Ice"); - case SPTYP_TRANSMIGRATION: + case SPTYP_TRANSMUTATION: return ("Tmgr"); case SPTYP_NECROMANCY: return ("Necr"); @@ -803,8 +803,8 @@ const char* spelltype_long_name( int which_spelltype ) return ("Fire"); case SPTYP_ICE: return ("Ice"); - case SPTYP_TRANSMIGRATION: - return ("Transmigration"); + case SPTYP_TRANSMUTATION: + return ("Transmutation"); case SPTYP_NECROMANCY: return ("Necromancy"); case SPTYP_HOLY: @@ -840,8 +840,8 @@ const char *spelltype_name(unsigned int which_spelltype) return ("Fire"); case SPTYP_ICE: return ("Ice"); - case SPTYP_TRANSMIGRATION: - return ("Transmigration"); + case SPTYP_TRANSMUTATION: + return ("Transmutation"); case SPTYP_NECROMANCY: return ("Necromancy"); case SPTYP_HOLY: @@ -871,7 +871,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_TRANSMIGRATION: return (SK_TRANSMIGRATION); + case SPTYP_TRANSMUTATION: return (SK_TRANSMUTATION); case SPTYP_NECROMANCY: return (SK_NECROMANCY); case SPTYP_SUMMONING: return (SK_SUMMONINGS); case SPTYP_DIVINATION: return (SK_DIVINATIONS); @@ -898,7 +898,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_TRANSMIGRATION: return (SPTYP_TRANSMIGRATION); + case SK_TRANSMUTATION: 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/spl-util.h b/crawl-ref/source/spl-util.h index c41fa1bb4f..2a916a4b32 100644 --- a/crawl-ref/source/spl-util.h +++ b/crawl-ref/source/spl-util.h @@ -20,7 +20,7 @@ enum spschool_flag_type SPTYP_ENCHANTMENT = 1<<1, SPTYP_FIRE = 1<<2, SPTYP_ICE = 1<<3, - SPTYP_TRANSMIGRATION = 1<<4, + SPTYP_TRANSMUTATION = 1<<4, SPTYP_NECROMANCY = 1<<5, SPTYP_SUMMONING = 1<<6, SPTYP_DIVINATION = 1<<7, diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc index 1a0e67cca8..79db961492 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_TRANSMIGRATION: + case SK_TRANSMUTATION: case SK_DIVINATIONS: case SK_FIRE_MAGIC: case SK_ICE_MAGIC: |
