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.121 by root, Mon Apr 14 00:35:17 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.14';
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} || $ENV{CROSSFIRE_LIBDIR};
27 30
28our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" 31our $OLDDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire"
29 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 32 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
30 : File::Spec->tmpdir . "/crossfire"; 33 : File::Spec->tmpdir . "/crossfire";
31 34
35our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
36 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
37 : File::Spec->tmpdir . "/deliantra";
38
32mkdir $VARDIR, 0777; 39mkdir $VARDIR, 0777;
33 40
34sub TILESIZE (){ 32 } 41sub TILESIZE (){ 32 }
42sub CACHESTRIDE (){ 64 }
35 43
36our %ARCH; 44our %ARCH;
45our %FACE; # face32
37our %FACE; 46our %FACEDATA;
38our $TILE; 47our $TILE;
39 48
40our %FIELD_MULTILINE = ( 49our %FIELD_MULTILINE = (
41 msg => "endmsg", 50 msg => "endmsg",
42 lore => "endlore", 51 lore => "endlore",
… …
149); 158);
150 159
151our @MOVE_TYPE = keys %MOVE_TYPE; 160our @MOVE_TYPE = keys %MOVE_TYPE;
152 161
153{ 162{
154 package Crossfire::MoveType; 163 package Deliantra::MoveType;
155 164
156 use overload 165 use overload
157 '=' => sub { bless [@{$_[0]}], ref $_[0] }, 166 '=' => sub { bless [@{$_[0]}], ref $_[0] },
158 '""' => \&as_string, 167 '""' => \&as_string,
159 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef }, 168 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
… …
179 'eq' => sub { "$_[0]" eq "$_[1]" }, 188 'eq' => sub { "$_[0]" eq "$_[1]" },
180 'ne' => sub { "$_[0]" ne "$_[1]" }, 189 'ne' => sub { "$_[0]" ne "$_[1]" },
181 ; 190 ;
182} 191}
183 192
184sub Crossfire::MoveType::new { 193sub Deliantra::MoveType::new {
185 my ($class, $string) = @_; 194 my ($class, $string) = @_;
186 195
187 my $mask; 196 my $mask;
188 my $value; 197 my $value;
189 198
… …
203 } 212 }
204 213
205 (bless [$mask, $value], $class)->normalise 214 (bless [$mask, $value], $class)->normalise
206} 215}
207 216
208sub Crossfire::MoveType::normalise { 217sub Deliantra::MoveType::normalise {
209 my ($self) = @_; 218 my ($self) = @_;
210 219
211 if ($self->[0] & MOVE_ALL) { 220 if ($self->[0] & MOVE_ALL) {
212 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); 221 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
213 $self->[0] &= $mask; 222 $self->[0] &= $mask;
… …
217 $self->[1] &= $self->[0]; 226 $self->[1] &= $self->[0];
218 227
219 $self 228 $self
220} 229}
221 230
222sub Crossfire::MoveType::as_string { 231sub Deliantra::MoveType::as_string {
223 my ($self) = @_; 232 my ($self) = @_;
224 233
225 my @res; 234 my @res;
226 235
227 my ($mask, $value) = @$self; 236 my ($mask, $value) = @$self;
228 237
229 for (@Crossfire::MOVE_TYPE) { 238 for (@Deliantra::MOVE_TYPE) {
230 my $bit = $Crossfire::MOVE_TYPE{$_}; 239 my $bit = $Deliantra::MOVE_TYPE{$_};
231 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 240 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
232 $mask &= ~$bit; 241 $mask &= ~$bit;
233 push @res, $value & $bit ? $_ : "-$_"; 242 push @res, $value & $bit ? $_ : "-$_";
234 } 243 }
235 } 244 }
… …
352 # check whether attachment is the same as in the archetype 361 # check whether attachment is the same as in the archetype
353 if (exists $ob->{attach}) { 362 if (exists $ob->{attach}) {
354 my $arch = $ARCH{$ob->{_name}}; 363 my $arch = $ARCH{$ob->{_name}};
355 my $js = JSON::XS->new->utf8->canonical (1); 364 my $js = JSON::XS->new->utf8->canonical (1);
356 365
366 if (defined $arch->{attach}
357 if ($js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) { 367 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
358 delete $ob->{attach} 368 delete $ob->{attach}
359 } 369 }
360 } 370 }
361 371
362 # color_fg is used as default for magicmap if magicmap does not exist 372 # color_fg is used as default for magicmap if magicmap does not exist
… …
374 384
375 # convert movement strings to bitsets 385 # convert movement strings to bitsets
376 for my $attr (keys %FIELD_MOVEMENT) { 386 for my $attr (keys %FIELD_MOVEMENT) {
377 next unless exists $ob->{$attr}; 387 next unless exists $ob->{$attr};
378 388
379 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 389 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
380 } 390 }
381 391
382 # convert outdated movement flags to new movement sets 392 # convert outdated movement flags to new movement sets
383 if (defined (my $v = delete $ob->{no_pass})) { 393 if (defined (my $v = delete $ob->{no_pass})) {
384 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 394 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
385 } 395 }
386 if (defined (my $v = delete $ob->{slow_move})) { 396 if (defined (my $v = delete $ob->{slow_move})) {
387 $ob->{move_slow} += "walk"; 397 $ob->{move_slow} += "walk";
388 $ob->{move_slow_penalty} = $v; 398 $ob->{move_slow_penalty} = $v;
389 } 399 }
390 if (defined (my $v = delete $ob->{walk_on})) { 400 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" } 401 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
392 } 402 }
393 if (defined (my $v = delete $ob->{walk_off})) { 403 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" } 404 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
395 } 405 }
396 if (defined (my $v = delete $ob->{fly_on})) { 406 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" } 407 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
398 } 408 }
399 if (defined (my $v = delete $ob->{fly_off})) { 409 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" } 410 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
401 } 411 }
402 if (defined (my $v = delete $ob->{flying})) { 412 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" } 413 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
404 } 414 }
405 415
406 # convert idiotic event_xxx things into objects 416 # convert idiotic event_xxx things into objects
407 while (my ($event, $subtype) = each %EVENT_TYPE) { 417 while (my ($event, $subtype) = each %EVENT_TYPE) {
408 if (exists $ob->{"event_${event}_plugin"}) { 418 if (exists $ob->{"event_${event}_plugin"}) {
… …
469} 479}
470 480
471sub attr_thaw($) { 481sub attr_thaw($) {
472 my ($ob) = @_; 482 my ($ob) = @_;
473 483
474 $ob->{attach} = from_json $ob->{attach} 484 $ob->{attach} = decode_json $ob->{attach}
475 if exists $ob->{attach}; 485 if exists $ob->{attach};
476 486
477 $ob 487 $ob
478} 488}
479 489
480sub attr_freeze($) { 490sub attr_freeze($) {
481 my ($ob) = @_; 491 my ($ob) = @_;
482 492
483 $ob->{attach} = Crossfire::to_json $ob->{attach} 493 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
484 if exists $ob->{attach}; 494 if exists $ob->{attach};
485 495
486 $ob 496 $ob
487} 497}
488 498
… …
618 my $str; 628 my $str;
619 629
620 my $append; $append = sub { 630 my $append; $append = sub {
621 my %a = %{$_[0]}; 631 my %a = %{$_[0]};
622 632
623 Crossfire::attr_freeze \%a; 633 Deliantra::attr_freeze \%a;
624 Crossfire::normalize_arch \%a; 634 Deliantra::normalize_arch \%a;
625 635
626 # undo the bit-split we did before 636 # undo the bit-split we did before
627 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 637 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}) 638 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
629 | (delete $a{attack_movement_bits_4_7}); 639 | (delete $a{attack_movement_bits_4_7});
… …
647 } 657 }
648 658
649 my @kv; 659 my @kv;
650 660
651 for ($a{_name} eq "map" 661 for ($a{_name} eq "map"
652 ? @Crossfire::FIELD_ORDER_MAP 662 ? @Deliantra::FIELD_ORDER_MAP
653 : @Crossfire::FIELD_ORDER) { 663 : @Deliantra::FIELD_ORDER) {
654 push @kv, [$_, delete $a{$_}] 664 push @kv, [$_, delete $a{$_}]
655 if exists $a{$_}; 665 if exists $a{$_};
656 } 666 }
657 667
658 for (sort keys %a) { 668 for (sort keys %a) {
… …
661 } 671 }
662 672
663 for (@kv) { 673 for (@kv) {
664 my ($k, $v) = @$_; 674 my ($k, $v) = @$_;
665 675
666 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 676 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
667 $v =~ s/\n$//; 677 $v =~ s/\n$//;
668 $str .= "$k\n$v\n$end\n"; 678 $str .= "$k\n$v\n$end\n";
669 } else { 679 } else {
670 $str .= "$k $v\n"; 680 $str .= "$k $v\n";
671 } 681 }
… …
767=cut 777=cut
768 778
769sub arch_attr($) { 779sub arch_attr($) {
770 my ($obj) = @_; 780 my ($obj) = @_;
771 781
772 require Crossfire::Data; 782 require Deliantra::Data;
773 783
774 my $root; 784 my $root;
775 my $attr = { }; 785 my $attr = { };
776 786
777 my $arch = $ARCH{ $obj->{_name} }; 787 my $arch = $ARCH{ $obj->{_name} };
778 my $type = $obj->{type} || $arch->{type}; 788 my $type = $obj->{type} || $arch->{type};
779 789
780 if ($type > 0) { 790 if ($type > 0) {
781 $root = $Crossfire::Data::ATTR{$type}; 791 $root = $Deliantra::Data::ATTR{$type};
782 } else { 792 } else {
783 my %a = (%$arch, %$obj); 793 my %a = (%$arch, %$obj);
784 794
785 if ($a{is_floor} && !$a{alive}) { 795 if ($a{is_floor} && !$a{alive}) {
786 $root = $Crossfire::Data::TYPE{Floor}; 796 $root = $Deliantra::Data::TYPE{Floor};
787 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 797 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
788 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 798 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
789 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 799 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
790 $root = $Crossfire::Data::TYPE{Wall}; 800 $root = $Deliantra::Data::TYPE{Wall};
791 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 801 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
792 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 802 $root = $Deliantra::Data::TYPE{"Weak Wall"};
793 } else { 803 } else {
794 $root = $Crossfire::Data::TYPE{Misc}; 804 $root = $Deliantra::Data::TYPE{Misc};
795 } 805 }
796 } 806 }
797 807
798 my @import = ($root); 808 my @import = ($root);
799 809
800 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 810 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
801 unless $type == 116; 811 unless $type == 116;
802 812
803 my (%ignore); 813 my (%ignore);
804 my (@section_order, %section, @attr_order); 814 my (@section_order, %section, @attr_order);
805 815
806 while (my $type = shift @import) { 816 while (my $type = shift @import) {
817 push @import,
818 grep $_,
819 map $Deliantra::Data::TYPE{$_},
807 push @import, @{$type->{import} || []}; 820 @{$type->{import} || []};
808 821
809 $attr->{$_} ||= $type->{$_} 822 $attr->{$_} ||= $type->{$_}
810 for qw(name desc use); 823 for qw(name desc use);
811 824
812 for (@{$type->{ignore} || []}) { 825 for (@{$type->{ignore} || []}) {
… …
901} 914}
902 915
903sub construct_tilecache_pb { 916sub construct_tilecache_pb {
904 my ($idx, $cache) = @_; 917 my ($idx, $cache) = @_;
905 918
906 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64; 919 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
907 920
908 while (my ($name, $tile) = each %$cache) { 921 while (my ($name, $tile) = each %$cache) {
909 my $tpb = delete $tile->{pb}; 922 my $tpb = delete $tile->{pb};
910 my $ofs = $tile->{idx}; 923 my $ofs = $tile->{idx};
911 924
912 for my $x (0 .. $tile->{w} - 1) { 925 for my $x (0 .. $tile->{w} - 1) {
913 for my $y (0 .. $tile->{h} - 1) { 926 for my $y (0 .. $tile->{h} - 1) {
914 my $idx = $ofs + $x + $y * $tile->{w}; 927 my $idx = $ofs + $x + $y * $tile->{w};
915 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, 928 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
916 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 929 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
917 } 930 }
918 } 931 }
919 } 932 }
920 933
921 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 934 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
… …
937=cut 950=cut
938 951
939sub load_tilecache() { 952sub load_tilecache() {
940 require Gtk2; 953 require Gtk2;
941 954
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, 955 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
974 sub { 956 sub {
975 my %cache; 957 my %cache;
976 my $facedata = Storable::retrieve "$LIB/facedata"; 958 my $facedata = Storable::retrieve "$LIB/facedata";
977 959
978 $facedata->{version} == 2 960 $facedata->{version} == 2
979 or die "$LIB/facedata: version mismatch, cannot proceed."; 961 or die "$LIB/facedata: version mismatch, cannot proceed.";
980 962
981 my $faces = $facedata->{faceinfo}; 963 my $faces = $facedata->{faceinfo};
982 my $idx = 0; 964 my $idx = 0;
983 965
984 for (sort keys %$faces) { 966 for (sort keys %$faces) {
985 my ($face, $info) = ($_, $faces->{$_}); 967 my ($face, $info) = ($_, $faces->{$_});
986 968
987 my $pb = new Gtk2::Gdk::PixbufLoader; 969 my $pb = new Gtk2::Gdk::PixbufLoader;
988 $pb->write ($info->{data32}); 970 $pb->write ($info->{data32});
989 $pb->close; 971 $pb->close;
990 my $pb = $pb->get_pixbuf; 972 my $pb = $pb->get_pixbuf;
991 973
992 my $tile = $cache{$face} = { 974 my $tile = $cache{$face} = {
993 pb => $pb, 975 pb => $pb,
994 idx => $idx, 976 idx => $idx,
995 w => int $pb->get_width / TILESIZE, 977 w => int $pb->get_width / TILESIZE,
996 h => int $pb->get_height / TILESIZE, 978 h => int $pb->get_height / TILESIZE,
997 }; 979 };
998 980
999 $idx += $tile->{w} * $tile->{h}; 981 $idx += $tile->{w} * $tile->{h};
1000 } 982 }
1001 983
1002 construct_tilecache_pb $idx, \%cache; 984 construct_tilecache_pb $idx, \%cache;
1003 985
1004 \%cache 986 \%cache
1005 }; 987 };
1006 }
1007} 988}
1008 989
1009=head1 AUTHOR 990=head1 AUTHOR
1010 991
1011 Marc Lehmann <schmorp@schmorp.de> 992 Marc Lehmann <schmorp@schmorp.de>
… …
1015 http://www.ta-sa.org/ 996 http://www.ta-sa.org/
1016 997
1017=cut 998=cut
1018 999
10191 10001
1001

Diff Legend

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