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.108 by elmex, Wed May 23 20:21:28 2007 UTC vs.
Revision 1.128 by root, Sun Sep 28 05:58:01 2008 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire - Crossfire maphandling 3Deliantra - Deliantra suppport module to read/write archetypes, maps etc.
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Deliantra;
8 8
9our $VERSION = '0.98'; 9our $VERSION = '1.222';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
16use File::Spec; 16use File::Spec;
17use List::Util qw(min max); 17use List::Util qw(min max);
18use Storable qw(freeze thaw); 18use Storable qw(freeze thaw);
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
22 *ARCH $TILE *FACE *FACEDATA
23 TILESIZE CACHESTRIDE
24 editor_archs arch_extents
22); 25);
23 26
24use JSON::XS qw(from_json to_json); 27use JSON::XS qw(decode_json encode_json);
25 28
26our $LIB = $ENV{CROSSFIRE_LIBDIR}; 29our $LIB = $ENV{DELIANTRA_LIBDIR};
27 30
28our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" 31our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
29 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 32 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
30 : File::Spec->tmpdir . "/crossfire"; 33 : File::Spec->tmpdir . "/deliantra";
31 34
32mkdir $VARDIR, 0777; 35mkdir $VARDIR, 0777;
33 36
34sub TILESIZE (){ 32 } 37sub TILESIZE (){ 32 }
38sub CACHESTRIDE (){ 64 }
35 39
36our %ARCH; 40our %ARCH;
41our %FACE; # face32
37our %FACE; 42our %FACEDATA;
38our $TILE; 43our $TILE;
39 44
40our %FIELD_MULTILINE = ( 45our %FIELD_MULTILINE = (
41 msg => "endmsg", 46 msg => "endmsg",
42 lore => "endlore", 47 lore => "endlore",
… …
64 69
65 elevation 70 elevation
66 71
67 name name_pl custom_name attach title race 72 name name_pl custom_name attach title race
68 slaying skill msg lore other_arch 73 slaying skill msg lore other_arch
69 face animation is_animated 74 sound sound_destroy face animation is_animated
70 magicmap smoothlevel smoothface 75 magicmap smoothlevel smoothface
71 str dex con wis pow cha int 76 str dex con wis pow cha int
72 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
73 exp perm_exp expmul 78 exp perm_exp expmul
74 food dam luck wc ac x y speed speed_left move_state attack_movement 79 food dam luck wc ac x y speed speed_left move_state attack_movement
… …
149); 154);
150 155
151our @MOVE_TYPE = keys %MOVE_TYPE; 156our @MOVE_TYPE = keys %MOVE_TYPE;
152 157
153{ 158{
154 package Crossfire::MoveType; 159 package Deliantra::MoveType;
155 160
156 use overload 161 use overload
157 '=' => sub { bless [@{$_[0]}], ref $_[0] }, 162 '=' => sub { bless [@{$_[0]}], ref $_[0] },
158 '""' => \&as_string, 163 '""' => \&as_string,
159 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef }, 164 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
… …
179 'eq' => sub { "$_[0]" eq "$_[1]" }, 184 'eq' => sub { "$_[0]" eq "$_[1]" },
180 'ne' => sub { "$_[0]" ne "$_[1]" }, 185 'ne' => sub { "$_[0]" ne "$_[1]" },
181 ; 186 ;
182} 187}
183 188
184sub Crossfire::MoveType::new { 189sub Deliantra::MoveType::new {
185 my ($class, $string) = @_; 190 my ($class, $string) = @_;
186 191
187 my $mask; 192 my $mask;
188 my $value; 193 my $value;
189 194
… …
203 } 208 }
204 209
205 (bless [$mask, $value], $class)->normalise 210 (bless [$mask, $value], $class)->normalise
206} 211}
207 212
208sub Crossfire::MoveType::normalise { 213sub Deliantra::MoveType::normalise {
209 my ($self) = @_; 214 my ($self) = @_;
210 215
211 if ($self->[0] & MOVE_ALL) { 216 if ($self->[0] & MOVE_ALL) {
212 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); 217 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
213 $self->[0] &= $mask; 218 $self->[0] &= $mask;
… …
217 $self->[1] &= $self->[0]; 222 $self->[1] &= $self->[0];
218 223
219 $self 224 $self
220} 225}
221 226
222sub Crossfire::MoveType::as_string { 227sub Deliantra::MoveType::as_string {
223 my ($self) = @_; 228 my ($self) = @_;
224 229
225 my @res; 230 my @res;
226 231
227 my ($mask, $value) = @$self; 232 my ($mask, $value) = @$self;
228 233
229 for (@Crossfire::MOVE_TYPE) { 234 for (@Deliantra::MOVE_TYPE) {
230 my $bit = $Crossfire::MOVE_TYPE{$_}; 235 my $bit = $Deliantra::MOVE_TYPE{$_};
231 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 236 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
232 $mask &= ~$bit; 237 $mask &= ~$bit;
233 push @res, $value & $bit ? $_ : "-$_"; 238 push @res, $value & $bit ? $_ : "-$_";
234 } 239 }
235 } 240 }
… …
352 # check whether attachment is the same as in the archetype 357 # check whether attachment is the same as in the archetype
353 if (exists $ob->{attach}) { 358 if (exists $ob->{attach}) {
354 my $arch = $ARCH{$ob->{_name}}; 359 my $arch = $ARCH{$ob->{_name}};
355 my $js = JSON::XS->new->utf8->canonical (1); 360 my $js = JSON::XS->new->utf8->canonical (1);
356 361
362 if (defined $arch->{attach}
357 if ($js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) { 363 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
358 delete $ob->{attach} 364 delete $ob->{attach}
359 } 365 }
360 } 366 }
361 367
362 # color_fg is used as default for magicmap if magicmap does not exist 368 # color_fg is used as default for magicmap if magicmap does not exist
… …
374 380
375 # convert movement strings to bitsets 381 # convert movement strings to bitsets
376 for my $attr (keys %FIELD_MOVEMENT) { 382 for my $attr (keys %FIELD_MOVEMENT) {
377 next unless exists $ob->{$attr}; 383 next unless exists $ob->{$attr};
378 384
379 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 385 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
380 } 386 }
381 387
382 # convert outdated movement flags to new movement sets 388 # convert outdated movement flags to new movement sets
383 if (defined (my $v = delete $ob->{no_pass})) { 389 if (defined (my $v = delete $ob->{no_pass})) {
384 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 390 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
385 } 391 }
386 if (defined (my $v = delete $ob->{slow_move})) { 392 if (defined (my $v = delete $ob->{slow_move})) {
387 $ob->{move_slow} += "walk"; 393 $ob->{move_slow} += "walk";
388 $ob->{move_slow_penalty} = $v; 394 $ob->{move_slow_penalty} = $v;
389 } 395 }
390 if (defined (my $v = delete $ob->{walk_on})) { 396 if (defined (my $v = delete $ob->{walk_on})) {
391 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" } 397 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
392 } 398 }
393 if (defined (my $v = delete $ob->{walk_off})) { 399 if (defined (my $v = delete $ob->{walk_off})) {
394 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" } 400 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
395 } 401 }
396 if (defined (my $v = delete $ob->{fly_on})) { 402 if (defined (my $v = delete $ob->{fly_on})) {
397 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" } 403 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
398 } 404 }
399 if (defined (my $v = delete $ob->{fly_off})) { 405 if (defined (my $v = delete $ob->{fly_off})) {
400 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" } 406 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
401 } 407 }
402 if (defined (my $v = delete $ob->{flying})) { 408 if (defined (my $v = delete $ob->{flying})) {
403 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" } 409 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
404 } 410 }
405 411
406 # convert idiotic event_xxx things into objects 412 # convert idiotic event_xxx things into objects
407 while (my ($event, $subtype) = each %EVENT_TYPE) { 413 while (my ($event, $subtype) = each %EVENT_TYPE) {
408 if (exists $ob->{"event_${event}_plugin"}) { 414 if (exists $ob->{"event_${event}_plugin"}) {
… …
424# arch as in "arch xxx", ie.. objects 430# arch as in "arch xxx", ie.. objects
425sub normalize_arch($) { 431sub normalize_arch($) {
426 my ($ob) = @_; 432 my ($ob) = @_;
427 433
428 normalize_object $ob; 434 normalize_object $ob;
435
436 return if $ob->{_atype} eq "object";
429 437
430 my $arch = $ARCH{$ob->{_name}} 438 my $arch = $ARCH{$ob->{_name}}
431 or (warn "$ob->{_name}: no such archetype", return $ob); 439 or (warn "$ob->{_name}: no such archetype", return $ob);
432 440
433 if ($arch->{type} == 22) { # map 441 if ($arch->{type} == 22) { # map
… …
469} 477}
470 478
471sub attr_thaw($) { 479sub attr_thaw($) {
472 my ($ob) = @_; 480 my ($ob) = @_;
473 481
474 $ob->{attach} = from_json $ob->{attach} 482 $ob->{attach} = decode_json $ob->{attach}
475 if exists $ob->{attach}; 483 if exists $ob->{attach};
476 484
477 $ob 485 $ob
478} 486}
479 487
480sub attr_freeze($) { 488sub attr_freeze($) {
481 my ($ob) = @_; 489 my ($ob) = @_;
482 490
483 $ob->{attach} = Crossfire::to_json $ob->{attach} 491 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
484 if exists $ob->{attach}; 492 if exists $ob->{attach};
485 493
486 $ob 494 $ob
487} 495}
488 496
… …
508 516
509 my %arc; 517 my %arc;
510 my ($more, $prev); 518 my ($more, $prev);
511 my $comment; 519 my $comment;
512 520
513 open my $fh, "<:raw:perlio:utf8", $path 521 open my $fh, "<:utf8", $path
514 or Carp::croak "$path: $!"; 522 or Carp::croak "$path: $!";
515 523
516# binmode $fh; 524# binmode $fh;
517 525
518 my $parse_block; $parse_block = sub { 526 my $parse_block; $parse_block = sub {
… …
618 my $str; 626 my $str;
619 627
620 my $append; $append = sub { 628 my $append; $append = sub {
621 my %a = %{$_[0]}; 629 my %a = %{$_[0]};
622 630
623 Crossfire::attr_freeze \%a; 631 Deliantra::attr_freeze \%a;
624 Crossfire::normalize_arch \%a; 632 Deliantra::normalize_arch \%a;
625 633
626 # undo the bit-split we did before 634 # undo the bit-split we did before
627 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 635 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
628 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 636 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
629 | (delete $a{attack_movement_bits_4_7}); 637 | (delete $a{attack_movement_bits_4_7});
… …
647 } 655 }
648 656
649 my @kv; 657 my @kv;
650 658
651 for ($a{_name} eq "map" 659 for ($a{_name} eq "map"
652 ? @Crossfire::FIELD_ORDER_MAP 660 ? @Deliantra::FIELD_ORDER_MAP
653 : @Crossfire::FIELD_ORDER) { 661 : @Deliantra::FIELD_ORDER) {
654 push @kv, [$_, delete $a{$_}] 662 push @kv, [$_, delete $a{$_}]
655 if exists $a{$_}; 663 if exists $a{$_};
656 } 664 }
657 665
658 for (sort keys %a) { 666 for (sort keys %a) {
… …
661 } 669 }
662 670
663 for (@kv) { 671 for (@kv) {
664 my ($k, $v) = @$_; 672 my ($k, $v) = @$_;
665 673
666 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 674 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
667 $v =~ s/\n$//; 675 $v =~ s/\n$//;
668 $str .= "$k\n$v\n$end\n"; 676 $str .= "$k\n$v\n$end\n";
669 } else { 677 } else {
670 $str .= "$k $v\n"; 678 $str .= "$k $v\n";
671 } 679 }
… …
767=cut 775=cut
768 776
769sub arch_attr($) { 777sub arch_attr($) {
770 my ($obj) = @_; 778 my ($obj) = @_;
771 779
772 require Crossfire::Data; 780 require Deliantra::Data;
773 781
774 my $root; 782 my $root;
775 my $attr = { }; 783 my $attr = { };
776 784
777 my $arch = $ARCH{ $obj->{_name} }; 785 my $arch = $ARCH{ $obj->{_name} };
778 my $type = $obj->{type} || $arch->{type}; 786 my $type = $obj->{type} || $arch->{type};
779 787
780 if ($type > 0) { 788 if ($type > 0) {
781 $root = $Crossfire::Data::ATTR{$type}; 789 $root = $Deliantra::Data::ATTR{$type};
782 } else { 790 } else {
783 my %a = (%$arch, %$obj); 791 my %a = (%$arch, %$obj);
784 792
785 if ($a{is_floor} && !$a{alive}) { 793 if ($a{is_floor} && !$a{alive}) {
786 $root = $Crossfire::Data::TYPE{Floor}; 794 $root = $Deliantra::Data::TYPE{Floor};
787 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 795 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
788 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 796 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
789 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 797 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
790 $root = $Crossfire::Data::TYPE{Wall}; 798 $root = $Deliantra::Data::TYPE{Wall};
791 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 799 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
792 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 800 $root = $Deliantra::Data::TYPE{"Weak Wall"};
793 } else { 801 } else {
794 $root = $Crossfire::Data::TYPE{Misc}; 802 $root = $Deliantra::Data::TYPE{Misc};
795 } 803 }
796 } 804 }
797 805
798 my @import = ($root); 806 my @import = ($root);
799 807
800 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 808 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
801 unless $type == 116; 809 unless $type == 116;
802 810
803 my (%ignore); 811 my (%ignore);
804 my (@section_order, %section, @attr_order); 812 my (@section_order, %section, @attr_order);
805 813
806 while (my $type = shift @import) { 814 while (my $type = shift @import) {
815 push @import,
816 grep $_,
817 map $Deliantra::Data::TYPE{$_},
807 push @import, @{$type->{import} || []}; 818 @{$type->{import} || []};
808 819
809 $attr->{$_} ||= $type->{$_} 820 $attr->{$_} ||= $type->{$_}
810 for qw(name desc use); 821 for qw(name desc use);
811 822
812 for (@{$type->{ignore} || []}) { 823 for (@{$type->{ignore} || []}) {
… …
901} 912}
902 913
903sub construct_tilecache_pb { 914sub construct_tilecache_pb {
904 my ($idx, $cache) = @_; 915 my ($idx, $cache) = @_;
905 916
906 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64; 917 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
907 918
908 while (my ($name, $tile) = each %$cache) { 919 while (my ($name, $tile) = each %$cache) {
909 my $tpb = delete $tile->{pb}; 920 my $tpb = delete $tile->{pb};
910 my $ofs = $tile->{idx}; 921 my $ofs = $tile->{idx};
911 922
912 for my $x (0 .. $tile->{w} - 1) { 923 for my $x (0 .. $tile->{w} - 1) {
913 for my $y (0 .. $tile->{h} - 1) { 924 for my $y (0 .. $tile->{h} - 1) {
914 my $idx = $ofs + $x + $y * $tile->{w}; 925 my $idx = $ofs + $x + $y * $tile->{w};
915 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, 926 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
916 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 927 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
917 } 928 }
918 } 929 }
919 } 930 }
920 931
921 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 932 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
… …
937=cut 948=cut
938 949
939sub load_tilecache() { 950sub load_tilecache() {
940 require Gtk2; 951 require Gtk2;
941 952
942 if (-e "$LIB/crossfire.0") { # Crossfire1 version
943 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
944 sub {
945 my $tile = read_pak "$LIB/crossfire.0";
946
947 my %cache;
948
949 my $idx = 0;
950
951 for my $name (sort keys %$tile) {
952 my $pb = new Gtk2::Gdk::PixbufLoader;
953 $pb->write ($tile->{$name});
954 $pb->close;
955 my $pb = $pb->get_pixbuf;
956
957 my $tile = $cache{$name} = {
958 pb => $pb,
959 idx => $idx,
960 w => int $pb->get_width / TILESIZE,
961 h => int $pb->get_height / TILESIZE,
962 };
963
964 $idx += $tile->{w} * $tile->{h};
965 }
966
967 construct_tilecache_pb $idx, \%cache;
968
969 \%cache
970 };
971
972 } else { # Crossfire+ version
973 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache, 953 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
974 sub { 954 sub {
975 my %cache; 955 my %cache;
976 my $facedata = Storable::retrieve "$LIB/facedata"; 956 my $facedata = Storable::retrieve "$LIB/facedata";
977 957
978 $facedata->{version} == 2 958 $facedata->{version} == 2
979 or die "$LIB/facedata: version mismatch, cannot proceed."; 959 or die "$LIB/facedata: version mismatch, cannot proceed.";
980 960
981 my $faces = $facedata->{faceinfo}; 961 my $faces = $facedata->{faceinfo};
982 my $idx = 0; 962 my $idx = 0;
983 963
984 for (sort keys %$faces) { 964 for (sort keys %$faces) {
985 my ($face, $info) = ($_, $faces->{$_}); 965 my ($face, $info) = ($_, $faces->{$_});
986 966
987 my $pb = new Gtk2::Gdk::PixbufLoader; 967 my $pb = new Gtk2::Gdk::PixbufLoader;
988 $pb->write ($info->{data32}); 968 $pb->write ($info->{data32});
989 $pb->close; 969 $pb->close;
990 my $pb = $pb->get_pixbuf; 970 my $pb = $pb->get_pixbuf;
991 971
992 my $tile = $cache{$face} = { 972 my $tile = $cache{$face} = {
993 pb => $pb, 973 pb => $pb,
994 idx => $idx, 974 idx => $idx,
995 w => int $pb->get_width / TILESIZE, 975 w => int $pb->get_width / TILESIZE,
996 h => int $pb->get_height / TILESIZE, 976 h => int $pb->get_height / TILESIZE,
997 }; 977 };
998 978
999 $idx += $tile->{w} * $tile->{h}; 979 $idx += $tile->{w} * $tile->{h};
1000 } 980 }
1001 981
1002 construct_tilecache_pb $idx, \%cache; 982 construct_tilecache_pb $idx, \%cache;
1003 983
1004 \%cache 984 \%cache
1005 }; 985 };
1006 }
1007} 986}
1008 987
1009=head1 AUTHOR 988=head1 AUTHOR
1010 989
1011 Marc Lehmann <schmorp@schmorp.de> 990 Marc Lehmann <schmorp@schmorp.de>
… …
1015 http://www.ta-sa.org/ 994 http://www.ta-sa.org/
1016 995
1017=cut 996=cut
1018 997
10191 9981
999

Diff Legend

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