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.57 by root, Thu Mar 23 08:55:54 2006 UTC vs.
Revision 1.96 by root, Sun Mar 11 00:14:44 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(
54 elevation 73 elevation
55 74
56 name name_pl custom_name title race 75 name name_pl custom_name attach title race
57 slaying skill msg lore other_arch face 76 slaying skill msg lore other_arch face
58 #todo-events 77 #todo-events
59 animation is_animated 78 animation is_animated
60 Str Dex Con Wis Pow Cha Int 79 str dex con wis pow cha int
61 hp maxhp sp maxsp grace maxgrace 80 hp maxhp sp maxsp grace maxgrace
62 exp perm_exp expmul 81 exp perm_exp expmul
63 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
64 nrof level direction type subtype 83 nrof level direction type subtype attacktype
65 84
66 resist_physical resist_magic resist_fire resist_electricity 85 resist_physical resist_magic resist_fire resist_electricity
67 resist_cold resist_confusion resist_acid resist_drain 86 resist_cold resist_confusion resist_acid resist_drain
68 resist_weaponmagic resist_ghosthit resist_poison resist_slow 87 resist_weaponmagic resist_ghosthit resist_poison resist_slow
69 resist_paralyze resist_turn_undead resist_fear resist_cancellation 88 resist_paralyze resist_turn_undead resist_fear resist_cancellation
… …
98 117
99 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
100 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
101)); 120));
102 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
103sub MOVE_WALK (){ 0x01 } 137sub MOVE_WALK (){ 0x01 }
104sub MOVE_FLY_LOW (){ 0x02 } 138sub MOVE_FLY_LOW (){ 0x02 }
105sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
106sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
107sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
108sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
109sub 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}
110 244
111sub load_ref($) { 245sub load_ref($) {
112 my ($path) = @_; 246 my ($path) = @_;
113 247
114 open my $fh, "<", $path 248 open my $fh, "<:raw:perlio", $path
115 or die "$path: $!"; 249 or die "$path: $!";
116 binmode $fh;
117 local $/; 250 local $/;
118 251
119 thaw <$fh> 252 thaw <$fh>
120} 253}
121 254
122sub save_ref($$) { 255sub save_ref($$) {
123 my ($ref, $path) = @_; 256 my ($ref, $path) = @_;
124 257
125 open my $fh, ">", "$path~" 258 open my $fh, ">:raw:perlio", "$path~"
126 or die "$path~: $!"; 259 or die "$path~: $!";
127 binmode $fh;
128 print $fh freeze $ref; 260 print $fh freeze $ref;
129 close $fh; 261 close $fh;
130 rename "$path~", $path 262 rename "$path~", $path
131 or die "$path: $!"; 263 or die "$path: $!";
132} 264}
133 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
134sub normalize_object($) { 335sub normalize_object($) {
135 my ($ob) = @_; 336 my ($ob) = @_;
136 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 # color_fg is used as default for magicmap if magicmap does not exist
358 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
359
360 # nuke outdated or never supported fields
137 delete $ob->{$_} for qw( 361 delete @$ob{qw(
138 can_knockback can_parry can_impale can_cut can_dam_armour 362 can_knockback can_parry can_impale can_cut can_dam_armour
139 can_apply pass_thru can_pass_thru 363 can_apply pass_thru can_pass_thru
140 ); 364 )};
141 365
142 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 366 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
367 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
368 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
369
370 # convert movement strings to bitsets
371 for my $attr (keys %FIELD_MOVEMENT) {
143 next unless exists $ob->{$attr}; 372 next unless exists $ob->{$attr};
144 next if $ob->{$attr} =~ /^\d+$/;
145 373
146 my $flags = 0; 374 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr};
147
148 # assume list
149 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
150 $flags |= MOVE_WALK if $flag eq "walk";
151 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
152 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
153 $flags |= MOVE_FLYING if $flag eq "flying";
154 $flags |= MOVE_SWIM if $flag eq "swim";
155 $flags |= MOVE_BOAT if $flag eq "boat";
156 $flags |= MOVE_ALL if $flag eq "all";
157
158 $flags &= ~MOVE_WALK if $flag eq "-walk";
159 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
160 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
161 $flags &= ~MOVE_FLYING if $flag eq "-flying";
162 $flags &= ~MOVE_SWIM if $flag eq "-swim";
163 $flags &= ~MOVE_BOAT if $flag eq "-boat";
164 $flags &= ~MOVE_ALL if $flag eq "-all";
165 }
166
167 $ob->{$attr} = $flags;
168 } 375 }
169 376
377 # convert outdated movement flags to new movement sets
170 if (defined (my $v = delete $ob->{no_pass})) { 378 if (defined (my $v = delete $ob->{no_pass})) {
171 $ob->{move_block} = $v ? MOVE_ALL : 0; 379 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
172 } 380 }
173 if (defined (my $v = delete $ob->{slow_move})) { 381 if (defined (my $v = delete $ob->{slow_move})) {
174 $ob->{move_slow} |= MOVE_WALK; 382 $ob->{move_slow} += "walk";
175 $ob->{move_slow_penalty} = $v; 383 $ob->{move_slow_penalty} = $v;
176 } 384 }
177 if (defined (my $v = delete $ob->{walk_on})) { 385 if (defined (my $v = delete $ob->{walk_on})) {
178 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 386 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
179 : $ob->{move_on} & ~MOVE_WALK;
180 } 387 }
181 if (defined (my $v = delete $ob->{walk_off})) { 388 if (defined (my $v = delete $ob->{walk_off})) {
182 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 389 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
183 : $ob->{move_off} & ~MOVE_WALK;
184 } 390 }
185 if (defined (my $v = delete $ob->{fly_on})) { 391 if (defined (my $v = delete $ob->{fly_on})) {
186 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 392 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
187 : $ob->{move_on} & ~MOVE_FLY_LOW;
188 } 393 }
189 if (defined (my $v = delete $ob->{fly_off})) { 394 if (defined (my $v = delete $ob->{fly_off})) {
190 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 395 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
191 : $ob->{move_off} & ~MOVE_FLY_LOW;
192 } 396 }
193 if (defined (my $v = delete $ob->{flying})) { 397 if (defined (my $v = delete $ob->{flying})) {
194 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 398 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
195 : $ob->{move_type} & ~MOVE_FLY_LOW;
196 } 399 }
400
401 # convert idiotic event_xxx things into objects
402 while (my ($event, $subtype) = each %EVENT_TYPE) {
403 if (exists $ob->{"event_${event}_plugin"}) {
404 push @{$ob->{inventory}}, {
405 _name => "event_$event",
406 title => delete $ob->{"event_${event}_plugin"},
407 slaying => delete $ob->{"event_${event}"},
408 name => delete $ob->{"event_${event}_options"},
409 };
410 }
411 }
412
413 # some archetypes had "+3" instead of the canonical "3", so fix
414 $ob->{dam} *= 1 if exists $ob->{dam};
197 415
198 $ob 416 $ob
199} 417}
200 418
419# arch as in "arch xxx", ie.. objects
201sub normalize_arch($) { 420sub normalize_arch($) {
202 my ($ob) = @_; 421 my ($ob) = @_;
203 422
204 normalize_object $ob; 423 normalize_object $ob;
205 424
… …
242 } 461 }
243 462
244 $ob 463 $ob
245} 464}
246 465
466sub attr_thaw($) {
467 my ($ob) = @_;
468
469 $ob->{attach} = from_json $ob->{attach}
470 if exists $ob->{attach};
471
472 $ob
473}
474
475sub attr_freeze($) {
476 my ($ob) = @_;
477
478 $ob->{attach} = Crossfire::to_json $ob->{attach}
479 if exists $ob->{attach};
480
481 $ob
482}
483
247sub read_pak($) { 484sub read_pak($) {
248 my ($path) = @_; 485 my ($path) = @_;
249 486
250 my %pak; 487 my %pak;
251 488
252 open my $fh, "<", $path 489 open my $fh, "<:raw:perlio", $path
253 or Carp::croak "$_[0]: $!"; 490 or Carp::croak "$_[0]: $!";
254 binmode $fh; 491 binmode $fh;
255 while (<$fh>) { 492 while (<$fh>) {
256 my ($type, $id, $len, $path) = split; 493 my ($type, $id, $len, $path) = split;
257 $path =~ s/.*\///; 494 $path =~ s/.*\///;
… …
259 } 496 }
260 497
261 \%pak 498 \%pak
262} 499}
263 500
264sub read_arch($) { 501sub read_arch($;$) {
265 my ($path) = @_; 502 my ($path, $toplevel) = @_;
266 503
267 my %arc; 504 my %arc;
268 my ($more, $prev); 505 my ($more, $prev);
506 my $comment;
269 507
270 open my $fh, "<", $path 508 open my $fh, "<:raw:perlio:utf8", $path
271 or Carp::croak "$path: $!"; 509 or Carp::croak "$path: $!";
272 510
273 binmode $fh; 511# binmode $fh;
274 512
275 my $parse_block; $parse_block = sub { 513 my $parse_block; $parse_block = sub {
276 my %arc = @_; 514 my %arc = @_;
277 515
278 while (<$fh>) { 516 while (<$fh>) {
279 s/\s+$//; 517 s/\s+$//;
280 if (/^end$/i) { 518 if (/^end$/i) {
281 last; 519 last;
520
282 } elsif (/^arch (\S+)$/i) { 521 } elsif (/^arch (\S+)$/i) {
283 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 522 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
523
284 } elsif (/^lore$/i) { 524 } elsif (/^lore$/i) {
285 while (<$fh>) { 525 while (<$fh>) {
286 last if /^endlore\s*$/i; 526 last if /^endlore\s*$/i;
287 $arc{lore} .= $_; 527 $arc{lore} .= $_;
288 } 528 }
289 } elsif (/^msg$/i) { 529 } elsif (/^msg$/i) {
290 while (<$fh>) { 530 while (<$fh>) {
291 last if /^endmsg\s*$/i; 531 last if /^endmsg\s*$/i;
292 $arc{msg} .= $_; 532 $arc{msg} .= $_;
293 } 533 }
534 } elsif (/^anim$/i) {
535 while (<$fh>) {
536 last if /^mina\s*$/i;
537 chomp;
538 push @{ $arc{anim} }, $_;
539 }
294 } elsif (/^(\S+)\s*(.*)$/) { 540 } elsif (/^(\S+)\s*(.*)$/) {
295 $arc{lc $1} = $2; 541 $arc{lc $1} = $2;
296 } elsif (/^\s*($|#)/) { 542 } elsif (/^\s*#/) {
543 $arc{_comment} .= "$_\n";
544
545 } elsif (/^\s*$/) {
297 # 546 #
298 } else { 547 } else {
299 warn "$path: unparsable line '$_' in arch $arc{_name}"; 548 warn "$path: unparsable line '$_' in arch $arc{_name}";
300 } 549 }
301 } 550 }
… …
307 s/\s+$//; 556 s/\s+$//;
308 if (/^more$/i) { 557 if (/^more$/i) {
309 $more = $prev; 558 $more = $prev;
310 } elsif (/^object (\S+)$/i) { 559 } elsif (/^object (\S+)$/i) {
311 my $name = $1; 560 my $name = $1;
312 my $arc = normalize_object $parse_block->(_name => $name); 561 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
562 undef $comment;
563 delete $arc{_comment} unless length $arc{_comment};
564 $arc->{_atype} = 'object';
313 565
314 if ($more) { 566 if ($more) {
315 $more->{more} = $arc; 567 $more->{more} = $arc;
316 } else { 568 } else {
317 $arc{$name} = $arc; 569 $arc{$name} = $arc;
318 } 570 }
319 $prev = $arc; 571 $prev = $arc;
320 $more = undef; 572 $more = undef;
321 } elsif (/^arch (\S+)$/i) { 573 } elsif (/^arch (\S+)$/i) {
322 my $name = $1; 574 my $name = $1;
323 my $arc = normalize_arch $parse_block->(_name => $name); 575 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
576 undef $comment;
577 delete $arc{_comment} unless length $arc{_comment};
578 $arc->{_atype} = 'arch';
324 579
325 if ($more) { 580 if ($more) {
326 $more->{more} = $arc; 581 $more->{more} = $arc;
327 } else { 582 } else {
328 push @{ $arc{arch} }, $arc; 583 push @{ $arc{arch} }, $arc;
329 } 584 }
330 $prev = $arc; 585 $prev = $arc;
331 $more = undef; 586 $more = undef;
587 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
588 if ($1 eq "lev_array") {
589 while (<$fh>) {
590 last if /^endplst\s*$/;
591 push @{$toplevel->{lev_array}}, $_+0;
592 }
593 } else {
594 $toplevel->{$1} = $2;
595 }
596 } elsif (/^\s*#/) {
597 $comment .= "$_\n";
332 } elsif (/^\s*($|#)/) { 598 } elsif (/^\s*($|#)/) {
333 # 599 #
334 } else { 600 } else {
335 warn "$path: unparseable top-level line '$_'"; 601 die "$path: unparseable top-level line '$_'";
336 } 602 }
337 } 603 }
338 604
339 undef $parse_block; # work around bug in perl not freeing $fh etc. 605 undef $parse_block; # work around bug in perl not freeing $fh etc.
340 606
341 \%arc 607 \%arc
608}
609
610sub archlist_to_string {
611 my ($arch) = @_;
612
613 my $str;
614
615 my $append; $append = sub {
616 my %a = %{$_[0]};
617
618 Crossfire::attr_freeze \%a;
619 Crossfire::normalize_arch \%a;
620
621 # undo the bit-split we did before
622 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
623 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
624 | (delete $a{attack_movement_bits_4_7});
625 }
626
627 if (my $comment = delete $a{_comment}) {
628 if ($comment =~ /[^\n\s#]/) {
629 $str .= $comment;
630 }
631 }
632
633 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
634
635 my $inv = delete $a{inventory};
636 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
637 my $anim = delete $a{anim};
638
639 if ($a{_atype} eq 'object') {
640 $str .= join "\n", "anim", @$anim, "mina\n"
641 if $anim;
642 }
643
644 my @kv;
645
646 for ($a{_name} eq "map"
647 ? @Crossfire::FIELD_ORDER_MAP
648 : @Crossfire::FIELD_ORDER) {
649 push @kv, [$_, delete $a{$_}]
650 if exists $a{$_};
651 }
652
653 for (sort keys %a) {
654 next if /^_/; # ignore our _-keys
655 push @kv, [$_, delete $a{$_}];
656 }
657
658 for (@kv) {
659 my ($k, $v) = @$_;
660
661 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
662 $v =~ s/\n$//;
663 $str .= "$k\n$v\n$end\n";
664 } else {
665 $str .= "$k $v\n";
666 }
667 }
668
669 if ($inv) {
670 $append->($_) for @$inv;
671 }
672
673 $str .= "end\n";
674
675 if ($a{_atype} eq 'object') {
676 if ($more) {
677 $str .= "more\n";
678 $append->($more) if $more;
679 } else {
680 $str .= "\n";
681 }
682 }
683 };
684
685 for (@$arch) {
686 $append->($_);
687 }
688
689 $str
342} 690}
343 691
344# put all archs into a hash with editor_face as it's key 692# put all archs into a hash with editor_face as it's key
345# NOTE: the arrays in the hash values are references to 693# NOTE: the arrays in the hash values are references to
346# the archs from $ARCH 694# the archs from $ARCH
347sub editor_archs { 695sub editor_archs {
348 my %paths; 696 my %paths;
349 697
350 for (keys %ARCH) { 698 for (keys %ARCH) {
351 my $arch = $ARCH{$_}; 699 my $arch = $ARCH{$_};
352 push @{$paths{$arch->{editor_folder}}}, \$arch; 700 push @{$paths{$arch->{editor_folder}}}, $arch;
353 } 701 }
354 702
355 \%paths 703 \%paths
356} 704}
357 705
… …
367 my ($a) = @_; 715 my ($a) = @_;
368 716
369 my $o = $ARCH{$a->{_name}} 717 my $o = $ARCH{$a->{_name}}
370 or return; 718 or return;
371 719
372 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 720 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
721 unless ($face) {
722 $face = $FACE{"blank.x11"}
373 or (warn "no face data found for arch '$a->{_name}'"), return; 723 or (warn "no face data found for arch '$a->{_name}'"), return;
724 }
374 725
375 if ($face->{w} > 1 || $face->{h} > 1) { 726 if ($face->{w} > 1 || $face->{h} > 1) {
376 # bigface 727 # bigface
377 return (0, 0, $face->{w} - 1, $face->{h} - 1); 728 return (0, 0, $face->{w} - 1, $face->{h} - 1);
378 729
… …
422 my $type = $obj->{type} || $arch->{type}; 773 my $type = $obj->{type} || $arch->{type};
423 774
424 if ($type > 0) { 775 if ($type > 0) {
425 $root = $Crossfire::Data::ATTR{$type}; 776 $root = $Crossfire::Data::ATTR{$type};
426 } else { 777 } else {
778 my %a = (%$arch, %$obj);
779
780 if ($a{is_floor} && !$a{alive}) {
781 $root = $Crossfire::Data::TYPE{Floor};
782 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
783 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
784 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
785 $root = $Crossfire::Data::TYPE{Wall};
786 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
787 $root = $Crossfire::Data::TYPE{"Weak Wall"};
788 } else {
427 $root = $Crossfire::Data::TYPE{Misc}; 789 $root = $Crossfire::Data::TYPE{Misc};
428
429 type:
430 for (@Crossfire::Data::ATTR0) {
431 my $req = $_->{required}
432 or die "internal error: ATTR0 without 'required'";
433
434 keys %$req;
435 while (my ($k, $v) = each %$req) {
436 next type
437 unless $obj->{$k} == $v || $arch->{$k} == $v;
438 }
439
440 $root = $_;
441 } 790 }
442 } 791 }
443 792
444 my @import = ($root); 793 my @import = ($root);
445 794
… …
487 ]; 836 ];
488 837
489 $attr 838 $attr
490} 839}
491 840
492sub arch_edit_sections {
493# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
494# edit_type = 0;
495# else if (edit_type != 0) {
496# // all flags from 'check_type' must be unset in this arch because they get recalculated now
497# edit_type &= ~check_type;
498# }
499#
500# }
501# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
502# getAttributeValue("alive", defarch) == 1 &&
503# (getAttributeValue("monster", defarch) == 1 ||
504# getAttributeValue("generator", defarch) == 1)) {
505# // Monster: monsters/npcs/generators
506# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
507# }
508# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
509# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
510# // Walls
511# edit_type |= IGUIConstants.TILE_EDIT_WALL;
512# }
513# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
514# getAttributeValue("connected", defarch) != 0) {
515# // Connected Objects
516# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
517# }
518# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
519# arch_type == 66 || arch_type == 41 || arch_type == 95) {
520# // Exit: teleporter/exit/trapdoors
521# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
522# }
523# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
524# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
525# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
526# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
527# arch_type == 124 || arch_type == 130)) {
528# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
529# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
530# }
531# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
532# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
533# arch_type == 91 || arch_type == 21 || arch_type == 24) {
534# // Door: door/special door/gates + keys
535# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
536# }
537# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
538# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
539# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
540# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
541# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
542# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
543# arch_type == 122 || arch_type == 3)) {
544# // Equipment: weapons/armour/wands/rods
545# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
546# }
547#
548# return(edit_type);
549#
550#
551}
552
553sub cache_file($$&&) { 841sub cache_file($$&&) {
554 my ($src, $cache, $load, $create) = @_; 842 my ($src, $cache, $load, $create) = @_;
555 843
556 my ($size, $mtime) = (stat $src)[7,9] 844 my ($size, $mtime) = (stat $src)[7,9]
557 or Carp::croak "$src: $!"; 845 or Carp::croak "$src: $!";
… …
619 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 907 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
620 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 908 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
621 or die "$VARDIR/tilecache.png: $!"; 909 or die "$VARDIR/tilecache.png: $!";
622 *FACE = $_[0]; 910 *FACE = $_[0];
623 }, sub { 911 }, sub {
624 require File::Temp;
625
626 my $tile = read_pak "$LIB/crossfire.0"; 912 my $tile = read_pak "$LIB/crossfire.0";
627 913
628 my %cache; 914 my %cache;
629 915
630 my $idx = 0; 916 my $idx = 0;
631 917
632 for my $name (sort keys %$tile) { 918 for my $name (sort keys %$tile) {
633 my ($fh, $filename) = File::Temp::tempfile (); 919 my $pb = new Gtk2::Gdk::PixbufLoader;
634 print $fh $tile->{$name}; 920 $pb->write ($tile->{$name});
635 close $fh; 921 $pb->close;
636 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 922 my $pb = $pb->get_pixbuf;
637 unlink $filename;
638 923
639 my $tile = $cache{$name} = { 924 my $tile = $cache{$name} = {
640 pb => $pb, 925 pb => $pb,
641 idx => $idx, 926 idx => $idx,
642 w => int $pb->get_width / TILESIZE, 927 w => int $pb->get_width / TILESIZE,
… …
660 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 945 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
661 } 946 }
662 } 947 }
663 } 948 }
664 949
665 $pb->save ("$VARDIR/tilecache.png", "png"); 950 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
666 951
667 \%cache 952 \%cache
668 }; 953 };
669} 954}
670 955

Diff Legend

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