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.71 by elmex, Thu Aug 31 21:09:32 2006 UTC vs.
Revision 1.105 by root, Tue Apr 17 18:50:41 2007 UTC

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

Diff Legend

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