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.101 by root, Tue Apr 10 09:37:03 2007 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.1'; 9our $VERSION = '0.98';
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::XS qw(from_json to_json);
25
24our $LIB = $ENV{CROSSFIRE_LIBDIR}; 26our $LIB = $ENV{CROSSFIRE_LIBDIR};
25 27
26our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; 28our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire"
29 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
30 : File::Spec->tmpdir . "/crossfire";
27 31
28mkdir $VARDIR, 0777; 32mkdir $VARDIR, 0777;
29 33
30sub TILESIZE (){ 32 } 34sub TILESIZE (){ 32 }
31 35
… …
37 msg => "endmsg", 41 msg => "endmsg",
38 lore => "endlore", 42 lore => "endlore",
39 maplore => "endmaplore", 43 maplore => "endmaplore",
40); 44);
41 45
46# movement bit type, PITA
47our %FIELD_MOVEMENT = map +($_ => undef),
48 qw(move_type move_block move_allow move_on move_off move_slow);
49
42# same as in server save routine, to (hopefully) be compatible 50# same as in server save routine, to (hopefully) be compatible
43# to the other editors. 51# to the other editors.
52our @FIELD_ORDER_MAP = (qw(
53 file_format_version
54 name attach swap_time reset_timeout fixed_resettime difficulty region
55 shopitems shopgreed shopmin shopmax shoprace
56 darkness width height enter_x enter_y msg maplore
57 unique template
58 outdoor temp pressure humid windspeed winddir sky nosmooth
59 tile_path_1 tile_path_2 tile_path_3 tile_path_4
60));
61
44our @FIELD_ORDER = (qw( 62our @FIELD_ORDER = (qw(
63 elevation
64
45 name name_pl custom_name title race 65 name name_pl custom_name attach title race
46 slaying skill msg lore other_arch face 66 slaying skill msg lore other_arch
47 #events 67 is_animated animation face
48 animation is_animated 68 magicmap smoothlevel smoothface
49 Str Dex Con Wis Pow Cha Int 69 str dex con wis pow cha int
50 hp maxhp sp maxsp grace maxgrace 70 hp maxhp sp maxsp grace maxgrace
51 exp perm_exp expmul 71 exp perm_exp expmul
52 food dam luck wc ac x y speed speed_left move_state attack_movement 72 food dam luck wc ac x y speed speed_left move_state attack_movement
53 nrof level direction type subtype 73 nrof level direction type subtype attacktype
54 74
55 resist_physical resist_magic resist_fire resist_electricity 75 resist_physical resist_magic resist_fire resist_electricity
56 resist_cold resist_confusion resist_acid resist_drain 76 resist_cold resist_confusion resist_acid resist_drain
57 resist_weaponmagic resist_ghosthit resist_poison resist_slow 77 resist_weaponmagic resist_ghosthit resist_poison resist_slow
58 resist_paralyze resist_turn_undead resist_fear resist_cancellation 78 resist_paralyze resist_turn_undead resist_fear resist_cancellation
… …
87 107
88 body_range body_arm body_torso body_head body_neck body_skill 108 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 109 body_finger body_shoulder body_foot body_hand body_wrist body_waist
90)); 110));
91 111
112our %EVENT_TYPE = (
113 apply => 1,
114 attack => 2,
115 death => 3,
116 drop => 4,
117 pickup => 5,
118 say => 6,
119 stop => 7,
120 time => 8,
121 throw => 9,
122 trigger => 10,
123 close => 11,
124 timer => 12,
125);
126
92sub MOVE_WALK (){ 0x01 } 127sub MOVE_WALK (){ 0x01 }
93sub MOVE_FLY_LOW (){ 0x02 } 128sub MOVE_FLY_LOW (){ 0x02 }
94sub MOVE_FLY_HIGH (){ 0x04 } 129sub MOVE_FLY_HIGH (){ 0x04 }
95sub MOVE_FLYING (){ 0x06 } 130sub MOVE_FLYING (){ 0x06 }
96sub MOVE_SWIM (){ 0x08 } 131sub MOVE_SWIM (){ 0x08 }
97sub MOVE_BOAT (){ 0x10 } 132sub MOVE_BOAT (){ 0x10 }
98sub MOVE_ALL (){ 0xff } 133sub MOVE_KNOWN (){ 0x1f } # all of above
134sub MOVE_ALL (){ 0x10000 } # very special value
135
136our %MOVE_TYPE = (
137 walk => MOVE_WALK,
138 fly_low => MOVE_FLY_LOW,
139 fly_high => MOVE_FLY_HIGH,
140 flying => MOVE_FLYING,
141 swim => MOVE_SWIM,
142 boat => MOVE_BOAT,
143 all => MOVE_ALL,
144);
145
146our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat);
147
148{
149 package Crossfire::MoveType;
150
151 use overload
152 '=' => sub { bless [@{$_[0]}], ref $_[0] },
153 '""' => \&as_string,
154 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
155 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
156 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
157 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
158 'x=' => sub {
159 my $cur = $_[0] >= $_[1];
160 if (!defined $cur) {
161 if ($_[0] >= "all") {
162 $_[0] -= $_[1];
163 } else {
164 $_[0] += $_[1];
165 }
166 } elsif ($cur) {
167 $_[0] -= $_[1];
168 } else {
169 $_[0] /= $_[1];
170 }
171
172 $_[0]
173 },
174 'eq' => sub { "$_[0]" eq "$_[1]" },
175 'ne' => sub { "$_[0]" ne "$_[1]" },
176 ;
177}
178
179sub Crossfire::MoveType::new {
180 my ($class, $string) = @_;
181
182 my $mask;
183 my $value;
184
185 if ($string =~ /^\s*\d+\s*$/) {
186 $mask = MOVE_ALL;
187 $value = $string+0;
188 } else {
189 for (split /\s+/, lc $string) {
190 if (s/^-//) {
191 $mask |= $MOVE_TYPE{$_};
192 $value &= ~$MOVE_TYPE{$_};
193 } else {
194 $mask |= $MOVE_TYPE{$_};
195 $value |= $MOVE_TYPE{$_};
196 }
197 }
198 }
199
200 (bless [$mask, $value], $class)->normalise
201}
202
203sub Crossfire::MoveType::normalise {
204 my ($self) = @_;
205
206 if ($self->[0] & MOVE_ALL) {
207 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
208 $self->[0] &= $mask;
209 $self->[1] &= $mask;
210 }
211
212 $self->[1] &= $self->[0];
213
214 $self
215}
216
217sub Crossfire::MoveType::as_string {
218 my ($self) = @_;
219
220 my @res;
221
222 my ($mask, $value) = @$self;
223
224 for (@Crossfire::MOVE_TYPE) {
225 my $bit = $Crossfire::MOVE_TYPE{$_};
226 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
227 $mask &= ~$bit;
228 push @res, $value & $bit ? $_ : "-$_";
229 }
230 }
231
232 join " ", @res
233}
99 234
100sub load_ref($) { 235sub load_ref($) {
101 my ($path) = @_; 236 my ($path) = @_;
102 237
103 open my $fh, "<", $path 238 open my $fh, "<:raw:perlio", $path
104 or die "$path: $!"; 239 or die "$path: $!";
105 binmode $fh;
106 local $/; 240 local $/;
107 241
108 thaw <$fh> 242 thaw <$fh>
109} 243}
110 244
111sub save_ref($$) { 245sub save_ref($$) {
112 my ($ref, $path) = @_; 246 my ($ref, $path) = @_;
113 247
114 open my $fh, ">", "$path~" 248 open my $fh, ">:raw:perlio", "$path~"
115 or die "$path~: $!"; 249 or die "$path~: $!";
116 binmode $fh;
117 print $fh freeze $ref; 250 print $fh freeze $ref;
118 close $fh; 251 close $fh;
119 rename "$path~", $path 252 rename "$path~", $path
120 or die "$path: $!"; 253 or die "$path: $!";
121} 254}
122 255
256my %attack_mask = (
257 physical => 0x00000001,
258 magic => 0x00000002,
259 fire => 0x00000004,
260 electricity => 0x00000008,
261 cold => 0x00000010,
262 confusion => 0x00000020,
263 acid => 0x00000040,
264 drain => 0x00000080,
265 weaponmagic => 0x00000100,
266 ghosthit => 0x00000200,
267 poison => 0x00000400,
268 slow => 0x00000800,
269 paralyze => 0x00001000,
270 turn_undead => 0x00002000,
271 fear => 0x00004000,
272 cancellation => 0x00008000,
273 deplete => 0x00010000,
274 death => 0x00020000,
275 chaos => 0x00040000,
276 counterspell => 0x00080000,
277 godpower => 0x00100000,
278 holyword => 0x00200000,
279 blind => 0x00400000,
280 internal => 0x00800000,
281 life_stealing => 0x01000000,
282 disease => 0x02000000,
283);
284
285sub _add_resist($$$) {
286 my ($ob, $mask, $value) = @_;
287
288 while (my ($k, $v) = each %attack_mask) {
289 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
290 }
291}
292
293my %MATERIAL = reverse
294 paper => 1,
295 iron => 2,
296 glass => 4,
297 leather => 8,
298 wood => 16,
299 organic => 32,
300 stone => 64,
301 cloth => 128,
302 adamant => 256,
303 liquid => 512,
304 tin => 1024,
305 bone => 2048,
306 ice => 4096,
307
308 # guesses
309 runestone => 12,
310 bronze => 18,
311 "ancient wood" => 20,
312 glass => 36,
313 marble => 66,
314 ice => 68,
315 stone => 70,
316 stone => 80,
317 cloth => 136,
318 ironwood => 144,
319 adamantium => 258,
320 glacium => 260,
321 blood => 544,
322;
323
324# object as in "Object xxx", i.e. archetypes
123sub normalize_object($) { 325sub normalize_object($) {
124 my ($ob) = @_; 326 my ($ob) = @_;
125 327
328 # convert material bitset to materialname, if possible
329 if (exists $ob->{material}) {
330 if (!$ob->{material}) {
331 delete $ob->{material};
332 } elsif (exists $ob->{materialname}) {
333 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
334 delete $ob->{material};
335 } else {
336 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
337 delete $ob->{material}; # assume materilname is more specific and nuke material
338 }
339 } elsif (my $name = $MATERIAL{$ob->{material}}) {
340 delete $ob->{material};
341 $ob->{materialname} = $name;
342 } else {
343 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
344 }
345 }
346
347 # color_fg is used as default for magicmap if magicmap does not exist
348 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
349
350 # nuke outdated or never supported fields
126 delete $ob->{$_} for qw( 351 delete @$ob{qw(
127 can_knockback can_parry can_impale can_cut can_dam_armour 352 can_knockback can_parry can_impale can_cut can_dam_armour
128 can_apply pass_thru can_pass_thru 353 can_apply pass_thru can_pass_thru color_bg color_fg
129 ); 354 )};
130 355
131 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 356 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
357 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
358 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
359
360 # convert movement strings to bitsets
361 for my $attr (keys %FIELD_MOVEMENT) {
132 next unless exists $ob->{$attr}; 362 next unless exists $ob->{$attr};
133 next if $ob->{$attr} =~ /^\d+$/;
134 363
135 my $flags = 0; 364 $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 } 365 }
158 366
367 # convert outdated movement flags to new movement sets
159 if (defined (my $v = delete $ob->{no_pass})) { 368 if (defined (my $v = delete $ob->{no_pass})) {
160 $ob->{move_block} = $v ? MOVE_ALL : 0; 369 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
161 } 370 }
162 if (defined (my $v = delete $ob->{slow_move})) { 371 if (defined (my $v = delete $ob->{slow_move})) {
163 $ob->{move_slow} |= MOVE_WALK; 372 $ob->{move_slow} += "walk";
164 $ob->{move_slow_penalty} = $v; 373 $ob->{move_slow_penalty} = $v;
165 } 374 }
166 if (defined (my $v = delete $ob->{walk_on})) { 375 if (defined (my $v = delete $ob->{walk_on})) {
167 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 376 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
168 : $ob->{move_on} & ~MOVE_WALK;
169 } 377 }
170 if (defined (my $v = delete $ob->{walk_off})) { 378 if (defined (my $v = delete $ob->{walk_off})) {
171 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 379 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
172 : $ob->{move_off} & ~MOVE_WALK;
173 } 380 }
174 if (defined (my $v = delete $ob->{fly_on})) { 381 if (defined (my $v = delete $ob->{fly_on})) {
175 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 382 $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 } 383 }
178 if (defined (my $v = delete $ob->{fly_off})) { 384 if (defined (my $v = delete $ob->{fly_off})) {
179 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 385 $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 } 386 }
182 if (defined (my $v = delete $ob->{flying})) { 387 if (defined (my $v = delete $ob->{flying})) {
183 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 388 $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 } 389 }
390
391 # convert idiotic event_xxx things into objects
392 while (my ($event, $subtype) = each %EVENT_TYPE) {
393 if (exists $ob->{"event_${event}_plugin"}) {
394 push @{$ob->{inventory}}, {
395 _name => "event_$event",
396 title => delete $ob->{"event_${event}_plugin"},
397 slaying => delete $ob->{"event_${event}"},
398 name => delete $ob->{"event_${event}_options"},
399 };
400 }
401 }
402
403 # some archetypes had "+3" instead of the canonical "3", so fix
404 $ob->{dam} *= 1 if exists $ob->{dam};
186 405
187 $ob 406 $ob
188} 407}
189 408
409# arch as in "arch xxx", ie.. objects
190sub normalize_arch($) { 410sub normalize_arch($) {
191 my ($ob) = @_; 411 my ($ob) = @_;
192 412
193 normalize_object $ob; 413 normalize_object $ob;
194 414
… …
221 delete $ob->{$k}; 441 delete $ob->{$k};
222 } 442 }
223 } 443 }
224 } 444 }
225 445
446 # a speciality for the editor
447 if (exists $ob->{attack_movement}) {
448 my $am = delete $ob->{attack_movement};
449 $ob->{attack_movement_bits_0_3} = $am & 15;
450 $ob->{attack_movement_bits_4_7} = $am & 240;
451 }
452
453 $ob
454}
455
456sub attr_thaw($) {
457 my ($ob) = @_;
458
459 $ob->{attach} = from_json $ob->{attach}
460 if exists $ob->{attach};
461
462 $ob
463}
464
465sub attr_freeze($) {
466 my ($ob) = @_;
467
468 $ob->{attach} = Crossfire::to_json $ob->{attach}
469 if exists $ob->{attach};
470
226 $ob 471 $ob
227} 472}
228 473
229sub read_pak($) { 474sub read_pak($) {
230 my ($path) = @_; 475 my ($path) = @_;
231 476
232 my %pak; 477 my %pak;
233 478
234 open my $fh, "<", $path 479 open my $fh, "<:raw:perlio", $path
235 or Carp::croak "$_[0]: $!"; 480 or Carp::croak "$_[0]: $!";
236 binmode $fh; 481 binmode $fh;
237 while (<$fh>) { 482 while (<$fh>) {
238 my ($type, $id, $len, $path) = split; 483 my ($type, $id, $len, $path) = split;
239 $path =~ s/.*\///; 484 $path =~ s/.*\///;
… …
241 } 486 }
242 487
243 \%pak 488 \%pak
244} 489}
245 490
246sub read_arch($) { 491sub read_arch($;$) {
247 my ($path) = @_; 492 my ($path, $toplevel) = @_;
248 493
249 my %arc; 494 my %arc;
250 my ($more, $prev); 495 my ($more, $prev);
496 my $comment;
251 497
252 open my $fh, "<", $path 498 open my $fh, "<:raw:perlio:utf8", $path
253 or Carp::croak "$path: $!"; 499 or Carp::croak "$path: $!";
254 500
255 binmode $fh; 501# binmode $fh;
256 502
257 my $parse_block; $parse_block = sub { 503 my $parse_block; $parse_block = sub {
258 my %arc = @_; 504 my %arc = @_;
259 505
260 while (<$fh>) { 506 while (<$fh>) {
261 s/\s+$//; 507 s/\s+$//;
262 if (/^end$/i) { 508 if (/^end$/i) {
263 last; 509 last;
510
264 } elsif (/^arch (\S+)$/i) { 511 } elsif (/^arch (\S+)$/i) {
265 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 512 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
513
266 } elsif (/^lore$/i) { 514 } elsif (/^lore$/i) {
267 while (<$fh>) { 515 while (<$fh>) {
268 last if /^endlore\s*$/i; 516 last if /^endlore\s*$/i;
269 $arc{lore} .= $_; 517 $arc{lore} .= $_;
270 } 518 }
271 } elsif (/^msg$/i) { 519 } elsif (/^msg$/i) {
272 while (<$fh>) { 520 while (<$fh>) {
273 last if /^endmsg\s*$/i; 521 last if /^endmsg\s*$/i;
274 $arc{msg} .= $_; 522 $arc{msg} .= $_;
275 } 523 }
524 } elsif (/^anim$/i) {
525 while (<$fh>) {
526 last if /^mina\s*$/i;
527 chomp;
528 push @{ $arc{anim} }, $_;
529 }
276 } elsif (/^(\S+)\s*(.*)$/) { 530 } elsif (/^(\S+)\s*(.*)$/) {
277 $arc{lc $1} = $2; 531 $arc{lc $1} = $2;
278 } elsif (/^\s*($|#)/) { 532 } elsif (/^\s*#/) {
533 $arc{_comment} .= "$_\n";
534
535 } elsif (/^\s*$/) {
279 # 536 #
280 } else { 537 } else {
281 warn "$path: unparsable line '$_' in arch $arc{_name}"; 538 warn "$path: unparsable line '$_' in arch $arc{_name}";
282 } 539 }
283 } 540 }
… …
289 s/\s+$//; 546 s/\s+$//;
290 if (/^more$/i) { 547 if (/^more$/i) {
291 $more = $prev; 548 $more = $prev;
292 } elsif (/^object (\S+)$/i) { 549 } elsif (/^object (\S+)$/i) {
293 my $name = $1; 550 my $name = $1;
294 my $arc = normalize_object $parse_block->(_name => $name); 551 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
552 undef $comment;
553 delete $arc{_comment} unless length $arc{_comment};
554 $arc->{_atype} = 'object';
295 555
296 if ($more) { 556 if ($more) {
297 $more->{more} = $arc; 557 $more->{more} = $arc;
298 } else { 558 } else {
299 $arc{$name} = $arc; 559 $arc{$name} = $arc;
300 } 560 }
301 $prev = $arc; 561 $prev = $arc;
302 $more = undef; 562 $more = undef;
303 } elsif (/^arch (\S+)$/i) { 563 } elsif (/^arch (\S+)$/i) {
304 my $name = $1; 564 my $name = $1;
305 my $arc = normalize_object $parse_block->(_name => $name); 565 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
566 undef $comment;
567 delete $arc{_comment} unless length $arc{_comment};
568 $arc->{_atype} = 'arch';
306 569
307 if ($more) { 570 if ($more) {
308 $more->{more} = $arc; 571 $more->{more} = $arc;
309 } else { 572 } else {
310 push @{ $arc{arch} }, $arc; 573 push @{ $arc{arch} }, $arc;
311 } 574 }
312 $prev = $arc; 575 $prev = $arc;
313 $more = undef; 576 $more = undef;
577 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
578 if ($1 eq "lev_array") {
579 while (<$fh>) {
580 last if /^endplst\s*$/;
581 push @{$toplevel->{lev_array}}, $_+0;
582 }
583 } else {
584 $toplevel->{$1} = $2;
585 }
586 } elsif (/^\s*#/) {
587 $comment .= "$_\n";
314 } elsif (/^\s*($|#)/) { 588 } elsif (/^\s*($|#)/) {
315 # 589 #
316 } else { 590 } else {
317 warn "$path: unparseable top-level line '$_'"; 591 die "$path: unparseable top-level line '$_'";
318 } 592 }
319 } 593 }
320 594
321 undef $parse_block; # work around bug in perl not freeing $fh etc. 595 undef $parse_block; # work around bug in perl not freeing $fh etc.
322 596
323 \%arc 597 \%arc
598}
599
600sub archlist_to_string {
601 my ($arch) = @_;
602
603 my $str;
604
605 my $append; $append = sub {
606 my %a = %{$_[0]};
607
608 Crossfire::attr_freeze \%a;
609 Crossfire::normalize_arch \%a;
610
611 # undo the bit-split we did before
612 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
613 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
614 | (delete $a{attack_movement_bits_4_7});
615 }
616
617 if (my $comment = delete $a{_comment}) {
618 if ($comment =~ /[^\n\s#]/) {
619 $str .= $comment;
620 }
621 }
622
623 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
624
625 my $inv = delete $a{inventory};
626 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
627 my $anim = delete $a{anim};
628
629 if ($a{_atype} eq 'object') {
630 $str .= join "\n", "anim", @$anim, "mina\n"
631 if $anim;
632 }
633
634 my @kv;
635
636 for ($a{_name} eq "map"
637 ? @Crossfire::FIELD_ORDER_MAP
638 : @Crossfire::FIELD_ORDER) {
639 push @kv, [$_, delete $a{$_}]
640 if exists $a{$_};
641 }
642
643 for (sort keys %a) {
644 next if /^_/; # ignore our _-keys
645 push @kv, [$_, delete $a{$_}];
646 }
647
648 for (@kv) {
649 my ($k, $v) = @$_;
650
651 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
652 $v =~ s/\n$//;
653 $str .= "$k\n$v\n$end\n";
654 } else {
655 $str .= "$k $v\n";
656 }
657 }
658
659 if ($inv) {
660 $append->($_) for @$inv;
661 }
662
663 $str .= "end\n";
664
665 if ($a{_atype} eq 'object') {
666 if ($more) {
667 $str .= "more\n";
668 $append->($more) if $more;
669 } else {
670 $str .= "\n";
671 }
672 }
673 };
674
675 for (@$arch) {
676 $append->($_);
677 }
678
679 $str
324} 680}
325 681
326# put all archs into a hash with editor_face as it's key 682# put all archs into a hash with editor_face as it's key
327# NOTE: the arrays in the hash values are references to 683# NOTE: the arrays in the hash values are references to
328# the archs from $ARCH 684# the archs from $ARCH
329sub editor_archs { 685sub editor_archs {
330 my %paths; 686 my %paths;
331 687
332 for (keys %ARCH) { 688 for (keys %ARCH) {
333 my $arch = $ARCH{$_}; 689 my $arch = $ARCH{$_};
334 push @{$paths{$arch->{editor_folder}}}, \$arch; 690 push @{$paths{$arch->{editor_folder}}}, $arch;
335 } 691 }
336 692
337 \%paths 693 \%paths
338} 694}
339 695
… …
349 my ($a) = @_; 705 my ($a) = @_;
350 706
351 my $o = $ARCH{$a->{_name}} 707 my $o = $ARCH{$a->{_name}}
352 or return; 708 or return;
353 709
354 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 710 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
711 unless ($face) {
712 $face = $FACE{"blank.x11"}
355 or (warn "no face data found for arch '$a->{_name}'"), return; 713 or (warn "no face data found for arch '$a->{_name}'"), return;
714 }
356 715
357 if ($face->{w} > 1 || $face->{h} > 1) { 716 if ($face->{w} > 1 || $face->{h} > 1) {
358 # bigface 717 # bigface
359 return (0, 0, $face->{w} - 1, $face->{h} - 1); 718 return (0, 0, $face->{w} - 1, $face->{h} - 1);
360 719
… …
404 my $type = $obj->{type} || $arch->{type}; 763 my $type = $obj->{type} || $arch->{type};
405 764
406 if ($type > 0) { 765 if ($type > 0) {
407 $root = $Crossfire::Data::ATTR{$type}; 766 $root = $Crossfire::Data::ATTR{$type};
408 } else { 767 } else {
768 my %a = (%$arch, %$obj);
769
770 if ($a{is_floor} && !$a{alive}) {
771 $root = $Crossfire::Data::TYPE{Floor};
772 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
773 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
774 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
775 $root = $Crossfire::Data::TYPE{Wall};
776 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
777 $root = $Crossfire::Data::TYPE{"Weak Wall"};
778 } else {
409 $root = $Crossfire::Data::TYPE{Misc}; 779 $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 } 780 }
424 } 781 }
425 782
426 my @import = ($root); 783 my @import = ($root);
427 784
… …
469 ]; 826 ];
470 827
471 $attr 828 $attr
472} 829}
473 830
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($$&&) { 831sub cache_file($$&&) {
536 my ($src, $cache, $load, $create) = @_; 832 my ($src, $cache, $load, $create) = @_;
537 833
538 my ($size, $mtime) = (stat $src)[7,9] 834 my ($size, $mtime) = (stat $src)[7,9]
539 or Carp::croak "$src: $!"; 835 or Carp::croak "$src: $!";
… …
601 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 897 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
602 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 898 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
603 or die "$VARDIR/tilecache.png: $!"; 899 or die "$VARDIR/tilecache.png: $!";
604 *FACE = $_[0]; 900 *FACE = $_[0];
605 }, sub { 901 }, sub {
606 require File::Temp;
607
608 my $tile = read_pak "$LIB/crossfire.0"; 902 my $tile = read_pak "$LIB/crossfire.0";
609 903
610 my %cache; 904 my %cache;
611 905
612 my $idx = 0; 906 my $idx = 0;
613 907
614 for my $name (sort keys %$tile) { 908 for my $name (sort keys %$tile) {
615 my ($fh, $filename) = File::Temp::tempfile (); 909 my $pb = new Gtk2::Gdk::PixbufLoader;
616 print $fh $tile->{$name}; 910 $pb->write ($tile->{$name});
617 close $fh; 911 $pb->close;
618 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 912 my $pb = $pb->get_pixbuf;
619 unlink $filename;
620 913
621 my $tile = $cache{$name} = { 914 my $tile = $cache{$name} = {
622 pb => $pb, 915 pb => $pb,
623 idx => $idx, 916 idx => $idx,
624 w => int $pb->get_width / TILESIZE, 917 w => int $pb->get_width / TILESIZE,
… …
642 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 935 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
643 } 936 }
644 } 937 }
645 } 938 }
646 939
647 $pb->save ("$VARDIR/tilecache.png", "png"); 940 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
648 941
649 \%cache 942 \%cache
650 }; 943 };
651} 944}
652 945

Diff Legend

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