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.54 by root, Thu Mar 23 06:45:23 2006 UTC vs.
Revision 1.84 by root, Wed Feb 7 00:22:34 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
204my %MATERIAL = reverse
205 paper => 1,
206 iron => 2,
207 glass => 4,
208 leather => 8,
209 wood => 16,
210 organic => 32,
211 stone => 64,
212 cloth => 128,
213 adamant => 256,
214 liquid => 512,
215 tin => 1024,
216 bone => 2048,
217 ice => 4096,
218
219 # guesses
220 runestone => 12,
221 bronze => 18,
222 "ancient wood" => 20,
223 glass => 36,
224 marble => 66,
225 ice => 68,
226 stone => 70,
227 stone => 80,
228 cloth => 136,
229 ironwood => 144,
230 glacium => 260,
231 blood => 544,
232;
233
234# object as in "Object xxx", i.e. archetypes
123sub normalize_object($) { 235sub normalize_object($) {
124 my ($ob) = @_; 236 my ($ob) = @_;
125 237
238 # convert material bitset to materialname, if possible
239 if (exists $ob->{material}) {
240 if (!$ob->{material}) {
241 delete $ob->{material};
242 } elsif (exists $ob->{materialname}) {
243 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
244 delete $ob->{material};
245 } else {
246 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
247 delete $ob->{material}; # assume materilname is more specific and nuke material
248 }
249 } elsif (my $name = $MATERIAL{$ob->{material}}) {
250 delete $ob->{material};
251 $ob->{materialname} = $name;
252 } else {
253 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
254 }
255 }
256
257 # nuke outdated or never supported fields
126 delete $ob->{$_} for qw( 258 delete @$ob{qw(
127 can_knockback can_parry can_impale can_cut can_dam_armour 259 can_knockback can_parry can_impale can_cut can_dam_armour
128 can_apply pass_thru can_pass_thru 260 can_apply pass_thru can_pass_thru
129 ); 261 )};
130 262
131 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 263 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
264 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
265 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
266
267 # convert movement strings to bitsets
268 for my $attr (keys %FIELD_MOVEMENT) {
132 next unless exists $ob->{$attr}; 269 next unless exists $ob->{$attr};
270
271 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
272
133 next if $ob->{$attr} =~ /^\d+$/; 273 next if $ob->{$attr} =~ /^\d+$/;
134 274
135 my $flags = 0; 275 my $flags = 0;
136 276
137 # assume list 277 # assume list
… …
154 } 294 }
155 295
156 $ob->{$attr} = $flags; 296 $ob->{$attr} = $flags;
157 } 297 }
158 298
299 # convert outdated movement flags to new movement sets
159 if (defined (my $v = delete $ob->{no_pass})) { 300 if (defined (my $v = delete $ob->{no_pass})) {
160 $ob->{move_block} = $v ? MOVE_ALL : 0; 301 $ob->{move_block} = $v ? MOVE_ALL : 0;
161 } 302 }
162 if (defined (my $v = delete $ob->{slow_move})) { 303 if (defined (my $v = delete $ob->{slow_move})) {
163 $ob->{move_slow} |= MOVE_WALK; 304 $ob->{move_slow} |= MOVE_WALK;
164 $ob->{move_slow_penalty} = $v; 305 $ob->{move_slow_penalty} = $v;
165 } 306 }
166 if (defined (my $v = delete $ob->{walk_on})) { 307 if (defined (my $v = delete $ob->{walk_on})) {
308 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
167 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 309 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
168 : $ob->{move_on} & ~MOVE_WALK; 310 : $ob->{move_on} & ~MOVE_WALK;
169 } 311 }
170 if (defined (my $v = delete $ob->{walk_off})) { 312 if (defined (my $v = delete $ob->{walk_off})) {
313 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
171 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 314 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
172 : $ob->{move_off} & ~MOVE_WALK; 315 : $ob->{move_off} & ~MOVE_WALK;
173 } 316 }
174 if (defined (my $v = delete $ob->{fly_on})) { 317 if (defined (my $v = delete $ob->{fly_on})) {
318 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
175 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 319 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
176 : $ob->{move_on} & ~MOVE_FLY_LOW; 320 : $ob->{move_on} & ~MOVE_FLY_LOW;
177 } 321 }
178 if (defined (my $v = delete $ob->{fly_off})) { 322 if (defined (my $v = delete $ob->{fly_off})) {
323 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
179 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 324 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
180 : $ob->{move_off} & ~MOVE_FLY_LOW; 325 : $ob->{move_off} & ~MOVE_FLY_LOW;
181 } 326 }
182 if (defined (my $v = delete $ob->{flying})) { 327 if (defined (my $v = delete $ob->{flying})) {
328 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type};
183 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 329 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
184 : $ob->{move_type} & ~MOVE_FLY_LOW; 330 : $ob->{move_type} & ~MOVE_FLY_LOW;
185 } 331 }
186 332
333 # convert idiotic event_xxx things into objects
334 while (my ($event, $subtype) = each %EVENT_TYPE) {
335 if (exists $ob->{"event_${event}_plugin"}) {
336 push @{$ob->{inventory}}, {
337 _name => "event_$event",
338 title => delete $ob->{"event_${event}_plugin"},
339 slaying => delete $ob->{"event_${event}"},
340 name => delete $ob->{"event_${event}_options"},
341 };
342 }
343 }
344
345 # some archetypes had "+3" instead of the canonical "3", so fix
346 $ob->{dam} *= 1 if exists $ob->{dam};
347
187 $ob 348 $ob
188} 349}
189 350
351# arch as in "arch xxx", ie.. objects
190sub normalize_arch($) { 352sub normalize_arch($) {
191 my ($ob) = @_; 353 my ($ob) = @_;
192 354
193 normalize_object $ob; 355 normalize_object $ob;
194 356
… …
221 delete $ob->{$k}; 383 delete $ob->{$k};
222 } 384 }
223 } 385 }
224 } 386 }
225 387
388 # a speciality for the editor
389 if (exists $ob->{attack_movement}) {
390 my $am = delete $ob->{attack_movement};
391 $ob->{attack_movement_bits_0_3} = $am & 15;
392 $ob->{attack_movement_bits_4_7} = $am & 240;
393 }
394
395 $ob
396}
397
398sub attr_thaw($) {
399 my ($ob) = @_;
400
401 $ob->{attach} = from_json $ob->{attach}
402 if exists $ob->{attach};
403
404 $ob
405}
406
407sub attr_freeze($) {
408 my ($ob) = @_;
409
410 $ob->{attach} = Crossfire::to_json $ob->{attach}
411 if exists $ob->{attach};
412
226 $ob 413 $ob
227} 414}
228 415
229sub read_pak($) { 416sub read_pak($) {
230 my ($path) = @_; 417 my ($path) = @_;
231 418
232 my %pak; 419 my %pak;
233 420
234 open my $fh, "<", $path 421 open my $fh, "<:raw:perlio", $path
235 or Carp::croak "$_[0]: $!"; 422 or Carp::croak "$_[0]: $!";
236 binmode $fh; 423 binmode $fh;
237 while (<$fh>) { 424 while (<$fh>) {
238 my ($type, $id, $len, $path) = split; 425 my ($type, $id, $len, $path) = split;
239 $path =~ s/.*\///; 426 $path =~ s/.*\///;
… …
241 } 428 }
242 429
243 \%pak 430 \%pak
244} 431}
245 432
246sub read_arch($) { 433sub read_arch($;$) {
247 my ($path) = @_; 434 my ($path, $toplevel) = @_;
248 435
249 my %arc; 436 my %arc;
250 my ($more, $prev); 437 my ($more, $prev);
438 my $comment;
251 439
252 open my $fh, "<", $path 440 open my $fh, "<:raw:perlio:utf8", $path
253 or Carp::croak "$path: $!"; 441 or Carp::croak "$path: $!";
254 442
255 binmode $fh; 443# binmode $fh;
256 444
257 my $parse_block; $parse_block = sub { 445 my $parse_block; $parse_block = sub {
258 my %arc = @_; 446 my %arc = @_;
259 447
260 while (<$fh>) { 448 while (<$fh>) {
261 s/\s+$//; 449 s/\s+$//;
262 if (/^end$/i) { 450 if (/^end$/i) {
263 last; 451 last;
452
264 } elsif (/^arch (\S+)$/) { 453 } elsif (/^arch (\S+)$/i) {
265 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 454 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
455
266 } elsif (/^lore$/) { 456 } elsif (/^lore$/i) {
267 while (<$fh>) { 457 while (<$fh>) {
268 last if /^endlore\s*$/i; 458 last if /^endlore\s*$/i;
269 $arc{lore} .= $_; 459 $arc{lore} .= $_;
270 } 460 }
271 } elsif (/^msg$/) { 461 } elsif (/^msg$/i) {
272 while (<$fh>) { 462 while (<$fh>) {
273 last if /^endmsg\s*$/i; 463 last if /^endmsg\s*$/i;
274 $arc{msg} .= $_; 464 $arc{msg} .= $_;
275 } 465 }
466 } elsif (/^anim$/i) {
467 while (<$fh>) {
468 last if /^mina\s*$/i;
469 chomp;
470 push @{ $arc{anim} }, $_;
471 }
276 } elsif (/^(\S+)\s*(.*)$/) { 472 } elsif (/^(\S+)\s*(.*)$/) {
277 $arc{lc $1} = $2; 473 $arc{lc $1} = $2;
278 } elsif (/^\s*($|#)/) { 474 } elsif (/^\s*#/) {
475 $arc{_comment} .= "$_\n";
476
477 } elsif (/^\s*$/) {
279 # 478 #
280 } else { 479 } else {
281 warn "$path: unparsable line '$_' in arch $arc{_name}"; 480 warn "$path: unparsable line '$_' in arch $arc{_name}";
282 } 481 }
283 } 482 }
… …
289 s/\s+$//; 488 s/\s+$//;
290 if (/^more$/i) { 489 if (/^more$/i) {
291 $more = $prev; 490 $more = $prev;
292 } elsif (/^object (\S+)$/i) { 491 } elsif (/^object (\S+)$/i) {
293 my $name = $1; 492 my $name = $1;
294 my $arc = normalize_object $parse_block->(_name => $name); 493 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
494 undef $comment;
495 delete $arc{_comment} unless length $arc{_comment};
496 $arc->{_atype} = 'object';
295 497
296 if ($more) { 498 if ($more) {
297 $more->{more} = $arc; 499 $more->{more} = $arc;
298 } else { 500 } else {
299 $arc{$name} = $arc; 501 $arc{$name} = $arc;
300 } 502 }
301 $prev = $arc; 503 $prev = $arc;
302 $more = undef; 504 $more = undef;
303 } elsif (/^arch (\S+)$/i) { 505 } elsif (/^arch (\S+)$/i) {
304 push @{ $arc{arch} }, normalize_arch $parse_block->(_name => $1); 506 my $name = $1;
507 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
508 undef $comment;
509 delete $arc{_comment} unless length $arc{_comment};
510 $arc->{_atype} = 'arch';
511
512 if ($more) {
513 $more->{more} = $arc;
514 } else {
515 push @{ $arc{arch} }, $arc;
516 }
517 $prev = $arc;
518 $more = undef;
519 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
520 if ($1 eq "lev_array") {
521 while (<$fh>) {
522 last if /^endplst\s*$/;
523 push @{$toplevel->{lev_array}}, $_+0;
524 }
525 } else {
526 $toplevel->{$1} = $2;
527 }
528 } elsif (/^\s*#/) {
529 $comment .= "$_\n";
305 } elsif (/^\s*($|#)/) { 530 } elsif (/^\s*($|#)/) {
306 # 531 #
307 } else { 532 } else {
308 warn "$path: unparseable top-level line '$_'"; 533 die "$path: unparseable top-level line '$_'";
309 } 534 }
310 } 535 }
311 536
312 undef $parse_block; # work around bug in perl not freeing $fh etc. 537 undef $parse_block; # work around bug in perl not freeing $fh etc.
313 538
314 \%arc 539 \%arc
540}
541
542sub archlist_to_string {
543 my ($arch) = @_;
544
545 my $str;
546
547 my $append; $append = sub {
548 my %a = %{$_[0]};
549
550 Crossfire::attr_freeze \%a;
551 Crossfire::normalize_arch \%a;
552
553 # undo the bit-split we did before
554 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
555 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
556 | (delete $a{attack_movement_bits_4_7});
557 }
558
559 if (my $comment = delete $a{_comment}) {
560 if ($comment =~ /[^\n\s#]/) {
561 $str .= $comment;
562 }
563 }
564
565 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
566
567 my $inv = delete $a{inventory};
568 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
569 my $anim = delete $a{anim};
570
571 my @kv;
572
573 for ($a{_name} eq "map"
574 ? @Crossfire::FIELD_ORDER_MAP
575 : @Crossfire::FIELD_ORDER) {
576 push @kv, [$_, delete $a{$_}]
577 if exists $a{$_};
578 }
579
580 for (sort keys %a) {
581 next if /^_/; # ignore our _-keys
582 push @kv, [$_, delete $a{$_}];
583 }
584
585 for (@kv) {
586 my ($k, $v) = @$_;
587
588 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
589 $v =~ s/\n$//;
590 $str .= "$k\n$v\n$end\n";
591 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
592 if ($v & ~Crossfire::MOVE_ALL or !$v) {
593 $str .= "$k $v\n";
594
595 } elsif ($v & Crossfire::MOVE_ALLBIT) {
596 $str .= "$k all";
597
598 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
599 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
600 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
601 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
602 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
603
604 $str .= "\n";
605
606 } else {
607 $str .= $k;
608
609 $str .= " walk" if $v & Crossfire::MOVE_WALK;
610 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
611 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
612 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
613 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
614
615 $str .= "\n";
616 }
617 } else {
618 $str .= "$k $v\n";
619 }
620 }
621
622 if ($inv) {
623 $append->($_) for @$inv;
624 }
625
626 if ($a{_atype} eq 'object') {
627 $str .= join "\n", "anim", @$anim, "mina\n"
628 if $anim;
629 }
630
631 $str .= "end\n";
632
633 if ($a{_atype} eq 'object') {
634 if ($more) {
635 $str .= "more\n";
636 $append->($more) if $more;
637 } else {
638 $str .= "\n";
639 }
640 }
641 };
642
643 for (@$arch) {
644 $append->($_);
645 }
646
647 $str
315} 648}
316 649
317# put all archs into a hash with editor_face as it's key 650# put all archs into a hash with editor_face as it's key
318# NOTE: the arrays in the hash values are references to 651# NOTE: the arrays in the hash values are references to
319# the archs from $ARCH 652# the archs from $ARCH
320sub editor_archs { 653sub editor_archs {
321 my %paths; 654 my %paths;
322 655
323 for (keys %ARCH) { 656 for (keys %ARCH) {
324 my $arch = $ARCH{$_}; 657 my $arch = $ARCH{$_};
325 push @{$paths{$arch->{editor_folder}}}, \$arch; 658 push @{$paths{$arch->{editor_folder}}}, $arch;
326 } 659 }
327 660
328 \%paths 661 \%paths
329} 662}
330 663
… …
340 my ($a) = @_; 673 my ($a) = @_;
341 674
342 my $o = $ARCH{$a->{_name}} 675 my $o = $ARCH{$a->{_name}}
343 or return; 676 or return;
344 677
345 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 678 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
679 unless ($face) {
680 $face = $FACE{"blank.x11"}
346 or (warn "no face data found for arch '$a->{_name}'"), return; 681 or (warn "no face data found for arch '$a->{_name}'"), return;
682 }
347 683
348 if ($face->{w} > 1 || $face->{h} > 1) { 684 if ($face->{w} > 1 || $face->{h} > 1) {
349 # bigface 685 # bigface
350 return (0, 0, $face->{w} - 1, $face->{h} - 1); 686 return (0, 0, $face->{w} - 1, $face->{h} - 1);
351 687
… …
395 my $type = $obj->{type} || $arch->{type}; 731 my $type = $obj->{type} || $arch->{type};
396 732
397 if ($type > 0) { 733 if ($type > 0) {
398 $root = $Crossfire::Data::ATTR{$type}; 734 $root = $Crossfire::Data::ATTR{$type};
399 } else { 735 } else {
736 my %a = (%$arch, %$obj);
737
738 if ($a{is_floor} && !$a{alive}) {
739 $root = $Crossfire::Data::TYPE{Floor};
740 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
741 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
742 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
743 $root = $Crossfire::Data::TYPE{Wall};
744 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
745 $root = $Crossfire::Data::TYPE{"Weak Wall"};
746 } else {
400 $root = $Crossfire::Data::TYPE{Misc}; 747 $root = $Crossfire::Data::TYPE{Misc};
401
402 type:
403 for (@Crossfire::Data::ATTR0) {
404 my $req = $_->{required}
405 or die "internal error: ATTR0 without 'required'";
406
407 keys %$req;
408 while (my ($k, $v) = each %$req) {
409 next type
410 unless $obj->{$k} == $v || $arch->{$k} == $v;
411 }
412
413 $root = $_;
414 } 748 }
415 } 749 }
416 750
417 my @import = ($root); 751 my @import = ($root);
418 752
… …
592 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 926 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
593 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 927 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
594 or die "$VARDIR/tilecache.png: $!"; 928 or die "$VARDIR/tilecache.png: $!";
595 *FACE = $_[0]; 929 *FACE = $_[0];
596 }, sub { 930 }, sub {
597 require File::Temp;
598
599 my $tile = read_pak "$LIB/crossfire.0"; 931 my $tile = read_pak "$LIB/crossfire.0";
600 932
601 my %cache; 933 my %cache;
602 934
603 my $idx = 0; 935 my $idx = 0;
604 936
605 for my $name (sort keys %$tile) { 937 for my $name (sort keys %$tile) {
606 my ($fh, $filename) = File::Temp::tempfile (); 938 my $pb = new Gtk2::Gdk::PixbufLoader;
607 print $fh $tile->{$name}; 939 $pb->write ($tile->{$name});
608 close $fh; 940 $pb->close;
609 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 941 my $pb = $pb->get_pixbuf;
610 unlink $filename;
611 942
612 my $tile = $cache{$name} = { 943 my $tile = $cache{$name} = {
613 pb => $pb, 944 pb => $pb,
614 idx => $idx, 945 idx => $idx,
615 w => int $pb->get_width / TILESIZE, 946 w => int $pb->get_width / TILESIZE,
… …
633 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 964 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
634 } 965 }
635 } 966 }
636 } 967 }
637 968
638 $pb->save ("$VARDIR/tilecache.png", "png"); 969 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
639 970
640 \%cache 971 \%cache
641 }; 972 };
642} 973}
643 974

Diff Legend

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