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

Diff Legend

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