ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra/Deliantra.pm
(Generate patch)

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.54 by root, Thu Mar 23 06:45:23 2006 UTC vs.
Revision 1.82 by root, Tue Feb 6 23:53:26 2007 UTC

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

Diff Legend

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