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.41 by root, Tue Apr 13 02:39:52 2010 UTC

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
70sub find_style_; 70sub find_style_;
71sub find_style_($$) { 71sub 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
126sub find_style($$$) { 126sub 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
149cf::async_ext { 149cf::async_ext {
150 $Coro::current->{desc} = "random map meta file cleaner"; 150 eCoro::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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines