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.55 by root, Thu Mar 23 07:06:17 2006 UTC vs.
Revision 1.94 by root, Sat Mar 3 20:07:04 2007 UTC

4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.1'; 9our $VERSION = '0.96';
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.
62our @FIELD_ORDER_MAP = (qw(
63 file_format_version
64 name attach swap_time reset_timeout fixed_resettime difficulty region
65 shopitems shopgreed shopmin shopmax shoprace
66 darkness width height enter_x enter_y msg maplore
67 unique template
68 outdoor temp pressure humid windspeed winddir sky nosmooth
69 tile_path_1 tile_path_2 tile_path_3 tile_path_4
70));
71
44our @FIELD_ORDER = (qw( 72our @FIELD_ORDER = (qw(
73 elevation
74
45 name name_pl custom_name title race 75 name name_pl custom_name attach title race
46 slaying skill msg lore other_arch face 76 slaying skill msg lore other_arch face
47 #events 77 #todo-events
48 animation is_animated 78 animation is_animated
49 Str Dex Con Wis Pow Cha Int 79 str dex con wis pow cha int
50 hp maxhp sp maxsp grace maxgrace 80 hp maxhp sp maxsp grace maxgrace
51 exp perm_exp expmul 81 exp perm_exp expmul
52 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
53 nrof level direction type subtype 83 nrof level direction type subtype attacktype
54 84
55 resist_physical resist_magic resist_fire resist_electricity 85 resist_physical resist_magic resist_fire resist_electricity
56 resist_cold resist_confusion resist_acid resist_drain 86 resist_cold resist_confusion resist_acid resist_drain
57 resist_weaponmagic resist_ghosthit resist_poison resist_slow 87 resist_weaponmagic resist_ghosthit resist_poison resist_slow
58 resist_paralyze resist_turn_undead resist_fear resist_cancellation 88 resist_paralyze resist_turn_undead resist_fear resist_cancellation
87 117
88 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
89 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
90)); 120));
91 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
92sub MOVE_WALK (){ 0x01 } 137sub MOVE_WALK (){ 0x01 }
93sub MOVE_FLY_LOW (){ 0x02 } 138sub MOVE_FLY_LOW (){ 0x02 }
94sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
95sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
96sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
97sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
98sub 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}
99 244
100sub load_ref($) { 245sub load_ref($) {
101 my ($path) = @_; 246 my ($path) = @_;
102 247
103 open my $fh, "<", $path 248 open my $fh, "<:raw:perlio", $path
104 or die "$path: $!"; 249 or die "$path: $!";
105 binmode $fh;
106 local $/; 250 local $/;
107 251
108 thaw <$fh> 252 thaw <$fh>
109} 253}
110 254
111sub save_ref($$) { 255sub save_ref($$) {
112 my ($ref, $path) = @_; 256 my ($ref, $path) = @_;
113 257
114 open my $fh, ">", "$path~" 258 open my $fh, ">:raw:perlio", "$path~"
115 or die "$path~: $!"; 259 or die "$path~: $!";
116 binmode $fh;
117 print $fh freeze $ref; 260 print $fh freeze $ref;
118 close $fh; 261 close $fh;
119 rename "$path~", $path 262 rename "$path~", $path
120 or die "$path: $!"; 263 or die "$path: $!";
121} 264}
122 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
123sub normalize_object($) { 335sub normalize_object($) {
124 my ($ob) = @_; 336 my ($ob) = @_;
125 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
126 delete $ob->{$_} for qw( 358 delete @$ob{qw(
127 can_knockback can_parry can_impale can_cut can_dam_armour 359 can_knockback can_parry can_impale can_cut can_dam_armour
128 can_apply pass_thru can_pass_thru 360 can_apply pass_thru can_pass_thru
129 ); 361 )};
130 362
131 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) {
132 next unless exists $ob->{$attr}; 369 next unless exists $ob->{$attr};
133 next if $ob->{$attr} =~ /^\d+$/;
134 370
135 my $flags = 0; 371 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr};
136
137 # assume list
138 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
139 $flags |= MOVE_WALK if $flag eq "walk";
140 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
141 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
142 $flags |= MOVE_FLYING if $flag eq "flying";
143 $flags |= MOVE_SWIM if $flag eq "swim";
144 $flags |= MOVE_BOAT if $flag eq "boat";
145 $flags |= MOVE_ALL if $flag eq "all";
146
147 $flags &= ~MOVE_WALK if $flag eq "-walk";
148 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
149 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
150 $flags &= ~MOVE_FLYING if $flag eq "-flying";
151 $flags &= ~MOVE_SWIM if $flag eq "-swim";
152 $flags &= ~MOVE_BOAT if $flag eq "-boat";
153 $flags &= ~MOVE_ALL if $flag eq "-all";
154 }
155
156 $ob->{$attr} = $flags;
157 } 372 }
158 373
374 # convert outdated movement flags to new movement sets
159 if (defined (my $v = delete $ob->{no_pass})) { 375 if (defined (my $v = delete $ob->{no_pass})) {
160 $ob->{move_block} = $v ? MOVE_ALL : 0; 376 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
161 } 377 }
162 if (defined (my $v = delete $ob->{slow_move})) { 378 if (defined (my $v = delete $ob->{slow_move})) {
163 $ob->{move_slow} |= MOVE_WALK; 379 $ob->{move_slow} += "walk";
164 $ob->{move_slow_penalty} = $v; 380 $ob->{move_slow_penalty} = $v;
165 } 381 }
166 if (defined (my $v = delete $ob->{walk_on})) { 382 if (defined (my $v = delete $ob->{walk_on})) {
167 $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" }
168 : $ob->{move_on} & ~MOVE_WALK;
169 } 384 }
170 if (defined (my $v = delete $ob->{walk_off})) { 385 if (defined (my $v = delete $ob->{walk_off})) {
171 $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" }
172 : $ob->{move_off} & ~MOVE_WALK;
173 } 387 }
174 if (defined (my $v = delete $ob->{fly_on})) { 388 if (defined (my $v = delete $ob->{fly_on})) {
175 $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" }
176 : $ob->{move_on} & ~MOVE_FLY_LOW;
177 } 390 }
178 if (defined (my $v = delete $ob->{fly_off})) { 391 if (defined (my $v = delete $ob->{fly_off})) {
179 $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" }
180 : $ob->{move_off} & ~MOVE_FLY_LOW;
181 } 393 }
182 if (defined (my $v = delete $ob->{flying})) { 394 if (defined (my $v = delete $ob->{flying})) {
183 $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" }
184 : $ob->{move_type} & ~MOVE_FLY_LOW;
185 } 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};
186 412
187 $ob 413 $ob
188} 414}
189 415
416# arch as in "arch xxx", ie.. objects
190sub normalize_arch($) { 417sub normalize_arch($) {
191 my ($ob) = @_; 418 my ($ob) = @_;
192 419
193 normalize_object $ob; 420 normalize_object $ob;
194 421
221 delete $ob->{$k}; 448 delete $ob->{$k};
222 } 449 }
223 } 450 }
224 } 451 }
225 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
226 $ob 478 $ob
227} 479}
228 480
229sub read_pak($) { 481sub read_pak($) {
230 my ($path) = @_; 482 my ($path) = @_;
231 483
232 my %pak; 484 my %pak;
233 485
234 open my $fh, "<", $path 486 open my $fh, "<:raw:perlio", $path
235 or Carp::croak "$_[0]: $!"; 487 or Carp::croak "$_[0]: $!";
236 binmode $fh; 488 binmode $fh;
237 while (<$fh>) { 489 while (<$fh>) {
238 my ($type, $id, $len, $path) = split; 490 my ($type, $id, $len, $path) = split;
239 $path =~ s/.*\///; 491 $path =~ s/.*\///;
241 } 493 }
242 494
243 \%pak 495 \%pak
244} 496}
245 497
246sub read_arch($) { 498sub read_arch($;$) {
247 my ($path) = @_; 499 my ($path, $toplevel) = @_;
248 500
249 my %arc; 501 my %arc;
250 my ($more, $prev); 502 my ($more, $prev);
503 my $comment;
251 504
252 open my $fh, "<", $path 505 open my $fh, "<:raw:perlio:utf8", $path
253 or Carp::croak "$path: $!"; 506 or Carp::croak "$path: $!";
254 507
255 binmode $fh; 508# binmode $fh;
256 509
257 my $parse_block; $parse_block = sub { 510 my $parse_block; $parse_block = sub {
258 my %arc = @_; 511 my %arc = @_;
259 512
260 while (<$fh>) { 513 while (<$fh>) {
261 s/\s+$//; 514 s/\s+$//;
262 if (/^end$/i) { 515 if (/^end$/i) {
263 last; 516 last;
517
264 } elsif (/^arch (\S+)$/i) { 518 } elsif (/^arch (\S+)$/i) {
265 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 519 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
520
266 } elsif (/^lore$/i) { 521 } elsif (/^lore$/i) {
267 while (<$fh>) { 522 while (<$fh>) {
268 last if /^endlore\s*$/i; 523 last if /^endlore\s*$/i;
269 $arc{lore} .= $_; 524 $arc{lore} .= $_;
270 } 525 }
271 } elsif (/^msg$/i) { 526 } elsif (/^msg$/i) {
272 while (<$fh>) { 527 while (<$fh>) {
273 last if /^endmsg\s*$/i; 528 last if /^endmsg\s*$/i;
274 $arc{msg} .= $_; 529 $arc{msg} .= $_;
275 } 530 }
531 } elsif (/^anim$/i) {
532 while (<$fh>) {
533 last if /^mina\s*$/i;
534 chomp;
535 push @{ $arc{anim} }, $_;
536 }
276 } elsif (/^(\S+)\s*(.*)$/) { 537 } elsif (/^(\S+)\s*(.*)$/) {
277 $arc{lc $1} = $2; 538 $arc{lc $1} = $2;
278 } elsif (/^\s*($|#)/) { 539 } elsif (/^\s*#/) {
540 $arc{_comment} .= "$_\n";
541
542 } elsif (/^\s*$/) {
279 # 543 #
280 } else { 544 } else {
281 warn "$path: unparsable line '$_' in arch $arc{_name}"; 545 warn "$path: unparsable line '$_' in arch $arc{_name}";
282 } 546 }
283 } 547 }
289 s/\s+$//; 553 s/\s+$//;
290 if (/^more$/i) { 554 if (/^more$/i) {
291 $more = $prev; 555 $more = $prev;
292 } elsif (/^object (\S+)$/i) { 556 } elsif (/^object (\S+)$/i) {
293 my $name = $1; 557 my $name = $1;
294 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';
295 562
296 if ($more) { 563 if ($more) {
297 $more->{more} = $arc; 564 $more->{more} = $arc;
298 } else { 565 } else {
299 $arc{$name} = $arc; 566 $arc{$name} = $arc;
300 } 567 }
301 $prev = $arc; 568 $prev = $arc;
302 $more = undef; 569 $more = undef;
303 } elsif (/^arch (\S+)$/i) { 570 } elsif (/^arch (\S+)$/i) {
304 my $name = $1; 571 my $name = $1;
305 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';
306 576
307 if ($more) { 577 if ($more) {
308 $more->{more} = $arc; 578 $more->{more} = $arc;
309 } else { 579 } else {
310 push @{ $arc{arch} }, $arc; 580 push @{ $arc{arch} }, $arc;
311 } 581 }
312 $prev = $arc; 582 $prev = $arc;
313 $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";
314 } elsif (/^\s*($|#)/) { 595 } elsif (/^\s*($|#)/) {
315 # 596 #
316 } else { 597 } else {
317 warn "$path: unparseable top-level line '$_'"; 598 die "$path: unparseable top-level line '$_'";
318 } 599 }
319 } 600 }
320 601
321 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.
322 603
323 \%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
324} 687}
325 688
326# 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
327# NOTE: the arrays in the hash values are references to 690# NOTE: the arrays in the hash values are references to
328# the archs from $ARCH 691# the archs from $ARCH
329sub editor_archs { 692sub editor_archs {
330 my %paths; 693 my %paths;
331 694
332 for (keys %ARCH) { 695 for (keys %ARCH) {
333 my $arch = $ARCH{$_}; 696 my $arch = $ARCH{$_};
334 push @{$paths{$arch->{editor_folder}}}, \$arch; 697 push @{$paths{$arch->{editor_folder}}}, $arch;
335 } 698 }
336 699
337 \%paths 700 \%paths
338} 701}
339 702
349 my ($a) = @_; 712 my ($a) = @_;
350 713
351 my $o = $ARCH{$a->{_name}} 714 my $o = $ARCH{$a->{_name}}
352 or return; 715 or return;
353 716
354 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"}
355 or (warn "no face data found for arch '$a->{_name}'"), return; 720 or (warn "no face data found for arch '$a->{_name}'"), return;
721 }
356 722
357 if ($face->{w} > 1 || $face->{h} > 1) { 723 if ($face->{w} > 1 || $face->{h} > 1) {
358 # bigface 724 # bigface
359 return (0, 0, $face->{w} - 1, $face->{h} - 1); 725 return (0, 0, $face->{w} - 1, $face->{h} - 1);
360 726
404 my $type = $obj->{type} || $arch->{type}; 770 my $type = $obj->{type} || $arch->{type};
405 771
406 if ($type > 0) { 772 if ($type > 0) {
407 $root = $Crossfire::Data::ATTR{$type}; 773 $root = $Crossfire::Data::ATTR{$type};
408 } 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 {
409 $root = $Crossfire::Data::TYPE{Misc}; 786 $root = $Crossfire::Data::TYPE{Misc};
410
411 type:
412 for (@Crossfire::Data::ATTR0) {
413 my $req = $_->{required}
414 or die "internal error: ATTR0 without 'required'";
415
416 keys %$req;
417 while (my ($k, $v) = each %$req) {
418 next type
419 unless $obj->{$k} == $v || $arch->{$k} == $v;
420 }
421
422 $root = $_;
423 } 787 }
424 } 788 }
425 789
426 my @import = ($root); 790 my @import = ($root);
427 791
469 ]; 833 ];
470 834
471 $attr 835 $attr
472} 836}
473 837
474sub arch_edit_sections {
475# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
476# edit_type = 0;
477# else if (edit_type != 0) {
478# // all flags from 'check_type' must be unset in this arch because they get recalculated now
479# edit_type &= ~check_type;
480# }
481#
482# }
483# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
484# getAttributeValue("alive", defarch) == 1 &&
485# (getAttributeValue("monster", defarch) == 1 ||
486# getAttributeValue("generator", defarch) == 1)) {
487# // Monster: monsters/npcs/generators
488# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
489# }
490# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
491# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
492# // Walls
493# edit_type |= IGUIConstants.TILE_EDIT_WALL;
494# }
495# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
496# getAttributeValue("connected", defarch) != 0) {
497# // Connected Objects
498# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
499# }
500# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
501# arch_type == 66 || arch_type == 41 || arch_type == 95) {
502# // Exit: teleporter/exit/trapdoors
503# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
504# }
505# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
506# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
507# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
508# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
509# arch_type == 124 || arch_type == 130)) {
510# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
511# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
512# }
513# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
514# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
515# arch_type == 91 || arch_type == 21 || arch_type == 24) {
516# // Door: door/special door/gates + keys
517# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
518# }
519# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
520# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
521# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
522# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
523# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
524# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
525# arch_type == 122 || arch_type == 3)) {
526# // Equipment: weapons/armour/wands/rods
527# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
528# }
529#
530# return(edit_type);
531#
532#
533}
534
535sub cache_file($$&&) { 838sub cache_file($$&&) {
536 my ($src, $cache, $load, $create) = @_; 839 my ($src, $cache, $load, $create) = @_;
537 840
538 my ($size, $mtime) = (stat $src)[7,9] 841 my ($size, $mtime) = (stat $src)[7,9]
539 or Carp::croak "$src: $!"; 842 or Carp::croak "$src: $!";
601 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 904 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
602 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 905 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
603 or die "$VARDIR/tilecache.png: $!"; 906 or die "$VARDIR/tilecache.png: $!";
604 *FACE = $_[0]; 907 *FACE = $_[0];
605 }, sub { 908 }, sub {
606 require File::Temp;
607
608 my $tile = read_pak "$LIB/crossfire.0"; 909 my $tile = read_pak "$LIB/crossfire.0";
609 910
610 my %cache; 911 my %cache;
611 912
612 my $idx = 0; 913 my $idx = 0;
613 914
614 for my $name (sort keys %$tile) { 915 for my $name (sort keys %$tile) {
615 my ($fh, $filename) = File::Temp::tempfile (); 916 my $pb = new Gtk2::Gdk::PixbufLoader;
616 print $fh $tile->{$name}; 917 $pb->write ($tile->{$name});
617 close $fh; 918 $pb->close;
618 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 919 my $pb = $pb->get_pixbuf;
619 unlink $filename;
620 920
621 my $tile = $cache{$name} = { 921 my $tile = $cache{$name} = {
622 pb => $pb, 922 pb => $pb,
623 idx => $idx, 923 idx => $idx,
624 w => int $pb->get_width / TILESIZE, 924 w => int $pb->get_width / TILESIZE,
642 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 942 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
643 } 943 }
644 } 944 }
645 } 945 }
646 946
647 $pb->save ("$VARDIR/tilecache.png", "png"); 947 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
648 948
649 \%cache 949 \%cache
650 }; 950 };
651} 951}
652 952

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines