From d8435ada14d2be5243e3ce499fbd2666bb2da90d Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Sat, 14 Nov 2009 14:33:07 +0100 Subject: Implement "blink other closer" as a monster spell. --- crawl-ref/source/spl-data.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'crawl-ref/source/spl-data.h') diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h index e8d212591e..cd4fba8797 100644 --- a/crawl-ref/source/spl-data.h +++ b/crawl-ref/source/spl-data.h @@ -2238,6 +2238,19 @@ false }, +{ + SPELL_BLINK_OTHER_CLOSER, "Blink Other Closer", + SPTYP_TRANSLOCATION, + SPFLAG_TARGET | SPFLAG_MONSTER, + 2, + 0, + LOS_RADIUS, LOS_RADIUS, + 0, + NULL, + true, + false +}, + { SPELL_SUMMON_MUSHROOMS, "Summon Mushrooms", SPTYP_SUMMONING, -- cgit v1.2.3-54-g00ecf From 782038ad8d8e9313d2fc875fecabdc7436239905 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Sat, 14 Nov 2009 15:55:26 +0100 Subject: Add "blink away" and "blink range" to spl-data.h. --- crawl-ref/source/spl-data.h | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/spl-data.h') diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h index cd4fba8797..48c3d05515 100644 --- a/crawl-ref/source/spl-data.h +++ b/crawl-ref/source/spl-data.h @@ -571,7 +571,7 @@ }, { - SPELL_BLINK, "Blink", + SPELL_BLINK, "Blink", SPTYP_TRANSLOCATION, SPFLAG_ESCAPE, 2, @@ -583,6 +583,32 @@ true }, +{ + SPELL_BLINK_RANGE, "Blink Range", // XXX needs better name + SPTYP_TRANSLOCATION, + SPFLAG_ESCAPE | SPFLAG_MONSTER, + 2, + 0, + -1, -1, + 0, + NULL, + false, + false +}, + +{ + SPELL_BLINK_AWAY, "Blink Away", + SPTYP_TRANSLOCATION, + SPFLAG_ESCAPE | SPFLAG_MONSTER, + 2, + 0, + -1, -1, + 0, + NULL, + false, + false +}, + // The following name was found in the hack.exe file of an early version // of PCHACK - credit goes to its creator (whoever that may be): { -- cgit v1.2.3-54-g00ecf From 39c107535e8796b517e78f68a18d29ee265866f1 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Sat, 14 Nov 2009 17:23:42 +0100 Subject: Rename 'blink * closer' to 'blink * close'. --- crawl-ref/source/beam.cc | 12 ++++++------ crawl-ref/source/enum.h | 8 ++++---- crawl-ref/source/mon-cast.cc | 9 +++++---- crawl-ref/source/mon-spll.h | 2 +- crawl-ref/source/spl-data.h | 2 +- crawl-ref/source/teleport.cc | 2 +- crawl-ref/source/teleport.h | 2 +- 7 files changed, 19 insertions(+), 18 deletions(-) (limited to 'crawl-ref/source/spl-data.h') diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 47bd79c622..1c54f2914e 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -205,7 +205,7 @@ static void _ench_animation(int flavour, const monsters *mon, bool force) case BEAM_TELEPORT: case BEAM_BANISH: case BEAM_BLINK: - case BEAM_BLINK_CLOSER: + case BEAM_BLINK_CLOSE: elem = ETC_WARP; break; default: @@ -3947,8 +3947,8 @@ void bolt::affect_player_enchantment() obvious_effect = true; break; - case BEAM_BLINK_CLOSER: - blink_closer(&you, source); + case BEAM_BLINK_CLOSE: + blink_other_close(&you, source); obvious_effect = true; break; @@ -5163,10 +5163,10 @@ mon_resist_type bolt::apply_enchantment_to_monster(monsters* mon) monster_blink(mon); return (MON_AFFECTED); - case BEAM_BLINK_CLOSER: + case BEAM_BLINK_CLOSE: if (mon->observable()) obvious_effect = true; - blink_closer(mon, source); + blink_other_close(mon, source); return (MON_AFFECTED); case BEAM_POLYMORPH: @@ -6232,7 +6232,7 @@ std::string beam_type_name(beam_type type) case BEAM_DISINTEGRATION: return ("disintegration"); case BEAM_ENSLAVE_DEMON: return ("enslave demon"); case BEAM_BLINK: return ("blink"); - case BEAM_BLINK_CLOSER: return ("blink closer"); + case BEAM_BLINK_CLOSE: return ("blink close"); case BEAM_PETRIFY: return ("petrify"); case BEAM_CORONA: return ("backlight"); case BEAM_PORKALATOR: return ("porkalator"); diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index d22d8fbcd3..c0fa452b32 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -242,9 +242,9 @@ enum beam_type // beam[].flavour BEAM_DISINTEGRATION, BEAM_ENSLAVE_DEMON, BEAM_BLINK, - BEAM_BLINK_CLOSER, + BEAM_BLINK_CLOSE, BEAM_PETRIFY, - BEAM_CORONA, // 45 + BEAM_CORONA, BEAM_PORKALATOR, BEAM_HIBERNATION, BEAM_BERSERK, @@ -2895,8 +2895,8 @@ enum spell_type SPELL_EARTH_ELEMENTALS, SPELL_AIR_ELEMENTALS, SPELL_SLEEP, - SPELL_BLINK_OTHER_CLOSER, - SPELL_BLINK_CLOSER, + SPELL_BLINK_OTHER_CLOSE, + SPELL_BLINK_CLOSE, SPELL_BLINK_RANGE, SPELL_BLINK_AWAY, diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc index b44fdb765c..7616162696 100644 --- a/crawl-ref/source/mon-cast.cc +++ b/crawl-ref/source/mon-cast.cc @@ -622,8 +622,8 @@ bolt mons_spells( monsters *mons, spell_type spell_cast, int power, beam.is_beam = true; break; - case SPELL_BLINK_OTHER_CLOSER: - beam.flavour = BEAM_BLINK_CLOSER; + case SPELL_BLINK_OTHER_CLOSE: + beam.flavour = BEAM_BLINK_CLOSE; beam.is_beam = true; break; @@ -802,6 +802,7 @@ bool setup_mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast, case SPELL_CONTROLLED_BLINK: case SPELL_BLINK_RANGE: case SPELL_BLINK_AWAY: + case SPELL_BLINK_CLOSE: case SPELL_TOMB_OF_DOROKLOHE: case SPELL_CHAIN_LIGHTNING: // the only user is reckless case SPELL_SUMMON_EYEBALLS: @@ -2048,11 +2049,11 @@ void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast, } break; } - case SPELL_BLINK_OTHER_CLOSER: + case SPELL_BLINK_OTHER_CLOSE: { // Allow the caster to comment on moving the foe. std::string msg = getSpeakString(monster->name(DESC_PLAIN) - + " blink_other_closer"); + + " blink_other_close"); if (!msg.empty() && msg != "__NONE") { mons_speaks_msg(monster, msg, MSGCH_TALK, diff --git a/crawl-ref/source/mon-spll.h b/crawl-ref/source/mon-spll.h index dc2e9a2756..0a17a4a77f 100644 --- a/crawl-ref/source/mon-spll.h +++ b/crawl-ref/source/mon-spll.h @@ -1001,7 +1001,7 @@ { SPELL_LEHUDIBS_CRYSTAL_SPEAR, SPELL_IRON_SHOT, - SPELL_BLINK_OTHER_CLOSER, + SPELL_BLINK_OTHER_CLOSE, SPELL_BOLT_OF_MAGMA, SPELL_ISKENDERUNS_MYSTIC_BLAST, SPELL_STONE_ARROW diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h index 48c3d05515..0b5af3f977 100644 --- a/crawl-ref/source/spl-data.h +++ b/crawl-ref/source/spl-data.h @@ -2265,7 +2265,7 @@ }, { - SPELL_BLINK_OTHER_CLOSER, "Blink Other Closer", + SPELL_BLINK_OTHER_CLOSE, "Blink Other Close", SPTYP_TRANSLOCATION, SPFLAG_TARGET | SPFLAG_MONSTER, 2, diff --git a/crawl-ref/source/teleport.cc b/crawl-ref/source/teleport.cc index d1f8aeb077..3a10012c30 100644 --- a/crawl-ref/source/teleport.cc +++ b/crawl-ref/source/teleport.cc @@ -98,7 +98,7 @@ static coord_def random_space_weighted(actor* moved, actor* target, } // Blink the victim closer to the monster at target. -void blink_closer(actor* victim, const coord_def &target) +void blink_other_close(actor* victim, const coord_def &target) { actor* caster = actor_at(target); if (!caster) diff --git a/crawl-ref/source/teleport.h b/crawl-ref/source/teleport.h index a330edc78e..9d87b93301 100644 --- a/crawl-ref/source/teleport.h +++ b/crawl-ref/source/teleport.h @@ -4,7 +4,7 @@ class actor; class monsters; -void blink_closer(actor* victim, const coord_def& target); +void blink_other_close(actor* victim, const coord_def& target); void blink_away(monsters* mon); void blink_range(monsters* mon); -- cgit v1.2.3-54-g00ecf From 6aad7a2a186bc80f8055013e1c667c57d105b91d Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Sat, 14 Nov 2009 17:24:08 +0100 Subject: Implement spell "blink close". This allows a monster to blink close to its target. --- crawl-ref/source/mon-cast.cc | 2 ++ crawl-ref/source/spl-data.h | 13 +++++++++++++ crawl-ref/source/teleport.cc | 13 +++++++++++++ crawl-ref/source/teleport.h | 1 + 4 files changed, 29 insertions(+) (limited to 'crawl-ref/source/spl-data.h') diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc index 7616162696..798dba18fd 100644 --- a/crawl-ref/source/mon-cast.cc +++ b/crawl-ref/source/mon-cast.cc @@ -1295,6 +1295,8 @@ bool handle_mon_spell(monsters *monster, bolt &beem) blink_range(monster); else if (spell_cast == SPELL_BLINK_AWAY) blink_away(monster); + else if (spell_cast == SPELL_BLINK_CLOSE) + blink_close(monster); else { if (spell_needs_foe(spell_cast)) diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h index 0b5af3f977..819edeaeef 100644 --- a/crawl-ref/source/spl-data.h +++ b/crawl-ref/source/spl-data.h @@ -609,6 +609,19 @@ false }, +{ + SPELL_BLINK_CLOSE, "Blink Close", + SPTYP_TRANSLOCATION, + SPFLAG_MONSTER, + 2, + 0, + -1, -1, + 0, + NULL, + false, + false +}, + // The following name was found in the hack.exe file of an early version // of PCHACK - credit goes to its creator (whoever that may be): { diff --git a/crawl-ref/source/teleport.cc b/crawl-ref/source/teleport.cc index ef9cf3a025..8b96ed6b35 100644 --- a/crawl-ref/source/teleport.cc +++ b/crawl-ref/source/teleport.cc @@ -140,6 +140,19 @@ void blink_range(monsters* mon) ASSERT(success); } +// Blink the monster close to its foe. +void blink_close(monsters* mon) +{ + actor* foe = mon->get_foe(); + if (!foe || !mon->can_see(foe)) + return; + coord_def dest = random_space_weighted(mon, foe, true); + if (dest.origin()) + return; + bool success = mon->blink_to(dest); + ASSERT(success); +} + bool random_near_space(const coord_def& origin, coord_def& target, bool allow_adjacent, bool restrict_los, bool forbid_dangerous, bool forbid_sanctuary) diff --git a/crawl-ref/source/teleport.h b/crawl-ref/source/teleport.h index 9d87b93301..e54a437bc6 100644 --- a/crawl-ref/source/teleport.h +++ b/crawl-ref/source/teleport.h @@ -7,6 +7,7 @@ class monsters; void blink_other_close(actor* victim, const coord_def& target); void blink_away(monsters* mon); void blink_range(monsters* mon); +void blink_close(monsters* mon); bool random_near_space(const coord_def& origin, coord_def& target, bool allow_adjacent = false, bool restrict_LOS = true, -- cgit v1.2.3-54-g00ecf From 79c3d7c39771724248d7f06bc206c33d6517225a Mon Sep 17 00:00:00 2001 From: Adam Borowski Date: Sun, 15 Nov 2009 01:21:31 +0100 Subject: Remove the Divinations school. --- crawl-ref/docs/aptitudes.txt | 66 ++++++------- crawl-ref/source/acr.cc | 4 +- crawl-ref/source/dat/database/randbook.txt | 38 ------- crawl-ref/source/effects.cc | 4 +- crawl-ref/source/enum.h | 46 ++++----- crawl-ref/source/itemname.cc | 3 - crawl-ref/source/makeitem.cc | 5 - crawl-ref/source/newgame.cc | 2 +- crawl-ref/source/skills.cc | 2 +- crawl-ref/source/skills2.cc | 153 +++++++++++------------------ crawl-ref/source/spl-book.cc | 40 +------- crawl-ref/source/spl-cast.cc | 2 +- crawl-ref/source/spl-data.h | 8 +- crawl-ref/source/spl-util.cc | 29 +----- crawl-ref/source/spl-util.h | 1 - crawl-ref/source/tags.h | 2 +- crawl-ref/source/tutorial.cc | 1 - 17 files changed, 127 insertions(+), 279 deletions(-) (limited to 'crawl-ref/source/spl-data.h') diff --git a/crawl-ref/docs/aptitudes.txt b/crawl-ref/docs/aptitudes.txt index 0ad6313656..c69291b404 100644 --- a/crawl-ref/docs/aptitudes.txt +++ b/crawl-ref/docs/aptitudes.txt @@ -110,38 +110,38 @@ Vampire 110 90 100 110 140 110 140 90 140 140 140 140 140 Fgt SBl LBl Axs M&F Pla Stv U C Thr Slg Bws Crb Drt - Spc Coj Enc Sum Nec Trl Trm Div Fir Ice Air Ear Poi + Spc Coj Enc Sum Nec Trl Trm Fir Ice Air Ear Poi --------------------------------------------------------------------- -Human 130 100 100 100 100 100 100 100 100 100 100 100 100 -High Elf 90 90 70 110 130 90 90 110 100 100 70 130 130 -Deep Elf 70 80 50 80 70 80 80 80 90 90 80 100 80 -Sludge Elf 90 130 130 90 90 100 60 130 80 80 80 80 80 -Mountain Dwarf 210 120 150 150 160 150 120 130 70 130 150 70 130 -Deep Dwarf 160 120 120 110 80 90 120 120 110 110 170 60 130 -Hill Orc 200 100 120 100 100 150 160 160 100 100 150 100 110 -Merfolk 130 140 90 100 150 140 60 80 160 80 150 150 80 -Halfling 170 130 100 120 150 100 150 140 100 100 90 100 120 -Kobold 140 110 110 110 110 100 110 130 100 100 100 100 100 -Spriggan 80 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 180 120 110 120 120 120 120 130 120 120 120 120 130 -Ogre 90 160 160 160 160 160 160 160 160 160 160 160 160 -Troll 260 160 200 160 150 160 160 200 160 160 200 120 160 -Minotaur 230 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 140 100 100 100 - White 130 100 120 100 100 100 100 100 140 70 100 100 100 - Green 130 100 120 100 100 100 100 100 100 100 100 100 70 - 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 140 100 - Purple 90 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 140 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 160 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 +Human 130 100 100 100 100 100 100 100 100 100 100 100 +High Elf 90 90 70 110 130 90 90 100 100 70 130 130 +Deep Elf 70 80 50 80 70 80 80 90 90 80 100 80 +Sludge Elf 90 130 130 90 90 100 60 80 80 80 80 80 +Mountain Dwarf 210 120 150 150 160 150 120 70 130 150 70 130 +Deep Dwarf 160 120 120 110 80 90 120 110 110 170 60 130 +Hill Orc 200 100 120 100 100 150 160 100 100 150 100 110 +Merfolk 130 140 90 100 150 140 60 160 80 150 150 80 +Halfling 170 130 100 120 150 100 150 100 100 90 100 120 +Kobold 140 110 110 110 110 100 110 100 100 100 100 100 +Spriggan 80 160 50 150 120 50 60 140 140 120 120 100 +Naga 130 100 100 100 100 100 100 100 100 100 100 60 +Centaur 180 120 110 120 120 120 120 120 120 120 120 130 +Ogre 90 160 160 160 160 160 160 160 160 160 160 160 +Troll 260 160 200 160 150 160 160 160 160 200 120 160 +Minotaur 230 170 170 170 170 170 170 170 170 170 170 170 +Kenku 130 60 160 70 80 150 150 90 120 90 120 100 +Draconian Red 130 100 120 100 100 100 100 70 140 100 100 100 + White 130 100 120 100 100 100 100 140 70 100 100 100 + Green 130 100 120 100 100 100 100 100 100 100 100 70 + Yellow 130 100 120 100 100 100 100 100 100 100 100 100 + Grey 130 100 120 100 100 100 100 100 100 100 100 100 + Black 130 100 120 100 100 100 100 100 100 70 140 100 + Purple 90 100 90 100 100 100 100 100 100 100 100 100 + Mottled 130 100 120 100 100 100 100 80 100 100 100 100 + Pale 130 100 120 100 100 100 100 90 100 90 100 100 +Demigod 140 110 110 110 110 110 110 110 110 110 110 110 +Demonspawn 130 100 110 100 90 110 110 100 110 110 110 100 +Mummy 130 140 140 140 100 140 140 140 140 140 140 140 +Ghoul 160 130 130 120 100 120 120 150 90 150 90 100 +Vampire 130 160 90 100 90 140 90 140 100 100 120 120 --------------------------------------------------------------------- - Spc Coj Enc Sum Nec Trl Trm Div Fir Ice Air Ear Poi + Spc Coj Enc Sum Nec Trl Trm Fir Ice Air Ear Poi diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index de7e3f3b9f..357a37431a 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -4428,8 +4428,8 @@ static void _compile_time_asserts() { // Check that the numbering comments in enum.h haven't been // disturbed accidentally. - COMPILE_CHECK(SK_UNARMED_COMBAT == 19 , c1); - COMPILE_CHECK(SK_EVOCATIONS == 39 , c2); + COMPILE_CHECK(SK_UNARMED_COMBAT == 18 , c1); + COMPILE_CHECK(SK_EVOCATIONS == 38 , c2); COMPILE_CHECK(SP_VAMPIRE == 30 , c3); COMPILE_CHECK(SPELL_DEBUGGING_RAY == 103 , c4); COMPILE_CHECK(SPELL_PETRIFY == 155 , c5); diff --git a/crawl-ref/source/dat/database/randbook.txt b/crawl-ref/source/dat/database/randbook.txt index 603c144c3c..c1b4a82386 100644 --- a/crawl-ref/source/dat/database/randbook.txt +++ b/crawl-ref/source/dat/database/randbook.txt @@ -539,26 +539,6 @@ Illusion w:2 Slavery %%%% -Divination - -Divination - -Augury - -Prophecy - -Foreboding - -Prediction - -Omens - -Sight - -Visions - -Truth -%%%% Translocation Translocation @@ -712,20 +692,6 @@ Creative Supportive %%%% -Divination adj - -Divine - -Prophetic - -w:5 -All-Knowing - -w:5 -All-Seeing - -Spiritual -%%%% Translocation adj Spatial @@ -995,10 +961,6 @@ Murray Nergalle %%%% -Divination owner - -__NONE -%%%% highlevel Translocation owner Lom Lobon diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index 45d30acaaf..99f01b41f9 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -1721,7 +1721,7 @@ static int _spell_weight(spell_type spell) // When randomly picking a book for acquirement, use the sum of the // weights of all unknown spells in the book. -static int _book_weight(int book) +static int _book_weight(book_type book) { ASSERT(book >= 0 && book <= MAX_FIXED_BOOK); @@ -1843,7 +1843,7 @@ static bool _do_book_acquirement(item_def &book, int agent) weights[bk] = 0; continue; } - weights[bk] = _book_weight(bk); + weights[bk] = _book_weight(static_cast(bk)); total_weights += weights[bk]; } diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index c0fa452b32..108731e960 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -279,51 +279,48 @@ enum beam_type // beam[].flavour enum book_type { - BOOK_MINOR_MAGIC_I, // 0 + BOOK_MINOR_MAGIC_I, BOOK_MINOR_MAGIC_II, BOOK_MINOR_MAGIC_III, BOOK_CONJURATIONS_I, BOOK_CONJURATIONS_II, - BOOK_FLAMES, // 5 + BOOK_FLAMES, BOOK_FROST, BOOK_SUMMONINGS, BOOK_FIRE, BOOK_ICE, - BOOK_SURVEYANCES, // 10 BOOK_SPATIAL_TRANSLOCATIONS, BOOK_ENCHANTMENTS, BOOK_YOUNG_POISONERS, BOOK_TEMPESTS, - BOOK_DEATH, // 15 + BOOK_DEATH, BOOK_HINDERANCE, BOOK_CHANGES, BOOK_TRANSFIGURATIONS, - BOOK_PRACTICAL_MAGIC, - BOOK_WAR_CHANTS, // 20 + BOOK_WAR_CHANTS, BOOK_CLOUDS, BOOK_NECROMANCY, BOOK_CALLINGS, BOOK_CHARMS, - BOOK_AIR, // 25 + BOOK_AIR, BOOK_SKY, - BOOK_DIVINATIONS, BOOK_WARP, BOOK_ENVENOMATIONS, - BOOK_UNLIFE, // 30 + BOOK_UNLIFE, BOOK_CONTROL, BOOK_MUTATIONS, BOOK_TUKIMA, BOOK_GEOMANCY, - BOOK_EARTH, // 35 + BOOK_EARTH, BOOK_WIZARDRY, BOOK_POWER, BOOK_CANTRIPS, //jmf: 04jan2000 BOOK_PARTY_TRICKS, //jmf: 04jan2000 - BOOK_BEASTS, // 40 + BOOK_BEASTS, BOOK_STALKING, // renamed -- assassination was confusing -- bwr MAX_NORMAL_BOOK = BOOK_STALKING, - MIN_GOD_ONLY_BOOK, // 42 + MIN_GOD_ONLY_BOOK, BOOK_ANNIHILATIONS = MIN_GOD_ONLY_BOOK, BOOK_DEMONOLOGY, BOOK_NECRONOMICON, @@ -331,20 +328,17 @@ enum book_type MAX_FIXED_BOOK = MAX_GOD_ONLY_BOOK, - BOOK_RANDART_LEVEL, // 45 + BOOK_RANDART_LEVEL, BOOK_RANDART_THEME, BOOK_CARD_EFFECT, // not implemented - MAX_MEMORISABLE_BOOK = BOOK_CARD_EFFECT, - BOOK_MANUAL, - BOOK_DESTRUCTION, // 49 + BOOK_DESTRUCTION, NUM_BOOKS }; #define NUM_NORMAL_BOOKS (MAX_NORMAL_BOOK + 1) #define NUM_FIXED_BOOKS (MAX_FIXED_BOOK + 1) -#define NUM_MEMORISABLE_BOOK (MAX_MEMORISABLE_BOOK + 1) enum branch_type // you.where_are_you { @@ -2604,42 +2598,40 @@ enum size_type // order. enum skill_type { - SK_FIGHTING, // 0 + SK_FIGHTING, SK_SHORT_BLADES, SK_LONG_BLADES, - SK_UNUSED_1, // SK_GREAT_SWORDS - now unused SK_AXES, - SK_MACES_FLAILS, // 5 + SK_MACES_FLAILS, SK_POLEARMS, SK_STAVES, SK_SLINGS, SK_BOWS, - SK_CROSSBOWS, // 10 + SK_CROSSBOWS, SK_DARTS, SK_THROWING, SK_ARMOUR, SK_DODGING, - SK_STEALTH, // 15 + SK_STEALTH, SK_STABBING, SK_SHIELDS, SK_TRAPS_DOORS, - SK_UNARMED_COMBAT, // 19 + SK_UNARMED_COMBAT, // 20 // 21 // 22 // 23 // 24 - SK_SPELLCASTING = 25, // 25 + SK_SPELLCASTING = 25, SK_CONJURATIONS, SK_ENCHANTMENTS, SK_SUMMONINGS, SK_NECROMANCY, - SK_TRANSLOCATIONS, // 30 + SK_TRANSLOCATIONS, SK_TRANSMUTATIONS, - SK_DIVINATIONS, SK_FIRE_MAGIC, SK_ICE_MAGIC, - SK_AIR_MAGIC, // 35 + SK_AIR_MAGIC, SK_EARTH_MAGIC, SK_POISON_MAGIC, SK_INVOCATIONS, diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index d9e6fae591..89e198a34e 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -844,7 +844,6 @@ static const char* book_type_name(int booktype) case BOOK_SUMMONINGS: return "Summonings"; case BOOK_FIRE: return "Fire"; case BOOK_ICE: return "Ice"; - case BOOK_SURVEYANCES: return "Surveyances"; case BOOK_SPATIAL_TRANSLOCATIONS: return "Spatial Translocations"; case BOOK_ENCHANTMENTS: return "Enchantments"; case BOOK_TEMPESTS: return "the Tempests"; @@ -852,7 +851,6 @@ static const char* book_type_name(int booktype) case BOOK_HINDERANCE: return "Hinderance"; case BOOK_CHANGES: return "Changes"; case BOOK_TRANSFIGURATIONS: return "Transfigurations"; - case BOOK_PRACTICAL_MAGIC: return "Practical Magic"; case BOOK_WAR_CHANTS: return "War Chants"; case BOOK_CLOUDS: return "Clouds"; case BOOK_NECROMANCY: return "Necromancy"; @@ -861,7 +859,6 @@ static const char* book_type_name(int booktype) case BOOK_DEMONOLOGY: return "Demonology"; case BOOK_AIR: return "Air"; case BOOK_SKY: return "the Sky"; - case BOOK_DIVINATIONS: return "Divinations"; case BOOK_WARP: return "the Warp"; case BOOK_ENVENOMATIONS: return "Envenomations"; case BOOK_ANNIHILATIONS: return "Annihilations"; diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 99843c71bd..b25fc498cd 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -2753,12 +2753,7 @@ static void _generate_book_item(item_def& item, int allow_uniques, if (one_chance_in(4)) item.plus = SK_SPELLCASTING + random2(NUM_SKILLS - SK_SPELLCASTING); else - { item.plus = random2(SK_UNARMED_COMBAT); - - if (item.plus == SK_UNUSED_1) - item.plus = SK_UNARMED_COMBAT; - } // Set number of reads possible before it "crumbles to dust". item.plus2 = 3 + random2(15); } diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 2a2cd4c8a2..d4764557a3 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -2373,7 +2373,7 @@ static void _give_wanderer_spell(skill_type skill) spell_type spell = SPELL_NO_SPELL; // Doing a rejection loop for this because I am lazy. - while (skill == SK_SPELLCASTING || skill == SK_DIVINATIONS) + while (skill == SK_SPELLCASTING) { int value = SK_POISON_MAGIC-SK_CONJURATIONS + 1; skill = skill_type(SK_CONJURATIONS + random2(value)); diff --git a/crawl-ref/source/skills.cc b/crawl-ref/source/skills.cc index 04a33efca1..64fd439fc2 100644 --- a/crawl-ref/source/skills.cc +++ b/crawl-ref/source/skills.cc @@ -270,7 +270,7 @@ static int _exercise2(int exsk) // Experimental restriction (too many spell schools). -- bwr int skill_rank = 1; - for (int i = SK_CONJURATIONS; i <= SK_DIVINATIONS; ++i) + for (int i = SK_CONJURATIONS; i < SK_FIRE_MAGIC; ++i) { if (you.skills[exsk] < you.skills[i]) skill_rank++; diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc index 4d1f7e2971..33ecdb4d31 100644 --- a/crawl-ref/source/skills2.cc +++ b/crawl-ref/source/skills2.cc @@ -72,66 +72,63 @@ typedef skill_title_key_t stk; const char *skills[50][6] = { // Skill name levels 1-7 levels 8-14 levels 15-20 levels 21-26 level 27 - {"Fighting", "Skirmisher", "Fighter", "Warrior", "Slayer", "Conqueror"}, // 0 + {"Fighting", "Skirmisher", "Fighter", "Warrior", "Slayer", "Conqueror"}, {"Short Blades", "Cutter", "Slicer", "Swashbuckler", "Blademaster", "Eviscerator"}, {"Long Blades", "Slasher", "Carver", "Fencer", "@Adj@ Blade", "Swordmaster"}, - {NULL}, // 3- was: great swords {dlb} {"Axes", "Chopper", "Cleaver", "Severer", "Executioner", "Axe Maniac"}, - {"Maces & Flails", "Cudgeler", "Basher", "Bludgeoner", "Shatterer", "Skullcrusher"}, // 5 + {"Maces & Flails", "Cudgeler", "Basher", "Bludgeoner", "Shatterer", "Skullcrusher"}, {"Polearms", "Poker", "Spear-Bearer", "Impaler", "Phalangite", "@Adj@ Porcupine"}, {"Staves", "Twirler", "Cruncher", "Stickfighter", "Pulveriser", "Chief of Staff"}, {"Slings", "Vandal", "Slinger", "Whirler", "Slingshot", "@Adj@ Catapult"}, {"Bows", "Shooter", "Archer", "Marks@genus@", "Crack Shot", "Merry @Genus@"}, - {"Crossbows", "Bolt Thrower", "Quickloader", "Sharpshooter", "Sniper", "@Adj@ Arbalest"}, // 10 + {"Crossbows", "Bolt Thrower", "Quickloader", "Sharpshooter", "Sniper", "@Adj@ Arbalest"}, {"Darts", "Dart Thrower", "Hurler", "Hedgehog", "Darts Champion", "Perforator"}, {"Throwing", "Chucker", "Thrower", "Deadly Accurate", "Hawkeye", "@Adj@ Ballista"}, {"Armour", "Covered", "Protected", "Tortoise", "Impregnable", "Invulnerable"}, {"Dodging", "Ducker", "Nimble", "Spry", "Acrobat", "Intangible"}, - {"Stealth", "Sneak", "Covert", "Unseen", "Imperceptible", "Ninja"}, // 15 + {"Stealth", "Sneak", "Covert", "Unseen", "Imperceptible", "Ninja"}, {"Stabbing", "Miscreant", "Blackguard", "Backstabber", "Cutthroat", "Politician"}, {"Shields", "Shield-Bearer", "Hoplite", "Blocker", "Peltast", "@Adj@ Barricade"}, {"Traps & Doors", "Scout", "Disarmer", "Vigilant", "Perceptive", "Dungeon Master"}, // STR based fighters, for DEX/martial arts titles see below {"Unarmed Combat", "Ruffian", "Grappler", "Brawler", "Wrestler", "@Weight@weight Champion"}, - {NULL}, // 20- empty - {NULL}, // 21- empty - {NULL}, // 22- empty - {NULL}, // 23- empty - {NULL}, // 24- empty + {NULL}, + {NULL}, + {NULL}, + {NULL}, + {NULL}, + {NULL}, - {"Spellcasting", "Magician", "Thaumaturge", "Eclecticist", "Sorcerer", "Archmage"}, // 25 + {"Spellcasting", "Magician", "Thaumaturge", "Eclecticist", "Sorcerer", "Archmage"}, {"Conjurations", "Ruinous", "Conjurer", "Destroyer", "Devastator", "Annihilator"}, {"Enchantments", "Charm-Maker", "Infuser", "Bewitcher", "Enchanter", "Spellbinder"}, {"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 + {"Translocations", "Grasshopper", "Placeless @Genus@", "Blinker", "Portalist", "Plane @Walker@"}, {"Transmutations", "Changer", "Transmogrifier", "Alchemist", "Malleable", "Shapeless @Genus@"}, - {"Divinations", "Seer", "Clairvoyant", "Diviner", "Augur", "Oracle"}, {"Fire Magic", "Firebug", "Arsonist", "Scorcher", "Pyromancer", "Infernalist"}, {"Ice Magic", "Chiller", "Frost Mage", "Gelid", "Cryomancer", "Englaciator"}, - {"Air Magic", "Gusty", "Cloud Mage", "Aerator", "Anemomancer", "Meteorologist"}, // 35 + {"Air Magic", "Gusty", "Cloud Mage", "Aerator", "Anemomancer", "Meteorologist"}, {"Earth Magic", "Digger", "Geomancer", "Earth Mage", "Metallomancer", "Petrodigitator"}, {"Poison Magic", "Stinger", "Tainter", "Polluter", "Contaminator", "Envenomancer"}, // These titles apply to atheists only, worshippers of the various gods // use the god titles instead, depending on piety or, in Xom's case, mood. {"Invocations", "Unbeliever", "Agnostic", "Dissident", "Heretic", "Apostate"}, - {"Evocations", "Charlatan", "Prestidigitator", "Fetichist", "Evocator", "Talismancer"}, // 39 - -/*NOTE: If more skills are added, must change ranges in level_change() in player.cc */ - - {NULL}, // 40- empty - {NULL}, // 41- empty - {NULL}, // 42- empty - {NULL}, // 43- empty - {NULL}, // 44- empty - {NULL}, // 45- empty - {NULL}, // 46- empty - {NULL}, // 47- empty - {NULL}, // 48- empty - {NULL} // 49- empty {end of array} + {"Evocations", "Charlatan", "Prestidigitator", "Fetichist", "Evocator", "Talismancer"}, + + {NULL}, + {NULL}, + {NULL}, + {NULL}, + {NULL}, + {NULL}, + {NULL}, + {NULL}, + {NULL}, + {NULL} }; const char *martial_arts_titles[6] = @@ -149,7 +146,6 @@ const int spec_skills[NUM_SPECIES][40] = 100, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES - 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS 100, // SK_POLEARMS @@ -171,6 +167,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 130, // SK_SPELLCASTING 100, // SK_CONJURATIONS 100, // SK_ENCHANTMENTS @@ -178,7 +175,6 @@ const int spec_skills[NUM_SPECIES][40] = 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS 100, // SK_TRANSMUTATIONS - 100, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC 100, // SK_AIR_MAGIC @@ -192,7 +188,6 @@ const int spec_skills[NUM_SPECIES][40] = 100, // SK_FIGHTING 70, // SK_SHORT_BLADES 70, // SK_LONG_BLADES - 100, // SK_UNUSED_1 130, // SK_AXES 150, // SK_MACES_FLAILS 150, // SK_POLEARMS @@ -213,6 +208,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 100, // undefined 90, // SK_SPELLCASTING 90, // SK_CONJURATIONS @@ -221,7 +217,6 @@ const int spec_skills[NUM_SPECIES][40] = 130, // SK_NECROMANCY 90, // SK_TRANSLOCATIONS 90, // SK_TRANSMUTATIONS - 110, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC 70, // SK_AIR_MAGIC @@ -235,7 +230,6 @@ const int spec_skills[NUM_SPECIES][40] = 150, // SK_FIGHTING 100, // SK_SHORT_BLADES 110, // SK_LONG_BLADES - 100, // SK_UNUSED_1 150, // SK_AXES 170, // SK_MACES_FLAILS 170, // SK_POLEARMS @@ -256,6 +250,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 100, // undefined 70, // SK_SPELLCASTING 80, // SK_CONJURATIONS @@ -264,7 +259,6 @@ const int spec_skills[NUM_SPECIES][40] = 70, // SK_NECROMANCY 80, // SK_TRANSLOCATIONS 80, // SK_TRANSMUTATIONS - 80, // SK_DIVINATIONS 90, // SK_FIRE_MAGIC 90, // SK_ICE_MAGIC 80, // SK_AIR_MAGIC @@ -278,7 +272,6 @@ const int spec_skills[NUM_SPECIES][40] = 80, // SK_FIGHTING 110, // SK_SHORT_BLADES 110, // SK_LONG_BLADES - 100, // SK_UNUSED_1 130, // SK_AXES 140, // SK_MACES_FLAILS 140, // SK_POLEARMS @@ -299,6 +292,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 100, // undefined 90, // SK_SPELLCASTING 130, // SK_CONJURATIONS @@ -307,7 +301,6 @@ const int spec_skills[NUM_SPECIES][40] = 90, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS 60, // SK_TRANSMUTATIONS - 130, // SK_DIVINATIONS 80, // SK_FIRE_MAGIC 80, // SK_ICE_MAGIC 80, // SK_AIR_MAGIC @@ -321,7 +314,6 @@ const int spec_skills[NUM_SPECIES][40] = 70, // SK_FIGHTING 80, // SK_SHORT_BLADES 90, // SK_LONG_BLADES - 100, // SK_UNUSED_1 70, // SK_AXES 70, // SK_MACES_FLAILS 110, // SK_POLEARMS @@ -343,6 +335,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 210, // SK_SPELLCASTING 120, // SK_CONJURATIONS 150, // SK_ENCHANTMENTS @@ -350,7 +343,6 @@ const int spec_skills[NUM_SPECIES][40] = 160, // SK_NECROMANCY 150, // SK_TRANSLOCATIONS 120, // SK_TRANSMUTATIONS - 130, // SK_DIVINATIONS 70, // SK_FIRE_MAGIC 130, // SK_ICE_MAGIC 150, // SK_AIR_MAGIC @@ -364,7 +356,6 @@ const int spec_skills[NUM_SPECIES][40] = 120, // SK_FIGHTING 60, // SK_SHORT_BLADES 100, // SK_LONG_BLADES - 100, // SK_UNUSED_1 120, // SK_AXES 150, // SK_MACES_FLAILS 160, // SK_POLEARMS @@ -386,6 +377,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 170, // SK_SPELLCASTING 130, // SK_CONJURATIONS 100, // SK_ENCHANTMENTS @@ -393,7 +385,6 @@ const int spec_skills[NUM_SPECIES][40] = 150, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS 150, // SK_TRANSMUTATIONS - 140, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC 90, // SK_AIR_MAGIC @@ -407,7 +398,6 @@ const int spec_skills[NUM_SPECIES][40] = 70, // SK_FIGHTING 100, // SK_SHORT_BLADES 80, // SK_LONG_BLADES - 100, // SK_UNUSED_1 70, // SK_AXES 80, // SK_MACES_FLAILS 80, // SK_POLEARMS @@ -429,6 +419,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 200, // SK_SPELLCASTING 100, // SK_CONJURATIONS 120, // SK_ENCHANTMENTS @@ -436,7 +427,6 @@ const int spec_skills[NUM_SPECIES][40] = 100, // SK_NECROMANCY 150, // SK_TRANSLOCATIONS 160, // SK_TRANSMUTATIONS - 160, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC 150, // SK_AIR_MAGIC @@ -450,7 +440,6 @@ const int spec_skills[NUM_SPECIES][40] = 80, // SK_FIGHTING 60, // SK_SHORT_BLADES 140, // SK_LONG_BLADES - 100, // SK_UNUSED_1 110, // SK_AXES 100, // SK_MACES_FLAILS 150, // SK_POLEARMS @@ -472,6 +461,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 140, // SK_SPELLCASTING 110, // SK_CONJURATIONS 110, // SK_ENCHANTMENTS @@ -479,7 +469,6 @@ const int spec_skills[NUM_SPECIES][40] = 110, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS 110, // SK_TRANSMUTATIONS - 130, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC 100, // SK_AIR_MAGIC @@ -493,7 +482,6 @@ const int spec_skills[NUM_SPECIES][40] = 100, // SK_FIGHTING 140, // SK_SHORT_BLADES 140, // SK_LONG_BLADES - 100, // SK_UNUSED_1 140, // SK_AXES 140, // SK_MACES_FLAILS 140, // SK_POLEARMS @@ -514,6 +502,7 @@ const int spec_skills[NUM_SPECIES][40] = 140, // undefined 140, // undefined 140, // undefined + 100, // undefined 140, // undefined 130, // SK_SPELLCASTING 140, // SK_CONJURATIONS @@ -522,7 +511,6 @@ const int spec_skills[NUM_SPECIES][40] = 100, // SK_NECROMANCY 140, // SK_TRANSLOCATIONS 140, // SK_TRANSMUTATIONS - 140, // SK_DIVINATIONS 140, // SK_FIRE_MAGIC 140, // SK_ICE_MAGIC 140, // SK_AIR_MAGIC @@ -536,7 +524,6 @@ const int spec_skills[NUM_SPECIES][40] = 100, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES - 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS 100, // SK_POLEARMS @@ -558,6 +545,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 130, // SK_SPELLCASTING 100, // SK_CONJURATIONS 100, // SK_ENCHANTMENTS @@ -565,7 +553,6 @@ const int spec_skills[NUM_SPECIES][40] = 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS 100, // SK_TRANSMUTATIONS - 100, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC 100, // SK_AIR_MAGIC @@ -579,7 +566,6 @@ const int spec_skills[NUM_SPECIES][40] = 70, // SK_FIGHTING 200, // SK_SHORT_BLADES 180, // SK_LONG_BLADES - 100, // SK_UNUSED_1 180, // SK_AXES 90, // SK_MACES_FLAILS 110, // SK_POLEARMS @@ -600,6 +586,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 100, // undefined 90, // SK_SPELLCASTING 160, // SK_CONJURATIONS @@ -608,7 +595,6 @@ const int spec_skills[NUM_SPECIES][40] = 160, // SK_NECROMANCY 160, // SK_TRANSLOCATIONS 160, // SK_TRANSMUTATIONS - 160, // SK_DIVINATIONS 160, // SK_FIRE_MAGIC 160, // SK_ICE_MAGIC 160, // SK_AIR_MAGIC @@ -622,7 +608,6 @@ const int spec_skills[NUM_SPECIES][40] = 140, // SK_FIGHTING 150, // SK_SHORT_BLADES 150, // SK_LONG_BLADES - 100, // SK_UNUSED_1 150, // SK_AXES 130, // SK_MACES_FLAILS 150, // SK_POLEARMS @@ -644,6 +629,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 260, // SK_SPELLCASTING 160, // SK_CONJURATIONS 200, // SK_ENCHANTMENTS @@ -651,7 +637,6 @@ const int spec_skills[NUM_SPECIES][40] = 150, // SK_NECROMANCY 160, // SK_TRANSLOCATIONS 160, // SK_TRANSMUTATIONS - 200, // SK_DIVINATIONS 160, // SK_FIRE_MAGIC 160, // SK_ICE_MAGIC 200, // SK_AIR_MAGIC @@ -665,7 +650,6 @@ const int spec_skills[NUM_SPECIES][40] = 90, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES - 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS 100, // SK_POLEARMS @@ -687,6 +671,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 130, // SK_SPELLCASTING 100, // SK_CONJURATIONS 120, // SK_ENCHANTMENTS @@ -694,7 +679,6 @@ const int spec_skills[NUM_SPECIES][40] = 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS 100, // SK_TRANSMUTATIONS - 100, // SK_DIVINATIONS 70, // SK_FIRE_MAGIC 140, // SK_ICE_MAGIC 100, // SK_AIR_MAGIC @@ -708,7 +692,6 @@ const int spec_skills[NUM_SPECIES][40] = 90, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES - 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS 100, // SK_POLEARMS @@ -730,6 +713,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 130, // SK_SPELLCASTING 100, // SK_CONJURATIONS 120, // SK_ENCHANTMENTS @@ -737,7 +721,6 @@ const int spec_skills[NUM_SPECIES][40] = 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS 100, // SK_TRANSMUTATIONS - 100, // SK_DIVINATIONS 140, // SK_FIRE_MAGIC 70, // SK_ICE_MAGIC 100, // SK_AIR_MAGIC @@ -751,7 +734,6 @@ const int spec_skills[NUM_SPECIES][40] = 90, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES - 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS 100, // SK_POLEARMS @@ -773,6 +755,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 130, // SK_SPELLCASTING 100, // SK_CONJURATIONS 120, // SK_ENCHANTMENTS @@ -780,7 +763,6 @@ const int spec_skills[NUM_SPECIES][40] = 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS 100, // SK_TRANSMUTATIONS - 100, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC 100, // SK_AIR_MAGIC @@ -794,7 +776,6 @@ const int spec_skills[NUM_SPECIES][40] = 90, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES - 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS 100, // SK_POLEARMS @@ -816,6 +797,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 130, // SK_SPELLCASTING 100, // SK_CONJURATIONS 120, // SK_ENCHANTMENTS @@ -823,7 +805,6 @@ const int spec_skills[NUM_SPECIES][40] = 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS 100, // SK_TRANSMUTATIONS - 100, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC 100, // SK_AIR_MAGIC @@ -837,7 +818,6 @@ const int spec_skills[NUM_SPECIES][40] = 90, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES - 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS 100, // SK_POLEARMS @@ -859,6 +839,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 130, // SK_SPELLCASTING 100, // SK_CONJURATIONS 120, // SK_ENCHANTMENTS @@ -866,7 +847,6 @@ const int spec_skills[NUM_SPECIES][40] = 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS 100, // SK_TRANSMUTATIONS - 100, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC 100, // SK_AIR_MAGIC @@ -880,7 +860,6 @@ const int spec_skills[NUM_SPECIES][40] = 90, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES - 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS 100, // SK_POLEARMS @@ -902,6 +881,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 130, // SK_SPELLCASTING 100, // SK_CONJURATIONS 120, // SK_ENCHANTMENTS @@ -909,7 +889,6 @@ const int spec_skills[NUM_SPECIES][40] = 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS 100, // SK_TRANSMUTATIONS - 100, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC 70, // SK_AIR_MAGIC @@ -923,7 +902,6 @@ const int spec_skills[NUM_SPECIES][40] = 90, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES - 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS 100, // SK_POLEARMS @@ -944,6 +922,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 100, // undefined 90, // SK_SPELLCASTING 100, // SK_CONJURATIONS @@ -952,7 +931,6 @@ const int spec_skills[NUM_SPECIES][40] = 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS 100, // SK_TRANSMUTATIONS - 100, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC 100, // SK_AIR_MAGIC @@ -966,7 +944,6 @@ const int spec_skills[NUM_SPECIES][40] = 90, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES - 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS 100, // SK_POLEARMS @@ -988,6 +965,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 130, // SK_SPELLCASTING 100, // SK_CONJURATIONS 120, // SK_ENCHANTMENTS @@ -995,7 +973,6 @@ const int spec_skills[NUM_SPECIES][40] = 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS 100, // SK_TRANSMUTATIONS - 100, // SK_DIVINATIONS 80, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC 100, // SK_AIR_MAGIC @@ -1009,7 +986,6 @@ const int spec_skills[NUM_SPECIES][40] = 90, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES - 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS 100, // SK_POLEARMS @@ -1031,6 +1007,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 130, // SK_SPELLCASTING 100, // SK_CONJURATIONS 120, // SK_ENCHANTMENTS @@ -1038,7 +1015,6 @@ const int spec_skills[NUM_SPECIES][40] = 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS 100, // SK_TRANSMUTATIONS - 100, // SK_DIVINATIONS 90, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC 90, // SK_AIR_MAGIC @@ -1052,7 +1028,6 @@ const int spec_skills[NUM_SPECIES][40] = 90, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES - 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS 100, // SK_POLEARMS @@ -1074,6 +1049,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 130, // SK_SPELLCASTING 100, // SK_CONJURATIONS 120, // SK_ENCHANTMENTS @@ -1081,7 +1057,6 @@ const int spec_skills[NUM_SPECIES][40] = 100, // SK_NECROMANCY 100, // SK_TRANSLOCATIONS 100, // SK_TRANSMUTATIONS - 100, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC 100, // SK_AIR_MAGIC @@ -1095,7 +1070,6 @@ const int spec_skills[NUM_SPECIES][40] = 100, // SK_FIGHTING 120, // SK_SHORT_BLADES 110, // SK_LONG_BLADES - 100, // SK_UNUSED_1 110, // SK_AXES 110, // SK_MACES_FLAILS 110, // SK_POLEARMS @@ -1117,6 +1091,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 180, // SK_SPELLCASTING 120, // SK_CONJURATIONS 110, // SK_ENCHANTMENTS @@ -1124,7 +1099,6 @@ const int spec_skills[NUM_SPECIES][40] = 120, // SK_NECROMANCY 120, // SK_TRANSLOCATIONS 120, // SK_TRANSMUTATIONS - 130, // SK_DIVINATIONS 120, // SK_FIRE_MAGIC 120, // SK_ICE_MAGIC 120, // SK_AIR_MAGIC @@ -1138,7 +1112,6 @@ const int spec_skills[NUM_SPECIES][40] = 110, // SK_FIGHTING 110, // SK_SHORT_BLADES 110, // SK_LONG_BLADES - 100, // SK_UNUSED_1 110, // SK_AXES 110, // SK_MACES_FLAILS 110, // SK_POLEARMS @@ -1158,6 +1131,7 @@ const int spec_skills[NUM_SPECIES][40] = 110, // undefined 110, // undefined 110, // undefined + 100, // undefined 110, // undefined 110, // undefined 140, // SK_SPELLCASTING @@ -1167,7 +1141,6 @@ const int spec_skills[NUM_SPECIES][40] = 110, // SK_NECROMANCY 110, // SK_TRANSLOCATIONS 110, // SK_TRANSMUTATIONS - 110, // SK_DIVINATIONS 110, // SK_FIRE_MAGIC 110, // SK_ICE_MAGIC 110, // SK_AIR_MAGIC @@ -1181,7 +1154,6 @@ const int spec_skills[NUM_SPECIES][40] = 150, // SK_FIGHTING 90, // SK_SHORT_BLADES 140, // SK_LONG_BLADES - 100, // SK_UNUSED_1 150, // SK_AXES 160, // SK_MACES_FLAILS 180, // SK_POLEARMS @@ -1202,6 +1174,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 100, // undefined 80, // SK_SPELLCASTING 160, // SK_CONJURATIONS @@ -1210,7 +1183,6 @@ const int spec_skills[NUM_SPECIES][40] = 120, // SK_NECROMANCY 50, // SK_TRANSLOCATIONS 60, // SK_TRANSMUTATIONS - 70, // SK_DIVINATIONS 140, // SK_FIRE_MAGIC 140, // SK_ICE_MAGIC 120, // SK_AIR_MAGIC @@ -1224,7 +1196,6 @@ const int spec_skills[NUM_SPECIES][40] = 70, // SK_FIGHTING 70, // SK_SHORT_BLADES 70, // SK_LONG_BLADES - 100, // SK_UNUSED_1 70, // SK_AXES 70, // SK_MACES_FLAILS 70, // SK_POLEARMS @@ -1246,6 +1217,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 230, // SK_SPELLCASTING 170, // SK_CONJURATIONS 170, // SK_ENCHANTMENTS @@ -1253,7 +1225,6 @@ const int spec_skills[NUM_SPECIES][40] = 170, // SK_NECROMANCY 170, // SK_TRANSLOCATIONS 170, // SK_TRANSMUTATIONS - 170, // SK_DIVINATIONS 170, // SK_FIRE_MAGIC 170, // SK_ICE_MAGIC 170, // SK_AIR_MAGIC @@ -1267,7 +1238,6 @@ const int spec_skills[NUM_SPECIES][40] = 100, // SK_FIGHTING 110, // SK_SHORT_BLADES 110, // SK_LONG_BLADES - 100, // SK_UNUSED_1 110, // SK_AXES 110, // SK_MACES_FLAILS 110, // SK_POLEARMS @@ -1289,6 +1259,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 130, // SK_SPELLCASTING 100, // SK_CONJURATIONS 110, // SK_ENCHANTMENTS @@ -1296,7 +1267,6 @@ const int spec_skills[NUM_SPECIES][40] = 90, // SK_NECROMANCY 110, // SK_TRANSLOCATIONS 110, // SK_TRANSMUTATIONS - 110, // SK_DIVINATIONS 100, // SK_FIRE_MAGIC 110, // SK_ICE_MAGIC 110, // SK_AIR_MAGIC @@ -1310,7 +1280,6 @@ const int spec_skills[NUM_SPECIES][40] = 80, // SK_FIGHTING 110, // SK_SHORT_BLADES 110, // SK_LONG_BLADES - 100, // SK_UNUSED_1 110, // SK_AXES 110, // SK_MACES_FLAILS 110, // SK_POLEARMS @@ -1332,6 +1301,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 160, // SK_SPELLCASTING 130, // SK_CONJURATIONS 130, // SK_ENCHANTMENTS @@ -1339,7 +1309,6 @@ const int spec_skills[NUM_SPECIES][40] = 100, // SK_NECROMANCY 120, // SK_TRANSLOCATIONS 120, // SK_TRANSMUTATIONS - 120, // SK_DIVINATIONS 150, // SK_FIRE_MAGIC 90, // SK_ICE_MAGIC 150, // SK_AIR_MAGIC @@ -1353,7 +1322,6 @@ const int spec_skills[NUM_SPECIES][40] = 100, // SK_FIGHTING 80, // SK_SHORT_BLADES 80, // SK_LONG_BLADES - 100, // SK_UNUSED_1 80, // SK_AXES 80, // SK_MACES_FLAILS 80, // SK_POLEARMS @@ -1375,6 +1343,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 130, // SK_SPELLCASTING 60, // SK_CONJURATIONS 160, // SK_ENCHANTMENTS @@ -1382,7 +1351,6 @@ const int spec_skills[NUM_SPECIES][40] = 80, // SK_NECROMANCY 150, // SK_TRANSLOCATIONS 150, // SK_TRANSMUTATIONS - 180, // SK_DIVINATIONS 90, // SK_FIRE_MAGIC 120, // SK_ICE_MAGIC 90, // SK_AIR_MAGIC @@ -1396,7 +1364,6 @@ const int spec_skills[NUM_SPECIES][40] = 80, // SK_FIGHTING 70, // SK_SHORT_BLADES 90, // SK_LONG_BLADES - 100, // SK_UNUSED_1 140, // SK_AXES 150, // SK_MACES_FLAILS 50, // SK_POLEARMS @@ -1418,6 +1385,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 130, // SK_SPELLCASTING 140, // SK_CONJURATIONS 90, // SK_ENCHANTMENTS @@ -1425,7 +1393,6 @@ const int spec_skills[NUM_SPECIES][40] = 150, // SK_NECROMANCY 140, // SK_TRANSLOCATIONS 60, // SK_TRANSMUTATIONS - 80, // SK_DIVINATIONS 160, // SK_FIRE_MAGIC 80, // SK_ICE_MAGIC 150, // SK_AIR_MAGIC @@ -1439,7 +1406,6 @@ const int spec_skills[NUM_SPECIES][40] = 110, // SK_FIGHTING 90, // SK_SHORT_BLADES 100, // SK_LONG_BLADES - 100, // SK_UNUSED_1 110, // SK_AXES 140, // SK_MACES_FLAILS 110, // SK_POLEARMS @@ -1460,6 +1426,7 @@ const int spec_skills[NUM_SPECIES][40] = 140, // undefined 140, // undefined 140, // undefined + 100, // undefined 140, // undefined 130, // SK_SPELLCASTING 160, // SK_CONJURATIONS @@ -1468,7 +1435,6 @@ const int spec_skills[NUM_SPECIES][40] = 90, // SK_NECROMANCY 140, // SK_TRANSLOCATIONS 90, // SK_TRANSMUTATIONS - 120, // SK_DIVINATIONS 140, // SK_FIRE_MAGIC 100, // SK_ICE_MAGIC 100, // SK_AIR_MAGIC @@ -1482,7 +1448,6 @@ const int spec_skills[NUM_SPECIES][40] = 110, // SK_FIGHTING 120, // SK_SHORT_BLADES 100, // SK_LONG_BLADES - 100, // SK_UNUSED_1 90, // SK_AXES 100, // SK_MACES_FLAILS 120, // SK_POLEARMS @@ -1504,6 +1469,7 @@ const int spec_skills[NUM_SPECIES][40] = 100, // undefined 100, // undefined 100, // undefined + 100, // undefined 160, // SK_SPELLCASTING 120, // SK_CONJURATIONS 120, // SK_ENCHANTMENTS @@ -1511,7 +1477,6 @@ const int spec_skills[NUM_SPECIES][40] = 80, // SK_NECROMANCY 90, // SK_TRANSLOCATIONS 120, // SK_TRANSMUTATION - 120, // SK_DIVINATIONS 110, // SK_FIRE_MAGIC 110, // SK_ICE_MAGIC 170, // SK_AIR_MAGIC @@ -1580,7 +1545,7 @@ static const skill_type skill_display_order[] = SK_COLUMN_BREAK, SK_SPELLCASTING, SK_CONJURATIONS, SK_ENCHANTMENTS, SK_SUMMONINGS, - SK_NECROMANCY, SK_TRANSLOCATIONS, SK_TRANSMUTATIONS, SK_DIVINATIONS, + SK_NECROMANCY, SK_TRANSLOCATIONS, SK_TRANSMUTATIONS, SK_FIRE_MAGIC, SK_ICE_MAGIC, SK_AIR_MAGIC, SK_EARTH_MAGIC, SK_POISON_MAGIC, SK_BLANK_LINE, @@ -2204,7 +2169,7 @@ void wield_warning(bool newWeapon) bool is_invalid_skill(int skill) { - if (skill < 0 || skill == SK_UNUSED_1 || skill >= NUM_SKILLS) + if (skill < 0 || skill >= NUM_SKILLS) return (true); if (skill > SK_UNARMED_COMBAT && skill < SK_SPELLCASTING) diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc index 144ae43dbe..c4c467023a 100644 --- a/crawl-ref/source/spl-book.cc +++ b/crawl-ref/source/spl-book.cc @@ -161,16 +161,6 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] = SPELL_NO_SPELL, }, - // 10 - Book of Surveyances - {SPELL_DETECT_SECRET_DOORS, - SPELL_DETECT_TRAPS, - SPELL_DETECT_ITEMS, - SPELL_NO_SPELL, - SPELL_NO_SPELL, - SPELL_NO_SPELL, - SPELL_NO_SPELL, - SPELL_NO_SPELL - }, // 11 - Book of Spatial Translocations {SPELL_APPORTATION, @@ -260,17 +250,6 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] = SPELL_NO_SPELL, }, - // 19 - Book of Practical Magic - {SPELL_PROJECTED_NOISE, - SPELL_SELECTIVE_AMNESIA, - SPELL_DIG, - SPELL_NO_SPELL, - SPELL_NO_SPELL, - SPELL_NO_SPELL, - SPELL_NO_SPELL, - SPELL_NO_SPELL, - }, - // 20 - Book of War Chants {SPELL_FIRE_BRAND, SPELL_FREEZING_AURA, @@ -348,16 +327,6 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] = SPELL_CONJURE_BALL_LIGHTNING, }, - // 27 - Book of Divinations - {SPELL_DETECT_SECRET_DOORS, - SPELL_DETECT_CREATURES, - SPELL_DETECT_ITEMS, - SPELL_NO_SPELL, - SPELL_NO_SPELL, - SPELL_NO_SPELL, - SPELL_NO_SPELL, - SPELL_NO_SPELL, - }, // 28 - Book of the Warp {SPELL_BANISHMENT, @@ -449,7 +418,7 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] = }, // 36 - Book of Wizardry - {SPELL_DETECT_CREATURES, + {SPELL_SELECTIVE_AMNESIA, SPELL_SUMMON_ELEMENTAL, SPELL_TELEPORT_SELF, SPELL_FIREBALL, @@ -474,11 +443,11 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] = {SPELL_CONFUSING_TOUCH, SPELL_ANIMATE_SKELETON, SPELL_SUMMON_SMALL_MAMMALS, - SPELL_DETECT_SECRET_DOORS, SPELL_APPORTATION, SPELL_NO_SPELL, SPELL_NO_SPELL, SPELL_NO_SPELL, + SPELL_NO_SPELL, }, // 39 - Book of Party Tricks //jmf: added 04jan2000 @@ -495,12 +464,12 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] = // 40 - Book of Beasts //jmf: added 19mar2000 {SPELL_SUMMON_SMALL_MAMMALS, SPELL_STICKS_TO_SNAKES, - SPELL_DETECT_CREATURES, SPELL_CALL_CANINE_FAMILIAR, SPELL_TAME_BEASTS, SPELL_DRAGON_FORM, SPELL_NO_SPELL, SPELL_NO_SPELL, + SPELL_NO_SPELL, }, // 41 - Book of Stalking //jmf: 24jun2000 @@ -910,7 +879,6 @@ int book_rarity(unsigned char which_book) case BOOK_MINOR_MAGIC_I: case BOOK_MINOR_MAGIC_II: case BOOK_MINOR_MAGIC_III: - case BOOK_SURVEYANCES: case BOOK_HINDERANCE: case BOOK_CANTRIPS: //jmf: added 04jan2000 return 1; @@ -921,7 +889,6 @@ int book_rarity(unsigned char which_book) case BOOK_CONJURATIONS_I: case BOOK_CONJURATIONS_II: - case BOOK_PRACTICAL_MAGIC: case BOOK_NECROMANCY: case BOOK_CALLINGS: case BOOK_WIZARDRY: @@ -947,7 +914,6 @@ int book_rarity(unsigned char which_book) return 7; case BOOK_TRANSFIGURATIONS: - case BOOK_DIVINATIONS: return 8; case BOOK_FIRE: diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index bf94a30b65..8a3e11182e 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -812,7 +812,7 @@ bool cast_a_spell(bool check_range, spell_type spell) static bool _spell_is_utility_spell(spell_type spell_id) { return (spell_typematch(spell_id, - SPTYP_ENCHANTMENT | SPTYP_TRANSLOCATION | SPTYP_DIVINATION)); + SPTYP_ENCHANTMENT | SPTYP_TRANSLOCATION)); } bool maybe_identify_staff(item_def &item, spell_type spell) diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h index 819edeaeef..e2affc569e 100644 --- a/crawl-ref/source/spl-data.h +++ b/crawl-ref/source/spl-data.h @@ -559,7 +559,7 @@ { SPELL_DETECT_TRAPS, "Detect Traps", - SPTYP_DIVINATION, + 0, SPFLAG_MAPPING, 2, 50, @@ -768,7 +768,7 @@ { SPELL_DETECT_ITEMS, "Detect Items", - SPTYP_DIVINATION, + 0, SPFLAG_MAPPING, 2, 50, @@ -1249,7 +1249,7 @@ { SPELL_DETECT_CREATURES, "Detect Creatures", - SPTYP_DIVINATION, + 0, SPFLAG_MAPPING, 2, 60, // not 50, note the fuzz @@ -1730,7 +1730,7 @@ { SPELL_DETECT_SECRET_DOORS, "Detect Secret Doors", - SPTYP_DIVINATION, + 0, SPFLAG_NONE, 1, 200, diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc index 5d1445d669..dcdc1382eb 100644 --- a/crawl-ref/source/spl-util.cc +++ b/crawl-ref/source/spl-util.cc @@ -854,7 +854,6 @@ int spell_type2skill(unsigned int spelltype) case SPTYP_TRANSMUTATION: return (SK_TRANSMUTATIONS); case SPTYP_NECROMANCY: return (SK_NECROMANCY); case SPTYP_SUMMONING: return (SK_SUMMONINGS); - case SPTYP_DIVINATION: return (SK_DIVINATIONS); case SPTYP_TRANSLOCATION: return (SK_TRANSLOCATIONS); case SPTYP_POISON: return (SK_POISON_MAGIC); case SPTYP_EARTH: return (SK_EARTH_MAGIC); @@ -862,6 +861,7 @@ int spell_type2skill(unsigned int spelltype) default: case SPTYP_HOLY: + case SPTYP_DIVINATION: #ifdef DEBUG_DIAGNOSTICS mprf(MSGCH_DIAGNOSTICS, "spell_type2skill: called with spelltype %u", spelltype ); @@ -870,33 +870,6 @@ int spell_type2skill(unsigned int spelltype) } } // end spell_type2skill() -int spell_skill2type(unsigned int skill) -{ - switch (skill) - { - case SK_CONJURATIONS: return (SPTYP_CONJURATION); - case SK_ENCHANTMENTS: return (SPTYP_ENCHANTMENT); - case SK_FIRE_MAGIC: return (SPTYP_FIRE); - case SK_ICE_MAGIC: return (SPTYP_ICE); - case SK_TRANSMUTATIONS: return (SPTYP_TRANSMUTATION); - case SK_NECROMANCY: return (SPTYP_NECROMANCY); - case SK_SUMMONINGS: return (SPTYP_SUMMONING); - case SK_DIVINATIONS: return (SPTYP_DIVINATION); - case SK_TRANSLOCATIONS: return (SPTYP_TRANSLOCATION); - case SK_POISON_MAGIC: return (SPTYP_POISON); - case SK_EARTH_MAGIC: return (SPTYP_EARTH); - case SK_AIR_MAGIC: return (SPTYP_AIR); - - default: - case SPTYP_HOLY: -#ifdef DEBUG_DIAGNOSTICS - mprf(MSGCH_DIAGNOSTICS, "spell_skill2type: called with skill %u", - skill); -#endif - return (-1); - } -} // end spell_type2skill() - /* ************************************************** * * diff --git a/crawl-ref/source/spl-util.h b/crawl-ref/source/spl-util.h index 9715d52eee..cd3d009b31 100644 --- a/crawl-ref/source/spl-util.h +++ b/crawl-ref/source/spl-util.h @@ -116,6 +116,5 @@ bool spell_direction( dist &spelld, bolt &pbolt, bool cancel_at_self = false ); int spell_type2skill (unsigned int which_spelltype); -int spell_skill2type (unsigned int which_skill); #endif diff --git a/crawl-ref/source/tags.h b/crawl-ref/source/tags.h index e7399bd705..493e85493b 100644 --- a/crawl-ref/source/tags.h +++ b/crawl-ref/source/tags.h @@ -41,7 +41,7 @@ enum tag_file_type // file types supported by tag system enum tag_major_version { TAG_MAJOR_START = 5, - TAG_MAJOR_VERSION = 7 + TAG_MAJOR_VERSION = 8 }; // Minor version will be reset to zero when major version changes. diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc index 8ff6ca998d..f54ff9337b 100644 --- a/crawl-ref/source/tutorial.cc +++ b/crawl-ref/source/tutorial.cc @@ -1159,7 +1159,6 @@ void tut_gained_new_skill(int skill) case SK_NECROMANCY: case SK_TRANSLOCATIONS: case SK_TRANSMUTATIONS: - case SK_DIVINATIONS: case SK_FIRE_MAGIC: case SK_ICE_MAGIC: case SK_AIR_MAGIC: -- cgit v1.2.3-54-g00ecf