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.79 by elmex, Fri Jan 5 14:17:49 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
… …
37 msg => "endmsg", 51 msg => "endmsg",
38 lore => "endlore", 52 lore => "endlore",
39 maplore => "endmaplore", 53 maplore => "endmaplore",
40); 54);
41 55
56# movement bit type, PITA
57our %FIELD_MOVEMENT = map +($_ => undef),
58 qw(move_type move_block move_allow move_on move_off move_slow);
59
42# same as in server save routine, to (hopefully) be compatible 60# same as in server save routine, to (hopefully) be compatible
43# to the other editors. 61# to the other editors.
44our @FIELD_ORDER_MAP = (qw( 62our @FIELD_ORDER_MAP = (qw(
45 name swap_time reset_timeout fixed_resettime difficulty region 63 name attach swap_time reset_timeout fixed_resettime difficulty region
46 shopitems shopgreed shopmin shopmax shoprace 64 shopitems shopgreed shopmin shopmax shoprace
47 darkness width height enter_x enter_y msg maplore 65 darkness width height enter_x enter_y msg maplore
48 unique template 66 unique template
49 outdoor temp pressure humid windspeed winddir sky nosmooth 67 outdoor temp pressure humid windspeed winddir sky nosmooth
50 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
51)); 69));
52 70
53our @FIELD_ORDER = (qw( 71our @FIELD_ORDER = (qw(
54 elevation 72 elevation
55 73
56 name name_pl custom_name title race 74 name name_pl custom_name attach title race
57 slaying skill msg lore other_arch face 75 slaying skill msg lore other_arch face
58 #todo-events 76 #todo-events
59 animation is_animated 77 animation is_animated
60 Str Dex Con Wis Pow Cha Int 78 str dex con wis pow cha int
61 hp maxhp sp maxsp grace maxgrace 79 hp maxhp sp maxsp grace maxgrace
62 exp perm_exp expmul 80 exp perm_exp expmul
63 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
64 nrof level direction type subtype 82 nrof level direction type subtype attacktype
65 83
66 resist_physical resist_magic resist_fire resist_electricity 84 resist_physical resist_magic resist_fire resist_electricity
67 resist_cold resist_confusion resist_acid resist_drain 85 resist_cold resist_confusion resist_acid resist_drain
68 resist_weaponmagic resist_ghosthit resist_poison resist_slow 86 resist_weaponmagic resist_ghosthit resist_poison resist_slow
69 resist_paralyze resist_turn_undead resist_fear resist_cancellation 87 resist_paralyze resist_turn_undead resist_fear resist_cancellation
… …
98 116
99 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
100 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
101)); 119));
102 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
103sub MOVE_WALK (){ 0x01 } 136sub MOVE_WALK (){ 0x01 }
104sub MOVE_FLY_LOW (){ 0x02 } 137sub MOVE_FLY_LOW (){ 0x02 }
105sub MOVE_FLY_HIGH (){ 0x04 } 138sub MOVE_FLY_HIGH (){ 0x04 }
106sub MOVE_FLYING (){ 0x06 } 139sub MOVE_FLYING (){ 0x06 }
107sub MOVE_SWIM (){ 0x08 } 140sub MOVE_SWIM (){ 0x08 }
108sub MOVE_BOAT (){ 0x10 } 141sub MOVE_BOAT (){ 0x10 }
142sub MOVE_KNOWN (){ 0x1f } # all of above
109sub MOVE_ALL (){ 0xff } 143sub MOVE_ALLBIT (){ 0x10000 }
144sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
110 145
111sub load_ref($) { 146sub load_ref($) {
112 my ($path) = @_; 147 my ($path) = @_;
113 148
114 open my $fh, "<", $path 149 open my $fh, "<:raw:perlio", $path
115 or die "$path: $!"; 150 or die "$path: $!";
116 binmode $fh;
117 local $/; 151 local $/;
118 152
119 thaw <$fh> 153 thaw <$fh>
120} 154}
121 155
122sub save_ref($$) { 156sub save_ref($$) {
123 my ($ref, $path) = @_; 157 my ($ref, $path) = @_;
124 158
125 open my $fh, ">", "$path~" 159 open my $fh, ">:raw:perlio", "$path~"
126 or die "$path~: $!"; 160 or die "$path~: $!";
127 binmode $fh;
128 print $fh freeze $ref; 161 print $fh freeze $ref;
129 close $fh; 162 close $fh;
130 rename "$path~", $path 163 rename "$path~", $path
131 or die "$path: $!"; 164 or die "$path: $!";
132} 165}
133 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
134sub normalize_object($) { 205sub normalize_object($) {
135 my ($ob) = @_; 206 my ($ob) = @_;
136 207
208 # nuke outdated or never supported fields
137 delete $ob->{$_} for qw( 209 delete @$ob{qw(
138 can_knockback can_parry can_impale can_cut can_dam_armour 210 can_knockback can_parry can_impale can_cut can_dam_armour
139 can_apply pass_thru can_pass_thru 211 can_apply pass_thru can_pass_thru
140 ); 212 )};
141 213
142 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 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
219 for my $attr (keys %FIELD_MOVEMENT) {
143 next unless exists $ob->{$attr}; 220 next unless exists $ob->{$attr};
221
222 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
223
144 next if $ob->{$attr} =~ /^\d+$/; 224 next if $ob->{$attr} =~ /^\d+$/;
145 225
146 my $flags = 0; 226 my $flags = 0;
147 227
148 # assume list 228 # assume list
… …
165 } 245 }
166 246
167 $ob->{$attr} = $flags; 247 $ob->{$attr} = $flags;
168 } 248 }
169 249
250 # convert outdated movement flags to new movement sets
170 if (defined (my $v = delete $ob->{no_pass})) { 251 if (defined (my $v = delete $ob->{no_pass})) {
171 $ob->{move_block} = $v ? MOVE_ALL : 0; 252 $ob->{move_block} = $v ? MOVE_ALL : 0;
172 } 253 }
173 if (defined (my $v = delete $ob->{slow_move})) { 254 if (defined (my $v = delete $ob->{slow_move})) {
174 $ob->{move_slow} |= MOVE_WALK; 255 $ob->{move_slow} |= MOVE_WALK;
175 $ob->{move_slow_penalty} = $v; 256 $ob->{move_slow_penalty} = $v;
176 } 257 }
177 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};
178 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 260 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
179 : $ob->{move_on} & ~MOVE_WALK; 261 : $ob->{move_on} & ~MOVE_WALK;
180 } 262 }
181 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};
182 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 265 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
183 : $ob->{move_off} & ~MOVE_WALK; 266 : $ob->{move_off} & ~MOVE_WALK;
184 } 267 }
185 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};
186 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 270 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
187 : $ob->{move_on} & ~MOVE_FLY_LOW; 271 : $ob->{move_on} & ~MOVE_FLY_LOW;
188 } 272 }
189 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};
190 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 275 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
191 : $ob->{move_off} & ~MOVE_FLY_LOW; 276 : $ob->{move_off} & ~MOVE_FLY_LOW;
192 } 277 }
193 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};
194 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 280 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
195 : $ob->{move_type} & ~MOVE_FLY_LOW; 281 : $ob->{move_type} & ~MOVE_FLY_LOW;
196 } 282 }
197 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
198 $ob 299 $ob
199} 300}
200 301
302# arch as in "arch xxx", ie.. objects
201sub normalize_arch($) { 303sub normalize_arch($) {
202 my ($ob) = @_; 304 my ($ob) = @_;
203 305
204 normalize_object $ob; 306 normalize_object $ob;
205 307
… …
242 } 344 }
243 345
244 $ob 346 $ob
245} 347}
246 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
247sub read_pak($) { 367sub read_pak($) {
248 my ($path) = @_; 368 my ($path) = @_;
249 369
250 my %pak; 370 my %pak;
251 371
252 open my $fh, "<", $path 372 open my $fh, "<:raw:perlio", $path
253 or Carp::croak "$_[0]: $!"; 373 or Carp::croak "$_[0]: $!";
254 binmode $fh; 374 binmode $fh;
255 while (<$fh>) { 375 while (<$fh>) {
256 my ($type, $id, $len, $path) = split; 376 my ($type, $id, $len, $path) = split;
257 $path =~ s/.*\///; 377 $path =~ s/.*\///;
… …
259 } 379 }
260 380
261 \%pak 381 \%pak
262} 382}
263 383
264sub read_arch($) { 384sub read_arch($;$) {
265 my ($path) = @_; 385 my ($path, $toplevel) = @_;
266 386
267 my %arc; 387 my %arc;
268 my ($more, $prev); 388 my ($more, $prev);
269 389
270 open my $fh, "<", $path 390 open my $fh, "<:raw:perlio:utf8", $path
271 or Carp::croak "$path: $!"; 391 or Carp::croak "$path: $!";
272 392
273 binmode $fh; 393# binmode $fh;
274 394
275 my $parse_block; $parse_block = sub { 395 my $parse_block; $parse_block = sub {
276 my %arc = @_; 396 my %arc = @_;
277 397
278 while (<$fh>) { 398 while (<$fh>) {
279 s/\s+$//; 399 s/\s+$//;
280 if (/^end$/i) { 400 if (/^end$/i) {
281 last; 401 last;
282 } elsif (/^arch (\S+)$/i) { 402 } elsif (/^arch (\S+)$/i) {
283 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 403 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
284 } elsif (/^lore$/i) { 404 } elsif (/^lore$/i) {
285 while (<$fh>) { 405 while (<$fh>) {
286 last if /^endlore\s*$/i; 406 last if /^endlore\s*$/i;
287 $arc{lore} .= $_; 407 $arc{lore} .= $_;
288 } 408 }
289 } elsif (/^msg$/i) { 409 } elsif (/^msg$/i) {
290 while (<$fh>) { 410 while (<$fh>) {
291 last if /^endmsg\s*$/i; 411 last if /^endmsg\s*$/i;
292 $arc{msg} .= $_; 412 $arc{msg} .= $_;
293 } 413 }
414 } elsif (/^anim$/i) {
415 while (<$fh>) {
416 last if /^mina\s*$/i;
417 chomp;
418 push @{ $arc{anim} }, $_;
419 }
294 } elsif (/^(\S+)\s*(.*)$/) { 420 } elsif (/^(\S+)\s*(.*)$/) {
295 $arc{lc $1} = $2; 421 $arc{lc $1} = $2;
296 } elsif (/^\s*($|#)/) { 422 } elsif (/^\s*($|#)/) {
297 # 423 #
298 } else { 424 } else {
… …
307 s/\s+$//; 433 s/\s+$//;
308 if (/^more$/i) { 434 if (/^more$/i) {
309 $more = $prev; 435 $more = $prev;
310 } elsif (/^object (\S+)$/i) { 436 } elsif (/^object (\S+)$/i) {
311 my $name = $1; 437 my $name = $1;
312 my $arc = normalize_object $parse_block->(_name => $name); 438 my $arc = attr_thaw normalize_object $parse_block->(_name => $name);
439 $arc->{_atype} = 'object';
313 440
314 if ($more) { 441 if ($more) {
315 $more->{more} = $arc; 442 $more->{more} = $arc;
316 } else { 443 } else {
317 $arc{$name} = $arc; 444 $arc{$name} = $arc;
318 } 445 }
319 $prev = $arc; 446 $prev = $arc;
320 $more = undef; 447 $more = undef;
321 } elsif (/^arch (\S+)$/i) { 448 } elsif (/^arch (\S+)$/i) {
322 my $name = $1; 449 my $name = $1;
323 my $arc = normalize_arch $parse_block->(_name => $name); 450 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name);
451 $arc->{_atype} = 'arch';
324 452
325 if ($more) { 453 if ($more) {
326 $more->{more} = $arc; 454 $more->{more} = $arc;
327 } else { 455 } else {
328 push @{ $arc{arch} }, $arc; 456 push @{ $arc{arch} }, $arc;
329 } 457 }
330 $prev = $arc; 458 $prev = $arc;
331 $more = undef; 459 $more = undef;
460 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
461 if ($1 eq "lev_array") {
462 while (<$fh>) {
463 last if /^endplst\s*$/;
464 push @{$toplevel->{lev_array}}, $_+0;
465 }
466 } else {
467 $toplevel->{$1} = $2;
468 }
332 } elsif (/^\s*($|#)/) { 469 } elsif (/^\s*($|#)/) {
333 # 470 #
334 } else { 471 } else {
335 warn "$path: unparseable top-level line '$_'"; 472 die "$path: unparseable top-level line '$_'";
336 } 473 }
337 } 474 }
338 475
339 undef $parse_block; # work around bug in perl not freeing $fh etc. 476 undef $parse_block; # work around bug in perl not freeing $fh etc.
340 477
341 \%arc 478 \%arc
479}
480
481sub archlist_to_string {
482 my ($arch) = @_;
483
484 my $str;
485
486 my $append; $append = sub {
487 my %a = %{$_[0]};
488
489 Crossfire::attr_freeze \%a;
490 Crossfire::normalize_arch \%a;
491
492 # undo the bit-split we did before
493 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
494 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
495 | (delete $a{attack_movement_bits_4_7});
496 }
497
498 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
499
500 my $inv = delete $a{inventory};
501 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
502 my $anim = delete $a{anim};
503
504 my @kv;
505
506 for ($a{_name} eq "map"
507 ? @Crossfire::FIELD_ORDER_MAP
508 : @Crossfire::FIELD_ORDER) {
509 push @kv, [$_, delete $a{$_}]
510 if exists $a{$_};
511 }
512
513 for (sort keys %a) {
514 next if /^_/; # ignore our _-keys
515 push @kv, [$_, delete $a{$_}];
516 }
517
518 for (@kv) {
519 my ($k, $v) = @$_;
520
521 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
522 $v =~ s/\n$//;
523 $str .= "$k\n$v\n$end\n";
524 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
525 if ($v & ~Crossfire::MOVE_ALL or !$v) {
526 $str .= "$k $v\n";
527
528 } elsif ($v & Crossfire::MOVE_ALLBIT) {
529 $str .= "$k all";
530
531 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
532 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
533 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
534 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
535 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
536
537 $str .= "\n";
538
539 } else {
540 $str .= $k;
541
542 $str .= " walk" if $v & Crossfire::MOVE_WALK;
543 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
544 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
545 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
546 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
547
548 $str .= "\n";
549 }
550 } else {
551 $str .= "$k $v\n";
552 }
553 }
554
555 if ($inv) {
556 $append->($_) for @$inv;
557 }
558
559 if ($a{_atype} eq 'object') {
560 $str .= join "\n", "anim", @$anim, "mina\n"
561 if $anim;
562 }
563
564 $str .= "end\n";
565
566 if (($a{_atype} eq 'object') && $more) {
567 $str .= "\nmore\n";
568 $append->($more) if $more;
569 }
570 };
571
572 for (@$arch) {
573 $append->($_);
574 }
575
576 $str
342} 577}
343 578
344# put all archs into a hash with editor_face as it's key 579# put all archs into a hash with editor_face as it's key
345# NOTE: the arrays in the hash values are references to 580# NOTE: the arrays in the hash values are references to
346# the archs from $ARCH 581# the archs from $ARCH
347sub editor_archs { 582sub editor_archs {
348 my %paths; 583 my %paths;
349 584
350 for (keys %ARCH) { 585 for (keys %ARCH) {
351 my $arch = $ARCH{$_}; 586 my $arch = $ARCH{$_};
352 push @{$paths{$arch->{editor_folder}}}, \$arch; 587 push @{$paths{$arch->{editor_folder}}}, $arch;
353 } 588 }
354 589
355 \%paths 590 \%paths
356} 591}
357 592
… …
367 my ($a) = @_; 602 my ($a) = @_;
368 603
369 my $o = $ARCH{$a->{_name}} 604 my $o = $ARCH{$a->{_name}}
370 or return; 605 or return;
371 606
372 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 607 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
608 unless ($face) {
609 $face = $FACE{"blank.x11"}
373 or (warn "no face data found for arch '$a->{_name}'"), return; 610 or (warn "no face data found for arch '$a->{_name}'"), return;
611 }
374 612
375 if ($face->{w} > 1 || $face->{h} > 1) { 613 if ($face->{w} > 1 || $face->{h} > 1) {
376 # bigface 614 # bigface
377 return (0, 0, $face->{w} - 1, $face->{h} - 1); 615 return (0, 0, $face->{w} - 1, $face->{h} - 1);
378 616
… …
422 my $type = $obj->{type} || $arch->{type}; 660 my $type = $obj->{type} || $arch->{type};
423 661
424 if ($type > 0) { 662 if ($type > 0) {
425 $root = $Crossfire::Data::ATTR{$type}; 663 $root = $Crossfire::Data::ATTR{$type};
426 } else { 664 } else {
665 my %a = (%$arch, %$obj);
666
667 if ($a{is_floor} && !$a{alive}) {
668 $root = $Crossfire::Data::TYPE{Floor};
669 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
670 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
671 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
672 $root = $Crossfire::Data::TYPE{Wall};
673 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
674 $root = $Crossfire::Data::TYPE{"Weak Wall"};
675 } else {
427 $root = $Crossfire::Data::TYPE{Misc}; 676 $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 } 677 }
442 } 678 }
443 679
444 my @import = ($root); 680 my @import = ($root);
445 681
… …
619 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 855 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
620 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 856 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
621 or die "$VARDIR/tilecache.png: $!"; 857 or die "$VARDIR/tilecache.png: $!";
622 *FACE = $_[0]; 858 *FACE = $_[0];
623 }, sub { 859 }, sub {
624 require File::Temp;
625
626 my $tile = read_pak "$LIB/crossfire.0"; 860 my $tile = read_pak "$LIB/crossfire.0";
627 861
628 my %cache; 862 my %cache;
629 863
630 my $idx = 0; 864 my $idx = 0;
631 865
632 for my $name (sort keys %$tile) { 866 for my $name (sort keys %$tile) {
633 my ($fh, $filename) = File::Temp::tempfile (); 867 my $pb = new Gtk2::Gdk::PixbufLoader;
634 print $fh $tile->{$name}; 868 $pb->write ($tile->{$name});
635 close $fh; 869 $pb->close;
636 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 870 my $pb = $pb->get_pixbuf;
637 unlink $filename;
638 871
639 my $tile = $cache{$name} = { 872 my $tile = $cache{$name} = {
640 pb => $pb, 873 pb => $pb,
641 idx => $idx, 874 idx => $idx,
642 w => int $pb->get_width / TILESIZE, 875 w => int $pb->get_width / TILESIZE,
… …
660 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 893 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
661 } 894 }
662 } 895 }
663 } 896 }
664 897
665 $pb->save ("$VARDIR/tilecache.png", "png"); 898 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
666 899
667 \%cache 900 \%cache
668 }; 901 };
669} 902}
670 903

Diff Legend

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