diff options
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/direct.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/enum.h | 30 | ||||
| -rw-r--r-- | crawl-ref/source/invent.cc | 14 | ||||
| -rw-r--r-- | crawl-ref/source/item_use.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/spells4.cc | 5 |
5 files changed, 34 insertions, 19 deletions
diff --git a/crawl-ref/source/direct.cc b/crawl-ref/source/direct.cc index e6e8f03631..52290684a0 100644 --- a/crawl-ref/source/direct.cc +++ b/crawl-ref/source/direct.cc @@ -2290,7 +2290,8 @@ command_type targeting_behaviour::get_command(int key) case CONTROL('F'): return CMD_TARGET_CYCLE_TARGET_MODE; case 'p': return CMD_TARGET_PREV_TARGET; case 'f': return CMD_TARGET_MAYBE_PREV_TARGET; - + case 't': return CMD_TARGET_MAYBE_PREV_TARGET; // f. users of the 0.3.4 keys + case '-': return CMD_TARGET_CYCLE_BACK; case '+': case '=': return CMD_TARGET_CYCLE_FORWARD; case ';': case '/': return CMD_TARGET_OBJ_CYCLE_BACK; diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index e54cbbb2ca..483673a0f9 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -2138,22 +2138,22 @@ enum object_class_type // (unsigned char) mitm[].base_type enum operation_types { - OPER_WIELD = 'w', - OPER_QUAFF = 'q', - OPER_DROP = 'd', - OPER_EAT = 'e', - OPER_TAKEOFF = 'T', - OPER_WEAR = 'W', - OPER_PUTON = 'P', - OPER_REMOVE = 'R', - OPER_READ = 'r', + OPER_WIELD = 'w', + OPER_QUAFF = 'q', + OPER_DROP = 'd', + OPER_EAT = 'e', + OPER_TAKEOFF = 'T', + OPER_WEAR = 'W', + OPER_PUTON = 'P', + OPER_REMOVE = 'R', + OPER_READ = 'r', OPER_MEMORISE = 'M', - OPER_ZAP = 'z', - OPER_EXAMINE = 'v', - OPER_FIRE = 'f', - OPER_PRAY = 'p', - OPER_EVOKE = 'E', - OPER_ANY = 0 + OPER_ZAP = 'Z', + OPER_EXAMINE = 'v', + OPER_FIRE = 'f', + OPER_PRAY = 'p', + OPER_EVOKE = 'E', + OPER_ANY = 0 }; enum orb_type diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index 70c4cc4fa6..f7664f7eb3 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -1046,11 +1046,19 @@ bool has_warning_inscription(const item_def& item, operation_types oper) { const char iletter = static_cast<char>(oper); - + const std::string& r(item.inscription); for ( unsigned int i = 0; i + 1 < r.size(); ++i ) - if (r[i] == '!' && (r[i+1] == iletter || r[i+1] == '*')) - return true; + { + if (r[i] == '!') + { + if (r[i+1] == iletter || r[i+1] == '*') + return true; + else if (oper == OPER_ZAP && r[i+1] == 'z') // for the 0.3.4. keys + return true; + } + } + return false; } diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 162adce4b1..1fbbb65bea 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -4672,6 +4672,7 @@ bool wearing_slot(int inv_slot) for (int i = EQ_CLOAK; i <= EQ_AMULET; ++i) if ( inv_slot == you.equip[i] ) return true; + return false; } diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index 1c8a86d255..90ccd5ac9e 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -1654,6 +1654,11 @@ bool cast_evaporate(int pow, bolt& beem, int potion) beem.flavour = BEAM_POTION_STEAM; break; + case POT_BLOOD: + case POT_BLOOD_COAGULATED: + if (one_chance_in(3)) + break; // stinking cloud + // deliberate fall through case POT_BERSERK_RAGE: beem.flavour = (coinflip() ? BEAM_POTION_FIRE : BEAM_POTION_STEAM); break; |