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.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}
… …
54 $self->activate; 56 $self->activate;
55 57
56 1 58 1
57} 59}
58 60
61sub select_random_map {
62 my ($maps, $difficulty) = @_;
63
64 # because I am lazy, I ignore the weighting
65
66 my @maps = keys %$maps;
67
68 cf::map::find "/styles/$maps[cf::rmg_rndm scalar @maps]"
69}
70
59# called by the random map generator 71# called by the random map generator
60sub find_style_; 72sub find_style_;
61sub find_style_($$) { 73sub find_style_($$$) {
62 my ($path, $difficulty) = @_; 74 my ($path, $difficulty, $recurse) = @_;
63 75
64 my $map; 76 my $map;
77
78 # see if there is a metafile
79 if (0 < aio_load "$cf::MAPDIR/$path.rmg", my $meta) {
80 $meta = cf::decode_json $meta;
81
82 # only "maps" is supported
83 if ($meta->{maps}) {
84 $map = select_random_map $meta->{maps}, $difficulty;
85 }
86 }
65 87
66 $map = cf::map::find $path 88 $map = cf::map::find $path
67 unless aio_stat "$cf::MAPDIR/$path.map"; 89 unless aio_stat "$cf::MAPDIR/$path.map";
68 90
69 unless ($map) { 91 unless ($map) {
70 # search files and/or dirs 92 # search files and/or dirs
71 if (my ($dirs, $nondirs) = aio_scandir "$cf::MAPDIR/$path/", 1) { 93 if (my ($dirs, $nondirs) = aio_scandir "$cf::MAPDIR/$path/", 1) {
72 my @entries = sort grep s/\.map$//, @$nondirs; 94 my @entries = sort grep s/\.(?:map|rmg)$//, @$nondirs;
73 95
74 if ($difficulty < 0) { 96 if ($difficulty < 0) {
75 # 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
76 $map = cf::map::find "$path/$entries[cf::rmg_rndm scalar @entries]" 98 $map = cf::map::find "$path/$entries[cf::rmg_rndm scalar @entries]"
77 if @entries; 99 if @entries;
78 } else { 100 } else {
79 # pick a map with nearest difficulty value ("mapname_<difficulty>.map") 101 # pick a map with nearest difficulty value ("mapname_<difficulty>.map")
80 @entries = sort @$dirs 102 @entries = sort @$dirs
81 unless @entries; 103 unless @entries || !$recurse;
82 104
83 my $min_diff = 1e99; 105 my $min_diff = 1e99;
84 106
85 for my $name (@entries) { 107 for my $name (@entries) {
86 if ($name =~ /_(\d+)$/) { 108 if ($name =~ /_(\d+)$/) {
87 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
88 ($map, $min_diff) = ($name, $diff) if $diff < $min_diff; 110 ($map, $min_diff) = ($name, $diff) if $diff < $min_diff;
89 } 111 }
90 } 112 }
91 113
92 unless ($map) { 114 unless ($map) {
… …
101 } 123 }
102 124
103 $map 125 $map
104} 126}
105 127
106sub find_style($$$) { 128sub find_style($$$$) {
107 my ($dir, $name, $difficulty) = @_; 129 my ($dir, $name, $difficulty, $recurse) = @_;
130
131 cf::cede_to_tick;
132
133 my $map;
108 134
109 cf::cede_to_tick; 135 if ($name) {
110
111 my $map = find_style_ $name ? "$dir/$name" : $dir, $difficulty; 136 $map = find_style_ "$dir/$name", $difficulty, $recurse;
137 } else {
138 $map = (find_style_ "$dir/default", $difficulty, $recurse)
139 || (find_style_ $dir, $difficulty, $recurse);
140 }
112 141
113 if ($map) { 142 if ($map) {
114 $map->load; 143 $map->load;
115 $map->deactivate; 144 $map->deactivate;
116 } 145 }
… …
118 #warn "return $dir,$name,$difficulty => $map\n" if $difficulty >= 0;#d# 147 #warn "return $dir,$name,$difficulty => $map\n" if $difficulty >= 0;#d#
119 $map 148 $map
120} 149}
121 150
122cf::async_ext { 151cf::async_ext {
123 $Coro::current->{desc} = "random map meta file cleaner"; 152 local $Coro::current->{desc} = "random map meta file cleaner";
124 $Coro::current->nice (1); 153 $Coro::current->nice (1);
125 154
126 while () { 155 while () {
127 my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7;
128
129 Coro::AnyEvent::idle_upto $META_TIMEOUT / 10 * 2; 156 Coro::AnyEvent::idle_upto $META_TIMEOUT / 10 * 2;
130 157
131 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
132 or return; 159 or return;
133 160
… …
138 and next; 165 and next;
139 166
140 my $age = $cf::NOW - (stat _)[8]; 167 my $age = $cf::NOW - (stat _)[8];
141 168
142 if ($age > $META_TIMEOUT) { 169 if ($age > $META_TIMEOUT) {
143 warn "resetting random meta data for $file"; 170 cf::trace "resetting random meta data for $file";
144 IO::AIO::aio_unlink "$cf::RANDOMDIR/$file"; 171 IO::AIO::aio_unlink "$cf::RANDOMDIR/$file";
145 } 172 }
146 } 173 }
147 174
148 Coro::AnyEvent::sleep $META_TIMEOUT / 10; 175 Coro::AnyEvent::sleep $META_TIMEOUT / 10;
… …
156 while () { 183 while () {
157 my $map = cf::map::new; 184 my $map = cf::map::new;
158 $map->generate_random_map ({ 185 $map->generate_random_map ({
159 region => "scorn", 186 region => "scorn",
160 random_seed => $seed++, 187 random_seed => $seed++,
161 xsize => (int rand 100) + 1, 188 xsize => (cf::rndm 1, 100),
162 ysize => (int rand 100) + 1, 189 ysize => (cf::rndm 1, 100),
163 }); 190 });
164 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#
165 $map->destroy; 192 $map->destroy;
166 } 193 }
167 }; 194 };
… …
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}
202 229
2031
204

Diff Legend

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