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.79 by elmex, Fri Jan 5 14:17:49 2007 UTC vs.
Revision 1.105 by root, Tue Apr 17 18:50:41 2007 UTC

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

Diff Legend

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