diff options
-rw-r--r-- | crawl-ref/source/describe.cc | 7 | ||||
-rw-r--r-- | crawl-ref/source/item_use.cc | 11 | ||||
-rw-r--r-- | crawl-ref/source/itemname.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/itemprop.h | 2 | ||||
-rw-r--r-- | crawl-ref/source/makeitem.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/shopping.cc | 4 |
6 files changed, 16 insertions, 12 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 03cc26546c..04622dd58b 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -2405,9 +2405,10 @@ static std::string describe_scroll( const item_def &item ) "of one who reads it. "; break; - case SCR_FORGETFULNESS: - description += "This annoying scrolls causes you to forget " - "about the items in your inventory."; + case SCR_FOG: + description += "This scroll surrounds the reader " + "with a dense cloud of fog. "; + break; case SCR_ACQUIREMENT: description += "This wonderful scroll causes the " diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 6cd7ba299a..5fd1c638fe 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -36,6 +36,7 @@ #include "beam.h" #include "cio.h" +#include "cloud.h" #include "command.h" #include "debug.h" #include "delay.h" @@ -3714,11 +3715,10 @@ void read_scroll(void) } break; - case SCR_FORGETFULNESS: - if (wearing_amulet(AMU_CLARITY)) - mpr("You feel forgetfull for a moment."); - else - id_the_scroll = forget_inventory(); + case SCR_FOG: + mpr("The scroll dissolves into smoke."); + big_cloud( one_chance_in(10) ? CLOUD_MIASMA : random_smoke_type(), + KC_YOU, you.x_pos, you.y_pos, 50, 8 + random2(8)); break; case SCR_MAGIC_MAPPING: @@ -3924,6 +3924,7 @@ void read_scroll(void) do_curse_item( item ); } break; + } // end switch // finally, destroy and identify the scroll diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index aa55ee08f3..5f043aa25b 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -532,7 +532,7 @@ static const char* scroll_type_name(int scrolltype) case SCR_BLINKING: return "blinking"; case SCR_PAPER: return "paper"; case SCR_MAGIC_MAPPING: return "magic mapping"; - case SCR_FORGETFULNESS: return "forgetfullness"; + case SCR_FOG: return "fog"; case SCR_ACQUIREMENT: return "acquirement"; case SCR_ENCHANT_WEAPON_II: return "enchant weapon II"; case SCR_VORPALISE_WEAPON: return "vorpalise weapon"; diff --git a/crawl-ref/source/itemprop.h b/crawl-ref/source/itemprop.h index c9e037dc14..352f8aac9b 100644 --- a/crawl-ref/source/itemprop.h +++ b/crawl-ref/source/itemprop.h @@ -310,7 +310,7 @@ enum scroll_type SCR_BLINKING, SCR_PAPER, // 15 SCR_MAGIC_MAPPING, - SCR_FORGETFULNESS, + SCR_FOG, SCR_ACQUIREMENT, SCR_ENCHANT_WEAPON_II, SCR_VORPALISE_WEAPON, // 20 diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 076da6c5da..fcba0e73b6 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -2530,7 +2530,7 @@ int items( int allow_uniques, // not just true-false, (temp_rand > 464) ? SCR_FEAR : // 3.26% (temp_rand > 434) ? SCR_NOISE : // 3.26% (temp_rand > 404) ? SCR_MAGIC_MAPPING : // 3.26% - (temp_rand > 374) ? SCR_FORGETFULNESS : // 3.26% + (temp_rand > 374) ? SCR_FOG : // 3.26% (temp_rand > 344) ? SCR_RANDOM_USELESSNESS :// 3.26% (temp_rand > 314) ? SCR_CURSE_WEAPON : // 3.26% (temp_rand > 284) ? SCR_CURSE_ARMOUR : // 3.26% diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc index a0d6a8192a..a410cb0719 100644 --- a/crawl-ref/source/shopping.cc +++ b/crawl-ref/source/shopping.cc @@ -1254,6 +1254,9 @@ unsigned int item_value( item_def item, bool ident ) case SCR_IDENTIFY: valued += 20; break; + case SCR_FOG: + valued += 10; + break; case SCR_NOISE: case SCR_RANDOM_USELESSNESS: valued += 2; @@ -1262,7 +1265,6 @@ unsigned int item_value( item_def item, bool ident ) case SCR_CURSE_WEAPON: case SCR_PAPER: case SCR_IMMOLATION: - case SCR_FORGETFULNESS: valued++; break; } |