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

Diff Legend

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