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.73 by root, Tue Sep 12 02:18:06 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
165my %attack_mask = (
166 physical => 0x00000001,
167 magic => 0x00000002,
168 fire => 0x00000004,
169 electricity => 0x00000008,
170 cold => 0x00000010,
171 confusion => 0x00000020,
172 acid => 0x00000040,
173 drain => 0x00000080,
174 weaponmagic => 0x00000100,
175 ghosthit => 0x00000200,
176 poison => 0x00000400,
177 slow => 0x00000800,
178 paralyze => 0x00001000,
179 turn_undead => 0x00002000,
180 fear => 0x00004000,
181 cancellation => 0x00008000,
182 deplete => 0x00010000,
183 death => 0x00020000,
184 chaos => 0x00040000,
185 counterspell => 0x00080000,
186 godpower => 0x00100000,
187 holyword => 0x00200000,
188 blind => 0x00400000,
189 internal => 0x00800000,
190 life_stealing => 0x01000000,
191 disease => 0x02000000,
192);
193
194sub _add_resist($$$) {
195 my ($ob, $mask, $value) = @_;
196
197 while (my ($k, $v) = each %attack_mask) {
198 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
199 }
200}
201
202# object as in "Object xxx", i.e. archetypes
134sub normalize_object($) { 203sub normalize_object($) {
135 my ($ob) = @_; 204 my ($ob) = @_;
136 205
206 # nuke outdated or never supported fields
137 delete $ob->{$_} for qw( 207 delete @$ob{qw(
138 can_knockback can_parry can_impale can_cut can_dam_armour 208 can_knockback can_parry can_impale can_cut can_dam_armour
139 can_apply pass_thru can_pass_thru 209 can_apply pass_thru can_pass_thru
140 ); 210 )};
141 211
142 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 212 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
213 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
214 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
215
216 # convert movement strings to bitsets
217 for my $attr (keys %FIELD_MOVEMENT) {
143 next unless exists $ob->{$attr}; 218 next unless exists $ob->{$attr};
219
220 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
221
144 next if $ob->{$attr} =~ /^\d+$/; 222 next if $ob->{$attr} =~ /^\d+$/;
145 223
146 my $flags = 0; 224 my $flags = 0;
147 225
148 # assume list 226 # assume list
… …
165 } 243 }
166 244
167 $ob->{$attr} = $flags; 245 $ob->{$attr} = $flags;
168 } 246 }
169 247
248 # convert outdated movement flags to new movement sets
170 if (defined (my $v = delete $ob->{no_pass})) { 249 if (defined (my $v = delete $ob->{no_pass})) {
171 $ob->{move_block} = $v ? MOVE_ALL : 0; 250 $ob->{move_block} = $v ? MOVE_ALL : 0;
172 } 251 }
173 if (defined (my $v = delete $ob->{slow_move})) { 252 if (defined (my $v = delete $ob->{slow_move})) {
174 $ob->{move_slow} |= MOVE_WALK; 253 $ob->{move_slow} |= MOVE_WALK;
175 $ob->{move_slow_penalty} = $v; 254 $ob->{move_slow_penalty} = $v;
176 } 255 }
177 if (defined (my $v = delete $ob->{walk_on})) { 256 if (defined (my $v = delete $ob->{walk_on})) {
257 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
178 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 258 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
179 : $ob->{move_on} & ~MOVE_WALK; 259 : $ob->{move_on} & ~MOVE_WALK;
180 } 260 }
181 if (defined (my $v = delete $ob->{walk_off})) { 261 if (defined (my $v = delete $ob->{walk_off})) {
262 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
182 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 263 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
183 : $ob->{move_off} & ~MOVE_WALK; 264 : $ob->{move_off} & ~MOVE_WALK;
184 } 265 }
185 if (defined (my $v = delete $ob->{fly_on})) { 266 if (defined (my $v = delete $ob->{fly_on})) {
267 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
186 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 268 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
187 : $ob->{move_on} & ~MOVE_FLY_LOW; 269 : $ob->{move_on} & ~MOVE_FLY_LOW;
188 } 270 }
189 if (defined (my $v = delete $ob->{fly_off})) { 271 if (defined (my $v = delete $ob->{fly_off})) {
272 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
190 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 273 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
191 : $ob->{move_off} & ~MOVE_FLY_LOW; 274 : $ob->{move_off} & ~MOVE_FLY_LOW;
192 } 275 }
193 if (defined (my $v = delete $ob->{flying})) { 276 if (defined (my $v = delete $ob->{flying})) {
277 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type};
194 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 278 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
195 : $ob->{move_type} & ~MOVE_FLY_LOW; 279 : $ob->{move_type} & ~MOVE_FLY_LOW;
196 } 280 }
197 281
282 # convert idiotic event_xxx things into objects
283 while (my ($event, $subtype) = each %EVENT_TYPE) {
284 if (exists $ob->{"event_${event}_plugin"}) {
285 push @{$ob->{inventory}}, {
286 _name => "event_$event",
287 title => delete $ob->{"event_${event}_plugin"},
288 slaying => delete $ob->{"event_${event}"},
289 name => delete $ob->{"event_${event}_options"},
290 };
291 }
292 }
293
294 # some archetypes had "+3" instead of the canonical "3", so fix
295 $ob->{dam} *= 1 if exists $ob->{dam};
296
198 $ob 297 $ob
199} 298}
200 299
300# arch as in "arch xxx", ie.. objects
201sub normalize_arch($) { 301sub normalize_arch($) {
202 my ($ob) = @_; 302 my ($ob) = @_;
203 303
204 normalize_object $ob; 304 normalize_object $ob;
205 305
… …
242 } 342 }
243 343
244 $ob 344 $ob
245} 345}
246 346
347sub attr_thaw($) {
348 my ($ob) = @_;
349
350 $ob->{attach} = from_json $ob->{attach}
351 if exists $ob->{attach};
352
353 $ob
354}
355
356sub attr_freeze($) {
357 my ($ob) = @_;
358
359 $ob->{attach} = Crossfire::to_json $ob->{attach}
360 if exists $ob->{attach};
361
362 $ob
363}
364
247sub read_pak($) { 365sub read_pak($) {
248 my ($path) = @_; 366 my ($path) = @_;
249 367
250 my %pak; 368 my %pak;
251 369
252 open my $fh, "<", $path 370 open my $fh, "<:raw:perlio", $path
253 or Carp::croak "$_[0]: $!"; 371 or Carp::croak "$_[0]: $!";
254 binmode $fh; 372 binmode $fh;
255 while (<$fh>) { 373 while (<$fh>) {
256 my ($type, $id, $len, $path) = split; 374 my ($type, $id, $len, $path) = split;
257 $path =~ s/.*\///; 375 $path =~ s/.*\///;
… …
259 } 377 }
260 378
261 \%pak 379 \%pak
262} 380}
263 381
264sub read_arch($) { 382sub read_arch($;$) {
265 my ($path) = @_; 383 my ($path, $toplevel) = @_;
266 384
267 my %arc; 385 my %arc;
268 my ($more, $prev); 386 my ($more, $prev);
269 387
270 open my $fh, "<", $path 388 open my $fh, "<:raw:perlio:utf8", $path
271 or Carp::croak "$path: $!"; 389 or Carp::croak "$path: $!";
272 390
273 binmode $fh; 391# binmode $fh;
274 392
275 my $parse_block; $parse_block = sub { 393 my $parse_block; $parse_block = sub {
276 my %arc = @_; 394 my %arc = @_;
277 395
278 while (<$fh>) { 396 while (<$fh>) {
279 s/\s+$//; 397 s/\s+$//;
280 if (/^end$/i) { 398 if (/^end$/i) {
281 last; 399 last;
282 } elsif (/^arch (\S+)$/i) { 400 } elsif (/^arch (\S+)$/i) {
283 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 401 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
284 } elsif (/^lore$/i) { 402 } elsif (/^lore$/i) {
285 while (<$fh>) { 403 while (<$fh>) {
286 last if /^endlore\s*$/i; 404 last if /^endlore\s*$/i;
287 $arc{lore} .= $_; 405 $arc{lore} .= $_;
288 } 406 }
289 } elsif (/^msg$/i) { 407 } elsif (/^msg$/i) {
290 while (<$fh>) { 408 while (<$fh>) {
291 last if /^endmsg\s*$/i; 409 last if /^endmsg\s*$/i;
292 $arc{msg} .= $_; 410 $arc{msg} .= $_;
293 } 411 }
412 } elsif (/^anim$/i) {
413 while (<$fh>) {
414 last if /^mina\s*$/i;
415 chomp;
416 push @{ $arc{anim} }, $_;
417 }
294 } elsif (/^(\S+)\s*(.*)$/) { 418 } elsif (/^(\S+)\s*(.*)$/) {
295 $arc{lc $1} = $2; 419 $arc{lc $1} = $2;
296 } elsif (/^\s*($|#)/) { 420 } elsif (/^\s*($|#)/) {
297 # 421 #
298 } else { 422 } else {
… …
307 s/\s+$//; 431 s/\s+$//;
308 if (/^more$/i) { 432 if (/^more$/i) {
309 $more = $prev; 433 $more = $prev;
310 } elsif (/^object (\S+)$/i) { 434 } elsif (/^object (\S+)$/i) {
311 my $name = $1; 435 my $name = $1;
312 my $arc = normalize_object $parse_block->(_name => $name); 436 my $arc = attr_thaw normalize_object $parse_block->(_name => $name);
437 $arc->{_atype} = 'object';
313 438
314 if ($more) { 439 if ($more) {
315 $more->{more} = $arc; 440 $more->{more} = $arc;
316 } else { 441 } else {
317 $arc{$name} = $arc; 442 $arc{$name} = $arc;
318 } 443 }
319 $prev = $arc; 444 $prev = $arc;
320 $more = undef; 445 $more = undef;
321 } elsif (/^arch (\S+)$/i) { 446 } elsif (/^arch (\S+)$/i) {
322 my $name = $1; 447 my $name = $1;
323 my $arc = normalize_arch $parse_block->(_name => $name); 448 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name);
449 $arc->{_atype} = 'arch';
324 450
325 if ($more) { 451 if ($more) {
326 $more->{more} = $arc; 452 $more->{more} = $arc;
327 } else { 453 } else {
328 push @{ $arc{arch} }, $arc; 454 push @{ $arc{arch} }, $arc;
329 } 455 }
330 $prev = $arc; 456 $prev = $arc;
331 $more = undef; 457 $more = undef;
458 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
459 if ($1 eq "lev_array") {
460 while (<$fh>) {
461 last if /^endplst\s*$/;
462 push @{$toplevel->{lev_array}}, $_+0;
463 }
464 } else {
465 $toplevel->{$1} = $2;
466 }
332 } elsif (/^\s*($|#)/) { 467 } elsif (/^\s*($|#)/) {
333 # 468 #
334 } else { 469 } else {
335 warn "$path: unparseable top-level line '$_'"; 470 die "$path: unparseable top-level line '$_'";
336 } 471 }
337 } 472 }
338 473
339 undef $parse_block; # work around bug in perl not freeing $fh etc. 474 undef $parse_block; # work around bug in perl not freeing $fh etc.
340 475
341 \%arc 476 \%arc
477}
478
479sub archlist_to_string {
480 my ($arch) = @_;
481
482 my $str;
483
484 my $append; $append = sub {
485 my %a = %{$_[0]};
486
487 Crossfire::attr_freeze \%a;
488 Crossfire::normalize_arch \%a;
489
490 # undo the bit-split we did before
491 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
492 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
493 | (delete $a{attack_movement_bits_4_7});
494 }
495
496 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
497
498 my $inv = delete $a{inventory};
499 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
500 my $anim = delete $a{anim};
501
502 my @kv;
503
504 for ($a{_name} eq "map"
505 ? @Crossfire::FIELD_ORDER_MAP
506 : @Crossfire::FIELD_ORDER) {
507 push @kv, [$_, delete $a{$_}]
508 if exists $a{$_};
509 }
510
511 for (sort keys %a) {
512 next if /^_/; # ignore our _-keys
513 push @kv, [$_, delete $a{$_}];
514 }
515
516 for (@kv) {
517 my ($k, $v) = @$_;
518
519 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
520 $v =~ s/\n$//;
521 $str .= "$k\n$v\n$end\n";
522 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
523 if ($v & ~Crossfire::MOVE_ALL or !$v) {
524 $str .= "$k $v\n";
525
526 } elsif ($v & Crossfire::MOVE_ALLBIT) {
527 $str .= "$k all";
528
529 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
530 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
531 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
532 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
533 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
534
535 $str .= "\n";
536
537 } else {
538 $str .= $k;
539
540 $str .= " walk" if $v & Crossfire::MOVE_WALK;
541 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
542 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
543 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
544 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
545
546 $str .= "\n";
547 }
548 } else {
549 $str .= "$k $v\n";
550 }
551 }
552
553 if ($inv) {
554 $append->($_) for @$inv;
555 }
556
557 if ($a{_atype} eq 'object') {
558 $str .= join "\n", "anim", @$anim, "mina\n"
559 if $anim;
560 }
561
562 $str .= "end\n";
563
564 if (($a{_atype} eq 'object') && $more) {
565 $str .= "\nmore\n";
566 $append->($more) if $more;
567 }
568 };
569
570 for (@$arch) {
571 $append->($_);
572 }
573
574 $str
342} 575}
343 576
344# put all archs into a hash with editor_face as it's key 577# put all archs into a hash with editor_face as it's key
345# NOTE: the arrays in the hash values are references to 578# NOTE: the arrays in the hash values are references to
346# the archs from $ARCH 579# the archs from $ARCH
347sub editor_archs { 580sub editor_archs {
348 my %paths; 581 my %paths;
349 582
350 for (keys %ARCH) { 583 for (keys %ARCH) {
351 my $arch = $ARCH{$_}; 584 my $arch = $ARCH{$_};
352 push @{$paths{$arch->{editor_folder}}}, \$arch; 585 push @{$paths{$arch->{editor_folder}}}, $arch;
353 } 586 }
354 587
355 \%paths 588 \%paths
356} 589}
357 590
… …
422 my $type = $obj->{type} || $arch->{type}; 655 my $type = $obj->{type} || $arch->{type};
423 656
424 if ($type > 0) { 657 if ($type > 0) {
425 $root = $Crossfire::Data::ATTR{$type}; 658 $root = $Crossfire::Data::ATTR{$type};
426 } else { 659 } else {
660 my %a = (%$arch, %$obj);
661
662 if ($a{is_floor} && !$a{alive}) {
663 $root = $Crossfire::Data::TYPE{Floor};
664 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
665 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
666 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
667 $root = $Crossfire::Data::TYPE{Wall};
668 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
669 $root = $Crossfire::Data::TYPE{"Weak Wall"};
670 } else {
427 $root = $Crossfire::Data::TYPE{Misc}; 671 $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 } 672 }
442 } 673 }
443 674
444 my @import = ($root); 675 my @import = ($root);
445 676
… …
619 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 850 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
620 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 851 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
621 or die "$VARDIR/tilecache.png: $!"; 852 or die "$VARDIR/tilecache.png: $!";
622 *FACE = $_[0]; 853 *FACE = $_[0];
623 }, sub { 854 }, sub {
624 require File::Temp;
625
626 my $tile = read_pak "$LIB/crossfire.0"; 855 my $tile = read_pak "$LIB/crossfire.0";
627 856
628 my %cache; 857 my %cache;
629 858
630 my $idx = 0; 859 my $idx = 0;
631 860
632 for my $name (sort keys %$tile) { 861 for my $name (sort keys %$tile) {
633 my ($fh, $filename) = File::Temp::tempfile (); 862 my $pb = new Gtk2::Gdk::PixbufLoader;
634 print $fh $tile->{$name}; 863 $pb->write ($tile->{$name});
635 close $fh; 864 $pb->close;
636 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 865 my $pb = $pb->get_pixbuf;
637 unlink $filename;
638 866
639 my $tile = $cache{$name} = { 867 my $tile = $cache{$name} = {
640 pb => $pb, 868 pb => $pb,
641 idx => $idx, 869 idx => $idx,
642 w => int $pb->get_width / TILESIZE, 870 w => int $pb->get_width / TILESIZE,
… …
660 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 888 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
661 } 889 }
662 } 890 }
663 } 891 }
664 892
665 $pb->save ("$VARDIR/tilecache.png", "png"); 893 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
666 894
667 \%cache 895 \%cache
668 }; 896 };
669} 897}
670 898

Diff Legend

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