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.87 by root, Fri Feb 9 01:49:35 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(
63 file_format_version
45 name swap_time reset_timeout fixed_resettime difficulty region 64 name attach swap_time reset_timeout fixed_resettime difficulty region
46 shopitems shopgreed shopmin shopmax shoprace 65 shopitems shopgreed shopmin shopmax shoprace
47 darkness width height enter_x enter_y msg maplore 66 darkness width height enter_x enter_y msg maplore
48 unique template 67 unique template
49 outdoor temp pressure humid windspeed winddir sky nosmooth 68 outdoor temp pressure humid windspeed winddir sky nosmooth
50 tile_path_1 tile_path_2 tile_path_3 tile_path_4 69 tile_path_1 tile_path_2 tile_path_3 tile_path_4
51)); 70));
52 71
53our @FIELD_ORDER = (qw( 72our @FIELD_ORDER = (qw(
73 elevation
74
54 name name_pl custom_name title race 75 name name_pl custom_name attach title race
55 slaying skill msg lore other_arch face 76 slaying skill msg lore other_arch face
56 #todo-events 77 #todo-events
57 animation is_animated 78 animation is_animated
58 Str Dex Con Wis Pow Cha Int 79 str dex con wis pow cha int
59 hp maxhp sp maxsp grace maxgrace 80 hp maxhp sp maxsp grace maxgrace
60 exp perm_exp expmul 81 exp perm_exp expmul
61 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
62 nrof level direction type subtype 83 nrof level direction type subtype attacktype
63 84
64 resist_physical resist_magic resist_fire resist_electricity 85 resist_physical resist_magic resist_fire resist_electricity
65 resist_cold resist_confusion resist_acid resist_drain 86 resist_cold resist_confusion resist_acid resist_drain
66 resist_weaponmagic resist_ghosthit resist_poison resist_slow 87 resist_weaponmagic resist_ghosthit resist_poison resist_slow
67 resist_paralyze resist_turn_undead resist_fear resist_cancellation 88 resist_paralyze resist_turn_undead resist_fear resist_cancellation
… …
96 117
97 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
98 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
99)); 120));
100 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
101sub MOVE_WALK (){ 0x01 } 137sub MOVE_WALK (){ 0x01 }
102sub MOVE_FLY_LOW (){ 0x02 } 138sub MOVE_FLY_LOW (){ 0x02 }
103sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
104sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
105sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
106sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
143sub MOVE_KNOWN (){ 0x1f } # all of above
107sub MOVE_ALL (){ 0xff } 144sub MOVE_ALLBIT (){ 0x10000 }
145sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
108 146
109sub load_ref($) { 147sub load_ref($) {
110 my ($path) = @_; 148 my ($path) = @_;
111 149
112 open my $fh, "<", $path 150 open my $fh, "<:raw:perlio", $path
113 or die "$path: $!"; 151 or die "$path: $!";
114 binmode $fh;
115 local $/; 152 local $/;
116 153
117 thaw <$fh> 154 thaw <$fh>
118} 155}
119 156
120sub save_ref($$) { 157sub save_ref($$) {
121 my ($ref, $path) = @_; 158 my ($ref, $path) = @_;
122 159
123 open my $fh, ">", "$path~" 160 open my $fh, ">:raw:perlio", "$path~"
124 or die "$path~: $!"; 161 or die "$path~: $!";
125 binmode $fh;
126 print $fh freeze $ref; 162 print $fh freeze $ref;
127 close $fh; 163 close $fh;
128 rename "$path~", $path 164 rename "$path~", $path
129 or die "$path: $!"; 165 or die "$path: $!";
130} 166}
131 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
132sub normalize_object($) { 237sub normalize_object($) {
133 my ($ob) = @_; 238 my ($ob) = @_;
134 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
135 delete $ob->{$_} for qw( 260 delete @$ob{qw(
136 can_knockback can_parry can_impale can_cut can_dam_armour 261 can_knockback can_parry can_impale can_cut can_dam_armour
137 can_apply pass_thru can_pass_thru 262 can_apply pass_thru can_pass_thru
138 ); 263 )};
139 264
140 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) {
141 next unless exists $ob->{$attr}; 271 next unless exists $ob->{$attr};
272
273 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
274
142 next if $ob->{$attr} =~ /^\d+$/; 275 next if $ob->{$attr} =~ /^\d+$/;
143 276
144 my $flags = 0; 277 my $flags = 0;
145 278
146 # assume list 279 # assume list
… …
163 } 296 }
164 297
165 $ob->{$attr} = $flags; 298 $ob->{$attr} = $flags;
166 } 299 }
167 300
301 # convert outdated movement flags to new movement sets
168 if (defined (my $v = delete $ob->{no_pass})) { 302 if (defined (my $v = delete $ob->{no_pass})) {
169 $ob->{move_block} = $v ? MOVE_ALL : 0; 303 $ob->{move_block} = $v ? MOVE_ALL : 0;
170 } 304 }
171 if (defined (my $v = delete $ob->{slow_move})) { 305 if (defined (my $v = delete $ob->{slow_move})) {
172 $ob->{move_slow} |= MOVE_WALK; 306 $ob->{move_slow} |= MOVE_WALK;
173 $ob->{move_slow_penalty} = $v; 307 $ob->{move_slow_penalty} = $v;
174 } 308 }
175 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};
176 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 311 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
177 : $ob->{move_on} & ~MOVE_WALK; 312 : $ob->{move_on} & ~MOVE_WALK;
178 } 313 }
179 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};
180 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 316 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
181 : $ob->{move_off} & ~MOVE_WALK; 317 : $ob->{move_off} & ~MOVE_WALK;
182 } 318 }
183 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};
184 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 321 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
185 : $ob->{move_on} & ~MOVE_FLY_LOW; 322 : $ob->{move_on} & ~MOVE_FLY_LOW;
186 } 323 }
187 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};
188 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 326 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
189 : $ob->{move_off} & ~MOVE_FLY_LOW; 327 : $ob->{move_off} & ~MOVE_FLY_LOW;
190 } 328 }
191 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};
192 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 331 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
193 : $ob->{move_type} & ~MOVE_FLY_LOW; 332 : $ob->{move_type} & ~MOVE_FLY_LOW;
194 } 333 }
195 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
196 $ob 350 $ob
197} 351}
198 352
353# arch as in "arch xxx", ie.. objects
199sub normalize_arch($) { 354sub normalize_arch($) {
200 my ($ob) = @_; 355 my ($ob) = @_;
201 356
202 normalize_object $ob; 357 normalize_object $ob;
203 358
… …
230 delete $ob->{$k}; 385 delete $ob->{$k};
231 } 386 }
232 } 387 }
233 } 388 }
234 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
235 $ob 415 $ob
236} 416}
237 417
238sub read_pak($) { 418sub read_pak($) {
239 my ($path) = @_; 419 my ($path) = @_;
240 420
241 my %pak; 421 my %pak;
242 422
243 open my $fh, "<", $path 423 open my $fh, "<:raw:perlio", $path
244 or Carp::croak "$_[0]: $!"; 424 or Carp::croak "$_[0]: $!";
245 binmode $fh; 425 binmode $fh;
246 while (<$fh>) { 426 while (<$fh>) {
247 my ($type, $id, $len, $path) = split; 427 my ($type, $id, $len, $path) = split;
248 $path =~ s/.*\///; 428 $path =~ s/.*\///;
… …
250 } 430 }
251 431
252 \%pak 432 \%pak
253} 433}
254 434
255sub read_arch($) { 435sub read_arch($;$) {
256 my ($path) = @_; 436 my ($path, $toplevel) = @_;
257 437
258 my %arc; 438 my %arc;
259 my ($more, $prev); 439 my ($more, $prev);
440 my $comment;
260 441
261 open my $fh, "<", $path 442 open my $fh, "<:raw:perlio:utf8", $path
262 or Carp::croak "$path: $!"; 443 or Carp::croak "$path: $!";
263 444
264 binmode $fh; 445# binmode $fh;
265 446
266 my $parse_block; $parse_block = sub { 447 my $parse_block; $parse_block = sub {
267 my %arc = @_; 448 my %arc = @_;
268 449
269 while (<$fh>) { 450 while (<$fh>) {
270 s/\s+$//; 451 s/\s+$//;
271 if (/^end$/i) { 452 if (/^end$/i) {
272 last; 453 last;
454
273 } elsif (/^arch (\S+)$/i) { 455 } elsif (/^arch (\S+)$/i) {
274 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 456 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
457
275 } elsif (/^lore$/i) { 458 } elsif (/^lore$/i) {
276 while (<$fh>) { 459 while (<$fh>) {
277 last if /^endlore\s*$/i; 460 last if /^endlore\s*$/i;
278 $arc{lore} .= $_; 461 $arc{lore} .= $_;
279 } 462 }
280 } elsif (/^msg$/i) { 463 } elsif (/^msg$/i) {
281 while (<$fh>) { 464 while (<$fh>) {
282 last if /^endmsg\s*$/i; 465 last if /^endmsg\s*$/i;
283 $arc{msg} .= $_; 466 $arc{msg} .= $_;
284 } 467 }
468 } elsif (/^anim$/i) {
469 while (<$fh>) {
470 last if /^mina\s*$/i;
471 chomp;
472 push @{ $arc{anim} }, $_;
473 }
285 } elsif (/^(\S+)\s*(.*)$/) { 474 } elsif (/^(\S+)\s*(.*)$/) {
286 $arc{lc $1} = $2; 475 $arc{lc $1} = $2;
287 } elsif (/^\s*($|#)/) { 476 } elsif (/^\s*#/) {
477 $arc{_comment} .= "$_\n";
478
479 } elsif (/^\s*$/) {
288 # 480 #
289 } else { 481 } else {
290 warn "$path: unparsable line '$_' in arch $arc{_name}"; 482 warn "$path: unparsable line '$_' in arch $arc{_name}";
291 } 483 }
292 } 484 }
… …
298 s/\s+$//; 490 s/\s+$//;
299 if (/^more$/i) { 491 if (/^more$/i) {
300 $more = $prev; 492 $more = $prev;
301 } elsif (/^object (\S+)$/i) { 493 } elsif (/^object (\S+)$/i) {
302 my $name = $1; 494 my $name = $1;
303 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';
304 499
305 if ($more) { 500 if ($more) {
306 $more->{more} = $arc; 501 $more->{more} = $arc;
307 } else { 502 } else {
308 $arc{$name} = $arc; 503 $arc{$name} = $arc;
309 } 504 }
310 $prev = $arc; 505 $prev = $arc;
311 $more = undef; 506 $more = undef;
312 } elsif (/^arch (\S+)$/i) { 507 } elsif (/^arch (\S+)$/i) {
313 my $name = $1; 508 my $name = $1;
314 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';
315 513
316 if ($more) { 514 if ($more) {
317 $more->{more} = $arc; 515 $more->{more} = $arc;
318 } else { 516 } else {
319 push @{ $arc{arch} }, $arc; 517 push @{ $arc{arch} }, $arc;
320 } 518 }
321 $prev = $arc; 519 $prev = $arc;
322 $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";
323 } elsif (/^\s*($|#)/) { 532 } elsif (/^\s*($|#)/) {
324 # 533 #
325 } else { 534 } else {
326 warn "$path: unparseable top-level line '$_'"; 535 die "$path: unparseable top-level line '$_'";
327 } 536 }
328 } 537 }
329 538
330 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.
331 540
332 \%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 if ($a{_atype} eq 'object') {
574 $str .= join "\n", "anim", @$anim, "mina\n"
575 if $anim;
576 }
577
578 my @kv;
579
580 for ($a{_name} eq "map"
581 ? @Crossfire::FIELD_ORDER_MAP
582 : @Crossfire::FIELD_ORDER) {
583 push @kv, [$_, delete $a{$_}]
584 if exists $a{$_};
585 }
586
587 for (sort keys %a) {
588 next if /^_/; # ignore our _-keys
589 push @kv, [$_, delete $a{$_}];
590 }
591
592 for (@kv) {
593 my ($k, $v) = @$_;
594
595 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
596 $v =~ s/\n$//;
597 $str .= "$k\n$v\n$end\n";
598 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
599 if ($v & ~Crossfire::MOVE_ALL or !$v) {
600 $str .= "$k $v\n";
601
602 } elsif ($v & Crossfire::MOVE_ALLBIT) {
603 $str .= "$k all";
604
605 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
606 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
607 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
608 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
609 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
610
611 $str .= "\n";
612
613 } else {
614 $str .= $k;
615
616 $str .= " walk" if $v & Crossfire::MOVE_WALK;
617 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
618 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
619 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
620 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
621
622 $str .= "\n";
623 }
624 } else {
625 $str .= "$k $v\n";
626 }
627 }
628
629 if ($inv) {
630 $append->($_) for @$inv;
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
333} 650}
334 651
335# 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
336# NOTE: the arrays in the hash values are references to 653# NOTE: the arrays in the hash values are references to
337# the archs from $ARCH 654# the archs from $ARCH
338sub editor_archs { 655sub editor_archs {
339 my %paths; 656 my %paths;
340 657
341 for (keys %ARCH) { 658 for (keys %ARCH) {
342 my $arch = $ARCH{$_}; 659 my $arch = $ARCH{$_};
343 push @{$paths{$arch->{editor_folder}}}, \$arch; 660 push @{$paths{$arch->{editor_folder}}}, $arch;
344 } 661 }
345 662
346 \%paths 663 \%paths
347} 664}
348 665
… …
358 my ($a) = @_; 675 my ($a) = @_;
359 676
360 my $o = $ARCH{$a->{_name}} 677 my $o = $ARCH{$a->{_name}}
361 or return; 678 or return;
362 679
363 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"}
364 or (warn "no face data found for arch '$a->{_name}'"), return; 683 or (warn "no face data found for arch '$a->{_name}'"), return;
684 }
365 685
366 if ($face->{w} > 1 || $face->{h} > 1) { 686 if ($face->{w} > 1 || $face->{h} > 1) {
367 # bigface 687 # bigface
368 return (0, 0, $face->{w} - 1, $face->{h} - 1); 688 return (0, 0, $face->{w} - 1, $face->{h} - 1);
369 689
… …
413 my $type = $obj->{type} || $arch->{type}; 733 my $type = $obj->{type} || $arch->{type};
414 734
415 if ($type > 0) { 735 if ($type > 0) {
416 $root = $Crossfire::Data::ATTR{$type}; 736 $root = $Crossfire::Data::ATTR{$type};
417 } 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 {
418 $root = $Crossfire::Data::TYPE{Misc}; 749 $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 } 750 }
433 } 751 }
434 752
435 my @import = ($root); 753 my @import = ($root);
436 754
… …
610 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 928 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
611 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 929 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
612 or die "$VARDIR/tilecache.png: $!"; 930 or die "$VARDIR/tilecache.png: $!";
613 *FACE = $_[0]; 931 *FACE = $_[0];
614 }, sub { 932 }, sub {
615 require File::Temp;
616
617 my $tile = read_pak "$LIB/crossfire.0"; 933 my $tile = read_pak "$LIB/crossfire.0";
618 934
619 my %cache; 935 my %cache;
620 936
621 my $idx = 0; 937 my $idx = 0;
622 938
623 for my $name (sort keys %$tile) { 939 for my $name (sort keys %$tile) {
624 my ($fh, $filename) = File::Temp::tempfile (); 940 my $pb = new Gtk2::Gdk::PixbufLoader;
625 print $fh $tile->{$name}; 941 $pb->write ($tile->{$name});
626 close $fh; 942 $pb->close;
627 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 943 my $pb = $pb->get_pixbuf;
628 unlink $filename;
629 944
630 my $tile = $cache{$name} = { 945 my $tile = $cache{$name} = {
631 pb => $pb, 946 pb => $pb,
632 idx => $idx, 947 idx => $idx,
633 w => int $pb->get_width / TILESIZE, 948 w => int $pb->get_width / TILESIZE,
… …
651 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 966 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
652 } 967 }
653 } 968 }
654 } 969 }
655 970
656 $pb->save ("$VARDIR/tilecache.png", "png"); 971 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
657 972
658 \%cache 973 \%cache
659 }; 974 };
660} 975}
661 976

Diff Legend

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