… | |
… | |
4 | |
4 | |
5 | =cut |
5 | =cut |
6 | |
6 | |
7 | package Deliantra; |
7 | package Deliantra; |
8 | |
8 | |
9 | our $VERSION = '1.14'; |
9 | our $VERSION = '1.25'; |
10 | |
10 | |
11 | use strict; |
11 | use common::sense; |
12 | |
12 | |
13 | use base 'Exporter'; |
13 | use base 'Exporter'; |
14 | |
14 | |
15 | use Carp (); |
15 | use Carp (); |
16 | use File::Spec; |
16 | use File::Spec; |
… | |
… | |
24 | editor_archs arch_extents |
24 | editor_archs arch_extents |
25 | ); |
25 | ); |
26 | |
26 | |
27 | use JSON::XS qw(decode_json encode_json); |
27 | use JSON::XS qw(decode_json encode_json); |
28 | |
28 | |
29 | our $LIB = $ENV{DELIANTRA_LIBDIR} || $ENV{CROSSFIRE_LIBDIR}; |
29 | our $LIB = $ENV{DELIANTRA_LIBDIR}; |
30 | |
|
|
31 | our $OLDDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" |
|
|
32 | : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" |
|
|
33 | : File::Spec->tmpdir . "/crossfire"; |
|
|
34 | |
30 | |
35 | our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra" |
31 | our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra" |
36 | : $ENV{AppData} ? "$ENV{APPDATA}/deliantra" |
32 | : $ENV{AppData} ? "$ENV{APPDATA}/deliantra" |
37 | : File::Spec->tmpdir . "/deliantra"; |
33 | : File::Spec->tmpdir . "/deliantra"; |
38 | |
34 | |
… | |
… | |
73 | |
69 | |
74 | elevation |
70 | elevation |
75 | |
71 | |
76 | name name_pl custom_name attach title race |
72 | name name_pl custom_name attach title race |
77 | slaying skill msg lore other_arch |
73 | slaying skill msg lore other_arch |
78 | face animation is_animated |
74 | sound sound_destroy face animation is_animated |
79 | magicmap smoothlevel smoothface |
75 | magicmap smoothlevel smoothface |
80 | str dex con wis pow cha int |
76 | str dex con wis pow cha int |
81 | hp maxhp sp maxsp grace maxgrace |
77 | hp maxhp sp maxsp grace maxgrace |
82 | exp perm_exp expmul |
78 | exp perm_exp expmul |
83 | 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 |
… | |
… | |
155 | boat => MOVE_BOAT, |
151 | boat => MOVE_BOAT, |
156 | ship => MOVE_SHIP, |
152 | ship => MOVE_SHIP, |
157 | all => MOVE_ALL, |
153 | all => MOVE_ALL, |
158 | ); |
154 | ); |
159 | |
155 | |
160 | our @MOVE_TYPE = keys %MOVE_TYPE; |
156 | our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship); |
161 | |
157 | |
162 | { |
158 | { |
163 | package Deliantra::MoveType; |
159 | package Deliantra::MoveType; |
164 | |
160 | |
165 | use overload |
161 | use overload |
… | |
… | |
186 | $_[0] |
182 | $_[0] |
187 | }, |
183 | }, |
188 | 'eq' => sub { "$_[0]" eq "$_[1]" }, |
184 | 'eq' => sub { "$_[0]" eq "$_[1]" }, |
189 | 'ne' => sub { "$_[0]" ne "$_[1]" }, |
185 | 'ne' => sub { "$_[0]" ne "$_[1]" }, |
190 | ; |
186 | ; |
|
|
187 | |
|
|
188 | sub TO_JSON { |
|
|
189 | $_[0][0] |
|
|
190 | } |
191 | } |
191 | } |
192 | |
192 | |
193 | sub Deliantra::MoveType::new { |
193 | sub Deliantra::MoveType::new { |
194 | my ($class, $string) = @_; |
194 | my ($class, $string) = @_; |
195 | |
195 | |
… | |
… | |
389 | $ob->{$attr} = new Deliantra::MoveType $ob->{$attr}; |
389 | $ob->{$attr} = new Deliantra::MoveType $ob->{$attr}; |
390 | } |
390 | } |
391 | |
391 | |
392 | # convert outdated movement flags to new movement sets |
392 | # convert outdated movement flags to new movement sets |
393 | if (defined (my $v = delete $ob->{no_pass})) { |
393 | if (defined (my $v = delete $ob->{no_pass})) { |
394 | $ob->{move_block} = new Deliantra::MoveType $v ? "all" : ""; |
394 | $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0"; |
395 | } |
395 | } |
396 | if (defined (my $v = delete $ob->{slow_move})) { |
396 | if (defined (my $v = delete $ob->{slow_move})) { |
397 | $ob->{move_slow} += "walk"; |
397 | $ob->{move_slow} += "walk"; |
398 | $ob->{move_slow_penalty} = $v; |
398 | $ob->{move_slow_penalty} = $v; |
399 | } |
399 | } |
400 | if (defined (my $v = delete $ob->{walk_on})) { |
400 | if (defined (my $v = delete $ob->{walk_on})) { |
401 | $ob->{move_on} ||= new Deliantra::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" } |
402 | } |
402 | } |
403 | if (defined (my $v = delete $ob->{walk_off})) { |
403 | if (defined (my $v = delete $ob->{walk_off})) { |
404 | $ob->{move_off} ||= new Deliantra::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" } |
405 | } |
405 | } |
406 | if (defined (my $v = delete $ob->{fly_on})) { |
406 | if (defined (my $v = delete $ob->{fly_on})) { |
… | |
… | |
434 | # arch as in "arch xxx", ie.. objects |
434 | # arch as in "arch xxx", ie.. objects |
435 | sub normalize_arch($) { |
435 | sub normalize_arch($) { |
436 | my ($ob) = @_; |
436 | my ($ob) = @_; |
437 | |
437 | |
438 | normalize_object $ob; |
438 | normalize_object $ob; |
|
|
439 | |
|
|
440 | return if $ob->{_atype} eq "object"; |
439 | |
441 | |
440 | my $arch = $ARCH{$ob->{_name}} |
442 | my $arch = $ARCH{$ob->{_name}} |
441 | or (warn "$ob->{_name}: no such archetype", return $ob); |
443 | or (warn "$ob->{_name}: no such archetype", return $ob); |
442 | |
444 | |
443 | if ($arch->{type} == 22) { # map |
445 | if ($arch->{type} == 22) { # map |
… | |
… | |
488 | } |
490 | } |
489 | |
491 | |
490 | sub attr_freeze($) { |
492 | sub attr_freeze($) { |
491 | my ($ob) = @_; |
493 | my ($ob) = @_; |
492 | |
494 | |
493 | $ob->{attach} = Deliantra::encode_json $ob->{attach} |
495 | $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach}) |
494 | if exists $ob->{attach}; |
496 | if exists $ob->{attach}; |
495 | |
497 | |
496 | $ob |
498 | $ob |
497 | } |
499 | } |
498 | |
500 | |
… | |
… | |
518 | |
520 | |
519 | my %arc; |
521 | my %arc; |
520 | my ($more, $prev); |
522 | my ($more, $prev); |
521 | my $comment; |
523 | my $comment; |
522 | |
524 | |
523 | open my $fh, "<:raw:perlio:utf8", $path |
525 | open my $fh, "<:utf8", $path |
524 | or Carp::croak "$path: $!"; |
526 | or Carp::croak "$path: $!"; |
525 | |
527 | |
526 | # binmode $fh; |
528 | # binmode $fh; |
527 | |
529 | |
528 | my $parse_block; $parse_block = sub { |
530 | my $parse_block; $parse_block = sub { |