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.92 by root, Sat Mar 3 19:32:00 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.
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 '""' => \&as_string,
163 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
164 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
165 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
166 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
167 'x=' => sub {
168 my $cur = $_[0] >= $_[1];
169 if (!defined $cur) {
170 $_[0] += $_[1];
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}
108 239
109sub load_ref($) { 240sub load_ref($) {
110 my ($path) = @_; 241 my ($path) = @_;
111 242
112 open my $fh, "<", $path 243 open my $fh, "<:raw:perlio", $path
113 or die "$path: $!"; 244 or die "$path: $!";
114 binmode $fh;
115 local $/; 245 local $/;
116 246
117 thaw <$fh> 247 thaw <$fh>
118} 248}
119 249
120sub save_ref($$) { 250sub save_ref($$) {
121 my ($ref, $path) = @_; 251 my ($ref, $path) = @_;
122 252
123 open my $fh, ">", "$path~" 253 open my $fh, ">:raw:perlio", "$path~"
124 or die "$path~: $!"; 254 or die "$path~: $!";
125 binmode $fh;
126 print $fh freeze $ref; 255 print $fh freeze $ref;
127 close $fh; 256 close $fh;
128 rename "$path~", $path 257 rename "$path~", $path
129 or die "$path: $!"; 258 or die "$path: $!";
130} 259}
131 260
261my %attack_mask = (
262 physical => 0x00000001,
263 magic => 0x00000002,
264 fire => 0x00000004,
265 electricity => 0x00000008,
266 cold => 0x00000010,
267 confusion => 0x00000020,
268 acid => 0x00000040,
269 drain => 0x00000080,
270 weaponmagic => 0x00000100,
271 ghosthit => 0x00000200,
272 poison => 0x00000400,
273 slow => 0x00000800,
274 paralyze => 0x00001000,
275 turn_undead => 0x00002000,
276 fear => 0x00004000,
277 cancellation => 0x00008000,
278 deplete => 0x00010000,
279 death => 0x00020000,
280 chaos => 0x00040000,
281 counterspell => 0x00080000,
282 godpower => 0x00100000,
283 holyword => 0x00200000,
284 blind => 0x00400000,
285 internal => 0x00800000,
286 life_stealing => 0x01000000,
287 disease => 0x02000000,
288);
289
290sub _add_resist($$$) {
291 my ($ob, $mask, $value) = @_;
292
293 while (my ($k, $v) = each %attack_mask) {
294 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
295 }
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;
328
329# object as in "Object xxx", i.e. archetypes
132sub normalize_object($) { 330sub normalize_object($) {
133 my ($ob) = @_; 331 my ($ob) = @_;
134 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 # nuke outdated or never supported fields
135 delete $ob->{$_} for qw( 353 delete @$ob{qw(
136 can_knockback can_parry can_impale can_cut can_dam_armour 354 can_knockback can_parry can_impale can_cut can_dam_armour
137 can_apply pass_thru can_pass_thru 355 can_apply pass_thru can_pass_thru
138 ); 356 )};
139 357
140 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 358 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
359 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
360 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
361
362 # convert movement strings to bitsets
363 for my $attr (keys %FIELD_MOVEMENT) {
141 next unless exists $ob->{$attr}; 364 next unless exists $ob->{$attr};
142 next if $ob->{$attr} =~ /^\d+$/;
143 365
144 my $flags = 0; 366 $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 } 367 }
167 368
369 # convert outdated movement flags to new movement sets
168 if (defined (my $v = delete $ob->{no_pass})) { 370 if (defined (my $v = delete $ob->{no_pass})) {
169 $ob->{move_block} = $v ? MOVE_ALL : 0; 371 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
170 } 372 }
171 if (defined (my $v = delete $ob->{slow_move})) { 373 if (defined (my $v = delete $ob->{slow_move})) {
172 $ob->{move_slow} |= MOVE_WALK; 374 $ob->{move_slow} += "walk";
173 $ob->{move_slow_penalty} = $v; 375 $ob->{move_slow_penalty} = $v;
174 } 376 }
175 if (defined (my $v = delete $ob->{walk_on})) { 377 if (defined (my $v = delete $ob->{walk_on})) {
176 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 378 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
177 : $ob->{move_on} & ~MOVE_WALK;
178 } 379 }
179 if (defined (my $v = delete $ob->{walk_off})) { 380 if (defined (my $v = delete $ob->{walk_off})) {
180 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 381 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
181 : $ob->{move_off} & ~MOVE_WALK;
182 } 382 }
183 if (defined (my $v = delete $ob->{fly_on})) { 383 if (defined (my $v = delete $ob->{fly_on})) {
184 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 384 $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 } 385 }
187 if (defined (my $v = delete $ob->{fly_off})) { 386 if (defined (my $v = delete $ob->{fly_off})) {
188 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 387 $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 } 388 }
191 if (defined (my $v = delete $ob->{flying})) { 389 if (defined (my $v = delete $ob->{flying})) {
192 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 390 $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 } 391 }
392
393 # convert idiotic event_xxx things into objects
394 while (my ($event, $subtype) = each %EVENT_TYPE) {
395 if (exists $ob->{"event_${event}_plugin"}) {
396 push @{$ob->{inventory}}, {
397 _name => "event_$event",
398 title => delete $ob->{"event_${event}_plugin"},
399 slaying => delete $ob->{"event_${event}"},
400 name => delete $ob->{"event_${event}_options"},
401 };
402 }
403 }
404
405 # some archetypes had "+3" instead of the canonical "3", so fix
406 $ob->{dam} *= 1 if exists $ob->{dam};
195 407
196 $ob 408 $ob
197} 409}
198 410
411# arch as in "arch xxx", ie.. objects
199sub normalize_arch($) { 412sub normalize_arch($) {
200 my ($ob) = @_; 413 my ($ob) = @_;
201 414
202 normalize_object $ob; 415 normalize_object $ob;
203 416
… …
230 delete $ob->{$k}; 443 delete $ob->{$k};
231 } 444 }
232 } 445 }
233 } 446 }
234 447
448 # a speciality for the editor
449 if (exists $ob->{attack_movement}) {
450 my $am = delete $ob->{attack_movement};
451 $ob->{attack_movement_bits_0_3} = $am & 15;
452 $ob->{attack_movement_bits_4_7} = $am & 240;
453 }
454
455 $ob
456}
457
458sub attr_thaw($) {
459 my ($ob) = @_;
460
461 $ob->{attach} = from_json $ob->{attach}
462 if exists $ob->{attach};
463
464 $ob
465}
466
467sub attr_freeze($) {
468 my ($ob) = @_;
469
470 $ob->{attach} = Crossfire::to_json $ob->{attach}
471 if exists $ob->{attach};
472
235 $ob 473 $ob
236} 474}
237 475
238sub read_pak($) { 476sub read_pak($) {
239 my ($path) = @_; 477 my ($path) = @_;
240 478
241 my %pak; 479 my %pak;
242 480
243 open my $fh, "<", $path 481 open my $fh, "<:raw:perlio", $path
244 or Carp::croak "$_[0]: $!"; 482 or Carp::croak "$_[0]: $!";
245 binmode $fh; 483 binmode $fh;
246 while (<$fh>) { 484 while (<$fh>) {
247 my ($type, $id, $len, $path) = split; 485 my ($type, $id, $len, $path) = split;
248 $path =~ s/.*\///; 486 $path =~ s/.*\///;
… …
250 } 488 }
251 489
252 \%pak 490 \%pak
253} 491}
254 492
255sub read_arch($) { 493sub read_arch($;$) {
256 my ($path) = @_; 494 my ($path, $toplevel) = @_;
257 495
258 my %arc; 496 my %arc;
259 my ($more, $prev); 497 my ($more, $prev);
498 my $comment;
260 499
261 open my $fh, "<", $path 500 open my $fh, "<:raw:perlio:utf8", $path
262 or Carp::croak "$path: $!"; 501 or Carp::croak "$path: $!";
263 502
264 binmode $fh; 503# binmode $fh;
265 504
266 my $parse_block; $parse_block = sub { 505 my $parse_block; $parse_block = sub {
267 my %arc = @_; 506 my %arc = @_;
268 507
269 while (<$fh>) { 508 while (<$fh>) {
270 s/\s+$//; 509 s/\s+$//;
271 if (/^end$/i) { 510 if (/^end$/i) {
272 last; 511 last;
512
273 } elsif (/^arch (\S+)$/i) { 513 } elsif (/^arch (\S+)$/i) {
274 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 514 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
515
275 } elsif (/^lore$/i) { 516 } elsif (/^lore$/i) {
276 while (<$fh>) { 517 while (<$fh>) {
277 last if /^endlore\s*$/i; 518 last if /^endlore\s*$/i;
278 $arc{lore} .= $_; 519 $arc{lore} .= $_;
279 } 520 }
280 } elsif (/^msg$/i) { 521 } elsif (/^msg$/i) {
281 while (<$fh>) { 522 while (<$fh>) {
282 last if /^endmsg\s*$/i; 523 last if /^endmsg\s*$/i;
283 $arc{msg} .= $_; 524 $arc{msg} .= $_;
284 } 525 }
526 } elsif (/^anim$/i) {
527 while (<$fh>) {
528 last if /^mina\s*$/i;
529 chomp;
530 push @{ $arc{anim} }, $_;
531 }
285 } elsif (/^(\S+)\s*(.*)$/) { 532 } elsif (/^(\S+)\s*(.*)$/) {
286 $arc{lc $1} = $2; 533 $arc{lc $1} = $2;
287 } elsif (/^\s*($|#)/) { 534 } elsif (/^\s*#/) {
535 $arc{_comment} .= "$_\n";
536
537 } elsif (/^\s*$/) {
288 # 538 #
289 } else { 539 } else {
290 warn "$path: unparsable line '$_' in arch $arc{_name}"; 540 warn "$path: unparsable line '$_' in arch $arc{_name}";
291 } 541 }
292 } 542 }
… …
298 s/\s+$//; 548 s/\s+$//;
299 if (/^more$/i) { 549 if (/^more$/i) {
300 $more = $prev; 550 $more = $prev;
301 } elsif (/^object (\S+)$/i) { 551 } elsif (/^object (\S+)$/i) {
302 my $name = $1; 552 my $name = $1;
303 my $arc = normalize_object $parse_block->(_name => $name); 553 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
554 undef $comment;
555 delete $arc{_comment} unless length $arc{_comment};
556 $arc->{_atype} = 'object';
304 557
305 if ($more) { 558 if ($more) {
306 $more->{more} = $arc; 559 $more->{more} = $arc;
307 } else { 560 } else {
308 $arc{$name} = $arc; 561 $arc{$name} = $arc;
309 } 562 }
310 $prev = $arc; 563 $prev = $arc;
311 $more = undef; 564 $more = undef;
312 } elsif (/^arch (\S+)$/i) { 565 } elsif (/^arch (\S+)$/i) {
313 my $name = $1; 566 my $name = $1;
314 my $arc = normalize_object $parse_block->(_name => $name); 567 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
568 undef $comment;
569 delete $arc{_comment} unless length $arc{_comment};
570 $arc->{_atype} = 'arch';
315 571
316 if ($more) { 572 if ($more) {
317 $more->{more} = $arc; 573 $more->{more} = $arc;
318 } else { 574 } else {
319 push @{ $arc{arch} }, $arc; 575 push @{ $arc{arch} }, $arc;
320 } 576 }
321 $prev = $arc; 577 $prev = $arc;
322 $more = undef; 578 $more = undef;
579 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
580 if ($1 eq "lev_array") {
581 while (<$fh>) {
582 last if /^endplst\s*$/;
583 push @{$toplevel->{lev_array}}, $_+0;
584 }
585 } else {
586 $toplevel->{$1} = $2;
587 }
588 } elsif (/^\s*#/) {
589 $comment .= "$_\n";
323 } elsif (/^\s*($|#)/) { 590 } elsif (/^\s*($|#)/) {
324 # 591 #
325 } else { 592 } else {
326 warn "$path: unparseable top-level line '$_'"; 593 die "$path: unparseable top-level line '$_'";
327 } 594 }
328 } 595 }
329 596
330 undef $parse_block; # work around bug in perl not freeing $fh etc. 597 undef $parse_block; # work around bug in perl not freeing $fh etc.
331 598
332 \%arc 599 \%arc
600}
601
602sub archlist_to_string {
603 my ($arch) = @_;
604
605 my $str;
606
607 my $append; $append = sub {
608 my %a = %{$_[0]};
609
610 Crossfire::attr_freeze \%a;
611 Crossfire::normalize_arch \%a;
612
613 # undo the bit-split we did before
614 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
615 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
616 | (delete $a{attack_movement_bits_4_7});
617 }
618
619 if (my $comment = delete $a{_comment}) {
620 if ($comment =~ /[^\n\s#]/) {
621 $str .= $comment;
622 }
623 }
624
625 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
626
627 my $inv = delete $a{inventory};
628 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
629 my $anim = delete $a{anim};
630
631 if ($a{_atype} eq 'object') {
632 $str .= join "\n", "anim", @$anim, "mina\n"
633 if $anim;
634 }
635
636 my @kv;
637
638 for ($a{_name} eq "map"
639 ? @Crossfire::FIELD_ORDER_MAP
640 : @Crossfire::FIELD_ORDER) {
641 push @kv, [$_, delete $a{$_}]
642 if exists $a{$_};
643 }
644
645 for (sort keys %a) {
646 next if /^_/; # ignore our _-keys
647 push @kv, [$_, delete $a{$_}];
648 }
649
650 for (@kv) {
651 my ($k, $v) = @$_;
652
653 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
654 $v =~ s/\n$//;
655 $str .= "$k\n$v\n$end\n";
656 } else {
657 $str .= "$k $v\n";
658 }
659 }
660
661 if ($inv) {
662 $append->($_) for @$inv;
663 }
664
665 $str .= "end\n";
666
667 if ($a{_atype} eq 'object') {
668 if ($more) {
669 $str .= "more\n";
670 $append->($more) if $more;
671 } else {
672 $str .= "\n";
673 }
674 }
675 };
676
677 for (@$arch) {
678 $append->($_);
679 }
680
681 $str
333} 682}
334 683
335# put all archs into a hash with editor_face as it's key 684# put all archs into a hash with editor_face as it's key
336# NOTE: the arrays in the hash values are references to 685# NOTE: the arrays in the hash values are references to
337# the archs from $ARCH 686# the archs from $ARCH
338sub editor_archs { 687sub editor_archs {
339 my %paths; 688 my %paths;
340 689
341 for (keys %ARCH) { 690 for (keys %ARCH) {
342 my $arch = $ARCH{$_}; 691 my $arch = $ARCH{$_};
343 push @{$paths{$arch->{editor_folder}}}, \$arch; 692 push @{$paths{$arch->{editor_folder}}}, $arch;
344 } 693 }
345 694
346 \%paths 695 \%paths
347} 696}
348 697
… …
358 my ($a) = @_; 707 my ($a) = @_;
359 708
360 my $o = $ARCH{$a->{_name}} 709 my $o = $ARCH{$a->{_name}}
361 or return; 710 or return;
362 711
363 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 712 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
713 unless ($face) {
714 $face = $FACE{"blank.x11"}
364 or (warn "no face data found for arch '$a->{_name}'"), return; 715 or (warn "no face data found for arch '$a->{_name}'"), return;
716 }
365 717
366 if ($face->{w} > 1 || $face->{h} > 1) { 718 if ($face->{w} > 1 || $face->{h} > 1) {
367 # bigface 719 # bigface
368 return (0, 0, $face->{w} - 1, $face->{h} - 1); 720 return (0, 0, $face->{w} - 1, $face->{h} - 1);
369 721
… …
413 my $type = $obj->{type} || $arch->{type}; 765 my $type = $obj->{type} || $arch->{type};
414 766
415 if ($type > 0) { 767 if ($type > 0) {
416 $root = $Crossfire::Data::ATTR{$type}; 768 $root = $Crossfire::Data::ATTR{$type};
417 } else { 769 } else {
770 my %a = (%$arch, %$obj);
771
772 if ($a{is_floor} && !$a{alive}) {
773 $root = $Crossfire::Data::TYPE{Floor};
774 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
775 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
776 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
777 $root = $Crossfire::Data::TYPE{Wall};
778 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
779 $root = $Crossfire::Data::TYPE{"Weak Wall"};
780 } else {
418 $root = $Crossfire::Data::TYPE{Misc}; 781 $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 } 782 }
433 } 783 }
434 784
435 my @import = ($root); 785 my @import = ($root);
436 786
… …
478 ]; 828 ];
479 829
480 $attr 830 $attr
481} 831}
482 832
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($$&&) { 833sub cache_file($$&&) {
545 my ($src, $cache, $load, $create) = @_; 834 my ($src, $cache, $load, $create) = @_;
546 835
547 my ($size, $mtime) = (stat $src)[7,9] 836 my ($size, $mtime) = (stat $src)[7,9]
548 or Carp::croak "$src: $!"; 837 or Carp::croak "$src: $!";
… …
610 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 899 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
611 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 900 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
612 or die "$VARDIR/tilecache.png: $!"; 901 or die "$VARDIR/tilecache.png: $!";
613 *FACE = $_[0]; 902 *FACE = $_[0];
614 }, sub { 903 }, sub {
615 require File::Temp;
616
617 my $tile = read_pak "$LIB/crossfire.0"; 904 my $tile = read_pak "$LIB/crossfire.0";
618 905
619 my %cache; 906 my %cache;
620 907
621 my $idx = 0; 908 my $idx = 0;
622 909
623 for my $name (sort keys %$tile) { 910 for my $name (sort keys %$tile) {
624 my ($fh, $filename) = File::Temp::tempfile (); 911 my $pb = new Gtk2::Gdk::PixbufLoader;
625 print $fh $tile->{$name}; 912 $pb->write ($tile->{$name});
626 close $fh; 913 $pb->close;
627 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 914 my $pb = $pb->get_pixbuf;
628 unlink $filename;
629 915
630 my $tile = $cache{$name} = { 916 my $tile = $cache{$name} = {
631 pb => $pb, 917 pb => $pb,
632 idx => $idx, 918 idx => $idx,
633 w => int $pb->get_width / TILESIZE, 919 w => int $pb->get_width / TILESIZE,
… …
651 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 937 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
652 } 938 }
653 } 939 }
654 } 940 }
655 941
656 $pb->save ("$VARDIR/tilecache.png", "png"); 942 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
657 943
658 \%cache 944 \%cache
659 }; 945 };
660} 946}
661 947

Diff Legend

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