--- deliantra/server/ext/map-random.ext	2010/03/26 00:26:48	1.38
+++ deliantra/server/ext/map-random.ext	2012/02/03 03:01:45	1.47
@@ -2,6 +2,8 @@
 
 use Coro::AIO;
 
+CONF META_TIMEOUT : map_random_meta_timeout = 86400 * 7;
+
 cf::map->register (qr{^\?random/([0-9a-f]{32})});
 
 sub init {
@@ -13,7 +15,7 @@
       $self->{random} = cf::decode_json $data;
       $self->{random}{custom} ||= "$self->{random}{origin_map}+$self->{random}{origin_x}+$self->{random}{origin_y}";
    } else {
-      warn "unable to read meta file for $self->{random_id}\n";
+      cf::info "unable to read meta file for $self->{random_id}\n";
       return 0;
    }
 
@@ -56,20 +58,40 @@
    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_($$) {
-   my ($path, $difficulty) = @_;
+sub find_style_($$$) {
+   my ($path, $difficulty, $recurse) = @_;
 
    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";
 
    unless ($map) {
       # search files and/or dirs
       if (my ($dirs, $nondirs) = aio_scandir "$cf::MAPDIR/$path/", 1) {
-         my @entries = sort grep s/\.map$//, @$nondirs;
+         my @entries = sort grep s/\.(?:map|rmg)$//, @$nondirs;
 
          if ($difficulty < 0) {
             # pick a fully random map, but only a map, do not recurse
@@ -78,13 +100,13 @@
          } else {
             # pick a map with nearest difficulty value ("mapname_<difficulty>.map")
             @entries = sort @$dirs
-               unless @entries;
+               unless @entries || !$recurse;
 
             my $min_diff = 1e99;
 
             for my $name (@entries) {
                if ($name =~ /_(\d+)$/) {
-                  my $diff = abs $difficulty - $1 + 0.5; # prefer the more difficult version
+                  my $diff = abs $difficulty - $1 + 0.25 + 0.25 * cf::rmg_rndm; # prefer the more difficult version
                   ($map, $min_diff) = ($name, $diff) if $diff < $min_diff;
                }
             }
@@ -103,12 +125,19 @@
    $map
 }
 
-sub find_style($$$) {
-   my ($dir, $name, $difficulty) = @_;
-   
+sub find_style($$$$) {
+   my ($dir, $name, $difficulty, $recurse) = @_;
+
    cf::cede_to_tick;
 
-   my $map = find_style_ $name ? "$dir/$name" : $dir, $difficulty;
+   my $map;
+   
+   if ($name) {
+      $map = find_style_ "$dir/$name", $difficulty, $recurse;
+   } else {
+      $map = (find_style_ "$dir/default", $difficulty, $recurse)
+             || (find_style_ $dir, $difficulty, $recurse);
+   }
 
    if ($map) {
       $map->load;
@@ -120,12 +149,10 @@
 }
 
 cf::async_ext {
-   $Coro::current->{desc} = "random map meta file cleaner";
+   local $Coro::current->{desc} = "random map meta file cleaner";
    $Coro::current->nice (1);
 
    while () {
-      my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7;
-
       Coro::AnyEvent::idle_upto $META_TIMEOUT / 10 * 2;
 
       my ($files) = Coro::AIO::aio_readdirx $cf::RANDOMDIR, IO::AIO::READDIR_STAT_ORDER
@@ -140,7 +167,7 @@
          my $age = $cf::NOW - (stat _)[8];
 
          if ($age > $META_TIMEOUT) {
-            warn "resetting random meta data for $file";
+            cf::trace "resetting random meta data for $file";
             IO::AIO::aio_unlink "$cf::RANDOMDIR/$file";
          }
       }
@@ -158,8 +185,8 @@
          $map->generate_random_map ({
             region => "scorn",
             random_seed => $seed++,
-            xsize => (int rand 100) + 1,
-            ysize => (int rand 100) + 1,
+            xsize => (cf::rndm 1, 100),
+            ysize => (cf::rndm 1, 100),
          });
          warn sprintf "%d: %dx%d o# %d\n", $seed, $map->width, $map->height, &cf::object::objects_size;#d#
          $map->destroy;
@@ -191,14 +218,12 @@
       $map->post_load_original;
       my $m=100;
       for (1..50) {
-         my $t=EV::time;
+         my $t=AE::time;
          $map->_save_objects ("/tmp/x", cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
-         $t = EV::time-$t;
+         $t = AE::time-$t;
          $m=$t if $m>$t;
          warn $m;
       }
    };
 }
 
-1
-