diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-22 18:05:50 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-22 18:05:50 +0000 |
commit | 03d0dc004fc0e97aea58665ea1b09f61afbf34f4 (patch) | |
tree | fbb5427aa24920bb0d55bf527f8ca75ac838cead /crawl-ref/source | |
parent | 2f0b704c918d91c1fccbb040dd1a472491b56ea8 (diff) | |
download | crawl-ref-03d0dc004fc0e97aea58665ea1b09f61afbf34f4.tar.gz crawl-ref-03d0dc004fc0e97aea58665ea1b09f61afbf34f4.zip |
For consistency with branded missile weapons, make branded missiles "of
flame" and "of frost" rather than "of flame" and "of ice".
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8697 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
-rw-r--r-- | crawl-ref/source/describe.cc | 12 | ||||
-rw-r--r-- | crawl-ref/source/item_use.cc | 10 | ||||
-rw-r--r-- | crawl-ref/source/itemname.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/itemprop.h | 2 | ||||
-rw-r--r-- | crawl-ref/source/makeitem.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/rltiles/dc-item.txt | 2 | ||||
-rw-r--r-- | crawl-ref/source/tilesdl.cc | 4 |
7 files changed, 18 insertions, 18 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 1498093b9c..ca3a3973a9 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -1187,7 +1187,7 @@ static std::string _describe_ammo( const item_def &item ) bool can_launch = has_launcher(item); bool can_throw = is_throwable(&you, item, true); bool need_new_line = true; - bool always_destryoed = false; + bool always_destroyed = false; if (item.special && item_type_known(item)) { @@ -1209,9 +1209,9 @@ static std::string _describe_ammo( const item_def &item ) case SPMSL_FLAME: bolt_name = "flame"; // Intentional fall-through - case SPMSL_ICE: + case SPMSL_FROST: if (bolt_name.empty()) - bolt_name = "ice"; + bolt_name = "frost"; // Intentional fall-through case SPMSL_CHAOS: if (bolt_name.empty()) @@ -1233,7 +1233,7 @@ static std::string _describe_ammo( const item_def &item ) description += bolt_name; description += "."; - always_destryoed = true; + always_destroyed = true; break; case SPMSL_POISONED: case SPMSL_POISONED_II: @@ -1265,7 +1265,7 @@ static std::string _describe_ammo( const item_def &item ) description += "It will explode into fragemnets upon hitting " "a target, hitting an obstruction, or reaching the end of " "its range."; - always_destryoed = true; + always_destroyed = true; break; case SPMSL_STEEL: description += "Compared to normal ammo it does 50% more damage, " @@ -1312,7 +1312,7 @@ static std::string _describe_ammo( const item_def &item ) } } - if (always_destryoed) + if (always_destroyed) description += "$It will always be destroyed upon impact."; else append_missile_info(description); diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 4e0e941b9d..9b98b02c18 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -1679,7 +1679,7 @@ bool elemental_missile_beam(int launcher_brand, int ammo_brand) return (true); int element = (launcher_brand == SPWPN_FROST - + ammo_brand == SPMSL_ICE + + ammo_brand == SPMSL_FROST - launcher_brand == SPWPN_FLAME - ammo_brand == SPMSL_FLAME); @@ -2033,7 +2033,7 @@ void setup_missile_beam(const actor *agent, bolt &beam, item_def &item, ammo.special = SPMSL_CHAOS; } else if ((bow_brand == SPWPN_FLAME || ammo_brand == SPMSL_FLAME) - && ammo_brand != SPMSL_ICE && bow_brand != SPWPN_FROST) + && ammo_brand != SPMSL_FROST && bow_brand != SPWPN_FROST) { beam.flavour = BEAM_FIRE; beam.name = "flame"; @@ -2041,14 +2041,14 @@ void setup_missile_beam(const actor *agent, bolt &beam, item_def &item, ammo.special = SPMSL_FLAME; } - else if ((bow_brand == SPWPN_FROST || ammo_brand == SPMSL_ICE) + else if ((bow_brand == SPWPN_FROST || ammo_brand == SPMSL_FROST) && ammo_brand != SPMSL_FLAME && bow_brand != SPWPN_FLAME) { beam.flavour = BEAM_COLD; beam.name = "frost"; beam.colour = WHITE; - ammo.special = SPMSL_ICE; + ammo.special = SPMSL_FROST; } ASSERT(beam.flavour == BEAM_MISSILE || !is_artefact(item)); @@ -2149,7 +2149,7 @@ static bool determines_ammo_brand(int bow_brand, int ammo_brand) { if (bow_brand == SPWPN_FLAME && ammo_brand == SPMSL_FLAME) return (false); - if (bow_brand == SPWPN_FROST && ammo_brand == SPMSL_ICE) + if (bow_brand == SPWPN_FROST && ammo_brand == SPMSL_FROST) return (false); if (bow_brand == SPWPN_VENOM && ammo_brand == SPMSL_POISONED) return (false); diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 7eacf12918..354c8b54f5 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -1149,8 +1149,8 @@ std::string item_def::name_aux( description_level_type desc, case SPMSL_FLAME: buff << ((terse) ? " (flame)" : " of flame"); break; - case SPMSL_ICE: - buff << ((terse) ? " (ice)" : " of ice"); + case SPMSL_FROST: + buff << ((terse) ? " (frost)" : " of frost"); break; case SPMSL_NORMAL: case SPMSL_POISONED: diff --git a/crawl-ref/source/itemprop.h b/crawl-ref/source/itemprop.h index 1242c82d23..045959e3d0 100644 --- a/crawl-ref/source/itemprop.h +++ b/crawl-ref/source/itemprop.h @@ -370,7 +370,7 @@ enum special_missile_type // to separate from weapons in general {dlb} SPMSL_FORBID_BRAND = -1, // -1 SPMSL_NORMAL, // 0 SPMSL_FLAME, - SPMSL_ICE, + SPMSL_FROST, SPMSL_POISONED, SPMSL_POISONED_II, // unused SPMSL_CURARE, // 5 diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 65e5547c75..29f9e8e6da 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -1677,7 +1677,7 @@ static special_missile_type _determine_missile_brand(const item_def& item, if (temp_rand < 60) rc = SPMSL_FLAME; else if (temp_rand < 120) - rc = SPMSL_ICE; + rc = SPMSL_FROST; else if (temp_rand < 150) rc = SPMSL_POISONED; else diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt index 10ce7bf7a1..361c4923c0 100644 --- a/crawl-ref/source/rltiles/dc-item.txt +++ b/crawl-ref/source/rltiles/dc-item.txt @@ -169,7 +169,7 @@ i-draining BRAND_DRAINING i-speed BRAND_SPEED
i-vorpal BRAND_VORPAL
i-flaming BRAND_FLAME
-i-freezing BRAND_ICE
+i-freezing BRAND_FROST
i-vampiricism BRAND_VAMPIRICISM
i-pain BRAND_PAIN
i-distortion BRAND_DISTORTION
diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc index 3cce15564a..bf9f281ca3 100644 --- a/crawl-ref/source/tilesdl.cc +++ b/crawl-ref/source/tilesdl.cc @@ -1234,8 +1234,8 @@ static void _fill_item_info(InventoryTile &desc, const item_def &item) case SPMSL_FLAME: desc.special = TILE_BRAND_FLAME; break; - case SPMSL_ICE: - desc.special = TILE_BRAND_ICE; + case SPMSL_FROST: + desc.special = TILE_BRAND_FROST; break; case SPMSL_POISONED: desc.special = TILE_BRAND_POISONED; |