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.116 by root, Thu Nov 8 01:21:54 2007 UTC vs.
Revision 1.141 by root, Mon Mar 22 00:58:17 2010 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire - Crossfire maphandling 3Deliantra - Deliantra suppport module to read/write archetypes, maps etc.
4
5=over 4
4 6
5=cut 7=cut
6 8
7package Crossfire; 9package Deliantra;
8 10
9our $VERSION = '1.11'; 11our $VERSION = '1.30';
10 12
11use strict; 13use common::sense;
12 14
13use base 'Exporter'; 15use base 'Exporter';
14 16
15use Carp (); 17use Carp ();
16use File::Spec; 18use File::Spec;
… …
22 *ARCH $TILE *FACE *FACEDATA 24 *ARCH $TILE *FACE *FACEDATA
23 TILESIZE CACHESTRIDE 25 TILESIZE CACHESTRIDE
24 editor_archs arch_extents 26 editor_archs arch_extents
25); 27);
26 28
27use JSON::XS qw(from_json to_json); 29use JSON::XS qw(decode_json encode_json);
28 30
29our $LIB = $ENV{CROSSFIRE_LIBDIR}; 31our $LIB = $ENV{DELIANTRA_LIBDIR};
30 32
31our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" 33our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
32 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 34 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
33 : File::Spec->tmpdir . "/crossfire"; 35 : File::Spec->tmpdir . "/deliantra";
34 36
35mkdir $VARDIR, 0777; 37mkdir $VARDIR, 0777;
36 38
37sub TILESIZE (){ 32 } 39sub TILESIZE (){ 32 }
38sub CACHESTRIDE (){ 64 } 40sub CACHESTRIDE (){ 64 }
… …
69 71
70 elevation 72 elevation
71 73
72 name name_pl custom_name attach title race 74 name name_pl custom_name attach title race
73 slaying skill msg lore other_arch 75 slaying skill msg lore other_arch
74 face animation is_animated 76 sound sound_destroy face animation is_animated
75 magicmap smoothlevel smoothface 77 magicmap smoothlevel smoothface
76 str dex con wis pow cha int 78 str dex con wis pow cha int
77 hp maxhp sp maxsp grace maxgrace 79 hp maxhp sp maxsp grace maxgrace
78 exp perm_exp expmul 80 exp perm_exp expmul
79 food dam luck wc ac x y speed speed_left move_state attack_movement 81 food dam luck wc ac x y speed speed_left move_state attack_movement
… …
151 boat => MOVE_BOAT, 153 boat => MOVE_BOAT,
152 ship => MOVE_SHIP, 154 ship => MOVE_SHIP,
153 all => MOVE_ALL, 155 all => MOVE_ALL,
154); 156);
155 157
156our @MOVE_TYPE = keys %MOVE_TYPE; 158our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
157 159
158{ 160{
159 package Crossfire::MoveType; 161 package Deliantra::MoveType;
160 162
161 use overload 163 use overload
162 '=' => sub { bless [@{$_[0]}], ref $_[0] }, 164 '=' => sub { bless [@{$_[0]}], ref $_[0] },
163 '""' => \&as_string, 165 '""' => \&as_string,
164 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef }, 166 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
167 '<=' => sub {
168 ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
169 ? $_[0][1] & $MOVE_TYPE{$_[1]}
170 : undef
171 },
165 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise }, 172 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
166 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 173 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
167 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 174 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
168 'x=' => sub { 175 'x=' => sub { # toggle between off, + and -
169 my $cur = $_[0] >= $_[1]; 176 my $cur = $_[0] >= $_[1];
170 if (!defined $cur) { 177 if (!defined $cur) {
171 if ($_[0] >= "all") { 178 if ($_[0] >= "all") {
172 $_[0] -= $_[1]; 179 $_[0] -= $_[1];
173 } else { 180 } else {
… …
182 $_[0] 189 $_[0]
183 }, 190 },
184 'eq' => sub { "$_[0]" eq "$_[1]" }, 191 'eq' => sub { "$_[0]" eq "$_[1]" },
185 'ne' => sub { "$_[0]" ne "$_[1]" }, 192 'ne' => sub { "$_[0]" ne "$_[1]" },
186 ; 193 ;
187}
188 194
189sub Crossfire::MoveType::new { 195 sub TO_JSON {
196 $_[0][0]
197 }
198}
199
200sub Deliantra::MoveType::new {
190 my ($class, $string) = @_; 201 my ($class, $string) = @_;
191 202
192 my $mask; 203 my $mask;
193 my $value; 204 my $value;
194 205
… …
208 } 219 }
209 220
210 (bless [$mask, $value], $class)->normalise 221 (bless [$mask, $value], $class)->normalise
211} 222}
212 223
213sub Crossfire::MoveType::normalise { 224sub Deliantra::MoveType::normalise {
214 my ($self) = @_; 225 my ($self) = @_;
215 226
216 if ($self->[0] & MOVE_ALL) { 227 if ($self->[0] & MOVE_ALL) {
217 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); 228 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
218 $self->[0] &= $mask; 229 $self->[0] &= $mask;
… …
222 $self->[1] &= $self->[0]; 233 $self->[1] &= $self->[0];
223 234
224 $self 235 $self
225} 236}
226 237
227sub Crossfire::MoveType::as_string { 238sub Deliantra::MoveType::as_string {
228 my ($self) = @_; 239 my ($self) = @_;
229 240
230 my @res; 241 my @res;
231 242
232 my ($mask, $value) = @$self; 243 my ($mask, $value) = @$self;
233 244
234 for (@Crossfire::MOVE_TYPE) { 245 for (@Deliantra::MOVE_TYPE) {
235 my $bit = $Crossfire::MOVE_TYPE{$_}; 246 my $bit = $Deliantra::MOVE_TYPE{$_};
236 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 247 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
237 $mask &= ~$bit; 248 $mask &= ~$bit;
238 push @res, $value & $bit ? $_ : "-$_"; 249 push @res, $value & $bit ? $_ : "-$_";
239 } 250 }
240 } 251 }
… …
333 344
334# object as in "Object xxx", i.e. archetypes 345# object as in "Object xxx", i.e. archetypes
335sub normalize_object($) { 346sub normalize_object($) {
336 my ($ob) = @_; 347 my ($ob) = @_;
337 348
349 delete $ob->{editable}; # deprecated
350
338 # convert material bitset to materialname, if possible 351 # convert material bitset to materialname, if possible
339 if (exists $ob->{material}) { 352 if (exists $ob->{material}) {
340 if (!$ob->{material}) { 353 if (!$ob->{material}) {
341 delete $ob->{material}; 354 delete $ob->{material};
342 } elsif (exists $ob->{materialname}) { 355 } elsif (exists $ob->{materialname}) {
… …
380 393
381 # convert movement strings to bitsets 394 # convert movement strings to bitsets
382 for my $attr (keys %FIELD_MOVEMENT) { 395 for my $attr (keys %FIELD_MOVEMENT) {
383 next unless exists $ob->{$attr}; 396 next unless exists $ob->{$attr};
384 397
385 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 398 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
386 } 399 }
387 400
388 # convert outdated movement flags to new movement sets 401 # convert outdated movement flags to new movement sets
389 if (defined (my $v = delete $ob->{no_pass})) { 402 if (defined (my $v = delete $ob->{no_pass})) {
390 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 403 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
391 } 404 }
392 if (defined (my $v = delete $ob->{slow_move})) { 405 if (defined (my $v = delete $ob->{slow_move})) {
393 $ob->{move_slow} += "walk"; 406 $ob->{move_slow} += "walk";
394 $ob->{move_slow_penalty} = $v; 407 $ob->{move_slow_penalty} = $v;
395 } 408 }
396 if (defined (my $v = delete $ob->{walk_on})) { 409 if (defined (my $v = delete $ob->{walk_on})) {
397 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" } 410 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
398 } 411 }
399 if (defined (my $v = delete $ob->{walk_off})) { 412 if (defined (my $v = delete $ob->{walk_off})) {
400 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" } 413 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
401 } 414 }
402 if (defined (my $v = delete $ob->{fly_on})) { 415 if (defined (my $v = delete $ob->{fly_on})) {
403 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" } 416 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
404 } 417 }
405 if (defined (my $v = delete $ob->{fly_off})) { 418 if (defined (my $v = delete $ob->{fly_off})) {
406 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" } 419 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
407 } 420 }
408 if (defined (my $v = delete $ob->{flying})) { 421 if (defined (my $v = delete $ob->{flying})) {
409 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" } 422 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
410 } 423 }
411 424
412 # convert idiotic event_xxx things into objects 425 # convert idiotic event_xxx things into objects
413 while (my ($event, $subtype) = each %EVENT_TYPE) { 426 while (my ($event, $subtype) = each %EVENT_TYPE) {
414 if (exists $ob->{"event_${event}_plugin"}) { 427 if (exists $ob->{"event_${event}_plugin"}) {
… …
430# arch as in "arch xxx", ie.. objects 443# arch as in "arch xxx", ie.. objects
431sub normalize_arch($) { 444sub normalize_arch($) {
432 my ($ob) = @_; 445 my ($ob) = @_;
433 446
434 normalize_object $ob; 447 normalize_object $ob;
448
449 return if $ob->{_atype} eq "object";
435 450
436 my $arch = $ARCH{$ob->{_name}} 451 my $arch = $ARCH{$ob->{_name}}
437 or (warn "$ob->{_name}: no such archetype", return $ob); 452 or (warn "$ob->{_name}: no such archetype", return $ob);
438 453
439 if ($arch->{type} == 22) { # map 454 if ($arch->{type} == 22) { # map
… …
475} 490}
476 491
477sub attr_thaw($) { 492sub attr_thaw($) {
478 my ($ob) = @_; 493 my ($ob) = @_;
479 494
480 $ob->{attach} = from_json $ob->{attach} 495 $ob->{attach} = decode_json $ob->{attach}
481 if exists $ob->{attach}; 496 if exists $ob->{attach};
482 497
483 $ob 498 $ob
484} 499}
485 500
486sub attr_freeze($) { 501sub attr_freeze($) {
487 my ($ob) = @_; 502 my ($ob) = @_;
488 503
489 $ob->{attach} = Crossfire::to_json $ob->{attach} 504 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
490 if exists $ob->{attach}; 505 if exists $ob->{attach};
491 506
492 $ob 507 $ob
493} 508}
494 509
… …
514 529
515 my %arc; 530 my %arc;
516 my ($more, $prev); 531 my ($more, $prev);
517 my $comment; 532 my $comment;
518 533
519 open my $fh, "<:raw:perlio:utf8", $path 534 open my $fh, "<:utf8", $path
520 or Carp::croak "$path: $!"; 535 or Carp::croak "$path: $!";
521 536
522# binmode $fh; 537# binmode $fh;
523 538
524 my $parse_block; $parse_block = sub { 539 my $parse_block; $parse_block = sub {
… …
624 my $str; 639 my $str;
625 640
626 my $append; $append = sub { 641 my $append; $append = sub {
627 my %a = %{$_[0]}; 642 my %a = %{$_[0]};
628 643
629 Crossfire::attr_freeze \%a; 644 Deliantra::attr_freeze \%a;
630 Crossfire::normalize_arch \%a; 645 Deliantra::normalize_arch \%a;
631 646
632 # undo the bit-split we did before 647 # undo the bit-split we did before
633 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 648 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
634 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 649 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
635 | (delete $a{attack_movement_bits_4_7}); 650 | (delete $a{attack_movement_bits_4_7});
… …
653 } 668 }
654 669
655 my @kv; 670 my @kv;
656 671
657 for ($a{_name} eq "map" 672 for ($a{_name} eq "map"
658 ? @Crossfire::FIELD_ORDER_MAP 673 ? @Deliantra::FIELD_ORDER_MAP
659 : @Crossfire::FIELD_ORDER) { 674 : @Deliantra::FIELD_ORDER) {
660 push @kv, [$_, delete $a{$_}] 675 push @kv, [$_, delete $a{$_}]
661 if exists $a{$_}; 676 if exists $a{$_};
662 } 677 }
663 678
664 for (sort keys %a) { 679 for (sort keys %a) {
… …
667 } 682 }
668 683
669 for (@kv) { 684 for (@kv) {
670 my ($k, $v) = @$_; 685 my ($k, $v) = @$_;
671 686
672 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 687 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
673 $v =~ s/\n$//; 688 $v =~ s/\n$//;
674 $str .= "$k\n$v\n$end\n"; 689 $str .= "$k\n$v\n$end\n";
675 } else { 690 } else {
676 $str .= "$k $v\n"; 691 $str .= "$k $v\n";
677 } 692 }
… …
773=cut 788=cut
774 789
775sub arch_attr($) { 790sub arch_attr($) {
776 my ($obj) = @_; 791 my ($obj) = @_;
777 792
778 require Crossfire::Data; 793 require Deliantra::Data;
779 794
780 my $root; 795 my $root;
781 my $attr = { }; 796 my $attr = { };
782 797
783 my $arch = $ARCH{ $obj->{_name} }; 798 my $arch = $ARCH{ $obj->{_name} };
784 my $type = $obj->{type} || $arch->{type}; 799 my $type = $obj->{type} || $arch->{type};
785 800
786 if ($type > 0) { 801 if ($type > 0) {
787 $root = $Crossfire::Data::ATTR{$type}; 802 $root = $Deliantra::Data::ATTR{$type};
788 } else { 803 } else {
789 my %a = (%$arch, %$obj); 804 my %a = (%$arch, %$obj);
790 805
791 if ($a{is_floor} && !$a{alive}) { 806 if ($a{is_floor} && !$a{alive}) {
792 $root = $Crossfire::Data::TYPE{Floor}; 807 $root = $Deliantra::Data::TYPE{Floor};
793 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 808 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
794 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 809 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
795 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 810 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
796 $root = $Crossfire::Data::TYPE{Wall}; 811 $root = $Deliantra::Data::TYPE{Wall};
797 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 812 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
798 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 813 $root = $Deliantra::Data::TYPE{"Weak Wall"};
799 } else { 814 } else {
800 $root = $Crossfire::Data::TYPE{Misc}; 815 $root = $Deliantra::Data::TYPE{Misc};
801 } 816 }
802 } 817 }
803 818
819 my (%ignore);
804 my @import = ($root); 820 my @import = ($root);
805
806 unshift @import, \%Crossfire::Data::DEFAULT_ATTR
807 unless $type == 116;
808 821
809 my (%ignore); 822 my @new_import;
810 my (@section_order, %section, @attr_order);
811
812 while (my $type = shift @import) { 823 while (my $type = shift @import) {
824 # first import everything we will need:
813 push @import, 825 push @import,
814 grep $_, 826 grep $_,
815 map $Crossfire::Data::TYPE{$_}, 827 map $Deliantra::Data::TYPE{$_},
816 @{$type->{import} || []}; 828 @{$type->{import} || []};
817 829
830 # and compute the ignored attributes
831 for (@{$type->{ignore} || []}) {
832 $ignore{$_}++ for ref $_ ? @$_ : $_;
833 }
834
835 push @new_import, $type;
836 }
837 (@import) = @new_import;
838
839 # then add defaults to the back of the list, so they are added
840 # as last resort.
841 push @import, \%Deliantra::Data::DEFAULT_ATTR
842 unless $type == 116;
843
844 my (@section_order, %section, @attr_order);
845
846 # @import = root, imported, default
847 while (my $type = pop @import) {
818 $attr->{$_} ||= $type->{$_} 848 $attr->{$_} ||= $type->{$_}
819 for qw(name desc use); 849 for qw(name desc use);
820
821 for (@{$type->{ignore} || []}) {
822 $ignore{$_}++ for ref $_ ? @$_ : $_;
823 }
824 850
825 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 851 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
826 my ($name, $attr) = @$_; 852 my ($name, $attr) = @$_;
827 push @section_order, $name; 853 push @section_order, $name;
828 for (@$attr) { 854 for (@$attr) {
829 my ($k, $v) = @$_; 855 my ($k, $v) = @$_;
830 push @attr_order, $k; 856 push @attr_order, $k;
831 $section{$name}{$k} ||= $v; 857 $section{$name}{$k} = $v; # overwrite, so that the root decides
832 }
833 } 858 }
859 }
860 }
861
862 # remove ignores for "root" type
863 for (
864 map @{$_->[1]}, # section attributes
865 [general => ($root->{attr} || [])],
866 @{$root->{section} || []}
867 ) {
868 my ($k, $v) = @$_;
869 # skip fixed attributes, if they are ignored thats fine
870 next if $v->{type} eq 'fixed';
871
872 delete $ignore{$k}; # if the attributes are defined explicitly they
873 # should NOT be ignored. ignore should mainly
874 # hit imported/inherited attributes.
834 } 875 }
835 876
836 $attr->{section} = [ 877 $attr->{section} = [
837 map !exists $section{$_} ? () : do { 878 map !exists $section{$_} ? () : do {
838 my $attr = delete $section{$_}; 879 my $attr = delete $section{$_};
… …
842 map exists $attr->{$_} && !$ignore{$_} 883 map exists $attr->{$_} && !$ignore{$_}
843 ? [$_ => delete $attr->{$_}] : (), 884 ? [$_ => delete $attr->{$_}] : (),
844 @attr_order 885 @attr_order
845 ] 886 ]
846 }, 887 },
847
848 exists $section{$_} ? [$_ => delete $section{$_}] : (), 888 exists $section{$_} ? [$_ => delete $section{$_}] : (),
849 @section_order 889 @section_order
850 ]; 890 ];
851 891
852 $attr 892 $attr
853} 893}
… …
981 1021
982 \%cache 1022 \%cache
983 }; 1023 };
984} 1024}
985 1025
1026=back
1027
986=head1 AUTHOR 1028=head1 AUTHOR
987 1029
988 Marc Lehmann <schmorp@schmorp.de> 1030 Marc Lehmann <schmorp@schmorp.de>
989 http://home.schmorp.de/ 1031 http://home.schmorp.de/
990 1032

Diff Legend

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