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.65 by root, Wed May 3 19:34:31 2006 UTC vs.
Revision 1.106 by root, Mon Apr 23 19:09:48 2007 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.1'; 9our $VERSION = '0.98';
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::XS qw(from_json to_json);
25
24our $LIB = $ENV{CROSSFIRE_LIBDIR}; 26our $LIB = $ENV{CROSSFIRE_LIBDIR};
25 27
26our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; 28our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire"
29 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
30 : File::Spec->tmpdir . "/crossfire";
27 31
28mkdir $VARDIR, 0777; 32mkdir $VARDIR, 0777;
29 33
30sub TILESIZE (){ 32 } 34sub TILESIZE (){ 32 }
31 35
… …
44 qw(move_type move_block move_allow move_on move_off move_slow); 48 qw(move_type move_block move_allow move_on move_off move_slow);
45 49
46# same as in server save routine, to (hopefully) be compatible 50# same as in server save routine, to (hopefully) be compatible
47# to the other editors. 51# to the other editors.
48our @FIELD_ORDER_MAP = (qw( 52our @FIELD_ORDER_MAP = (qw(
53 file_format_version
49 name swap_time reset_timeout fixed_resettime difficulty region 54 name attach swap_time reset_timeout fixed_resettime difficulty region
50 shopitems shopgreed shopmin shopmax shoprace 55 shopitems shopgreed shopmin shopmax shoprace
51 darkness width height enter_x enter_y msg maplore 56 darkness width height enter_x enter_y msg maplore
52 unique template 57 unique template
53 outdoor temp pressure humid windspeed winddir sky nosmooth 58 outdoor temp pressure humid windspeed winddir sky nosmooth
54 tile_path_1 tile_path_2 tile_path_3 tile_path_4 59 tile_path_1 tile_path_2 tile_path_3 tile_path_4
55)); 60));
56 61
57our @FIELD_ORDER = (qw( 62our @FIELD_ORDER = (qw(
63 inherit
64
58 elevation 65 elevation
59 66
60 name name_pl custom_name title race 67 name name_pl custom_name attach title race
61 slaying skill msg lore other_arch face 68 slaying skill msg lore other_arch
62 #todo-events
63 animation is_animated 69 face animation is_animated
70 magicmap smoothlevel smoothface
64 str dex con wis pow cha int 71 str dex con wis pow cha int
65 hp maxhp sp maxsp grace maxgrace 72 hp maxhp sp maxsp grace maxgrace
66 exp perm_exp expmul 73 exp perm_exp expmul
67 food dam luck wc ac x y speed speed_left move_state attack_movement 74 food dam luck wc ac x y speed speed_left move_state attack_movement
68 nrof level direction type subtype attacktype 75 nrof level direction type subtype attacktype
… …
123sub MOVE_FLY_LOW (){ 0x02 } 130sub MOVE_FLY_LOW (){ 0x02 }
124sub MOVE_FLY_HIGH (){ 0x04 } 131sub MOVE_FLY_HIGH (){ 0x04 }
125sub MOVE_FLYING (){ 0x06 } 132sub MOVE_FLYING (){ 0x06 }
126sub MOVE_SWIM (){ 0x08 } 133sub MOVE_SWIM (){ 0x08 }
127sub MOVE_BOAT (){ 0x10 } 134sub MOVE_BOAT (){ 0x10 }
135sub MOVE_SHIP (){ 0x20 }
128sub MOVE_KNOWN (){ 0x1f } # all of above 136sub MOVE_KNOWN (){ 0x3f } # all of above
129sub MOVE_ALLBIT (){ 0x10000 }
130sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 137sub MOVE_ALL (){ 0x10000 } # very special value
138
139our %MOVE_TYPE = (
140 walk => MOVE_WALK,
141 fly_low => MOVE_FLY_LOW,
142 fly_high => MOVE_FLY_HIGH,
143 flying => MOVE_FLYING,
144 swim => MOVE_SWIM,
145 boat => MOVE_BOAT,
146 ship => MOVE_SHIP,
147 all => MOVE_ALL,
148);
149
150our @MOVE_TYPE = keys %MOVE_TYPE;
151
152{
153 package Crossfire::MoveType;
154
155 use overload
156 '=' => sub { bless [@{$_[0]}], ref $_[0] },
157 '""' => \&as_string,
158 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
159 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
160 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
161 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
162 'x=' => sub {
163 my $cur = $_[0] >= $_[1];
164 if (!defined $cur) {
165 if ($_[0] >= "all") {
166 $_[0] -= $_[1];
167 } else {
168 $_[0] += $_[1];
169 }
170 } elsif ($cur) {
171 $_[0] -= $_[1];
172 } else {
173 $_[0] /= $_[1];
174 }
175
176 $_[0]
177 },
178 'eq' => sub { "$_[0]" eq "$_[1]" },
179 'ne' => sub { "$_[0]" ne "$_[1]" },
180 ;
181}
182
183sub Crossfire::MoveType::new {
184 my ($class, $string) = @_;
185
186 my $mask;
187 my $value;
188
189 if ($string =~ /^\s*\d+\s*$/) {
190 $mask = MOVE_ALL;
191 $value = $string+0;
192 } else {
193 for (split /\s+/, lc $string) {
194 if (s/^-//) {
195 $mask |= $MOVE_TYPE{$_};
196 $value &= ~$MOVE_TYPE{$_};
197 } else {
198 $mask |= $MOVE_TYPE{$_};
199 $value |= $MOVE_TYPE{$_};
200 }
201 }
202 }
203
204 (bless [$mask, $value], $class)->normalise
205}
206
207sub Crossfire::MoveType::normalise {
208 my ($self) = @_;
209
210 if ($self->[0] & MOVE_ALL) {
211 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
212 $self->[0] &= $mask;
213 $self->[1] &= $mask;
214 }
215
216 $self->[1] &= $self->[0];
217
218 $self
219}
220
221sub Crossfire::MoveType::as_string {
222 my ($self) = @_;
223
224 my @res;
225
226 my ($mask, $value) = @$self;
227
228 for (@Crossfire::MOVE_TYPE) {
229 my $bit = $Crossfire::MOVE_TYPE{$_};
230 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
231 $mask &= ~$bit;
232 push @res, $value & $bit ? $_ : "-$_";
233 }
234 }
235
236 join " ", @res
237}
131 238
132sub load_ref($) { 239sub load_ref($) {
133 my ($path) = @_; 240 my ($path) = @_;
134 241
135 open my $fh, "<:raw:perlio", $path 242 open my $fh, "<:raw:perlio", $path
… …
148 close $fh; 255 close $fh;
149 rename "$path~", $path 256 rename "$path~", $path
150 or die "$path: $!"; 257 or die "$path: $!";
151} 258}
152 259
260my %attack_mask = (
261 physical => 0x00000001,
262 magic => 0x00000002,
263 fire => 0x00000004,
264 electricity => 0x00000008,
265 cold => 0x00000010,
266 confusion => 0x00000020,
267 acid => 0x00000040,
268 drain => 0x00000080,
269 weaponmagic => 0x00000100,
270 ghosthit => 0x00000200,
271 poison => 0x00000400,
272 slow => 0x00000800,
273 paralyze => 0x00001000,
274 turn_undead => 0x00002000,
275 fear => 0x00004000,
276 cancellation => 0x00008000,
277 deplete => 0x00010000,
278 death => 0x00020000,
279 chaos => 0x00040000,
280 counterspell => 0x00080000,
281 godpower => 0x00100000,
282 holyword => 0x00200000,
283 blind => 0x00400000,
284 internal => 0x00800000,
285 life_stealing => 0x01000000,
286 disease => 0x02000000,
287);
288
289sub _add_resist($$$) {
290 my ($ob, $mask, $value) = @_;
291
292 while (my ($k, $v) = each %attack_mask) {
293 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
294 }
295}
296
297my %MATERIAL = reverse
298 paper => 1,
299 iron => 2,
300 glass => 4,
301 leather => 8,
302 wood => 16,
303 organic => 32,
304 stone => 64,
305 cloth => 128,
306 adamant => 256,
307 liquid => 512,
308 tin => 1024,
309 bone => 2048,
310 ice => 4096,
311
312 # guesses
313 runestone => 12,
314 bronze => 18,
315 "ancient wood" => 20,
316 glass => 36,
317 marble => 66,
318 ice => 68,
319 stone => 70,
320 stone => 80,
321 cloth => 136,
322 ironwood => 144,
323 adamantium => 258,
324 glacium => 260,
325 blood => 544,
326;
327
153# object as in "Object xxx", i.e. archetypes 328# object as in "Object xxx", i.e. archetypes
154sub normalize_object($) { 329sub normalize_object($) {
155 my ($ob) = @_; 330 my ($ob) = @_;
156 331
332 # convert material bitset to materialname, if possible
333 if (exists $ob->{material}) {
334 if (!$ob->{material}) {
335 delete $ob->{material};
336 } elsif (exists $ob->{materialname}) {
337 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
338 delete $ob->{material};
339 } else {
340 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
341 delete $ob->{material}; # assume materilname is more specific and nuke material
342 }
343 } elsif (my $name = $MATERIAL{$ob->{material}}) {
344 delete $ob->{material};
345 $ob->{materialname} = $name;
346 } else {
347 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
348 }
349 }
350
351 # color_fg is used as default for magicmap if magicmap does not exist
352 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
353
157 # nuke outdated or never supported fields 354 # nuke outdated or never supported fields
158 delete $ob->{$_} for qw( 355 delete @$ob{qw(
159 can_knockback can_parry can_impale can_cut can_dam_armour 356 can_knockback can_parry can_impale can_cut can_dam_armour
160 can_apply pass_thru can_pass_thru 357 can_apply pass_thru can_pass_thru color_bg color_fg
161 ); 358 )};
359
360 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
361 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
362 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
162 363
163 # convert movement strings to bitsets 364 # convert movement strings to bitsets
164 for my $attr (keys %FIELD_MOVEMENT) { 365 for my $attr (keys %FIELD_MOVEMENT) {
165 next unless exists $ob->{$attr}; 366 next unless exists $ob->{$attr};
166 367
167 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 368 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr};
168
169 next if $ob->{$attr} =~ /^\d+$/;
170
171 my $flags = 0;
172
173 # assume list
174 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
175 $flags |= MOVE_WALK if $flag eq "walk";
176 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
177 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
178 $flags |= MOVE_FLYING if $flag eq "flying";
179 $flags |= MOVE_SWIM if $flag eq "swim";
180 $flags |= MOVE_BOAT if $flag eq "boat";
181 $flags |= MOVE_ALL if $flag eq "all";
182
183 $flags &= ~MOVE_WALK if $flag eq "-walk";
184 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
185 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
186 $flags &= ~MOVE_FLYING if $flag eq "-flying";
187 $flags &= ~MOVE_SWIM if $flag eq "-swim";
188 $flags &= ~MOVE_BOAT if $flag eq "-boat";
189 $flags &= ~MOVE_ALL if $flag eq "-all";
190 }
191
192 $ob->{$attr} = $flags;
193 } 369 }
194 370
195 # convert outdated movement flags to new movement sets 371 # convert outdated movement flags to new movement sets
196 if (defined (my $v = delete $ob->{no_pass})) { 372 if (defined (my $v = delete $ob->{no_pass})) {
197 $ob->{move_block} = $v ? MOVE_ALL : 0; 373 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
198 } 374 }
199 if (defined (my $v = delete $ob->{slow_move})) { 375 if (defined (my $v = delete $ob->{slow_move})) {
200 $ob->{move_slow} |= MOVE_WALK; 376 $ob->{move_slow} += "walk";
201 $ob->{move_slow_penalty} = $v; 377 $ob->{move_slow_penalty} = $v;
202 } 378 }
203 if (defined (my $v = delete $ob->{walk_on})) { 379 if (defined (my $v = delete $ob->{walk_on})) {
204 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 380 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
205 : $ob->{move_on} & ~MOVE_WALK;
206 } 381 }
207 if (defined (my $v = delete $ob->{walk_off})) { 382 if (defined (my $v = delete $ob->{walk_off})) {
208 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 383 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
209 : $ob->{move_off} & ~MOVE_WALK;
210 } 384 }
211 if (defined (my $v = delete $ob->{fly_on})) { 385 if (defined (my $v = delete $ob->{fly_on})) {
212 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 386 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
213 : $ob->{move_on} & ~MOVE_FLY_LOW;
214 } 387 }
215 if (defined (my $v = delete $ob->{fly_off})) { 388 if (defined (my $v = delete $ob->{fly_off})) {
216 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 389 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
217 : $ob->{move_off} & ~MOVE_FLY_LOW;
218 } 390 }
219 if (defined (my $v = delete $ob->{flying})) { 391 if (defined (my $v = delete $ob->{flying})) {
220 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 392 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
221 : $ob->{move_type} & ~MOVE_FLY_LOW;
222 } 393 }
223 394
224 # convert idiotic event_xxx things into objects 395 # convert idiotic event_xxx things into objects
225 while (my ($event, $subtype) = each %EVENT_TYPE) { 396 while (my ($event, $subtype) = each %EVENT_TYPE) {
226 if (exists $ob->{"event_${event}_plugin"}) { 397 if (exists $ob->{"event_${event}_plugin"}) {
… …
230 slaying => delete $ob->{"event_${event}"}, 401 slaying => delete $ob->{"event_${event}"},
231 name => delete $ob->{"event_${event}_options"}, 402 name => delete $ob->{"event_${event}_options"},
232 }; 403 };
233 } 404 }
234 } 405 }
406
407 # some archetypes had "+3" instead of the canonical "3", so fix
408 $ob->{dam} *= 1 if exists $ob->{dam};
235 409
236 $ob 410 $ob
237} 411}
238 412
239# arch as in "arch xxx", ie.. objects 413# arch as in "arch xxx", ie.. objects
… …
281 } 455 }
282 456
283 $ob 457 $ob
284} 458}
285 459
460sub attr_thaw($) {
461 my ($ob) = @_;
462
463 $ob->{attach} = from_json $ob->{attach}
464 if exists $ob->{attach};
465
466 $ob
467}
468
469sub attr_freeze($) {
470 my ($ob) = @_;
471
472 $ob->{attach} = Crossfire::to_json $ob->{attach}
473 if exists $ob->{attach};
474
475 $ob
476}
477
286sub read_pak($) { 478sub read_pak($) {
287 my ($path) = @_; 479 my ($path) = @_;
288 480
289 my %pak; 481 my %pak;
290 482
… …
303sub read_arch($;$) { 495sub read_arch($;$) {
304 my ($path, $toplevel) = @_; 496 my ($path, $toplevel) = @_;
305 497
306 my %arc; 498 my %arc;
307 my ($more, $prev); 499 my ($more, $prev);
500 my $comment;
308 501
309 open my $fh, "<:raw:perlio:utf8", $path 502 open my $fh, "<:raw:perlio:utf8", $path
310 or Carp::croak "$path: $!"; 503 or Carp::croak "$path: $!";
311 504
312 binmode $fh; 505# binmode $fh;
313 506
314 my $parse_block; $parse_block = sub { 507 my $parse_block; $parse_block = sub {
315 my %arc = @_; 508 my %arc = @_;
316 509
317 while (<$fh>) { 510 while (<$fh>) {
318 s/\s+$//; 511 s/\s+$//;
319 if (/^end$/i) { 512 if (/^end$/i) {
320 last; 513 last;
514
321 } elsif (/^arch (\S+)$/i) { 515 } elsif (/^arch (\S+)$/i) {
322 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 516 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
517
323 } elsif (/^lore$/i) { 518 } elsif (/^lore$/i) {
324 while (<$fh>) { 519 while (<$fh>) {
325 last if /^endlore\s*$/i; 520 last if /^endlore\s*$/i;
326 $arc{lore} .= $_; 521 $arc{lore} .= $_;
327 } 522 }
… …
336 chomp; 531 chomp;
337 push @{ $arc{anim} }, $_; 532 push @{ $arc{anim} }, $_;
338 } 533 }
339 } elsif (/^(\S+)\s*(.*)$/) { 534 } elsif (/^(\S+)\s*(.*)$/) {
340 $arc{lc $1} = $2; 535 $arc{lc $1} = $2;
341 } elsif (/^\s*($|#)/) { 536 } elsif (/^\s*#/) {
537 $arc{_comment} .= "$_\n";
538
539 } elsif (/^\s*$/) {
342 # 540 #
343 } else { 541 } else {
344 warn "$path: unparsable line '$_' in arch $arc{_name}"; 542 warn "$path: unparsable line '$_' in arch $arc{_name}";
345 } 543 }
346 } 544 }
… …
352 s/\s+$//; 550 s/\s+$//;
353 if (/^more$/i) { 551 if (/^more$/i) {
354 $more = $prev; 552 $more = $prev;
355 } elsif (/^object (\S+)$/i) { 553 } elsif (/^object (\S+)$/i) {
356 my $name = $1; 554 my $name = $1;
357 my $arc = normalize_object $parse_block->(_name => $name); 555 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
556 undef $comment;
557 delete $arc{_comment} unless length $arc{_comment};
558 $arc->{_atype} = 'object';
358 559
359 if ($more) { 560 if ($more) {
360 $more->{more} = $arc; 561 $more->{more} = $arc;
361 } else { 562 } else {
362 $arc{$name} = $arc; 563 $arc{$name} = $arc;
363 } 564 }
364 $prev = $arc; 565 $prev = $arc;
365 $more = undef; 566 $more = undef;
366 } elsif (/^arch (\S+)$/i) { 567 } elsif (/^arch (\S+)$/i) {
367 my $name = $1; 568 my $name = $1;
368 my $arc = normalize_arch $parse_block->(_name => $name); 569 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
570 undef $comment;
571 delete $arc{_comment} unless length $arc{_comment};
572 $arc->{_atype} = 'arch';
369 573
370 if ($more) { 574 if ($more) {
371 $more->{more} = $arc; 575 $more->{more} = $arc;
372 } else { 576 } else {
373 push @{ $arc{arch} }, $arc; 577 push @{ $arc{arch} }, $arc;
… …
381 push @{$toplevel->{lev_array}}, $_+0; 585 push @{$toplevel->{lev_array}}, $_+0;
382 } 586 }
383 } else { 587 } else {
384 $toplevel->{$1} = $2; 588 $toplevel->{$1} = $2;
385 } 589 }
590 } elsif (/^\s*#/) {
591 $comment .= "$_\n";
386 } elsif (/^\s*($|#)/) { 592 } elsif (/^\s*($|#)/) {
387 # 593 #
388 } else { 594 } else {
389 die "$path: unparseable top-level line '$_'"; 595 die "$path: unparseable top-level line '$_'";
390 } 596 }
391 } 597 }
392 598
393 undef $parse_block; # work around bug in perl not freeing $fh etc. 599 undef $parse_block; # work around bug in perl not freeing $fh etc.
394 600
395 \%arc 601 \%arc
602}
603
604sub archlist_to_string {
605 my ($arch) = @_;
606
607 my $str;
608
609 my $append; $append = sub {
610 my %a = %{$_[0]};
611
612 Crossfire::attr_freeze \%a;
613 Crossfire::normalize_arch \%a;
614
615 # undo the bit-split we did before
616 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
617 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
618 | (delete $a{attack_movement_bits_4_7});
619 }
620
621 if (my $comment = delete $a{_comment}) {
622 if ($comment =~ /[^\n\s#]/) {
623 $str .= $comment;
624 }
625 }
626
627 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
628
629 my $inv = delete $a{inventory};
630 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
631 my $anim = delete $a{anim};
632
633 if ($a{_atype} eq 'object') {
634 $str .= join "\n", "anim", @$anim, "mina\n"
635 if $anim;
636 }
637
638 my @kv;
639
640 for ($a{_name} eq "map"
641 ? @Crossfire::FIELD_ORDER_MAP
642 : @Crossfire::FIELD_ORDER) {
643 push @kv, [$_, delete $a{$_}]
644 if exists $a{$_};
645 }
646
647 for (sort keys %a) {
648 next if /^_/; # ignore our _-keys
649 push @kv, [$_, delete $a{$_}];
650 }
651
652 for (@kv) {
653 my ($k, $v) = @$_;
654
655 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
656 $v =~ s/\n$//;
657 $str .= "$k\n$v\n$end\n";
658 } else {
659 $str .= "$k $v\n";
660 }
661 }
662
663 if ($inv) {
664 $append->($_) for @$inv;
665 }
666
667 $str .= "end\n";
668
669 if ($a{_atype} eq 'object') {
670 if ($more) {
671 $str .= "more\n";
672 $append->($more) if $more;
673 } else {
674 $str .= "\n";
675 }
676 }
677 };
678
679 for (@$arch) {
680 $append->($_);
681 }
682
683 $str
396} 684}
397 685
398# put all archs into a hash with editor_face as it's key 686# put all archs into a hash with editor_face as it's key
399# NOTE: the arrays in the hash values are references to 687# NOTE: the arrays in the hash values are references to
400# the archs from $ARCH 688# the archs from $ARCH
… …
421 my ($a) = @_; 709 my ($a) = @_;
422 710
423 my $o = $ARCH{$a->{_name}} 711 my $o = $ARCH{$a->{_name}}
424 or return; 712 or return;
425 713
426 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 714 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
715 unless ($face) {
716 $face = $FACE{"blank.x11"}
427 or (warn "no face data found for arch '$a->{_name}'"), return; 717 or (warn "no face data found for arch '$a->{_name}'"), return;
718 }
428 719
429 if ($face->{w} > 1 || $face->{h} > 1) { 720 if ($face->{w} > 1 || $face->{h} > 1) {
430 # bigface 721 # bigface
431 return (0, 0, $face->{w} - 1, $face->{h} - 1); 722 return (0, 0, $face->{w} - 1, $face->{h} - 1);
432 723
… …
539 ]; 830 ];
540 831
541 $attr 832 $attr
542} 833}
543 834
544sub arch_edit_sections {
545# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
546# edit_type = 0;
547# else if (edit_type != 0) {
548# // all flags from 'check_type' must be unset in this arch because they get recalculated now
549# edit_type &= ~check_type;
550# }
551#
552# }
553# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
554# getAttributeValue("alive", defarch) == 1 &&
555# (getAttributeValue("monster", defarch) == 1 ||
556# getAttributeValue("generator", defarch) == 1)) {
557# // Monster: monsters/npcs/generators
558# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
559# }
560# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
561# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
562# // Walls
563# edit_type |= IGUIConstants.TILE_EDIT_WALL;
564# }
565# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
566# getAttributeValue("connected", defarch) != 0) {
567# // Connected Objects
568# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
569# }
570# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
571# arch_type == 66 || arch_type == 41 || arch_type == 95) {
572# // Exit: teleporter/exit/trapdoors
573# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
574# }
575# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
576# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
577# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
578# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
579# arch_type == 124 || arch_type == 130)) {
580# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
581# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
582# }
583# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
584# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
585# arch_type == 91 || arch_type == 21 || arch_type == 24) {
586# // Door: door/special door/gates + keys
587# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
588# }
589# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
590# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
591# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
592# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
593# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
594# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
595# arch_type == 122 || arch_type == 3)) {
596# // Equipment: weapons/armour/wands/rods
597# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
598# }
599#
600# return(edit_type);
601#
602#
603}
604
605sub cache_file($$&&) { 835sub cache_file($$&&) {
606 my ($src, $cache, $load, $create) = @_; 836 my ($src, $cache, $load, $create) = @_;
607 837
608 my ($size, $mtime) = (stat $src)[7,9] 838 my ($size, $mtime) = (stat $src)[7,9]
609 or Carp::croak "$src: $!"; 839 or Carp::croak "$src: $!";
… …
657 }, sub { 887 }, sub {
658 read_arch "$LIB/archetypes" 888 read_arch "$LIB/archetypes"
659 }; 889 };
660} 890}
661 891
892sub construct_tilecache_pb {
893 my ($idx, $cache) = @_;
894
895 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
896
897 while (my ($name, $tile) = each %$cache) {
898 my $tpb = delete $tile->{pb};
899 my $ofs = $tile->{idx};
900
901 for my $x (0 .. $tile->{w} - 1) {
902 for my $y (0 .. $tile->{h} - 1) {
903 my $idx = $ofs + $x + $y * $tile->{w};
904 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
905 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
906 }
907 }
908 }
909
910 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
911
912 $cache
913}
914
915sub use_tilecache {
916 my ($face) = @_;
917 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
918 or die "$VARDIR/tilecache.png: $!";
919 *FACE = $_[0];
920}
921
662=item load_tilecache 922=item load_tilecache
663 923
664(Re-)Load %TILE and %FACE. 924(Re-)Load %TILE and %FACE.
665 925
666=cut 926=cut
667 927
668sub load_tilecache() { 928sub load_tilecache() {
669 require Gtk2; 929 require Gtk2;
670 930
931 if (-e "$LIB/crossfire.0") { # Crossfire1 version
671 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 932 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
672 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 933 sub {
673 or die "$VARDIR/tilecache.png: $!";
674 *FACE = $_[0];
675 }, sub {
676 my $tile = read_pak "$LIB/crossfire.0"; 934 my $tile = read_pak "$LIB/crossfire.0";
677 935
678 my %cache; 936 my %cache;
679 937
680 my $idx = 0; 938 my $idx = 0;
681 939
682 for my $name (sort keys %$tile) { 940 for my $name (sort keys %$tile) {
683 my $pb = new Gtk2::Gdk::PixbufLoader; 941 my $pb = new Gtk2::Gdk::PixbufLoader;
684 $pb->write ($tile->{$name}); 942 $pb->write ($tile->{$name});
685 $pb->close; 943 $pb->close;
686 my $pb = $pb->get_pixbuf; 944 my $pb = $pb->get_pixbuf;
687 945
688 my $tile = $cache{$name} = { 946 my $tile = $cache{$name} = {
689 pb => $pb, 947 pb => $pb,
690 idx => $idx, 948 idx => $idx,
691 w => int $pb->get_width / TILESIZE, 949 w => int $pb->get_width / TILESIZE,
692 h => int $pb->get_height / TILESIZE, 950 h => int $pb->get_height / TILESIZE,
951 };
952
953 $idx += $tile->{w} * $tile->{h};
954 }
955
956 construct_tilecache_pb $idx, \%cache;
957
958 \%cache
693 }; 959 };
960
961 } else { # Crossfire+ version
962 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
963 sub {
964 my %cache;
965 my $facedata = Storable::retrieve "$LIB/facedata";
966
967 $facedata->{version} == 2
968 or die "$LIB/facedata: version mismatch, cannot proceed.";
969
970 my $faces = $facedata->{faceinfo};
971 my $idx = 0;
972
973 for (sort keys %$faces) {
974 my ($face, $info) = ($_, $faces->{$_});
975
976 my $pb = new Gtk2::Gdk::PixbufLoader;
977 $pb->write ($info->{data32});
978 $pb->close;
979 my $pb = $pb->get_pixbuf;
980
981 my $tile = $cache{$face} = {
982 pb => $pb,
983 idx => $idx,
984 w => int $pb->get_width / TILESIZE,
985 h => int $pb->get_height / TILESIZE,
694 986 };
695 987
696 $idx += $tile->{w} * $tile->{h}; 988 $idx += $tile->{w} * $tile->{h};
697 }
698
699 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
700
701 while (my ($name, $tile) = each %cache) {
702 my $tpb = delete $tile->{pb};
703 my $ofs = $tile->{idx};
704
705 for my $x (0 .. $tile->{w} - 1) {
706 for my $y (0 .. $tile->{h} - 1) {
707 my $idx = $ofs + $x + $y * $tile->{w};
708 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
709 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
710 } 989 }
990
991 construct_tilecache_pb $idx, \%cache;
992
993 \%cache
711 } 994 };
712 }
713
714 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
715
716 \%cache
717 }; 995 }
718} 996}
719 997
720=head1 AUTHOR 998=head1 AUTHOR
721 999
722 Marc Lehmann <schmorp@schmorp.de> 1000 Marc Lehmann <schmorp@schmorp.de>

Diff Legend

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