| … | |
… | |
| 11 | |
11 | |
| 12 | if (0 < Coro::AIO::aio_load "$cf::RANDOMDIR/$self->{random_id}.meta", my $data) { |
12 | if (0 < Coro::AIO::aio_load "$cf::RANDOMDIR/$self->{random_id}.meta", my $data) { |
| 13 | $self->{random} = cf::decode_json $data; |
13 | $self->{random} = cf::decode_json $data; |
| 14 | $self->{random}{custom} ||= "$self->{random}{origin_map}+$self->{random}{origin_x}+$self->{random}{origin_y}"; |
14 | $self->{random}{custom} ||= "$self->{random}{origin_map}+$self->{random}{origin_x}+$self->{random}{origin_y}"; |
| 15 | } else { |
15 | } else { |
| 16 | warn "unable to read meta file for $self->{random_id}\n"; |
16 | cf::info "unable to read meta file for $self->{random_id}\n"; |
| 17 | return 0; |
17 | return 0; |
| 18 | } |
18 | } |
| 19 | |
19 | |
| 20 | 1 |
20 | 1 |
| 21 | } |
21 | } |
| … | |
… | |
| 66 | cf::map::find "/styles/$maps[cf::rmg_rndm scalar @maps]" |
66 | cf::map::find "/styles/$maps[cf::rmg_rndm scalar @maps]" |
| 67 | } |
67 | } |
| 68 | |
68 | |
| 69 | # called by the random map generator |
69 | # called by the random map generator |
| 70 | sub find_style_; |
70 | sub find_style_; |
| 71 | sub find_style_($$) { |
71 | sub find_style_($$$) { |
| 72 | my ($path, $difficulty) = @_; |
72 | my ($path, $difficulty, $recurse) = @_; |
| 73 | |
73 | |
| 74 | my $map; |
74 | my $map; |
| 75 | |
75 | |
| 76 | # see if there is a metafile |
76 | # see if there is a metafile |
| 77 | if (0 < aio_load "$cf::MAPDIR/$path.rmg", my $meta) { |
77 | if (0 < aio_load "$cf::MAPDIR/$path.rmg", my $meta) { |
| … | |
… | |
| 87 | unless aio_stat "$cf::MAPDIR/$path.map"; |
87 | unless aio_stat "$cf::MAPDIR/$path.map"; |
| 88 | |
88 | |
| 89 | unless ($map) { |
89 | unless ($map) { |
| 90 | # search files and/or dirs |
90 | # search files and/or dirs |
| 91 | if (my ($dirs, $nondirs) = aio_scandir "$cf::MAPDIR/$path/", 1) { |
91 | if (my ($dirs, $nondirs) = aio_scandir "$cf::MAPDIR/$path/", 1) { |
| 92 | my @entries = sort grep s/\.map$//, @$nondirs; |
92 | my @entries = sort grep s/\.(?:map|rmg)$//, @$nondirs; |
| 93 | |
93 | |
| 94 | if ($difficulty < 0) { |
94 | if ($difficulty < 0) { |
| 95 | # 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 |
| 96 | $map = cf::map::find "$path/$entries[cf::rmg_rndm scalar @entries]" |
96 | $map = cf::map::find "$path/$entries[cf::rmg_rndm scalar @entries]" |
| 97 | if @entries; |
97 | if @entries; |
| 98 | } else { |
98 | } else { |
| 99 | # pick a map with nearest difficulty value ("mapname_<difficulty>.map") |
99 | # pick a map with nearest difficulty value ("mapname_<difficulty>.map") |
| 100 | @entries = sort @$dirs |
100 | @entries = sort @$dirs |
| 101 | unless @entries; |
101 | unless @entries || !$recurse; |
| 102 | |
102 | |
| 103 | my $min_diff = 1e99; |
103 | my $min_diff = 1e99; |
| 104 | |
104 | |
| 105 | for my $name (@entries) { |
105 | for my $name (@entries) { |
| 106 | if ($name =~ /_(\d+)$/) { |
106 | if ($name =~ /_(\d+)$/) { |
| 107 | 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 |
| 108 | ($map, $min_diff) = ($name, $diff) if $diff < $min_diff; |
108 | ($map, $min_diff) = ($name, $diff) if $diff < $min_diff; |
| 109 | } |
109 | } |
| 110 | } |
110 | } |
| 111 | |
111 | |
| 112 | unless ($map) { |
112 | unless ($map) { |
| … | |
… | |
| 121 | } |
121 | } |
| 122 | |
122 | |
| 123 | $map |
123 | $map |
| 124 | } |
124 | } |
| 125 | |
125 | |
| 126 | sub find_style($$$) { |
126 | sub find_style($$$$) { |
| 127 | my ($dir, $name, $difficulty) = @_; |
127 | my ($dir, $name, $difficulty, $recurse) = @_; |
| 128 | |
128 | |
| 129 | cf::cede_to_tick; |
129 | cf::cede_to_tick; |
| 130 | |
130 | |
| 131 | my $map; |
131 | my $map; |
| 132 | |
132 | |
| 133 | if ($name) { |
133 | if ($name) { |
| 134 | $map = find_style_ "$dir/$name", $difficulty; |
134 | $map = find_style_ "$dir/$name", $difficulty, $recurse; |
| 135 | } else { |
135 | } else { |
| 136 | $map = (find_style_ "$dir/default", $difficulty) |
136 | $map = (find_style_ "$dir/default", $difficulty, $recurse) |
| 137 | || (find_style_ $dir, $difficulty); |
137 | || (find_style_ $dir, $difficulty, $recurse); |
| 138 | } |
138 | } |
| 139 | |
139 | |
| 140 | if ($map) { |
140 | if ($map) { |
| 141 | $map->load; |
141 | $map->load; |
| 142 | $map->deactivate; |
142 | $map->deactivate; |
| … | |
… | |
| 145 | #warn "return $dir,$name,$difficulty => $map\n" if $difficulty >= 0;#d# |
145 | #warn "return $dir,$name,$difficulty => $map\n" if $difficulty >= 0;#d# |
| 146 | $map |
146 | $map |
| 147 | } |
147 | } |
| 148 | |
148 | |
| 149 | cf::async_ext { |
149 | cf::async_ext { |
| 150 | $Coro::current->{desc} = "random map meta file cleaner"; |
150 | local $Coro::current->{desc} = "random map meta file cleaner"; |
| 151 | $Coro::current->nice (1); |
151 | $Coro::current->nice (1); |
| 152 | |
152 | |
| 153 | while () { |
153 | while () { |
| 154 | my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7; |
154 | my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7; |
| 155 | |
155 | |
| … | |
… | |
| 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 | }; |
| … | |
… | |
| 216 | $map->load_header; |
216 | $map->load_header; |
| 217 | $map->load; |
217 | $map->load; |
| 218 | $map->post_load_original; |
218 | $map->post_load_original; |
| 219 | my $m=100; |
219 | my $m=100; |
| 220 | for (1..50) { |
220 | for (1..50) { |
| 221 | my $t=EV::time; |
221 | my $t=AE::time; |
| 222 | $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); |
| 223 | $t = EV::time-$t; |
223 | $t = AE::time-$t; |
| 224 | $m=$t if $m>$t; |
224 | $m=$t if $m>$t; |
| 225 | warn $m; |
225 | warn $m; |
| 226 | } |
226 | } |
| 227 | }; |
227 | }; |
| 228 | } |
228 | } |
