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.104 by root, Mon Apr 16 12:32:30 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
… …
68 61
69our @FIELD_ORDER = (qw( 62our @FIELD_ORDER = (qw(
70 elevation 63 elevation
71 64
72 name name_pl custom_name attach title race 65 name name_pl custom_name attach title race
73 slaying skill msg lore other_arch face 66 slaying skill msg lore other_arch
74 #todo-events
75 animation is_animated 67 face animation is_animated
68 magicmap smoothlevel smoothface
76 str dex con wis pow cha int 69 str dex con wis pow cha int
77 hp maxhp sp maxsp grace maxgrace 70 hp maxhp sp maxsp grace maxgrace
78 exp perm_exp expmul 71 exp perm_exp expmul
79 food dam luck wc ac x y speed speed_left move_state attack_movement 72 food dam luck wc ac x y speed speed_left move_state attack_movement
80 nrof level direction type subtype attacktype 73 nrof level direction type subtype attacktype
… …
136sub MOVE_FLY_HIGH (){ 0x04 } 129sub MOVE_FLY_HIGH (){ 0x04 }
137sub MOVE_FLYING (){ 0x06 } 130sub MOVE_FLYING (){ 0x06 }
138sub MOVE_SWIM (){ 0x08 } 131sub MOVE_SWIM (){ 0x08 }
139sub MOVE_BOAT (){ 0x10 } 132sub MOVE_BOAT (){ 0x10 }
140sub MOVE_KNOWN (){ 0x1f } # all of above 133sub MOVE_KNOWN (){ 0x1f } # all of above
141sub MOVE_ALLBIT (){ 0x10000 }
142sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 134sub MOVE_ALL (){ 0x10000 } # very special value
135
136our %MOVE_TYPE = (
137 walk => MOVE_WALK,
138 fly_low => MOVE_FLY_LOW,
139 fly_high => MOVE_FLY_HIGH,
140 flying => MOVE_FLYING,
141 swim => MOVE_SWIM,
142 boat => MOVE_BOAT,
143 all => MOVE_ALL,
144);
145
146our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat);
147
148{
149 package Crossfire::MoveType;
150
151 use overload
152 '=' => sub { bless [@{$_[0]}], ref $_[0] },
153 '""' => \&as_string,
154 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
155 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
156 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
157 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
158 'x=' => sub {
159 my $cur = $_[0] >= $_[1];
160 if (!defined $cur) {
161 if ($_[0] >= "all") {
162 $_[0] -= $_[1];
163 } else {
164 $_[0] += $_[1];
165 }
166 } elsif ($cur) {
167 $_[0] -= $_[1];
168 } else {
169 $_[0] /= $_[1];
170 }
171
172 $_[0]
173 },
174 'eq' => sub { "$_[0]" eq "$_[1]" },
175 'ne' => sub { "$_[0]" ne "$_[1]" },
176 ;
177}
178
179sub Crossfire::MoveType::new {
180 my ($class, $string) = @_;
181
182 my $mask;
183 my $value;
184
185 if ($string =~ /^\s*\d+\s*$/) {
186 $mask = MOVE_ALL;
187 $value = $string+0;
188 } else {
189 for (split /\s+/, lc $string) {
190 if (s/^-//) {
191 $mask |= $MOVE_TYPE{$_};
192 $value &= ~$MOVE_TYPE{$_};
193 } else {
194 $mask |= $MOVE_TYPE{$_};
195 $value |= $MOVE_TYPE{$_};
196 }
197 }
198 }
199
200 (bless [$mask, $value], $class)->normalise
201}
202
203sub Crossfire::MoveType::normalise {
204 my ($self) = @_;
205
206 if ($self->[0] & MOVE_ALL) {
207 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
208 $self->[0] &= $mask;
209 $self->[1] &= $mask;
210 }
211
212 $self->[1] &= $self->[0];
213
214 $self
215}
216
217sub Crossfire::MoveType::as_string {
218 my ($self) = @_;
219
220 my @res;
221
222 my ($mask, $value) = @$self;
223
224 for (@Crossfire::MOVE_TYPE) {
225 my $bit = $Crossfire::MOVE_TYPE{$_};
226 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
227 $mask &= ~$bit;
228 push @res, $value & $bit ? $_ : "-$_";
229 }
230 }
231
232 join " ", @res
233}
143 234
144sub load_ref($) { 235sub load_ref($) {
145 my ($path) = @_; 236 my ($path) = @_;
146 237
147 open my $fh, "<:raw:perlio", $path 238 open my $fh, "<:raw:perlio", $path
… …
197 while (my ($k, $v) = each %attack_mask) { 288 while (my ($k, $v) = each %attack_mask) {
198 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v; 289 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
199 } 290 }
200} 291}
201 292
293my %MATERIAL = reverse
294 paper => 1,
295 iron => 2,
296 glass => 4,
297 leather => 8,
298 wood => 16,
299 organic => 32,
300 stone => 64,
301 cloth => 128,
302 adamant => 256,
303 liquid => 512,
304 tin => 1024,
305 bone => 2048,
306 ice => 4096,
307
308 # guesses
309 runestone => 12,
310 bronze => 18,
311 "ancient wood" => 20,
312 glass => 36,
313 marble => 66,
314 ice => 68,
315 stone => 70,
316 stone => 80,
317 cloth => 136,
318 ironwood => 144,
319 adamantium => 258,
320 glacium => 260,
321 blood => 544,
322;
323
202# object as in "Object xxx", i.e. archetypes 324# object as in "Object xxx", i.e. archetypes
203sub normalize_object($) { 325sub normalize_object($) {
204 my ($ob) = @_; 326 my ($ob) = @_;
205 327
328 # convert material bitset to materialname, if possible
329 if (exists $ob->{material}) {
330 if (!$ob->{material}) {
331 delete $ob->{material};
332 } elsif (exists $ob->{materialname}) {
333 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
334 delete $ob->{material};
335 } else {
336 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
337 delete $ob->{material}; # assume materilname is more specific and nuke material
338 }
339 } elsif (my $name = $MATERIAL{$ob->{material}}) {
340 delete $ob->{material};
341 $ob->{materialname} = $name;
342 } else {
343 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
344 }
345 }
346
347 # color_fg is used as default for magicmap if magicmap does not exist
348 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
349
206 # nuke outdated or never supported fields 350 # nuke outdated or never supported fields
207 delete @$ob{qw( 351 delete @$ob{qw(
208 can_knockback can_parry can_impale can_cut can_dam_armour 352 can_knockback can_parry can_impale can_cut can_dam_armour
209 can_apply pass_thru can_pass_thru 353 can_apply pass_thru can_pass_thru color_bg color_fg
210 )}; 354 )};
211 355
212 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 356 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
213 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 357 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
214 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 358 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
215 359
216 # convert movement strings to bitsets 360 # convert movement strings to bitsets
217 for my $attr (keys %FIELD_MOVEMENT) { 361 for my $attr (keys %FIELD_MOVEMENT) {
218 next unless exists $ob->{$attr}; 362 next unless exists $ob->{$attr};
219 363
220 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 364 $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 } 365 }
247 366
248 # convert outdated movement flags to new movement sets 367 # convert outdated movement flags to new movement sets
249 if (defined (my $v = delete $ob->{no_pass})) { 368 if (defined (my $v = delete $ob->{no_pass})) {
250 $ob->{move_block} = $v ? MOVE_ALL : 0; 369 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
251 } 370 }
252 if (defined (my $v = delete $ob->{slow_move})) { 371 if (defined (my $v = delete $ob->{slow_move})) {
253 $ob->{move_slow} |= MOVE_WALK; 372 $ob->{move_slow} += "walk";
254 $ob->{move_slow_penalty} = $v; 373 $ob->{move_slow_penalty} = $v;
255 } 374 }
256 if (defined (my $v = delete $ob->{walk_on})) { 375 if (defined (my $v = delete $ob->{walk_on})) {
257 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 376 $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 } 377 }
261 if (defined (my $v = delete $ob->{walk_off})) { 378 if (defined (my $v = delete $ob->{walk_off})) {
262 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 379 $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 } 380 }
266 if (defined (my $v = delete $ob->{fly_on})) { 381 if (defined (my $v = delete $ob->{fly_on})) {
267 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 382 $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 } 383 }
271 if (defined (my $v = delete $ob->{fly_off})) { 384 if (defined (my $v = delete $ob->{fly_off})) {
272 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 385 $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 } 386 }
276 if (defined (my $v = delete $ob->{flying})) { 387 if (defined (my $v = delete $ob->{flying})) {
277 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 388 $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 } 389 }
281 390
282 # convert idiotic event_xxx things into objects 391 # convert idiotic event_xxx things into objects
283 while (my ($event, $subtype) = each %EVENT_TYPE) { 392 while (my ($event, $subtype) = each %EVENT_TYPE) {
284 if (exists $ob->{"event_${event}_plugin"}) { 393 if (exists $ob->{"event_${event}_plugin"}) {
… …
382sub read_arch($;$) { 491sub read_arch($;$) {
383 my ($path, $toplevel) = @_; 492 my ($path, $toplevel) = @_;
384 493
385 my %arc; 494 my %arc;
386 my ($more, $prev); 495 my ($more, $prev);
496 my $comment;
387 497
388 open my $fh, "<:raw:perlio:utf8", $path 498 open my $fh, "<:raw:perlio:utf8", $path
389 or Carp::croak "$path: $!"; 499 or Carp::croak "$path: $!";
390 500
391# binmode $fh; 501# binmode $fh;
… …
395 505
396 while (<$fh>) { 506 while (<$fh>) {
397 s/\s+$//; 507 s/\s+$//;
398 if (/^end$/i) { 508 if (/^end$/i) {
399 last; 509 last;
510
400 } elsif (/^arch (\S+)$/i) { 511 } elsif (/^arch (\S+)$/i) {
401 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 512 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
513
402 } elsif (/^lore$/i) { 514 } elsif (/^lore$/i) {
403 while (<$fh>) { 515 while (<$fh>) {
404 last if /^endlore\s*$/i; 516 last if /^endlore\s*$/i;
405 $arc{lore} .= $_; 517 $arc{lore} .= $_;
406 } 518 }
… …
415 chomp; 527 chomp;
416 push @{ $arc{anim} }, $_; 528 push @{ $arc{anim} }, $_;
417 } 529 }
418 } elsif (/^(\S+)\s*(.*)$/) { 530 } elsif (/^(\S+)\s*(.*)$/) {
419 $arc{lc $1} = $2; 531 $arc{lc $1} = $2;
420 } elsif (/^\s*($|#)/) { 532 } elsif (/^\s*#/) {
533 $arc{_comment} .= "$_\n";
534
535 } elsif (/^\s*$/) {
421 # 536 #
422 } else { 537 } else {
423 warn "$path: unparsable line '$_' in arch $arc{_name}"; 538 warn "$path: unparsable line '$_' in arch $arc{_name}";
424 } 539 }
425 } 540 }
… …
431 s/\s+$//; 546 s/\s+$//;
432 if (/^more$/i) { 547 if (/^more$/i) {
433 $more = $prev; 548 $more = $prev;
434 } elsif (/^object (\S+)$/i) { 549 } elsif (/^object (\S+)$/i) {
435 my $name = $1; 550 my $name = $1;
436 my $arc = attr_thaw normalize_object $parse_block->(_name => $name); 551 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
552 undef $comment;
553 delete $arc{_comment} unless length $arc{_comment};
437 $arc->{_atype} = 'object'; 554 $arc->{_atype} = 'object';
438 555
439 if ($more) { 556 if ($more) {
440 $more->{more} = $arc; 557 $more->{more} = $arc;
441 } else { 558 } else {
… …
443 } 560 }
444 $prev = $arc; 561 $prev = $arc;
445 $more = undef; 562 $more = undef;
446 } elsif (/^arch (\S+)$/i) { 563 } elsif (/^arch (\S+)$/i) {
447 my $name = $1; 564 my $name = $1;
448 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 565 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
566 undef $comment;
567 delete $arc{_comment} unless length $arc{_comment};
449 $arc->{_atype} = 'arch'; 568 $arc->{_atype} = 'arch';
450 569
451 if ($more) { 570 if ($more) {
452 $more->{more} = $arc; 571 $more->{more} = $arc;
453 } else { 572 } else {
… …
462 push @{$toplevel->{lev_array}}, $_+0; 581 push @{$toplevel->{lev_array}}, $_+0;
463 } 582 }
464 } else { 583 } else {
465 $toplevel->{$1} = $2; 584 $toplevel->{$1} = $2;
466 } 585 }
586 } elsif (/^\s*#/) {
587 $comment .= "$_\n";
467 } elsif (/^\s*($|#)/) { 588 } elsif (/^\s*($|#)/) {
468 # 589 #
469 } else { 590 } else {
470 die "$path: unparseable top-level line '$_'"; 591 die "$path: unparseable top-level line '$_'";
471 } 592 }
… …
491 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 612 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}) 613 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
493 | (delete $a{attack_movement_bits_4_7}); 614 | (delete $a{attack_movement_bits_4_7});
494 } 615 }
495 616
617 if (my $comment = delete $a{_comment}) {
618 if ($comment =~ /[^\n\s#]/) {
619 $str .= $comment;
620 }
621 }
622
496 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 623 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
497 624
498 my $inv = delete $a{inventory}; 625 my $inv = delete $a{inventory};
499 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 626 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
500 my $anim = delete $a{anim}; 627 my $anim = delete $a{anim};
628
629 if ($a{_atype} eq 'object') {
630 $str .= join "\n", "anim", @$anim, "mina\n"
631 if $anim;
632 }
501 633
502 my @kv; 634 my @kv;
503 635
504 for ($a{_name} eq "map" 636 for ($a{_name} eq "map"
505 ? @Crossfire::FIELD_ORDER_MAP 637 ? @Crossfire::FIELD_ORDER_MAP
… …
517 my ($k, $v) = @$_; 649 my ($k, $v) = @$_;
518 650
519 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 651 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
520 $v =~ s/\n$//; 652 $v =~ s/\n$//;
521 $str .= "$k\n$v\n$end\n"; 653 $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 { 654 } else {
549 $str .= "$k $v\n"; 655 $str .= "$k $v\n";
550 } 656 }
551 } 657 }
552 658
553 if ($inv) { 659 if ($inv) {
554 $append->($_) for @$inv; 660 $append->($_) for @$inv;
555 } 661 }
556 662
663 $str .= "end\n";
664
557 if ($a{_atype} eq 'object') { 665 if ($a{_atype} eq 'object') {
558 $str .= join "\n", "anim", @$anim, "mina\n" 666 if ($more) {
559 if $anim;
560 }
561
562 $str .= "end\n";
563
564 if (($a{_atype} eq 'object') && $more) {
565 $str .= "\nmore\n"; 667 $str .= "more\n";
566 $append->($more) if $more; 668 $append->($more) if $more;
669 } else {
670 $str .= "\n";
671 }
567 } 672 }
568 }; 673 };
569 674
570 for (@$arch) { 675 for (@$arch) {
571 $append->($_); 676 $append->($_);
… …
600 my ($a) = @_; 705 my ($a) = @_;
601 706
602 my $o = $ARCH{$a->{_name}} 707 my $o = $ARCH{$a->{_name}}
603 or return; 708 or return;
604 709
605 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 710 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
711 unless ($face) {
712 $face = $FACE{"blank.x11"}
606 or (warn "no face data found for arch '$a->{_name}'"), return; 713 or (warn "no face data found for arch '$a->{_name}'"), return;
714 }
607 715
608 if ($face->{w} > 1 || $face->{h} > 1) { 716 if ($face->{w} > 1 || $face->{h} > 1) {
609 # bigface 717 # bigface
610 return (0, 0, $face->{w} - 1, $face->{h} - 1); 718 return (0, 0, $face->{w} - 1, $face->{h} - 1);
611 719
… …
718 ]; 826 ];
719 827
720 $attr 828 $attr
721} 829}
722 830
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($$&&) { 831sub cache_file($$&&) {
785 my ($src, $cache, $load, $create) = @_; 832 my ($src, $cache, $load, $create) = @_;
786 833
787 my ($size, $mtime) = (stat $src)[7,9] 834 my ($size, $mtime) = (stat $src)[7,9]
788 or Carp::croak "$src: $!"; 835 or Carp::croak "$src: $!";
… …
836 }, sub { 883 }, sub {
837 read_arch "$LIB/archetypes" 884 read_arch "$LIB/archetypes"
838 }; 885 };
839} 886}
840 887
888sub construct_tilecache_pb {
889 my ($idx, $cache) = @_;
890
891 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
892
893 while (my ($name, $tile) = each %$cache) {
894 my $tpb = delete $tile->{pb};
895 my $ofs = $tile->{idx};
896
897 for my $x (0 .. $tile->{w} - 1) {
898 for my $y (0 .. $tile->{h} - 1) {
899 my $idx = $ofs + $x + $y * $tile->{w};
900 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
901 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
902 }
903 }
904 }
905
906 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
907
908 $cache
909}
910
911sub use_tilecache {
912 my ($face) = @_;
913 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
914 or die "$VARDIR/tilecache.png: $!";
915 *FACE = $_[0];
916}
917
841=item load_tilecache 918=item load_tilecache
842 919
843(Re-)Load %TILE and %FACE. 920(Re-)Load %TILE and %FACE.
844 921
845=cut 922=cut
846 923
847sub load_tilecache() { 924sub load_tilecache() {
848 require Gtk2; 925 require Gtk2;
849 926
927 if (-e "$LIB/crossfire.0") { # Crossfire1 version
850 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 928 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
851 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 929 sub {
852 or die "$VARDIR/tilecache.png: $!";
853 *FACE = $_[0];
854 }, sub {
855 my $tile = read_pak "$LIB/crossfire.0"; 930 my $tile = read_pak "$LIB/crossfire.0";
856 931
857 my %cache; 932 my %cache;
858 933
859 my $idx = 0; 934 my $idx = 0;
860 935
861 for my $name (sort keys %$tile) { 936 for my $name (sort keys %$tile) {
862 my $pb = new Gtk2::Gdk::PixbufLoader; 937 my $pb = new Gtk2::Gdk::PixbufLoader;
863 $pb->write ($tile->{$name}); 938 $pb->write ($tile->{$name});
864 $pb->close; 939 $pb->close;
865 my $pb = $pb->get_pixbuf; 940 my $pb = $pb->get_pixbuf;
866 941
867 my $tile = $cache{$name} = { 942 my $tile = $cache{$name} = {
868 pb => $pb, 943 pb => $pb,
869 idx => $idx, 944 idx => $idx,
870 w => int $pb->get_width / TILESIZE, 945 w => int $pb->get_width / TILESIZE,
871 h => int $pb->get_height / TILESIZE, 946 h => int $pb->get_height / TILESIZE,
947 };
948
949 $idx += $tile->{w} * $tile->{h};
950 }
951
952 construct_tilecache_pb $idx, \%cache;
953
954 \%cache
872 }; 955 };
956
957 } else { # Crossfire+ version
958 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
959 sub {
960 my %cache;
961 my $facedata = Storable::retrieve "$LIB/facedata";
962
963 $facedata->{version} == 2
964 or die "$LIB/facedata: version mismatch, cannot proceed.";
965
966 my $faces = $facedata->{faceinfo};
967 my $idx = 0;
968
969 for (sort keys %$faces) {
970 my ($face, $info) = ($_, $faces->{$_});
971
972 my $pb = new Gtk2::Gdk::PixbufLoader;
973 $pb->write ($info->{data32});
974 $pb->close;
975 my $pb = $pb->get_pixbuf;
976
977 my $tile = $cache{$face} = {
978 pb => $pb,
979 idx => $idx,
980 w => int $pb->get_width / TILESIZE,
981 h => int $pb->get_height / TILESIZE,
873 982 };
874 983
875 $idx += $tile->{w} * $tile->{h}; 984 $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 } 985 }
986
987 construct_tilecache_pb $idx, \%cache;
988
989 \%cache
890 } 990 };
891 }
892
893 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
894
895 \%cache
896 }; 991 }
897} 992}
898 993
899=head1 AUTHOR 994=head1 AUTHOR
900 995
901 Marc Lehmann <schmorp@schmorp.de> 996 Marc Lehmann <schmorp@schmorp.de>

Diff Legend

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