--- deliantra/server/ext/map-random.ext	2007/12/05 11:08:34	1.19
+++ deliantra/server/ext/map-random.ext	2008/05/04 19:50:13	1.27
@@ -1,5 +1,7 @@
 #! perl # mandatory
 
+use Coro::AIO;
+
 cf::map->register (qr{^\?random/([0-9a-f]{32})});
 
 sub init {
@@ -75,12 +77,75 @@
    }
 }
 
+# called by the random map generator
+sub find_style_;
+sub find_style_($$) {
+   my ($path, $difficulty) = @_;
+
+   my $map;
+
+   $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;
+
+         if ($difficulty < 0) {
+            # pick a fully random map, but only a map, do not recurse
+            $map = cf::map::find "$path/$entries[cf::rmg_rndm scalar @entries]"
+               if @entries;
+         } else {
+            # pick a map with nearest difficulty value ("mapname_<difficulty>.map")
+            @entries = sort @$dirs
+               unless @entries;
+
+            my $min_diff = 1e99;
+
+            for my $name (@entries) {
+               if ($name =~ /_(\d+)$/) {
+                  my $diff = abs $difficulty - $1 + 0.5; # prefer the more difficult version
+                  ($map, $min_diff) = ($name, $diff) if $diff < $min_diff;
+               }
+            }
+
+            unless ($map) {
+               # no map with given pattern found, choose a random map
+               $map = $entries[cf::rmg_rndm scalar @entries];
+            }
+
+            $map = find_style_ "$path/$map", $difficulty
+               if $map;
+         }
+      }
+   }
+
+   $map
+}
+
+sub find_style($$$) {
+   my ($dir, $name, $difficulty) = @_;
+   
+   cf::cede_to_tick;
+
+   my $map = find_style_ $name ? "$dir/$name" : $dir, $difficulty;
+
+   if ($map) {
+      $map->load;
+      $map->deactivate;
+   }
+
+   warn "return $dir,$name,$difficulty => $map\n" if $difficulty >= 0;#d#
+   $map
+}
+
 # clean up old temp maps regularly
 our $CLEAN_RANDOM_MAPS = cf::periodic 3600, Coro::unblock_sub {
    clean_random_maps;
 };
 
-# map generator stresstest, never enable under normal circumstances
+# map generator stresstest, NEVER enable under normal circumstances
 if (0) {
    cf::async {
       my $seed = 0;
@@ -89,14 +154,27 @@
          $map->generate_random_map ({
             region => "scorn",
             random_seed => $seed++,
-            xsize => 12,
-            ysize => 12,
+            xsize => (int rand 90) + 3,
+            ysize => (int rand 90) + 3,
          });
-         warn sprintf "%d: %d %d\n", $seed, $map->width, $map->height;#d#
+#         warn sprintf "%d: %d %d\n", $seed, $map->width, $map->height;#d#
          $map->destroy;
       }
    };
 }
+
+# prefetch test, load some ocean-maps
+if (0) {
+   cf::async {
+      # 0.58
+      Coro::Timer::sleep 2;
+      for my $x (200..219) {
+         for my $y (200..219) {
+            (cf::map::find "/world/world_$x\_$y")->load;
+         }
+      }
+   };
+}
 
 1