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.54 by root, Thu Mar 23 06:45:23 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.
60our @FIELD_ORDER_MAP = (qw(
61 name attach swap_time reset_timeout fixed_resettime difficulty region
62 shopitems shopgreed shopmin shopmax shoprace
63 darkness width height enter_x enter_y msg maplore
64 unique template
65 outdoor temp pressure humid windspeed winddir sky nosmooth
66 tile_path_1 tile_path_2 tile_path_3 tile_path_4
67));
68
44our @FIELD_ORDER = (qw( 69our @FIELD_ORDER = (qw(
70 elevation
71
45 name name_pl custom_name title race 72 name name_pl custom_name attach title race
46 slaying skill msg lore other_arch face 73 slaying skill msg lore other_arch face
47 #events 74 #todo-events
48 animation is_animated 75 animation is_animated
49 Str Dex Con Wis Pow Cha Int 76 str dex con wis pow cha int
50 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
51 exp perm_exp expmul 78 exp perm_exp expmul
52 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
53 nrof level direction type subtype 80 nrof level direction type subtype attacktype
54 81
55 resist_physical resist_magic resist_fire resist_electricity 82 resist_physical resist_magic resist_fire resist_electricity
56 resist_cold resist_confusion resist_acid resist_drain 83 resist_cold resist_confusion resist_acid resist_drain
57 resist_weaponmagic resist_ghosthit resist_poison resist_slow 84 resist_weaponmagic resist_ghosthit resist_poison resist_slow
58 resist_paralyze resist_turn_undead resist_fear resist_cancellation 85 resist_paralyze resist_turn_undead resist_fear resist_cancellation
… …
87 114
88 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
89 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
90)); 117));
91 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
92sub MOVE_WALK (){ 0x01 } 134sub MOVE_WALK (){ 0x01 }
93sub MOVE_FLY_LOW (){ 0x02 } 135sub MOVE_FLY_LOW (){ 0x02 }
94sub MOVE_FLY_HIGH (){ 0x04 } 136sub MOVE_FLY_HIGH (){ 0x04 }
95sub MOVE_FLYING (){ 0x06 } 137sub MOVE_FLYING (){ 0x06 }
96sub MOVE_SWIM (){ 0x08 } 138sub MOVE_SWIM (){ 0x08 }
97sub MOVE_BOAT (){ 0x10 } 139sub MOVE_BOAT (){ 0x10 }
140sub MOVE_KNOWN (){ 0x1f } # all of above
98sub MOVE_ALL (){ 0xff } 141sub MOVE_ALLBIT (){ 0x10000 }
142sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
99 143
100sub load_ref($) { 144sub load_ref($) {
101 my ($path) = @_; 145 my ($path) = @_;
102 146
103 open my $fh, "<", $path 147 open my $fh, "<:raw:perlio", $path
104 or die "$path: $!"; 148 or die "$path: $!";
105 binmode $fh;
106 local $/; 149 local $/;
107 150
108 thaw <$fh> 151 thaw <$fh>
109} 152}
110 153
111sub save_ref($$) { 154sub save_ref($$) {
112 my ($ref, $path) = @_; 155 my ($ref, $path) = @_;
113 156
114 open my $fh, ">", "$path~" 157 open my $fh, ">:raw:perlio", "$path~"
115 or die "$path~: $!"; 158 or die "$path~: $!";
116 binmode $fh;
117 print $fh freeze $ref; 159 print $fh freeze $ref;
118 close $fh; 160 close $fh;
119 rename "$path~", $path 161 rename "$path~", $path
120 or die "$path: $!"; 162 or die "$path: $!";
121} 163}
122 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
123sub normalize_object($) { 203sub normalize_object($) {
124 my ($ob) = @_; 204 my ($ob) = @_;
125 205
206 # nuke outdated or never supported fields
126 delete $ob->{$_} for qw( 207 delete @$ob{qw(
127 can_knockback can_parry can_impale can_cut can_dam_armour 208 can_knockback can_parry can_impale can_cut can_dam_armour
128 can_apply pass_thru can_pass_thru 209 can_apply pass_thru can_pass_thru
129 ); 210 )};
130 211
131 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) {
132 next unless exists $ob->{$attr}; 218 next unless exists $ob->{$attr};
219
220 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
221
133 next if $ob->{$attr} =~ /^\d+$/; 222 next if $ob->{$attr} =~ /^\d+$/;
134 223
135 my $flags = 0; 224 my $flags = 0;
136 225
137 # assume list 226 # assume list
… …
154 } 243 }
155 244
156 $ob->{$attr} = $flags; 245 $ob->{$attr} = $flags;
157 } 246 }
158 247
248 # convert outdated movement flags to new movement sets
159 if (defined (my $v = delete $ob->{no_pass})) { 249 if (defined (my $v = delete $ob->{no_pass})) {
160 $ob->{move_block} = $v ? MOVE_ALL : 0; 250 $ob->{move_block} = $v ? MOVE_ALL : 0;
161 } 251 }
162 if (defined (my $v = delete $ob->{slow_move})) { 252 if (defined (my $v = delete $ob->{slow_move})) {
163 $ob->{move_slow} |= MOVE_WALK; 253 $ob->{move_slow} |= MOVE_WALK;
164 $ob->{move_slow_penalty} = $v; 254 $ob->{move_slow_penalty} = $v;
165 } 255 }
166 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};
167 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 258 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
168 : $ob->{move_on} & ~MOVE_WALK; 259 : $ob->{move_on} & ~MOVE_WALK;
169 } 260 }
170 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};
171 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 263 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
172 : $ob->{move_off} & ~MOVE_WALK; 264 : $ob->{move_off} & ~MOVE_WALK;
173 } 265 }
174 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};
175 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 268 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
176 : $ob->{move_on} & ~MOVE_FLY_LOW; 269 : $ob->{move_on} & ~MOVE_FLY_LOW;
177 } 270 }
178 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};
179 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 273 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
180 : $ob->{move_off} & ~MOVE_FLY_LOW; 274 : $ob->{move_off} & ~MOVE_FLY_LOW;
181 } 275 }
182 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};
183 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 278 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
184 : $ob->{move_type} & ~MOVE_FLY_LOW; 279 : $ob->{move_type} & ~MOVE_FLY_LOW;
185 } 280 }
186 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
187 $ob 297 $ob
188} 298}
189 299
300# arch as in "arch xxx", ie.. objects
190sub normalize_arch($) { 301sub normalize_arch($) {
191 my ($ob) = @_; 302 my ($ob) = @_;
192 303
193 normalize_object $ob; 304 normalize_object $ob;
194 305
… …
221 delete $ob->{$k}; 332 delete $ob->{$k};
222 } 333 }
223 } 334 }
224 } 335 }
225 336
337 # a speciality for the editor
338 if (exists $ob->{attack_movement}) {
339 my $am = delete $ob->{attack_movement};
340 $ob->{attack_movement_bits_0_3} = $am & 15;
341 $ob->{attack_movement_bits_4_7} = $am & 240;
342 }
343
344 $ob
345}
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
226 $ob 362 $ob
227} 363}
228 364
229sub read_pak($) { 365sub read_pak($) {
230 my ($path) = @_; 366 my ($path) = @_;
231 367
232 my %pak; 368 my %pak;
233 369
234 open my $fh, "<", $path 370 open my $fh, "<:raw:perlio", $path
235 or Carp::croak "$_[0]: $!"; 371 or Carp::croak "$_[0]: $!";
236 binmode $fh; 372 binmode $fh;
237 while (<$fh>) { 373 while (<$fh>) {
238 my ($type, $id, $len, $path) = split; 374 my ($type, $id, $len, $path) = split;
239 $path =~ s/.*\///; 375 $path =~ s/.*\///;
… …
241 } 377 }
242 378
243 \%pak 379 \%pak
244} 380}
245 381
246sub read_arch($) { 382sub read_arch($;$) {
247 my ($path) = @_; 383 my ($path, $toplevel) = @_;
248 384
249 my %arc; 385 my %arc;
250 my ($more, $prev); 386 my ($more, $prev);
251 387
252 open my $fh, "<", $path 388 open my $fh, "<:raw:perlio:utf8", $path
253 or Carp::croak "$path: $!"; 389 or Carp::croak "$path: $!";
254 390
255 binmode $fh; 391# binmode $fh;
256 392
257 my $parse_block; $parse_block = sub { 393 my $parse_block; $parse_block = sub {
258 my %arc = @_; 394 my %arc = @_;
259 395
260 while (<$fh>) { 396 while (<$fh>) {
261 s/\s+$//; 397 s/\s+$//;
262 if (/^end$/i) { 398 if (/^end$/i) {
263 last; 399 last;
264 } elsif (/^arch (\S+)$/) { 400 } elsif (/^arch (\S+)$/i) {
265 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 401 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
266 } elsif (/^lore$/) { 402 } elsif (/^lore$/i) {
267 while (<$fh>) { 403 while (<$fh>) {
268 last if /^endlore\s*$/i; 404 last if /^endlore\s*$/i;
269 $arc{lore} .= $_; 405 $arc{lore} .= $_;
270 } 406 }
271 } elsif (/^msg$/) { 407 } elsif (/^msg$/i) {
272 while (<$fh>) { 408 while (<$fh>) {
273 last if /^endmsg\s*$/i; 409 last if /^endmsg\s*$/i;
274 $arc{msg} .= $_; 410 $arc{msg} .= $_;
411 }
412 } elsif (/^anim$/i) {
413 while (<$fh>) {
414 last if /^mina\s*$/i;
415 chomp;
416 push @{ $arc{anim} }, $_;
275 } 417 }
276 } elsif (/^(\S+)\s*(.*)$/) { 418 } elsif (/^(\S+)\s*(.*)$/) {
277 $arc{lc $1} = $2; 419 $arc{lc $1} = $2;
278 } elsif (/^\s*($|#)/) { 420 } elsif (/^\s*($|#)/) {
279 # 421 #
… …
289 s/\s+$//; 431 s/\s+$//;
290 if (/^more$/i) { 432 if (/^more$/i) {
291 $more = $prev; 433 $more = $prev;
292 } elsif (/^object (\S+)$/i) { 434 } elsif (/^object (\S+)$/i) {
293 my $name = $1; 435 my $name = $1;
294 my $arc = normalize_object $parse_block->(_name => $name); 436 my $arc = attr_thaw normalize_object $parse_block->(_name => $name);
437 $arc->{_atype} = 'object';
295 438
296 if ($more) { 439 if ($more) {
297 $more->{more} = $arc; 440 $more->{more} = $arc;
298 } else { 441 } else {
299 $arc{$name} = $arc; 442 $arc{$name} = $arc;
300 } 443 }
301 $prev = $arc; 444 $prev = $arc;
302 $more = undef; 445 $more = undef;
303 } elsif (/^arch (\S+)$/i) { 446 } elsif (/^arch (\S+)$/i) {
447 my $name = $1;
304 push @{ $arc{arch} }, normalize_arch $parse_block->(_name => $1); 448 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name);
449 $arc->{_atype} = 'arch';
450
451 if ($more) {
452 $more->{more} = $arc;
453 } else {
454 push @{ $arc{arch} }, $arc;
455 }
456 $prev = $arc;
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 }
305 } elsif (/^\s*($|#)/) { 467 } elsif (/^\s*($|#)/) {
306 # 468 #
307 } else { 469 } else {
308 warn "$path: unparseable top-level line '$_'"; 470 die "$path: unparseable top-level line '$_'";
309 } 471 }
310 } 472 }
311 473
312 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.
313 475
314 \%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
315} 575}
316 576
317# 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
318# NOTE: the arrays in the hash values are references to 578# NOTE: the arrays in the hash values are references to
319# the archs from $ARCH 579# the archs from $ARCH
320sub editor_archs { 580sub editor_archs {
321 my %paths; 581 my %paths;
322 582
323 for (keys %ARCH) { 583 for (keys %ARCH) {
324 my $arch = $ARCH{$_}; 584 my $arch = $ARCH{$_};
325 push @{$paths{$arch->{editor_folder}}}, \$arch; 585 push @{$paths{$arch->{editor_folder}}}, $arch;
326 } 586 }
327 587
328 \%paths 588 \%paths
329} 589}
330 590
… …
395 my $type = $obj->{type} || $arch->{type}; 655 my $type = $obj->{type} || $arch->{type};
396 656
397 if ($type > 0) { 657 if ($type > 0) {
398 $root = $Crossfire::Data::ATTR{$type}; 658 $root = $Crossfire::Data::ATTR{$type};
399 } 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 {
400 $root = $Crossfire::Data::TYPE{Misc}; 671 $root = $Crossfire::Data::TYPE{Misc};
401
402 type:
403 for (@Crossfire::Data::ATTR0) {
404 my $req = $_->{required}
405 or die "internal error: ATTR0 without 'required'";
406
407 keys %$req;
408 while (my ($k, $v) = each %$req) {
409 next type
410 unless $obj->{$k} == $v || $arch->{$k} == $v;
411 }
412
413 $root = $_;
414 } 672 }
415 } 673 }
416 674
417 my @import = ($root); 675 my @import = ($root);
418 676
… …
592 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 850 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
593 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 851 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
594 or die "$VARDIR/tilecache.png: $!"; 852 or die "$VARDIR/tilecache.png: $!";
595 *FACE = $_[0]; 853 *FACE = $_[0];
596 }, sub { 854 }, sub {
597 require File::Temp;
598
599 my $tile = read_pak "$LIB/crossfire.0"; 855 my $tile = read_pak "$LIB/crossfire.0";
600 856
601 my %cache; 857 my %cache;
602 858
603 my $idx = 0; 859 my $idx = 0;
604 860
605 for my $name (sort keys %$tile) { 861 for my $name (sort keys %$tile) {
606 my ($fh, $filename) = File::Temp::tempfile (); 862 my $pb = new Gtk2::Gdk::PixbufLoader;
607 print $fh $tile->{$name}; 863 $pb->write ($tile->{$name});
608 close $fh; 864 $pb->close;
609 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 865 my $pb = $pb->get_pixbuf;
610 unlink $filename;
611 866
612 my $tile = $cache{$name} = { 867 my $tile = $cache{$name} = {
613 pb => $pb, 868 pb => $pb,
614 idx => $idx, 869 idx => $idx,
615 w => int $pb->get_width / TILESIZE, 870 w => int $pb->get_width / TILESIZE,
… …
633 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 888 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
634 } 889 }
635 } 890 }
636 } 891 }
637 892
638 $pb->save ("$VARDIR/tilecache.png", "png"); 893 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
639 894
640 \%cache 895 \%cache
641 }; 896 };
642} 897}
643 898

Diff Legend

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