… | |
… | |
4 | |
4 | |
5 | =cut |
5 | =cut |
6 | |
6 | |
7 | package Crossfire; |
7 | package Crossfire; |
8 | |
8 | |
9 | our $VERSION = '0.9'; |
9 | our $VERSION = '0.97'; |
10 | |
10 | |
11 | use strict; |
11 | use strict; |
12 | |
12 | |
13 | use base 'Exporter'; |
13 | use base 'Exporter'; |
14 | |
14 | |
… | |
… | |
33 | JSON::Syck::Dump $_[0] |
33 | JSON::Syck::Dump $_[0] |
34 | } |
34 | } |
35 | |
35 | |
36 | our $LIB = $ENV{CROSSFIRE_LIBDIR}; |
36 | our $LIB = $ENV{CROSSFIRE_LIBDIR}; |
37 | |
37 | |
38 | our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; |
38 | our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" |
|
|
39 | : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" |
|
|
40 | : File::Spec->tmpdir . "/crossfire"; |
39 | |
41 | |
40 | mkdir $VARDIR, 0777; |
42 | mkdir $VARDIR, 0777; |
41 | |
43 | |
42 | sub TILESIZE (){ 32 } |
44 | sub TILESIZE (){ 32 } |
43 | |
45 | |
… | |
… | |
56 | qw(move_type move_block move_allow move_on move_off move_slow); |
58 | qw(move_type move_block move_allow move_on move_off move_slow); |
57 | |
59 | |
58 | # same as in server save routine, to (hopefully) be compatible |
60 | # same as in server save routine, to (hopefully) be compatible |
59 | # to the other editors. |
61 | # to the other editors. |
60 | our @FIELD_ORDER_MAP = (qw( |
62 | our @FIELD_ORDER_MAP = (qw( |
|
|
63 | file_format_version |
61 | name attach swap_time reset_timeout fixed_resettime difficulty region |
64 | name attach swap_time reset_timeout fixed_resettime difficulty region |
62 | shopitems shopgreed shopmin shopmax shoprace |
65 | shopitems shopgreed shopmin shopmax shoprace |
63 | darkness width height enter_x enter_y msg maplore |
66 | darkness width height enter_x enter_y msg maplore |
64 | unique template |
67 | unique template |
65 | outdoor temp pressure humid windspeed winddir sky nosmooth |
68 | outdoor temp pressure humid windspeed winddir sky nosmooth |
… | |
… | |
136 | sub MOVE_FLY_HIGH (){ 0x04 } |
139 | sub MOVE_FLY_HIGH (){ 0x04 } |
137 | sub MOVE_FLYING (){ 0x06 } |
140 | sub MOVE_FLYING (){ 0x06 } |
138 | sub MOVE_SWIM (){ 0x08 } |
141 | sub MOVE_SWIM (){ 0x08 } |
139 | sub MOVE_BOAT (){ 0x10 } |
142 | sub MOVE_BOAT (){ 0x10 } |
140 | sub MOVE_KNOWN (){ 0x1f } # all of above |
143 | sub MOVE_KNOWN (){ 0x1f } # all of above |
141 | sub MOVE_ALLBIT (){ 0x10000 } |
|
|
142 | sub MOVE_ALL (){ 0x1001f } # very special value, more PITA |
144 | sub MOVE_ALL (){ 0x10000 } # very special value |
|
|
145 | |
|
|
146 | our %MOVE_TYPE = ( |
|
|
147 | walk => MOVE_WALK, |
|
|
148 | fly_low => MOVE_FLY_LOW, |
|
|
149 | fly_high => MOVE_FLY_HIGH, |
|
|
150 | flying => MOVE_FLYING, |
|
|
151 | swim => MOVE_SWIM, |
|
|
152 | boat => MOVE_BOAT, |
|
|
153 | all => MOVE_ALL, |
|
|
154 | ); |
|
|
155 | |
|
|
156 | our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat); |
|
|
157 | |
|
|
158 | { |
|
|
159 | package Crossfire::MoveType; |
|
|
160 | |
|
|
161 | use overload |
|
|
162 | '=' => sub { bless [@{$_[0]}], ref $_[0] }, |
|
|
163 | '""' => \&as_string, |
|
|
164 | '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef }, |
|
|
165 | '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise }, |
|
|
166 | '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise }, |
|
|
167 | '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, |
|
|
168 | 'x=' => sub { |
|
|
169 | my $cur = $_[0] >= $_[1]; |
|
|
170 | if (!defined $cur) { |
|
|
171 | if ($_[0] >= "all") { |
|
|
172 | $_[0] -= $_[1]; |
|
|
173 | } else { |
|
|
174 | $_[0] += $_[1]; |
|
|
175 | } |
|
|
176 | } elsif ($cur) { |
|
|
177 | $_[0] -= $_[1]; |
|
|
178 | } else { |
|
|
179 | $_[0] /= $_[1]; |
|
|
180 | } |
|
|
181 | |
|
|
182 | $_[0] |
|
|
183 | }, |
|
|
184 | 'eq' => sub { "$_[0]" eq "$_[1]" }, |
|
|
185 | 'ne' => sub { "$_[0]" ne "$_[1]" }, |
|
|
186 | ; |
|
|
187 | } |
|
|
188 | |
|
|
189 | sub Crossfire::MoveType::new { |
|
|
190 | my ($class, $string) = @_; |
|
|
191 | |
|
|
192 | my $mask; |
|
|
193 | my $value; |
|
|
194 | |
|
|
195 | if ($string =~ /^\s*\d+\s*$/) { |
|
|
196 | $mask = MOVE_ALL; |
|
|
197 | $value = $string+0; |
|
|
198 | } else { |
|
|
199 | for (split /\s+/, lc $string) { |
|
|
200 | if (s/^-//) { |
|
|
201 | $mask |= $MOVE_TYPE{$_}; |
|
|
202 | $value &= ~$MOVE_TYPE{$_}; |
|
|
203 | } else { |
|
|
204 | $mask |= $MOVE_TYPE{$_}; |
|
|
205 | $value |= $MOVE_TYPE{$_}; |
|
|
206 | } |
|
|
207 | } |
|
|
208 | } |
|
|
209 | |
|
|
210 | (bless [$mask, $value], $class)->normalise |
|
|
211 | } |
|
|
212 | |
|
|
213 | sub Crossfire::MoveType::normalise { |
|
|
214 | my ($self) = @_; |
|
|
215 | |
|
|
216 | if ($self->[0] & MOVE_ALL) { |
|
|
217 | my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); |
|
|
218 | $self->[0] &= $mask; |
|
|
219 | $self->[1] &= $mask; |
|
|
220 | } |
|
|
221 | |
|
|
222 | $self->[1] &= $self->[0]; |
|
|
223 | |
|
|
224 | $self |
|
|
225 | } |
|
|
226 | |
|
|
227 | sub Crossfire::MoveType::as_string { |
|
|
228 | my ($self) = @_; |
|
|
229 | |
|
|
230 | my @res; |
|
|
231 | |
|
|
232 | my ($mask, $value) = @$self; |
|
|
233 | |
|
|
234 | for (@Crossfire::MOVE_TYPE) { |
|
|
235 | my $bit = $Crossfire::MOVE_TYPE{$_}; |
|
|
236 | if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { |
|
|
237 | $mask &= ~$bit; |
|
|
238 | push @res, $value & $bit ? $_ : "-$_"; |
|
|
239 | } |
|
|
240 | } |
|
|
241 | |
|
|
242 | join " ", @res |
|
|
243 | } |
143 | |
244 | |
144 | sub load_ref($) { |
245 | sub load_ref($) { |
145 | my ($path) = @_; |
246 | my ($path) = @_; |
146 | |
247 | |
147 | open my $fh, "<:raw:perlio", $path |
248 | open my $fh, "<:raw:perlio", $path |
… | |
… | |
193 | |
294 | |
194 | sub _add_resist($$$) { |
295 | sub _add_resist($$$) { |
195 | my ($ob, $mask, $value) = @_; |
296 | my ($ob, $mask, $value) = @_; |
196 | |
297 | |
197 | while (my ($k, $v) = each %attack_mask) { |
298 | while (my ($k, $v) = each %attack_mask) { |
198 | $ob->{"resist_$k"} += $value if $mask & $v; |
299 | $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v; |
199 | } |
300 | } |
200 | } |
301 | } |
|
|
302 | |
|
|
303 | my %MATERIAL = reverse |
|
|
304 | paper => 1, |
|
|
305 | iron => 2, |
|
|
306 | glass => 4, |
|
|
307 | leather => 8, |
|
|
308 | wood => 16, |
|
|
309 | organic => 32, |
|
|
310 | stone => 64, |
|
|
311 | cloth => 128, |
|
|
312 | adamant => 256, |
|
|
313 | liquid => 512, |
|
|
314 | tin => 1024, |
|
|
315 | bone => 2048, |
|
|
316 | ice => 4096, |
|
|
317 | |
|
|
318 | # guesses |
|
|
319 | runestone => 12, |
|
|
320 | bronze => 18, |
|
|
321 | "ancient wood" => 20, |
|
|
322 | glass => 36, |
|
|
323 | marble => 66, |
|
|
324 | ice => 68, |
|
|
325 | stone => 70, |
|
|
326 | stone => 80, |
|
|
327 | cloth => 136, |
|
|
328 | ironwood => 144, |
|
|
329 | adamantium => 258, |
|
|
330 | glacium => 260, |
|
|
331 | blood => 544, |
|
|
332 | ; |
201 | |
333 | |
202 | # object as in "Object xxx", i.e. archetypes |
334 | # object as in "Object xxx", i.e. archetypes |
203 | sub normalize_object($) { |
335 | sub normalize_object($) { |
204 | my ($ob) = @_; |
336 | my ($ob) = @_; |
|
|
337 | |
|
|
338 | # convert material bitset to materialname, if possible |
|
|
339 | if (exists $ob->{material}) { |
|
|
340 | if (!$ob->{material}) { |
|
|
341 | delete $ob->{material}; |
|
|
342 | } elsif (exists $ob->{materialname}) { |
|
|
343 | if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) { |
|
|
344 | delete $ob->{material}; |
|
|
345 | } else { |
|
|
346 | warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n"; |
|
|
347 | delete $ob->{material}; # assume materilname is more specific and nuke material |
|
|
348 | } |
|
|
349 | } elsif (my $name = $MATERIAL{$ob->{material}}) { |
|
|
350 | delete $ob->{material}; |
|
|
351 | $ob->{materialname} = $name; |
|
|
352 | } else { |
|
|
353 | warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; |
|
|
354 | } |
|
|
355 | } |
205 | |
356 | |
206 | # nuke outdated or never supported fields |
357 | # nuke outdated or never supported fields |
207 | delete @$ob{qw( |
358 | delete @$ob{qw( |
208 | can_knockback can_parry can_impale can_cut can_dam_armour |
359 | can_knockback can_parry can_impale can_cut can_dam_armour |
209 | can_apply pass_thru can_pass_thru |
360 | can_apply pass_thru can_pass_thru |
… | |
… | |
215 | |
366 | |
216 | # convert movement strings to bitsets |
367 | # convert movement strings to bitsets |
217 | for my $attr (keys %FIELD_MOVEMENT) { |
368 | for my $attr (keys %FIELD_MOVEMENT) { |
218 | next unless exists $ob->{$attr}; |
369 | next unless exists $ob->{$attr}; |
219 | |
370 | |
220 | $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility |
371 | $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; |
221 | |
|
|
222 | next if $ob->{$attr} =~ /^\d+$/; |
|
|
223 | |
|
|
224 | my $flags = 0; |
|
|
225 | |
|
|
226 | # assume list |
|
|
227 | for my $flag (map lc, split /\s+/, $ob->{$attr}) { |
|
|
228 | $flags |= MOVE_WALK if $flag eq "walk"; |
|
|
229 | $flags |= MOVE_FLY_LOW if $flag eq "fly_low"; |
|
|
230 | $flags |= MOVE_FLY_HIGH if $flag eq "fly_high"; |
|
|
231 | $flags |= MOVE_FLYING if $flag eq "flying"; |
|
|
232 | $flags |= MOVE_SWIM if $flag eq "swim"; |
|
|
233 | $flags |= MOVE_BOAT if $flag eq "boat"; |
|
|
234 | $flags |= MOVE_ALL if $flag eq "all"; |
|
|
235 | |
|
|
236 | $flags &= ~MOVE_WALK if $flag eq "-walk"; |
|
|
237 | $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low"; |
|
|
238 | $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high"; |
|
|
239 | $flags &= ~MOVE_FLYING if $flag eq "-flying"; |
|
|
240 | $flags &= ~MOVE_SWIM if $flag eq "-swim"; |
|
|
241 | $flags &= ~MOVE_BOAT if $flag eq "-boat"; |
|
|
242 | $flags &= ~MOVE_ALL if $flag eq "-all"; |
|
|
243 | } |
|
|
244 | |
|
|
245 | $ob->{$attr} = $flags; |
|
|
246 | } |
372 | } |
247 | |
373 | |
248 | # convert outdated movement flags to new movement sets |
374 | # convert outdated movement flags to new movement sets |
249 | if (defined (my $v = delete $ob->{no_pass})) { |
375 | if (defined (my $v = delete $ob->{no_pass})) { |
250 | $ob->{move_block} = $v ? MOVE_ALL : 0; |
376 | $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; |
251 | } |
377 | } |
252 | if (defined (my $v = delete $ob->{slow_move})) { |
378 | if (defined (my $v = delete $ob->{slow_move})) { |
253 | $ob->{move_slow} |= MOVE_WALK; |
379 | $ob->{move_slow} += "walk"; |
254 | $ob->{move_slow_penalty} = $v; |
380 | $ob->{move_slow_penalty} = $v; |
255 | } |
381 | } |
256 | if (defined (my $v = delete $ob->{walk_on})) { |
382 | if (defined (my $v = delete $ob->{walk_on})) { |
257 | $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; |
383 | $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" } |
258 | $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK |
|
|
259 | : $ob->{move_on} & ~MOVE_WALK; |
|
|
260 | } |
384 | } |
261 | if (defined (my $v = delete $ob->{walk_off})) { |
385 | if (defined (my $v = delete $ob->{walk_off})) { |
262 | $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; |
386 | $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" } |
263 | $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK |
|
|
264 | : $ob->{move_off} & ~MOVE_WALK; |
|
|
265 | } |
387 | } |
266 | if (defined (my $v = delete $ob->{fly_on})) { |
388 | if (defined (my $v = delete $ob->{fly_on})) { |
267 | $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; |
389 | $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" } |
268 | $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW |
|
|
269 | : $ob->{move_on} & ~MOVE_FLY_LOW; |
|
|
270 | } |
390 | } |
271 | if (defined (my $v = delete $ob->{fly_off})) { |
391 | if (defined (my $v = delete $ob->{fly_off})) { |
272 | $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; |
392 | $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" } |
273 | $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW |
|
|
274 | : $ob->{move_off} & ~MOVE_FLY_LOW; |
|
|
275 | } |
393 | } |
276 | if (defined (my $v = delete $ob->{flying})) { |
394 | if (defined (my $v = delete $ob->{flying})) { |
277 | $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; |
395 | $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" } |
278 | $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW |
|
|
279 | : $ob->{move_type} & ~MOVE_FLY_LOW; |
|
|
280 | } |
396 | } |
281 | |
397 | |
282 | # convert idiotic event_xxx things into objects |
398 | # convert idiotic event_xxx things into objects |
283 | while (my ($event, $subtype) = each %EVENT_TYPE) { |
399 | while (my ($event, $subtype) = each %EVENT_TYPE) { |
284 | if (exists $ob->{"event_${event}_plugin"}) { |
400 | if (exists $ob->{"event_${event}_plugin"}) { |
… | |
… | |
288 | slaying => delete $ob->{"event_${event}"}, |
404 | slaying => delete $ob->{"event_${event}"}, |
289 | name => delete $ob->{"event_${event}_options"}, |
405 | name => delete $ob->{"event_${event}_options"}, |
290 | }; |
406 | }; |
291 | } |
407 | } |
292 | } |
408 | } |
|
|
409 | |
|
|
410 | # some archetypes had "+3" instead of the canonical "3", so fix |
|
|
411 | $ob->{dam} *= 1 if exists $ob->{dam}; |
293 | |
412 | |
294 | $ob |
413 | $ob |
295 | } |
414 | } |
296 | |
415 | |
297 | # arch as in "arch xxx", ie.. objects |
416 | # arch as in "arch xxx", ie.. objects |
… | |
… | |
379 | sub read_arch($;$) { |
498 | sub read_arch($;$) { |
380 | my ($path, $toplevel) = @_; |
499 | my ($path, $toplevel) = @_; |
381 | |
500 | |
382 | my %arc; |
501 | my %arc; |
383 | my ($more, $prev); |
502 | my ($more, $prev); |
|
|
503 | my $comment; |
384 | |
504 | |
385 | open my $fh, "<:raw:perlio:utf8", $path |
505 | open my $fh, "<:raw:perlio:utf8", $path |
386 | or Carp::croak "$path: $!"; |
506 | or Carp::croak "$path: $!"; |
387 | |
507 | |
388 | # binmode $fh; |
508 | # binmode $fh; |
… | |
… | |
392 | |
512 | |
393 | while (<$fh>) { |
513 | while (<$fh>) { |
394 | s/\s+$//; |
514 | s/\s+$//; |
395 | if (/^end$/i) { |
515 | if (/^end$/i) { |
396 | last; |
516 | last; |
|
|
517 | |
397 | } elsif (/^arch (\S+)$/i) { |
518 | } elsif (/^arch (\S+)$/i) { |
398 | push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); |
519 | push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); |
|
|
520 | |
399 | } elsif (/^lore$/i) { |
521 | } elsif (/^lore$/i) { |
400 | while (<$fh>) { |
522 | while (<$fh>) { |
401 | last if /^endlore\s*$/i; |
523 | last if /^endlore\s*$/i; |
402 | $arc{lore} .= $_; |
524 | $arc{lore} .= $_; |
403 | } |
525 | } |
… | |
… | |
412 | chomp; |
534 | chomp; |
413 | push @{ $arc{anim} }, $_; |
535 | push @{ $arc{anim} }, $_; |
414 | } |
536 | } |
415 | } elsif (/^(\S+)\s*(.*)$/) { |
537 | } elsif (/^(\S+)\s*(.*)$/) { |
416 | $arc{lc $1} = $2; |
538 | $arc{lc $1} = $2; |
417 | } elsif (/^\s*($|#)/) { |
539 | } elsif (/^\s*#/) { |
|
|
540 | $arc{_comment} .= "$_\n"; |
|
|
541 | |
|
|
542 | } elsif (/^\s*$/) { |
418 | # |
543 | # |
419 | } else { |
544 | } else { |
420 | warn "$path: unparsable line '$_' in arch $arc{_name}"; |
545 | warn "$path: unparsable line '$_' in arch $arc{_name}"; |
421 | } |
546 | } |
422 | } |
547 | } |
… | |
… | |
428 | s/\s+$//; |
553 | s/\s+$//; |
429 | if (/^more$/i) { |
554 | if (/^more$/i) { |
430 | $more = $prev; |
555 | $more = $prev; |
431 | } elsif (/^object (\S+)$/i) { |
556 | } elsif (/^object (\S+)$/i) { |
432 | my $name = $1; |
557 | my $name = $1; |
433 | my $arc = attr_thaw normalize_object $parse_block->(_name => $name); |
558 | my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment); |
|
|
559 | undef $comment; |
|
|
560 | delete $arc{_comment} unless length $arc{_comment}; |
434 | $arc->{_atype} = 'object'; |
561 | $arc->{_atype} = 'object'; |
435 | |
562 | |
436 | if ($more) { |
563 | if ($more) { |
437 | $more->{more} = $arc; |
564 | $more->{more} = $arc; |
438 | } else { |
565 | } else { |
… | |
… | |
440 | } |
567 | } |
441 | $prev = $arc; |
568 | $prev = $arc; |
442 | $more = undef; |
569 | $more = undef; |
443 | } elsif (/^arch (\S+)$/i) { |
570 | } elsif (/^arch (\S+)$/i) { |
444 | my $name = $1; |
571 | my $name = $1; |
445 | my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); |
572 | my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment); |
|
|
573 | undef $comment; |
|
|
574 | delete $arc{_comment} unless length $arc{_comment}; |
446 | $arc->{_atype} = 'arch'; |
575 | $arc->{_atype} = 'arch'; |
447 | |
576 | |
448 | if ($more) { |
577 | if ($more) { |
449 | $more->{more} = $arc; |
578 | $more->{more} = $arc; |
450 | } else { |
579 | } else { |
… | |
… | |
459 | push @{$toplevel->{lev_array}}, $_+0; |
588 | push @{$toplevel->{lev_array}}, $_+0; |
460 | } |
589 | } |
461 | } else { |
590 | } else { |
462 | $toplevel->{$1} = $2; |
591 | $toplevel->{$1} = $2; |
463 | } |
592 | } |
|
|
593 | } elsif (/^\s*#/) { |
|
|
594 | $comment .= "$_\n"; |
464 | } elsif (/^\s*($|#)/) { |
595 | } elsif (/^\s*($|#)/) { |
465 | # |
596 | # |
466 | } else { |
597 | } else { |
467 | die "$path: unparseable top-level line '$_'"; |
598 | die "$path: unparseable top-level line '$_'"; |
468 | } |
599 | } |
… | |
… | |
488 | if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { |
619 | if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { |
489 | $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) |
620 | $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) |
490 | | (delete $a{attack_movement_bits_4_7}); |
621 | | (delete $a{attack_movement_bits_4_7}); |
491 | } |
622 | } |
492 | |
623 | |
|
|
624 | if (my $comment = delete $a{_comment}) { |
|
|
625 | if ($comment =~ /[^\n\s#]/) { |
|
|
626 | $str .= $comment; |
|
|
627 | } |
|
|
628 | } |
|
|
629 | |
493 | $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; |
630 | $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; |
494 | |
631 | |
495 | my $inv = delete $a{inventory}; |
632 | my $inv = delete $a{inventory}; |
496 | my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some |
633 | my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some |
497 | my $anim = delete $a{anim}; |
634 | my $anim = delete $a{anim}; |
|
|
635 | |
|
|
636 | if ($a{_atype} eq 'object') { |
|
|
637 | $str .= join "\n", "anim", @$anim, "mina\n" |
|
|
638 | if $anim; |
|
|
639 | } |
498 | |
640 | |
499 | my @kv; |
641 | my @kv; |
500 | |
642 | |
501 | for ($a{_name} eq "map" |
643 | for ($a{_name} eq "map" |
502 | ? @Crossfire::FIELD_ORDER_MAP |
644 | ? @Crossfire::FIELD_ORDER_MAP |
… | |
… | |
514 | my ($k, $v) = @$_; |
656 | my ($k, $v) = @$_; |
515 | |
657 | |
516 | if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { |
658 | if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { |
517 | $v =~ s/\n$//; |
659 | $v =~ s/\n$//; |
518 | $str .= "$k\n$v\n$end\n"; |
660 | $str .= "$k\n$v\n$end\n"; |
519 | } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) { |
|
|
520 | if ($v & ~Crossfire::MOVE_ALL or !$v) { |
|
|
521 | $str .= "$k $v\n"; |
|
|
522 | |
|
|
523 | } elsif ($v & Crossfire::MOVE_ALLBIT) { |
|
|
524 | $str .= "$k all"; |
|
|
525 | |
|
|
526 | $str .= " -walk" unless $v & Crossfire::MOVE_WALK; |
|
|
527 | $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW; |
|
|
528 | $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH; |
|
|
529 | $str .= " -swim" unless $v & Crossfire::MOVE_SWIM; |
|
|
530 | $str .= " -boat" unless $v & Crossfire::MOVE_BOAT; |
|
|
531 | |
|
|
532 | $str .= "\n"; |
|
|
533 | |
|
|
534 | } else { |
|
|
535 | $str .= $k; |
|
|
536 | |
|
|
537 | $str .= " walk" if $v & Crossfire::MOVE_WALK; |
|
|
538 | $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW; |
|
|
539 | $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH; |
|
|
540 | $str .= " swim" if $v & Crossfire::MOVE_SWIM; |
|
|
541 | $str .= " boat" if $v & Crossfire::MOVE_BOAT; |
|
|
542 | |
|
|
543 | $str .= "\n"; |
|
|
544 | } |
|
|
545 | } else { |
661 | } else { |
546 | $str .= "$k $v\n"; |
662 | $str .= "$k $v\n"; |
547 | } |
663 | } |
548 | } |
664 | } |
549 | |
665 | |
550 | if ($inv) { |
666 | if ($inv) { |
551 | $append->($_) for @$inv; |
667 | $append->($_) for @$inv; |
552 | } |
668 | } |
553 | |
669 | |
|
|
670 | $str .= "end\n"; |
|
|
671 | |
554 | if ($a{_atype} eq 'object') { |
672 | if ($a{_atype} eq 'object') { |
555 | $str .= join "\n", "anim", @$anim, "mina\n" |
673 | if ($more) { |
556 | if $anim; |
|
|
557 | } |
|
|
558 | |
|
|
559 | $str .= "end\n"; |
|
|
560 | |
|
|
561 | if (($a{_atype} eq 'object') && $more) { |
|
|
562 | $str .= "\nmore\n"; |
674 | $str .= "more\n"; |
563 | $append->($more) if $more; |
675 | $append->($more) if $more; |
|
|
676 | } else { |
|
|
677 | $str .= "\n"; |
|
|
678 | } |
564 | } |
679 | } |
565 | }; |
680 | }; |
566 | |
681 | |
567 | for (@$arch) { |
682 | for (@$arch) { |
568 | $append->($_); |
683 | $append->($_); |
… | |
… | |
597 | my ($a) = @_; |
712 | my ($a) = @_; |
598 | |
713 | |
599 | my $o = $ARCH{$a->{_name}} |
714 | my $o = $ARCH{$a->{_name}} |
600 | or return; |
715 | or return; |
601 | |
716 | |
602 | my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} |
717 | my $face = $FACE{$a->{face} || $o->{face} || "blank.111"}; |
|
|
718 | unless ($face) { |
|
|
719 | $face = $FACE{"blank.x11"} |
603 | or (warn "no face data found for arch '$a->{_name}'"), return; |
720 | or (warn "no face data found for arch '$a->{_name}'"), return; |
|
|
721 | } |
604 | |
722 | |
605 | if ($face->{w} > 1 || $face->{h} > 1) { |
723 | if ($face->{w} > 1 || $face->{h} > 1) { |
606 | # bigface |
724 | # bigface |
607 | return (0, 0, $face->{w} - 1, $face->{h} - 1); |
725 | return (0, 0, $face->{w} - 1, $face->{h} - 1); |
608 | |
726 | |
… | |
… | |
715 | ]; |
833 | ]; |
716 | |
834 | |
717 | $attr |
835 | $attr |
718 | } |
836 | } |
719 | |
837 | |
720 | sub arch_edit_sections { |
|
|
721 | # if (edit_type == IGUIConstants.TILE_EDIT_NONE) |
|
|
722 | # edit_type = 0; |
|
|
723 | # else if (edit_type != 0) { |
|
|
724 | # // all flags from 'check_type' must be unset in this arch because they get recalculated now |
|
|
725 | # edit_type &= ~check_type; |
|
|
726 | # } |
|
|
727 | # |
|
|
728 | # } |
|
|
729 | # if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 && |
|
|
730 | # getAttributeValue("alive", defarch) == 1 && |
|
|
731 | # (getAttributeValue("monster", defarch) == 1 || |
|
|
732 | # getAttributeValue("generator", defarch) == 1)) { |
|
|
733 | # // Monster: monsters/npcs/generators |
|
|
734 | # edit_type |= IGUIConstants.TILE_EDIT_MONSTER; |
|
|
735 | # } |
|
|
736 | # if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 && |
|
|
737 | # arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) { |
|
|
738 | # // Walls |
|
|
739 | # edit_type |= IGUIConstants.TILE_EDIT_WALL; |
|
|
740 | # } |
|
|
741 | # if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 && |
|
|
742 | # getAttributeValue("connected", defarch) != 0) { |
|
|
743 | # // Connected Objects |
|
|
744 | # edit_type |= IGUIConstants.TILE_EDIT_CONNECTED; |
|
|
745 | # } |
|
|
746 | # if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 && |
|
|
747 | # arch_type == 66 || arch_type == 41 || arch_type == 95) { |
|
|
748 | # // Exit: teleporter/exit/trapdoors |
|
|
749 | # edit_type |= IGUIConstants.TILE_EDIT_EXIT; |
|
|
750 | # } |
|
|
751 | # if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 && |
|
|
752 | # getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 || |
|
|
753 | # arch_type == 5 || arch_type == 36 || arch_type == 60 || |
|
|
754 | # arch_type == 85 || arch_type == 111 || arch_type == 123 || |
|
|
755 | # arch_type == 124 || arch_type == 130)) { |
|
|
756 | # // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls |
|
|
757 | # edit_type |= IGUIConstants.TILE_EDIT_TREASURE; |
|
|
758 | # } |
|
|
759 | # if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 && |
|
|
760 | # arch_type == 20 || arch_type == 23 || arch_type == 26 || |
|
|
761 | # arch_type == 91 || arch_type == 21 || arch_type == 24) { |
|
|
762 | # // Door: door/special door/gates + keys |
|
|
763 | # edit_type |= IGUIConstants.TILE_EDIT_DOOR; |
|
|
764 | # } |
|
|
765 | # if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 && |
|
|
766 | # getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 && |
|
|
767 | # arch_type <= 16) || arch_type == 33 || arch_type == 34 || |
|
|
768 | # arch_type == 35 || arch_type == 39 || arch_type == 70 || |
|
|
769 | # arch_type == 87 || arch_type == 99 || arch_type == 100 || |
|
|
770 | # arch_type == 104 || arch_type == 109 || arch_type == 113 || |
|
|
771 | # arch_type == 122 || arch_type == 3)) { |
|
|
772 | # // Equipment: weapons/armour/wands/rods |
|
|
773 | # edit_type |= IGUIConstants.TILE_EDIT_EQUIP; |
|
|
774 | # } |
|
|
775 | # |
|
|
776 | # return(edit_type); |
|
|
777 | # |
|
|
778 | # |
|
|
779 | } |
|
|
780 | |
|
|
781 | sub cache_file($$&&) { |
838 | sub cache_file($$&&) { |
782 | my ($src, $cache, $load, $create) = @_; |
839 | my ($src, $cache, $load, $create) = @_; |
783 | |
840 | |
784 | my ($size, $mtime) = (stat $src)[7,9] |
841 | my ($size, $mtime) = (stat $src)[7,9] |
785 | or Carp::croak "$src: $!"; |
842 | or Carp::croak "$src: $!"; |