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.64 by root, Sun Apr 2 20:17:23 2006 UTC vs.
Revision 1.70 by root, Sun Aug 27 16:33:19 2006 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.1'; 9our $VERSION = '0.9';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
18use Storable qw(freeze thaw); 18use Storable qw(freeze thaw);
19 19
20our @EXPORT = qw( 20our @EXPORT = qw(
21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents 21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents
22); 22);
23
24use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working
25
26sub from_json($) {
27 $JSON::Syck::ImplicitUnicode = 1;
28 JSON::Syck::Load $_[0]
29}
30
31sub to_json($) {
32 $JSON::Syck::ImplicitUnicode = 0;
33 JSON::Syck::Dump $_[0]
34}
23 35
24our $LIB = $ENV{CROSSFIRE_LIBDIR}; 36our $LIB = $ENV{CROSSFIRE_LIBDIR};
25 37
26our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; 38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire";
27 39
… …
44 qw(move_type move_block move_allow move_on move_off move_slow); 56 qw(move_type move_block move_allow move_on move_off move_slow);
45 57
46# same as in server save routine, to (hopefully) be compatible 58# same as in server save routine, to (hopefully) be compatible
47# to the other editors. 59# to the other editors.
48our @FIELD_ORDER_MAP = (qw( 60our @FIELD_ORDER_MAP = (qw(
49 name swap_time reset_timeout fixed_resettime difficulty region 61 name attach swap_time reset_timeout fixed_resettime difficulty region
50 shopitems shopgreed shopmin shopmax shoprace 62 shopitems shopgreed shopmin shopmax shoprace
51 darkness width height enter_x enter_y msg maplore 63 darkness width height enter_x enter_y msg maplore
52 unique template 64 unique template
53 outdoor temp pressure humid windspeed winddir sky nosmooth 65 outdoor temp pressure humid windspeed winddir sky nosmooth
54 tile_path_1 tile_path_2 tile_path_3 tile_path_4 66 tile_path_1 tile_path_2 tile_path_3 tile_path_4
55)); 67));
56 68
57our @FIELD_ORDER = (qw( 69our @FIELD_ORDER = (qw(
58 elevation 70 elevation
59 71
60 name name_pl custom_name title race 72 name name_pl custom_name attach title race
61 slaying skill msg lore other_arch face 73 slaying skill msg lore other_arch face
62 #todo-events 74 #todo-events
63 animation is_animated 75 animation is_animated
64 str dex con wis pow cha int 76 str dex con wis pow cha int
65 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
… …
199 if (defined (my $v = delete $ob->{slow_move})) { 211 if (defined (my $v = delete $ob->{slow_move})) {
200 $ob->{move_slow} |= MOVE_WALK; 212 $ob->{move_slow} |= MOVE_WALK;
201 $ob->{move_slow_penalty} = $v; 213 $ob->{move_slow_penalty} = $v;
202 } 214 }
203 if (defined (my $v = delete $ob->{walk_on})) { 215 if (defined (my $v = delete $ob->{walk_on})) {
216 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
204 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 217 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
205 : $ob->{move_on} & ~MOVE_WALK; 218 : $ob->{move_on} & ~MOVE_WALK;
206 } 219 }
207 if (defined (my $v = delete $ob->{walk_off})) { 220 if (defined (my $v = delete $ob->{walk_off})) {
221 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
208 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 222 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
209 : $ob->{move_off} & ~MOVE_WALK; 223 : $ob->{move_off} & ~MOVE_WALK;
210 } 224 }
211 if (defined (my $v = delete $ob->{fly_on})) { 225 if (defined (my $v = delete $ob->{fly_on})) {
226 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
212 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 227 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
213 : $ob->{move_on} & ~MOVE_FLY_LOW; 228 : $ob->{move_on} & ~MOVE_FLY_LOW;
214 } 229 }
215 if (defined (my $v = delete $ob->{fly_off})) { 230 if (defined (my $v = delete $ob->{fly_off})) {
231 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
216 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 232 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
217 : $ob->{move_off} & ~MOVE_FLY_LOW; 233 : $ob->{move_off} & ~MOVE_FLY_LOW;
218 } 234 }
219 if (defined (my $v = delete $ob->{flying})) { 235 if (defined (my $v = delete $ob->{flying})) {
236 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type};
220 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 237 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
221 : $ob->{move_type} & ~MOVE_FLY_LOW; 238 : $ob->{move_type} & ~MOVE_FLY_LOW;
222 } 239 }
223 240
224 # convert idiotic event_xxx things into objects 241 # convert idiotic event_xxx things into objects
… …
281 } 298 }
282 299
283 $ob 300 $ob
284} 301}
285 302
303sub attr_thaw($) {
304 my ($ob) = @_;
305
306 $ob->{attach} = from_json $ob->{attach}
307 if exists $ob->{attach};
308
309 $ob
310}
311
312sub attr_freeze($) {
313 my ($ob) = @_;
314
315 $ob->{attach} = Crossfire::to_json $ob->{attach}
316 if exists $ob->{attach};
317
318 $ob
319}
320
286sub read_pak($) { 321sub read_pak($) {
287 my ($path) = @_; 322 my ($path) = @_;
288 323
289 my %pak; 324 my %pak;
290 325
… …
307 my ($more, $prev); 342 my ($more, $prev);
308 343
309 open my $fh, "<:raw:perlio:utf8", $path 344 open my $fh, "<:raw:perlio:utf8", $path
310 or Carp::croak "$path: $!"; 345 or Carp::croak "$path: $!";
311 346
312 binmode $fh; 347# binmode $fh;
313 348
314 my $parse_block; $parse_block = sub { 349 my $parse_block; $parse_block = sub {
315 my %arc = @_; 350 my %arc = @_;
316 351
317 while (<$fh>) { 352 while (<$fh>) {
318 s/\s+$//; 353 s/\s+$//;
319 if (/^end$/i) { 354 if (/^end$/i) {
320 last; 355 last;
321 } elsif (/^arch (\S+)$/i) { 356 } elsif (/^arch (\S+)$/i) {
322 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 357 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
323 } elsif (/^lore$/i) { 358 } elsif (/^lore$/i) {
324 while (<$fh>) { 359 while (<$fh>) {
325 last if /^endlore\s*$/i; 360 last if /^endlore\s*$/i;
326 $arc{lore} .= $_; 361 $arc{lore} .= $_;
327 } 362 }
328 } elsif (/^msg$/i) { 363 } elsif (/^msg$/i) {
329 while (<$fh>) { 364 while (<$fh>) {
330 last if /^endmsg\s*$/i; 365 last if /^endmsg\s*$/i;
331 $arc{msg} .= $_; 366 $arc{msg} .= $_;
332 } 367 }
368 } elsif (/^anim$/i) {
369 while (<$fh>) {
370 last if /^mina\s*$/i;
371 chomp;
372 push @{ $arc{anim} }, $_;
373 }
333 } elsif (/^(\S+)\s*(.*)$/) { 374 } elsif (/^(\S+)\s*(.*)$/) {
334 $arc{lc $1} = $2; 375 $arc{lc $1} = $2;
335 } elsif (/^\s*($|#)/) { 376 } elsif (/^\s*($|#)/) {
336 # 377 #
337 } else { 378 } else {
… …
346 s/\s+$//; 387 s/\s+$//;
347 if (/^more$/i) { 388 if (/^more$/i) {
348 $more = $prev; 389 $more = $prev;
349 } elsif (/^object (\S+)$/i) { 390 } elsif (/^object (\S+)$/i) {
350 my $name = $1; 391 my $name = $1;
351 my $arc = normalize_object $parse_block->(_name => $name); 392 my $arc = attr_thaw normalize_object $parse_block->(_name => $name);
352 393
353 if ($more) { 394 if ($more) {
354 $more->{more} = $arc; 395 $more->{more} = $arc;
355 } else { 396 } else {
356 $arc{$name} = $arc; 397 $arc{$name} = $arc;
357 } 398 }
358 $prev = $arc; 399 $prev = $arc;
359 $more = undef; 400 $more = undef;
360 } elsif (/^arch (\S+)$/i) { 401 } elsif (/^arch (\S+)$/i) {
361 my $name = $1; 402 my $name = $1;
362 my $arc = normalize_arch $parse_block->(_name => $name); 403 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name);
363 404
364 if ($more) { 405 if ($more) {
365 $more->{more} = $arc; 406 $more->{more} = $arc;
366 } else { 407 } else {
367 push @{ $arc{arch} }, $arc; 408 push @{ $arc{arch} }, $arc;

Diff Legend

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