From 25262bdbcec856c4b99b72b86a3ccb7c363ee9e0 Mon Sep 17 00:00:00 2001 From: Stefan O'Rear Date: Fri, 6 Nov 2009 11:55:38 -0800 Subject: Rename purple smoke to clouds of translocational energy --- crawl-ref/source/beam.cc | 8 +------- crawl-ref/source/cloud.cc | 17 +++++++---------- crawl-ref/source/dat/altar.des | 2 +- crawl-ref/source/dat/bazaar.des | 2 +- crawl-ref/source/dat/clua/lm_fog.lua | 2 +- crawl-ref/source/dat/vaults.des | 2 +- crawl-ref/source/enum.h | 5 ++--- crawl-ref/source/item_use.cc | 4 ++-- crawl-ref/source/misc.cc | 2 +- crawl-ref/source/monstuff.cc | 4 ++-- crawl-ref/source/rltiles/dc-misc.txt | 2 +- crawl-ref/source/spells1.cc | 4 ++-- crawl-ref/source/spells3.cc | 4 ++-- crawl-ref/source/spells4.cc | 3 +-- crawl-ref/source/tile2.cc | 2 +- crawl-ref/source/tilepick.cc | 4 ++-- crawl-ref/source/tutorial.cc | 2 +- 17 files changed, 29 insertions(+), 40 deletions(-) diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index afede6aa9d..e3c8360fca 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -2964,9 +2964,6 @@ static int _potion_beam_flavour_to_colour(beam_type flavour) case BEAM_POTION_BLUE_SMOKE: return (LIGHTBLUE); - case BEAM_POTION_PURP_SMOKE: - return (MAGENTA); - case BEAM_POTION_RANDOM: default: // Leave it the colour of the potion, the clouds will colour @@ -3263,14 +3260,13 @@ void bolt::affect_place_explosion_clouds() case BEAM_POTION_BLACK_SMOKE: case BEAM_POTION_GREY_SMOKE: case BEAM_POTION_BLUE_SMOKE: - case BEAM_POTION_PURP_SMOKE: case BEAM_POTION_RAIN: case BEAM_POTION_MUTAGENIC: cl_type = beam2cloud(flavour); break; case BEAM_POTION_RANDOM: - switch (random2(11)) + switch (random2(10)) { case 0: cl_type = CLOUD_FIRE; break; case 1: cl_type = CLOUD_STINK; break; @@ -3279,7 +3275,6 @@ void bolt::affect_place_explosion_clouds() case 4: cl_type = CLOUD_BLACK_SMOKE; break; case 5: cl_type = CLOUD_GREY_SMOKE; break; case 6: cl_type = CLOUD_BLUE_SMOKE; break; - case 7: cl_type = CLOUD_PURP_SMOKE; break; default: cl_type = CLOUD_STEAM; break; } break; @@ -6069,7 +6064,6 @@ std::string beam_type_name(beam_type type) case BEAM_POTION_BLACK_SMOKE: return ("black smoke"); case BEAM_POTION_GREY_SMOKE: return ("grey smoke"); case BEAM_POTION_BLUE_SMOKE: return ("blue smoke"); - case BEAM_POTION_PURP_SMOKE: return ("purple smoke"); case BEAM_POTION_RAIN: return ("rain"); case BEAM_POTION_RANDOM: return ("random potion"); case BEAM_POTION_MUTAGENIC: return ("mutagenic fog"); diff --git a/crawl-ref/source/cloud.cc b/crawl-ref/source/cloud.cc index 12c64462cb..96ae7d8916 100644 --- a/crawl-ref/source/cloud.cc +++ b/crawl-ref/source/cloud.cc @@ -427,12 +427,12 @@ cloud_type cloud_type_at(const coord_def &c) cloud_type random_smoke_type() { - // excludes black (reproducing existing behaviour) + // including black to keep variety switch ( random2(3) ) { case 0: return CLOUD_GREY_SMOKE; case 1: return CLOUD_BLUE_SMOKE; - case 2: return CLOUD_PURP_SMOKE; + case 2: return CLOUD_BLACK_SMOKE; } return CLOUD_DEBUGGING; } @@ -461,8 +461,6 @@ cloud_type beam2cloud(beam_type flavour) return CLOUD_GREY_SMOKE; case BEAM_POTION_BLUE_SMOKE: return CLOUD_BLUE_SMOKE; - case BEAM_POTION_PURP_SMOKE: - return CLOUD_PURP_SMOKE; case BEAM_STEAM: case BEAM_POTION_STEAM: return CLOUD_STEAM; @@ -494,7 +492,6 @@ beam_type cloud2beam(cloud_type flavour) case CLOUD_BLACK_SMOKE: return BEAM_POTION_BLACK_SMOKE; case CLOUD_GREY_SMOKE: return BEAM_POTION_GREY_SMOKE; case CLOUD_BLUE_SMOKE: return BEAM_POTION_BLUE_SMOKE; - case CLOUD_PURP_SMOKE: return BEAM_POTION_PURP_SMOKE; case CLOUD_STEAM: return BEAM_STEAM; case CLOUD_MIASMA: return BEAM_MIASMA; case CLOUD_CHAOS: return BEAM_CHAOS; @@ -712,7 +709,7 @@ void in_a_cloud() case CLOUD_GREY_SMOKE: case CLOUD_BLUE_SMOKE: - case CLOUD_PURP_SMOKE: + case CLOUD_TLOC_ENERGY: case CLOUD_BLACK_SMOKE: mpr("You are engulfed in a cloud of smoke!"); break; @@ -829,7 +826,7 @@ bool is_harmless_cloud(cloud_type type) case CLOUD_BLACK_SMOKE: case CLOUD_GREY_SMOKE: case CLOUD_BLUE_SMOKE: - case CLOUD_PURP_SMOKE: + case CLOUD_TLOC_ENERGY: case CLOUD_MIST: case CLOUD_RAIN: case CLOUD_DEBUGGING: @@ -880,8 +877,8 @@ std::string cloud_name(cloud_type type) return "grey smoke"; case CLOUD_BLUE_SMOKE: return "blue smoke"; - case CLOUD_PURP_SMOKE: - return "purple smoke"; + case CLOUD_TLOC_ENERGY: + return "translocational energy"; case CLOUD_STEAM: return "steam"; case CLOUD_MIASMA: @@ -1006,7 +1003,7 @@ int get_cloud_colour(int cloudno) which_colour = LIGHTBLUE; break; - case CLOUD_PURP_SMOKE: + case CLOUD_TLOC_ENERGY: which_colour = MAGENTA; break; diff --git a/crawl-ref/source/dat/altar.des b/crawl-ref/source/dat/altar.des index 8e23b27501..63fe4e2a08 100644 --- a/crawl-ref/source/dat/altar.des +++ b/crawl-ref/source/dat/altar.des @@ -595,7 +595,7 @@ TAGS: no_rotate ORIENT: float SUBST: y = c. COLOUR: 1. = random -MARKER: P = lua:fog_machine { cloud_type="purple smoke", walk_dist=1, \ +MARKER: P = lua:fog_machine { cloud_type="tloc energy", walk_dist=1, \ size=9, pow_max=20, delay=10, buildup_amnt=14, buildup_time=7, \ spread_rate=3, start_clouds=1 } : if crawl.coinflip() then diff --git a/crawl-ref/source/dat/bazaar.des b/crawl-ref/source/dat/bazaar.des index eda4623d20..9a0e435266 100644 --- a/crawl-ref/source/dat/bazaar.des +++ b/crawl-ref/source/dat/bazaar.des @@ -246,7 +246,7 @@ ENDMAP # Bazaar in the mist (Lemuel) NAME: bzr_in_the_mist TAGS: bzr_entry -MARKER: O = lua:fog_machine { cloud_type= "purple smoke", \ +MARKER: O = lua:fog_machine { cloud_type= "thin mist", \ pow_min = 6, pow_max = 12, delay_min = 15, delay_max = 35, \ size = 2, walk_dist = 2, spread_rate= 35 } MARKER: O = lua:bazaar_portal() diff --git a/crawl-ref/source/dat/clua/lm_fog.lua b/crawl-ref/source/dat/clua/lm_fog.lua index 1b87026c9a..7fdbaf8eed 100644 --- a/crawl-ref/source/dat/clua/lm_fog.lua +++ b/crawl-ref/source/dat/clua/lm_fog.lua @@ -25,7 +25,7 @@ -- -- cloud_type: The name of the cloud type to use. Possible cloud types are: -- flame, noxious fumes, freezing vapour, poison gases, --- grey smoke, blue smoke, purple smoke, steam, rain, +-- grey smoke, blue smoke, tloc energy, steam, rain, -- foul pestilence, black smoke, mutagenic fog, thin mist (the default). -- walk_dist: The distance to move over the course of one random walk. -- defaults to 0. diff --git a/crawl-ref/source/dat/vaults.des b/crawl-ref/source/dat/vaults.des index 418f145cae..4cdeace9cb 100644 --- a/crawl-ref/source/dat/vaults.des +++ b/crawl-ref/source/dat/vaults.des @@ -291,7 +291,7 @@ local function teleporter (position, mtable) -- In order to mimic a normal teleport, even though this is certainly not. dgn.apply_area_cloud(position.x, position.y, 1, 4, 1, 1, - "purple smoke", "you", -1) + "tloc energy", "you", -1) end -- Lua marker magic! diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index c03710cc0b..38249fff2c 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -260,8 +260,7 @@ enum beam_type // beam[].flavour BEAM_POTION_GREY_SMOKE, BEAM_POTION_MUTAGENIC, BEAM_POTION_BLUE_SMOKE, - BEAM_POTION_PURP_SMOKE, // 60 - BEAM_POTION_RAIN, + BEAM_POTION_RAIN, // 60 BEAM_POTION_RANDOM, BEAM_LAST_REAL = BEAM_POTION_RANDOM, @@ -430,7 +429,7 @@ enum cloud_type CLOUD_BLACK_SMOKE, CLOUD_GREY_SMOKE, CLOUD_BLUE_SMOKE, - CLOUD_PURP_SMOKE, + CLOUD_TLOC_ENERGY, CLOUD_FOREST_FIRE, CLOUD_STEAM, diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 19378c4da6..22027b1137 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -1829,7 +1829,7 @@ static bool _dispersal_hit_victim(bolt& beam, actor* victim, int dmg, if (victim->atype() == ACT_PLAYER) { // Leave a purple cloud. - place_cloud(CLOUD_PURP_SMOKE, you.pos(), 1 + random2(3), KC_YOU); + place_cloud(CLOUD_TLOC_ENERGY, you.pos(), 1 + random2(3), KC_YOU); victim->moveto(pos); mpr("You blink!"); @@ -1844,7 +1844,7 @@ static bool _dispersal_hit_victim(bolt& beam, actor* victim, int dmg, mon->move_to_pos(pos); // Leave a purple cloud. - place_cloud(CLOUD_PURP_SMOKE, oldpos, 1 + random2(3), + place_cloud(CLOUD_TLOC_ENERGY, oldpos, 1 + random2(3), victim->kill_alignment()); mon->apply_location_effects(oldpos); diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 427255cfc8..208b3d9916 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -2244,7 +2244,7 @@ void down_stairs( int old_level, dungeon_feature_type force_stair, mprf("You insert %s into the lock.", you.inv[runes[1]].name(DESC_NOCAP_THE).c_str()); - big_cloud(CLOUD_PURP_SMOKE, KC_YOU, you.pos(), 20, 7 + random2(7)); + big_cloud(CLOUD_BLUE_SMOKE, KC_YOU, you.pos(), 20, 7 + random2(7)); viewwindow(true, false); mpr("Heavy smoke blows from the lock!"); more(); diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 7a7ea35dc2..f549758e08 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -2511,7 +2511,7 @@ bool monster_blink(monsters *monster, bool quiet) return (false); // Leave a purple cloud. - place_cloud(CLOUD_PURP_SMOKE, oldplace, 1 + random2(3), + place_cloud(CLOUD_TLOC_ENERGY, oldplace, 1 + random2(3), monster->kill_alignment()); monster->check_redraw(oldplace); @@ -3646,7 +3646,7 @@ void monster_teleport(monsters *monster, bool instan, bool silent) handle_seen_interrupt(monster); // Leave a purple cloud. - place_cloud(CLOUD_PURP_SMOKE, oldplace, 1 + random2(3), + place_cloud(CLOUD_TLOC_ENERGY, oldplace, 1 + random2(3), monster->kill_alignment()); monster->check_redraw(oldplace); diff --git a/crawl-ref/source/rltiles/dc-misc.txt b/crawl-ref/source/rltiles/dc-misc.txt index 209a1112ce..bca4a92897 100644 --- a/crawl-ref/source/rltiles/dc-misc.txt +++ b/crawl-ref/source/rltiles/dc-misc.txt @@ -23,7 +23,7 @@ cloud_black_smoke CLOUD_BLACK_SMOKE cloud_blue_smoke CLOUD_BLUE_SMOKE cloud_grey_smoke CLOUD_GREY_SMOKE cloud_miasma CLOUD_MIASMA -cloud_purp_smoke CLOUD_PURP_SMOKE +cloud_tloc_energy CLOUD_TLOC_ENERGY #########MAP %sdir dc-misc diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc index e3dc153adb..4abc752eb7 100644 --- a/crawl-ref/source/spells1.cc +++ b/crawl-ref/source/spells1.cc @@ -171,7 +171,7 @@ int blink(int pow, bool high_level_controlled_blink, bool wizard_blink) else { // Leave a purple cloud. - place_cloud(CLOUD_PURP_SMOKE, you.pos(), 1 + random2(3), KC_YOU); + place_cloud(CLOUD_TLOC_ENERGY, you.pos(), 1 + random2(3), KC_YOU); move_player_to_grid(beam.target, false, true, true); // Controlling teleport contaminates the player. -- bwr @@ -235,7 +235,7 @@ void random_blink(bool allow_partial_control, bool override_abyss) if (success) { // Leave a purple cloud. - place_cloud(CLOUD_PURP_SMOKE, origin, 1 + random2(3), KC_YOU); + place_cloud(CLOUD_TLOC_ENERGY, origin, 1 + random2(3), KC_YOU); if (you.level_type == LEVEL_ABYSS) { diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index 139e177bdc..a92006b6ff 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -1530,7 +1530,7 @@ static bool _teleport_player(bool allow_control, bool new_abyss_area) else { // Leave a purple cloud. - place_cloud(CLOUD_PURP_SMOKE, you.pos(), 1 + random2(3), KC_YOU); + place_cloud(CLOUD_TLOC_ENERGY, you.pos(), 1 + random2(3), KC_YOU); // Controlling teleport contaminates the player. - bwr move_player_to_grid(pos, false, true, true); @@ -1592,7 +1592,7 @@ static bool _teleport_player(bool allow_control, bool new_abyss_area) } // Leave a purple cloud. - place_cloud(CLOUD_PURP_SMOKE, you.pos(), 1 + random2(3), KC_YOU); + place_cloud(CLOUD_TLOC_ENERGY, you.pos(), 1 + random2(3), KC_YOU); move_player_to_grid(newpos, false, true, true); } diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index b9d528b703..a70bb84861 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -1181,7 +1181,6 @@ bool cast_evaporate(int pow, bolt& beem, int pot_idx) case 4: beem.flavour = BEAM_POTION_RANDOM; break; case 5: beem.flavour = BEAM_POTION_BLUE_SMOKE; break; case 6: beem.flavour = BEAM_POTION_BLACK_SMOKE; break; - case 7: beem.flavour = BEAM_POTION_PURP_SMOKE; break; default: beem.flavour = BEAM_POTION_STEAM; break; } tracer_flavour = BEAM_RANDOM; @@ -2028,7 +2027,7 @@ static int _quadrant_blink(coord_def where, int pow, int, actor *) if (res) { // Leave a purple cloud. - place_cloud(CLOUD_PURP_SMOKE, origin, 1 + random2(3), KC_YOU); + place_cloud(CLOUD_TLOC_ENERGY, origin, 1 + random2(3), KC_YOU); } return res; diff --git a/crawl-ref/source/tile2.cc b/crawl-ref/source/tile2.cc index 0534963612..dade215c54 100644 --- a/crawl-ref/source/tile2.cc +++ b/crawl-ref/source/tile2.cc @@ -177,7 +177,7 @@ void tile_init_default_flavour() int get_clean_map_idx(int tile_idx) { int idx = tile_idx & TILE_FLAG_MASK; - if (idx >= TILE_CLOUD_FIRE_0 && idx <= TILE_CLOUD_PURP_SMOKE + if (idx >= TILE_CLOUD_FIRE_0 && idx <= TILE_CLOUD_TLOC_ENERGY || idx >= TILEP_MONS_PANDEMONIUM_DEMON && idx <= TILEP_MONS_TEST_SPAWNER || idx >= TILEP_MCACHE_START) { diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index a2517e8cd6..3d56449778 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -2585,8 +2585,8 @@ static int _tileidx_cloud(int type, int decay) ch = TILE_CLOUD_BLUE_SMOKE; break; - case CLOUD_PURP_SMOKE: - ch = TILE_CLOUD_PURP_SMOKE; + case CLOUD_TLOC_ENERGY: + ch = TILE_CLOUD_TLOC_ENERGY; break; case CLOUD_MIASMA: diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc index c2bd7df2c7..a9c72e35f5 100644 --- a/crawl-ref/source/tutorial.cc +++ b/crawl-ref/source/tutorial.cc @@ -4399,7 +4399,7 @@ static void _tutorial_describe_cloud(int x, int y) case CLOUD_BLACK_SMOKE: case CLOUD_GREY_SMOKE: case CLOUD_BLUE_SMOKE: - case CLOUD_PURP_SMOKE: + case CLOUD_TLOC_ENERGY: case CLOUD_MIST: ostr << "harmless. "; break; -- cgit v1.2.3-54-g00ecf