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.74 by root, Wed Sep 20 15:38:21 2006 UTC vs.
Revision 1.111 by elmex, Thu Jun 7 14:45:22 2007 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.91'; 9our $VERSION = '0.99';
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
… …
88 resist_life_stealing resist_disease 83 resist_life_stealing resist_disease
89 84
90 path_attuned path_repelled path_denied material materialname 85 path_attuned path_repelled path_denied material materialname
91 value carrying weight invisible state magic 86 value carrying weight invisible state magic
92 last_heal last_sp last_grace last_eat 87 last_heal last_sp last_grace last_eat
93 connected glow_radius randomitems npx_status npc_program 88 connected glow_radius randomitems tresure_env npx_status npc_program
94 run_away pick_up container will_apply smoothlevel 89 run_away pick_up container will_apply smoothlevel
95 current_weapon_script weapontype tooltype elevation client_type 90 current_weapon_script weapontype tooltype elevation client_type
96 item_power duration range 91 item_power duration range
97 range_modifier duration_modifier dam_modifier gen_sp_armour 92 range_modifier duration_modifier dam_modifier gen_sp_armour
98 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty 93 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
… …
109 known_magical known_cursed can_use_skill been_applied has_ready_scroll 104 known_magical known_cursed can_use_skill been_applied has_ready_scroll
110 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly 105 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
111 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark 106 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
112 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage 107 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
113 activate_on_push activate_on_release is_water use_content_on_gen is_buildable 108 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
109 precious
114 110
115 body_range body_arm body_torso body_head body_neck body_skill 111 body_range body_arm body_torso body_head body_neck body_skill
116 body_finger body_shoulder body_foot body_hand body_wrist body_waist 112 body_finger body_shoulder body_foot body_hand body_wrist body_waist
117)); 113));
118 114
… …
135sub MOVE_FLY_LOW (){ 0x02 } 131sub MOVE_FLY_LOW (){ 0x02 }
136sub MOVE_FLY_HIGH (){ 0x04 } 132sub MOVE_FLY_HIGH (){ 0x04 }
137sub MOVE_FLYING (){ 0x06 } 133sub MOVE_FLYING (){ 0x06 }
138sub MOVE_SWIM (){ 0x08 } 134sub MOVE_SWIM (){ 0x08 }
139sub MOVE_BOAT (){ 0x10 } 135sub MOVE_BOAT (){ 0x10 }
136sub MOVE_SHIP (){ 0x20 }
140sub MOVE_KNOWN (){ 0x1f } # all of above 137sub MOVE_KNOWN (){ 0x3f } # all of above
141sub MOVE_ALLBIT (){ 0x10000 }
142sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 138sub MOVE_ALL (){ 0x10000 } # very special value
139
140our %MOVE_TYPE = (
141 walk => MOVE_WALK,
142 fly_low => MOVE_FLY_LOW,
143 fly_high => MOVE_FLY_HIGH,
144 flying => MOVE_FLYING,
145 swim => MOVE_SWIM,
146 boat => MOVE_BOAT,
147 ship => MOVE_SHIP,
148 all => MOVE_ALL,
149);
150
151our @MOVE_TYPE = keys %MOVE_TYPE;
152
153{
154 package Crossfire::MoveType;
155
156 use overload
157 '=' => sub { bless [@{$_[0]}], ref $_[0] },
158 '""' => \&as_string,
159 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
160 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
161 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
162 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
163 'x=' => sub {
164 my $cur = $_[0] >= $_[1];
165 if (!defined $cur) {
166 if ($_[0] >= "all") {
167 $_[0] -= $_[1];
168 } else {
169 $_[0] += $_[1];
170 }
171 } elsif ($cur) {
172 $_[0] -= $_[1];
173 } else {
174 $_[0] /= $_[1];
175 }
176
177 $_[0]
178 },
179 'eq' => sub { "$_[0]" eq "$_[1]" },
180 'ne' => sub { "$_[0]" ne "$_[1]" },
181 ;
182}
183
184sub Crossfire::MoveType::new {
185 my ($class, $string) = @_;
186
187 my $mask;
188 my $value;
189
190 if ($string =~ /^\s*\d+\s*$/) {
191 $mask = MOVE_ALL;
192 $value = $string+0;
193 } else {
194 for (split /\s+/, lc $string) {
195 if (s/^-//) {
196 $mask |= $MOVE_TYPE{$_};
197 $value &= ~$MOVE_TYPE{$_};
198 } else {
199 $mask |= $MOVE_TYPE{$_};
200 $value |= $MOVE_TYPE{$_};
201 }
202 }
203 }
204
205 (bless [$mask, $value], $class)->normalise
206}
207
208sub Crossfire::MoveType::normalise {
209 my ($self) = @_;
210
211 if ($self->[0] & MOVE_ALL) {
212 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
213 $self->[0] &= $mask;
214 $self->[1] &= $mask;
215 }
216
217 $self->[1] &= $self->[0];
218
219 $self
220}
221
222sub Crossfire::MoveType::as_string {
223 my ($self) = @_;
224
225 my @res;
226
227 my ($mask, $value) = @$self;
228
229 for (@Crossfire::MOVE_TYPE) {
230 my $bit = $Crossfire::MOVE_TYPE{$_};
231 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
232 $mask &= ~$bit;
233 push @res, $value & $bit ? $_ : "-$_";
234 }
235 }
236
237 join " ", @res
238}
143 239
144sub load_ref($) { 240sub load_ref($) {
145 my ($path) = @_; 241 my ($path) = @_;
146 242
147 open my $fh, "<:raw:perlio", $path 243 open my $fh, "<:raw:perlio", $path
… …
197 while (my ($k, $v) = each %attack_mask) { 293 while (my ($k, $v) = each %attack_mask) {
198 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v; 294 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
199 } 295 }
200} 296}
201 297
298my %MATERIAL = reverse
299 paper => 1,
300 iron => 2,
301 glass => 4,
302 leather => 8,
303 wood => 16,
304 organic => 32,
305 stone => 64,
306 cloth => 128,
307 adamant => 256,
308 liquid => 512,
309 tin => 1024,
310 bone => 2048,
311 ice => 4096,
312
313 # guesses
314 runestone => 12,
315 bronze => 18,
316 "ancient wood" => 20,
317 glass => 36,
318 marble => 66,
319 ice => 68,
320 stone => 70,
321 stone => 80,
322 cloth => 136,
323 ironwood => 144,
324 adamantium => 258,
325 glacium => 260,
326 blood => 544,
327;
328
202# object as in "Object xxx", i.e. archetypes 329# object as in "Object xxx", i.e. archetypes
203sub normalize_object($) { 330sub normalize_object($) {
204 my ($ob) = @_; 331 my ($ob) = @_;
205 332
333 # convert material bitset to materialname, if possible
334 if (exists $ob->{material}) {
335 if (!$ob->{material}) {
336 delete $ob->{material};
337 } elsif (exists $ob->{materialname}) {
338 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
339 delete $ob->{material};
340 } else {
341 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
342 delete $ob->{material}; # assume materilname is more specific and nuke material
343 }
344 } elsif (my $name = $MATERIAL{$ob->{material}}) {
345 delete $ob->{material};
346 $ob->{materialname} = $name;
347 } else {
348 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
349 }
350 }
351
352 # check whether attachment is the same as in the archetype
353 if (exists $ob->{attach}) {
354 my $arch = $ARCH{$ob->{_name}};
355 my $js = JSON::XS->new->utf8->canonical (1);
356
357 if (defined $arch->{attach}
358 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
359 delete $ob->{attach}
360 }
361 }
362
363 # color_fg is used as default for magicmap if magicmap does not exist
364 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
365
206 # nuke outdated or never supported fields 366 # nuke outdated or never supported fields
207 delete @$ob{qw( 367 delete @$ob{qw(
208 can_knockback can_parry can_impale can_cut can_dam_armour 368 can_knockback can_parry can_impale can_cut can_dam_armour
209 can_apply pass_thru can_pass_thru 369 can_apply pass_thru can_pass_thru color_bg color_fg
210 )}; 370 )};
211 371
212 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 372 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
213 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 373 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
214 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 374 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
215 375
216 # convert movement strings to bitsets 376 # convert movement strings to bitsets
217 for my $attr (keys %FIELD_MOVEMENT) { 377 for my $attr (keys %FIELD_MOVEMENT) {
218 next unless exists $ob->{$attr}; 378 next unless exists $ob->{$attr};
219 379
220 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 380 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr};
221
222 next if $ob->{$attr} =~ /^\d+$/;
223
224 my $flags = 0;
225
226 # assume list
227 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
228 $flags |= MOVE_WALK if $flag eq "walk";
229 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
230 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
231 $flags |= MOVE_FLYING if $flag eq "flying";
232 $flags |= MOVE_SWIM if $flag eq "swim";
233 $flags |= MOVE_BOAT if $flag eq "boat";
234 $flags |= MOVE_ALL if $flag eq "all";
235
236 $flags &= ~MOVE_WALK if $flag eq "-walk";
237 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
238 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
239 $flags &= ~MOVE_FLYING if $flag eq "-flying";
240 $flags &= ~MOVE_SWIM if $flag eq "-swim";
241 $flags &= ~MOVE_BOAT if $flag eq "-boat";
242 $flags &= ~MOVE_ALL if $flag eq "-all";
243 }
244
245 $ob->{$attr} = $flags;
246 } 381 }
247 382
248 # convert outdated movement flags to new movement sets 383 # convert outdated movement flags to new movement sets
249 if (defined (my $v = delete $ob->{no_pass})) { 384 if (defined (my $v = delete $ob->{no_pass})) {
250 $ob->{move_block} = $v ? MOVE_ALL : 0; 385 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
251 } 386 }
252 if (defined (my $v = delete $ob->{slow_move})) { 387 if (defined (my $v = delete $ob->{slow_move})) {
253 $ob->{move_slow} |= MOVE_WALK; 388 $ob->{move_slow} += "walk";
254 $ob->{move_slow_penalty} = $v; 389 $ob->{move_slow_penalty} = $v;
255 } 390 }
256 if (defined (my $v = delete $ob->{walk_on})) { 391 if (defined (my $v = delete $ob->{walk_on})) {
257 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 392 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
258 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
259 : $ob->{move_on} & ~MOVE_WALK;
260 } 393 }
261 if (defined (my $v = delete $ob->{walk_off})) { 394 if (defined (my $v = delete $ob->{walk_off})) {
262 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 395 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
263 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
264 : $ob->{move_off} & ~MOVE_WALK;
265 } 396 }
266 if (defined (my $v = delete $ob->{fly_on})) { 397 if (defined (my $v = delete $ob->{fly_on})) {
267 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 398 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
268 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
269 : $ob->{move_on} & ~MOVE_FLY_LOW;
270 } 399 }
271 if (defined (my $v = delete $ob->{fly_off})) { 400 if (defined (my $v = delete $ob->{fly_off})) {
272 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 401 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
273 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
274 : $ob->{move_off} & ~MOVE_FLY_LOW;
275 } 402 }
276 if (defined (my $v = delete $ob->{flying})) { 403 if (defined (my $v = delete $ob->{flying})) {
277 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 404 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
278 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
279 : $ob->{move_type} & ~MOVE_FLY_LOW;
280 } 405 }
281 406
282 # convert idiotic event_xxx things into objects 407 # convert idiotic event_xxx things into objects
283 while (my ($event, $subtype) = each %EVENT_TYPE) { 408 while (my ($event, $subtype) = each %EVENT_TYPE) {
284 if (exists $ob->{"event_${event}_plugin"}) { 409 if (exists $ob->{"event_${event}_plugin"}) {
… …
382sub read_arch($;$) { 507sub read_arch($;$) {
383 my ($path, $toplevel) = @_; 508 my ($path, $toplevel) = @_;
384 509
385 my %arc; 510 my %arc;
386 my ($more, $prev); 511 my ($more, $prev);
512 my $comment;
387 513
388 open my $fh, "<:raw:perlio:utf8", $path 514 open my $fh, "<:raw:perlio:utf8", $path
389 or Carp::croak "$path: $!"; 515 or Carp::croak "$path: $!";
390 516
391# binmode $fh; 517# binmode $fh;
… …
395 521
396 while (<$fh>) { 522 while (<$fh>) {
397 s/\s+$//; 523 s/\s+$//;
398 if (/^end$/i) { 524 if (/^end$/i) {
399 last; 525 last;
526
400 } elsif (/^arch (\S+)$/i) { 527 } elsif (/^arch (\S+)$/i) {
401 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 528 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
529
402 } elsif (/^lore$/i) { 530 } elsif (/^lore$/i) {
403 while (<$fh>) { 531 while (<$fh>) {
404 last if /^endlore\s*$/i; 532 last if /^endlore\s*$/i;
405 $arc{lore} .= $_; 533 $arc{lore} .= $_;
406 } 534 }
… …
415 chomp; 543 chomp;
416 push @{ $arc{anim} }, $_; 544 push @{ $arc{anim} }, $_;
417 } 545 }
418 } elsif (/^(\S+)\s*(.*)$/) { 546 } elsif (/^(\S+)\s*(.*)$/) {
419 $arc{lc $1} = $2; 547 $arc{lc $1} = $2;
420 } elsif (/^\s*($|#)/) { 548 } elsif (/^\s*#/) {
549 $arc{_comment} .= "$_\n";
550
551 } elsif (/^\s*$/) {
421 # 552 #
422 } else { 553 } else {
423 warn "$path: unparsable line '$_' in arch $arc{_name}"; 554 warn "$path: unparsable line '$_' in arch $arc{_name}";
424 } 555 }
425 } 556 }
… …
431 s/\s+$//; 562 s/\s+$//;
432 if (/^more$/i) { 563 if (/^more$/i) {
433 $more = $prev; 564 $more = $prev;
434 } elsif (/^object (\S+)$/i) { 565 } elsif (/^object (\S+)$/i) {
435 my $name = $1; 566 my $name = $1;
436 my $arc = attr_thaw normalize_object $parse_block->(_name => $name); 567 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
568 undef $comment;
569 delete $arc{_comment} unless length $arc{_comment};
437 $arc->{_atype} = 'object'; 570 $arc->{_atype} = 'object';
438 571
439 if ($more) { 572 if ($more) {
440 $more->{more} = $arc; 573 $more->{more} = $arc;
441 } else { 574 } else {
… …
443 } 576 }
444 $prev = $arc; 577 $prev = $arc;
445 $more = undef; 578 $more = undef;
446 } elsif (/^arch (\S+)$/i) { 579 } elsif (/^arch (\S+)$/i) {
447 my $name = $1; 580 my $name = $1;
448 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 581 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
582 undef $comment;
583 delete $arc{_comment} unless length $arc{_comment};
449 $arc->{_atype} = 'arch'; 584 $arc->{_atype} = 'arch';
450 585
451 if ($more) { 586 if ($more) {
452 $more->{more} = $arc; 587 $more->{more} = $arc;
453 } else { 588 } else {
… …
462 push @{$toplevel->{lev_array}}, $_+0; 597 push @{$toplevel->{lev_array}}, $_+0;
463 } 598 }
464 } else { 599 } else {
465 $toplevel->{$1} = $2; 600 $toplevel->{$1} = $2;
466 } 601 }
602 } elsif (/^\s*#/) {
603 $comment .= "$_\n";
467 } elsif (/^\s*($|#)/) { 604 } elsif (/^\s*($|#)/) {
468 # 605 #
469 } else { 606 } else {
470 die "$path: unparseable top-level line '$_'"; 607 die "$path: unparseable top-level line '$_'";
471 } 608 }
… …
491 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 628 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
492 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 629 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
493 | (delete $a{attack_movement_bits_4_7}); 630 | (delete $a{attack_movement_bits_4_7});
494 } 631 }
495 632
633 if (my $comment = delete $a{_comment}) {
634 if ($comment =~ /[^\n\s#]/) {
635 $str .= $comment;
636 }
637 }
638
496 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 639 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
497 640
498 my $inv = delete $a{inventory}; 641 my $inv = delete $a{inventory};
499 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 642 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
500 my $anim = delete $a{anim}; 643 my $anim = delete $a{anim};
644
645 if ($a{_atype} eq 'object') {
646 $str .= join "\n", "anim", @$anim, "mina\n"
647 if $anim;
648 }
501 649
502 my @kv; 650 my @kv;
503 651
504 for ($a{_name} eq "map" 652 for ($a{_name} eq "map"
505 ? @Crossfire::FIELD_ORDER_MAP 653 ? @Crossfire::FIELD_ORDER_MAP
… …
517 my ($k, $v) = @$_; 665 my ($k, $v) = @$_;
518 666
519 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 667 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
520 $v =~ s/\n$//; 668 $v =~ s/\n$//;
521 $str .= "$k\n$v\n$end\n"; 669 $str .= "$k\n$v\n$end\n";
522 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
523 if ($v & ~Crossfire::MOVE_ALL or !$v) {
524 $str .= "$k $v\n";
525
526 } elsif ($v & Crossfire::MOVE_ALLBIT) {
527 $str .= "$k all";
528
529 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
530 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
531 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
532 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
533 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
534
535 $str .= "\n";
536
537 } else {
538 $str .= $k;
539
540 $str .= " walk" if $v & Crossfire::MOVE_WALK;
541 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
542 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
543 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
544 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
545
546 $str .= "\n";
547 }
548 } else { 670 } else {
549 $str .= "$k $v\n"; 671 $str .= "$k $v\n";
550 } 672 }
551 } 673 }
552 674
553 if ($inv) { 675 if ($inv) {
554 $append->($_) for @$inv; 676 $append->($_) for @$inv;
555 } 677 }
556 678
679 $str .= "end\n";
680
557 if ($a{_atype} eq 'object') { 681 if ($a{_atype} eq 'object') {
558 $str .= join "\n", "anim", @$anim, "mina\n" 682 if ($more) {
559 if $anim;
560 }
561
562 $str .= "end\n";
563
564 if (($a{_atype} eq 'object') && $more) {
565 $str .= "\nmore\n"; 683 $str .= "more\n";
566 $append->($more) if $more; 684 $append->($more) if $more;
685 } else {
686 $str .= "\n";
687 }
567 } 688 }
568 }; 689 };
569 690
570 for (@$arch) { 691 for (@$arch) {
571 $append->($_); 692 $append->($_);
… …
600 my ($a) = @_; 721 my ($a) = @_;
601 722
602 my $o = $ARCH{$a->{_name}} 723 my $o = $ARCH{$a->{_name}}
603 or return; 724 or return;
604 725
605 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 726 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
727 unless ($face) {
728 $face = $FACE{"blank.x11"}
606 or (warn "no face data found for arch '$a->{_name}'"), return; 729 or (warn "no face data found for arch '$a->{_name}'"), return;
730 }
607 731
608 if ($face->{w} > 1 || $face->{h} > 1) { 732 if ($face->{w} > 1 || $face->{h} > 1) {
609 # bigface 733 # bigface
610 return (0, 0, $face->{w} - 1, $face->{h} - 1); 734 return (0, 0, $face->{w} - 1, $face->{h} - 1);
611 735
… …
718 ]; 842 ];
719 843
720 $attr 844 $attr
721} 845}
722 846
723sub arch_edit_sections {
724# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
725# edit_type = 0;
726# else if (edit_type != 0) {
727# // all flags from 'check_type' must be unset in this arch because they get recalculated now
728# edit_type &= ~check_type;
729# }
730#
731# }
732# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
733# getAttributeValue("alive", defarch) == 1 &&
734# (getAttributeValue("monster", defarch) == 1 ||
735# getAttributeValue("generator", defarch) == 1)) {
736# // Monster: monsters/npcs/generators
737# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
738# }
739# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
740# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
741# // Walls
742# edit_type |= IGUIConstants.TILE_EDIT_WALL;
743# }
744# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
745# getAttributeValue("connected", defarch) != 0) {
746# // Connected Objects
747# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
748# }
749# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
750# arch_type == 66 || arch_type == 41 || arch_type == 95) {
751# // Exit: teleporter/exit/trapdoors
752# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
753# }
754# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
755# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
756# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
757# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
758# arch_type == 124 || arch_type == 130)) {
759# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
760# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
761# }
762# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
763# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
764# arch_type == 91 || arch_type == 21 || arch_type == 24) {
765# // Door: door/special door/gates + keys
766# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
767# }
768# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
769# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
770# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
771# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
772# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
773# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
774# arch_type == 122 || arch_type == 3)) {
775# // Equipment: weapons/armour/wands/rods
776# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
777# }
778#
779# return(edit_type);
780#
781#
782}
783
784sub cache_file($$&&) { 847sub cache_file($$&&) {
785 my ($src, $cache, $load, $create) = @_; 848 my ($src, $cache, $load, $create) = @_;
786 849
787 my ($size, $mtime) = (stat $src)[7,9] 850 my ($size, $mtime) = (stat $src)[7,9]
788 or Carp::croak "$src: $!"; 851 or Carp::croak "$src: $!";
… …
836 }, sub { 899 }, sub {
837 read_arch "$LIB/archetypes" 900 read_arch "$LIB/archetypes"
838 }; 901 };
839} 902}
840 903
904sub construct_tilecache_pb {
905 my ($idx, $cache) = @_;
906
907 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
908
909 while (my ($name, $tile) = each %$cache) {
910 my $tpb = delete $tile->{pb};
911 my $ofs = $tile->{idx};
912
913 for my $x (0 .. $tile->{w} - 1) {
914 for my $y (0 .. $tile->{h} - 1) {
915 my $idx = $ofs + $x + $y * $tile->{w};
916 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
917 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
918 }
919 }
920 }
921
922 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
923
924 $cache
925}
926
927sub use_tilecache {
928 my ($face) = @_;
929 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
930 or die "$VARDIR/tilecache.png: $!";
931 *FACE = $_[0];
932}
933
841=item load_tilecache 934=item load_tilecache
842 935
843(Re-)Load %TILE and %FACE. 936(Re-)Load %TILE and %FACE.
844 937
845=cut 938=cut
846 939
847sub load_tilecache() { 940sub load_tilecache() {
848 require Gtk2; 941 require Gtk2;
849 942
850 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 943 if (-e "$LIB/facedata") { # Crossfire TRT faces
851 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 944 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
852 or die "$VARDIR/tilecache.png: $!"; 945 sub {
853 *FACE = $_[0];
854 }, sub {
855 my $tile = read_pak "$LIB/crossfire.0";
856
857 my %cache; 946 my %cache;
947 my $facedata = Storable::retrieve "$LIB/facedata";
858 948
949 $facedata->{version} == 2
950 or die "$LIB/facedata: version mismatch, cannot proceed.";
951
952 my $faces = $facedata->{faceinfo};
859 my $idx = 0; 953 my $idx = 0;
860 954
861 for my $name (sort keys %$tile) { 955 for (sort keys %$faces) {
956 my ($face, $info) = ($_, $faces->{$_});
957
862 my $pb = new Gtk2::Gdk::PixbufLoader; 958 my $pb = new Gtk2::Gdk::PixbufLoader;
863 $pb->write ($tile->{$name}); 959 $pb->write ($info->{data32});
864 $pb->close; 960 $pb->close;
865 my $pb = $pb->get_pixbuf; 961 my $pb = $pb->get_pixbuf;
866 962
867 my $tile = $cache{$name} = { 963 my $tile = $cache{$face} = {
868 pb => $pb, 964 pb => $pb,
869 idx => $idx, 965 idx => $idx,
870 w => int $pb->get_width / TILESIZE, 966 w => int $pb->get_width / TILESIZE,
871 h => int $pb->get_height / TILESIZE, 967 h => int $pb->get_height / TILESIZE,
968 };
969
970 $idx += $tile->{w} * $tile->{h};
971 }
972
973 construct_tilecache_pb $idx, \%cache;
974
975 \%cache
872 }; 976 };
977
978 } elsif (-e "$LIB/crossfire.0") { # Crossfire1 version
979 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
980 sub {
981 my $tile = read_pak "$LIB/crossfire.0";
982
983 my %cache;
984
985 my $idx = 0;
986
987 for my $name (sort keys %$tile) {
988 my $pb = new Gtk2::Gdk::PixbufLoader;
989 $pb->write ($tile->{$name});
990 $pb->close;
991 my $pb = $pb->get_pixbuf;
992
993 my $tile = $cache{$name} = {
994 pb => $pb,
995 idx => $idx,
996 w => int $pb->get_width / TILESIZE,
997 h => int $pb->get_height / TILESIZE,
873 998 };
874 999
875 $idx += $tile->{w} * $tile->{h}; 1000 $idx += $tile->{w} * $tile->{h};
876 }
877
878 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
879
880 while (my ($name, $tile) = each %cache) {
881 my $tpb = delete $tile->{pb};
882 my $ofs = $tile->{idx};
883
884 for my $x (0 .. $tile->{w} - 1) {
885 for my $y (0 .. $tile->{h} - 1) {
886 my $idx = $ofs + $x + $y * $tile->{w};
887 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
888 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
889 } 1001 }
1002
1003 construct_tilecache_pb $idx, \%cache;
1004
1005 \%cache
890 } 1006 };
891 }
892 1007
893 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
894
895 \%cache
896 }; 1008 }
897} 1009}
898 1010
899=head1 AUTHOR 1011=head1 AUTHOR
900 1012
901 Marc Lehmann <schmorp@schmorp.de> 1013 Marc Lehmann <schmorp@schmorp.de>

Diff Legend

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