--- deliantra/server/ext/map-random.ext	2010/03/26 00:26:48	1.38
+++ deliantra/server/ext/map-random.ext	2010/03/27 20:12:24	1.39
@@ -56,6 +56,16 @@
    1
 }
 
+sub select_random_map {
+   my ($maps, $difficulty) = @_;
+
+   # because I am lazy, I ignore the weighting
+
+   my @maps = keys %$maps;
+
+   cf::map::find "/styles/$maps[cf::rmg_rndm scalar @maps]"
+}
+
 # called by the random map generator
 sub find_style_;
 sub find_style_($$) {
@@ -63,6 +73,16 @@
 
    my $map;
 
+   # see if there is a metafile
+   if (0 < aio_load "$cf::MAPDIR/$path.rmg", my $meta) {
+      $meta = cf::decode_json $meta;
+
+      # only "maps" is supported
+      if ($meta->{maps}) {
+         $map = select_random_map $meta->{maps}, $difficulty;
+      }
+   }
+
    $map = cf::map::find $path
       unless aio_stat "$cf::MAPDIR/$path.map";
 
@@ -108,7 +128,14 @@
    
    cf::cede_to_tick;
 
-   my $map = find_style_ $name ? "$dir/$name" : $dir, $difficulty;
+   my $map;
+   
+   if ($name) {
+      $map = find_style_ "$dir/$name", $difficulty;
+   } else {
+      $map = (find_style_ "$dir/default", $difficulty)
+             || (find_style_ $dir, $difficulty);
+   }
 
    if ($map) {
       $map->load;