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.124 by root, Mon Aug 25 04:04:56 2008 UTC vs.
Revision 1.135 by root, Tue Nov 3 14:56:58 2009 UTC

1=head1 NAME 1=head1 NAME
2 2
3Deliantra - Deliantra suppport module to read/write archetypes, maps etc. 3Deliantra - Deliantra suppport module to read/write archetypes, maps etc.
4 4
5=over 4
6
5=cut 7=cut
6 8
7package Deliantra; 9package Deliantra;
8 10
9our $VERSION = '1.21'; 11our $VERSION = '1.25';
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;
… …
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 Deliantra::MoveType; 161 package Deliantra::MoveType;
160 162
161 use overload 163 use overload
… …
182 $_[0] 184 $_[0]
183 }, 185 },
184 'eq' => sub { "$_[0]" eq "$_[1]" }, 186 'eq' => sub { "$_[0]" eq "$_[1]" },
185 'ne' => sub { "$_[0]" ne "$_[1]" }, 187 'ne' => sub { "$_[0]" ne "$_[1]" },
186 ; 188 ;
189
190 sub TO_JSON {
191 $_[0][0]
192 }
187} 193}
188 194
189sub Deliantra::MoveType::new { 195sub Deliantra::MoveType::new {
190 my ($class, $string) = @_; 196 my ($class, $string) = @_;
191 197
… …
333 339
334# object as in "Object xxx", i.e. archetypes 340# object as in "Object xxx", i.e. archetypes
335sub normalize_object($) { 341sub normalize_object($) {
336 my ($ob) = @_; 342 my ($ob) = @_;
337 343
344 delete $ob->{editable}; # deprecated
345
338 # convert material bitset to materialname, if possible 346 # convert material bitset to materialname, if possible
339 if (exists $ob->{material}) { 347 if (exists $ob->{material}) {
340 if (!$ob->{material}) { 348 if (!$ob->{material}) {
341 delete $ob->{material}; 349 delete $ob->{material};
342 } elsif (exists $ob->{materialname}) { 350 } elsif (exists $ob->{materialname}) {
… …
385 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr}; 393 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
386 } 394 }
387 395
388 # convert outdated movement flags to new movement sets 396 # convert outdated movement flags to new movement sets
389 if (defined (my $v = delete $ob->{no_pass})) { 397 if (defined (my $v = delete $ob->{no_pass})) {
390 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : ""; 398 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
391 } 399 }
392 if (defined (my $v = delete $ob->{slow_move})) { 400 if (defined (my $v = delete $ob->{slow_move})) {
393 $ob->{move_slow} += "walk"; 401 $ob->{move_slow} += "walk";
394 $ob->{move_slow_penalty} = $v; 402 $ob->{move_slow_penalty} = $v;
395 } 403 }
396 if (defined (my $v = delete $ob->{walk_on})) { 404 if (defined (my $v = delete $ob->{walk_on})) {
397 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" } 405 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
398 } 406 }
399 if (defined (my $v = delete $ob->{walk_off})) { 407 if (defined (my $v = delete $ob->{walk_off})) {
400 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" } 408 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
401 } 409 }
402 if (defined (my $v = delete $ob->{fly_on})) { 410 if (defined (my $v = delete $ob->{fly_on})) {
… …
430# arch as in "arch xxx", ie.. objects 438# arch as in "arch xxx", ie.. objects
431sub normalize_arch($) { 439sub normalize_arch($) {
432 my ($ob) = @_; 440 my ($ob) = @_;
433 441
434 normalize_object $ob; 442 normalize_object $ob;
443
444 return if $ob->{_atype} eq "object";
435 445
436 my $arch = $ARCH{$ob->{_name}} 446 my $arch = $ARCH{$ob->{_name}}
437 or (warn "$ob->{_name}: no such archetype", return $ob); 447 or (warn "$ob->{_name}: no such archetype", return $ob);
438 448
439 if ($arch->{type} == 22) { # map 449 if ($arch->{type} == 22) { # map
… …
514 524
515 my %arc; 525 my %arc;
516 my ($more, $prev); 526 my ($more, $prev);
517 my $comment; 527 my $comment;
518 528
519 open my $fh, "<:raw:perlio:utf8", $path 529 open my $fh, "<:utf8", $path
520 or Carp::croak "$path: $!"; 530 or Carp::croak "$path: $!";
521 531
522# binmode $fh; 532# binmode $fh;
523 533
524 my $parse_block; $parse_block = sub { 534 my $parse_block; $parse_block = sub {
… …
981 991
982 \%cache 992 \%cache
983 }; 993 };
984} 994}
985 995
996=back
997
986=head1 AUTHOR 998=head1 AUTHOR
987 999
988 Marc Lehmann <schmorp@schmorp.de> 1000 Marc Lehmann <schmorp@schmorp.de>
989 http://home.schmorp.de/ 1001 http://home.schmorp.de/
990 1002

Diff Legend

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