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.130 by root, Thu Jun 25 13:15:56 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 },
… …
177 $_[0] 182 $_[0]
178 }, 183 },
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}
183 187
184sub Crossfire::MoveType::new { 188 sub TO_JSON {
189 $_[0][0]
190 }
191}
192
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"}) {
… …
425# arch as in "arch xxx", ie.. objects 434# arch as in "arch xxx", ie.. objects
426sub normalize_arch($) { 435sub normalize_arch($) {
427 my ($ob) = @_; 436 my ($ob) = @_;
428 437
429 normalize_object $ob; 438 normalize_object $ob;
439
440 return if $ob->{_atype} eq "object";
430 441
431 my $arch = $ARCH{$ob->{_name}} 442 my $arch = $ARCH{$ob->{_name}}
432 or (warn "$ob->{_name}: no such archetype", return $ob); 443 or (warn "$ob->{_name}: no such archetype", return $ob);
433 444
434 if ($arch->{type} == 22) { # map 445 if ($arch->{type} == 22) { # map
… …
470} 481}
471 482
472sub attr_thaw($) { 483sub attr_thaw($) {
473 my ($ob) = @_; 484 my ($ob) = @_;
474 485
475 $ob->{attach} = from_json $ob->{attach} 486 $ob->{attach} = decode_json $ob->{attach}
476 if exists $ob->{attach}; 487 if exists $ob->{attach};
477 488
478 $ob 489 $ob
479} 490}
480 491
481sub attr_freeze($) { 492sub attr_freeze($) {
482 my ($ob) = @_; 493 my ($ob) = @_;
483 494
484 $ob->{attach} = Crossfire::to_json $ob->{attach} 495 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
485 if exists $ob->{attach}; 496 if exists $ob->{attach};
486 497
487 $ob 498 $ob
488} 499}
489 500
… …
509 520
510 my %arc; 521 my %arc;
511 my ($more, $prev); 522 my ($more, $prev);
512 my $comment; 523 my $comment;
513 524
514 open my $fh, "<:raw:perlio:utf8", $path 525 open my $fh, "<:utf8", $path
515 or Carp::croak "$path: $!"; 526 or Carp::croak "$path: $!";
516 527
517# binmode $fh; 528# binmode $fh;
518 529
519 my $parse_block; $parse_block = sub { 530 my $parse_block; $parse_block = sub {
… …
619 my $str; 630 my $str;
620 631
621 my $append; $append = sub { 632 my $append; $append = sub {
622 my %a = %{$_[0]}; 633 my %a = %{$_[0]};
623 634
624 Crossfire::attr_freeze \%a; 635 Deliantra::attr_freeze \%a;
625 Crossfire::normalize_arch \%a; 636 Deliantra::normalize_arch \%a;
626 637
627 # undo the bit-split we did before 638 # undo the bit-split we did before
628 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 639 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}) 640 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
630 | (delete $a{attack_movement_bits_4_7}); 641 | (delete $a{attack_movement_bits_4_7});
… …
648 } 659 }
649 660
650 my @kv; 661 my @kv;
651 662
652 for ($a{_name} eq "map" 663 for ($a{_name} eq "map"
653 ? @Crossfire::FIELD_ORDER_MAP 664 ? @Deliantra::FIELD_ORDER_MAP
654 : @Crossfire::FIELD_ORDER) { 665 : @Deliantra::FIELD_ORDER) {
655 push @kv, [$_, delete $a{$_}] 666 push @kv, [$_, delete $a{$_}]
656 if exists $a{$_}; 667 if exists $a{$_};
657 } 668 }
658 669
659 for (sort keys %a) { 670 for (sort keys %a) {
… …
662 } 673 }
663 674
664 for (@kv) { 675 for (@kv) {
665 my ($k, $v) = @$_; 676 my ($k, $v) = @$_;
666 677
667 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 678 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
668 $v =~ s/\n$//; 679 $v =~ s/\n$//;
669 $str .= "$k\n$v\n$end\n"; 680 $str .= "$k\n$v\n$end\n";
670 } else { 681 } else {
671 $str .= "$k $v\n"; 682 $str .= "$k $v\n";
672 } 683 }
… …
768=cut 779=cut
769 780
770sub arch_attr($) { 781sub arch_attr($) {
771 my ($obj) = @_; 782 my ($obj) = @_;
772 783
773 require Crossfire::Data; 784 require Deliantra::Data;
774 785
775 my $root; 786 my $root;
776 my $attr = { }; 787 my $attr = { };
777 788
778 my $arch = $ARCH{ $obj->{_name} }; 789 my $arch = $ARCH{ $obj->{_name} };
779 my $type = $obj->{type} || $arch->{type}; 790 my $type = $obj->{type} || $arch->{type};
780 791
781 if ($type > 0) { 792 if ($type > 0) {
782 $root = $Crossfire::Data::ATTR{$type}; 793 $root = $Deliantra::Data::ATTR{$type};
783 } else { 794 } else {
784 my %a = (%$arch, %$obj); 795 my %a = (%$arch, %$obj);
785 796
786 if ($a{is_floor} && !$a{alive}) { 797 if ($a{is_floor} && !$a{alive}) {
787 $root = $Crossfire::Data::TYPE{Floor}; 798 $root = $Deliantra::Data::TYPE{Floor};
788 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 799 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
789 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 800 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
790 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 801 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
791 $root = $Crossfire::Data::TYPE{Wall}; 802 $root = $Deliantra::Data::TYPE{Wall};
792 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 803 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
793 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 804 $root = $Deliantra::Data::TYPE{"Weak Wall"};
794 } else { 805 } else {
795 $root = $Crossfire::Data::TYPE{Misc}; 806 $root = $Deliantra::Data::TYPE{Misc};
796 } 807 }
797 } 808 }
798 809
799 my @import = ($root); 810 my @import = ($root);
800 811
801 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 812 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
802 unless $type == 116; 813 unless $type == 116;
803 814
804 my (%ignore); 815 my (%ignore);
805 my (@section_order, %section, @attr_order); 816 my (@section_order, %section, @attr_order);
806 817
807 while (my $type = shift @import) { 818 while (my $type = shift @import) {
819 push @import,
820 grep $_,
821 map $Deliantra::Data::TYPE{$_},
808 push @import, @{$type->{import} || []}; 822 @{$type->{import} || []};
809 823
810 $attr->{$_} ||= $type->{$_} 824 $attr->{$_} ||= $type->{$_}
811 for qw(name desc use); 825 for qw(name desc use);
812 826
813 for (@{$type->{ignore} || []}) { 827 for (@{$type->{ignore} || []}) {
… …
902} 916}
903 917
904sub construct_tilecache_pb { 918sub construct_tilecache_pb {
905 my ($idx, $cache) = @_; 919 my ($idx, $cache) = @_;
906 920
907 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64; 921 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
908 922
909 while (my ($name, $tile) = each %$cache) { 923 while (my ($name, $tile) = each %$cache) {
910 my $tpb = delete $tile->{pb}; 924 my $tpb = delete $tile->{pb};
911 my $ofs = $tile->{idx}; 925 my $ofs = $tile->{idx};
912 926
913 for my $x (0 .. $tile->{w} - 1) { 927 for my $x (0 .. $tile->{w} - 1) {
914 for my $y (0 .. $tile->{h} - 1) { 928 for my $y (0 .. $tile->{h} - 1) {
915 my $idx = $ofs + $x + $y * $tile->{w}; 929 my $idx = $ofs + $x + $y * $tile->{w};
916 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, 930 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
917 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 931 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
918 } 932 }
919 } 933 }
920 } 934 }
921 935
922 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 936 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
… …
938=cut 952=cut
939 953
940sub load_tilecache() { 954sub load_tilecache() {
941 require Gtk2; 955 require Gtk2;
942 956
943 if (-e "$LIB/facedata") { # Crossfire TRT faces
944 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache, 957 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
945 sub { 958 sub {
946 my %cache; 959 my %cache;
947 my $facedata = Storable::retrieve "$LIB/facedata"; 960 my $facedata = Storable::retrieve "$LIB/facedata";
948 961
949 $facedata->{version} == 2 962 $facedata->{version} == 2
950 or die "$LIB/facedata: version mismatch, cannot proceed."; 963 or die "$LIB/facedata: version mismatch, cannot proceed.";
951 964
952 my $faces = $facedata->{faceinfo}; 965 my $faces = $facedata->{faceinfo};
953 my $idx = 0; 966 my $idx = 0;
954 967
955 for (sort keys %$faces) { 968 for (sort keys %$faces) {
956 my ($face, $info) = ($_, $faces->{$_}); 969 my ($face, $info) = ($_, $faces->{$_});
957 970
958 my $pb = new Gtk2::Gdk::PixbufLoader; 971 my $pb = new Gtk2::Gdk::PixbufLoader;
959 $pb->write ($info->{data32}); 972 $pb->write ($info->{data32});
960 $pb->close; 973 $pb->close;
961 my $pb = $pb->get_pixbuf; 974 my $pb = $pb->get_pixbuf;
962 975
963 my $tile = $cache{$face} = { 976 my $tile = $cache{$face} = {
964 pb => $pb, 977 pb => $pb,
965 idx => $idx, 978 idx => $idx,
966 w => int $pb->get_width / TILESIZE, 979 w => int $pb->get_width / TILESIZE,
967 h => int $pb->get_height / TILESIZE, 980 h => int $pb->get_height / TILESIZE,
968 }; 981 };
969 982
970 $idx += $tile->{w} * $tile->{h}; 983 $idx += $tile->{w} * $tile->{h};
971 } 984 }
972 985
973 construct_tilecache_pb $idx, \%cache; 986 construct_tilecache_pb $idx, \%cache;
974 987
975 \%cache 988 \%cache
976 }; 989 };
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} 990}
1010 991
1011=head1 AUTHOR 992=head1 AUTHOR
1012 993
1013 Marc Lehmann <schmorp@schmorp.de> 994 Marc Lehmann <schmorp@schmorp.de>
… …
1017 http://www.ta-sa.org/ 998 http://www.ta-sa.org/
1018 999
1019=cut 1000=cut
1020 1001
10211 10021
1003

Diff Legend

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