ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/map-random.ext
(Generate patch)

Comparing deliantra/server/ext/map-random.ext (file contents):
Revision 1.38 by root, Fri Mar 26 00:26:48 2010 UTC vs.
Revision 1.41 by root, Tue Apr 13 02:39:52 2010 UTC

… …
54 $self->activate; 54 $self->activate;
55 55
56 1 56 1
57} 57}
58 58
59sub select_random_map {
60 my ($maps, $difficulty) = @_;
61
62 # because I am lazy, I ignore the weighting
63
64 my @maps = keys %$maps;
65
66 cf::map::find "/styles/$maps[cf::rmg_rndm scalar @maps]"
67}
68
59# called by the random map generator 69# called by the random map generator
60sub find_style_; 70sub find_style_;
61sub find_style_($$) { 71sub find_style_($$$) {
62 my ($path, $difficulty) = @_; 72 my ($path, $difficulty, $recurse) = @_;
63 73
64 my $map; 74 my $map;
75
76 # see if there is a metafile
77 if (0 < aio_load "$cf::MAPDIR/$path.rmg", my $meta) {
78 $meta = cf::decode_json $meta;
79
80 # only "maps" is supported
81 if ($meta->{maps}) {
82 $map = select_random_map $meta->{maps}, $difficulty;
83 }
84 }
65 85
66 $map = cf::map::find $path 86 $map = cf::map::find $path
67 unless aio_stat "$cf::MAPDIR/$path.map"; 87 unless aio_stat "$cf::MAPDIR/$path.map";
68 88
69 unless ($map) { 89 unless ($map) {
70 # search files and/or dirs 90 # search files and/or dirs
71 if (my ($dirs, $nondirs) = aio_scandir "$cf::MAPDIR/$path/", 1) { 91 if (my ($dirs, $nondirs) = aio_scandir "$cf::MAPDIR/$path/", 1) {
72 my @entries = sort grep s/\.map$//, @$nondirs; 92 my @entries = sort grep s/\.(?:map|rmg)$//, @$nondirs;
73 93
74 if ($difficulty < 0) { 94 if ($difficulty < 0) {
75 # pick a fully random map, but only a map, do not recurse 95 # pick a fully random map, but only a map, do not recurse
76 $map = cf::map::find "$path/$entries[cf::rmg_rndm scalar @entries]" 96 $map = cf::map::find "$path/$entries[cf::rmg_rndm scalar @entries]"
77 if @entries; 97 if @entries;
78 } else { 98 } else {
79 # pick a map with nearest difficulty value ("mapname_<difficulty>.map") 99 # pick a map with nearest difficulty value ("mapname_<difficulty>.map")
80 @entries = sort @$dirs 100 @entries = sort @$dirs
81 unless @entries; 101 unless @entries || !$recurse;
82 102
83 my $min_diff = 1e99; 103 my $min_diff = 1e99;
84 104
85 for my $name (@entries) { 105 for my $name (@entries) {
86 if ($name =~ /_(\d+)$/) { 106 if ($name =~ /_(\d+)$/) {
87 my $diff = abs $difficulty - $1 + 0.5; # prefer the more difficult version 107 my $diff = abs $difficulty - $1 + 0.25 + 0.25 * cf::rmg_rndm; # prefer the more difficult version
88 ($map, $min_diff) = ($name, $diff) if $diff < $min_diff; 108 ($map, $min_diff) = ($name, $diff) if $diff < $min_diff;
89 } 109 }
90 } 110 }
91 111
92 unless ($map) { 112 unless ($map) {
… …
101 } 121 }
102 122
103 $map 123 $map
104} 124}
105 125
106sub find_style($$$) { 126sub find_style($$$$) {
107 my ($dir, $name, $difficulty) = @_; 127 my ($dir, $name, $difficulty, $recurse) = @_;
108 128
109 cf::cede_to_tick; 129 cf::cede_to_tick;
110 130
131 my $map;
132
133 if ($name) {
111 my $map = find_style_ $name ? "$dir/$name" : $dir, $difficulty; 134 $map = find_style_ "$dir/$name", $difficulty, $recurse;
135 } else {
136 $map = (find_style_ "$dir/default", $difficulty, $recurse)
137 || (find_style_ $dir, $difficulty, $recurse);
138 }
112 139
113 if ($map) { 140 if ($map) {
114 $map->load; 141 $map->load;
115 $map->deactivate; 142 $map->deactivate;
116 } 143 }
… …
118 #warn "return $dir,$name,$difficulty => $map\n" if $difficulty >= 0;#d# 145 #warn "return $dir,$name,$difficulty => $map\n" if $difficulty >= 0;#d#
119 $map 146 $map
120} 147}
121 148
122cf::async_ext { 149cf::async_ext {
123 $Coro::current->{desc} = "random map meta file cleaner"; 150 eCoro::current->{desc} = "random map meta file cleaner";
124 $Coro::current->nice (1); 151 $Coro::current->nice (1);
125 152
126 while () { 153 while () {
127 my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7; 154 my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7;
128 155
… …
189 $map->load_header; 216 $map->load_header;
190 $map->load; 217 $map->load;
191 $map->post_load_original; 218 $map->post_load_original;
192 my $m=100; 219 my $m=100;
193 for (1..50) { 220 for (1..50) {
194 my $t=EV::time; 221 my $t=AE::time;
195 $map->_save_objects ("/tmp/x", cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 222 $map->_save_objects ("/tmp/x", cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
196 $t = EV::time-$t; 223 $t = AE::time-$t;
197 $m=$t if $m>$t; 224 $m=$t if $m>$t;
198 warn $m; 225 warn $m;
199 } 226 }
200 }; 227 };
201} 228}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines