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.59 by root, Sun Mar 26 11:52:31 2006 UTC vs.
Revision 1.89 by root, Tue Feb 27 23:29:59 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
… …
44 qw(move_type move_block move_allow move_on move_off move_slow); 58 qw(move_type move_block move_allow move_on move_off move_slow);
45 59
46# same as in server save routine, to (hopefully) be compatible 60# same as in server save routine, to (hopefully) be compatible
47# to the other editors. 61# to the other editors.
48our @FIELD_ORDER_MAP = (qw( 62our @FIELD_ORDER_MAP = (qw(
63 file_format_version
49 name swap_time reset_timeout fixed_resettime difficulty region 64 name attach swap_time reset_timeout fixed_resettime difficulty region
50 shopitems shopgreed shopmin shopmax shoprace 65 shopitems shopgreed shopmin shopmax shoprace
51 darkness width height enter_x enter_y msg maplore 66 darkness width height enter_x enter_y msg maplore
52 unique template 67 unique template
53 outdoor temp pressure humid windspeed winddir sky nosmooth 68 outdoor temp pressure humid windspeed winddir sky nosmooth
54 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
55)); 70));
56 71
57our @FIELD_ORDER = (qw( 72our @FIELD_ORDER = (qw(
58 elevation 73 elevation
59 74
60 name name_pl custom_name title race 75 name name_pl custom_name attach title race
61 slaying skill msg lore other_arch face 76 slaying skill msg lore other_arch face
62 #todo-events 77 #todo-events
63 animation is_animated 78 animation is_animated
64 str dex con wis pow cha int 79 str dex con wis pow cha int
65 hp maxhp sp maxsp grace maxgrace 80 hp maxhp sp maxsp grace maxgrace
… …
102 117
103 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
104 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
105)); 120));
106 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
107sub MOVE_WALK (){ 0x01 } 137sub MOVE_WALK (){ 0x01 }
108sub MOVE_FLY_LOW (){ 0x02 } 138sub MOVE_FLY_LOW (){ 0x02 }
109sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
110sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
111sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
… …
115sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 145sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
116 146
117sub load_ref($) { 147sub load_ref($) {
118 my ($path) = @_; 148 my ($path) = @_;
119 149
120 open my $fh, "<", $path 150 open my $fh, "<:raw:perlio", $path
121 or die "$path: $!"; 151 or die "$path: $!";
122 binmode $fh;
123 local $/; 152 local $/;
124 153
125 thaw <$fh> 154 thaw <$fh>
126} 155}
127 156
128sub save_ref($$) { 157sub save_ref($$) {
129 my ($ref, $path) = @_; 158 my ($ref, $path) = @_;
130 159
131 open my $fh, ">", "$path~" 160 open my $fh, ">:raw:perlio", "$path~"
132 or die "$path~: $!"; 161 or die "$path~: $!";
133 binmode $fh;
134 print $fh freeze $ref; 162 print $fh freeze $ref;
135 close $fh; 163 close $fh;
136 rename "$path~", $path 164 rename "$path~", $path
137 or die "$path: $!"; 165 or die "$path: $!";
138} 166}
139 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
140sub normalize_object($) { 237sub normalize_object($) {
141 my ($ob) = @_; 238 my ($ob) = @_;
142 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
143 delete $ob->{$_} for qw( 260 delete @$ob{qw(
144 can_knockback can_parry can_impale can_cut can_dam_armour 261 can_knockback can_parry can_impale can_cut can_dam_armour
145 can_apply pass_thru can_pass_thru 262 can_apply pass_thru can_pass_thru
146 ); 263 )};
147 264
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
148 for my $attr (keys %FIELD_MOVEMENT) { 270 for my $attr (keys %FIELD_MOVEMENT) {
149 next unless exists $ob->{$attr}; 271 next unless exists $ob->{$attr};
150 272
151 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 273 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
152 274
… …
174 } 296 }
175 297
176 $ob->{$attr} = $flags; 298 $ob->{$attr} = $flags;
177 } 299 }
178 300
301 # convert outdated movement flags to new movement sets
179 if (defined (my $v = delete $ob->{no_pass})) { 302 if (defined (my $v = delete $ob->{no_pass})) {
180 $ob->{move_block} = $v ? MOVE_ALL : 0; 303 $ob->{move_block} = $v ? MOVE_ALL : 0;
181 } 304 }
182 if (defined (my $v = delete $ob->{slow_move})) { 305 if (defined (my $v = delete $ob->{slow_move})) {
183 $ob->{move_slow} |= MOVE_WALK; 306 $ob->{move_slow} |= MOVE_WALK;
184 $ob->{move_slow_penalty} = $v; 307 $ob->{move_slow_penalty} = $v;
185 } 308 }
186 if (defined (my $v = delete $ob->{walk_on})) { 309 if (defined (my $v = delete $ob->{walk_on})) {
310 $ob->{move_on} = 0 unless exists $ob->{move_on};
187 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 311 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
188 : $ob->{move_on} & ~MOVE_WALK; 312 : $ob->{move_on} & ~MOVE_WALK;
189 } 313 }
190 if (defined (my $v = delete $ob->{walk_off})) { 314 if (defined (my $v = delete $ob->{walk_off})) {
315 $ob->{move_off} = 0 unless exists $ob->{move_off};
191 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 316 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
192 : $ob->{move_off} & ~MOVE_WALK; 317 : $ob->{move_off} & ~MOVE_WALK;
193 } 318 }
194 if (defined (my $v = delete $ob->{fly_on})) { 319 if (defined (my $v = delete $ob->{fly_on})) {
320 $ob->{move_on} = 0 unless exists $ob->{move_on};
195 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 321 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
196 : $ob->{move_on} & ~MOVE_FLY_LOW; 322 : $ob->{move_on} & ~MOVE_FLY_LOW;
197 } 323 }
198 if (defined (my $v = delete $ob->{fly_off})) { 324 if (defined (my $v = delete $ob->{fly_off})) {
325 $ob->{move_off} = 0 unless exists $ob->{move_off};
199 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 326 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
200 : $ob->{move_off} & ~MOVE_FLY_LOW; 327 : $ob->{move_off} & ~MOVE_FLY_LOW;
201 } 328 }
202 if (defined (my $v = delete $ob->{flying})) { 329 if (defined (my $v = delete $ob->{flying})) {
330 $ob->{move_type} = 0 unless exists $ob->{move_type};
203 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 331 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
204 : $ob->{move_type} & ~MOVE_FLY_LOW; 332 : $ob->{move_type} & ~MOVE_FLY_LOW;
205 } 333 }
206 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
207 $ob 350 $ob
208} 351}
209 352
353# arch as in "arch xxx", ie.. objects
210sub normalize_arch($) { 354sub normalize_arch($) {
211 my ($ob) = @_; 355 my ($ob) = @_;
212 356
213 normalize_object $ob; 357 normalize_object $ob;
214 358
… …
251 } 395 }
252 396
253 $ob 397 $ob
254} 398}
255 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
415 $ob
416}
417
256sub read_pak($) { 418sub read_pak($) {
257 my ($path) = @_; 419 my ($path) = @_;
258 420
259 my %pak; 421 my %pak;
260 422
261 open my $fh, "<", $path 423 open my $fh, "<:raw:perlio", $path
262 or Carp::croak "$_[0]: $!"; 424 or Carp::croak "$_[0]: $!";
263 binmode $fh; 425 binmode $fh;
264 while (<$fh>) { 426 while (<$fh>) {
265 my ($type, $id, $len, $path) = split; 427 my ($type, $id, $len, $path) = split;
266 $path =~ s/.*\///; 428 $path =~ s/.*\///;
… …
268 } 430 }
269 431
270 \%pak 432 \%pak
271} 433}
272 434
273sub read_arch($) { 435sub read_arch($;$) {
274 my ($path) = @_; 436 my ($path, $toplevel) = @_;
275 437
276 my %arc; 438 my %arc;
277 my ($more, $prev); 439 my ($more, $prev);
440 my $comment;
278 441
279 open my $fh, "<", $path 442 open my $fh, "<:raw:perlio:utf8", $path
280 or Carp::croak "$path: $!"; 443 or Carp::croak "$path: $!";
281 444
282 binmode $fh; 445# binmode $fh;
283 446
284 my $parse_block; $parse_block = sub { 447 my $parse_block; $parse_block = sub {
285 my %arc = @_; 448 my %arc = @_;
286 449
287 while (<$fh>) { 450 while (<$fh>) {
288 s/\s+$//; 451 s/\s+$//;
289 if (/^end$/i) { 452 if (/^end$/i) {
290 last; 453 last;
454
291 } elsif (/^arch (\S+)$/i) { 455 } elsif (/^arch (\S+)$/i) {
292 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 456 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
457
293 } elsif (/^lore$/i) { 458 } elsif (/^lore$/i) {
294 while (<$fh>) { 459 while (<$fh>) {
295 last if /^endlore\s*$/i; 460 last if /^endlore\s*$/i;
296 $arc{lore} .= $_; 461 $arc{lore} .= $_;
297 } 462 }
298 } elsif (/^msg$/i) { 463 } elsif (/^msg$/i) {
299 while (<$fh>) { 464 while (<$fh>) {
300 last if /^endmsg\s*$/i; 465 last if /^endmsg\s*$/i;
301 $arc{msg} .= $_; 466 $arc{msg} .= $_;
302 } 467 }
468 } elsif (/^anim$/i) {
469 while (<$fh>) {
470 last if /^mina\s*$/i;
471 chomp;
472 push @{ $arc{anim} }, $_;
473 }
303 } elsif (/^(\S+)\s*(.*)$/) { 474 } elsif (/^(\S+)\s*(.*)$/) {
304 $arc{lc $1} = $2; 475 $arc{lc $1} = $2;
305 } elsif (/^\s*($|#)/) { 476 } elsif (/^\s*#/) {
477 $arc{_comment} .= "$_\n";
478
479 } elsif (/^\s*$/) {
306 # 480 #
307 } else { 481 } else {
308 warn "$path: unparsable line '$_' in arch $arc{_name}"; 482 warn "$path: unparsable line '$_' in arch $arc{_name}";
309 } 483 }
310 } 484 }
… …
316 s/\s+$//; 490 s/\s+$//;
317 if (/^more$/i) { 491 if (/^more$/i) {
318 $more = $prev; 492 $more = $prev;
319 } elsif (/^object (\S+)$/i) { 493 } elsif (/^object (\S+)$/i) {
320 my $name = $1; 494 my $name = $1;
321 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';
322 499
323 if ($more) { 500 if ($more) {
324 $more->{more} = $arc; 501 $more->{more} = $arc;
325 } else { 502 } else {
326 $arc{$name} = $arc; 503 $arc{$name} = $arc;
327 } 504 }
328 $prev = $arc; 505 $prev = $arc;
329 $more = undef; 506 $more = undef;
330 } elsif (/^arch (\S+)$/i) { 507 } elsif (/^arch (\S+)$/i) {
331 my $name = $1; 508 my $name = $1;
332 my $arc = normalize_arch $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';
333 513
334 if ($more) { 514 if ($more) {
335 $more->{more} = $arc; 515 $more->{more} = $arc;
336 } else { 516 } else {
337 push @{ $arc{arch} }, $arc; 517 push @{ $arc{arch} }, $arc;
338 } 518 }
339 $prev = $arc; 519 $prev = $arc;
340 $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";
341 } elsif (/^\s*($|#)/) { 532 } elsif (/^\s*($|#)/) {
342 # 533 #
343 } else { 534 } else {
344 warn "$path: unparseable top-level line '$_'"; 535 die "$path: unparseable top-level line '$_'";
345 } 536 }
346 } 537 }
347 538
348 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.
349 540
350 \%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
351} 650}
352 651
353# 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
354# NOTE: the arrays in the hash values are references to 653# NOTE: the arrays in the hash values are references to
355# the archs from $ARCH 654# the archs from $ARCH
356sub editor_archs { 655sub editor_archs {
357 my %paths; 656 my %paths;
358 657
359 for (keys %ARCH) { 658 for (keys %ARCH) {
360 my $arch = $ARCH{$_}; 659 my $arch = $ARCH{$_};
361 push @{$paths{$arch->{editor_folder}}}, \$arch; 660 push @{$paths{$arch->{editor_folder}}}, $arch;
362 } 661 }
363 662
364 \%paths 663 \%paths
365} 664}
366 665
… …
376 my ($a) = @_; 675 my ($a) = @_;
377 676
378 my $o = $ARCH{$a->{_name}} 677 my $o = $ARCH{$a->{_name}}
379 or return; 678 or return;
380 679
381 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"}
382 or (warn "no face data found for arch '$a->{_name}'"), return; 683 or (warn "no face data found for arch '$a->{_name}'"), return;
684 }
383 685
384 if ($face->{w} > 1 || $face->{h} > 1) { 686 if ($face->{w} > 1 || $face->{h} > 1) {
385 # bigface 687 # bigface
386 return (0, 0, $face->{w} - 1, $face->{h} - 1); 688 return (0, 0, $face->{w} - 1, $face->{h} - 1);
387 689
… …
431 my $type = $obj->{type} || $arch->{type}; 733 my $type = $obj->{type} || $arch->{type};
432 734
433 if ($type > 0) { 735 if ($type > 0) {
434 $root = $Crossfire::Data::ATTR{$type}; 736 $root = $Crossfire::Data::ATTR{$type};
435 } 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 {
436 $root = $Crossfire::Data::TYPE{Misc}; 749 $root = $Crossfire::Data::TYPE{Misc};
437
438 type:
439 for (@Crossfire::Data::ATTR0) {
440 my $req = $_->{required}
441 or die "internal error: ATTR0 without 'required'";
442
443 keys %$req;
444 while (my ($k, $v) = each %$req) {
445 next type
446 unless $obj->{$k} == $v || $arch->{$k} == $v;
447 }
448
449 $root = $_;
450 } 750 }
451 } 751 }
452 752
453 my @import = ($root); 753 my @import = ($root);
454 754
… …
496 ]; 796 ];
497 797
498 $attr 798 $attr
499} 799}
500 800
501sub arch_edit_sections {
502# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
503# edit_type = 0;
504# else if (edit_type != 0) {
505# // all flags from 'check_type' must be unset in this arch because they get recalculated now
506# edit_type &= ~check_type;
507# }
508#
509# }
510# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
511# getAttributeValue("alive", defarch) == 1 &&
512# (getAttributeValue("monster", defarch) == 1 ||
513# getAttributeValue("generator", defarch) == 1)) {
514# // Monster: monsters/npcs/generators
515# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
516# }
517# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
518# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
519# // Walls
520# edit_type |= IGUIConstants.TILE_EDIT_WALL;
521# }
522# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
523# getAttributeValue("connected", defarch) != 0) {
524# // Connected Objects
525# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
526# }
527# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
528# arch_type == 66 || arch_type == 41 || arch_type == 95) {
529# // Exit: teleporter/exit/trapdoors
530# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
531# }
532# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
533# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
534# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
535# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
536# arch_type == 124 || arch_type == 130)) {
537# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
538# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
539# }
540# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
541# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
542# arch_type == 91 || arch_type == 21 || arch_type == 24) {
543# // Door: door/special door/gates + keys
544# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
545# }
546# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
547# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
548# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
549# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
550# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
551# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
552# arch_type == 122 || arch_type == 3)) {
553# // Equipment: weapons/armour/wands/rods
554# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
555# }
556#
557# return(edit_type);
558#
559#
560}
561
562sub cache_file($$&&) { 801sub cache_file($$&&) {
563 my ($src, $cache, $load, $create) = @_; 802 my ($src, $cache, $load, $create) = @_;
564 803
565 my ($size, $mtime) = (stat $src)[7,9] 804 my ($size, $mtime) = (stat $src)[7,9]
566 or Carp::croak "$src: $!"; 805 or Carp::croak "$src: $!";
… …
628 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 867 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
629 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 868 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
630 or die "$VARDIR/tilecache.png: $!"; 869 or die "$VARDIR/tilecache.png: $!";
631 *FACE = $_[0]; 870 *FACE = $_[0];
632 }, sub { 871 }, sub {
633 require File::Temp;
634
635 my $tile = read_pak "$LIB/crossfire.0"; 872 my $tile = read_pak "$LIB/crossfire.0";
636 873
637 my %cache; 874 my %cache;
638 875
639 my $idx = 0; 876 my $idx = 0;
640 877
641 for my $name (sort keys %$tile) { 878 for my $name (sort keys %$tile) {
642 my ($fh, $filename) = File::Temp::tempfile (); 879 my $pb = new Gtk2::Gdk::PixbufLoader;
643 print $fh $tile->{$name}; 880 $pb->write ($tile->{$name});
644 close $fh; 881 $pb->close;
645 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 882 my $pb = $pb->get_pixbuf;
646 unlink $filename;
647 883
648 my $tile = $cache{$name} = { 884 my $tile = $cache{$name} = {
649 pb => $pb, 885 pb => $pb,
650 idx => $idx, 886 idx => $idx,
651 w => int $pb->get_width / TILESIZE, 887 w => int $pb->get_width / TILESIZE,
… …
669 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 905 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
670 } 906 }
671 } 907 }
672 } 908 }
673 909
674 $pb->save ("$VARDIR/tilecache.png", "png"); 910 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
675 911
676 \%cache 912 \%cache
677 }; 913 };
678} 914}
679 915

Diff Legend

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