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

Diff Legend

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