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.122 by root, Mon May 26 03:33:43 2008 UTC vs.
Revision 1.132 by root, Wed Sep 2 22:38:57 2009 UTC

… …
4 4
5=cut 5=cut
6 6
7package Deliantra; 7package Deliantra;
8 8
9our $VERSION = '1.2'; 9our $VERSION = '1.25';
10 10
11use strict; 11use common::sense;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
15use Carp (); 15use Carp ();
16use File::Spec; 16use File::Spec;
… …
24 editor_archs arch_extents 24 editor_archs arch_extents
25); 25);
26 26
27use JSON::XS qw(decode_json encode_json); 27use JSON::XS qw(decode_json encode_json);
28 28
29our $LIB = $ENV{DELIANTRA_LIBDIR} || $ENV{CROSSFIRE_LIBDIR}; 29our $LIB = $ENV{DELIANTRA_LIBDIR};
30
31our $OLDDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire"
32 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
33 : File::Spec->tmpdir . "/crossfire";
34 30
35our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra" 31our $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
160our @MOVE_TYPE = keys %MOVE_TYPE; 156our @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
193sub Deliantra::MoveType::new { 193sub Deliantra::MoveType::new {
194 my ($class, $string) = @_; 194 my ($class, $string) = @_;
195 195
… …
435sub normalize_arch($) { 435sub normalize_arch($) {
436 my ($ob) = @_; 436 my ($ob) = @_;
437 437
438 normalize_object $ob; 438 normalize_object $ob;
439 439
440 return if $ob->{_atype} eq "object";
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
444 my %normalize = ( 446 my %normalize = (
… …
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 {

Diff Legend

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