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.72 by root, Mon Sep 4 17:58:51 2006 UTC vs.
Revision 1.108 by elmex, Wed May 23 20:21:28 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
… …
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
… …
193 289
194sub _add_resist($$$) { 290sub _add_resist($$$) {
195 my ($ob, $mask, $value) = @_; 291 my ($ob, $mask, $value) = @_;
196 292
197 while (my ($k, $v) = each %attack_mask) { 293 while (my ($k, $v) = each %attack_mask) {
198 $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}
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;
201 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 ($js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
358 delete $ob->{attach}
359 }
360 }
361
362 # color_fg is used as default for magicmap if magicmap does not exist
363 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
364
206 # nuke outdated or never supported fields 365 # nuke outdated or never supported fields
207 delete @$ob{qw( 366 delete @$ob{qw(
208 can_knockback can_parry can_impale can_cut can_dam_armour 367 can_knockback can_parry can_impale can_cut can_dam_armour
209 can_apply pass_thru can_pass_thru 368 can_apply pass_thru can_pass_thru color_bg color_fg
210 )}; 369 )};
211 370
212 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 371 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
213 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 372 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
214 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 373 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
215 374
216 # convert movement strings to bitsets 375 # convert movement strings to bitsets
217 for my $attr (keys %FIELD_MOVEMENT) { 376 for my $attr (keys %FIELD_MOVEMENT) {
218 next unless exists $ob->{$attr}; 377 next unless exists $ob->{$attr};
219 378
220 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 379 $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 } 380 }
247 381
248 # convert outdated movement flags to new movement sets 382 # convert outdated movement flags to new movement sets
249 if (defined (my $v = delete $ob->{no_pass})) { 383 if (defined (my $v = delete $ob->{no_pass})) {
250 $ob->{move_block} = $v ? MOVE_ALL : 0; 384 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
251 } 385 }
252 if (defined (my $v = delete $ob->{slow_move})) { 386 if (defined (my $v = delete $ob->{slow_move})) {
253 $ob->{move_slow} |= MOVE_WALK; 387 $ob->{move_slow} += "walk";
254 $ob->{move_slow_penalty} = $v; 388 $ob->{move_slow_penalty} = $v;
255 } 389 }
256 if (defined (my $v = delete $ob->{walk_on})) { 390 if (defined (my $v = delete $ob->{walk_on})) {
257 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 391 $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 } 392 }
261 if (defined (my $v = delete $ob->{walk_off})) { 393 if (defined (my $v = delete $ob->{walk_off})) {
262 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 394 $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 } 395 }
266 if (defined (my $v = delete $ob->{fly_on})) { 396 if (defined (my $v = delete $ob->{fly_on})) {
267 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 397 $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 } 398 }
271 if (defined (my $v = delete $ob->{fly_off})) { 399 if (defined (my $v = delete $ob->{fly_off})) {
272 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 400 $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 } 401 }
276 if (defined (my $v = delete $ob->{flying})) { 402 if (defined (my $v = delete $ob->{flying})) {
277 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 403 $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 } 404 }
281 405
282 # convert idiotic event_xxx things into objects 406 # convert idiotic event_xxx things into objects
283 while (my ($event, $subtype) = each %EVENT_TYPE) { 407 while (my ($event, $subtype) = each %EVENT_TYPE) {
284 if (exists $ob->{"event_${event}_plugin"}) { 408 if (exists $ob->{"event_${event}_plugin"}) {
… …
288 slaying => delete $ob->{"event_${event}"}, 412 slaying => delete $ob->{"event_${event}"},
289 name => delete $ob->{"event_${event}_options"}, 413 name => delete $ob->{"event_${event}_options"},
290 }; 414 };
291 } 415 }
292 } 416 }
417
418 # some archetypes had "+3" instead of the canonical "3", so fix
419 $ob->{dam} *= 1 if exists $ob->{dam};
293 420
294 $ob 421 $ob
295} 422}
296 423
297# arch as in "arch xxx", ie.. objects 424# arch as in "arch xxx", ie.. objects
… …
379sub read_arch($;$) { 506sub read_arch($;$) {
380 my ($path, $toplevel) = @_; 507 my ($path, $toplevel) = @_;
381 508
382 my %arc; 509 my %arc;
383 my ($more, $prev); 510 my ($more, $prev);
511 my $comment;
384 512
385 open my $fh, "<:raw:perlio:utf8", $path 513 open my $fh, "<:raw:perlio:utf8", $path
386 or Carp::croak "$path: $!"; 514 or Carp::croak "$path: $!";
387 515
388# binmode $fh; 516# binmode $fh;
… …
392 520
393 while (<$fh>) { 521 while (<$fh>) {
394 s/\s+$//; 522 s/\s+$//;
395 if (/^end$/i) { 523 if (/^end$/i) {
396 last; 524 last;
525
397 } elsif (/^arch (\S+)$/i) { 526 } elsif (/^arch (\S+)$/i) {
398 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 527 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
528
399 } elsif (/^lore$/i) { 529 } elsif (/^lore$/i) {
400 while (<$fh>) { 530 while (<$fh>) {
401 last if /^endlore\s*$/i; 531 last if /^endlore\s*$/i;
402 $arc{lore} .= $_; 532 $arc{lore} .= $_;
403 } 533 }
… …
412 chomp; 542 chomp;
413 push @{ $arc{anim} }, $_; 543 push @{ $arc{anim} }, $_;
414 } 544 }
415 } elsif (/^(\S+)\s*(.*)$/) { 545 } elsif (/^(\S+)\s*(.*)$/) {
416 $arc{lc $1} = $2; 546 $arc{lc $1} = $2;
417 } elsif (/^\s*($|#)/) { 547 } elsif (/^\s*#/) {
548 $arc{_comment} .= "$_\n";
549
550 } elsif (/^\s*$/) {
418 # 551 #
419 } else { 552 } else {
420 warn "$path: unparsable line '$_' in arch $arc{_name}"; 553 warn "$path: unparsable line '$_' in arch $arc{_name}";
421 } 554 }
422 } 555 }
… …
428 s/\s+$//; 561 s/\s+$//;
429 if (/^more$/i) { 562 if (/^more$/i) {
430 $more = $prev; 563 $more = $prev;
431 } elsif (/^object (\S+)$/i) { 564 } elsif (/^object (\S+)$/i) {
432 my $name = $1; 565 my $name = $1;
433 my $arc = attr_thaw normalize_object $parse_block->(_name => $name); 566 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
567 undef $comment;
568 delete $arc{_comment} unless length $arc{_comment};
434 $arc->{_atype} = 'object'; 569 $arc->{_atype} = 'object';
435 570
436 if ($more) { 571 if ($more) {
437 $more->{more} = $arc; 572 $more->{more} = $arc;
438 } else { 573 } else {
… …
440 } 575 }
441 $prev = $arc; 576 $prev = $arc;
442 $more = undef; 577 $more = undef;
443 } elsif (/^arch (\S+)$/i) { 578 } elsif (/^arch (\S+)$/i) {
444 my $name = $1; 579 my $name = $1;
445 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 580 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
581 undef $comment;
582 delete $arc{_comment} unless length $arc{_comment};
446 $arc->{_atype} = 'arch'; 583 $arc->{_atype} = 'arch';
447 584
448 if ($more) { 585 if ($more) {
449 $more->{more} = $arc; 586 $more->{more} = $arc;
450 } else { 587 } else {
… …
459 push @{$toplevel->{lev_array}}, $_+0; 596 push @{$toplevel->{lev_array}}, $_+0;
460 } 597 }
461 } else { 598 } else {
462 $toplevel->{$1} = $2; 599 $toplevel->{$1} = $2;
463 } 600 }
601 } elsif (/^\s*#/) {
602 $comment .= "$_\n";
464 } elsif (/^\s*($|#)/) { 603 } elsif (/^\s*($|#)/) {
465 # 604 #
466 } else { 605 } else {
467 die "$path: unparseable top-level line '$_'"; 606 die "$path: unparseable top-level line '$_'";
468 } 607 }
… …
488 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 627 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
489 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 628 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
490 | (delete $a{attack_movement_bits_4_7}); 629 | (delete $a{attack_movement_bits_4_7});
491 } 630 }
492 631
632 if (my $comment = delete $a{_comment}) {
633 if ($comment =~ /[^\n\s#]/) {
634 $str .= $comment;
635 }
636 }
637
493 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 638 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
494 639
495 my $inv = delete $a{inventory}; 640 my $inv = delete $a{inventory};
496 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 641 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
497 my $anim = delete $a{anim}; 642 my $anim = delete $a{anim};
643
644 if ($a{_atype} eq 'object') {
645 $str .= join "\n", "anim", @$anim, "mina\n"
646 if $anim;
647 }
498 648
499 my @kv; 649 my @kv;
500 650
501 for ($a{_name} eq "map" 651 for ($a{_name} eq "map"
502 ? @Crossfire::FIELD_ORDER_MAP 652 ? @Crossfire::FIELD_ORDER_MAP
… …
514 my ($k, $v) = @$_; 664 my ($k, $v) = @$_;
515 665
516 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 666 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
517 $v =~ s/\n$//; 667 $v =~ s/\n$//;
518 $str .= "$k\n$v\n$end\n"; 668 $str .= "$k\n$v\n$end\n";
519 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
520 if ($v & ~Crossfire::MOVE_ALL or !$v) {
521 $str .= "$k $v\n";
522
523 } elsif ($v & Crossfire::MOVE_ALLBIT) {
524 $str .= "$k all";
525
526 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
527 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
528 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
529 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
530 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
531
532 $str .= "\n";
533
534 } else {
535 $str .= $k;
536
537 $str .= " walk" if $v & Crossfire::MOVE_WALK;
538 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
539 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
540 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
541 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
542
543 $str .= "\n";
544 }
545 } else { 669 } else {
546 $str .= "$k $v\n"; 670 $str .= "$k $v\n";
547 } 671 }
548 } 672 }
549 673
550 if ($inv) { 674 if ($inv) {
551 $append->($_) for @$inv; 675 $append->($_) for @$inv;
552 } 676 }
553 677
678 $str .= "end\n";
679
554 if ($a{_atype} eq 'object') { 680 if ($a{_atype} eq 'object') {
555 $str .= join "\n", "anim", @$anim, "mina\n" 681 if ($more) {
556 if $anim;
557 }
558
559 $str .= "end\n";
560
561 if (($a{_atype} eq 'object') && $more) {
562 $str .= "\nmore\n"; 682 $str .= "more\n";
563 $append->($more) if $more; 683 $append->($more) if $more;
684 } else {
685 $str .= "\n";
686 }
564 } 687 }
565 }; 688 };
566 689
567 for (@$arch) { 690 for (@$arch) {
568 $append->($_); 691 $append->($_);
… …
597 my ($a) = @_; 720 my ($a) = @_;
598 721
599 my $o = $ARCH{$a->{_name}} 722 my $o = $ARCH{$a->{_name}}
600 or return; 723 or return;
601 724
602 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 725 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
726 unless ($face) {
727 $face = $FACE{"blank.x11"}
603 or (warn "no face data found for arch '$a->{_name}'"), return; 728 or (warn "no face data found for arch '$a->{_name}'"), return;
729 }
604 730
605 if ($face->{w} > 1 || $face->{h} > 1) { 731 if ($face->{w} > 1 || $face->{h} > 1) {
606 # bigface 732 # bigface
607 return (0, 0, $face->{w} - 1, $face->{h} - 1); 733 return (0, 0, $face->{w} - 1, $face->{h} - 1);
608 734
… …
715 ]; 841 ];
716 842
717 $attr 843 $attr
718} 844}
719 845
720sub arch_edit_sections {
721# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
722# edit_type = 0;
723# else if (edit_type != 0) {
724# // all flags from 'check_type' must be unset in this arch because they get recalculated now
725# edit_type &= ~check_type;
726# }
727#
728# }
729# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
730# getAttributeValue("alive", defarch) == 1 &&
731# (getAttributeValue("monster", defarch) == 1 ||
732# getAttributeValue("generator", defarch) == 1)) {
733# // Monster: monsters/npcs/generators
734# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
735# }
736# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
737# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
738# // Walls
739# edit_type |= IGUIConstants.TILE_EDIT_WALL;
740# }
741# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
742# getAttributeValue("connected", defarch) != 0) {
743# // Connected Objects
744# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
745# }
746# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
747# arch_type == 66 || arch_type == 41 || arch_type == 95) {
748# // Exit: teleporter/exit/trapdoors
749# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
750# }
751# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
752# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
753# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
754# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
755# arch_type == 124 || arch_type == 130)) {
756# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
757# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
758# }
759# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
760# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
761# arch_type == 91 || arch_type == 21 || arch_type == 24) {
762# // Door: door/special door/gates + keys
763# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
764# }
765# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
766# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
767# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
768# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
769# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
770# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
771# arch_type == 122 || arch_type == 3)) {
772# // Equipment: weapons/armour/wands/rods
773# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
774# }
775#
776# return(edit_type);
777#
778#
779}
780
781sub cache_file($$&&) { 846sub cache_file($$&&) {
782 my ($src, $cache, $load, $create) = @_; 847 my ($src, $cache, $load, $create) = @_;
783 848
784 my ($size, $mtime) = (stat $src)[7,9] 849 my ($size, $mtime) = (stat $src)[7,9]
785 or Carp::croak "$src: $!"; 850 or Carp::croak "$src: $!";
… …
833 }, sub { 898 }, sub {
834 read_arch "$LIB/archetypes" 899 read_arch "$LIB/archetypes"
835 }; 900 };
836} 901}
837 902
903sub construct_tilecache_pb {
904 my ($idx, $cache) = @_;
905
906 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
907
908 while (my ($name, $tile) = each %$cache) {
909 my $tpb = delete $tile->{pb};
910 my $ofs = $tile->{idx};
911
912 for my $x (0 .. $tile->{w} - 1) {
913 for my $y (0 .. $tile->{h} - 1) {
914 my $idx = $ofs + $x + $y * $tile->{w};
915 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
916 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
917 }
918 }
919 }
920
921 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
922
923 $cache
924}
925
926sub use_tilecache {
927 my ($face) = @_;
928 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
929 or die "$VARDIR/tilecache.png: $!";
930 *FACE = $_[0];
931}
932
838=item load_tilecache 933=item load_tilecache
839 934
840(Re-)Load %TILE and %FACE. 935(Re-)Load %TILE and %FACE.
841 936
842=cut 937=cut
843 938
844sub load_tilecache() { 939sub load_tilecache() {
845 require Gtk2; 940 require Gtk2;
846 941
942 if (-e "$LIB/crossfire.0") { # Crossfire1 version
847 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 943 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
848 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 944 sub {
849 or die "$VARDIR/tilecache.png: $!";
850 *FACE = $_[0];
851 }, sub {
852 my $tile = read_pak "$LIB/crossfire.0"; 945 my $tile = read_pak "$LIB/crossfire.0";
853 946
854 my %cache; 947 my %cache;
855 948
856 my $idx = 0; 949 my $idx = 0;
857 950
858 for my $name (sort keys %$tile) { 951 for my $name (sort keys %$tile) {
859 my $pb = new Gtk2::Gdk::PixbufLoader; 952 my $pb = new Gtk2::Gdk::PixbufLoader;
860 $pb->write ($tile->{$name}); 953 $pb->write ($tile->{$name});
861 $pb->close; 954 $pb->close;
862 my $pb = $pb->get_pixbuf; 955 my $pb = $pb->get_pixbuf;
863 956
864 my $tile = $cache{$name} = { 957 my $tile = $cache{$name} = {
865 pb => $pb, 958 pb => $pb,
866 idx => $idx, 959 idx => $idx,
867 w => int $pb->get_width / TILESIZE, 960 w => int $pb->get_width / TILESIZE,
868 h => int $pb->get_height / TILESIZE, 961 h => int $pb->get_height / TILESIZE,
962 };
963
964 $idx += $tile->{w} * $tile->{h};
965 }
966
967 construct_tilecache_pb $idx, \%cache;
968
969 \%cache
869 }; 970 };
971
972 } else { # Crossfire+ version
973 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
974 sub {
975 my %cache;
976 my $facedata = Storable::retrieve "$LIB/facedata";
977
978 $facedata->{version} == 2
979 or die "$LIB/facedata: version mismatch, cannot proceed.";
980
981 my $faces = $facedata->{faceinfo};
982 my $idx = 0;
983
984 for (sort keys %$faces) {
985 my ($face, $info) = ($_, $faces->{$_});
986
987 my $pb = new Gtk2::Gdk::PixbufLoader;
988 $pb->write ($info->{data32});
989 $pb->close;
990 my $pb = $pb->get_pixbuf;
991
992 my $tile = $cache{$face} = {
993 pb => $pb,
994 idx => $idx,
995 w => int $pb->get_width / TILESIZE,
996 h => int $pb->get_height / TILESIZE,
870 997 };
871 998
872 $idx += $tile->{w} * $tile->{h}; 999 $idx += $tile->{w} * $tile->{h};
873 }
874
875 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
876
877 while (my ($name, $tile) = each %cache) {
878 my $tpb = delete $tile->{pb};
879 my $ofs = $tile->{idx};
880
881 for my $x (0 .. $tile->{w} - 1) {
882 for my $y (0 .. $tile->{h} - 1) {
883 my $idx = $ofs + $x + $y * $tile->{w};
884 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
885 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
886 } 1000 }
1001
1002 construct_tilecache_pb $idx, \%cache;
1003
1004 \%cache
887 } 1005 };
888 }
889
890 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
891
892 \%cache
893 }; 1006 }
894} 1007}
895 1008
896=head1 AUTHOR 1009=head1 AUTHOR
897 1010
898 Marc Lehmann <schmorp@schmorp.de> 1011 Marc Lehmann <schmorp@schmorp.de>

Diff Legend

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