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.77 by root, Tue Nov 7 22:40:26 2006 UTC vs.
Revision 1.107 by root, Wed May 9 11:44:40 2007 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.95'; 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" 28our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 29 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
… …
58 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);
59 49
60# same as in server save routine, to (hopefully) be compatible 50# same as in server save routine, to (hopefully) be compatible
61# to the other editors. 51# to the other editors.
62our @FIELD_ORDER_MAP = (qw( 52our @FIELD_ORDER_MAP = (qw(
53 file_format_version
63 name attach swap_time reset_timeout fixed_resettime difficulty region 54 name attach swap_time reset_timeout fixed_resettime difficulty region
64 shopitems shopgreed shopmin shopmax shoprace 55 shopitems shopgreed shopmin shopmax shoprace
65 darkness width height enter_x enter_y msg maplore 56 darkness width height enter_x enter_y msg maplore
66 unique template 57 unique template
67 outdoor temp pressure humid windspeed winddir sky nosmooth 58 outdoor temp pressure humid windspeed winddir sky nosmooth
68 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
69)); 60));
70 61
71our @FIELD_ORDER = (qw( 62our @FIELD_ORDER = (qw(
63 inherit
64
72 elevation 65 elevation
73 66
74 name name_pl custom_name attach title race 67 name name_pl custom_name attach title race
75 slaying skill msg lore other_arch face 68 slaying skill msg lore other_arch
76 #todo-events
77 animation is_animated 69 face animation is_animated
70 magicmap smoothlevel smoothface
78 str dex con wis pow cha int 71 str dex con wis pow cha int
79 hp maxhp sp maxsp grace maxgrace 72 hp maxhp sp maxsp grace maxgrace
80 exp perm_exp expmul 73 exp perm_exp expmul
81 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
82 nrof level direction type subtype attacktype 75 nrof level direction type subtype attacktype
… …
90 resist_life_stealing resist_disease 83 resist_life_stealing resist_disease
91 84
92 path_attuned path_repelled path_denied material materialname 85 path_attuned path_repelled path_denied material materialname
93 value carrying weight invisible state magic 86 value carrying weight invisible state magic
94 last_heal last_sp last_grace last_eat 87 last_heal last_sp last_grace last_eat
95 connected glow_radius randomitems npx_status npc_program 88 connected glow_radius randomitems tresure_env npx_status npc_program
96 run_away pick_up container will_apply smoothlevel 89 run_away pick_up container will_apply smoothlevel
97 current_weapon_script weapontype tooltype elevation client_type 90 current_weapon_script weapontype tooltype elevation client_type
98 item_power duration range 91 item_power duration range
99 range_modifier duration_modifier dam_modifier gen_sp_armour 92 range_modifier duration_modifier dam_modifier gen_sp_armour
100 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
… …
111 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
112 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
113 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
114 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
115 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
116 110
117 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
118 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
119)); 113));
120 114
… …
137sub MOVE_FLY_LOW (){ 0x02 } 131sub MOVE_FLY_LOW (){ 0x02 }
138sub MOVE_FLY_HIGH (){ 0x04 } 132sub MOVE_FLY_HIGH (){ 0x04 }
139sub MOVE_FLYING (){ 0x06 } 133sub MOVE_FLYING (){ 0x06 }
140sub MOVE_SWIM (){ 0x08 } 134sub MOVE_SWIM (){ 0x08 }
141sub MOVE_BOAT (){ 0x10 } 135sub MOVE_BOAT (){ 0x10 }
136sub MOVE_SHIP (){ 0x20 }
142sub MOVE_KNOWN (){ 0x1f } # all of above 137sub MOVE_KNOWN (){ 0x3f } # all of above
143sub MOVE_ALLBIT (){ 0x10000 }
144sub 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}
145 239
146sub load_ref($) { 240sub load_ref($) {
147 my ($path) = @_; 241 my ($path) = @_;
148 242
149 open my $fh, "<:raw:perlio", $path 243 open my $fh, "<:raw:perlio", $path
… …
199 while (my ($k, $v) = each %attack_mask) { 293 while (my ($k, $v) = each %attack_mask) {
200 $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;
201 } 295 }
202} 296}
203 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
204# object as in "Object xxx", i.e. archetypes 329# object as in "Object xxx", i.e. archetypes
205sub normalize_object($) { 330sub normalize_object($) {
206 my ($ob) = @_; 331 my ($ob) = @_;
207 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 # color_fg is used as default for magicmap if magicmap does not exist
353 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
354
208 # nuke outdated or never supported fields 355 # nuke outdated or never supported fields
209 delete @$ob{qw( 356 delete @$ob{qw(
210 can_knockback can_parry can_impale can_cut can_dam_armour 357 can_knockback can_parry can_impale can_cut can_dam_armour
211 can_apply pass_thru can_pass_thru 358 can_apply pass_thru can_pass_thru color_bg color_fg
212 )}; 359 )};
213 360
214 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 361 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
215 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 362 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
216 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 363 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
217 364
218 # convert movement strings to bitsets 365 # convert movement strings to bitsets
219 for my $attr (keys %FIELD_MOVEMENT) { 366 for my $attr (keys %FIELD_MOVEMENT) {
220 next unless exists $ob->{$attr}; 367 next unless exists $ob->{$attr};
221 368
222 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 369 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr};
223
224 next if $ob->{$attr} =~ /^\d+$/;
225
226 my $flags = 0;
227
228 # assume list
229 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
230 $flags |= MOVE_WALK if $flag eq "walk";
231 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
232 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
233 $flags |= MOVE_FLYING if $flag eq "flying";
234 $flags |= MOVE_SWIM if $flag eq "swim";
235 $flags |= MOVE_BOAT if $flag eq "boat";
236 $flags |= MOVE_ALL if $flag eq "all";
237
238 $flags &= ~MOVE_WALK if $flag eq "-walk";
239 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
240 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
241 $flags &= ~MOVE_FLYING if $flag eq "-flying";
242 $flags &= ~MOVE_SWIM if $flag eq "-swim";
243 $flags &= ~MOVE_BOAT if $flag eq "-boat";
244 $flags &= ~MOVE_ALL if $flag eq "-all";
245 }
246
247 $ob->{$attr} = $flags;
248 } 370 }
249 371
250 # convert outdated movement flags to new movement sets 372 # convert outdated movement flags to new movement sets
251 if (defined (my $v = delete $ob->{no_pass})) { 373 if (defined (my $v = delete $ob->{no_pass})) {
252 $ob->{move_block} = $v ? MOVE_ALL : 0; 374 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
253 } 375 }
254 if (defined (my $v = delete $ob->{slow_move})) { 376 if (defined (my $v = delete $ob->{slow_move})) {
255 $ob->{move_slow} |= MOVE_WALK; 377 $ob->{move_slow} += "walk";
256 $ob->{move_slow_penalty} = $v; 378 $ob->{move_slow_penalty} = $v;
257 } 379 }
258 if (defined (my $v = delete $ob->{walk_on})) { 380 if (defined (my $v = delete $ob->{walk_on})) {
259 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 381 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
260 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
261 : $ob->{move_on} & ~MOVE_WALK;
262 } 382 }
263 if (defined (my $v = delete $ob->{walk_off})) { 383 if (defined (my $v = delete $ob->{walk_off})) {
264 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 384 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
265 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
266 : $ob->{move_off} & ~MOVE_WALK;
267 } 385 }
268 if (defined (my $v = delete $ob->{fly_on})) { 386 if (defined (my $v = delete $ob->{fly_on})) {
269 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 387 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
270 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
271 : $ob->{move_on} & ~MOVE_FLY_LOW;
272 } 388 }
273 if (defined (my $v = delete $ob->{fly_off})) { 389 if (defined (my $v = delete $ob->{fly_off})) {
274 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 390 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
275 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
276 : $ob->{move_off} & ~MOVE_FLY_LOW;
277 } 391 }
278 if (defined (my $v = delete $ob->{flying})) { 392 if (defined (my $v = delete $ob->{flying})) {
279 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 393 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
280 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
281 : $ob->{move_type} & ~MOVE_FLY_LOW;
282 } 394 }
283 395
284 # convert idiotic event_xxx things into objects 396 # convert idiotic event_xxx things into objects
285 while (my ($event, $subtype) = each %EVENT_TYPE) { 397 while (my ($event, $subtype) = each %EVENT_TYPE) {
286 if (exists $ob->{"event_${event}_plugin"}) { 398 if (exists $ob->{"event_${event}_plugin"}) {
… …
384sub read_arch($;$) { 496sub read_arch($;$) {
385 my ($path, $toplevel) = @_; 497 my ($path, $toplevel) = @_;
386 498
387 my %arc; 499 my %arc;
388 my ($more, $prev); 500 my ($more, $prev);
501 my $comment;
389 502
390 open my $fh, "<:raw:perlio:utf8", $path 503 open my $fh, "<:raw:perlio:utf8", $path
391 or Carp::croak "$path: $!"; 504 or Carp::croak "$path: $!";
392 505
393# binmode $fh; 506# binmode $fh;
… …
397 510
398 while (<$fh>) { 511 while (<$fh>) {
399 s/\s+$//; 512 s/\s+$//;
400 if (/^end$/i) { 513 if (/^end$/i) {
401 last; 514 last;
515
402 } elsif (/^arch (\S+)$/i) { 516 } elsif (/^arch (\S+)$/i) {
403 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 517 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
518
404 } elsif (/^lore$/i) { 519 } elsif (/^lore$/i) {
405 while (<$fh>) { 520 while (<$fh>) {
406 last if /^endlore\s*$/i; 521 last if /^endlore\s*$/i;
407 $arc{lore} .= $_; 522 $arc{lore} .= $_;
408 } 523 }
… …
417 chomp; 532 chomp;
418 push @{ $arc{anim} }, $_; 533 push @{ $arc{anim} }, $_;
419 } 534 }
420 } elsif (/^(\S+)\s*(.*)$/) { 535 } elsif (/^(\S+)\s*(.*)$/) {
421 $arc{lc $1} = $2; 536 $arc{lc $1} = $2;
422 } elsif (/^\s*($|#)/) { 537 } elsif (/^\s*#/) {
538 $arc{_comment} .= "$_\n";
539
540 } elsif (/^\s*$/) {
423 # 541 #
424 } else { 542 } else {
425 warn "$path: unparsable line '$_' in arch $arc{_name}"; 543 warn "$path: unparsable line '$_' in arch $arc{_name}";
426 } 544 }
427 } 545 }
… …
433 s/\s+$//; 551 s/\s+$//;
434 if (/^more$/i) { 552 if (/^more$/i) {
435 $more = $prev; 553 $more = $prev;
436 } elsif (/^object (\S+)$/i) { 554 } elsif (/^object (\S+)$/i) {
437 my $name = $1; 555 my $name = $1;
438 my $arc = attr_thaw normalize_object $parse_block->(_name => $name); 556 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
557 undef $comment;
558 delete $arc{_comment} unless length $arc{_comment};
439 $arc->{_atype} = 'object'; 559 $arc->{_atype} = 'object';
440 560
441 if ($more) { 561 if ($more) {
442 $more->{more} = $arc; 562 $more->{more} = $arc;
443 } else { 563 } else {
… …
445 } 565 }
446 $prev = $arc; 566 $prev = $arc;
447 $more = undef; 567 $more = undef;
448 } elsif (/^arch (\S+)$/i) { 568 } elsif (/^arch (\S+)$/i) {
449 my $name = $1; 569 my $name = $1;
450 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 570 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
571 undef $comment;
572 delete $arc{_comment} unless length $arc{_comment};
451 $arc->{_atype} = 'arch'; 573 $arc->{_atype} = 'arch';
452 574
453 if ($more) { 575 if ($more) {
454 $more->{more} = $arc; 576 $more->{more} = $arc;
455 } else { 577 } else {
… …
464 push @{$toplevel->{lev_array}}, $_+0; 586 push @{$toplevel->{lev_array}}, $_+0;
465 } 587 }
466 } else { 588 } else {
467 $toplevel->{$1} = $2; 589 $toplevel->{$1} = $2;
468 } 590 }
591 } elsif (/^\s*#/) {
592 $comment .= "$_\n";
469 } elsif (/^\s*($|#)/) { 593 } elsif (/^\s*($|#)/) {
470 # 594 #
471 } else { 595 } else {
472 die "$path: unparseable top-level line '$_'"; 596 die "$path: unparseable top-level line '$_'";
473 } 597 }
… …
493 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 617 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
494 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 618 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
495 | (delete $a{attack_movement_bits_4_7}); 619 | (delete $a{attack_movement_bits_4_7});
496 } 620 }
497 621
622 if (my $comment = delete $a{_comment}) {
623 if ($comment =~ /[^\n\s#]/) {
624 $str .= $comment;
625 }
626 }
627
498 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 628 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
499 629
500 my $inv = delete $a{inventory}; 630 my $inv = delete $a{inventory};
501 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 631 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
502 my $anim = delete $a{anim}; 632 my $anim = delete $a{anim};
633
634 if ($a{_atype} eq 'object') {
635 $str .= join "\n", "anim", @$anim, "mina\n"
636 if $anim;
637 }
503 638
504 my @kv; 639 my @kv;
505 640
506 for ($a{_name} eq "map" 641 for ($a{_name} eq "map"
507 ? @Crossfire::FIELD_ORDER_MAP 642 ? @Crossfire::FIELD_ORDER_MAP
… …
519 my ($k, $v) = @$_; 654 my ($k, $v) = @$_;
520 655
521 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 656 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
522 $v =~ s/\n$//; 657 $v =~ s/\n$//;
523 $str .= "$k\n$v\n$end\n"; 658 $str .= "$k\n$v\n$end\n";
524 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
525 if ($v & ~Crossfire::MOVE_ALL or !$v) {
526 $str .= "$k $v\n";
527
528 } elsif ($v & Crossfire::MOVE_ALLBIT) {
529 $str .= "$k all";
530
531 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
532 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
533 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
534 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
535 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
536
537 $str .= "\n";
538
539 } else {
540 $str .= $k;
541
542 $str .= " walk" if $v & Crossfire::MOVE_WALK;
543 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
544 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
545 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
546 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
547
548 $str .= "\n";
549 }
550 } else { 659 } else {
551 $str .= "$k $v\n"; 660 $str .= "$k $v\n";
552 } 661 }
553 } 662 }
554 663
555 if ($inv) { 664 if ($inv) {
556 $append->($_) for @$inv; 665 $append->($_) for @$inv;
557 } 666 }
558 667
668 $str .= "end\n";
669
559 if ($a{_atype} eq 'object') { 670 if ($a{_atype} eq 'object') {
560 $str .= join "\n", "anim", @$anim, "mina\n" 671 if ($more) {
561 if $anim;
562 }
563
564 $str .= "end\n";
565
566 if (($a{_atype} eq 'object') && $more) {
567 $str .= "\nmore\n"; 672 $str .= "more\n";
568 $append->($more) if $more; 673 $append->($more) if $more;
674 } else {
675 $str .= "\n";
676 }
569 } 677 }
570 }; 678 };
571 679
572 for (@$arch) { 680 for (@$arch) {
573 $append->($_); 681 $append->($_);
… …
602 my ($a) = @_; 710 my ($a) = @_;
603 711
604 my $o = $ARCH{$a->{_name}} 712 my $o = $ARCH{$a->{_name}}
605 or return; 713 or return;
606 714
607 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 715 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
716 unless ($face) {
717 $face = $FACE{"blank.x11"}
608 or (warn "no face data found for arch '$a->{_name}'"), return; 718 or (warn "no face data found for arch '$a->{_name}'"), return;
719 }
609 720
610 if ($face->{w} > 1 || $face->{h} > 1) { 721 if ($face->{w} > 1 || $face->{h} > 1) {
611 # bigface 722 # bigface
612 return (0, 0, $face->{w} - 1, $face->{h} - 1); 723 return (0, 0, $face->{w} - 1, $face->{h} - 1);
613 724
… …
720 ]; 831 ];
721 832
722 $attr 833 $attr
723} 834}
724 835
725sub arch_edit_sections {
726# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
727# edit_type = 0;
728# else if (edit_type != 0) {
729# // all flags from 'check_type' must be unset in this arch because they get recalculated now
730# edit_type &= ~check_type;
731# }
732#
733# }
734# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
735# getAttributeValue("alive", defarch) == 1 &&
736# (getAttributeValue("monster", defarch) == 1 ||
737# getAttributeValue("generator", defarch) == 1)) {
738# // Monster: monsters/npcs/generators
739# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
740# }
741# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
742# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
743# // Walls
744# edit_type |= IGUIConstants.TILE_EDIT_WALL;
745# }
746# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
747# getAttributeValue("connected", defarch) != 0) {
748# // Connected Objects
749# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
750# }
751# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
752# arch_type == 66 || arch_type == 41 || arch_type == 95) {
753# // Exit: teleporter/exit/trapdoors
754# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
755# }
756# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
757# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
758# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
759# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
760# arch_type == 124 || arch_type == 130)) {
761# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
762# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
763# }
764# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
765# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
766# arch_type == 91 || arch_type == 21 || arch_type == 24) {
767# // Door: door/special door/gates + keys
768# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
769# }
770# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
771# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
772# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
773# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
774# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
775# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
776# arch_type == 122 || arch_type == 3)) {
777# // Equipment: weapons/armour/wands/rods
778# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
779# }
780#
781# return(edit_type);
782#
783#
784}
785
786sub cache_file($$&&) { 836sub cache_file($$&&) {
787 my ($src, $cache, $load, $create) = @_; 837 my ($src, $cache, $load, $create) = @_;
788 838
789 my ($size, $mtime) = (stat $src)[7,9] 839 my ($size, $mtime) = (stat $src)[7,9]
790 or Carp::croak "$src: $!"; 840 or Carp::croak "$src: $!";
… …
838 }, sub { 888 }, sub {
839 read_arch "$LIB/archetypes" 889 read_arch "$LIB/archetypes"
840 }; 890 };
841} 891}
842 892
893sub construct_tilecache_pb {
894 my ($idx, $cache) = @_;
895
896 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
897
898 while (my ($name, $tile) = each %$cache) {
899 my $tpb = delete $tile->{pb};
900 my $ofs = $tile->{idx};
901
902 for my $x (0 .. $tile->{w} - 1) {
903 for my $y (0 .. $tile->{h} - 1) {
904 my $idx = $ofs + $x + $y * $tile->{w};
905 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
906 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
907 }
908 }
909 }
910
911 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
912
913 $cache
914}
915
916sub use_tilecache {
917 my ($face) = @_;
918 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
919 or die "$VARDIR/tilecache.png: $!";
920 *FACE = $_[0];
921}
922
843=item load_tilecache 923=item load_tilecache
844 924
845(Re-)Load %TILE and %FACE. 925(Re-)Load %TILE and %FACE.
846 926
847=cut 927=cut
848 928
849sub load_tilecache() { 929sub load_tilecache() {
850 require Gtk2; 930 require Gtk2;
851 931
932 if (-e "$LIB/crossfire.0") { # Crossfire1 version
852 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 933 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
853 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 934 sub {
854 or die "$VARDIR/tilecache.png: $!";
855 *FACE = $_[0];
856 }, sub {
857 my $tile = read_pak "$LIB/crossfire.0"; 935 my $tile = read_pak "$LIB/crossfire.0";
858 936
859 my %cache; 937 my %cache;
860 938
861 my $idx = 0; 939 my $idx = 0;
862 940
863 for my $name (sort keys %$tile) { 941 for my $name (sort keys %$tile) {
864 my $pb = new Gtk2::Gdk::PixbufLoader; 942 my $pb = new Gtk2::Gdk::PixbufLoader;
865 $pb->write ($tile->{$name}); 943 $pb->write ($tile->{$name});
866 $pb->close; 944 $pb->close;
867 my $pb = $pb->get_pixbuf; 945 my $pb = $pb->get_pixbuf;
868 946
869 my $tile = $cache{$name} = { 947 my $tile = $cache{$name} = {
870 pb => $pb, 948 pb => $pb,
871 idx => $idx, 949 idx => $idx,
872 w => int $pb->get_width / TILESIZE, 950 w => int $pb->get_width / TILESIZE,
873 h => int $pb->get_height / TILESIZE, 951 h => int $pb->get_height / TILESIZE,
952 };
953
954 $idx += $tile->{w} * $tile->{h};
955 }
956
957 construct_tilecache_pb $idx, \%cache;
958
959 \%cache
874 }; 960 };
961
962 } else { # Crossfire+ version
963 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
964 sub {
965 my %cache;
966 my $facedata = Storable::retrieve "$LIB/facedata";
967
968 $facedata->{version} == 2
969 or die "$LIB/facedata: version mismatch, cannot proceed.";
970
971 my $faces = $facedata->{faceinfo};
972 my $idx = 0;
973
974 for (sort keys %$faces) {
975 my ($face, $info) = ($_, $faces->{$_});
976
977 my $pb = new Gtk2::Gdk::PixbufLoader;
978 $pb->write ($info->{data32});
979 $pb->close;
980 my $pb = $pb->get_pixbuf;
981
982 my $tile = $cache{$face} = {
983 pb => $pb,
984 idx => $idx,
985 w => int $pb->get_width / TILESIZE,
986 h => int $pb->get_height / TILESIZE,
875 987 };
876 988
877 $idx += $tile->{w} * $tile->{h}; 989 $idx += $tile->{w} * $tile->{h};
878 }
879
880 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
881
882 while (my ($name, $tile) = each %cache) {
883 my $tpb = delete $tile->{pb};
884 my $ofs = $tile->{idx};
885
886 for my $x (0 .. $tile->{w} - 1) {
887 for my $y (0 .. $tile->{h} - 1) {
888 my $idx = $ofs + $x + $y * $tile->{w};
889 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
890 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
891 } 990 }
991
992 construct_tilecache_pb $idx, \%cache;
993
994 \%cache
892 } 995 };
893 }
894
895 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
896
897 \%cache
898 }; 996 }
899} 997}
900 998
901=head1 AUTHOR 999=head1 AUTHOR
902 1000
903 Marc Lehmann <schmorp@schmorp.de> 1001 Marc Lehmann <schmorp@schmorp.de>

Diff Legend

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