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.110 by root, Mon May 28 21:33: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.99'; 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 }
… …
375 384
376 # convert movement strings to bitsets 385 # convert movement strings to bitsets
377 for my $attr (keys %FIELD_MOVEMENT) { 386 for my $attr (keys %FIELD_MOVEMENT) {
378 next unless exists $ob->{$attr}; 387 next unless exists $ob->{$attr};
379 388
380 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 389 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
381 } 390 }
382 391
383 # convert outdated movement flags to new movement sets 392 # convert outdated movement flags to new movement sets
384 if (defined (my $v = delete $ob->{no_pass})) { 393 if (defined (my $v = delete $ob->{no_pass})) {
385 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 394 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
386 } 395 }
387 if (defined (my $v = delete $ob->{slow_move})) { 396 if (defined (my $v = delete $ob->{slow_move})) {
388 $ob->{move_slow} += "walk"; 397 $ob->{move_slow} += "walk";
389 $ob->{move_slow_penalty} = $v; 398 $ob->{move_slow_penalty} = $v;
390 } 399 }
391 if (defined (my $v = delete $ob->{walk_on})) { 400 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" } 401 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
393 } 402 }
394 if (defined (my $v = delete $ob->{walk_off})) { 403 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" } 404 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
396 } 405 }
397 if (defined (my $v = delete $ob->{fly_on})) { 406 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" } 407 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
399 } 408 }
400 if (defined (my $v = delete $ob->{fly_off})) { 409 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" } 410 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
402 } 411 }
403 if (defined (my $v = delete $ob->{flying})) { 412 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" } 413 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
405 } 414 }
406 415
407 # convert idiotic event_xxx things into objects 416 # convert idiotic event_xxx things into objects
408 while (my ($event, $subtype) = each %EVENT_TYPE) { 417 while (my ($event, $subtype) = each %EVENT_TYPE) {
409 if (exists $ob->{"event_${event}_plugin"}) { 418 if (exists $ob->{"event_${event}_plugin"}) {
… …
470} 479}
471 480
472sub attr_thaw($) { 481sub attr_thaw($) {
473 my ($ob) = @_; 482 my ($ob) = @_;
474 483
475 $ob->{attach} = from_json $ob->{attach} 484 $ob->{attach} = decode_json $ob->{attach}
476 if exists $ob->{attach}; 485 if exists $ob->{attach};
477 486
478 $ob 487 $ob
479} 488}
480 489
481sub attr_freeze($) { 490sub attr_freeze($) {
482 my ($ob) = @_; 491 my ($ob) = @_;
483 492
484 $ob->{attach} = Crossfire::to_json $ob->{attach} 493 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
485 if exists $ob->{attach}; 494 if exists $ob->{attach};
486 495
487 $ob 496 $ob
488} 497}
489 498
… …
619 my $str; 628 my $str;
620 629
621 my $append; $append = sub { 630 my $append; $append = sub {
622 my %a = %{$_[0]}; 631 my %a = %{$_[0]};
623 632
624 Crossfire::attr_freeze \%a; 633 Deliantra::attr_freeze \%a;
625 Crossfire::normalize_arch \%a; 634 Deliantra::normalize_arch \%a;
626 635
627 # undo the bit-split we did before 636 # undo the bit-split we did before
628 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}) {
629 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 638 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
630 | (delete $a{attack_movement_bits_4_7}); 639 | (delete $a{attack_movement_bits_4_7});
… …
648 } 657 }
649 658
650 my @kv; 659 my @kv;
651 660
652 for ($a{_name} eq "map" 661 for ($a{_name} eq "map"
653 ? @Crossfire::FIELD_ORDER_MAP 662 ? @Deliantra::FIELD_ORDER_MAP
654 : @Crossfire::FIELD_ORDER) { 663 : @Deliantra::FIELD_ORDER) {
655 push @kv, [$_, delete $a{$_}] 664 push @kv, [$_, delete $a{$_}]
656 if exists $a{$_}; 665 if exists $a{$_};
657 } 666 }
658 667
659 for (sort keys %a) { 668 for (sort keys %a) {
… …
662 } 671 }
663 672
664 for (@kv) { 673 for (@kv) {
665 my ($k, $v) = @$_; 674 my ($k, $v) = @$_;
666 675
667 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 676 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
668 $v =~ s/\n$//; 677 $v =~ s/\n$//;
669 $str .= "$k\n$v\n$end\n"; 678 $str .= "$k\n$v\n$end\n";
670 } else { 679 } else {
671 $str .= "$k $v\n"; 680 $str .= "$k $v\n";
672 } 681 }
… …
768=cut 777=cut
769 778
770sub arch_attr($) { 779sub arch_attr($) {
771 my ($obj) = @_; 780 my ($obj) = @_;
772 781
773 require Crossfire::Data; 782 require Deliantra::Data;
774 783
775 my $root; 784 my $root;
776 my $attr = { }; 785 my $attr = { };
777 786
778 my $arch = $ARCH{ $obj->{_name} }; 787 my $arch = $ARCH{ $obj->{_name} };
779 my $type = $obj->{type} || $arch->{type}; 788 my $type = $obj->{type} || $arch->{type};
780 789
781 if ($type > 0) { 790 if ($type > 0) {
782 $root = $Crossfire::Data::ATTR{$type}; 791 $root = $Deliantra::Data::ATTR{$type};
783 } else { 792 } else {
784 my %a = (%$arch, %$obj); 793 my %a = (%$arch, %$obj);
785 794
786 if ($a{is_floor} && !$a{alive}) { 795 if ($a{is_floor} && !$a{alive}) {
787 $root = $Crossfire::Data::TYPE{Floor}; 796 $root = $Deliantra::Data::TYPE{Floor};
788 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 797 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
789 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 798 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
790 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 799 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
791 $root = $Crossfire::Data::TYPE{Wall}; 800 $root = $Deliantra::Data::TYPE{Wall};
792 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 801 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
793 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 802 $root = $Deliantra::Data::TYPE{"Weak Wall"};
794 } else { 803 } else {
795 $root = $Crossfire::Data::TYPE{Misc}; 804 $root = $Deliantra::Data::TYPE{Misc};
796 } 805 }
797 } 806 }
798 807
799 my @import = ($root); 808 my @import = ($root);
800 809
801 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 810 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
802 unless $type == 116; 811 unless $type == 116;
803 812
804 my (%ignore); 813 my (%ignore);
805 my (@section_order, %section, @attr_order); 814 my (@section_order, %section, @attr_order);
806 815
807 while (my $type = shift @import) { 816 while (my $type = shift @import) {
817 push @import,
818 grep $_,
819 map $Deliantra::Data::TYPE{$_},
808 push @import, @{$type->{import} || []}; 820 @{$type->{import} || []};
809 821
810 $attr->{$_} ||= $type->{$_} 822 $attr->{$_} ||= $type->{$_}
811 for qw(name desc use); 823 for qw(name desc use);
812 824
813 for (@{$type->{ignore} || []}) { 825 for (@{$type->{ignore} || []}) {
… …
902} 914}
903 915
904sub construct_tilecache_pb { 916sub construct_tilecache_pb {
905 my ($idx, $cache) = @_; 917 my ($idx, $cache) = @_;
906 918
907 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;
908 920
909 while (my ($name, $tile) = each %$cache) { 921 while (my ($name, $tile) = each %$cache) {
910 my $tpb = delete $tile->{pb}; 922 my $tpb = delete $tile->{pb};
911 my $ofs = $tile->{idx}; 923 my $ofs = $tile->{idx};
912 924
913 for my $x (0 .. $tile->{w} - 1) { 925 for my $x (0 .. $tile->{w} - 1) {
914 for my $y (0 .. $tile->{h} - 1) { 926 for my $y (0 .. $tile->{h} - 1) {
915 my $idx = $ofs + $x + $y * $tile->{w}; 927 my $idx = $ofs + $x + $y * $tile->{w};
916 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, 928 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
917 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 929 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
918 } 930 }
919 } 931 }
920 } 932 }
921 933
922 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 934 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
… …
938=cut 950=cut
939 951
940sub load_tilecache() { 952sub load_tilecache() {
941 require Gtk2; 953 require Gtk2;
942 954
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, 955 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
975 sub { 956 sub {
976 my %cache; 957 my %cache;
977 my $facedata = Storable::retrieve "$LIB/facedata"; 958 my $facedata = Storable::retrieve "$LIB/facedata";
978 959
979 $facedata->{version} == 2 960 $facedata->{version} == 2
980 or die "$LIB/facedata: version mismatch, cannot proceed."; 961 or die "$LIB/facedata: version mismatch, cannot proceed.";
981 962
982 my $faces = $facedata->{faceinfo}; 963 my $faces = $facedata->{faceinfo};
983 my $idx = 0; 964 my $idx = 0;
984 965
985 for (sort keys %$faces) { 966 for (sort keys %$faces) {
986 my ($face, $info) = ($_, $faces->{$_}); 967 my ($face, $info) = ($_, $faces->{$_});
987 968
988 my $pb = new Gtk2::Gdk::PixbufLoader; 969 my $pb = new Gtk2::Gdk::PixbufLoader;
989 $pb->write ($info->{data32}); 970 $pb->write ($info->{data32});
990 $pb->close; 971 $pb->close;
991 my $pb = $pb->get_pixbuf; 972 my $pb = $pb->get_pixbuf;
992 973
993 my $tile = $cache{$face} = { 974 my $tile = $cache{$face} = {
994 pb => $pb, 975 pb => $pb,
995 idx => $idx, 976 idx => $idx,
996 w => int $pb->get_width / TILESIZE, 977 w => int $pb->get_width / TILESIZE,
997 h => int $pb->get_height / TILESIZE, 978 h => int $pb->get_height / TILESIZE,
998 }; 979 };
999 980
1000 $idx += $tile->{w} * $tile->{h}; 981 $idx += $tile->{w} * $tile->{h};
1001 } 982 }
1002 983
1003 construct_tilecache_pb $idx, \%cache; 984 construct_tilecache_pb $idx, \%cache;
1004 985
1005 \%cache 986 \%cache
1006 }; 987 };
1007 }
1008} 988}
1009 989
1010=head1 AUTHOR 990=head1 AUTHOR
1011 991
1012 Marc Lehmann <schmorp@schmorp.de> 992 Marc Lehmann <schmorp@schmorp.de>
… …
1016 http://www.ta-sa.org/ 996 http://www.ta-sa.org/
1017 997
1018=cut 998=cut
1019 999
10201 10001
1001

Diff Legend

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