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

Diff Legend

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