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.118 by root, Wed Dec 5 11:39:26 2007 UTC vs.
Revision 1.119 by root, Wed Dec 26 18:05:00 2007 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 = '1.13'; 9our $VERSION = '1.13';
10 10
11use strict; 11use strict;
12 12
… …
154); 154);
155 155
156our @MOVE_TYPE = keys %MOVE_TYPE; 156our @MOVE_TYPE = keys %MOVE_TYPE;
157 157
158{ 158{
159 package Crossfire::MoveType; 159 package Deliantra::MoveType;
160 160
161 use overload 161 use overload
162 '=' => sub { bless [@{$_[0]}], ref $_[0] }, 162 '=' => sub { bless [@{$_[0]}], ref $_[0] },
163 '""' => \&as_string, 163 '""' => \&as_string,
164 '>=' => 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 },
… …
184 'eq' => sub { "$_[0]" eq "$_[1]" }, 184 'eq' => sub { "$_[0]" eq "$_[1]" },
185 'ne' => sub { "$_[0]" ne "$_[1]" }, 185 'ne' => sub { "$_[0]" ne "$_[1]" },
186 ; 186 ;
187} 187}
188 188
189sub Crossfire::MoveType::new { 189sub Deliantra::MoveType::new {
190 my ($class, $string) = @_; 190 my ($class, $string) = @_;
191 191
192 my $mask; 192 my $mask;
193 my $value; 193 my $value;
194 194
… …
208 } 208 }
209 209
210 (bless [$mask, $value], $class)->normalise 210 (bless [$mask, $value], $class)->normalise
211} 211}
212 212
213sub Crossfire::MoveType::normalise { 213sub Deliantra::MoveType::normalise {
214 my ($self) = @_; 214 my ($self) = @_;
215 215
216 if ($self->[0] & MOVE_ALL) { 216 if ($self->[0] & MOVE_ALL) {
217 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);
218 $self->[0] &= $mask; 218 $self->[0] &= $mask;
… …
222 $self->[1] &= $self->[0]; 222 $self->[1] &= $self->[0];
223 223
224 $self 224 $self
225} 225}
226 226
227sub Crossfire::MoveType::as_string { 227sub Deliantra::MoveType::as_string {
228 my ($self) = @_; 228 my ($self) = @_;
229 229
230 my @res; 230 my @res;
231 231
232 my ($mask, $value) = @$self; 232 my ($mask, $value) = @$self;
233 233
234 for (@Crossfire::MOVE_TYPE) { 234 for (@Deliantra::MOVE_TYPE) {
235 my $bit = $Crossfire::MOVE_TYPE{$_}; 235 my $bit = $Deliantra::MOVE_TYPE{$_};
236 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 236 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
237 $mask &= ~$bit; 237 $mask &= ~$bit;
238 push @res, $value & $bit ? $_ : "-$_"; 238 push @res, $value & $bit ? $_ : "-$_";
239 } 239 }
240 } 240 }
… …
380 380
381 # convert movement strings to bitsets 381 # convert movement strings to bitsets
382 for my $attr (keys %FIELD_MOVEMENT) { 382 for my $attr (keys %FIELD_MOVEMENT) {
383 next unless exists $ob->{$attr}; 383 next unless exists $ob->{$attr};
384 384
385 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 385 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
386 } 386 }
387 387
388 # convert outdated movement flags to new movement sets 388 # convert outdated movement flags to new movement sets
389 if (defined (my $v = delete $ob->{no_pass})) { 389 if (defined (my $v = delete $ob->{no_pass})) {
390 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 390 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
391 } 391 }
392 if (defined (my $v = delete $ob->{slow_move})) { 392 if (defined (my $v = delete $ob->{slow_move})) {
393 $ob->{move_slow} += "walk"; 393 $ob->{move_slow} += "walk";
394 $ob->{move_slow_penalty} = $v; 394 $ob->{move_slow_penalty} = $v;
395 } 395 }
396 if (defined (my $v = delete $ob->{walk_on})) { 396 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" } 397 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
398 } 398 }
399 if (defined (my $v = delete $ob->{walk_off})) { 399 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" } 400 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
401 } 401 }
402 if (defined (my $v = delete $ob->{fly_on})) { 402 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" } 403 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
404 } 404 }
405 if (defined (my $v = delete $ob->{fly_off})) { 405 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" } 406 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
407 } 407 }
408 if (defined (my $v = delete $ob->{flying})) { 408 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" } 409 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
410 } 410 }
411 411
412 # convert idiotic event_xxx things into objects 412 # convert idiotic event_xxx things into objects
413 while (my ($event, $subtype) = each %EVENT_TYPE) { 413 while (my ($event, $subtype) = each %EVENT_TYPE) {
414 if (exists $ob->{"event_${event}_plugin"}) { 414 if (exists $ob->{"event_${event}_plugin"}) {
… …
484} 484}
485 485
486sub attr_freeze($) { 486sub attr_freeze($) {
487 my ($ob) = @_; 487 my ($ob) = @_;
488 488
489 $ob->{attach} = Crossfire::encode_json $ob->{attach} 489 $ob->{attach} = Deliantra::encode_json $ob->{attach}
490 if exists $ob->{attach}; 490 if exists $ob->{attach};
491 491
492 $ob 492 $ob
493} 493}
494 494
… …
624 my $str; 624 my $str;
625 625
626 my $append; $append = sub { 626 my $append; $append = sub {
627 my %a = %{$_[0]}; 627 my %a = %{$_[0]};
628 628
629 Crossfire::attr_freeze \%a; 629 Deliantra::attr_freeze \%a;
630 Crossfire::normalize_arch \%a; 630 Deliantra::normalize_arch \%a;
631 631
632 # undo the bit-split we did before 632 # undo the bit-split we did before
633 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}) {
634 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 634 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
635 | (delete $a{attack_movement_bits_4_7}); 635 | (delete $a{attack_movement_bits_4_7});
… …
653 } 653 }
654 654
655 my @kv; 655 my @kv;
656 656
657 for ($a{_name} eq "map" 657 for ($a{_name} eq "map"
658 ? @Crossfire::FIELD_ORDER_MAP 658 ? @Deliantra::FIELD_ORDER_MAP
659 : @Crossfire::FIELD_ORDER) { 659 : @Deliantra::FIELD_ORDER) {
660 push @kv, [$_, delete $a{$_}] 660 push @kv, [$_, delete $a{$_}]
661 if exists $a{$_}; 661 if exists $a{$_};
662 } 662 }
663 663
664 for (sort keys %a) { 664 for (sort keys %a) {
… …
667 } 667 }
668 668
669 for (@kv) { 669 for (@kv) {
670 my ($k, $v) = @$_; 670 my ($k, $v) = @$_;
671 671
672 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 672 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
673 $v =~ s/\n$//; 673 $v =~ s/\n$//;
674 $str .= "$k\n$v\n$end\n"; 674 $str .= "$k\n$v\n$end\n";
675 } else { 675 } else {
676 $str .= "$k $v\n"; 676 $str .= "$k $v\n";
677 } 677 }
… …
773=cut 773=cut
774 774
775sub arch_attr($) { 775sub arch_attr($) {
776 my ($obj) = @_; 776 my ($obj) = @_;
777 777
778 require Crossfire::Data; 778 require Deliantra::Data;
779 779
780 my $root; 780 my $root;
781 my $attr = { }; 781 my $attr = { };
782 782
783 my $arch = $ARCH{ $obj->{_name} }; 783 my $arch = $ARCH{ $obj->{_name} };
784 my $type = $obj->{type} || $arch->{type}; 784 my $type = $obj->{type} || $arch->{type};
785 785
786 if ($type > 0) { 786 if ($type > 0) {
787 $root = $Crossfire::Data::ATTR{$type}; 787 $root = $Deliantra::Data::ATTR{$type};
788 } else { 788 } else {
789 my %a = (%$arch, %$obj); 789 my %a = (%$arch, %$obj);
790 790
791 if ($a{is_floor} && !$a{alive}) { 791 if ($a{is_floor} && !$a{alive}) {
792 $root = $Crossfire::Data::TYPE{Floor}; 792 $root = $Deliantra::Data::TYPE{Floor};
793 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 793 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
794 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 794 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
795 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 795 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
796 $root = $Crossfire::Data::TYPE{Wall}; 796 $root = $Deliantra::Data::TYPE{Wall};
797 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 797 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
798 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 798 $root = $Deliantra::Data::TYPE{"Weak Wall"};
799 } else { 799 } else {
800 $root = $Crossfire::Data::TYPE{Misc}; 800 $root = $Deliantra::Data::TYPE{Misc};
801 } 801 }
802 } 802 }
803 803
804 my @import = ($root); 804 my @import = ($root);
805 805
806 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 806 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
807 unless $type == 116; 807 unless $type == 116;
808 808
809 my (%ignore); 809 my (%ignore);
810 my (@section_order, %section, @attr_order); 810 my (@section_order, %section, @attr_order);
811 811
812 while (my $type = shift @import) { 812 while (my $type = shift @import) {
813 push @import, 813 push @import,
814 grep $_, 814 grep $_,
815 map $Crossfire::Data::TYPE{$_}, 815 map $Deliantra::Data::TYPE{$_},
816 @{$type->{import} || []}; 816 @{$type->{import} || []};
817 817
818 $attr->{$_} ||= $type->{$_} 818 $attr->{$_} ||= $type->{$_}
819 for qw(name desc use); 819 for qw(name desc use);
820 820

Diff Legend

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