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.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.
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 $_[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}
99 240
100sub load_ref($) { 241sub load_ref($) {
101 my ($path) = @_; 242 my ($path) = @_;
102 243
103 open my $fh, "<", $path 244 open my $fh, "<:raw:perlio", $path
104 or die "$path: $!"; 245 or die "$path: $!";
105 binmode $fh;
106 local $/; 246 local $/;
107 247
108 thaw <$fh> 248 thaw <$fh>
109} 249}
110 250
111sub save_ref($$) { 251sub save_ref($$) {
112 my ($ref, $path) = @_; 252 my ($ref, $path) = @_;
113 253
114 open my $fh, ">", "$path~" 254 open my $fh, ">:raw:perlio", "$path~"
115 or die "$path~: $!"; 255 or die "$path~: $!";
116 binmode $fh;
117 print $fh freeze $ref; 256 print $fh freeze $ref;
118 close $fh; 257 close $fh;
119 rename "$path~", $path 258 rename "$path~", $path
120 or die "$path: $!"; 259 or die "$path: $!";
121} 260}
122 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
123sub normalize_object($) { 331sub normalize_object($) {
124 my ($ob) = @_; 332 my ($ob) = @_;
125 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
126 delete $ob->{$_} for qw( 354 delete @$ob{qw(
127 can_knockback can_parry can_impale can_cut can_dam_armour 355 can_knockback can_parry can_impale can_cut can_dam_armour
128 can_apply pass_thru can_pass_thru 356 can_apply pass_thru can_pass_thru
129 ); 357 )};
130 358
131 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) {
132 next unless exists $ob->{$attr}; 365 next unless exists $ob->{$attr};
133 next if $ob->{$attr} =~ /^\d+$/;
134 366
135 my $flags = 0; 367 $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 } 368 }
158 369
370 # convert outdated movement flags to new movement sets
159 if (defined (my $v = delete $ob->{no_pass})) { 371 if (defined (my $v = delete $ob->{no_pass})) {
160 $ob->{move_block} = $v ? MOVE_ALL : 0; 372 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
161 } 373 }
162 if (defined (my $v = delete $ob->{slow_move})) { 374 if (defined (my $v = delete $ob->{slow_move})) {
163 $ob->{move_slow} |= MOVE_WALK; 375 $ob->{move_slow} += "walk";
164 $ob->{move_slow_penalty} = $v; 376 $ob->{move_slow_penalty} = $v;
165 } 377 }
166 if (defined (my $v = delete $ob->{walk_on})) { 378 if (defined (my $v = delete $ob->{walk_on})) {
167 $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" }
168 : $ob->{move_on} & ~MOVE_WALK;
169 } 380 }
170 if (defined (my $v = delete $ob->{walk_off})) { 381 if (defined (my $v = delete $ob->{walk_off})) {
171 $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" }
172 : $ob->{move_off} & ~MOVE_WALK;
173 } 383 }
174 if (defined (my $v = delete $ob->{fly_on})) { 384 if (defined (my $v = delete $ob->{fly_on})) {
175 $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" }
176 : $ob->{move_on} & ~MOVE_FLY_LOW;
177 } 386 }
178 if (defined (my $v = delete $ob->{fly_off})) { 387 if (defined (my $v = delete $ob->{fly_off})) {
179 $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" }
180 : $ob->{move_off} & ~MOVE_FLY_LOW;
181 } 389 }
182 if (defined (my $v = delete $ob->{flying})) { 390 if (defined (my $v = delete $ob->{flying})) {
183 $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" }
184 : $ob->{move_type} & ~MOVE_FLY_LOW;
185 } 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};
186 408
187 $ob 409 $ob
188} 410}
189 411
412# arch as in "arch xxx", ie.. objects
190sub normalize_arch($) { 413sub normalize_arch($) {
191 my ($ob) = @_; 414 my ($ob) = @_;
192 415
193 normalize_object $ob; 416 normalize_object $ob;
194 417
… …
221 delete $ob->{$k}; 444 delete $ob->{$k};
222 } 445 }
223 } 446 }
224 } 447 }
225 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
226 $ob 474 $ob
227} 475}
228 476
229sub read_pak($) { 477sub read_pak($) {
230 my ($path) = @_; 478 my ($path) = @_;
231 479
232 my %pak; 480 my %pak;
233 481
234 open my $fh, "<", $path 482 open my $fh, "<:raw:perlio", $path
235 or Carp::croak "$_[0]: $!"; 483 or Carp::croak "$_[0]: $!";
236 binmode $fh; 484 binmode $fh;
237 while (<$fh>) { 485 while (<$fh>) {
238 my ($type, $id, $len, $path) = split; 486 my ($type, $id, $len, $path) = split;
239 $path =~ s/.*\///; 487 $path =~ s/.*\///;
… …
241 } 489 }
242 490
243 \%pak 491 \%pak
244} 492}
245 493
246sub read_arch($) { 494sub read_arch($;$) {
247 my ($path) = @_; 495 my ($path, $toplevel) = @_;
248 496
249 my %arc; 497 my %arc;
250 my ($more, $prev); 498 my ($more, $prev);
499 my $comment;
251 500
252 open my $fh, "<", $path 501 open my $fh, "<:raw:perlio:utf8", $path
253 or Carp::croak "$path: $!"; 502 or Carp::croak "$path: $!";
254 503
255 binmode $fh; 504# binmode $fh;
256 505
257 my $parse_block; $parse_block = sub { 506 my $parse_block; $parse_block = sub {
258 my %arc = @_; 507 my %arc = @_;
259 508
260 while (<$fh>) { 509 while (<$fh>) {
261 s/\s+$//; 510 s/\s+$//;
262 if (/^end$/i) { 511 if (/^end$/i) {
263 last; 512 last;
513
264 } elsif (/^arch (\S+)$/i) { 514 } elsif (/^arch (\S+)$/i) {
265 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 515 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
516
266 } elsif (/^lore$/i) { 517 } elsif (/^lore$/i) {
267 while (<$fh>) { 518 while (<$fh>) {
268 last if /^endlore\s*$/i; 519 last if /^endlore\s*$/i;
269 $arc{lore} .= $_; 520 $arc{lore} .= $_;
270 } 521 }
271 } elsif (/^msg$/i) { 522 } elsif (/^msg$/i) {
272 while (<$fh>) { 523 while (<$fh>) {
273 last if /^endmsg\s*$/i; 524 last if /^endmsg\s*$/i;
274 $arc{msg} .= $_; 525 $arc{msg} .= $_;
275 } 526 }
527 } elsif (/^anim$/i) {
528 while (<$fh>) {
529 last if /^mina\s*$/i;
530 chomp;
531 push @{ $arc{anim} }, $_;
532 }
276 } elsif (/^(\S+)\s*(.*)$/) { 533 } elsif (/^(\S+)\s*(.*)$/) {
277 $arc{lc $1} = $2; 534 $arc{lc $1} = $2;
278 } elsif (/^\s*($|#)/) { 535 } elsif (/^\s*#/) {
536 $arc{_comment} .= "$_\n";
537
538 } elsif (/^\s*$/) {
279 # 539 #
280 } else { 540 } else {
281 warn "$path: unparsable line '$_' in arch $arc{_name}"; 541 warn "$path: unparsable line '$_' in arch $arc{_name}";
282 } 542 }
283 } 543 }
… …
289 s/\s+$//; 549 s/\s+$//;
290 if (/^more$/i) { 550 if (/^more$/i) {
291 $more = $prev; 551 $more = $prev;
292 } elsif (/^object (\S+)$/i) { 552 } elsif (/^object (\S+)$/i) {
293 my $name = $1; 553 my $name = $1;
294 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';
295 558
296 if ($more) { 559 if ($more) {
297 $more->{more} = $arc; 560 $more->{more} = $arc;
298 } else { 561 } else {
299 $arc{$name} = $arc; 562 $arc{$name} = $arc;
300 } 563 }
301 $prev = $arc; 564 $prev = $arc;
302 $more = undef; 565 $more = undef;
303 } elsif (/^arch (\S+)$/i) { 566 } elsif (/^arch (\S+)$/i) {
304 my $name = $1; 567 my $name = $1;
305 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';
306 572
307 if ($more) { 573 if ($more) {
308 $more->{more} = $arc; 574 $more->{more} = $arc;
309 } else { 575 } else {
310 push @{ $arc{arch} }, $arc; 576 push @{ $arc{arch} }, $arc;
311 } 577 }
312 $prev = $arc; 578 $prev = $arc;
313 $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";
314 } elsif (/^\s*($|#)/) { 591 } elsif (/^\s*($|#)/) {
315 # 592 #
316 } else { 593 } else {
317 warn "$path: unparseable top-level line '$_'"; 594 die "$path: unparseable top-level line '$_'";
318 } 595 }
319 } 596 }
320 597
321 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.
322 599
323 \%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
324} 683}
325 684
326# 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
327# NOTE: the arrays in the hash values are references to 686# NOTE: the arrays in the hash values are references to
328# the archs from $ARCH 687# the archs from $ARCH
329sub editor_archs { 688sub editor_archs {
330 my %paths; 689 my %paths;
331 690
332 for (keys %ARCH) { 691 for (keys %ARCH) {
333 my $arch = $ARCH{$_}; 692 my $arch = $ARCH{$_};
334 push @{$paths{$arch->{editor_folder}}}, \$arch; 693 push @{$paths{$arch->{editor_folder}}}, $arch;
335 } 694 }
336 695
337 \%paths 696 \%paths
338} 697}
339 698
… …
349 my ($a) = @_; 708 my ($a) = @_;
350 709
351 my $o = $ARCH{$a->{_name}} 710 my $o = $ARCH{$a->{_name}}
352 or return; 711 or return;
353 712
354 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"}
355 or (warn "no face data found for arch '$a->{_name}'"), return; 716 or (warn "no face data found for arch '$a->{_name}'"), return;
717 }
356 718
357 if ($face->{w} > 1 || $face->{h} > 1) { 719 if ($face->{w} > 1 || $face->{h} > 1) {
358 # bigface 720 # bigface
359 return (0, 0, $face->{w} - 1, $face->{h} - 1); 721 return (0, 0, $face->{w} - 1, $face->{h} - 1);
360 722
… …
404 my $type = $obj->{type} || $arch->{type}; 766 my $type = $obj->{type} || $arch->{type};
405 767
406 if ($type > 0) { 768 if ($type > 0) {
407 $root = $Crossfire::Data::ATTR{$type}; 769 $root = $Crossfire::Data::ATTR{$type};
408 } 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 {
409 $root = $Crossfire::Data::TYPE{Misc}; 782 $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 } 783 }
424 } 784 }
425 785
426 my @import = ($root); 786 my @import = ($root);
427 787
… …
469 ]; 829 ];
470 830
471 $attr 831 $attr
472} 832}
473 833
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($$&&) { 834sub cache_file($$&&) {
536 my ($src, $cache, $load, $create) = @_; 835 my ($src, $cache, $load, $create) = @_;
537 836
538 my ($size, $mtime) = (stat $src)[7,9] 837 my ($size, $mtime) = (stat $src)[7,9]
539 or Carp::croak "$src: $!"; 838 or Carp::croak "$src: $!";
… …
601 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 900 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
602 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 901 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
603 or die "$VARDIR/tilecache.png: $!"; 902 or die "$VARDIR/tilecache.png: $!";
604 *FACE = $_[0]; 903 *FACE = $_[0];
605 }, sub { 904 }, sub {
606 require File::Temp;
607
608 my $tile = read_pak "$LIB/crossfire.0"; 905 my $tile = read_pak "$LIB/crossfire.0";
609 906
610 my %cache; 907 my %cache;
611 908
612 my $idx = 0; 909 my $idx = 0;
613 910
614 for my $name (sort keys %$tile) { 911 for my $name (sort keys %$tile) {
615 my ($fh, $filename) = File::Temp::tempfile (); 912 my $pb = new Gtk2::Gdk::PixbufLoader;
616 print $fh $tile->{$name}; 913 $pb->write ($tile->{$name});
617 close $fh; 914 $pb->close;
618 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 915 my $pb = $pb->get_pixbuf;
619 unlink $filename;
620 916
621 my $tile = $cache{$name} = { 917 my $tile = $cache{$name} = {
622 pb => $pb, 918 pb => $pb,
623 idx => $idx, 919 idx => $idx,
624 w => int $pb->get_width / TILESIZE, 920 w => int $pb->get_width / TILESIZE,
… …
642 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 938 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
643 } 939 }
644 } 940 }
645 } 941 }
646 942
647 $pb->save ("$VARDIR/tilecache.png", "png"); 943 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
648 944
649 \%cache 945 \%cache
650 }; 946 };
651} 947}
652 948

Diff Legend

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