ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra/Deliantra.pm
(Generate patch)

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.74 by root, Wed Sep 20 15:38:21 2006 UTC vs.
Revision 1.106 by root, Mon Apr 23 19:09:48 2007 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.91'; 9our $VERSION = '0.98';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
19 19
20our @EXPORT = qw( 20our @EXPORT = qw(
21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents 21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents
22); 22);
23 23
24use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working 24use JSON::XS qw(from_json to_json);
25
26sub from_json($) {
27 $JSON::Syck::ImplicitUnicode = 1;
28 JSON::Syck::Load $_[0]
29}
30
31sub to_json($) {
32 $JSON::Syck::ImplicitUnicode = 0;
33 JSON::Syck::Dump $_[0]
34}
35 25
36our $LIB = $ENV{CROSSFIRE_LIBDIR}; 26our $LIB = $ENV{CROSSFIRE_LIBDIR};
37 27
38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; 28our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire"
29 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
30 : File::Spec->tmpdir . "/crossfire";
39 31
40mkdir $VARDIR, 0777; 32mkdir $VARDIR, 0777;
41 33
42sub TILESIZE (){ 32 } 34sub TILESIZE (){ 32 }
43 35
… …
56 qw(move_type move_block move_allow move_on move_off move_slow); 48 qw(move_type move_block move_allow move_on move_off move_slow);
57 49
58# same as in server save routine, to (hopefully) be compatible 50# same as in server save routine, to (hopefully) be compatible
59# to the other editors. 51# to the other editors.
60our @FIELD_ORDER_MAP = (qw( 52our @FIELD_ORDER_MAP = (qw(
53 file_format_version
61 name attach swap_time reset_timeout fixed_resettime difficulty region 54 name attach swap_time reset_timeout fixed_resettime difficulty region
62 shopitems shopgreed shopmin shopmax shoprace 55 shopitems shopgreed shopmin shopmax shoprace
63 darkness width height enter_x enter_y msg maplore 56 darkness width height enter_x enter_y msg maplore
64 unique template 57 unique template
65 outdoor temp pressure humid windspeed winddir sky nosmooth 58 outdoor temp pressure humid windspeed winddir sky nosmooth
66 tile_path_1 tile_path_2 tile_path_3 tile_path_4 59 tile_path_1 tile_path_2 tile_path_3 tile_path_4
67)); 60));
68 61
69our @FIELD_ORDER = (qw( 62our @FIELD_ORDER = (qw(
63 inherit
64
70 elevation 65 elevation
71 66
72 name name_pl custom_name attach title race 67 name name_pl custom_name attach title race
73 slaying skill msg lore other_arch face 68 slaying skill msg lore other_arch
74 #todo-events
75 animation is_animated 69 face animation is_animated
70 magicmap smoothlevel smoothface
76 str dex con wis pow cha int 71 str dex con wis pow cha int
77 hp maxhp sp maxsp grace maxgrace 72 hp maxhp sp maxsp grace maxgrace
78 exp perm_exp expmul 73 exp perm_exp expmul
79 food dam luck wc ac x y speed speed_left move_state attack_movement 74 food dam luck wc ac x y speed speed_left move_state attack_movement
80 nrof level direction type subtype attacktype 75 nrof level direction type subtype attacktype
… …
135sub MOVE_FLY_LOW (){ 0x02 } 130sub MOVE_FLY_LOW (){ 0x02 }
136sub MOVE_FLY_HIGH (){ 0x04 } 131sub MOVE_FLY_HIGH (){ 0x04 }
137sub MOVE_FLYING (){ 0x06 } 132sub MOVE_FLYING (){ 0x06 }
138sub MOVE_SWIM (){ 0x08 } 133sub MOVE_SWIM (){ 0x08 }
139sub MOVE_BOAT (){ 0x10 } 134sub MOVE_BOAT (){ 0x10 }
135sub MOVE_SHIP (){ 0x20 }
140sub MOVE_KNOWN (){ 0x1f } # all of above 136sub MOVE_KNOWN (){ 0x3f } # all of above
141sub MOVE_ALLBIT (){ 0x10000 }
142sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 137sub MOVE_ALL (){ 0x10000 } # very special value
138
139our %MOVE_TYPE = (
140 walk => MOVE_WALK,
141 fly_low => MOVE_FLY_LOW,
142 fly_high => MOVE_FLY_HIGH,
143 flying => MOVE_FLYING,
144 swim => MOVE_SWIM,
145 boat => MOVE_BOAT,
146 ship => MOVE_SHIP,
147 all => MOVE_ALL,
148);
149
150our @MOVE_TYPE = keys %MOVE_TYPE;
151
152{
153 package Crossfire::MoveType;
154
155 use overload
156 '=' => sub { bless [@{$_[0]}], ref $_[0] },
157 '""' => \&as_string,
158 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
159 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
160 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
161 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
162 'x=' => sub {
163 my $cur = $_[0] >= $_[1];
164 if (!defined $cur) {
165 if ($_[0] >= "all") {
166 $_[0] -= $_[1];
167 } else {
168 $_[0] += $_[1];
169 }
170 } elsif ($cur) {
171 $_[0] -= $_[1];
172 } else {
173 $_[0] /= $_[1];
174 }
175
176 $_[0]
177 },
178 'eq' => sub { "$_[0]" eq "$_[1]" },
179 'ne' => sub { "$_[0]" ne "$_[1]" },
180 ;
181}
182
183sub Crossfire::MoveType::new {
184 my ($class, $string) = @_;
185
186 my $mask;
187 my $value;
188
189 if ($string =~ /^\s*\d+\s*$/) {
190 $mask = MOVE_ALL;
191 $value = $string+0;
192 } else {
193 for (split /\s+/, lc $string) {
194 if (s/^-//) {
195 $mask |= $MOVE_TYPE{$_};
196 $value &= ~$MOVE_TYPE{$_};
197 } else {
198 $mask |= $MOVE_TYPE{$_};
199 $value |= $MOVE_TYPE{$_};
200 }
201 }
202 }
203
204 (bless [$mask, $value], $class)->normalise
205}
206
207sub Crossfire::MoveType::normalise {
208 my ($self) = @_;
209
210 if ($self->[0] & MOVE_ALL) {
211 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
212 $self->[0] &= $mask;
213 $self->[1] &= $mask;
214 }
215
216 $self->[1] &= $self->[0];
217
218 $self
219}
220
221sub Crossfire::MoveType::as_string {
222 my ($self) = @_;
223
224 my @res;
225
226 my ($mask, $value) = @$self;
227
228 for (@Crossfire::MOVE_TYPE) {
229 my $bit = $Crossfire::MOVE_TYPE{$_};
230 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
231 $mask &= ~$bit;
232 push @res, $value & $bit ? $_ : "-$_";
233 }
234 }
235
236 join " ", @res
237}
143 238
144sub load_ref($) { 239sub load_ref($) {
145 my ($path) = @_; 240 my ($path) = @_;
146 241
147 open my $fh, "<:raw:perlio", $path 242 open my $fh, "<:raw:perlio", $path
… …
197 while (my ($k, $v) = each %attack_mask) { 292 while (my ($k, $v) = each %attack_mask) {
198 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v; 293 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
199 } 294 }
200} 295}
201 296
297my %MATERIAL = reverse
298 paper => 1,
299 iron => 2,
300 glass => 4,
301 leather => 8,
302 wood => 16,
303 organic => 32,
304 stone => 64,
305 cloth => 128,
306 adamant => 256,
307 liquid => 512,
308 tin => 1024,
309 bone => 2048,
310 ice => 4096,
311
312 # guesses
313 runestone => 12,
314 bronze => 18,
315 "ancient wood" => 20,
316 glass => 36,
317 marble => 66,
318 ice => 68,
319 stone => 70,
320 stone => 80,
321 cloth => 136,
322 ironwood => 144,
323 adamantium => 258,
324 glacium => 260,
325 blood => 544,
326;
327
202# object as in "Object xxx", i.e. archetypes 328# object as in "Object xxx", i.e. archetypes
203sub normalize_object($) { 329sub normalize_object($) {
204 my ($ob) = @_; 330 my ($ob) = @_;
205 331
332 # convert material bitset to materialname, if possible
333 if (exists $ob->{material}) {
334 if (!$ob->{material}) {
335 delete $ob->{material};
336 } elsif (exists $ob->{materialname}) {
337 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
338 delete $ob->{material};
339 } else {
340 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
341 delete $ob->{material}; # assume materilname is more specific and nuke material
342 }
343 } elsif (my $name = $MATERIAL{$ob->{material}}) {
344 delete $ob->{material};
345 $ob->{materialname} = $name;
346 } else {
347 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
348 }
349 }
350
351 # color_fg is used as default for magicmap if magicmap does not exist
352 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
353
206 # nuke outdated or never supported fields 354 # nuke outdated or never supported fields
207 delete @$ob{qw( 355 delete @$ob{qw(
208 can_knockback can_parry can_impale can_cut can_dam_armour 356 can_knockback can_parry can_impale can_cut can_dam_armour
209 can_apply pass_thru can_pass_thru 357 can_apply pass_thru can_pass_thru color_bg color_fg
210 )}; 358 )};
211 359
212 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 360 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
213 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 361 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
214 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 362 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
215 363
216 # convert movement strings to bitsets 364 # convert movement strings to bitsets
217 for my $attr (keys %FIELD_MOVEMENT) { 365 for my $attr (keys %FIELD_MOVEMENT) {
218 next unless exists $ob->{$attr}; 366 next unless exists $ob->{$attr};
219 367
220 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 368 $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 } 369 }
247 370
248 # convert outdated movement flags to new movement sets 371 # convert outdated movement flags to new movement sets
249 if (defined (my $v = delete $ob->{no_pass})) { 372 if (defined (my $v = delete $ob->{no_pass})) {
250 $ob->{move_block} = $v ? MOVE_ALL : 0; 373 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
251 } 374 }
252 if (defined (my $v = delete $ob->{slow_move})) { 375 if (defined (my $v = delete $ob->{slow_move})) {
253 $ob->{move_slow} |= MOVE_WALK; 376 $ob->{move_slow} += "walk";
254 $ob->{move_slow_penalty} = $v; 377 $ob->{move_slow_penalty} = $v;
255 } 378 }
256 if (defined (my $v = delete $ob->{walk_on})) { 379 if (defined (my $v = delete $ob->{walk_on})) {
257 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 380 $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 } 381 }
261 if (defined (my $v = delete $ob->{walk_off})) { 382 if (defined (my $v = delete $ob->{walk_off})) {
262 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 383 $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 } 384 }
266 if (defined (my $v = delete $ob->{fly_on})) { 385 if (defined (my $v = delete $ob->{fly_on})) {
267 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 386 $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 } 387 }
271 if (defined (my $v = delete $ob->{fly_off})) { 388 if (defined (my $v = delete $ob->{fly_off})) {
272 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 389 $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 } 390 }
276 if (defined (my $v = delete $ob->{flying})) { 391 if (defined (my $v = delete $ob->{flying})) {
277 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 392 $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 } 393 }
281 394
282 # convert idiotic event_xxx things into objects 395 # convert idiotic event_xxx things into objects
283 while (my ($event, $subtype) = each %EVENT_TYPE) { 396 while (my ($event, $subtype) = each %EVENT_TYPE) {
284 if (exists $ob->{"event_${event}_plugin"}) { 397 if (exists $ob->{"event_${event}_plugin"}) {
… …
382sub read_arch($;$) { 495sub read_arch($;$) {
383 my ($path, $toplevel) = @_; 496 my ($path, $toplevel) = @_;
384 497
385 my %arc; 498 my %arc;
386 my ($more, $prev); 499 my ($more, $prev);
500 my $comment;
387 501
388 open my $fh, "<:raw:perlio:utf8", $path 502 open my $fh, "<:raw:perlio:utf8", $path
389 or Carp::croak "$path: $!"; 503 or Carp::croak "$path: $!";
390 504
391# binmode $fh; 505# binmode $fh;
… …
395 509
396 while (<$fh>) { 510 while (<$fh>) {
397 s/\s+$//; 511 s/\s+$//;
398 if (/^end$/i) { 512 if (/^end$/i) {
399 last; 513 last;
514
400 } elsif (/^arch (\S+)$/i) { 515 } elsif (/^arch (\S+)$/i) {
401 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 516 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
517
402 } elsif (/^lore$/i) { 518 } elsif (/^lore$/i) {
403 while (<$fh>) { 519 while (<$fh>) {
404 last if /^endlore\s*$/i; 520 last if /^endlore\s*$/i;
405 $arc{lore} .= $_; 521 $arc{lore} .= $_;
406 } 522 }
… …
415 chomp; 531 chomp;
416 push @{ $arc{anim} }, $_; 532 push @{ $arc{anim} }, $_;
417 } 533 }
418 } elsif (/^(\S+)\s*(.*)$/) { 534 } elsif (/^(\S+)\s*(.*)$/) {
419 $arc{lc $1} = $2; 535 $arc{lc $1} = $2;
420 } elsif (/^\s*($|#)/) { 536 } elsif (/^\s*#/) {
537 $arc{_comment} .= "$_\n";
538
539 } elsif (/^\s*$/) {
421 # 540 #
422 } else { 541 } else {
423 warn "$path: unparsable line '$_' in arch $arc{_name}"; 542 warn "$path: unparsable line '$_' in arch $arc{_name}";
424 } 543 }
425 } 544 }
… …
431 s/\s+$//; 550 s/\s+$//;
432 if (/^more$/i) { 551 if (/^more$/i) {
433 $more = $prev; 552 $more = $prev;
434 } elsif (/^object (\S+)$/i) { 553 } elsif (/^object (\S+)$/i) {
435 my $name = $1; 554 my $name = $1;
436 my $arc = attr_thaw normalize_object $parse_block->(_name => $name); 555 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
556 undef $comment;
557 delete $arc{_comment} unless length $arc{_comment};
437 $arc->{_atype} = 'object'; 558 $arc->{_atype} = 'object';
438 559
439 if ($more) { 560 if ($more) {
440 $more->{more} = $arc; 561 $more->{more} = $arc;
441 } else { 562 } else {
… …
443 } 564 }
444 $prev = $arc; 565 $prev = $arc;
445 $more = undef; 566 $more = undef;
446 } elsif (/^arch (\S+)$/i) { 567 } elsif (/^arch (\S+)$/i) {
447 my $name = $1; 568 my $name = $1;
448 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 569 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
570 undef $comment;
571 delete $arc{_comment} unless length $arc{_comment};
449 $arc->{_atype} = 'arch'; 572 $arc->{_atype} = 'arch';
450 573
451 if ($more) { 574 if ($more) {
452 $more->{more} = $arc; 575 $more->{more} = $arc;
453 } else { 576 } else {
… …
462 push @{$toplevel->{lev_array}}, $_+0; 585 push @{$toplevel->{lev_array}}, $_+0;
463 } 586 }
464 } else { 587 } else {
465 $toplevel->{$1} = $2; 588 $toplevel->{$1} = $2;
466 } 589 }
590 } elsif (/^\s*#/) {
591 $comment .= "$_\n";
467 } elsif (/^\s*($|#)/) { 592 } elsif (/^\s*($|#)/) {
468 # 593 #
469 } else { 594 } else {
470 die "$path: unparseable top-level line '$_'"; 595 die "$path: unparseable top-level line '$_'";
471 } 596 }
… …
491 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 616 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
492 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 617 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
493 | (delete $a{attack_movement_bits_4_7}); 618 | (delete $a{attack_movement_bits_4_7});
494 } 619 }
495 620
621 if (my $comment = delete $a{_comment}) {
622 if ($comment =~ /[^\n\s#]/) {
623 $str .= $comment;
624 }
625 }
626
496 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 627 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
497 628
498 my $inv = delete $a{inventory}; 629 my $inv = delete $a{inventory};
499 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 630 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
500 my $anim = delete $a{anim}; 631 my $anim = delete $a{anim};
632
633 if ($a{_atype} eq 'object') {
634 $str .= join "\n", "anim", @$anim, "mina\n"
635 if $anim;
636 }
501 637
502 my @kv; 638 my @kv;
503 639
504 for ($a{_name} eq "map" 640 for ($a{_name} eq "map"
505 ? @Crossfire::FIELD_ORDER_MAP 641 ? @Crossfire::FIELD_ORDER_MAP
… …
517 my ($k, $v) = @$_; 653 my ($k, $v) = @$_;
518 654
519 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 655 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
520 $v =~ s/\n$//; 656 $v =~ s/\n$//;
521 $str .= "$k\n$v\n$end\n"; 657 $str .= "$k\n$v\n$end\n";
522 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
523 if ($v & ~Crossfire::MOVE_ALL or !$v) {
524 $str .= "$k $v\n";
525
526 } elsif ($v & Crossfire::MOVE_ALLBIT) {
527 $str .= "$k all";
528
529 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
530 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
531 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
532 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
533 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
534
535 $str .= "\n";
536
537 } else {
538 $str .= $k;
539
540 $str .= " walk" if $v & Crossfire::MOVE_WALK;
541 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
542 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
543 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
544 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
545
546 $str .= "\n";
547 }
548 } else { 658 } else {
549 $str .= "$k $v\n"; 659 $str .= "$k $v\n";
550 } 660 }
551 } 661 }
552 662
553 if ($inv) { 663 if ($inv) {
554 $append->($_) for @$inv; 664 $append->($_) for @$inv;
555 } 665 }
556 666
667 $str .= "end\n";
668
557 if ($a{_atype} eq 'object') { 669 if ($a{_atype} eq 'object') {
558 $str .= join "\n", "anim", @$anim, "mina\n" 670 if ($more) {
559 if $anim;
560 }
561
562 $str .= "end\n";
563
564 if (($a{_atype} eq 'object') && $more) {
565 $str .= "\nmore\n"; 671 $str .= "more\n";
566 $append->($more) if $more; 672 $append->($more) if $more;
673 } else {
674 $str .= "\n";
675 }
567 } 676 }
568 }; 677 };
569 678
570 for (@$arch) { 679 for (@$arch) {
571 $append->($_); 680 $append->($_);
… …
600 my ($a) = @_; 709 my ($a) = @_;
601 710
602 my $o = $ARCH{$a->{_name}} 711 my $o = $ARCH{$a->{_name}}
603 or return; 712 or return;
604 713
605 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 714 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
715 unless ($face) {
716 $face = $FACE{"blank.x11"}
606 or (warn "no face data found for arch '$a->{_name}'"), return; 717 or (warn "no face data found for arch '$a->{_name}'"), return;
718 }
607 719
608 if ($face->{w} > 1 || $face->{h} > 1) { 720 if ($face->{w} > 1 || $face->{h} > 1) {
609 # bigface 721 # bigface
610 return (0, 0, $face->{w} - 1, $face->{h} - 1); 722 return (0, 0, $face->{w} - 1, $face->{h} - 1);
611 723
… …
718 ]; 830 ];
719 831
720 $attr 832 $attr
721} 833}
722 834
723sub arch_edit_sections {
724# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
725# edit_type = 0;
726# else if (edit_type != 0) {
727# // all flags from 'check_type' must be unset in this arch because they get recalculated now
728# edit_type &= ~check_type;
729# }
730#
731# }
732# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
733# getAttributeValue("alive", defarch) == 1 &&
734# (getAttributeValue("monster", defarch) == 1 ||
735# getAttributeValue("generator", defarch) == 1)) {
736# // Monster: monsters/npcs/generators
737# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
738# }
739# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
740# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
741# // Walls
742# edit_type |= IGUIConstants.TILE_EDIT_WALL;
743# }
744# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
745# getAttributeValue("connected", defarch) != 0) {
746# // Connected Objects
747# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
748# }
749# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
750# arch_type == 66 || arch_type == 41 || arch_type == 95) {
751# // Exit: teleporter/exit/trapdoors
752# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
753# }
754# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
755# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
756# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
757# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
758# arch_type == 124 || arch_type == 130)) {
759# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
760# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
761# }
762# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
763# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
764# arch_type == 91 || arch_type == 21 || arch_type == 24) {
765# // Door: door/special door/gates + keys
766# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
767# }
768# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
769# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
770# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
771# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
772# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
773# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
774# arch_type == 122 || arch_type == 3)) {
775# // Equipment: weapons/armour/wands/rods
776# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
777# }
778#
779# return(edit_type);
780#
781#
782}
783
784sub cache_file($$&&) { 835sub cache_file($$&&) {
785 my ($src, $cache, $load, $create) = @_; 836 my ($src, $cache, $load, $create) = @_;
786 837
787 my ($size, $mtime) = (stat $src)[7,9] 838 my ($size, $mtime) = (stat $src)[7,9]
788 or Carp::croak "$src: $!"; 839 or Carp::croak "$src: $!";
… …
836 }, sub { 887 }, sub {
837 read_arch "$LIB/archetypes" 888 read_arch "$LIB/archetypes"
838 }; 889 };
839} 890}
840 891
892sub construct_tilecache_pb {
893 my ($idx, $cache) = @_;
894
895 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
896
897 while (my ($name, $tile) = each %$cache) {
898 my $tpb = delete $tile->{pb};
899 my $ofs = $tile->{idx};
900
901 for my $x (0 .. $tile->{w} - 1) {
902 for my $y (0 .. $tile->{h} - 1) {
903 my $idx = $ofs + $x + $y * $tile->{w};
904 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
905 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
906 }
907 }
908 }
909
910 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
911
912 $cache
913}
914
915sub use_tilecache {
916 my ($face) = @_;
917 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
918 or die "$VARDIR/tilecache.png: $!";
919 *FACE = $_[0];
920}
921
841=item load_tilecache 922=item load_tilecache
842 923
843(Re-)Load %TILE and %FACE. 924(Re-)Load %TILE and %FACE.
844 925
845=cut 926=cut
846 927
847sub load_tilecache() { 928sub load_tilecache() {
848 require Gtk2; 929 require Gtk2;
849 930
931 if (-e "$LIB/crossfire.0") { # Crossfire1 version
850 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 932 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
851 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 933 sub {
852 or die "$VARDIR/tilecache.png: $!";
853 *FACE = $_[0];
854 }, sub {
855 my $tile = read_pak "$LIB/crossfire.0"; 934 my $tile = read_pak "$LIB/crossfire.0";
856 935
857 my %cache; 936 my %cache;
858 937
859 my $idx = 0; 938 my $idx = 0;
860 939
861 for my $name (sort keys %$tile) { 940 for my $name (sort keys %$tile) {
862 my $pb = new Gtk2::Gdk::PixbufLoader; 941 my $pb = new Gtk2::Gdk::PixbufLoader;
863 $pb->write ($tile->{$name}); 942 $pb->write ($tile->{$name});
864 $pb->close; 943 $pb->close;
865 my $pb = $pb->get_pixbuf; 944 my $pb = $pb->get_pixbuf;
866 945
867 my $tile = $cache{$name} = { 946 my $tile = $cache{$name} = {
868 pb => $pb, 947 pb => $pb,
869 idx => $idx, 948 idx => $idx,
870 w => int $pb->get_width / TILESIZE, 949 w => int $pb->get_width / TILESIZE,
871 h => int $pb->get_height / TILESIZE, 950 h => int $pb->get_height / TILESIZE,
951 };
952
953 $idx += $tile->{w} * $tile->{h};
954 }
955
956 construct_tilecache_pb $idx, \%cache;
957
958 \%cache
872 }; 959 };
960
961 } else { # Crossfire+ version
962 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
963 sub {
964 my %cache;
965 my $facedata = Storable::retrieve "$LIB/facedata";
966
967 $facedata->{version} == 2
968 or die "$LIB/facedata: version mismatch, cannot proceed.";
969
970 my $faces = $facedata->{faceinfo};
971 my $idx = 0;
972
973 for (sort keys %$faces) {
974 my ($face, $info) = ($_, $faces->{$_});
975
976 my $pb = new Gtk2::Gdk::PixbufLoader;
977 $pb->write ($info->{data32});
978 $pb->close;
979 my $pb = $pb->get_pixbuf;
980
981 my $tile = $cache{$face} = {
982 pb => $pb,
983 idx => $idx,
984 w => int $pb->get_width / TILESIZE,
985 h => int $pb->get_height / TILESIZE,
873 986 };
874 987
875 $idx += $tile->{w} * $tile->{h}; 988 $idx += $tile->{w} * $tile->{h};
876 }
877
878 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
879
880 while (my ($name, $tile) = each %cache) {
881 my $tpb = delete $tile->{pb};
882 my $ofs = $tile->{idx};
883
884 for my $x (0 .. $tile->{w} - 1) {
885 for my $y (0 .. $tile->{h} - 1) {
886 my $idx = $ofs + $x + $y * $tile->{w};
887 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
888 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
889 } 989 }
990
991 construct_tilecache_pb $idx, \%cache;
992
993 \%cache
890 } 994 };
891 }
892
893 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
894
895 \%cache
896 }; 995 }
897} 996}
898 997
899=head1 AUTHOR 998=head1 AUTHOR
900 999
901 Marc Lehmann <schmorp@schmorp.de> 1000 Marc Lehmann <schmorp@schmorp.de>

Diff Legend

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