diff options
| -rw-r--r-- | crawl-ref/source/acr.cc | 18 | ||||
| -rw-r--r-- | crawl-ref/source/dat/descript/spells.txt | 2 | ||||
| -rw-r--r-- | crawl-ref/source/player.cc | 12 | ||||
| -rw-r--r-- | crawl-ref/source/spells1.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/spells4.cc | 2 |
5 files changed, 19 insertions, 19 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 10614761bf..b8dfd911bc 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -2088,7 +2088,7 @@ static void _decrement_durations() if (--you.attribute[ATTR_DIVINE_SHIELD] == 0) { you.duration[DUR_DIVINE_SHIELD] = 0; - mpr("Your divine shield fades completely.", MSGCH_DURATION); + mpr("Your divine shield fades away.", MSGCH_DURATION); } } } @@ -2102,7 +2102,7 @@ static void _decrement_durations() const int temp_effect = get_weapon_brand(weapon); you.duration[DUR_WEAPON_BRAND] = 0; - set_item_ego_type( weapon, OBJ_WEAPONS, SPWPN_NORMAL ); + set_item_ego_type(weapon, OBJ_WEAPONS, SPWPN_NORMAL); std::string msg = weapon.name(DESC_CAP_YOUR); switch (temp_effect) @@ -2145,8 +2145,8 @@ static void _decrement_durations() || you.attribute[ATTR_TRANSFORMATION] != TRAN_BAT || you.duration[DUR_TRANSFORMATION] <= 5) { - if ( _decrement_a_duration(DUR_TRANSFORMATION, NULL, random2(3), - "Your transformation is almost over.") ) + if (_decrement_a_duration(DUR_TRANSFORMATION, NULL, random2(3), + "Your transformation is almost over.")) { untransform(); you.duration[DUR_BREATH_WEAPON] = 0; @@ -2256,10 +2256,10 @@ static void _decrement_durations() " stop glowing.").c_str()); _decrement_a_duration(DUR_SURE_BLADE, - "The bond with your blade fades away." ); + "The bond with your blade fades away."); - if ( _decrement_a_duration(DUR_MESMERISED, "You break out of your daze.", - 0, NULL, MSGCH_RECOVERY )) + if (_decrement_a_duration(DUR_MESMERISED, "You break out of your daze.", + 0, NULL, MSGCH_RECOVERY)) { you.mesmerised_by.clear(); } @@ -2378,7 +2378,7 @@ static void _decrement_durations() // Landing kills controlled flight. you.duration[DUR_CONTROLLED_FLIGHT] = 0; // Re-enter the terrain. - move_player_to_grid( you.pos(), false, true, true ); + move_player_to_grid(you.pos(), false, true, true); } } @@ -2432,7 +2432,7 @@ static void _decrement_durations() { mpr("Your life is in your own hands once again.", MSGCH_DURATION); you.duration[DUR_PARALYSIS] += 5 + random2(5); - confuse_player( 10 + random2(10) ); + confuse_player(10 + random2(10)); you.hp_max--; deflate_hp(you.hp_max, false); you.duration[DUR_DEATHS_DOOR] = 0; diff --git a/crawl-ref/source/dat/descript/spells.txt b/crawl-ref/source/dat/descript/spells.txt index 67234937a0..44dede83d2 100644 --- a/crawl-ref/source/dat/descript/spells.txt +++ b/crawl-ref/source/dat/descript/spells.txt @@ -232,7 +232,7 @@ This spell temporarily infuses the weapon held by the caster with the essence of %%%% Extension -This spell extends the duration of most enchantments affecting the caster. +This spell extends the duration of most enchantments affecting the caster. Be wary that using it slowly contaminates you with magical energy. %%%% Fire Brand diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 5ab6af83bc..3ea824aae0 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -3703,7 +3703,7 @@ int get_expiration_threshold(duration_type dur) { case DUR_FIRE_SHIELD: case DUR_SILENCE: // no message - return 5; + return (5); case DUR_DEFLECT_MISSILES: case DUR_REPEL_MISSILES: @@ -3718,23 +3718,23 @@ int get_expiration_threshold(duration_type dur) case DUR_FORESCRY: case DUR_CONTROL_TELEPORT: case DUR_DEATH_CHANNEL: - return 6; + return (6); case DUR_LEVITATION: case DUR_TRANSFORMATION: // not on status case DUR_DEATHS_DOOR: // not on status - return 10; + return (10); // These get no messages when they "flicker". case DUR_SAGE: case DUR_BARGAIN: - return 15; + return (15); case DUR_CONFUSING_TOUCH: - return 20; + return (20); default: - return 0; + return (0); } } diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc index 29b6c21147..0f7ece7715 100644 --- a/crawl-ref/source/spells1.cc +++ b/crawl-ref/source/spells1.cc @@ -794,7 +794,7 @@ int cast_healing(int pow, bool divine_ability, const coord_def& where) void remove_divine_vigour() { - mpr("Your divine vigour fades.", MSGCH_DURATION); + mpr("Your divine vigour fades away.", MSGCH_DURATION); you.duration[DUR_DIVINE_VIGOUR] = 0; you.attribute[ATTR_DIVINE_VIGOUR] = 0; calc_hp(); @@ -827,7 +827,7 @@ bool cast_divine_vigour() void remove_divine_stamina() { - mpr("Your divine stamina fades.", MSGCH_DURATION); + mpr("Your divine stamina fades away.", MSGCH_DURATION); modify_stat(STAT_STRENGTH, -you.attribute[ATTR_DIVINE_STAMINA], true, "Zin's divine stamina running out"); modify_stat(STAT_INTELLIGENCE, -you.attribute[ATTR_DIVINE_STAMINA], diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index 42c57fec65..9cf01d66e2 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -1854,7 +1854,7 @@ bool cast_sandblast(int pow, bolt &beam) void remove_condensation_shield() { - mpr("Your icy shield dissipates!", MSGCH_DURATION); + mpr("Your icy shield evaporates.", MSGCH_DURATION); you.duration[DUR_CONDENSATION_SHIELD] = 0; you.redraw_armour_class = true; } |