Customisable clouds!

cloud_struct now has members for colour, name, and tile; colour will be
used instead of the default colour of the cloud type, and will be used
to recolour the tile of the cloud (if it exists). Name will be used to
rebrand the cloud's description, and also alter the message generate
while standing in a cloud.

Finally, tile can be used to completely customise the tile used for the
cloud. The value is stored as a string in order to maintain save
compatibility across ASCII and tiles. A random tile (found using
tile_main_count) from that set will also be used, however, no duration
effects will be applied.

Recoloured cloud tiles using just the colour code should be possible,
though aren't yet fully tested.

This commit bumps TAG_MAJOR_VERSION: changing marshalling of the
FogMachine Lua code causes nasty crashes on reloading saved games.
Otherwise, I don't think I broke anything else. :-)

1 files changed, 18 insertions, 6 deletions

diff --git a/crawl-ref/source/cloud.h b/crawl-ref/source/cloud.h
index 9cd1ef249c..9bb5ba7f00 100644
--- a/crawl-ref/source/cloud.h
+++ b/crawl-ref/source/cloud.h
@@ -34,19 +34,30 @@ void delete_cloud( int cloud );
 void move_cloud( int cloud, const coord_def& newpos );
 
 void check_place_cloud( cloud_type cl_type, const coord_def& p, int lifetime,
-                        kill_category whose, int spread_rate = -1 );
+                        kill_category whose, int spread_rate = -1,
+                        int colour = -1, std::string name = "",
+                        std::string tile = "");
 void check_place_cloud( cloud_type cl_type, const coord_def& p, int lifetime,
-                        killer_type killer, int spread_rate = -1 );
+                        killer_type killer, int spread_rate = -1,
+                        int colour = -1, std::string name = "",
+                        std::string tile = "");
 void check_place_cloud( cloud_type cl_type, const coord_def& p, int lifetime,
                         kill_category whose, killer_type killer,
-                        int spread_rate = -1 );
+                        int spread_rate = -1,
+                        int colour = -1, std::string name = "",
+                        std::string tile = "");
 void place_cloud( cloud_type cl_type, const coord_def& ctarget,
-                  int cl_range, kill_category whose, int spread_rate = -1 );
+                  int cl_range, kill_category whose, int spread_rate = -1,
+                  int colour = -1, std::string name = "",
+                  std::string tile = "");
 void place_cloud( cloud_type cl_type, const coord_def& ctarget,
-                  int cl_range, killer_type killer, int spread_rate = -1 );
+                  int cl_range, killer_type killer, int spread_rate = -1,
+                  int colour = -1, std::string name = "",
+                  std::string tile = "");
 void place_cloud( cloud_type cl_type, const coord_def& ctarget,
                   int cl_range, kill_category whose, killer_type killer,
-                  int spread_rate = -1 );
+                  int spread_rate = -1, int colour = -1, std::string name = "",
+                  std::string tile = "");
 
 void manage_clouds(void);
 
@@ -61,6 +72,7 @@ int resist_fraction(int resist, int bonus_res = 0);
 int  max_cloud_damage(cloud_type cl_type, int power = -1);
 void in_a_cloud(void);
 
+std::string cloud_name(int cloudno);
 std::string cloud_name(cloud_type type);
 int get_cloud_colour(int cloudno);