diff options
author | Manoj Srivastava <srivasta@debian.org> | 2020-05-22 20:05:37 -0700 |
---|---|---|
committer | Manoj Srivastava <srivasta@debian.org> | 2020-05-22 21:39:31 -0700 |
commit | 035291b7f18974925f9a85a41e057bdc462c75f1 (patch) | |
tree | d69056be1a045aec185393b52dadb6fc2d5f50c9 /src/spells5.cc | |
parent | 9714b44a37dfc03aa00187726beea7ed8257415e (diff) | |
parent | 4e9b9c402ed95bf9a17fd6d795bc49bb4128a6fa (diff) |
Merge branch 'upstream'
Diffstat (limited to 'src/spells5.cc')
-rw-r--r-- | src/spells5.cc | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/src/spells5.cc b/src/spells5.cc index f503c822..ba2e6d05 100644 --- a/src/spells5.cc +++ b/src/spells5.cc @@ -919,30 +919,6 @@ void school_spells_init() } { - spell_type *spell = spell_new(&DISARM, "Disarm"); - spell_type_describe(spell, "Destroys doors and traps"); - spell_type_describe(spell, "At level 10 it destroys doors and traps, then reveals and unlocks any secret"); - spell_type_describe(spell, "doors"); - spell_type_set_mana(spell, 2, 4); - spell_type_set_difficulty(spell, 3, 15); - spell_type_init_mage(spell, - RANDOM, - SCHOOL_CONVEYANCE, - no_info, - convey_disarm); - - spell_type_set_device_charges(spell, "10+d15"); - - { - device_allocation *device_allocation = device_allocation_new(TV_STAFF); - device_allocation->rarity = 4; - range_init(&device_allocation->base_level, 1, 10); - range_init(&device_allocation->max_level, 10, 50); - spell_type_add_device_allocation(spell, device_allocation); - } - } - - { spell_type *spell = spell_new(&TELEPORT, "Teleportation"); spell_type_describe(spell, "Teleports you around the level. The casting time decreases with level"); spell_type_set_mana(spell, 8, 14); @@ -1143,7 +1119,7 @@ void school_spells_init() spell_type_describe(spell, "Asks for an object and identifies it"); spell_type_describe(spell, "At level 17 it identifies all objects in the inventory"); spell_type_describe(spell, "At level 27 it identifies all objects in the inventory and in a"); - spell_type_describe(spell, "radius on the floor, as well as probing monsters in that radius"); + spell_type_describe(spell, "radius on the floor"); spell_type_set_mana(spell, 10, 50); spell_type_set_difficulty(spell, 8, 40); spell_type_init_mage(spell, @@ -2321,8 +2297,7 @@ void school_spells_init() { spell_type *spell = spell_new(&MUSIC_MIND, "Clairaudience(IV)"); spell_type_describe(spell, "Allows you to sense monster minds as long as you sing."); - spell_type_describe(spell, "At level 10 it identifies all objects in a radius on the floor,"); - spell_type_describe(spell, "as well as probing monsters in that radius."); + spell_type_describe(spell, "At level 10 it identifies all objects in a radius on the floor."); spell_type_describe(spell, "Consumes the amount of mana each turn."); spell_type_set_mana(spell, 15, 30); spell_type_set_difficulty(spell, 25, 75); |