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.57 by root, Thu Mar 23 08:55:54 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
… …
37 msg => "endmsg", 49 msg => "endmsg",
38 lore => "endlore", 50 lore => "endlore",
39 maplore => "endmaplore", 51 maplore => "endmaplore",
40); 52);
41 53
54# movement bit type, PITA
55our %FIELD_MOVEMENT = map +($_ => undef),
56 qw(move_type move_block move_allow move_on move_off move_slow);
57
42# same as in server save routine, to (hopefully) be compatible 58# same as in server save routine, to (hopefully) be compatible
43# to the other editors. 59# to the other editors.
44our @FIELD_ORDER_MAP = (qw( 60our @FIELD_ORDER_MAP = (qw(
45 name swap_time reset_timeout fixed_resettime difficulty region 61 name attach swap_time reset_timeout fixed_resettime difficulty region
46 shopitems shopgreed shopmin shopmax shoprace 62 shopitems shopgreed shopmin shopmax shoprace
47 darkness width height enter_x enter_y msg maplore 63 darkness width height enter_x enter_y msg maplore
48 unique template 64 unique template
49 outdoor temp pressure humid windspeed winddir sky nosmooth 65 outdoor temp pressure humid windspeed winddir sky nosmooth
50 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
51)); 67));
52 68
53our @FIELD_ORDER = (qw( 69our @FIELD_ORDER = (qw(
54 elevation 70 elevation
55 71
56 name name_pl custom_name title race 72 name name_pl custom_name attach title race
57 slaying skill msg lore other_arch face 73 slaying skill msg lore other_arch face
58 #todo-events 74 #todo-events
59 animation is_animated 75 animation is_animated
60 Str Dex Con Wis Pow Cha Int 76 str dex con wis pow cha int
61 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
62 exp perm_exp expmul 78 exp perm_exp expmul
63 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
64 nrof level direction type subtype 80 nrof level direction type subtype attacktype
65 81
66 resist_physical resist_magic resist_fire resist_electricity 82 resist_physical resist_magic resist_fire resist_electricity
67 resist_cold resist_confusion resist_acid resist_drain 83 resist_cold resist_confusion resist_acid resist_drain
68 resist_weaponmagic resist_ghosthit resist_poison resist_slow 84 resist_weaponmagic resist_ghosthit resist_poison resist_slow
69 resist_paralyze resist_turn_undead resist_fear resist_cancellation 85 resist_paralyze resist_turn_undead resist_fear resist_cancellation
… …
98 114
99 body_range body_arm body_torso body_head body_neck body_skill 115 body_range body_arm body_torso body_head body_neck body_skill
100 body_finger body_shoulder body_foot body_hand body_wrist body_waist 116 body_finger body_shoulder body_foot body_hand body_wrist body_waist
101)); 117));
102 118
119our %EVENT_TYPE = (
120 apply => 1,
121 attack => 2,
122 death => 3,
123 drop => 4,
124 pickup => 5,
125 say => 6,
126 stop => 7,
127 time => 8,
128 throw => 9,
129 trigger => 10,
130 close => 11,
131 timer => 12,
132);
133
103sub MOVE_WALK (){ 0x01 } 134sub MOVE_WALK (){ 0x01 }
104sub MOVE_FLY_LOW (){ 0x02 } 135sub MOVE_FLY_LOW (){ 0x02 }
105sub MOVE_FLY_HIGH (){ 0x04 } 136sub MOVE_FLY_HIGH (){ 0x04 }
106sub MOVE_FLYING (){ 0x06 } 137sub MOVE_FLYING (){ 0x06 }
107sub MOVE_SWIM (){ 0x08 } 138sub MOVE_SWIM (){ 0x08 }
108sub MOVE_BOAT (){ 0x10 } 139sub MOVE_BOAT (){ 0x10 }
140sub MOVE_KNOWN (){ 0x1f } # all of above
109sub MOVE_ALL (){ 0xff } 141sub MOVE_ALLBIT (){ 0x10000 }
142sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
110 143
111sub load_ref($) { 144sub load_ref($) {
112 my ($path) = @_; 145 my ($path) = @_;
113 146
114 open my $fh, "<", $path 147 open my $fh, "<:raw:perlio", $path
115 or die "$path: $!"; 148 or die "$path: $!";
116 binmode $fh;
117 local $/; 149 local $/;
118 150
119 thaw <$fh> 151 thaw <$fh>
120} 152}
121 153
122sub save_ref($$) { 154sub save_ref($$) {
123 my ($ref, $path) = @_; 155 my ($ref, $path) = @_;
124 156
125 open my $fh, ">", "$path~" 157 open my $fh, ">:raw:perlio", "$path~"
126 or die "$path~: $!"; 158 or die "$path~: $!";
127 binmode $fh;
128 print $fh freeze $ref; 159 print $fh freeze $ref;
129 close $fh; 160 close $fh;
130 rename "$path~", $path 161 rename "$path~", $path
131 or die "$path: $!"; 162 or die "$path: $!";
132} 163}
133 164
165# object as in "Object xxx", i.e. archetypes
134sub normalize_object($) { 166sub normalize_object($) {
135 my ($ob) = @_; 167 my ($ob) = @_;
136 168
169 # nuke outdated or never supported fields
137 delete $ob->{$_} for qw( 170 delete $ob->{$_} for qw(
138 can_knockback can_parry can_impale can_cut can_dam_armour 171 can_knockback can_parry can_impale can_cut can_dam_armour
139 can_apply pass_thru can_pass_thru 172 can_apply pass_thru can_pass_thru
140 ); 173 );
141 174
142 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 175 # convert movement strings to bitsets
176 for my $attr (keys %FIELD_MOVEMENT) {
143 next unless exists $ob->{$attr}; 177 next unless exists $ob->{$attr};
178
179 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
180
144 next if $ob->{$attr} =~ /^\d+$/; 181 next if $ob->{$attr} =~ /^\d+$/;
145 182
146 my $flags = 0; 183 my $flags = 0;
147 184
148 # assume list 185 # assume list
… …
165 } 202 }
166 203
167 $ob->{$attr} = $flags; 204 $ob->{$attr} = $flags;
168 } 205 }
169 206
207 # convert outdated movement flags to new movement sets
170 if (defined (my $v = delete $ob->{no_pass})) { 208 if (defined (my $v = delete $ob->{no_pass})) {
171 $ob->{move_block} = $v ? MOVE_ALL : 0; 209 $ob->{move_block} = $v ? MOVE_ALL : 0;
172 } 210 }
173 if (defined (my $v = delete $ob->{slow_move})) { 211 if (defined (my $v = delete $ob->{slow_move})) {
174 $ob->{move_slow} |= MOVE_WALK; 212 $ob->{move_slow} |= MOVE_WALK;
175 $ob->{move_slow_penalty} = $v; 213 $ob->{move_slow_penalty} = $v;
176 } 214 }
177 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};
178 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 217 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
179 : $ob->{move_on} & ~MOVE_WALK; 218 : $ob->{move_on} & ~MOVE_WALK;
180 } 219 }
181 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};
182 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 222 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
183 : $ob->{move_off} & ~MOVE_WALK; 223 : $ob->{move_off} & ~MOVE_WALK;
184 } 224 }
185 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};
186 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 227 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
187 : $ob->{move_on} & ~MOVE_FLY_LOW; 228 : $ob->{move_on} & ~MOVE_FLY_LOW;
188 } 229 }
189 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};
190 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 232 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
191 : $ob->{move_off} & ~MOVE_FLY_LOW; 233 : $ob->{move_off} & ~MOVE_FLY_LOW;
192 } 234 }
193 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};
194 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 237 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
195 : $ob->{move_type} & ~MOVE_FLY_LOW; 238 : $ob->{move_type} & ~MOVE_FLY_LOW;
196 } 239 }
197 240
241 # convert idiotic event_xxx things into objects
242 while (my ($event, $subtype) = each %EVENT_TYPE) {
243 if (exists $ob->{"event_${event}_plugin"}) {
244 push @{$ob->{inventory}}, {
245 _name => "event_$event",
246 title => delete $ob->{"event_${event}_plugin"},
247 slaying => delete $ob->{"event_${event}"},
248 name => delete $ob->{"event_${event}_options"},
249 };
250 }
251 }
252
198 $ob 253 $ob
199} 254}
200 255
256# arch as in "arch xxx", ie.. objects
201sub normalize_arch($) { 257sub normalize_arch($) {
202 my ($ob) = @_; 258 my ($ob) = @_;
203 259
204 normalize_object $ob; 260 normalize_object $ob;
205 261
… …
242 } 298 }
243 299
244 $ob 300 $ob
245} 301}
246 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
247sub read_pak($) { 321sub read_pak($) {
248 my ($path) = @_; 322 my ($path) = @_;
249 323
250 my %pak; 324 my %pak;
251 325
252 open my $fh, "<", $path 326 open my $fh, "<:raw:perlio", $path
253 or Carp::croak "$_[0]: $!"; 327 or Carp::croak "$_[0]: $!";
254 binmode $fh; 328 binmode $fh;
255 while (<$fh>) { 329 while (<$fh>) {
256 my ($type, $id, $len, $path) = split; 330 my ($type, $id, $len, $path) = split;
257 $path =~ s/.*\///; 331 $path =~ s/.*\///;
… …
259 } 333 }
260 334
261 \%pak 335 \%pak
262} 336}
263 337
264sub read_arch($) { 338sub read_arch($;$) {
265 my ($path) = @_; 339 my ($path, $toplevel) = @_;
266 340
267 my %arc; 341 my %arc;
268 my ($more, $prev); 342 my ($more, $prev);
269 343
270 open my $fh, "<", $path 344 open my $fh, "<:raw:perlio:utf8", $path
271 or Carp::croak "$path: $!"; 345 or Carp::croak "$path: $!";
272 346
273 binmode $fh; 347# binmode $fh;
274 348
275 my $parse_block; $parse_block = sub { 349 my $parse_block; $parse_block = sub {
276 my %arc = @_; 350 my %arc = @_;
277 351
278 while (<$fh>) { 352 while (<$fh>) {
279 s/\s+$//; 353 s/\s+$//;
280 if (/^end$/i) { 354 if (/^end$/i) {
281 last; 355 last;
282 } elsif (/^arch (\S+)$/i) { 356 } elsif (/^arch (\S+)$/i) {
283 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 357 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
284 } elsif (/^lore$/i) { 358 } elsif (/^lore$/i) {
285 while (<$fh>) { 359 while (<$fh>) {
286 last if /^endlore\s*$/i; 360 last if /^endlore\s*$/i;
287 $arc{lore} .= $_; 361 $arc{lore} .= $_;
288 } 362 }
289 } elsif (/^msg$/i) { 363 } elsif (/^msg$/i) {
290 while (<$fh>) { 364 while (<$fh>) {
291 last if /^endmsg\s*$/i; 365 last if /^endmsg\s*$/i;
292 $arc{msg} .= $_; 366 $arc{msg} .= $_;
293 } 367 }
368 } elsif (/^anim$/i) {
369 while (<$fh>) {
370 last if /^mina\s*$/i;
371 chomp;
372 push @{ $arc{anim} }, $_;
373 }
294 } elsif (/^(\S+)\s*(.*)$/) { 374 } elsif (/^(\S+)\s*(.*)$/) {
295 $arc{lc $1} = $2; 375 $arc{lc $1} = $2;
296 } elsif (/^\s*($|#)/) { 376 } elsif (/^\s*($|#)/) {
297 # 377 #
298 } else { 378 } else {
… …
307 s/\s+$//; 387 s/\s+$//;
308 if (/^more$/i) { 388 if (/^more$/i) {
309 $more = $prev; 389 $more = $prev;
310 } elsif (/^object (\S+)$/i) { 390 } elsif (/^object (\S+)$/i) {
311 my $name = $1; 391 my $name = $1;
312 my $arc = normalize_object $parse_block->(_name => $name); 392 my $arc = attr_thaw normalize_object $parse_block->(_name => $name);
313 393
314 if ($more) { 394 if ($more) {
315 $more->{more} = $arc; 395 $more->{more} = $arc;
316 } else { 396 } else {
317 $arc{$name} = $arc; 397 $arc{$name} = $arc;
318 } 398 }
319 $prev = $arc; 399 $prev = $arc;
320 $more = undef; 400 $more = undef;
321 } elsif (/^arch (\S+)$/i) { 401 } elsif (/^arch (\S+)$/i) {
322 my $name = $1; 402 my $name = $1;
323 my $arc = normalize_arch $parse_block->(_name => $name); 403 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name);
324 404
325 if ($more) { 405 if ($more) {
326 $more->{more} = $arc; 406 $more->{more} = $arc;
327 } else { 407 } else {
328 push @{ $arc{arch} }, $arc; 408 push @{ $arc{arch} }, $arc;
329 } 409 }
330 $prev = $arc; 410 $prev = $arc;
331 $more = undef; 411 $more = undef;
412 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
413 if ($1 eq "lev_array") {
414 while (<$fh>) {
415 last if /^endplst\s*$/;
416 push @{$toplevel->{lev_array}}, $_+0;
417 }
418 } else {
419 $toplevel->{$1} = $2;
420 }
332 } elsif (/^\s*($|#)/) { 421 } elsif (/^\s*($|#)/) {
333 # 422 #
334 } else { 423 } else {
335 warn "$path: unparseable top-level line '$_'"; 424 die "$path: unparseable top-level line '$_'";
336 } 425 }
337 } 426 }
338 427
339 undef $parse_block; # work around bug in perl not freeing $fh etc. 428 undef $parse_block; # work around bug in perl not freeing $fh etc.
340 429
… …
347sub editor_archs { 436sub editor_archs {
348 my %paths; 437 my %paths;
349 438
350 for (keys %ARCH) { 439 for (keys %ARCH) {
351 my $arch = $ARCH{$_}; 440 my $arch = $ARCH{$_};
352 push @{$paths{$arch->{editor_folder}}}, \$arch; 441 push @{$paths{$arch->{editor_folder}}}, $arch;
353 } 442 }
354 443
355 \%paths 444 \%paths
356} 445}
357 446
… …
422 my $type = $obj->{type} || $arch->{type}; 511 my $type = $obj->{type} || $arch->{type};
423 512
424 if ($type > 0) { 513 if ($type > 0) {
425 $root = $Crossfire::Data::ATTR{$type}; 514 $root = $Crossfire::Data::ATTR{$type};
426 } else { 515 } else {
516 my %a = (%$arch, %$obj);
517
518 if ($a{is_floor} && !$a{alive}) {
519 $root = $Crossfire::Data::TYPE{Floor};
520 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
521 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
522 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
523 $root = $Crossfire::Data::TYPE{Wall};
524 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
525 $root = $Crossfire::Data::TYPE{"Weak Wall"};
526 } else {
427 $root = $Crossfire::Data::TYPE{Misc}; 527 $root = $Crossfire::Data::TYPE{Misc};
428
429 type:
430 for (@Crossfire::Data::ATTR0) {
431 my $req = $_->{required}
432 or die "internal error: ATTR0 without 'required'";
433
434 keys %$req;
435 while (my ($k, $v) = each %$req) {
436 next type
437 unless $obj->{$k} == $v || $arch->{$k} == $v;
438 }
439
440 $root = $_;
441 } 528 }
442 } 529 }
443 530
444 my @import = ($root); 531 my @import = ($root);
445 532
… …
619 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 706 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
620 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 707 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
621 or die "$VARDIR/tilecache.png: $!"; 708 or die "$VARDIR/tilecache.png: $!";
622 *FACE = $_[0]; 709 *FACE = $_[0];
623 }, sub { 710 }, sub {
624 require File::Temp;
625
626 my $tile = read_pak "$LIB/crossfire.0"; 711 my $tile = read_pak "$LIB/crossfire.0";
627 712
628 my %cache; 713 my %cache;
629 714
630 my $idx = 0; 715 my $idx = 0;
631 716
632 for my $name (sort keys %$tile) { 717 for my $name (sort keys %$tile) {
633 my ($fh, $filename) = File::Temp::tempfile (); 718 my $pb = new Gtk2::Gdk::PixbufLoader;
634 print $fh $tile->{$name}; 719 $pb->write ($tile->{$name});
635 close $fh; 720 $pb->close;
636 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 721 my $pb = $pb->get_pixbuf;
637 unlink $filename;
638 722
639 my $tile = $cache{$name} = { 723 my $tile = $cache{$name} = {
640 pb => $pb, 724 pb => $pb,
641 idx => $idx, 725 idx => $idx,
642 w => int $pb->get_width / TILESIZE, 726 w => int $pb->get_width / TILESIZE,
… …
660 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 744 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
661 } 745 }
662 } 746 }
663 } 747 }
664 748
665 $pb->save ("$VARDIR/tilecache.png", "png"); 749 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
666 750
667 \%cache 751 \%cache
668 }; 752 };
669} 753}
670 754

Diff Legend

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