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

Diff Legend

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