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

Diff Legend

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