[ViewVC] Diff of: cvs/deliantra/Deliantra/Deliantra.pm

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.118 by root, Wed Dec 5 11:39:26 2007 UTC vs.
Revision 1.147 by root, Wed Nov 7 12:04:36 2018 UTC

 =head1 NAME
-Crossfire - Crossfire maphandling
+Deliantra - Deliantra suppport module to read/write archetypes, maps etc.
+=over 4
 =cut
-package Crossfire;
+package Deliantra;
-our $VERSION = '1.13';
+our $VERSION = '2.01';
-use strict;
+use common::sense;
 use base 'Exporter';
 use Carp ();
 use File::Spec;
    editor_archs arch_extents
 );
 use JSON::XS qw(decode_json encode_json);
-our $LIB = $ENV{CROSSFIRE_LIBDIR};
+our $LIB = $ENV{DELIANTRA_LIBDIR};
-our $VARDIR = $ENV{HOME}    ? "$ENV{HOME}/.crossfire"
+our $VARDIR = $ENV{HOME}    ? "$ENV{HOME}/.deliantra"
-            : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
+            : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
-            : File::Spec->tmpdir . "/crossfire";
+            : File::Spec->tmpdir . "/deliantra";
 mkdir $VARDIR, 0777;
 sub TILESIZE    (){ 32 }
 sub CACHESTRIDE (){ 64 }
 # same as in server save routine, to (hopefully) be compatible
 # to the other editors.
 our @FIELD_ORDER_MAP = (qw(
    file_format_version
-   name attach swap_time reset_timeout fixed_resettime difficulty region
+   name attach swap_time reset_timeout fixed_resettime difficulty
+   region music
    shopitems shopgreed shopmin shopmax shoprace
    darkness width height enter_x enter_y msg maplore
    unique template
    outdoor temp pressure humid windspeed winddir sky nosmooth
    tile_path_1 tile_path_2 tile_path_3 tile_path_4
    elevation
    name name_pl custom_name attach title race
    slaying skill msg lore other_arch
-   face animation is_animated
+   sound sound_destroy face animation is_animated
-   magicmap smoothlevel smoothface
+   magicmap glyph smoothlevel smoothface
    str dex con wis pow cha int
    hp maxhp sp maxsp grace maxgrace
    exp perm_exp expmul
    food dam luck wc ac x y speed speed_left move_state attack_movement
    nrof level direction type subtype attacktype
    trigger => 10,
    close   => 11,
    timer   => 12,
 );
+# 1 up 2 right 4 down 8 left
+our %WALLDIR = (
+  0     =>  0,
+  1_2   =>  1,
+  1_4   =>  2,
+  2_2_1 =>  3,
+  1_1   =>  4,
+  2_1_1 =>  5,
+  2_2_2 =>  6,
+  3_2   =>  7,
+  1_3   =>  8,
+  2_2_4 =>  9,
+  2_1_2 => 10,
+  3_1   => 11,
+  2_2_3 => 12,
+  3_4   => 13,
+  3_3   => 14,
+  4     => 15,
+);
 sub MOVE_WALK      (){ 0x01 }
 sub MOVE_FLY_LOW   (){ 0x02 }
 sub MOVE_FLY_HIGH  (){ 0x04 }
 sub MOVE_FLYING    (){ 0x06 }
 sub MOVE_SWIM      (){ 0x08 }
    boat     => MOVE_BOAT,
    ship     => MOVE_SHIP,
    all      => MOVE_ALL,
 );
-our @MOVE_TYPE = keys %MOVE_TYPE;
+our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
 {
-   package Crossfire::MoveType;
+   package Deliantra::MoveType;
    use overload
       '='  => sub { bless [@{$_[0]}], ref $_[0] },
       '""' => \&as_string,
       '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
+      '<=' => sub {
+         ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
+            ? $_[0][1] & $MOVE_TYPE{$_[1]}
+            : undef
+      },
       '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |=  $MOVE_TYPE{$_[1]}; &normalise },
       '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
       '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
-      'x=' => sub {
+      'x=' => sub { # toggle between off, + and -
          my $cur = $_[0] >= $_[1];
          if (!defined $cur) {
             if ($_[0] >= "all") {
                $_[0] -= $_[1];
             } else {
          $_[0]
       },
       'eq' => sub { "$_[0]" eq "$_[1]" },
       'ne' => sub { "$_[0]" ne "$_[1]" },
    ;
-}
-sub Crossfire::MoveType::new {
+   sub TO_JSON {
+      $_[0][0]
+   }
+}
+sub Deliantra::MoveType::new {
    my ($class, $string) = @_;
    my $mask;
    my $value;
    }
    (bless [$mask, $value], $class)->normalise
 }
-sub Crossfire::MoveType::normalise {
+sub Deliantra::MoveType::normalise {
    my ($self) = @_;
    if ($self->[0] & MOVE_ALL) {
       my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
       $self->[0] &= $mask;
    $self->[1] &= $self->[0];
    $self
 }
-sub Crossfire::MoveType::as_string {
+sub Deliantra::MoveType::as_string {
    my ($self) = @_;
    my @res;
    my ($mask, $value) = @$self;
-   for (@Crossfire::MOVE_TYPE) {
+   for (@Deliantra::MOVE_TYPE) {
-      my $bit = $Crossfire::MOVE_TYPE{$_};
+      my $bit = $Deliantra::MOVE_TYPE{$_};
       if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
          $mask &= ~$bit;
          push @res, $value & $bit ? $_ : "-$_";
       }
    }
 # object as in "Object xxx", i.e. archetypes
 sub normalize_object($) {
    my ($ob) = @_;
+   delete $ob->{editable}; # deprecated
    # convert material bitset to materialname, if possible
    if (exists $ob->{material}) {
       if (!$ob->{material}) {
          delete $ob->{material};
       } elsif (exists $ob->{materialname}) {
    # convert movement strings to bitsets
    for my $attr (keys %FIELD_MOVEMENT) {
       next unless exists $ob->{$attr};
-      $ob->{$attr} = new Crossfire::MoveType $ob->{$attr};
+      $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
    }
    # convert outdated movement flags to new movement sets
    if (defined (my $v = delete $ob->{no_pass})) {
-      $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
+      $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
    }
    if (defined (my $v = delete $ob->{slow_move})) {
       $ob->{move_slow} += "walk";
       $ob->{move_slow_penalty} = $v;
    }
    if (defined (my $v = delete $ob->{walk_on})) {
-      $ob->{move_on}   ||= new Crossfire::MoveType; if ($v) { $ob->{move_on}  += "walk"     } else { $ob->{move_on}   -= "walk"    }
+      $ob->{move_on}   ||= new Deliantra::MoveType; if ($v) { $ob->{move_on}   += "walk"    } else { $ob->{move_on}   -= "walk"    }
    }
    if (defined (my $v = delete $ob->{walk_off})) {
-      $ob->{move_off}  ||= new Crossfire::MoveType; if ($v) { $ob->{move_off}  += "walk"    } else { $ob->{move_off}  -= "walk"    }
+      $ob->{move_off}  ||= new Deliantra::MoveType; if ($v) { $ob->{move_off}  += "walk"    } else { $ob->{move_off}  -= "walk"    }
    }
    if (defined (my $v = delete $ob->{fly_on})) {
-      $ob->{move_on}   ||= new Crossfire::MoveType; if ($v) { $ob->{move_on}   += "fly_low" } else { $ob->{move_on}   -= "fly_low" }
+      $ob->{move_on}   ||= new Deliantra::MoveType; if ($v) { $ob->{move_on}   += "fly_low" } else { $ob->{move_on}   -= "fly_low" }
    }
    if (defined (my $v = delete $ob->{fly_off})) {
-      $ob->{move_off}  ||= new Crossfire::MoveType; if ($v) { $ob->{move_off}  += "fly_low" } else { $ob->{move_off}  -= "fly_low" }
+      $ob->{move_off}  ||= new Deliantra::MoveType; if ($v) { $ob->{move_off}  += "fly_low" } else { $ob->{move_off}  -= "fly_low" }
    }
    if (defined (my $v = delete $ob->{flying})) {
-      $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
+      $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
    }
    # convert idiotic event_xxx things into objects
    while (my ($event, $subtype) = each %EVENT_TYPE) {
       if (exists $ob->{"event_${event}_plugin"}) {
 # arch as in "arch xxx", ie.. objects
 sub normalize_arch($) {
    my ($ob) = @_;
    normalize_object $ob;
+   return if $ob->{_atype} eq "object";
    my $arch = $ARCH{$ob->{_name}}
       or (warn "$ob->{_name}: no such archetype", return $ob);
    if ($arch->{type} == 22) { # map
 }
 sub attr_freeze($) {
    my ($ob) = @_;
-   $ob->{attach} = Crossfire::encode_json $ob->{attach}
+   $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
       if exists $ob->{attach};
    $ob
 }
    my %arc;
    my ($more, $prev);
    my $comment;
-   open my $fh, "<:raw:perlio:utf8", $path
+   open my $fh, "<:utf8", $path
       or Carp::croak "$path: $!";
 #  binmode $fh;
    my $parse_block; $parse_block = sub {
    my $str;
    my $append; $append = sub {
       my %a = %{$_[0]};
-      Crossfire::attr_freeze \%a;
+      Deliantra::attr_freeze \%a;
-      Crossfire::normalize_arch \%a;
+      Deliantra::normalize_arch \%a;
       # undo the bit-split we did before
       if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
          $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
                              | (delete $a{attack_movement_bits_4_7});
       }
       my @kv;
       for ($a{_name} eq "map"
-           ? @Crossfire::FIELD_ORDER_MAP
+           ? @Deliantra::FIELD_ORDER_MAP
-           : @Crossfire::FIELD_ORDER) {
+           : @Deliantra::FIELD_ORDER) {
          push @kv, [$_, delete $a{$_}]
             if exists $a{$_};
       }
       for (sort keys %a) {
       }
       for (@kv) {
          my ($k, $v) = @$_;
-         if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
+         if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
             $v =~ s/\n$//;
             $str .= "$k\n$v\n$end\n";
          } else {
             $str .= "$k $v\n";
          }
 =cut
 sub arch_attr($) {
    my ($obj) = @_;
-   require Crossfire::Data;
+   require Deliantra::Data;
    my $root;
    my $attr = { };
    my $arch = $ARCH{ $obj->{_name} };
    my $type = $obj->{type} || $arch->{type};
    if ($type > 0) {
-      $root = $Crossfire::Data::ATTR{$type};
+      $root = $Deliantra::Data::ATTR{$type};
    } else {
       my %a = (%$arch, %$obj);
       if ($a{is_floor} && !$a{alive}) {
-         $root = $Crossfire::Data::TYPE{Floor};
+         $root = $Deliantra::Data::TYPE{Floor};
       } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
-         $root = $Crossfire::Data::TYPE{"Monster & NPC"};
+         $root = $Deliantra::Data::TYPE{"Monster & NPC"};
       } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
-         $root = $Crossfire::Data::TYPE{Wall};
+         $root = $Deliantra::Data::TYPE{Wall};
       } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
-         $root = $Crossfire::Data::TYPE{"Weak Wall"};
+         $root = $Deliantra::Data::TYPE{"Weak Wall"};
       } else {
-         $root = $Crossfire::Data::TYPE{Misc};
+         $root = $Deliantra::Data::TYPE{Misc};
       }
    }
+   my (%ignore);
    my @import = ($root);
-   unshift @import, \%Crossfire::Data::DEFAULT_ATTR
-      unless $type == 116;
-   my (%ignore);
+   my @new_import;
-   my (@section_order, %section, @attr_order);
    while (my $type = shift @import) {
+      # first import everything we will need:
       push @import,
          grep $_,
-            map $Crossfire::Data::TYPE{$_},
+            map $Deliantra::Data::TYPE{$_},
                @{$type->{import} || []};
+      # and compute the ignored attributes
+      for (@{$type->{ignore} || []}) {
+         $ignore{$_}++ for ref $_ ? @$_ : $_;
+      }
+      push @new_import, $type;
+   }
+   (@import) = @new_import;
+   # then add defaults to the back of the list, so they are added
+   # as last resort.
+   push @import, \%Deliantra::Data::DEFAULT_ATTR
+      unless $type == 116;
+   my (@section_order, %section, @attr_order);
+   # @import = root, imported, default
+   while (my $type = pop @import) {
       $attr->{$_} ||= $type->{$_}
          for qw(name desc use);
-      for (@{$type->{ignore} || []}) {
-         $ignore{$_}++ for ref $_ ? @$_ : $_;
-      }
       for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
          my ($name, $attr) = @$_;
          push @section_order, $name;
          for (@$attr) {
             my ($k, $v) = @$_;
             push @attr_order, $k;
-            $section{$name}{$k} ||= $v;
+            $section{$name}{$k} = $v; # overwrite, so that the root decides
-         }
-      }
+         }
+      }
+   }
+   # remove ignores for "root" type
+   for (
+      map @{$_->[1]}, # section attributes
+        [general => ($root->{attr} || [])],
+        @{$root->{section} || []}
+   ) {
+      my ($k, $v) = @$_;
+      # skip fixed attributes, if they are ignored thats fine
+      next if $v->{type} eq 'fixed';
+      delete $ignore{$k}; # if the attributes are defined explicitly they
+                          # should NOT be ignored. ignore should mainly
+                          # hit imported/inherited attributes.
    }
    $attr->{section} = [
       map !exists $section{$_} ? () : do {
             my $attr = delete $section{$_};
                map exists $attr->{$_} && !$ignore{$_}
                       ? [$_ => delete $attr->{$_}] : (),
                    @attr_order
             ]
          },
          exists $section{$_} ? [$_ => delete $section{$_}] : (),
          @section_order
    ];
    $attr
 }
    require Gtk2;
    cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
       sub {
          my %cache;
-         my $facedata = Storable::retrieve "$LIB/facedata";
+         my $facedata = Storable::retrieve "$LIB/faceinfo";
+         open my $fh, "<", "$LIB/facedata"
+            or die "$LIB/facedata: $!";
          $facedata->{version} == 2
             or die "$LIB/facedata: version mismatch, cannot proceed.";
          my $faces = $facedata->{faceinfo};
          for (sort keys %$faces) {
             my ($face, $info) = ($_, $faces->{$_});
             my $pb = new Gtk2::Gdk::PixbufLoader;
+            if (exists $info->{data32}) {
-            $pb->write ($info->{data32});
+               $pb->write ($info->{data32});
+            } else {
+               sysseek $fh, $info->{fofs32}, 0;
+               sysread $fh, my $buf, $info->{size32};
+               $pb->write ($buf);
+            }
             $pb->close;
             my $pb = $pb->get_pixbuf;
             my $tile = $cache{$face} = {
                pb  => $pb,
          \%cache
       };
 }
+=back
 =head1 AUTHOR
  Marc Lehmann <schmorp@schmorp.de>
  http://home.schmorp.de/

Diff Legend

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

Comparing deliantra/Deliantra/Deliantra.pm (file contents): Revision 1.118 by root, Wed Dec 5 11:39:26 2007 UTC vs. Revision 1.147 by root, Wed Nov 7 12:04:36 2018 UTC

Diff Legend

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.118 by root, Wed Dec 5 11:39:26 2007 UTC vs.
Revision 1.147 by root, Wed Nov 7 12:04:36 2018 UTC