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.55 by root, Thu Mar 23 07:06:17 2006 UTC vs.
Revision 1.81 by root, Tue Feb 6 22:27:44 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.
62our @FIELD_ORDER_MAP = (qw(
63 name attach swap_time reset_timeout fixed_resettime difficulty region
64 shopitems shopgreed shopmin shopmax shoprace
65 darkness width height enter_x enter_y msg maplore
66 unique template
67 outdoor temp pressure humid windspeed winddir sky nosmooth
68 tile_path_1 tile_path_2 tile_path_3 tile_path_4
69));
70
44our @FIELD_ORDER = (qw( 71our @FIELD_ORDER = (qw(
72 elevation
73
45 name name_pl custom_name title race 74 name name_pl custom_name attach title race
46 slaying skill msg lore other_arch face 75 slaying skill msg lore other_arch face
47 #events 76 #todo-events
48 animation is_animated 77 animation is_animated
49 Str Dex Con Wis Pow Cha Int 78 str dex con wis pow cha int
50 hp maxhp sp maxsp grace maxgrace 79 hp maxhp sp maxsp grace maxgrace
51 exp perm_exp expmul 80 exp perm_exp expmul
52 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
53 nrof level direction type subtype 82 nrof level direction type subtype attacktype
54 83
55 resist_physical resist_magic resist_fire resist_electricity 84 resist_physical resist_magic resist_fire resist_electricity
56 resist_cold resist_confusion resist_acid resist_drain 85 resist_cold resist_confusion resist_acid resist_drain
57 resist_weaponmagic resist_ghosthit resist_poison resist_slow 86 resist_weaponmagic resist_ghosthit resist_poison resist_slow
58 resist_paralyze resist_turn_undead resist_fear resist_cancellation 87 resist_paralyze resist_turn_undead resist_fear resist_cancellation
… …
87 116
88 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
89 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
90)); 119));
91 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
92sub MOVE_WALK (){ 0x01 } 136sub MOVE_WALK (){ 0x01 }
93sub MOVE_FLY_LOW (){ 0x02 } 137sub MOVE_FLY_LOW (){ 0x02 }
94sub MOVE_FLY_HIGH (){ 0x04 } 138sub MOVE_FLY_HIGH (){ 0x04 }
95sub MOVE_FLYING (){ 0x06 } 139sub MOVE_FLYING (){ 0x06 }
96sub MOVE_SWIM (){ 0x08 } 140sub MOVE_SWIM (){ 0x08 }
97sub MOVE_BOAT (){ 0x10 } 141sub MOVE_BOAT (){ 0x10 }
142sub MOVE_KNOWN (){ 0x1f } # all of above
98sub MOVE_ALL (){ 0xff } 143sub MOVE_ALLBIT (){ 0x10000 }
144sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
99 145
100sub load_ref($) { 146sub load_ref($) {
101 my ($path) = @_; 147 my ($path) = @_;
102 148
103 open my $fh, "<", $path 149 open my $fh, "<:raw:perlio", $path
104 or die "$path: $!"; 150 or die "$path: $!";
105 binmode $fh;
106 local $/; 151 local $/;
107 152
108 thaw <$fh> 153 thaw <$fh>
109} 154}
110 155
111sub save_ref($$) { 156sub save_ref($$) {
112 my ($ref, $path) = @_; 157 my ($ref, $path) = @_;
113 158
114 open my $fh, ">", "$path~" 159 open my $fh, ">:raw:perlio", "$path~"
115 or die "$path~: $!"; 160 or die "$path~: $!";
116 binmode $fh;
117 print $fh freeze $ref; 161 print $fh freeze $ref;
118 close $fh; 162 close $fh;
119 rename "$path~", $path 163 rename "$path~", $path
120 or die "$path: $!"; 164 or die "$path: $!";
121} 165}
122 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
123sub normalize_object($) { 205sub normalize_object($) {
124 my ($ob) = @_; 206 my ($ob) = @_;
125 207
208 # nuke outdated or never supported fields
126 delete $ob->{$_} for qw( 209 delete @$ob{qw(
127 can_knockback can_parry can_impale can_cut can_dam_armour 210 can_knockback can_parry can_impale can_cut can_dam_armour
128 can_apply pass_thru can_pass_thru 211 can_apply pass_thru can_pass_thru
129 ); 212 )};
130 213
131 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) {
132 next unless exists $ob->{$attr}; 220 next unless exists $ob->{$attr};
221
222 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
223
133 next if $ob->{$attr} =~ /^\d+$/; 224 next if $ob->{$attr} =~ /^\d+$/;
134 225
135 my $flags = 0; 226 my $flags = 0;
136 227
137 # assume list 228 # assume list
… …
154 } 245 }
155 246
156 $ob->{$attr} = $flags; 247 $ob->{$attr} = $flags;
157 } 248 }
158 249
250 # convert outdated movement flags to new movement sets
159 if (defined (my $v = delete $ob->{no_pass})) { 251 if (defined (my $v = delete $ob->{no_pass})) {
160 $ob->{move_block} = $v ? MOVE_ALL : 0; 252 $ob->{move_block} = $v ? MOVE_ALL : 0;
161 } 253 }
162 if (defined (my $v = delete $ob->{slow_move})) { 254 if (defined (my $v = delete $ob->{slow_move})) {
163 $ob->{move_slow} |= MOVE_WALK; 255 $ob->{move_slow} |= MOVE_WALK;
164 $ob->{move_slow_penalty} = $v; 256 $ob->{move_slow_penalty} = $v;
165 } 257 }
166 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};
167 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 260 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
168 : $ob->{move_on} & ~MOVE_WALK; 261 : $ob->{move_on} & ~MOVE_WALK;
169 } 262 }
170 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};
171 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 265 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
172 : $ob->{move_off} & ~MOVE_WALK; 266 : $ob->{move_off} & ~MOVE_WALK;
173 } 267 }
174 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};
175 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 270 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
176 : $ob->{move_on} & ~MOVE_FLY_LOW; 271 : $ob->{move_on} & ~MOVE_FLY_LOW;
177 } 272 }
178 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};
179 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 275 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
180 : $ob->{move_off} & ~MOVE_FLY_LOW; 276 : $ob->{move_off} & ~MOVE_FLY_LOW;
181 } 277 }
182 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};
183 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 280 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
184 : $ob->{move_type} & ~MOVE_FLY_LOW; 281 : $ob->{move_type} & ~MOVE_FLY_LOW;
185 } 282 }
186 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
187 $ob 299 $ob
188} 300}
189 301
302# arch as in "arch xxx", ie.. objects
190sub normalize_arch($) { 303sub normalize_arch($) {
191 my ($ob) = @_; 304 my ($ob) = @_;
192 305
193 normalize_object $ob; 306 normalize_object $ob;
194 307
… …
221 delete $ob->{$k}; 334 delete $ob->{$k};
222 } 335 }
223 } 336 }
224 } 337 }
225 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
226 $ob 364 $ob
227} 365}
228 366
229sub read_pak($) { 367sub read_pak($) {
230 my ($path) = @_; 368 my ($path) = @_;
231 369
232 my %pak; 370 my %pak;
233 371
234 open my $fh, "<", $path 372 open my $fh, "<:raw:perlio", $path
235 or Carp::croak "$_[0]: $!"; 373 or Carp::croak "$_[0]: $!";
236 binmode $fh; 374 binmode $fh;
237 while (<$fh>) { 375 while (<$fh>) {
238 my ($type, $id, $len, $path) = split; 376 my ($type, $id, $len, $path) = split;
239 $path =~ s/.*\///; 377 $path =~ s/.*\///;
… …
241 } 379 }
242 380
243 \%pak 381 \%pak
244} 382}
245 383
246sub read_arch($) { 384sub read_arch($;$) {
247 my ($path) = @_; 385 my ($path, $toplevel) = @_;
248 386
249 my %arc; 387 my %arc;
250 my ($more, $prev); 388 my ($more, $prev);
389 my $comment;
251 390
252 open my $fh, "<", $path 391 open my $fh, "<:raw:perlio:utf8", $path
253 or Carp::croak "$path: $!"; 392 or Carp::croak "$path: $!";
254 393
255 binmode $fh; 394# binmode $fh;
256 395
257 my $parse_block; $parse_block = sub { 396 my $parse_block; $parse_block = sub {
258 my %arc = @_; 397 my %arc = @_;
259 398
260 while (<$fh>) { 399 while (<$fh>) {
261 s/\s+$//; 400 s/\s+$//;
262 if (/^end$/i) { 401 if (/^end$/i) {
263 last; 402 last;
403
264 } elsif (/^arch (\S+)$/i) { 404 } elsif (/^arch (\S+)$/i) {
265 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 405 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
406
266 } elsif (/^lore$/i) { 407 } elsif (/^lore$/i) {
267 while (<$fh>) { 408 while (<$fh>) {
268 last if /^endlore\s*$/i; 409 last if /^endlore\s*$/i;
269 $arc{lore} .= $_; 410 $arc{lore} .= $_;
270 } 411 }
271 } elsif (/^msg$/i) { 412 } elsif (/^msg$/i) {
272 while (<$fh>) { 413 while (<$fh>) {
273 last if /^endmsg\s*$/i; 414 last if /^endmsg\s*$/i;
274 $arc{msg} .= $_; 415 $arc{msg} .= $_;
275 } 416 }
417 } elsif (/^anim$/i) {
418 while (<$fh>) {
419 last if /^mina\s*$/i;
420 chomp;
421 push @{ $arc{anim} }, $_;
422 }
276 } elsif (/^(\S+)\s*(.*)$/) { 423 } elsif (/^(\S+)\s*(.*)$/) {
277 $arc{lc $1} = $2; 424 $arc{lc $1} = $2;
278 } elsif (/^\s*($|#)/) { 425 } elsif (/^\s*#/) {
426 $arc{_comment} .= "$_\n";
427
428 } elsif (/^\s*$/) {
279 # 429 #
280 } else { 430 } else {
281 warn "$path: unparsable line '$_' in arch $arc{_name}"; 431 warn "$path: unparsable line '$_' in arch $arc{_name}";
282 } 432 }
283 } 433 }
… …
289 s/\s+$//; 439 s/\s+$//;
290 if (/^more$/i) { 440 if (/^more$/i) {
291 $more = $prev; 441 $more = $prev;
292 } elsif (/^object (\S+)$/i) { 442 } elsif (/^object (\S+)$/i) {
293 my $name = $1; 443 my $name = $1;
294 my $arc = normalize_object $parse_block->(_name => $name); 444 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
445 undef $comment;
446 delete $arc{_comment} unless length $arc{_comment};
447 $arc->{_atype} = 'object';
295 448
296 if ($more) { 449 if ($more) {
297 $more->{more} = $arc; 450 $more->{more} = $arc;
298 } else { 451 } else {
299 $arc{$name} = $arc; 452 $arc{$name} = $arc;
300 } 453 }
301 $prev = $arc; 454 $prev = $arc;
302 $more = undef; 455 $more = undef;
303 } elsif (/^arch (\S+)$/i) { 456 } elsif (/^arch (\S+)$/i) {
304 my $name = $1; 457 my $name = $1;
305 my $arc = normalize_object $parse_block->(_name => $name); 458 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
459 undef $comment;
460 delete $arc{_comment} unless length $arc{_comment};
461 $arc->{_atype} = 'arch';
306 462
307 if ($more) { 463 if ($more) {
308 $more->{more} = $arc; 464 $more->{more} = $arc;
309 } else { 465 } else {
310 push @{ $arc{arch} }, $arc; 466 push @{ $arc{arch} }, $arc;
311 } 467 }
312 $prev = $arc; 468 $prev = $arc;
313 $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 }
479 } elsif (/^\s*#/) {
480 $comment .= "$_\n";
314 } elsif (/^\s*($|#)/) { 481 } elsif (/^\s*($|#)/) {
315 # 482 #
316 } else { 483 } else {
317 warn "$path: unparseable top-level line '$_'"; 484 die "$path: unparseable top-level line '$_'";
318 } 485 }
319 } 486 }
320 487
321 undef $parse_block; # work around bug in perl not freeing $fh etc. 488 undef $parse_block; # work around bug in perl not freeing $fh etc.
322 489
323 \%arc 490 \%arc
491}
492
493sub archlist_to_string {
494 my ($arch) = @_;
495
496 my $str;
497
498 my $append; $append = sub {
499 my %a = %{$_[0]};
500
501 Crossfire::attr_freeze \%a;
502 Crossfire::normalize_arch \%a;
503
504 # undo the bit-split we did before
505 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
506 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
507 | (delete $a{attack_movement_bits_4_7});
508 }
509
510 if (my $comment = delete $a{_comment}) {
511 if ($comment =~ /[^\n\s#]/) {
512 $str .= $comment;
513 }
514 }
515
516 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
517
518 my $inv = delete $a{inventory};
519 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
520 my $anim = delete $a{anim};
521
522 my @kv;
523
524 for ($a{_name} eq "map"
525 ? @Crossfire::FIELD_ORDER_MAP
526 : @Crossfire::FIELD_ORDER) {
527 push @kv, [$_, delete $a{$_}]
528 if exists $a{$_};
529 }
530
531 for (sort keys %a) {
532 next if /^_/; # ignore our _-keys
533 push @kv, [$_, delete $a{$_}];
534 }
535
536 for (@kv) {
537 my ($k, $v) = @$_;
538
539 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
540 $v =~ s/\n$//;
541 $str .= "$k\n$v\n$end\n";
542 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
543 if ($v & ~Crossfire::MOVE_ALL or !$v) {
544 $str .= "$k $v\n";
545
546 } elsif ($v & Crossfire::MOVE_ALLBIT) {
547 $str .= "$k all";
548
549 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
550 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
551 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
552 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
553 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
554
555 $str .= "\n";
556
557 } else {
558 $str .= $k;
559
560 $str .= " walk" if $v & Crossfire::MOVE_WALK;
561 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
562 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
563 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
564 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
565
566 $str .= "\n";
567 }
568 } else {
569 $str .= "$k $v\n";
570 }
571 }
572
573 if ($inv) {
574 $append->($_) for @$inv;
575 }
576
577 if ($a{_atype} eq 'object') {
578 $str .= join "\n", "anim", @$anim, "mina\n"
579 if $anim;
580 }
581
582 $str .= "end\n";
583
584 if ($a{_atype} eq 'object') {
585 if ($more) {
586 $str .= "more\n";
587 $append->($more) if $more;
588 } else {
589 $str .= "\n";
590 }
591 }
592 };
593
594 for (@$arch) {
595 $append->($_);
596 }
597
598 $str
324} 599}
325 600
326# put all archs into a hash with editor_face as it's key 601# put all archs into a hash with editor_face as it's key
327# NOTE: the arrays in the hash values are references to 602# NOTE: the arrays in the hash values are references to
328# the archs from $ARCH 603# the archs from $ARCH
329sub editor_archs { 604sub editor_archs {
330 my %paths; 605 my %paths;
331 606
332 for (keys %ARCH) { 607 for (keys %ARCH) {
333 my $arch = $ARCH{$_}; 608 my $arch = $ARCH{$_};
334 push @{$paths{$arch->{editor_folder}}}, \$arch; 609 push @{$paths{$arch->{editor_folder}}}, $arch;
335 } 610 }
336 611
337 \%paths 612 \%paths
338} 613}
339 614
… …
349 my ($a) = @_; 624 my ($a) = @_;
350 625
351 my $o = $ARCH{$a->{_name}} 626 my $o = $ARCH{$a->{_name}}
352 or return; 627 or return;
353 628
354 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 629 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
630 unless ($face) {
631 $face = $FACE{"blank.x11"}
355 or (warn "no face data found for arch '$a->{_name}'"), return; 632 or (warn "no face data found for arch '$a->{_name}'"), return;
633 }
356 634
357 if ($face->{w} > 1 || $face->{h} > 1) { 635 if ($face->{w} > 1 || $face->{h} > 1) {
358 # bigface 636 # bigface
359 return (0, 0, $face->{w} - 1, $face->{h} - 1); 637 return (0, 0, $face->{w} - 1, $face->{h} - 1);
360 638
… …
404 my $type = $obj->{type} || $arch->{type}; 682 my $type = $obj->{type} || $arch->{type};
405 683
406 if ($type > 0) { 684 if ($type > 0) {
407 $root = $Crossfire::Data::ATTR{$type}; 685 $root = $Crossfire::Data::ATTR{$type};
408 } else { 686 } else {
687 my %a = (%$arch, %$obj);
688
689 if ($a{is_floor} && !$a{alive}) {
690 $root = $Crossfire::Data::TYPE{Floor};
691 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
692 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
693 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
694 $root = $Crossfire::Data::TYPE{Wall};
695 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
696 $root = $Crossfire::Data::TYPE{"Weak Wall"};
697 } else {
409 $root = $Crossfire::Data::TYPE{Misc}; 698 $root = $Crossfire::Data::TYPE{Misc};
410
411 type:
412 for (@Crossfire::Data::ATTR0) {
413 my $req = $_->{required}
414 or die "internal error: ATTR0 without 'required'";
415
416 keys %$req;
417 while (my ($k, $v) = each %$req) {
418 next type
419 unless $obj->{$k} == $v || $arch->{$k} == $v;
420 }
421
422 $root = $_;
423 } 699 }
424 } 700 }
425 701
426 my @import = ($root); 702 my @import = ($root);
427 703
… …
601 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 877 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
602 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 878 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
603 or die "$VARDIR/tilecache.png: $!"; 879 or die "$VARDIR/tilecache.png: $!";
604 *FACE = $_[0]; 880 *FACE = $_[0];
605 }, sub { 881 }, sub {
606 require File::Temp;
607
608 my $tile = read_pak "$LIB/crossfire.0"; 882 my $tile = read_pak "$LIB/crossfire.0";
609 883
610 my %cache; 884 my %cache;
611 885
612 my $idx = 0; 886 my $idx = 0;
613 887
614 for my $name (sort keys %$tile) { 888 for my $name (sort keys %$tile) {
615 my ($fh, $filename) = File::Temp::tempfile (); 889 my $pb = new Gtk2::Gdk::PixbufLoader;
616 print $fh $tile->{$name}; 890 $pb->write ($tile->{$name});
617 close $fh; 891 $pb->close;
618 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 892 my $pb = $pb->get_pixbuf;
619 unlink $filename;
620 893
621 my $tile = $cache{$name} = { 894 my $tile = $cache{$name} = {
622 pb => $pb, 895 pb => $pb,
623 idx => $idx, 896 idx => $idx,
624 w => int $pb->get_width / TILESIZE, 897 w => int $pb->get_width / TILESIZE,
… …
642 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 915 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
643 } 916 }
644 } 917 }
645 } 918 }
646 919
647 $pb->save ("$VARDIR/tilecache.png", "png"); 920 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
648 921
649 \%cache 922 \%cache
650 }; 923 };
651} 924}
652 925

Diff Legend

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