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.40 by root, Sun Apr 11 04:52:07 2010 UTC vs.
Revision 1.47 by root, Fri Feb 3 03:01:45 2012 UTC

1#! perl # mandatory 1#! perl # mandatory
2 2
3use Coro::AIO; 3use Coro::AIO;
4
5CONF META_TIMEOUT : map_random_meta_timeout = 86400 * 7;
4 6
5cf::map->register (qr{^\?random/([0-9a-f]{32})}); 7cf::map->register (qr{^\?random/([0-9a-f]{32})});
6 8
7sub init { 9sub init {
8 my ($self) = @_; 10 my ($self) = @_;
… …
11 13
12 if (0 < Coro::AIO::aio_load "$cf::RANDOMDIR/$self->{random_id}.meta", my $data) { 14 if (0 < Coro::AIO::aio_load "$cf::RANDOMDIR/$self->{random_id}.meta", my $data) {
13 $self->{random} = cf::decode_json $data; 15 $self->{random} = cf::decode_json $data;
14 $self->{random}{custom} ||= "$self->{random}{origin_map}+$self->{random}{origin_x}+$self->{random}{origin_y}"; 16 $self->{random}{custom} ||= "$self->{random}{origin_map}+$self->{random}{origin_x}+$self->{random}{origin_y}";
15 } else { 17 } else {
16 warn "unable to read meta file for $self->{random_id}\n"; 18 cf::info "unable to read meta file for $self->{random_id}\n";
17 return 0; 19 return 0;
18 } 20 }
19 21
20 1 22 1
21} 23}
… …
66 cf::map::find "/styles/$maps[cf::rmg_rndm scalar @maps]" 68 cf::map::find "/styles/$maps[cf::rmg_rndm scalar @maps]"
67} 69}
68 70
69# called by the random map generator 71# called by the random map generator
70sub find_style_; 72sub find_style_;
71sub find_style_($$) { 73sub find_style_($$$) {
72 my ($path, $difficulty) = @_; 74 my ($path, $difficulty, $recurse) = @_;
73 75
74 my $map; 76 my $map;
75 77
76 # see if there is a metafile 78 # see if there is a metafile
77 if (0 < aio_load "$cf::MAPDIR/$path.rmg", my $meta) { 79 if (0 < aio_load "$cf::MAPDIR/$path.rmg", my $meta) {
… …
87 unless aio_stat "$cf::MAPDIR/$path.map"; 89 unless aio_stat "$cf::MAPDIR/$path.map";
88 90
89 unless ($map) { 91 unless ($map) {
90 # search files and/or dirs 92 # search files and/or dirs
91 if (my ($dirs, $nondirs) = aio_scandir "$cf::MAPDIR/$path/", 1) { 93 if (my ($dirs, $nondirs) = aio_scandir "$cf::MAPDIR/$path/", 1) {
92 my @entries = sort grep s/\.map$//, @$nondirs; 94 my @entries = sort grep s/\.(?:map|rmg)$//, @$nondirs;
93 95
94 if ($difficulty < 0) { 96 if ($difficulty < 0) {
95 # pick a fully random map, but only a map, do not recurse 97 # pick a fully random map, but only a map, do not recurse
96 $map = cf::map::find "$path/$entries[cf::rmg_rndm scalar @entries]" 98 $map = cf::map::find "$path/$entries[cf::rmg_rndm scalar @entries]"
97 if @entries; 99 if @entries;
98 } else { 100 } else {
99 # pick a map with nearest difficulty value ("mapname_<difficulty>.map") 101 # pick a map with nearest difficulty value ("mapname_<difficulty>.map")
100 @entries = sort @$dirs 102 @entries = sort @$dirs
101 unless @entries; 103 unless @entries || !$recurse;
102 104
103 my $min_diff = 1e99; 105 my $min_diff = 1e99;
104 106
105 for my $name (@entries) { 107 for my $name (@entries) {
106 if ($name =~ /_(\d+)$/) { 108 if ($name =~ /_(\d+)$/) {
107 my $diff = abs $difficulty - $1 + 0.5; # prefer the more difficult version 109 my $diff = abs $difficulty - $1 + 0.25 + 0.25 * cf::rmg_rndm; # prefer the more difficult version
108 ($map, $min_diff) = ($name, $diff) if $diff < $min_diff; 110 ($map, $min_diff) = ($name, $diff) if $diff < $min_diff;
109 } 111 }
110 } 112 }
111 113
112 unless ($map) { 114 unless ($map) {
… …
121 } 123 }
122 124
123 $map 125 $map
124} 126}
125 127
126sub find_style($$$) { 128sub find_style($$$$) {
127 my ($dir, $name, $difficulty) = @_; 129 my ($dir, $name, $difficulty, $recurse) = @_;
128 130
129 cf::cede_to_tick; 131 cf::cede_to_tick;
130 132
131 my $map; 133 my $map;
132 134
133 if ($name) { 135 if ($name) {
134 $map = find_style_ "$dir/$name", $difficulty; 136 $map = find_style_ "$dir/$name", $difficulty, $recurse;
135 } else { 137 } else {
136 $map = (find_style_ "$dir/default", $difficulty) 138 $map = (find_style_ "$dir/default", $difficulty, $recurse)
137 || (find_style_ $dir, $difficulty); 139 || (find_style_ $dir, $difficulty, $recurse);
138 } 140 }
139 141
140 if ($map) { 142 if ($map) {
141 $map->load; 143 $map->load;
142 $map->deactivate; 144 $map->deactivate;
… …
145 #warn "return $dir,$name,$difficulty => $map\n" if $difficulty >= 0;#d# 147 #warn "return $dir,$name,$difficulty => $map\n" if $difficulty >= 0;#d#
146 $map 148 $map
147} 149}
148 150
149cf::async_ext { 151cf::async_ext {
150 $Coro::current->{desc} = "random map meta file cleaner"; 152 local $Coro::current->{desc} = "random map meta file cleaner";
151 $Coro::current->nice (1); 153 $Coro::current->nice (1);
152 154
153 while () { 155 while () {
154 my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7;
155
156 Coro::AnyEvent::idle_upto $META_TIMEOUT / 10 * 2; 156 Coro::AnyEvent::idle_upto $META_TIMEOUT / 10 * 2;
157 157
158 my ($files) = Coro::AIO::aio_readdirx $cf::RANDOMDIR, IO::AIO::READDIR_STAT_ORDER 158 my ($files) = Coro::AIO::aio_readdirx $cf::RANDOMDIR, IO::AIO::READDIR_STAT_ORDER
159 or return; 159 or return;
160 160
… …
165 and next; 165 and next;
166 166
167 my $age = $cf::NOW - (stat _)[8]; 167 my $age = $cf::NOW - (stat _)[8];
168 168
169 if ($age > $META_TIMEOUT) { 169 if ($age > $META_TIMEOUT) {
170 warn "resetting random meta data for $file"; 170 cf::trace "resetting random meta data for $file";
171 IO::AIO::aio_unlink "$cf::RANDOMDIR/$file"; 171 IO::AIO::aio_unlink "$cf::RANDOMDIR/$file";
172 } 172 }
173 } 173 }
174 174
175 Coro::AnyEvent::sleep $META_TIMEOUT / 10; 175 Coro::AnyEvent::sleep $META_TIMEOUT / 10;
… …
183 while () { 183 while () {
184 my $map = cf::map::new; 184 my $map = cf::map::new;
185 $map->generate_random_map ({ 185 $map->generate_random_map ({
186 region => "scorn", 186 region => "scorn",
187 random_seed => $seed++, 187 random_seed => $seed++,
188 xsize => (int rand 100) + 1, 188 xsize => (cf::rndm 1, 100),
189 ysize => (int rand 100) + 1, 189 ysize => (cf::rndm 1, 100),
190 }); 190 });
191 warn sprintf "%d: %dx%d o# %d\n", $seed, $map->width, $map->height, &cf::object::objects_size;#d# 191 warn sprintf "%d: %dx%d o# %d\n", $seed, $map->width, $map->height, &cf::object::objects_size;#d#
192 $map->destroy; 192 $map->destroy;
193 } 193 }
194 }; 194 };
… …
225 warn $m; 225 warn $m;
226 } 226 }
227 }; 227 };
228} 228}
229 229
2301
231

Diff Legend

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