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.56 by root, Thu Mar 23 07:33:16 2006 UTC vs.
Revision 1.95 by root, Mon Mar 5 01:10:30 2007 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.1'; 9our $VERSION = '0.97';
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
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
24our $LIB = $ENV{CROSSFIRE_LIBDIR}; 36our $LIB = $ENV{CROSSFIRE_LIBDIR};
25 37
26our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; 38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
40 : File::Spec->tmpdir . "/crossfire";
27 41
28mkdir $VARDIR, 0777; 42mkdir $VARDIR, 0777;
29 43
30sub TILESIZE (){ 32 } 44sub TILESIZE (){ 32 }
31 45
… …
37 msg => "endmsg", 51 msg => "endmsg",
38 lore => "endlore", 52 lore => "endlore",
39 maplore => "endmaplore", 53 maplore => "endmaplore",
40); 54);
41 55
56# movement bit type, PITA
57our %FIELD_MOVEMENT = map +($_ => undef),
58 qw(move_type move_block move_allow move_on move_off move_slow);
59
42# same as in server save routine, to (hopefully) be compatible 60# same as in server save routine, to (hopefully) be compatible
43# to the other editors. 61# to the other editors.
44our @FIELD_ORDER_MAP = (qw( 62our @FIELD_ORDER_MAP = (qw(
63 file_format_version
45 name swap_time reset_timeout fixed_resettime difficulty region 64 name attach swap_time reset_timeout fixed_resettime difficulty region
46 shopitems shopgreed shopmin shopmax shoprace 65 shopitems shopgreed shopmin shopmax shoprace
47 darkness width height enter_x enter_y msg maplore 66 darkness width height enter_x enter_y msg maplore
48 unique template 67 unique template
49 outdoor temp pressure humid windspeed winddir sky nosmooth 68 outdoor temp pressure humid windspeed winddir sky nosmooth
50 tile_path_1 tile_path_2 tile_path_3 tile_path_4 69 tile_path_1 tile_path_2 tile_path_3 tile_path_4
51)); 70));
52 71
53our @FIELD_ORDER = (qw( 72our @FIELD_ORDER = (qw(
73 elevation
74
54 name name_pl custom_name title race 75 name name_pl custom_name attach title race
55 slaying skill msg lore other_arch face 76 slaying skill msg lore other_arch face
56 #todo-events 77 #todo-events
57 animation is_animated 78 animation is_animated
58 Str Dex Con Wis Pow Cha Int 79 str dex con wis pow cha int
59 hp maxhp sp maxsp grace maxgrace 80 hp maxhp sp maxsp grace maxgrace
60 exp perm_exp expmul 81 exp perm_exp expmul
61 food dam luck wc ac x y speed speed_left move_state attack_movement 82 food dam luck wc ac x y speed speed_left move_state attack_movement
62 nrof level direction type subtype 83 nrof level direction type subtype attacktype
63 84
64 resist_physical resist_magic resist_fire resist_electricity 85 resist_physical resist_magic resist_fire resist_electricity
65 resist_cold resist_confusion resist_acid resist_drain 86 resist_cold resist_confusion resist_acid resist_drain
66 resist_weaponmagic resist_ghosthit resist_poison resist_slow 87 resist_weaponmagic resist_ghosthit resist_poison resist_slow
67 resist_paralyze resist_turn_undead resist_fear resist_cancellation 88 resist_paralyze resist_turn_undead resist_fear resist_cancellation
… …
96 117
97 body_range body_arm body_torso body_head body_neck body_skill 118 body_range body_arm body_torso body_head body_neck body_skill
98 body_finger body_shoulder body_foot body_hand body_wrist body_waist 119 body_finger body_shoulder body_foot body_hand body_wrist body_waist
99)); 120));
100 121
122our %EVENT_TYPE = (
123 apply => 1,
124 attack => 2,
125 death => 3,
126 drop => 4,
127 pickup => 5,
128 say => 6,
129 stop => 7,
130 time => 8,
131 throw => 9,
132 trigger => 10,
133 close => 11,
134 timer => 12,
135);
136
101sub MOVE_WALK (){ 0x01 } 137sub MOVE_WALK (){ 0x01 }
102sub MOVE_FLY_LOW (){ 0x02 } 138sub MOVE_FLY_LOW (){ 0x02 }
103sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
104sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
105sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
106sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
107sub MOVE_ALL (){ 0xff } 143sub MOVE_KNOWN (){ 0x1f } # all of above
144sub MOVE_ALL (){ 0x10000 } # very special value
145
146our %MOVE_TYPE = (
147 walk => MOVE_WALK,
148 fly_low => MOVE_FLY_LOW,
149 fly_high => MOVE_FLY_HIGH,
150 flying => MOVE_FLYING,
151 swim => MOVE_SWIM,
152 boat => MOVE_BOAT,
153 all => MOVE_ALL,
154);
155
156our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat);
157
158{
159 package Crossfire::MoveType;
160
161 use overload
162 '=' => sub { bless [@{$_[0]}], ref $_[0] },
163 '""' => \&as_string,
164 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
165 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
166 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
167 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
168 'x=' => sub {
169 my $cur = $_[0] >= $_[1];
170 if (!defined $cur) {
171 if ($_[0] >= "all") {
172 $_[0] -= $_[1];
173 } else {
174 $_[0] += $_[1];
175 }
176 } elsif ($cur) {
177 $_[0] -= $_[1];
178 } else {
179 $_[0] /= $_[1];
180 }
181
182 $_[0]
183 },
184 'eq' => sub { "$_[0]" eq "$_[1]" },
185 'ne' => sub { "$_[0]" ne "$_[1]" },
186 ;
187}
188
189sub Crossfire::MoveType::new {
190 my ($class, $string) = @_;
191
192 my $mask;
193 my $value;
194
195 if ($string =~ /^\s*\d+\s*$/) {
196 $mask = MOVE_ALL;
197 $value = $string+0;
198 } else {
199 for (split /\s+/, lc $string) {
200 if (s/^-//) {
201 $mask |= $MOVE_TYPE{$_};
202 $value &= ~$MOVE_TYPE{$_};
203 } else {
204 $mask |= $MOVE_TYPE{$_};
205 $value |= $MOVE_TYPE{$_};
206 }
207 }
208 }
209
210 (bless [$mask, $value], $class)->normalise
211}
212
213sub Crossfire::MoveType::normalise {
214 my ($self) = @_;
215
216 if ($self->[0] & MOVE_ALL) {
217 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
218 $self->[0] &= $mask;
219 $self->[1] &= $mask;
220 }
221
222 $self->[1] &= $self->[0];
223
224 $self
225}
226
227sub Crossfire::MoveType::as_string {
228 my ($self) = @_;
229
230 my @res;
231
232 my ($mask, $value) = @$self;
233
234 for (@Crossfire::MOVE_TYPE) {
235 my $bit = $Crossfire::MOVE_TYPE{$_};
236 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
237 $mask &= ~$bit;
238 push @res, $value & $bit ? $_ : "-$_";
239 }
240 }
241
242 join " ", @res
243}
108 244
109sub load_ref($) { 245sub load_ref($) {
110 my ($path) = @_; 246 my ($path) = @_;
111 247
112 open my $fh, "<", $path 248 open my $fh, "<:raw:perlio", $path
113 or die "$path: $!"; 249 or die "$path: $!";
114 binmode $fh;
115 local $/; 250 local $/;
116 251
117 thaw <$fh> 252 thaw <$fh>
118} 253}
119 254
120sub save_ref($$) { 255sub save_ref($$) {
121 my ($ref, $path) = @_; 256 my ($ref, $path) = @_;
122 257
123 open my $fh, ">", "$path~" 258 open my $fh, ">:raw:perlio", "$path~"
124 or die "$path~: $!"; 259 or die "$path~: $!";
125 binmode $fh;
126 print $fh freeze $ref; 260 print $fh freeze $ref;
127 close $fh; 261 close $fh;
128 rename "$path~", $path 262 rename "$path~", $path
129 or die "$path: $!"; 263 or die "$path: $!";
130} 264}
131 265
266my %attack_mask = (
267 physical => 0x00000001,
268 magic => 0x00000002,
269 fire => 0x00000004,
270 electricity => 0x00000008,
271 cold => 0x00000010,
272 confusion => 0x00000020,
273 acid => 0x00000040,
274 drain => 0x00000080,
275 weaponmagic => 0x00000100,
276 ghosthit => 0x00000200,
277 poison => 0x00000400,
278 slow => 0x00000800,
279 paralyze => 0x00001000,
280 turn_undead => 0x00002000,
281 fear => 0x00004000,
282 cancellation => 0x00008000,
283 deplete => 0x00010000,
284 death => 0x00020000,
285 chaos => 0x00040000,
286 counterspell => 0x00080000,
287 godpower => 0x00100000,
288 holyword => 0x00200000,
289 blind => 0x00400000,
290 internal => 0x00800000,
291 life_stealing => 0x01000000,
292 disease => 0x02000000,
293);
294
295sub _add_resist($$$) {
296 my ($ob, $mask, $value) = @_;
297
298 while (my ($k, $v) = each %attack_mask) {
299 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
300 }
301}
302
303my %MATERIAL = reverse
304 paper => 1,
305 iron => 2,
306 glass => 4,
307 leather => 8,
308 wood => 16,
309 organic => 32,
310 stone => 64,
311 cloth => 128,
312 adamant => 256,
313 liquid => 512,
314 tin => 1024,
315 bone => 2048,
316 ice => 4096,
317
318 # guesses
319 runestone => 12,
320 bronze => 18,
321 "ancient wood" => 20,
322 glass => 36,
323 marble => 66,
324 ice => 68,
325 stone => 70,
326 stone => 80,
327 cloth => 136,
328 ironwood => 144,
329 adamantium => 258,
330 glacium => 260,
331 blood => 544,
332;
333
334# object as in "Object xxx", i.e. archetypes
132sub normalize_object($) { 335sub normalize_object($) {
133 my ($ob) = @_; 336 my ($ob) = @_;
134 337
338 # convert material bitset to materialname, if possible
339 if (exists $ob->{material}) {
340 if (!$ob->{material}) {
341 delete $ob->{material};
342 } elsif (exists $ob->{materialname}) {
343 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
344 delete $ob->{material};
345 } else {
346 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
347 delete $ob->{material}; # assume materilname is more specific and nuke material
348 }
349 } elsif (my $name = $MATERIAL{$ob->{material}}) {
350 delete $ob->{material};
351 $ob->{materialname} = $name;
352 } else {
353 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
354 }
355 }
356
357 # nuke outdated or never supported fields
135 delete $ob->{$_} for qw( 358 delete @$ob{qw(
136 can_knockback can_parry can_impale can_cut can_dam_armour 359 can_knockback can_parry can_impale can_cut can_dam_armour
137 can_apply pass_thru can_pass_thru 360 can_apply pass_thru can_pass_thru
138 ); 361 )};
139 362
140 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 363 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
364 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
365 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
366
367 # convert movement strings to bitsets
368 for my $attr (keys %FIELD_MOVEMENT) {
141 next unless exists $ob->{$attr}; 369 next unless exists $ob->{$attr};
142 next if $ob->{$attr} =~ /^\d+$/;
143 370
144 my $flags = 0; 371 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr};
145
146 # assume list
147 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
148 $flags |= MOVE_WALK if $flag eq "walk";
149 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
150 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
151 $flags |= MOVE_FLYING if $flag eq "flying";
152 $flags |= MOVE_SWIM if $flag eq "swim";
153 $flags |= MOVE_BOAT if $flag eq "boat";
154 $flags |= MOVE_ALL if $flag eq "all";
155
156 $flags &= ~MOVE_WALK if $flag eq "-walk";
157 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
158 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
159 $flags &= ~MOVE_FLYING if $flag eq "-flying";
160 $flags &= ~MOVE_SWIM if $flag eq "-swim";
161 $flags &= ~MOVE_BOAT if $flag eq "-boat";
162 $flags &= ~MOVE_ALL if $flag eq "-all";
163 }
164
165 $ob->{$attr} = $flags;
166 } 372 }
167 373
374 # convert outdated movement flags to new movement sets
168 if (defined (my $v = delete $ob->{no_pass})) { 375 if (defined (my $v = delete $ob->{no_pass})) {
169 $ob->{move_block} = $v ? MOVE_ALL : 0; 376 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
170 } 377 }
171 if (defined (my $v = delete $ob->{slow_move})) { 378 if (defined (my $v = delete $ob->{slow_move})) {
172 $ob->{move_slow} |= MOVE_WALK; 379 $ob->{move_slow} += "walk";
173 $ob->{move_slow_penalty} = $v; 380 $ob->{move_slow_penalty} = $v;
174 } 381 }
175 if (defined (my $v = delete $ob->{walk_on})) { 382 if (defined (my $v = delete $ob->{walk_on})) {
176 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 383 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
177 : $ob->{move_on} & ~MOVE_WALK;
178 } 384 }
179 if (defined (my $v = delete $ob->{walk_off})) { 385 if (defined (my $v = delete $ob->{walk_off})) {
180 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 386 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
181 : $ob->{move_off} & ~MOVE_WALK;
182 } 387 }
183 if (defined (my $v = delete $ob->{fly_on})) { 388 if (defined (my $v = delete $ob->{fly_on})) {
184 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 389 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
185 : $ob->{move_on} & ~MOVE_FLY_LOW;
186 } 390 }
187 if (defined (my $v = delete $ob->{fly_off})) { 391 if (defined (my $v = delete $ob->{fly_off})) {
188 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 392 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
189 : $ob->{move_off} & ~MOVE_FLY_LOW;
190 } 393 }
191 if (defined (my $v = delete $ob->{flying})) { 394 if (defined (my $v = delete $ob->{flying})) {
192 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 395 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
193 : $ob->{move_type} & ~MOVE_FLY_LOW;
194 } 396 }
397
398 # convert idiotic event_xxx things into objects
399 while (my ($event, $subtype) = each %EVENT_TYPE) {
400 if (exists $ob->{"event_${event}_plugin"}) {
401 push @{$ob->{inventory}}, {
402 _name => "event_$event",
403 title => delete $ob->{"event_${event}_plugin"},
404 slaying => delete $ob->{"event_${event}"},
405 name => delete $ob->{"event_${event}_options"},
406 };
407 }
408 }
409
410 # some archetypes had "+3" instead of the canonical "3", so fix
411 $ob->{dam} *= 1 if exists $ob->{dam};
195 412
196 $ob 413 $ob
197} 414}
198 415
416# arch as in "arch xxx", ie.. objects
199sub normalize_arch($) { 417sub normalize_arch($) {
200 my ($ob) = @_; 418 my ($ob) = @_;
201 419
202 normalize_object $ob; 420 normalize_object $ob;
203 421
… …
230 delete $ob->{$k}; 448 delete $ob->{$k};
231 } 449 }
232 } 450 }
233 } 451 }
234 452
453 # a speciality for the editor
454 if (exists $ob->{attack_movement}) {
455 my $am = delete $ob->{attack_movement};
456 $ob->{attack_movement_bits_0_3} = $am & 15;
457 $ob->{attack_movement_bits_4_7} = $am & 240;
458 }
459
460 $ob
461}
462
463sub attr_thaw($) {
464 my ($ob) = @_;
465
466 $ob->{attach} = from_json $ob->{attach}
467 if exists $ob->{attach};
468
469 $ob
470}
471
472sub attr_freeze($) {
473 my ($ob) = @_;
474
475 $ob->{attach} = Crossfire::to_json $ob->{attach}
476 if exists $ob->{attach};
477
235 $ob 478 $ob
236} 479}
237 480
238sub read_pak($) { 481sub read_pak($) {
239 my ($path) = @_; 482 my ($path) = @_;
240 483
241 my %pak; 484 my %pak;
242 485
243 open my $fh, "<", $path 486 open my $fh, "<:raw:perlio", $path
244 or Carp::croak "$_[0]: $!"; 487 or Carp::croak "$_[0]: $!";
245 binmode $fh; 488 binmode $fh;
246 while (<$fh>) { 489 while (<$fh>) {
247 my ($type, $id, $len, $path) = split; 490 my ($type, $id, $len, $path) = split;
248 $path =~ s/.*\///; 491 $path =~ s/.*\///;
… …
250 } 493 }
251 494
252 \%pak 495 \%pak
253} 496}
254 497
255sub read_arch($) { 498sub read_arch($;$) {
256 my ($path) = @_; 499 my ($path, $toplevel) = @_;
257 500
258 my %arc; 501 my %arc;
259 my ($more, $prev); 502 my ($more, $prev);
503 my $comment;
260 504
261 open my $fh, "<", $path 505 open my $fh, "<:raw:perlio:utf8", $path
262 or Carp::croak "$path: $!"; 506 or Carp::croak "$path: $!";
263 507
264 binmode $fh; 508# binmode $fh;
265 509
266 my $parse_block; $parse_block = sub { 510 my $parse_block; $parse_block = sub {
267 my %arc = @_; 511 my %arc = @_;
268 512
269 while (<$fh>) { 513 while (<$fh>) {
270 s/\s+$//; 514 s/\s+$//;
271 if (/^end$/i) { 515 if (/^end$/i) {
272 last; 516 last;
517
273 } elsif (/^arch (\S+)$/i) { 518 } elsif (/^arch (\S+)$/i) {
274 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 519 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
520
275 } elsif (/^lore$/i) { 521 } elsif (/^lore$/i) {
276 while (<$fh>) { 522 while (<$fh>) {
277 last if /^endlore\s*$/i; 523 last if /^endlore\s*$/i;
278 $arc{lore} .= $_; 524 $arc{lore} .= $_;
279 } 525 }
280 } elsif (/^msg$/i) { 526 } elsif (/^msg$/i) {
281 while (<$fh>) { 527 while (<$fh>) {
282 last if /^endmsg\s*$/i; 528 last if /^endmsg\s*$/i;
283 $arc{msg} .= $_; 529 $arc{msg} .= $_;
284 } 530 }
531 } elsif (/^anim$/i) {
532 while (<$fh>) {
533 last if /^mina\s*$/i;
534 chomp;
535 push @{ $arc{anim} }, $_;
536 }
285 } elsif (/^(\S+)\s*(.*)$/) { 537 } elsif (/^(\S+)\s*(.*)$/) {
286 $arc{lc $1} = $2; 538 $arc{lc $1} = $2;
287 } elsif (/^\s*($|#)/) { 539 } elsif (/^\s*#/) {
540 $arc{_comment} .= "$_\n";
541
542 } elsif (/^\s*$/) {
288 # 543 #
289 } else { 544 } else {
290 warn "$path: unparsable line '$_' in arch $arc{_name}"; 545 warn "$path: unparsable line '$_' in arch $arc{_name}";
291 } 546 }
292 } 547 }
… …
298 s/\s+$//; 553 s/\s+$//;
299 if (/^more$/i) { 554 if (/^more$/i) {
300 $more = $prev; 555 $more = $prev;
301 } elsif (/^object (\S+)$/i) { 556 } elsif (/^object (\S+)$/i) {
302 my $name = $1; 557 my $name = $1;
303 my $arc = normalize_object $parse_block->(_name => $name); 558 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
559 undef $comment;
560 delete $arc{_comment} unless length $arc{_comment};
561 $arc->{_atype} = 'object';
304 562
305 if ($more) { 563 if ($more) {
306 $more->{more} = $arc; 564 $more->{more} = $arc;
307 } else { 565 } else {
308 $arc{$name} = $arc; 566 $arc{$name} = $arc;
309 } 567 }
310 $prev = $arc; 568 $prev = $arc;
311 $more = undef; 569 $more = undef;
312 } elsif (/^arch (\S+)$/i) { 570 } elsif (/^arch (\S+)$/i) {
313 my $name = $1; 571 my $name = $1;
314 my $arc = normalize_object $parse_block->(_name => $name); 572 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
573 undef $comment;
574 delete $arc{_comment} unless length $arc{_comment};
575 $arc->{_atype} = 'arch';
315 576
316 if ($more) { 577 if ($more) {
317 $more->{more} = $arc; 578 $more->{more} = $arc;
318 } else { 579 } else {
319 push @{ $arc{arch} }, $arc; 580 push @{ $arc{arch} }, $arc;
320 } 581 }
321 $prev = $arc; 582 $prev = $arc;
322 $more = undef; 583 $more = undef;
584 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
585 if ($1 eq "lev_array") {
586 while (<$fh>) {
587 last if /^endplst\s*$/;
588 push @{$toplevel->{lev_array}}, $_+0;
589 }
590 } else {
591 $toplevel->{$1} = $2;
592 }
593 } elsif (/^\s*#/) {
594 $comment .= "$_\n";
323 } elsif (/^\s*($|#)/) { 595 } elsif (/^\s*($|#)/) {
324 # 596 #
325 } else { 597 } else {
326 warn "$path: unparseable top-level line '$_'"; 598 die "$path: unparseable top-level line '$_'";
327 } 599 }
328 } 600 }
329 601
330 undef $parse_block; # work around bug in perl not freeing $fh etc. 602 undef $parse_block; # work around bug in perl not freeing $fh etc.
331 603
332 \%arc 604 \%arc
605}
606
607sub archlist_to_string {
608 my ($arch) = @_;
609
610 my $str;
611
612 my $append; $append = sub {
613 my %a = %{$_[0]};
614
615 Crossfire::attr_freeze \%a;
616 Crossfire::normalize_arch \%a;
617
618 # undo the bit-split we did before
619 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
620 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
621 | (delete $a{attack_movement_bits_4_7});
622 }
623
624 if (my $comment = delete $a{_comment}) {
625 if ($comment =~ /[^\n\s#]/) {
626 $str .= $comment;
627 }
628 }
629
630 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
631
632 my $inv = delete $a{inventory};
633 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
634 my $anim = delete $a{anim};
635
636 if ($a{_atype} eq 'object') {
637 $str .= join "\n", "anim", @$anim, "mina\n"
638 if $anim;
639 }
640
641 my @kv;
642
643 for ($a{_name} eq "map"
644 ? @Crossfire::FIELD_ORDER_MAP
645 : @Crossfire::FIELD_ORDER) {
646 push @kv, [$_, delete $a{$_}]
647 if exists $a{$_};
648 }
649
650 for (sort keys %a) {
651 next if /^_/; # ignore our _-keys
652 push @kv, [$_, delete $a{$_}];
653 }
654
655 for (@kv) {
656 my ($k, $v) = @$_;
657
658 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
659 $v =~ s/\n$//;
660 $str .= "$k\n$v\n$end\n";
661 } else {
662 $str .= "$k $v\n";
663 }
664 }
665
666 if ($inv) {
667 $append->($_) for @$inv;
668 }
669
670 $str .= "end\n";
671
672 if ($a{_atype} eq 'object') {
673 if ($more) {
674 $str .= "more\n";
675 $append->($more) if $more;
676 } else {
677 $str .= "\n";
678 }
679 }
680 };
681
682 for (@$arch) {
683 $append->($_);
684 }
685
686 $str
333} 687}
334 688
335# put all archs into a hash with editor_face as it's key 689# put all archs into a hash with editor_face as it's key
336# NOTE: the arrays in the hash values are references to 690# NOTE: the arrays in the hash values are references to
337# the archs from $ARCH 691# the archs from $ARCH
338sub editor_archs { 692sub editor_archs {
339 my %paths; 693 my %paths;
340 694
341 for (keys %ARCH) { 695 for (keys %ARCH) {
342 my $arch = $ARCH{$_}; 696 my $arch = $ARCH{$_};
343 push @{$paths{$arch->{editor_folder}}}, \$arch; 697 push @{$paths{$arch->{editor_folder}}}, $arch;
344 } 698 }
345 699
346 \%paths 700 \%paths
347} 701}
348 702
… …
358 my ($a) = @_; 712 my ($a) = @_;
359 713
360 my $o = $ARCH{$a->{_name}} 714 my $o = $ARCH{$a->{_name}}
361 or return; 715 or return;
362 716
363 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 717 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
718 unless ($face) {
719 $face = $FACE{"blank.x11"}
364 or (warn "no face data found for arch '$a->{_name}'"), return; 720 or (warn "no face data found for arch '$a->{_name}'"), return;
721 }
365 722
366 if ($face->{w} > 1 || $face->{h} > 1) { 723 if ($face->{w} > 1 || $face->{h} > 1) {
367 # bigface 724 # bigface
368 return (0, 0, $face->{w} - 1, $face->{h} - 1); 725 return (0, 0, $face->{w} - 1, $face->{h} - 1);
369 726
… …
413 my $type = $obj->{type} || $arch->{type}; 770 my $type = $obj->{type} || $arch->{type};
414 771
415 if ($type > 0) { 772 if ($type > 0) {
416 $root = $Crossfire::Data::ATTR{$type}; 773 $root = $Crossfire::Data::ATTR{$type};
417 } else { 774 } else {
775 my %a = (%$arch, %$obj);
776
777 if ($a{is_floor} && !$a{alive}) {
778 $root = $Crossfire::Data::TYPE{Floor};
779 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
780 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
781 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
782 $root = $Crossfire::Data::TYPE{Wall};
783 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
784 $root = $Crossfire::Data::TYPE{"Weak Wall"};
785 } else {
418 $root = $Crossfire::Data::TYPE{Misc}; 786 $root = $Crossfire::Data::TYPE{Misc};
419
420 type:
421 for (@Crossfire::Data::ATTR0) {
422 my $req = $_->{required}
423 or die "internal error: ATTR0 without 'required'";
424
425 keys %$req;
426 while (my ($k, $v) = each %$req) {
427 next type
428 unless $obj->{$k} == $v || $arch->{$k} == $v;
429 }
430
431 $root = $_;
432 } 787 }
433 } 788 }
434 789
435 my @import = ($root); 790 my @import = ($root);
436 791
… …
478 ]; 833 ];
479 834
480 $attr 835 $attr
481} 836}
482 837
483sub arch_edit_sections {
484# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
485# edit_type = 0;
486# else if (edit_type != 0) {
487# // all flags from 'check_type' must be unset in this arch because they get recalculated now
488# edit_type &= ~check_type;
489# }
490#
491# }
492# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
493# getAttributeValue("alive", defarch) == 1 &&
494# (getAttributeValue("monster", defarch) == 1 ||
495# getAttributeValue("generator", defarch) == 1)) {
496# // Monster: monsters/npcs/generators
497# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
498# }
499# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
500# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
501# // Walls
502# edit_type |= IGUIConstants.TILE_EDIT_WALL;
503# }
504# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
505# getAttributeValue("connected", defarch) != 0) {
506# // Connected Objects
507# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
508# }
509# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
510# arch_type == 66 || arch_type == 41 || arch_type == 95) {
511# // Exit: teleporter/exit/trapdoors
512# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
513# }
514# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
515# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
516# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
517# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
518# arch_type == 124 || arch_type == 130)) {
519# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
520# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
521# }
522# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
523# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
524# arch_type == 91 || arch_type == 21 || arch_type == 24) {
525# // Door: door/special door/gates + keys
526# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
527# }
528# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
529# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
530# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
531# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
532# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
533# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
534# arch_type == 122 || arch_type == 3)) {
535# // Equipment: weapons/armour/wands/rods
536# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
537# }
538#
539# return(edit_type);
540#
541#
542}
543
544sub cache_file($$&&) { 838sub cache_file($$&&) {
545 my ($src, $cache, $load, $create) = @_; 839 my ($src, $cache, $load, $create) = @_;
546 840
547 my ($size, $mtime) = (stat $src)[7,9] 841 my ($size, $mtime) = (stat $src)[7,9]
548 or Carp::croak "$src: $!"; 842 or Carp::croak "$src: $!";
… …
610 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 904 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
611 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 905 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
612 or die "$VARDIR/tilecache.png: $!"; 906 or die "$VARDIR/tilecache.png: $!";
613 *FACE = $_[0]; 907 *FACE = $_[0];
614 }, sub { 908 }, sub {
615 require File::Temp;
616
617 my $tile = read_pak "$LIB/crossfire.0"; 909 my $tile = read_pak "$LIB/crossfire.0";
618 910
619 my %cache; 911 my %cache;
620 912
621 my $idx = 0; 913 my $idx = 0;
622 914
623 for my $name (sort keys %$tile) { 915 for my $name (sort keys %$tile) {
624 my ($fh, $filename) = File::Temp::tempfile (); 916 my $pb = new Gtk2::Gdk::PixbufLoader;
625 print $fh $tile->{$name}; 917 $pb->write ($tile->{$name});
626 close $fh; 918 $pb->close;
627 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 919 my $pb = $pb->get_pixbuf;
628 unlink $filename;
629 920
630 my $tile = $cache{$name} = { 921 my $tile = $cache{$name} = {
631 pb => $pb, 922 pb => $pb,
632 idx => $idx, 923 idx => $idx,
633 w => int $pb->get_width / TILESIZE, 924 w => int $pb->get_width / TILESIZE,
… …
651 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 942 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
652 } 943 }
653 } 944 }
654 } 945 }
655 946
656 $pb->save ("$VARDIR/tilecache.png", "png"); 947 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
657 948
658 \%cache 949 \%cache
659 }; 950 };
660} 951}
661 952

Diff Legend

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