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.58 by root, Thu Mar 23 20:15:08 2006 UTC vs.
Revision 1.80 by root, Tue Feb 6 22:08:14 2007 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.1'; 9our $VERSION = '0.96';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
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 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}
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"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
40 : File::Spec->tmpdir . "/crossfire";
27 41
28mkdir $VARDIR, 0777; 42mkdir $VARDIR, 0777;
29 43
30sub TILESIZE (){ 32 } 44sub TILESIZE (){ 32 }
31 45
… …
44 qw(move_type move_block move_allow move_on move_off move_slow); 58 qw(move_type move_block move_allow move_on move_off move_slow);
45 59
46# same as in server save routine, to (hopefully) be compatible 60# same as in server save routine, to (hopefully) be compatible
47# to the other editors. 61# to the other editors.
48our @FIELD_ORDER_MAP = (qw( 62our @FIELD_ORDER_MAP = (qw(
49 name swap_time reset_timeout fixed_resettime difficulty region 63 name attach swap_time reset_timeout fixed_resettime difficulty region
50 shopitems shopgreed shopmin shopmax shoprace 64 shopitems shopgreed shopmin shopmax shoprace
51 darkness width height enter_x enter_y msg maplore 65 darkness width height enter_x enter_y msg maplore
52 unique template 66 unique template
53 outdoor temp pressure humid windspeed winddir sky nosmooth 67 outdoor temp pressure humid windspeed winddir sky nosmooth
54 tile_path_1 tile_path_2 tile_path_3 tile_path_4 68 tile_path_1 tile_path_2 tile_path_3 tile_path_4
55)); 69));
56 70
57our @FIELD_ORDER = (qw( 71our @FIELD_ORDER = (qw(
58 elevation 72 elevation
59 73
60 name name_pl custom_name title race 74 name name_pl custom_name attach title race
61 slaying skill msg lore other_arch face 75 slaying skill msg lore other_arch face
62 #todo-events 76 #todo-events
63 animation is_animated 77 animation is_animated
64 Str Dex Con Wis Pow Cha Int 78 str dex con wis pow cha int
65 hp maxhp sp maxsp grace maxgrace 79 hp maxhp sp maxsp grace maxgrace
66 exp perm_exp expmul 80 exp perm_exp expmul
67 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
68 nrof level direction type subtype 82 nrof level direction type subtype attacktype
69 83
70 resist_physical resist_magic resist_fire resist_electricity 84 resist_physical resist_magic resist_fire resist_electricity
71 resist_cold resist_confusion resist_acid resist_drain 85 resist_cold resist_confusion resist_acid resist_drain
72 resist_weaponmagic resist_ghosthit resist_poison resist_slow 86 resist_weaponmagic resist_ghosthit resist_poison resist_slow
73 resist_paralyze resist_turn_undead resist_fear resist_cancellation 87 resist_paralyze resist_turn_undead resist_fear resist_cancellation
… …
102 116
103 body_range body_arm body_torso body_head body_neck body_skill 117 body_range body_arm body_torso body_head body_neck body_skill
104 body_finger body_shoulder body_foot body_hand body_wrist body_waist 118 body_finger body_shoulder body_foot body_hand body_wrist body_waist
105)); 119));
106 120
121our %EVENT_TYPE = (
122 apply => 1,
123 attack => 2,
124 death => 3,
125 drop => 4,
126 pickup => 5,
127 say => 6,
128 stop => 7,
129 time => 8,
130 throw => 9,
131 trigger => 10,
132 close => 11,
133 timer => 12,
134);
135
107sub MOVE_WALK (){ 0x01 } 136sub MOVE_WALK (){ 0x01 }
108sub MOVE_FLY_LOW (){ 0x02 } 137sub MOVE_FLY_LOW (){ 0x02 }
109sub MOVE_FLY_HIGH (){ 0x04 } 138sub MOVE_FLY_HIGH (){ 0x04 }
110sub MOVE_FLYING (){ 0x06 } 139sub MOVE_FLYING (){ 0x06 }
111sub MOVE_SWIM (){ 0x08 } 140sub MOVE_SWIM (){ 0x08 }
… …
115sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 144sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
116 145
117sub load_ref($) { 146sub load_ref($) {
118 my ($path) = @_; 147 my ($path) = @_;
119 148
120 open my $fh, "<", $path 149 open my $fh, "<:raw:perlio", $path
121 or die "$path: $!"; 150 or die "$path: $!";
122 binmode $fh;
123 local $/; 151 local $/;
124 152
125 thaw <$fh> 153 thaw <$fh>
126} 154}
127 155
128sub save_ref($$) { 156sub save_ref($$) {
129 my ($ref, $path) = @_; 157 my ($ref, $path) = @_;
130 158
131 open my $fh, ">", "$path~" 159 open my $fh, ">:raw:perlio", "$path~"
132 or die "$path~: $!"; 160 or die "$path~: $!";
133 binmode $fh;
134 print $fh freeze $ref; 161 print $fh freeze $ref;
135 close $fh; 162 close $fh;
136 rename "$path~", $path 163 rename "$path~", $path
137 or die "$path: $!"; 164 or die "$path: $!";
138} 165}
139 166
167my %attack_mask = (
168 physical => 0x00000001,
169 magic => 0x00000002,
170 fire => 0x00000004,
171 electricity => 0x00000008,
172 cold => 0x00000010,
173 confusion => 0x00000020,
174 acid => 0x00000040,
175 drain => 0x00000080,
176 weaponmagic => 0x00000100,
177 ghosthit => 0x00000200,
178 poison => 0x00000400,
179 slow => 0x00000800,
180 paralyze => 0x00001000,
181 turn_undead => 0x00002000,
182 fear => 0x00004000,
183 cancellation => 0x00008000,
184 deplete => 0x00010000,
185 death => 0x00020000,
186 chaos => 0x00040000,
187 counterspell => 0x00080000,
188 godpower => 0x00100000,
189 holyword => 0x00200000,
190 blind => 0x00400000,
191 internal => 0x00800000,
192 life_stealing => 0x01000000,
193 disease => 0x02000000,
194);
195
196sub _add_resist($$$) {
197 my ($ob, $mask, $value) = @_;
198
199 while (my ($k, $v) = each %attack_mask) {
200 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
201 }
202}
203
204# object as in "Object xxx", i.e. archetypes
140sub normalize_object($) { 205sub normalize_object($) {
141 my ($ob) = @_; 206 my ($ob) = @_;
142 207
208 # nuke outdated or never supported fields
143 delete $ob->{$_} for qw( 209 delete @$ob{qw(
144 can_knockback can_parry can_impale can_cut can_dam_armour 210 can_knockback can_parry can_impale can_cut can_dam_armour
145 can_apply pass_thru can_pass_thru 211 can_apply pass_thru can_pass_thru
146 ); 212 )};
147 213
214 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
215 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
216 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
217
218 # convert movement strings to bitsets
148 for my $attr (keys %FIELD_MOVEMENT) { 219 for my $attr (keys %FIELD_MOVEMENT) {
149 next unless exists $ob->{$attr}; 220 next unless exists $ob->{$attr};
150 221
151 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 222 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
152 223
… …
174 } 245 }
175 246
176 $ob->{$attr} = $flags; 247 $ob->{$attr} = $flags;
177 } 248 }
178 249
250 # convert outdated movement flags to new movement sets
179 if (defined (my $v = delete $ob->{no_pass})) { 251 if (defined (my $v = delete $ob->{no_pass})) {
180 $ob->{move_block} = $v ? MOVE_ALL : 0; 252 $ob->{move_block} = $v ? MOVE_ALL : 0;
181 } 253 }
182 if (defined (my $v = delete $ob->{slow_move})) { 254 if (defined (my $v = delete $ob->{slow_move})) {
183 $ob->{move_slow} |= MOVE_WALK; 255 $ob->{move_slow} |= MOVE_WALK;
184 $ob->{move_slow_penalty} = $v; 256 $ob->{move_slow_penalty} = $v;
185 } 257 }
186 if (defined (my $v = delete $ob->{walk_on})) { 258 if (defined (my $v = delete $ob->{walk_on})) {
259 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
187 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 260 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
188 : $ob->{move_on} & ~MOVE_WALK; 261 : $ob->{move_on} & ~MOVE_WALK;
189 } 262 }
190 if (defined (my $v = delete $ob->{walk_off})) { 263 if (defined (my $v = delete $ob->{walk_off})) {
264 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
191 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 265 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
192 : $ob->{move_off} & ~MOVE_WALK; 266 : $ob->{move_off} & ~MOVE_WALK;
193 } 267 }
194 if (defined (my $v = delete $ob->{fly_on})) { 268 if (defined (my $v = delete $ob->{fly_on})) {
269 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
195 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 270 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
196 : $ob->{move_on} & ~MOVE_FLY_LOW; 271 : $ob->{move_on} & ~MOVE_FLY_LOW;
197 } 272 }
198 if (defined (my $v = delete $ob->{fly_off})) { 273 if (defined (my $v = delete $ob->{fly_off})) {
274 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
199 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 275 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
200 : $ob->{move_off} & ~MOVE_FLY_LOW; 276 : $ob->{move_off} & ~MOVE_FLY_LOW;
201 } 277 }
202 if (defined (my $v = delete $ob->{flying})) { 278 if (defined (my $v = delete $ob->{flying})) {
279 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type};
203 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 280 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
204 : $ob->{move_type} & ~MOVE_FLY_LOW; 281 : $ob->{move_type} & ~MOVE_FLY_LOW;
205 } 282 }
206 283
284 # convert idiotic event_xxx things into objects
285 while (my ($event, $subtype) = each %EVENT_TYPE) {
286 if (exists $ob->{"event_${event}_plugin"}) {
287 push @{$ob->{inventory}}, {
288 _name => "event_$event",
289 title => delete $ob->{"event_${event}_plugin"},
290 slaying => delete $ob->{"event_${event}"},
291 name => delete $ob->{"event_${event}_options"},
292 };
293 }
294 }
295
296 # some archetypes had "+3" instead of the canonical "3", so fix
297 $ob->{dam} *= 1 if exists $ob->{dam};
298
207 $ob 299 $ob
208} 300}
209 301
302# arch as in "arch xxx", ie.. objects
210sub normalize_arch($) { 303sub normalize_arch($) {
211 my ($ob) = @_; 304 my ($ob) = @_;
212 305
213 normalize_object $ob; 306 normalize_object $ob;
214 307
… …
251 } 344 }
252 345
253 $ob 346 $ob
254} 347}
255 348
349sub attr_thaw($) {
350 my ($ob) = @_;
351
352 $ob->{attach} = from_json $ob->{attach}
353 if exists $ob->{attach};
354
355 $ob
356}
357
358sub attr_freeze($) {
359 my ($ob) = @_;
360
361 $ob->{attach} = Crossfire::to_json $ob->{attach}
362 if exists $ob->{attach};
363
364 $ob
365}
366
256sub read_pak($) { 367sub read_pak($) {
257 my ($path) = @_; 368 my ($path) = @_;
258 369
259 my %pak; 370 my %pak;
260 371
261 open my $fh, "<", $path 372 open my $fh, "<:raw:perlio", $path
262 or Carp::croak "$_[0]: $!"; 373 or Carp::croak "$_[0]: $!";
263 binmode $fh; 374 binmode $fh;
264 while (<$fh>) { 375 while (<$fh>) {
265 my ($type, $id, $len, $path) = split; 376 my ($type, $id, $len, $path) = split;
266 $path =~ s/.*\///; 377 $path =~ s/.*\///;
… …
268 } 379 }
269 380
270 \%pak 381 \%pak
271} 382}
272 383
273sub read_arch($) { 384sub read_arch($;$) {
274 my ($path) = @_; 385 my ($path, $toplevel) = @_;
275 386
276 my %arc; 387 my %arc;
277 my ($more, $prev); 388 my ($more, $prev);
389 my $comment;
278 390
279 open my $fh, "<", $path 391 open my $fh, "<:raw:perlio:utf8", $path
280 or Carp::croak "$path: $!"; 392 or Carp::croak "$path: $!";
281 393
282 binmode $fh; 394# binmode $fh;
283 395
284 my $parse_block; $parse_block = sub { 396 my $parse_block; $parse_block = sub {
285 my %arc = @_; 397 my %arc = @_;
286 398
287 while (<$fh>) { 399 while (<$fh>) {
288 s/\s+$//; 400 s/\s+$//;
289 if (/^end$/i) { 401 if (/^end$/i) {
290 last; 402 last;
403
291 } elsif (/^arch (\S+)$/i) { 404 } elsif (/^arch (\S+)$/i) {
292 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 405 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
406
293 } elsif (/^lore$/i) { 407 } elsif (/^lore$/i) {
294 while (<$fh>) { 408 while (<$fh>) {
295 last if /^endlore\s*$/i; 409 last if /^endlore\s*$/i;
296 $arc{lore} .= $_; 410 $arc{lore} .= $_;
297 } 411 }
298 } elsif (/^msg$/i) { 412 } elsif (/^msg$/i) {
299 while (<$fh>) { 413 while (<$fh>) {
300 last if /^endmsg\s*$/i; 414 last if /^endmsg\s*$/i;
301 $arc{msg} .= $_; 415 $arc{msg} .= $_;
302 } 416 }
417 } elsif (/^anim$/i) {
418 while (<$fh>) {
419 last if /^mina\s*$/i;
420 chomp;
421 push @{ $arc{anim} }, $_;
422 }
303 } elsif (/^(\S+)\s*(.*)$/) { 423 } elsif (/^(\S+)\s*(.*)$/) {
304 $arc{lc $1} = $2; 424 $arc{lc $1} = $2;
305 } elsif (/^\s*($|#)/) { 425 } elsif (/^\s*#/) {
426 $arc{_comment} .= $_;
427
428 } elsif (/^\s*$/) {
306 # 429 #
307 } else { 430 } else {
308 warn "$path: unparsable line '$_' in arch $arc{_name}"; 431 warn "$path: unparsable line '$_' in arch $arc{_name}";
309 } 432 }
310 } 433 }
… …
314 437
315 while (<$fh>) { 438 while (<$fh>) {
316 s/\s+$//; 439 s/\s+$//;
317 if (/^more$/i) { 440 if (/^more$/i) {
318 $more = $prev; 441 $more = $prev;
442 } elsif (/^\s*#/) {
443 $comment .= $_;
319 } elsif (/^object (\S+)$/i) { 444 } elsif (/^object (\S+)$/i) {
320 my $name = $1; 445 my $name = $1;
321 my $arc = normalize_object $parse_block->(_name => $name); 446 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
447 delete $arc{_comment} unless length $arc{_comment};
448 $arc->{_atype} = 'object';
322 449
323 if ($more) { 450 if ($more) {
324 $more->{more} = $arc; 451 $more->{more} = $arc;
325 } else { 452 } else {
326 $arc{$name} = $arc; 453 $arc{$name} = $arc;
327 } 454 }
328 $prev = $arc; 455 $prev = $arc;
329 $more = undef; 456 $more = undef;
330 } elsif (/^arch (\S+)$/i) { 457 } elsif (/^arch (\S+)$/i) {
331 my $name = $1; 458 my $name = $1;
332 my $arc = normalize_arch $parse_block->(_name => $name); 459 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
460 delete $arc{_comment} unless length $arc{_comment};
461 $arc->{_atype} = 'arch';
333 462
334 if ($more) { 463 if ($more) {
335 $more->{more} = $arc; 464 $more->{more} = $arc;
336 } else { 465 } else {
337 push @{ $arc{arch} }, $arc; 466 push @{ $arc{arch} }, $arc;
338 } 467 }
339 $prev = $arc; 468 $prev = $arc;
340 $more = undef; 469 $more = undef;
470 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
471 if ($1 eq "lev_array") {
472 while (<$fh>) {
473 last if /^endplst\s*$/;
474 push @{$toplevel->{lev_array}}, $_+0;
475 }
476 } else {
477 $toplevel->{$1} = $2;
478 }
341 } elsif (/^\s*($|#)/) { 479 } elsif (/^\s*($|#)/) {
342 # 480 #
343 } else { 481 } else {
344 warn "$path: unparseable top-level line '$_'"; 482 die "$path: unparseable top-level line '$_'";
345 } 483 }
346 } 484 }
347 485
348 undef $parse_block; # work around bug in perl not freeing $fh etc. 486 undef $parse_block; # work around bug in perl not freeing $fh etc.
349 487
350 \%arc 488 \%arc
489}
490
491sub archlist_to_string {
492 my ($arch) = @_;
493
494 my $str;
495
496 my $append; $append = sub {
497 my %a = %{$_[0]};
498
499 Crossfire::attr_freeze \%a;
500 Crossfire::normalize_arch \%a;
501
502 # undo the bit-split we did before
503 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
504 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
505 | (delete $a{attack_movement_bits_4_7});
506 }
507
508 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
509
510 my $inv = delete $a{inventory};
511 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
512 my $anim = delete $a{anim};
513
514 my @kv;
515
516 for ($a{_name} eq "map"
517 ? @Crossfire::FIELD_ORDER_MAP
518 : @Crossfire::FIELD_ORDER) {
519 push @kv, [$_, delete $a{$_}]
520 if exists $a{$_};
521 }
522
523 for (sort keys %a) {
524 next if /^_/; # ignore our _-keys
525 push @kv, [$_, delete $a{$_}];
526 }
527
528 for (@kv) {
529 my ($k, $v) = @$_;
530
531 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
532 $v =~ s/\n$//;
533 $str .= "$k\n$v\n$end\n";
534 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
535 if ($v & ~Crossfire::MOVE_ALL or !$v) {
536 $str .= "$k $v\n";
537
538 } elsif ($v & Crossfire::MOVE_ALLBIT) {
539 $str .= "$k all";
540
541 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
542 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
543 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
544 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
545 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
546
547 $str .= "\n";
548
549 } else {
550 $str .= $k;
551
552 $str .= " walk" if $v & Crossfire::MOVE_WALK;
553 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
554 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
555 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
556 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
557
558 $str .= "\n";
559 }
560 } else {
561 $str .= "$k $v\n";
562 }
563 }
564
565 if ($inv) {
566 $append->($_) for @$inv;
567 }
568
569 if ($a{_atype} eq 'object') {
570 $str .= join "\n", "anim", @$anim, "mina\n"
571 if $anim;
572 }
573
574 $str .= "end\n";
575
576 if (($a{_atype} eq 'object') && $more) {
577 $str .= "\nmore\n";
578 $append->($more) if $more;
579 }
580 };
581
582 for (@$arch) {
583 $append->($_);
584 }
585
586 $str
351} 587}
352 588
353# put all archs into a hash with editor_face as it's key 589# put all archs into a hash with editor_face as it's key
354# NOTE: the arrays in the hash values are references to 590# NOTE: the arrays in the hash values are references to
355# the archs from $ARCH 591# the archs from $ARCH
356sub editor_archs { 592sub editor_archs {
357 my %paths; 593 my %paths;
358 594
359 for (keys %ARCH) { 595 for (keys %ARCH) {
360 my $arch = $ARCH{$_}; 596 my $arch = $ARCH{$_};
361 push @{$paths{$arch->{editor_folder}}}, \$arch; 597 push @{$paths{$arch->{editor_folder}}}, $arch;
362 } 598 }
363 599
364 \%paths 600 \%paths
365} 601}
366 602
… …
376 my ($a) = @_; 612 my ($a) = @_;
377 613
378 my $o = $ARCH{$a->{_name}} 614 my $o = $ARCH{$a->{_name}}
379 or return; 615 or return;
380 616
381 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 617 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
618 unless ($face) {
619 $face = $FACE{"blank.x11"}
382 or (warn "no face data found for arch '$a->{_name}'"), return; 620 or (warn "no face data found for arch '$a->{_name}'"), return;
621 }
383 622
384 if ($face->{w} > 1 || $face->{h} > 1) { 623 if ($face->{w} > 1 || $face->{h} > 1) {
385 # bigface 624 # bigface
386 return (0, 0, $face->{w} - 1, $face->{h} - 1); 625 return (0, 0, $face->{w} - 1, $face->{h} - 1);
387 626
… …
431 my $type = $obj->{type} || $arch->{type}; 670 my $type = $obj->{type} || $arch->{type};
432 671
433 if ($type > 0) { 672 if ($type > 0) {
434 $root = $Crossfire::Data::ATTR{$type}; 673 $root = $Crossfire::Data::ATTR{$type};
435 } else { 674 } else {
675 my %a = (%$arch, %$obj);
676
677 if ($a{is_floor} && !$a{alive}) {
678 $root = $Crossfire::Data::TYPE{Floor};
679 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
680 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
681 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
682 $root = $Crossfire::Data::TYPE{Wall};
683 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
684 $root = $Crossfire::Data::TYPE{"Weak Wall"};
685 } else {
436 $root = $Crossfire::Data::TYPE{Misc}; 686 $root = $Crossfire::Data::TYPE{Misc};
437
438 type:
439 for (@Crossfire::Data::ATTR0) {
440 my $req = $_->{required}
441 or die "internal error: ATTR0 without 'required'";
442
443 keys %$req;
444 while (my ($k, $v) = each %$req) {
445 next type
446 unless $obj->{$k} == $v || $arch->{$k} == $v;
447 }
448
449 $root = $_;
450 } 687 }
451 } 688 }
452 689
453 my @import = ($root); 690 my @import = ($root);
454 691
… …
628 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 865 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
629 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 866 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
630 or die "$VARDIR/tilecache.png: $!"; 867 or die "$VARDIR/tilecache.png: $!";
631 *FACE = $_[0]; 868 *FACE = $_[0];
632 }, sub { 869 }, sub {
633 require File::Temp;
634
635 my $tile = read_pak "$LIB/crossfire.0"; 870 my $tile = read_pak "$LIB/crossfire.0";
636 871
637 my %cache; 872 my %cache;
638 873
639 my $idx = 0; 874 my $idx = 0;
640 875
641 for my $name (sort keys %$tile) { 876 for my $name (sort keys %$tile) {
642 my ($fh, $filename) = File::Temp::tempfile (); 877 my $pb = new Gtk2::Gdk::PixbufLoader;
643 print $fh $tile->{$name}; 878 $pb->write ($tile->{$name});
644 close $fh; 879 $pb->close;
645 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 880 my $pb = $pb->get_pixbuf;
646 unlink $filename;
647 881
648 my $tile = $cache{$name} = { 882 my $tile = $cache{$name} = {
649 pb => $pb, 883 pb => $pb,
650 idx => $idx, 884 idx => $idx,
651 w => int $pb->get_width / TILESIZE, 885 w => int $pb->get_width / TILESIZE,
… …
669 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 903 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
670 } 904 }
671 } 905 }
672 } 906 }
673 907
674 $pb->save ("$VARDIR/tilecache.png", "png"); 908 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
675 909
676 \%cache 910 \%cache
677 }; 911 };
678} 912}
679 913

Diff Legend

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