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

Diff Legend

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