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.111 by elmex, Thu Jun 7 14:45:22 2007 UTC vs.
Revision 1.129 by root, Sun Jan 11 22:03:03 2009 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.99'; 9our $VERSION = '1.23';
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 }
… …
375 380
376 # convert movement strings to bitsets 381 # convert movement strings to bitsets
377 for my $attr (keys %FIELD_MOVEMENT) { 382 for my $attr (keys %FIELD_MOVEMENT) {
378 next unless exists $ob->{$attr}; 383 next unless exists $ob->{$attr};
379 384
380 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 385 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
381 } 386 }
382 387
383 # convert outdated movement flags to new movement sets 388 # convert outdated movement flags to new movement sets
384 if (defined (my $v = delete $ob->{no_pass})) { 389 if (defined (my $v = delete $ob->{no_pass})) {
385 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 390 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
386 } 391 }
387 if (defined (my $v = delete $ob->{slow_move})) { 392 if (defined (my $v = delete $ob->{slow_move})) {
388 $ob->{move_slow} += "walk"; 393 $ob->{move_slow} += "walk";
389 $ob->{move_slow_penalty} = $v; 394 $ob->{move_slow_penalty} = $v;
390 } 395 }
391 if (defined (my $v = delete $ob->{walk_on})) { 396 if (defined (my $v = delete $ob->{walk_on})) {
392 $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" }
393 } 398 }
394 if (defined (my $v = delete $ob->{walk_off})) { 399 if (defined (my $v = delete $ob->{walk_off})) {
395 $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" }
396 } 401 }
397 if (defined (my $v = delete $ob->{fly_on})) { 402 if (defined (my $v = delete $ob->{fly_on})) {
398 $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" }
399 } 404 }
400 if (defined (my $v = delete $ob->{fly_off})) { 405 if (defined (my $v = delete $ob->{fly_off})) {
401 $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" }
402 } 407 }
403 if (defined (my $v = delete $ob->{flying})) { 408 if (defined (my $v = delete $ob->{flying})) {
404 $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" }
405 } 410 }
406 411
407 # convert idiotic event_xxx things into objects 412 # convert idiotic event_xxx things into objects
408 while (my ($event, $subtype) = each %EVENT_TYPE) { 413 while (my ($event, $subtype) = each %EVENT_TYPE) {
409 if (exists $ob->{"event_${event}_plugin"}) { 414 if (exists $ob->{"event_${event}_plugin"}) {
… …
425# arch as in "arch xxx", ie.. objects 430# arch as in "arch xxx", ie.. objects
426sub normalize_arch($) { 431sub normalize_arch($) {
427 my ($ob) = @_; 432 my ($ob) = @_;
428 433
429 normalize_object $ob; 434 normalize_object $ob;
435
436 return if $ob->{_atype} eq "object";
430 437
431 my $arch = $ARCH{$ob->{_name}} 438 my $arch = $ARCH{$ob->{_name}}
432 or (warn "$ob->{_name}: no such archetype", return $ob); 439 or (warn "$ob->{_name}: no such archetype", return $ob);
433 440
434 if ($arch->{type} == 22) { # map 441 if ($arch->{type} == 22) { # map
… …
470} 477}
471 478
472sub attr_thaw($) { 479sub attr_thaw($) {
473 my ($ob) = @_; 480 my ($ob) = @_;
474 481
475 $ob->{attach} = from_json $ob->{attach} 482 $ob->{attach} = decode_json $ob->{attach}
476 if exists $ob->{attach}; 483 if exists $ob->{attach};
477 484
478 $ob 485 $ob
479} 486}
480 487
481sub attr_freeze($) { 488sub attr_freeze($) {
482 my ($ob) = @_; 489 my ($ob) = @_;
483 490
484 $ob->{attach} = Crossfire::to_json $ob->{attach} 491 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
485 if exists $ob->{attach}; 492 if exists $ob->{attach};
486 493
487 $ob 494 $ob
488} 495}
489 496
… …
509 516
510 my %arc; 517 my %arc;
511 my ($more, $prev); 518 my ($more, $prev);
512 my $comment; 519 my $comment;
513 520
514 open my $fh, "<:raw:perlio:utf8", $path 521 open my $fh, "<:utf8", $path
515 or Carp::croak "$path: $!"; 522 or Carp::croak "$path: $!";
516 523
517# binmode $fh; 524# binmode $fh;
518 525
519 my $parse_block; $parse_block = sub { 526 my $parse_block; $parse_block = sub {
… …
619 my $str; 626 my $str;
620 627
621 my $append; $append = sub { 628 my $append; $append = sub {
622 my %a = %{$_[0]}; 629 my %a = %{$_[0]};
623 630
624 Crossfire::attr_freeze \%a; 631 Deliantra::attr_freeze \%a;
625 Crossfire::normalize_arch \%a; 632 Deliantra::normalize_arch \%a;
626 633
627 # undo the bit-split we did before 634 # undo the bit-split we did before
628 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}) {
629 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 636 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
630 | (delete $a{attack_movement_bits_4_7}); 637 | (delete $a{attack_movement_bits_4_7});
… …
648 } 655 }
649 656
650 my @kv; 657 my @kv;
651 658
652 for ($a{_name} eq "map" 659 for ($a{_name} eq "map"
653 ? @Crossfire::FIELD_ORDER_MAP 660 ? @Deliantra::FIELD_ORDER_MAP
654 : @Crossfire::FIELD_ORDER) { 661 : @Deliantra::FIELD_ORDER) {
655 push @kv, [$_, delete $a{$_}] 662 push @kv, [$_, delete $a{$_}]
656 if exists $a{$_}; 663 if exists $a{$_};
657 } 664 }
658 665
659 for (sort keys %a) { 666 for (sort keys %a) {
… …
662 } 669 }
663 670
664 for (@kv) { 671 for (@kv) {
665 my ($k, $v) = @$_; 672 my ($k, $v) = @$_;
666 673
667 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 674 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
668 $v =~ s/\n$//; 675 $v =~ s/\n$//;
669 $str .= "$k\n$v\n$end\n"; 676 $str .= "$k\n$v\n$end\n";
670 } else { 677 } else {
671 $str .= "$k $v\n"; 678 $str .= "$k $v\n";
672 } 679 }
… …
768=cut 775=cut
769 776
770sub arch_attr($) { 777sub arch_attr($) {
771 my ($obj) = @_; 778 my ($obj) = @_;
772 779
773 require Crossfire::Data; 780 require Deliantra::Data;
774 781
775 my $root; 782 my $root;
776 my $attr = { }; 783 my $attr = { };
777 784
778 my $arch = $ARCH{ $obj->{_name} }; 785 my $arch = $ARCH{ $obj->{_name} };
779 my $type = $obj->{type} || $arch->{type}; 786 my $type = $obj->{type} || $arch->{type};
780 787
781 if ($type > 0) { 788 if ($type > 0) {
782 $root = $Crossfire::Data::ATTR{$type}; 789 $root = $Deliantra::Data::ATTR{$type};
783 } else { 790 } else {
784 my %a = (%$arch, %$obj); 791 my %a = (%$arch, %$obj);
785 792
786 if ($a{is_floor} && !$a{alive}) { 793 if ($a{is_floor} && !$a{alive}) {
787 $root = $Crossfire::Data::TYPE{Floor}; 794 $root = $Deliantra::Data::TYPE{Floor};
788 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 795 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
789 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 796 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
790 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 797 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
791 $root = $Crossfire::Data::TYPE{Wall}; 798 $root = $Deliantra::Data::TYPE{Wall};
792 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 799 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
793 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 800 $root = $Deliantra::Data::TYPE{"Weak Wall"};
794 } else { 801 } else {
795 $root = $Crossfire::Data::TYPE{Misc}; 802 $root = $Deliantra::Data::TYPE{Misc};
796 } 803 }
797 } 804 }
798 805
799 my @import = ($root); 806 my @import = ($root);
800 807
801 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 808 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
802 unless $type == 116; 809 unless $type == 116;
803 810
804 my (%ignore); 811 my (%ignore);
805 my (@section_order, %section, @attr_order); 812 my (@section_order, %section, @attr_order);
806 813
807 while (my $type = shift @import) { 814 while (my $type = shift @import) {
815 push @import,
816 grep $_,
817 map $Deliantra::Data::TYPE{$_},
808 push @import, @{$type->{import} || []}; 818 @{$type->{import} || []};
809 819
810 $attr->{$_} ||= $type->{$_} 820 $attr->{$_} ||= $type->{$_}
811 for qw(name desc use); 821 for qw(name desc use);
812 822
813 for (@{$type->{ignore} || []}) { 823 for (@{$type->{ignore} || []}) {
… …
902} 912}
903 913
904sub construct_tilecache_pb { 914sub construct_tilecache_pb {
905 my ($idx, $cache) = @_; 915 my ($idx, $cache) = @_;
906 916
907 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;
908 918
909 while (my ($name, $tile) = each %$cache) { 919 while (my ($name, $tile) = each %$cache) {
910 my $tpb = delete $tile->{pb}; 920 my $tpb = delete $tile->{pb};
911 my $ofs = $tile->{idx}; 921 my $ofs = $tile->{idx};
912 922
913 for my $x (0 .. $tile->{w} - 1) { 923 for my $x (0 .. $tile->{w} - 1) {
914 for my $y (0 .. $tile->{h} - 1) { 924 for my $y (0 .. $tile->{h} - 1) {
915 my $idx = $ofs + $x + $y * $tile->{w}; 925 my $idx = $ofs + $x + $y * $tile->{w};
916 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, 926 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
917 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 927 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
918 } 928 }
919 } 929 }
920 } 930 }
921 931
922 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 932 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
… …
938=cut 948=cut
939 949
940sub load_tilecache() { 950sub load_tilecache() {
941 require Gtk2; 951 require Gtk2;
942 952
943 if (-e "$LIB/facedata") { # Crossfire TRT faces
944 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache, 953 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
945 sub { 954 sub {
946 my %cache; 955 my %cache;
947 my $facedata = Storable::retrieve "$LIB/facedata"; 956 my $facedata = Storable::retrieve "$LIB/facedata";
948 957
949 $facedata->{version} == 2 958 $facedata->{version} == 2
950 or die "$LIB/facedata: version mismatch, cannot proceed."; 959 or die "$LIB/facedata: version mismatch, cannot proceed.";
951 960
952 my $faces = $facedata->{faceinfo}; 961 my $faces = $facedata->{faceinfo};
953 my $idx = 0; 962 my $idx = 0;
954 963
955 for (sort keys %$faces) { 964 for (sort keys %$faces) {
956 my ($face, $info) = ($_, $faces->{$_}); 965 my ($face, $info) = ($_, $faces->{$_});
957 966
958 my $pb = new Gtk2::Gdk::PixbufLoader; 967 my $pb = new Gtk2::Gdk::PixbufLoader;
959 $pb->write ($info->{data32}); 968 $pb->write ($info->{data32});
960 $pb->close; 969 $pb->close;
961 my $pb = $pb->get_pixbuf; 970 my $pb = $pb->get_pixbuf;
962 971
963 my $tile = $cache{$face} = { 972 my $tile = $cache{$face} = {
964 pb => $pb, 973 pb => $pb,
965 idx => $idx, 974 idx => $idx,
966 w => int $pb->get_width / TILESIZE, 975 w => int $pb->get_width / TILESIZE,
967 h => int $pb->get_height / TILESIZE, 976 h => int $pb->get_height / TILESIZE,
968 }; 977 };
969 978
970 $idx += $tile->{w} * $tile->{h}; 979 $idx += $tile->{w} * $tile->{h};
971 } 980 }
972 981
973 construct_tilecache_pb $idx, \%cache; 982 construct_tilecache_pb $idx, \%cache;
974 983
975 \%cache 984 \%cache
976 }; 985 };
977
978 } elsif (-e "$LIB/crossfire.0") { # Crossfire1 version
979 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
980 sub {
981 my $tile = read_pak "$LIB/crossfire.0";
982
983 my %cache;
984
985 my $idx = 0;
986
987 for my $name (sort keys %$tile) {
988 my $pb = new Gtk2::Gdk::PixbufLoader;
989 $pb->write ($tile->{$name});
990 $pb->close;
991 my $pb = $pb->get_pixbuf;
992
993 my $tile = $cache{$name} = {
994 pb => $pb,
995 idx => $idx,
996 w => int $pb->get_width / TILESIZE,
997 h => int $pb->get_height / TILESIZE,
998 };
999
1000 $idx += $tile->{w} * $tile->{h};
1001 }
1002
1003 construct_tilecache_pb $idx, \%cache;
1004
1005 \%cache
1006 };
1007
1008 }
1009} 986}
1010 987
1011=head1 AUTHOR 988=head1 AUTHOR
1012 989
1013 Marc Lehmann <schmorp@schmorp.de> 990 Marc Lehmann <schmorp@schmorp.de>
… …
1017 http://www.ta-sa.org/ 994 http://www.ta-sa.org/
1018 995
1019=cut 996=cut
1020 997
10211 9981
999

Diff Legend

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