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.109 by elmex, Sun May 27 08:08:59 2007 UTC vs.
Revision 1.125 by root, Sun Aug 31 09:19:22 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.22';
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",
… …
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"}) {
… …
470} 475}
471 476
472sub attr_thaw($) { 477sub attr_thaw($) {
473 my ($ob) = @_; 478 my ($ob) = @_;
474 479
475 $ob->{attach} = from_json $ob->{attach} 480 $ob->{attach} = decode_json $ob->{attach}
476 if exists $ob->{attach}; 481 if exists $ob->{attach};
477 482
478 $ob 483 $ob
479} 484}
480 485
481sub attr_freeze($) { 486sub attr_freeze($) {
482 my ($ob) = @_; 487 my ($ob) = @_;
483 488
484 $ob->{attach} = Crossfire::to_json $ob->{attach} 489 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
485 if exists $ob->{attach}; 490 if exists $ob->{attach};
486 491
487 $ob 492 $ob
488} 493}
489 494
… …
619 my $str; 624 my $str;
620 625
621 my $append; $append = sub { 626 my $append; $append = sub {
622 my %a = %{$_[0]}; 627 my %a = %{$_[0]};
623 628
624 Crossfire::attr_freeze \%a; 629 Deliantra::attr_freeze \%a;
625 Crossfire::normalize_arch \%a; 630 Deliantra::normalize_arch \%a;
626 631
627 # undo the bit-split we did before 632 # undo the bit-split we did before
628 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 633 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}) 634 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
630 | (delete $a{attack_movement_bits_4_7}); 635 | (delete $a{attack_movement_bits_4_7});
… …
648 } 653 }
649 654
650 my @kv; 655 my @kv;
651 656
652 for ($a{_name} eq "map" 657 for ($a{_name} eq "map"
653 ? @Crossfire::FIELD_ORDER_MAP 658 ? @Deliantra::FIELD_ORDER_MAP
654 : @Crossfire::FIELD_ORDER) { 659 : @Deliantra::FIELD_ORDER) {
655 push @kv, [$_, delete $a{$_}] 660 push @kv, [$_, delete $a{$_}]
656 if exists $a{$_}; 661 if exists $a{$_};
657 } 662 }
658 663
659 for (sort keys %a) { 664 for (sort keys %a) {
… …
662 } 667 }
663 668
664 for (@kv) { 669 for (@kv) {
665 my ($k, $v) = @$_; 670 my ($k, $v) = @$_;
666 671
667 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 672 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
668 $v =~ s/\n$//; 673 $v =~ s/\n$//;
669 $str .= "$k\n$v\n$end\n"; 674 $str .= "$k\n$v\n$end\n";
670 } else { 675 } else {
671 $str .= "$k $v\n"; 676 $str .= "$k $v\n";
672 } 677 }
… …
768=cut 773=cut
769 774
770sub arch_attr($) { 775sub arch_attr($) {
771 my ($obj) = @_; 776 my ($obj) = @_;
772 777
773 require Crossfire::Data; 778 require Deliantra::Data;
774 779
775 my $root; 780 my $root;
776 my $attr = { }; 781 my $attr = { };
777 782
778 my $arch = $ARCH{ $obj->{_name} }; 783 my $arch = $ARCH{ $obj->{_name} };
779 my $type = $obj->{type} || $arch->{type}; 784 my $type = $obj->{type} || $arch->{type};
780 785
781 if ($type > 0) { 786 if ($type > 0) {
782 $root = $Crossfire::Data::ATTR{$type}; 787 $root = $Deliantra::Data::ATTR{$type};
783 } else { 788 } else {
784 my %a = (%$arch, %$obj); 789 my %a = (%$arch, %$obj);
785 790
786 if ($a{is_floor} && !$a{alive}) { 791 if ($a{is_floor} && !$a{alive}) {
787 $root = $Crossfire::Data::TYPE{Floor}; 792 $root = $Deliantra::Data::TYPE{Floor};
788 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 793 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
789 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 794 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
790 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 795 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
791 $root = $Crossfire::Data::TYPE{Wall}; 796 $root = $Deliantra::Data::TYPE{Wall};
792 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 797 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
793 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 798 $root = $Deliantra::Data::TYPE{"Weak Wall"};
794 } else { 799 } else {
795 $root = $Crossfire::Data::TYPE{Misc}; 800 $root = $Deliantra::Data::TYPE{Misc};
796 } 801 }
797 } 802 }
798 803
799 my @import = ($root); 804 my @import = ($root);
800 805
801 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 806 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
802 unless $type == 116; 807 unless $type == 116;
803 808
804 my (%ignore); 809 my (%ignore);
805 my (@section_order, %section, @attr_order); 810 my (@section_order, %section, @attr_order);
806 811
807 while (my $type = shift @import) { 812 while (my $type = shift @import) {
813 push @import,
814 grep $_,
815 map $Deliantra::Data::TYPE{$_},
808 push @import, @{$type->{import} || []}; 816 @{$type->{import} || []};
809 817
810 $attr->{$_} ||= $type->{$_} 818 $attr->{$_} ||= $type->{$_}
811 for qw(name desc use); 819 for qw(name desc use);
812 820
813 for (@{$type->{ignore} || []}) { 821 for (@{$type->{ignore} || []}) {
… …
902} 910}
903 911
904sub construct_tilecache_pb { 912sub construct_tilecache_pb {
905 my ($idx, $cache) = @_; 913 my ($idx, $cache) = @_;
906 914
907 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64; 915 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
908 916
909 while (my ($name, $tile) = each %$cache) { 917 while (my ($name, $tile) = each %$cache) {
910 my $tpb = delete $tile->{pb}; 918 my $tpb = delete $tile->{pb};
911 my $ofs = $tile->{idx}; 919 my $ofs = $tile->{idx};
912 920
913 for my $x (0 .. $tile->{w} - 1) { 921 for my $x (0 .. $tile->{w} - 1) {
914 for my $y (0 .. $tile->{h} - 1) { 922 for my $y (0 .. $tile->{h} - 1) {
915 my $idx = $ofs + $x + $y * $tile->{w}; 923 my $idx = $ofs + $x + $y * $tile->{w};
916 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, 924 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
917 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 925 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
918 } 926 }
919 } 927 }
920 } 928 }
921 929
922 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 930 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
… …
938=cut 946=cut
939 947
940sub load_tilecache() { 948sub load_tilecache() {
941 require Gtk2; 949 require Gtk2;
942 950
943 if (-e "$LIB/crossfire.0") { # Crossfire1 version
944 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
945 sub {
946 my $tile = read_pak "$LIB/crossfire.0";
947
948 my %cache;
949
950 my $idx = 0;
951
952 for my $name (sort keys %$tile) {
953 my $pb = new Gtk2::Gdk::PixbufLoader;
954 $pb->write ($tile->{$name});
955 $pb->close;
956 my $pb = $pb->get_pixbuf;
957
958 my $tile = $cache{$name} = {
959 pb => $pb,
960 idx => $idx,
961 w => int $pb->get_width / TILESIZE,
962 h => int $pb->get_height / TILESIZE,
963 };
964
965 $idx += $tile->{w} * $tile->{h};
966 }
967
968 construct_tilecache_pb $idx, \%cache;
969
970 \%cache
971 };
972
973 } else { # Crossfire+ version
974 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache, 951 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
975 sub { 952 sub {
976 my %cache; 953 my %cache;
977 my $facedata = Storable::retrieve "$LIB/facedata"; 954 my $facedata = Storable::retrieve "$LIB/facedata";
978 955
979 $facedata->{version} == 2 956 $facedata->{version} == 2
980 or die "$LIB/facedata: version mismatch, cannot proceed."; 957 or die "$LIB/facedata: version mismatch, cannot proceed.";
981 958
982 my $faces = $facedata->{faceinfo}; 959 my $faces = $facedata->{faceinfo};
983 my $idx = 0; 960 my $idx = 0;
984 961
985 for (sort keys %$faces) { 962 for (sort keys %$faces) {
986 my ($face, $info) = ($_, $faces->{$_}); 963 my ($face, $info) = ($_, $faces->{$_});
987 964
988 my $pb = new Gtk2::Gdk::PixbufLoader; 965 my $pb = new Gtk2::Gdk::PixbufLoader;
989 $pb->write ($info->{data32}); 966 $pb->write ($info->{data32});
990 $pb->close; 967 $pb->close;
991 my $pb = $pb->get_pixbuf; 968 my $pb = $pb->get_pixbuf;
992 969
993 my $tile = $cache{$face} = { 970 my $tile = $cache{$face} = {
994 pb => $pb, 971 pb => $pb,
995 idx => $idx, 972 idx => $idx,
996 w => int $pb->get_width / TILESIZE, 973 w => int $pb->get_width / TILESIZE,
997 h => int $pb->get_height / TILESIZE, 974 h => int $pb->get_height / TILESIZE,
998 }; 975 };
999 976
1000 $idx += $tile->{w} * $tile->{h}; 977 $idx += $tile->{w} * $tile->{h};
1001 } 978 }
1002 979
1003 construct_tilecache_pb $idx, \%cache; 980 construct_tilecache_pb $idx, \%cache;
1004 981
1005 \%cache 982 \%cache
1006 }; 983 };
1007 }
1008} 984}
1009 985
1010=head1 AUTHOR 986=head1 AUTHOR
1011 987
1012 Marc Lehmann <schmorp@schmorp.de> 988 Marc Lehmann <schmorp@schmorp.de>
… …
1016 http://www.ta-sa.org/ 992 http://www.ta-sa.org/
1017 993
1018=cut 994=cut
1019 995
10201 9961
997

Diff Legend

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