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.56 by root, Thu Mar 23 07:33:16 2006 UTC vs.
Revision 1.77 by root, Tue Nov 7 22:40:26 2006 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.1'; 9our $VERSION = '0.95';
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(
72 elevation
73
54 name name_pl custom_name title race 74 name name_pl custom_name attach title race
55 slaying skill msg lore other_arch face 75 slaying skill msg lore other_arch face
56 #todo-events 76 #todo-events
57 animation is_animated 77 animation is_animated
58 Str Dex Con Wis Pow Cha Int 78 str dex con wis pow cha int
59 hp maxhp sp maxsp grace maxgrace 79 hp maxhp sp maxsp grace maxgrace
60 exp perm_exp expmul 80 exp perm_exp expmul
61 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
62 nrof level direction type subtype 82 nrof level direction type subtype attacktype
63 83
64 resist_physical resist_magic resist_fire resist_electricity 84 resist_physical resist_magic resist_fire resist_electricity
65 resist_cold resist_confusion resist_acid resist_drain 85 resist_cold resist_confusion resist_acid resist_drain
66 resist_weaponmagic resist_ghosthit resist_poison resist_slow 86 resist_weaponmagic resist_ghosthit resist_poison resist_slow
67 resist_paralyze resist_turn_undead resist_fear resist_cancellation 87 resist_paralyze resist_turn_undead resist_fear resist_cancellation
… …
96 116
97 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
98 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
99)); 119));
100 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
101sub MOVE_WALK (){ 0x01 } 136sub MOVE_WALK (){ 0x01 }
102sub MOVE_FLY_LOW (){ 0x02 } 137sub MOVE_FLY_LOW (){ 0x02 }
103sub MOVE_FLY_HIGH (){ 0x04 } 138sub MOVE_FLY_HIGH (){ 0x04 }
104sub MOVE_FLYING (){ 0x06 } 139sub MOVE_FLYING (){ 0x06 }
105sub MOVE_SWIM (){ 0x08 } 140sub MOVE_SWIM (){ 0x08 }
106sub MOVE_BOAT (){ 0x10 } 141sub MOVE_BOAT (){ 0x10 }
142sub MOVE_KNOWN (){ 0x1f } # all of above
107sub MOVE_ALL (){ 0xff } 143sub MOVE_ALLBIT (){ 0x10000 }
144sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
108 145
109sub load_ref($) { 146sub load_ref($) {
110 my ($path) = @_; 147 my ($path) = @_;
111 148
112 open my $fh, "<", $path 149 open my $fh, "<:raw:perlio", $path
113 or die "$path: $!"; 150 or die "$path: $!";
114 binmode $fh;
115 local $/; 151 local $/;
116 152
117 thaw <$fh> 153 thaw <$fh>
118} 154}
119 155
120sub save_ref($$) { 156sub save_ref($$) {
121 my ($ref, $path) = @_; 157 my ($ref, $path) = @_;
122 158
123 open my $fh, ">", "$path~" 159 open my $fh, ">:raw:perlio", "$path~"
124 or die "$path~: $!"; 160 or die "$path~: $!";
125 binmode $fh;
126 print $fh freeze $ref; 161 print $fh freeze $ref;
127 close $fh; 162 close $fh;
128 rename "$path~", $path 163 rename "$path~", $path
129 or die "$path: $!"; 164 or die "$path: $!";
130} 165}
131 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
132sub normalize_object($) { 205sub normalize_object($) {
133 my ($ob) = @_; 206 my ($ob) = @_;
134 207
208 # nuke outdated or never supported fields
135 delete $ob->{$_} for qw( 209 delete @$ob{qw(
136 can_knockback can_parry can_impale can_cut can_dam_armour 210 can_knockback can_parry can_impale can_cut can_dam_armour
137 can_apply pass_thru can_pass_thru 211 can_apply pass_thru can_pass_thru
138 ); 212 )};
139 213
140 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) {
141 next unless exists $ob->{$attr}; 220 next unless exists $ob->{$attr};
221
222 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
223
142 next if $ob->{$attr} =~ /^\d+$/; 224 next if $ob->{$attr} =~ /^\d+$/;
143 225
144 my $flags = 0; 226 my $flags = 0;
145 227
146 # assume list 228 # assume list
… …
163 } 245 }
164 246
165 $ob->{$attr} = $flags; 247 $ob->{$attr} = $flags;
166 } 248 }
167 249
250 # convert outdated movement flags to new movement sets
168 if (defined (my $v = delete $ob->{no_pass})) { 251 if (defined (my $v = delete $ob->{no_pass})) {
169 $ob->{move_block} = $v ? MOVE_ALL : 0; 252 $ob->{move_block} = $v ? MOVE_ALL : 0;
170 } 253 }
171 if (defined (my $v = delete $ob->{slow_move})) { 254 if (defined (my $v = delete $ob->{slow_move})) {
172 $ob->{move_slow} |= MOVE_WALK; 255 $ob->{move_slow} |= MOVE_WALK;
173 $ob->{move_slow_penalty} = $v; 256 $ob->{move_slow_penalty} = $v;
174 } 257 }
175 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};
176 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 260 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
177 : $ob->{move_on} & ~MOVE_WALK; 261 : $ob->{move_on} & ~MOVE_WALK;
178 } 262 }
179 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};
180 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 265 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
181 : $ob->{move_off} & ~MOVE_WALK; 266 : $ob->{move_off} & ~MOVE_WALK;
182 } 267 }
183 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};
184 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 270 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
185 : $ob->{move_on} & ~MOVE_FLY_LOW; 271 : $ob->{move_on} & ~MOVE_FLY_LOW;
186 } 272 }
187 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};
188 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 275 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
189 : $ob->{move_off} & ~MOVE_FLY_LOW; 276 : $ob->{move_off} & ~MOVE_FLY_LOW;
190 } 277 }
191 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};
192 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 280 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
193 : $ob->{move_type} & ~MOVE_FLY_LOW; 281 : $ob->{move_type} & ~MOVE_FLY_LOW;
194 } 282 }
195 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
196 $ob 299 $ob
197} 300}
198 301
302# arch as in "arch xxx", ie.. objects
199sub normalize_arch($) { 303sub normalize_arch($) {
200 my ($ob) = @_; 304 my ($ob) = @_;
201 305
202 normalize_object $ob; 306 normalize_object $ob;
203 307
… …
230 delete $ob->{$k}; 334 delete $ob->{$k};
231 } 335 }
232 } 336 }
233 } 337 }
234 338
339 # a speciality for the editor
340 if (exists $ob->{attack_movement}) {
341 my $am = delete $ob->{attack_movement};
342 $ob->{attack_movement_bits_0_3} = $am & 15;
343 $ob->{attack_movement_bits_4_7} = $am & 240;
344 }
345
346 $ob
347}
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
235 $ob 364 $ob
236} 365}
237 366
238sub read_pak($) { 367sub read_pak($) {
239 my ($path) = @_; 368 my ($path) = @_;
240 369
241 my %pak; 370 my %pak;
242 371
243 open my $fh, "<", $path 372 open my $fh, "<:raw:perlio", $path
244 or Carp::croak "$_[0]: $!"; 373 or Carp::croak "$_[0]: $!";
245 binmode $fh; 374 binmode $fh;
246 while (<$fh>) { 375 while (<$fh>) {
247 my ($type, $id, $len, $path) = split; 376 my ($type, $id, $len, $path) = split;
248 $path =~ s/.*\///; 377 $path =~ s/.*\///;
… …
250 } 379 }
251 380
252 \%pak 381 \%pak
253} 382}
254 383
255sub read_arch($) { 384sub read_arch($;$) {
256 my ($path) = @_; 385 my ($path, $toplevel) = @_;
257 386
258 my %arc; 387 my %arc;
259 my ($more, $prev); 388 my ($more, $prev);
260 389
261 open my $fh, "<", $path 390 open my $fh, "<:raw:perlio:utf8", $path
262 or Carp::croak "$path: $!"; 391 or Carp::croak "$path: $!";
263 392
264 binmode $fh; 393# binmode $fh;
265 394
266 my $parse_block; $parse_block = sub { 395 my $parse_block; $parse_block = sub {
267 my %arc = @_; 396 my %arc = @_;
268 397
269 while (<$fh>) { 398 while (<$fh>) {
270 s/\s+$//; 399 s/\s+$//;
271 if (/^end$/i) { 400 if (/^end$/i) {
272 last; 401 last;
273 } elsif (/^arch (\S+)$/i) { 402 } elsif (/^arch (\S+)$/i) {
274 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 403 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
275 } elsif (/^lore$/i) { 404 } elsif (/^lore$/i) {
276 while (<$fh>) { 405 while (<$fh>) {
277 last if /^endlore\s*$/i; 406 last if /^endlore\s*$/i;
278 $arc{lore} .= $_; 407 $arc{lore} .= $_;
279 } 408 }
280 } elsif (/^msg$/i) { 409 } elsif (/^msg$/i) {
281 while (<$fh>) { 410 while (<$fh>) {
282 last if /^endmsg\s*$/i; 411 last if /^endmsg\s*$/i;
283 $arc{msg} .= $_; 412 $arc{msg} .= $_;
284 } 413 }
414 } elsif (/^anim$/i) {
415 while (<$fh>) {
416 last if /^mina\s*$/i;
417 chomp;
418 push @{ $arc{anim} }, $_;
419 }
285 } elsif (/^(\S+)\s*(.*)$/) { 420 } elsif (/^(\S+)\s*(.*)$/) {
286 $arc{lc $1} = $2; 421 $arc{lc $1} = $2;
287 } elsif (/^\s*($|#)/) { 422 } elsif (/^\s*($|#)/) {
288 # 423 #
289 } else { 424 } else {
… …
298 s/\s+$//; 433 s/\s+$//;
299 if (/^more$/i) { 434 if (/^more$/i) {
300 $more = $prev; 435 $more = $prev;
301 } elsif (/^object (\S+)$/i) { 436 } elsif (/^object (\S+)$/i) {
302 my $name = $1; 437 my $name = $1;
303 my $arc = normalize_object $parse_block->(_name => $name); 438 my $arc = attr_thaw normalize_object $parse_block->(_name => $name);
439 $arc->{_atype} = 'object';
304 440
305 if ($more) { 441 if ($more) {
306 $more->{more} = $arc; 442 $more->{more} = $arc;
307 } else { 443 } else {
308 $arc{$name} = $arc; 444 $arc{$name} = $arc;
309 } 445 }
310 $prev = $arc; 446 $prev = $arc;
311 $more = undef; 447 $more = undef;
312 } elsif (/^arch (\S+)$/i) { 448 } elsif (/^arch (\S+)$/i) {
313 my $name = $1; 449 my $name = $1;
314 my $arc = normalize_object $parse_block->(_name => $name); 450 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name);
451 $arc->{_atype} = 'arch';
315 452
316 if ($more) { 453 if ($more) {
317 $more->{more} = $arc; 454 $more->{more} = $arc;
318 } else { 455 } else {
319 push @{ $arc{arch} }, $arc; 456 push @{ $arc{arch} }, $arc;
320 } 457 }
321 $prev = $arc; 458 $prev = $arc;
322 $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 }
323 } elsif (/^\s*($|#)/) { 469 } elsif (/^\s*($|#)/) {
324 # 470 #
325 } else { 471 } else {
326 warn "$path: unparseable top-level line '$_'"; 472 die "$path: unparseable top-level line '$_'";
327 } 473 }
328 } 474 }
329 475
330 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.
331 477
332 \%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
333} 577}
334 578
335# 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
336# NOTE: the arrays in the hash values are references to 580# NOTE: the arrays in the hash values are references to
337# the archs from $ARCH 581# the archs from $ARCH
338sub editor_archs { 582sub editor_archs {
339 my %paths; 583 my %paths;
340 584
341 for (keys %ARCH) { 585 for (keys %ARCH) {
342 my $arch = $ARCH{$_}; 586 my $arch = $ARCH{$_};
343 push @{$paths{$arch->{editor_folder}}}, \$arch; 587 push @{$paths{$arch->{editor_folder}}}, $arch;
344 } 588 }
345 589
346 \%paths 590 \%paths
347} 591}
348 592
… …
413 my $type = $obj->{type} || $arch->{type}; 657 my $type = $obj->{type} || $arch->{type};
414 658
415 if ($type > 0) { 659 if ($type > 0) {
416 $root = $Crossfire::Data::ATTR{$type}; 660 $root = $Crossfire::Data::ATTR{$type};
417 } else { 661 } else {
662 my %a = (%$arch, %$obj);
663
664 if ($a{is_floor} && !$a{alive}) {
665 $root = $Crossfire::Data::TYPE{Floor};
666 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
667 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
668 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
669 $root = $Crossfire::Data::TYPE{Wall};
670 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
671 $root = $Crossfire::Data::TYPE{"Weak Wall"};
672 } else {
418 $root = $Crossfire::Data::TYPE{Misc}; 673 $root = $Crossfire::Data::TYPE{Misc};
419
420 type:
421 for (@Crossfire::Data::ATTR0) {
422 my $req = $_->{required}
423 or die "internal error: ATTR0 without 'required'";
424
425 keys %$req;
426 while (my ($k, $v) = each %$req) {
427 next type
428 unless $obj->{$k} == $v || $arch->{$k} == $v;
429 }
430
431 $root = $_;
432 } 674 }
433 } 675 }
434 676
435 my @import = ($root); 677 my @import = ($root);
436 678
… …
610 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 852 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
611 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 853 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
612 or die "$VARDIR/tilecache.png: $!"; 854 or die "$VARDIR/tilecache.png: $!";
613 *FACE = $_[0]; 855 *FACE = $_[0];
614 }, sub { 856 }, sub {
615 require File::Temp;
616
617 my $tile = read_pak "$LIB/crossfire.0"; 857 my $tile = read_pak "$LIB/crossfire.0";
618 858
619 my %cache; 859 my %cache;
620 860
621 my $idx = 0; 861 my $idx = 0;
622 862
623 for my $name (sort keys %$tile) { 863 for my $name (sort keys %$tile) {
624 my ($fh, $filename) = File::Temp::tempfile (); 864 my $pb = new Gtk2::Gdk::PixbufLoader;
625 print $fh $tile->{$name}; 865 $pb->write ($tile->{$name});
626 close $fh; 866 $pb->close;
627 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 867 my $pb = $pb->get_pixbuf;
628 unlink $filename;
629 868
630 my $tile = $cache{$name} = { 869 my $tile = $cache{$name} = {
631 pb => $pb, 870 pb => $pb,
632 idx => $idx, 871 idx => $idx,
633 w => int $pb->get_width / TILESIZE, 872 w => int $pb->get_width / TILESIZE,
… …
651 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 890 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
652 } 891 }
653 } 892 }
654 } 893 }
655 894
656 $pb->save ("$VARDIR/tilecache.png", "png"); 895 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
657 896
658 \%cache 897 \%cache
659 }; 898 };
660} 899}
661 900

Diff Legend

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