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.86 by root, Wed Feb 7 00:56:06 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 file_format_version
64 name attach swap_time reset_timeout fixed_resettime difficulty region
65 shopitems shopgreed shopmin shopmax shoprace
66 darkness width height enter_x enter_y msg maplore
67 unique template
68 outdoor temp pressure humid windspeed winddir sky nosmooth
69 tile_path_1 tile_path_2 tile_path_3 tile_path_4
70));
71
44our @FIELD_ORDER = (qw( 72our @FIELD_ORDER = (qw(
73 elevation
74
45 name name_pl custom_name title race 75 name name_pl custom_name attach title race
46 slaying skill msg lore other_arch face 76 slaying skill msg lore other_arch face
47 #events 77 #todo-events
48 animation is_animated 78 animation is_animated
49 Str Dex Con Wis Pow Cha Int 79 str dex con wis pow cha int
50 hp maxhp sp maxsp grace maxgrace 80 hp maxhp sp maxsp grace maxgrace
51 exp perm_exp expmul 81 exp perm_exp expmul
52 food dam luck wc ac x y speed speed_left move_state attack_movement 82 food dam luck wc ac x y speed speed_left move_state attack_movement
53 nrof level direction type subtype 83 nrof level direction type subtype attacktype
54 84
55 resist_physical resist_magic resist_fire resist_electricity 85 resist_physical resist_magic resist_fire resist_electricity
56 resist_cold resist_confusion resist_acid resist_drain 86 resist_cold resist_confusion resist_acid resist_drain
57 resist_weaponmagic resist_ghosthit resist_poison resist_slow 87 resist_weaponmagic resist_ghosthit resist_poison resist_slow
58 resist_paralyze resist_turn_undead resist_fear resist_cancellation 88 resist_paralyze resist_turn_undead resist_fear resist_cancellation
… …
87 117
88 body_range body_arm body_torso body_head body_neck body_skill 118 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 119 body_finger body_shoulder body_foot body_hand body_wrist body_waist
90)); 120));
91 121
122our %EVENT_TYPE = (
123 apply => 1,
124 attack => 2,
125 death => 3,
126 drop => 4,
127 pickup => 5,
128 say => 6,
129 stop => 7,
130 time => 8,
131 throw => 9,
132 trigger => 10,
133 close => 11,
134 timer => 12,
135);
136
92sub MOVE_WALK (){ 0x01 } 137sub MOVE_WALK (){ 0x01 }
93sub MOVE_FLY_LOW (){ 0x02 } 138sub MOVE_FLY_LOW (){ 0x02 }
94sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
95sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
96sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
97sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
143sub MOVE_KNOWN (){ 0x1f } # all of above
98sub MOVE_ALL (){ 0xff } 144sub MOVE_ALLBIT (){ 0x10000 }
145sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
99 146
100sub load_ref($) { 147sub load_ref($) {
101 my ($path) = @_; 148 my ($path) = @_;
102 149
103 open my $fh, "<", $path 150 open my $fh, "<:raw:perlio", $path
104 or die "$path: $!"; 151 or die "$path: $!";
105 binmode $fh;
106 local $/; 152 local $/;
107 153
108 thaw <$fh> 154 thaw <$fh>
109} 155}
110 156
111sub save_ref($$) { 157sub save_ref($$) {
112 my ($ref, $path) = @_; 158 my ($ref, $path) = @_;
113 159
114 open my $fh, ">", "$path~" 160 open my $fh, ">:raw:perlio", "$path~"
115 or die "$path~: $!"; 161 or die "$path~: $!";
116 binmode $fh;
117 print $fh freeze $ref; 162 print $fh freeze $ref;
118 close $fh; 163 close $fh;
119 rename "$path~", $path 164 rename "$path~", $path
120 or die "$path: $!"; 165 or die "$path: $!";
121} 166}
122 167
168my %attack_mask = (
169 physical => 0x00000001,
170 magic => 0x00000002,
171 fire => 0x00000004,
172 electricity => 0x00000008,
173 cold => 0x00000010,
174 confusion => 0x00000020,
175 acid => 0x00000040,
176 drain => 0x00000080,
177 weaponmagic => 0x00000100,
178 ghosthit => 0x00000200,
179 poison => 0x00000400,
180 slow => 0x00000800,
181 paralyze => 0x00001000,
182 turn_undead => 0x00002000,
183 fear => 0x00004000,
184 cancellation => 0x00008000,
185 deplete => 0x00010000,
186 death => 0x00020000,
187 chaos => 0x00040000,
188 counterspell => 0x00080000,
189 godpower => 0x00100000,
190 holyword => 0x00200000,
191 blind => 0x00400000,
192 internal => 0x00800000,
193 life_stealing => 0x01000000,
194 disease => 0x02000000,
195);
196
197sub _add_resist($$$) {
198 my ($ob, $mask, $value) = @_;
199
200 while (my ($k, $v) = each %attack_mask) {
201 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
202 }
203}
204
205my %MATERIAL = reverse
206 paper => 1,
207 iron => 2,
208 glass => 4,
209 leather => 8,
210 wood => 16,
211 organic => 32,
212 stone => 64,
213 cloth => 128,
214 adamant => 256,
215 liquid => 512,
216 tin => 1024,
217 bone => 2048,
218 ice => 4096,
219
220 # guesses
221 runestone => 12,
222 bronze => 18,
223 "ancient wood" => 20,
224 glass => 36,
225 marble => 66,
226 ice => 68,
227 stone => 70,
228 stone => 80,
229 cloth => 136,
230 ironwood => 144,
231 adamantium => 258,
232 glacium => 260,
233 blood => 544,
234;
235
236# object as in "Object xxx", i.e. archetypes
123sub normalize_object($) { 237sub normalize_object($) {
124 my ($ob) = @_; 238 my ($ob) = @_;
125 239
240 # convert material bitset to materialname, if possible
241 if (exists $ob->{material}) {
242 if (!$ob->{material}) {
243 delete $ob->{material};
244 } elsif (exists $ob->{materialname}) {
245 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
246 delete $ob->{material};
247 } else {
248 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
249 delete $ob->{material}; # assume materilname is more specific and nuke material
250 }
251 } elsif (my $name = $MATERIAL{$ob->{material}}) {
252 delete $ob->{material};
253 $ob->{materialname} = $name;
254 } else {
255 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
256 }
257 }
258
259 # nuke outdated or never supported fields
126 delete $ob->{$_} for qw( 260 delete @$ob{qw(
127 can_knockback can_parry can_impale can_cut can_dam_armour 261 can_knockback can_parry can_impale can_cut can_dam_armour
128 can_apply pass_thru can_pass_thru 262 can_apply pass_thru can_pass_thru
129 ); 263 )};
130 264
131 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 265 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
266 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
267 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
268
269 # convert movement strings to bitsets
270 for my $attr (keys %FIELD_MOVEMENT) {
132 next unless exists $ob->{$attr}; 271 next unless exists $ob->{$attr};
272
273 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
274
133 next if $ob->{$attr} =~ /^\d+$/; 275 next if $ob->{$attr} =~ /^\d+$/;
134 276
135 my $flags = 0; 277 my $flags = 0;
136 278
137 # assume list 279 # assume list
… …
154 } 296 }
155 297
156 $ob->{$attr} = $flags; 298 $ob->{$attr} = $flags;
157 } 299 }
158 300
301 # convert outdated movement flags to new movement sets
159 if (defined (my $v = delete $ob->{no_pass})) { 302 if (defined (my $v = delete $ob->{no_pass})) {
160 $ob->{move_block} = $v ? MOVE_ALL : 0; 303 $ob->{move_block} = $v ? MOVE_ALL : 0;
161 } 304 }
162 if (defined (my $v = delete $ob->{slow_move})) { 305 if (defined (my $v = delete $ob->{slow_move})) {
163 $ob->{move_slow} |= MOVE_WALK; 306 $ob->{move_slow} |= MOVE_WALK;
164 $ob->{move_slow_penalty} = $v; 307 $ob->{move_slow_penalty} = $v;
165 } 308 }
166 if (defined (my $v = delete $ob->{walk_on})) { 309 if (defined (my $v = delete $ob->{walk_on})) {
310 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
167 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 311 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
168 : $ob->{move_on} & ~MOVE_WALK; 312 : $ob->{move_on} & ~MOVE_WALK;
169 } 313 }
170 if (defined (my $v = delete $ob->{walk_off})) { 314 if (defined (my $v = delete $ob->{walk_off})) {
315 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
171 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 316 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
172 : $ob->{move_off} & ~MOVE_WALK; 317 : $ob->{move_off} & ~MOVE_WALK;
173 } 318 }
174 if (defined (my $v = delete $ob->{fly_on})) { 319 if (defined (my $v = delete $ob->{fly_on})) {
320 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
175 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 321 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
176 : $ob->{move_on} & ~MOVE_FLY_LOW; 322 : $ob->{move_on} & ~MOVE_FLY_LOW;
177 } 323 }
178 if (defined (my $v = delete $ob->{fly_off})) { 324 if (defined (my $v = delete $ob->{fly_off})) {
325 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
179 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 326 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
180 : $ob->{move_off} & ~MOVE_FLY_LOW; 327 : $ob->{move_off} & ~MOVE_FLY_LOW;
181 } 328 }
182 if (defined (my $v = delete $ob->{flying})) { 329 if (defined (my $v = delete $ob->{flying})) {
330 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type};
183 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 331 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
184 : $ob->{move_type} & ~MOVE_FLY_LOW; 332 : $ob->{move_type} & ~MOVE_FLY_LOW;
185 } 333 }
186 334
335 # convert idiotic event_xxx things into objects
336 while (my ($event, $subtype) = each %EVENT_TYPE) {
337 if (exists $ob->{"event_${event}_plugin"}) {
338 push @{$ob->{inventory}}, {
339 _name => "event_$event",
340 title => delete $ob->{"event_${event}_plugin"},
341 slaying => delete $ob->{"event_${event}"},
342 name => delete $ob->{"event_${event}_options"},
343 };
344 }
345 }
346
347 # some archetypes had "+3" instead of the canonical "3", so fix
348 $ob->{dam} *= 1 if exists $ob->{dam};
349
187 $ob 350 $ob
188} 351}
189 352
353# arch as in "arch xxx", ie.. objects
190sub normalize_arch($) { 354sub normalize_arch($) {
191 my ($ob) = @_; 355 my ($ob) = @_;
192 356
193 normalize_object $ob; 357 normalize_object $ob;
194 358
… …
221 delete $ob->{$k}; 385 delete $ob->{$k};
222 } 386 }
223 } 387 }
224 } 388 }
225 389
390 # a speciality for the editor
391 if (exists $ob->{attack_movement}) {
392 my $am = delete $ob->{attack_movement};
393 $ob->{attack_movement_bits_0_3} = $am & 15;
394 $ob->{attack_movement_bits_4_7} = $am & 240;
395 }
396
397 $ob
398}
399
400sub attr_thaw($) {
401 my ($ob) = @_;
402
403 $ob->{attach} = from_json $ob->{attach}
404 if exists $ob->{attach};
405
406 $ob
407}
408
409sub attr_freeze($) {
410 my ($ob) = @_;
411
412 $ob->{attach} = Crossfire::to_json $ob->{attach}
413 if exists $ob->{attach};
414
226 $ob 415 $ob
227} 416}
228 417
229sub read_pak($) { 418sub read_pak($) {
230 my ($path) = @_; 419 my ($path) = @_;
231 420
232 my %pak; 421 my %pak;
233 422
234 open my $fh, "<", $path 423 open my $fh, "<:raw:perlio", $path
235 or Carp::croak "$_[0]: $!"; 424 or Carp::croak "$_[0]: $!";
236 binmode $fh; 425 binmode $fh;
237 while (<$fh>) { 426 while (<$fh>) {
238 my ($type, $id, $len, $path) = split; 427 my ($type, $id, $len, $path) = split;
239 $path =~ s/.*\///; 428 $path =~ s/.*\///;
… …
241 } 430 }
242 431
243 \%pak 432 \%pak
244} 433}
245 434
246sub read_arch($) { 435sub read_arch($;$) {
247 my ($path) = @_; 436 my ($path, $toplevel) = @_;
248 437
249 my %arc; 438 my %arc;
250 my ($more, $prev); 439 my ($more, $prev);
440 my $comment;
251 441
252 open my $fh, "<", $path 442 open my $fh, "<:raw:perlio:utf8", $path
253 or Carp::croak "$path: $!"; 443 or Carp::croak "$path: $!";
254 444
255 binmode $fh; 445# binmode $fh;
256 446
257 my $parse_block; $parse_block = sub { 447 my $parse_block; $parse_block = sub {
258 my %arc = @_; 448 my %arc = @_;
259 449
260 while (<$fh>) { 450 while (<$fh>) {
261 s/\s+$//; 451 s/\s+$//;
262 if (/^end$/i) { 452 if (/^end$/i) {
263 last; 453 last;
454
264 } elsif (/^arch (\S+)$/i) { 455 } elsif (/^arch (\S+)$/i) {
265 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 456 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
457
266 } elsif (/^lore$/i) { 458 } elsif (/^lore$/i) {
267 while (<$fh>) { 459 while (<$fh>) {
268 last if /^endlore\s*$/i; 460 last if /^endlore\s*$/i;
269 $arc{lore} .= $_; 461 $arc{lore} .= $_;
270 } 462 }
271 } elsif (/^msg$/i) { 463 } elsif (/^msg$/i) {
272 while (<$fh>) { 464 while (<$fh>) {
273 last if /^endmsg\s*$/i; 465 last if /^endmsg\s*$/i;
274 $arc{msg} .= $_; 466 $arc{msg} .= $_;
275 } 467 }
468 } elsif (/^anim$/i) {
469 while (<$fh>) {
470 last if /^mina\s*$/i;
471 chomp;
472 push @{ $arc{anim} }, $_;
473 }
276 } elsif (/^(\S+)\s*(.*)$/) { 474 } elsif (/^(\S+)\s*(.*)$/) {
277 $arc{lc $1} = $2; 475 $arc{lc $1} = $2;
278 } elsif (/^\s*($|#)/) { 476 } elsif (/^\s*#/) {
477 $arc{_comment} .= "$_\n";
478
479 } elsif (/^\s*$/) {
279 # 480 #
280 } else { 481 } else {
281 warn "$path: unparsable line '$_' in arch $arc{_name}"; 482 warn "$path: unparsable line '$_' in arch $arc{_name}";
282 } 483 }
283 } 484 }
… …
289 s/\s+$//; 490 s/\s+$//;
290 if (/^more$/i) { 491 if (/^more$/i) {
291 $more = $prev; 492 $more = $prev;
292 } elsif (/^object (\S+)$/i) { 493 } elsif (/^object (\S+)$/i) {
293 my $name = $1; 494 my $name = $1;
294 my $arc = normalize_object $parse_block->(_name => $name); 495 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
496 undef $comment;
497 delete $arc{_comment} unless length $arc{_comment};
498 $arc->{_atype} = 'object';
295 499
296 if ($more) { 500 if ($more) {
297 $more->{more} = $arc; 501 $more->{more} = $arc;
298 } else { 502 } else {
299 $arc{$name} = $arc; 503 $arc{$name} = $arc;
300 } 504 }
301 $prev = $arc; 505 $prev = $arc;
302 $more = undef; 506 $more = undef;
303 } elsif (/^arch (\S+)$/i) { 507 } elsif (/^arch (\S+)$/i) {
304 my $name = $1; 508 my $name = $1;
305 my $arc = normalize_object $parse_block->(_name => $name); 509 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
510 undef $comment;
511 delete $arc{_comment} unless length $arc{_comment};
512 $arc->{_atype} = 'arch';
306 513
307 if ($more) { 514 if ($more) {
308 $more->{more} = $arc; 515 $more->{more} = $arc;
309 } else { 516 } else {
310 push @{ $arc{arch} }, $arc; 517 push @{ $arc{arch} }, $arc;
311 } 518 }
312 $prev = $arc; 519 $prev = $arc;
313 $more = undef; 520 $more = undef;
521 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
522 if ($1 eq "lev_array") {
523 while (<$fh>) {
524 last if /^endplst\s*$/;
525 push @{$toplevel->{lev_array}}, $_+0;
526 }
527 } else {
528 $toplevel->{$1} = $2;
529 }
530 } elsif (/^\s*#/) {
531 $comment .= "$_\n";
314 } elsif (/^\s*($|#)/) { 532 } elsif (/^\s*($|#)/) {
315 # 533 #
316 } else { 534 } else {
317 warn "$path: unparseable top-level line '$_'"; 535 die "$path: unparseable top-level line '$_'";
318 } 536 }
319 } 537 }
320 538
321 undef $parse_block; # work around bug in perl not freeing $fh etc. 539 undef $parse_block; # work around bug in perl not freeing $fh etc.
322 540
323 \%arc 541 \%arc
542}
543
544sub archlist_to_string {
545 my ($arch) = @_;
546
547 my $str;
548
549 my $append; $append = sub {
550 my %a = %{$_[0]};
551
552 Crossfire::attr_freeze \%a;
553 Crossfire::normalize_arch \%a;
554
555 # undo the bit-split we did before
556 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
557 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
558 | (delete $a{attack_movement_bits_4_7});
559 }
560
561 if (my $comment = delete $a{_comment}) {
562 if ($comment =~ /[^\n\s#]/) {
563 $str .= $comment;
564 }
565 }
566
567 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
568
569 my $inv = delete $a{inventory};
570 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
571 my $anim = delete $a{anim};
572
573 my @kv;
574
575 for ($a{_name} eq "map"
576 ? @Crossfire::FIELD_ORDER_MAP
577 : @Crossfire::FIELD_ORDER) {
578 push @kv, [$_, delete $a{$_}]
579 if exists $a{$_};
580 }
581
582 for (sort keys %a) {
583 next if /^_/; # ignore our _-keys
584 push @kv, [$_, delete $a{$_}];
585 }
586
587 for (@kv) {
588 my ($k, $v) = @$_;
589
590 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
591 $v =~ s/\n$//;
592 $str .= "$k\n$v\n$end\n";
593 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
594 if ($v & ~Crossfire::MOVE_ALL or !$v) {
595 $str .= "$k $v\n";
596
597 } elsif ($v & Crossfire::MOVE_ALLBIT) {
598 $str .= "$k all";
599
600 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
601 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
602 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
603 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
604 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
605
606 $str .= "\n";
607
608 } else {
609 $str .= $k;
610
611 $str .= " walk" if $v & Crossfire::MOVE_WALK;
612 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
613 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
614 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
615 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
616
617 $str .= "\n";
618 }
619 } else {
620 $str .= "$k $v\n";
621 }
622 }
623
624 if ($inv) {
625 $append->($_) for @$inv;
626 }
627
628 if ($a{_atype} eq 'object') {
629 $str .= join "\n", "anim", @$anim, "mina\n"
630 if $anim;
631 }
632
633 $str .= "end\n";
634
635 if ($a{_atype} eq 'object') {
636 if ($more) {
637 $str .= "more\n";
638 $append->($more) if $more;
639 } else {
640 $str .= "\n";
641 }
642 }
643 };
644
645 for (@$arch) {
646 $append->($_);
647 }
648
649 $str
324} 650}
325 651
326# put all archs into a hash with editor_face as it's key 652# put all archs into a hash with editor_face as it's key
327# NOTE: the arrays in the hash values are references to 653# NOTE: the arrays in the hash values are references to
328# the archs from $ARCH 654# the archs from $ARCH
329sub editor_archs { 655sub editor_archs {
330 my %paths; 656 my %paths;
331 657
332 for (keys %ARCH) { 658 for (keys %ARCH) {
333 my $arch = $ARCH{$_}; 659 my $arch = $ARCH{$_};
334 push @{$paths{$arch->{editor_folder}}}, \$arch; 660 push @{$paths{$arch->{editor_folder}}}, $arch;
335 } 661 }
336 662
337 \%paths 663 \%paths
338} 664}
339 665
… …
349 my ($a) = @_; 675 my ($a) = @_;
350 676
351 my $o = $ARCH{$a->{_name}} 677 my $o = $ARCH{$a->{_name}}
352 or return; 678 or return;
353 679
354 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 680 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
681 unless ($face) {
682 $face = $FACE{"blank.x11"}
355 or (warn "no face data found for arch '$a->{_name}'"), return; 683 or (warn "no face data found for arch '$a->{_name}'"), return;
684 }
356 685
357 if ($face->{w} > 1 || $face->{h} > 1) { 686 if ($face->{w} > 1 || $face->{h} > 1) {
358 # bigface 687 # bigface
359 return (0, 0, $face->{w} - 1, $face->{h} - 1); 688 return (0, 0, $face->{w} - 1, $face->{h} - 1);
360 689
… …
404 my $type = $obj->{type} || $arch->{type}; 733 my $type = $obj->{type} || $arch->{type};
405 734
406 if ($type > 0) { 735 if ($type > 0) {
407 $root = $Crossfire::Data::ATTR{$type}; 736 $root = $Crossfire::Data::ATTR{$type};
408 } else { 737 } else {
738 my %a = (%$arch, %$obj);
739
740 if ($a{is_floor} && !$a{alive}) {
741 $root = $Crossfire::Data::TYPE{Floor};
742 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
743 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
744 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
745 $root = $Crossfire::Data::TYPE{Wall};
746 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
747 $root = $Crossfire::Data::TYPE{"Weak Wall"};
748 } else {
409 $root = $Crossfire::Data::TYPE{Misc}; 749 $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 } 750 }
424 } 751 }
425 752
426 my @import = ($root); 753 my @import = ($root);
427 754
… …
601 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 928 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
602 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 929 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
603 or die "$VARDIR/tilecache.png: $!"; 930 or die "$VARDIR/tilecache.png: $!";
604 *FACE = $_[0]; 931 *FACE = $_[0];
605 }, sub { 932 }, sub {
606 require File::Temp;
607
608 my $tile = read_pak "$LIB/crossfire.0"; 933 my $tile = read_pak "$LIB/crossfire.0";
609 934
610 my %cache; 935 my %cache;
611 936
612 my $idx = 0; 937 my $idx = 0;
613 938
614 for my $name (sort keys %$tile) { 939 for my $name (sort keys %$tile) {
615 my ($fh, $filename) = File::Temp::tempfile (); 940 my $pb = new Gtk2::Gdk::PixbufLoader;
616 print $fh $tile->{$name}; 941 $pb->write ($tile->{$name});
617 close $fh; 942 $pb->close;
618 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 943 my $pb = $pb->get_pixbuf;
619 unlink $filename;
620 944
621 my $tile = $cache{$name} = { 945 my $tile = $cache{$name} = {
622 pb => $pb, 946 pb => $pb,
623 idx => $idx, 947 idx => $idx,
624 w => int $pb->get_width / TILESIZE, 948 w => int $pb->get_width / TILESIZE,
… …
642 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 966 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
643 } 967 }
644 } 968 }
645 } 969 }
646 970
647 $pb->save ("$VARDIR/tilecache.png", "png"); 971 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
648 972
649 \%cache 973 \%cache
650 }; 974 };
651} 975}
652 976

Diff Legend

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