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.73 by root, Tue Sep 12 02:18:06 2006 UTC vs.
Revision 1.118 by root, Wed Dec 5 11:39:26 2007 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.9'; 9our $VERSION = '1.13';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
16use File::Spec; 16use File::Spec;
17use List::Util qw(min max); 17use List::Util qw(min max);
18use Storable qw(freeze thaw); 18use Storable qw(freeze thaw);
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
22 *ARCH $TILE *FACE *FACEDATA
23 TILESIZE CACHESTRIDE
24 editor_archs arch_extents
22); 25);
23 26
24use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working 27use JSON::XS qw(decode_json encode_json);
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 28
36our $LIB = $ENV{CROSSFIRE_LIBDIR}; 29our $LIB = $ENV{CROSSFIRE_LIBDIR};
37 30
38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; 31our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire"
32 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
33 : File::Spec->tmpdir . "/crossfire";
39 34
40mkdir $VARDIR, 0777; 35mkdir $VARDIR, 0777;
41 36
42sub TILESIZE (){ 32 } 37sub TILESIZE (){ 32 }
38sub CACHESTRIDE (){ 64 }
43 39
44our %ARCH; 40our %ARCH;
41our %FACE; # face32
45our %FACE; 42our %FACEDATA;
46our $TILE; 43our $TILE;
47 44
48our %FIELD_MULTILINE = ( 45our %FIELD_MULTILINE = (
49 msg => "endmsg", 46 msg => "endmsg",
50 lore => "endlore", 47 lore => "endlore",
… …
56 qw(move_type move_block move_allow move_on move_off move_slow); 53 qw(move_type move_block move_allow move_on move_off move_slow);
57 54
58# same as in server save routine, to (hopefully) be compatible 55# same as in server save routine, to (hopefully) be compatible
59# to the other editors. 56# to the other editors.
60our @FIELD_ORDER_MAP = (qw( 57our @FIELD_ORDER_MAP = (qw(
58 file_format_version
61 name attach swap_time reset_timeout fixed_resettime difficulty region 59 name attach swap_time reset_timeout fixed_resettime difficulty region
62 shopitems shopgreed shopmin shopmax shoprace 60 shopitems shopgreed shopmin shopmax shoprace
63 darkness width height enter_x enter_y msg maplore 61 darkness width height enter_x enter_y msg maplore
64 unique template 62 unique template
65 outdoor temp pressure humid windspeed winddir sky nosmooth 63 outdoor temp pressure humid windspeed winddir sky nosmooth
66 tile_path_1 tile_path_2 tile_path_3 tile_path_4 64 tile_path_1 tile_path_2 tile_path_3 tile_path_4
67)); 65));
68 66
69our @FIELD_ORDER = (qw( 67our @FIELD_ORDER = (qw(
68 inherit
69
70 elevation 70 elevation
71 71
72 name name_pl custom_name attach title race 72 name name_pl custom_name attach title race
73 slaying skill msg lore other_arch face 73 slaying skill msg lore other_arch
74 #todo-events
75 animation is_animated 74 face animation is_animated
75 magicmap smoothlevel smoothface
76 str dex con wis pow cha int 76 str dex con wis pow cha int
77 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
78 exp perm_exp expmul 78 exp perm_exp expmul
79 food dam luck wc ac x y speed speed_left move_state attack_movement 79 food dam luck wc ac x y speed speed_left move_state attack_movement
80 nrof level direction type subtype attacktype 80 nrof level direction type subtype attacktype
… …
88 resist_life_stealing resist_disease 88 resist_life_stealing resist_disease
89 89
90 path_attuned path_repelled path_denied material materialname 90 path_attuned path_repelled path_denied material materialname
91 value carrying weight invisible state magic 91 value carrying weight invisible state magic
92 last_heal last_sp last_grace last_eat 92 last_heal last_sp last_grace last_eat
93 connected glow_radius randomitems npx_status npc_program 93 connected glow_radius randomitems tresure_env npx_status npc_program
94 run_away pick_up container will_apply smoothlevel 94 run_away pick_up container will_apply smoothlevel
95 current_weapon_script weapontype tooltype elevation client_type 95 current_weapon_script weapontype tooltype elevation client_type
96 item_power duration range 96 item_power duration range
97 range_modifier duration_modifier dam_modifier gen_sp_armour 97 range_modifier duration_modifier dam_modifier gen_sp_armour
98 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty 98 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
… …
109 known_magical known_cursed can_use_skill been_applied has_ready_scroll 109 known_magical known_cursed can_use_skill been_applied has_ready_scroll
110 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly 110 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
111 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark 111 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
112 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage 112 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
113 activate_on_push activate_on_release is_water use_content_on_gen is_buildable 113 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
114 precious
114 115
115 body_range body_arm body_torso body_head body_neck body_skill 116 body_range body_arm body_torso body_head body_neck body_skill
116 body_finger body_shoulder body_foot body_hand body_wrist body_waist 117 body_finger body_shoulder body_foot body_hand body_wrist body_waist
117)); 118));
118 119
… …
135sub MOVE_FLY_LOW (){ 0x02 } 136sub MOVE_FLY_LOW (){ 0x02 }
136sub MOVE_FLY_HIGH (){ 0x04 } 137sub MOVE_FLY_HIGH (){ 0x04 }
137sub MOVE_FLYING (){ 0x06 } 138sub MOVE_FLYING (){ 0x06 }
138sub MOVE_SWIM (){ 0x08 } 139sub MOVE_SWIM (){ 0x08 }
139sub MOVE_BOAT (){ 0x10 } 140sub MOVE_BOAT (){ 0x10 }
141sub MOVE_SHIP (){ 0x20 }
140sub MOVE_KNOWN (){ 0x1f } # all of above 142sub MOVE_KNOWN (){ 0x3f } # all of above
141sub MOVE_ALLBIT (){ 0x10000 }
142sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 143sub MOVE_ALL (){ 0x10000 } # very special value
144
145our %MOVE_TYPE = (
146 walk => MOVE_WALK,
147 fly_low => MOVE_FLY_LOW,
148 fly_high => MOVE_FLY_HIGH,
149 flying => MOVE_FLYING,
150 swim => MOVE_SWIM,
151 boat => MOVE_BOAT,
152 ship => MOVE_SHIP,
153 all => MOVE_ALL,
154);
155
156our @MOVE_TYPE = keys %MOVE_TYPE;
157
158{
159 package Crossfire::MoveType;
160
161 use overload
162 '=' => sub { bless [@{$_[0]}], ref $_[0] },
163 '""' => \&as_string,
164 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
165 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
166 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
167 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
168 'x=' => sub {
169 my $cur = $_[0] >= $_[1];
170 if (!defined $cur) {
171 if ($_[0] >= "all") {
172 $_[0] -= $_[1];
173 } else {
174 $_[0] += $_[1];
175 }
176 } elsif ($cur) {
177 $_[0] -= $_[1];
178 } else {
179 $_[0] /= $_[1];
180 }
181
182 $_[0]
183 },
184 'eq' => sub { "$_[0]" eq "$_[1]" },
185 'ne' => sub { "$_[0]" ne "$_[1]" },
186 ;
187}
188
189sub Crossfire::MoveType::new {
190 my ($class, $string) = @_;
191
192 my $mask;
193 my $value;
194
195 if ($string =~ /^\s*\d+\s*$/) {
196 $mask = MOVE_ALL;
197 $value = $string+0;
198 } else {
199 for (split /\s+/, lc $string) {
200 if (s/^-//) {
201 $mask |= $MOVE_TYPE{$_};
202 $value &= ~$MOVE_TYPE{$_};
203 } else {
204 $mask |= $MOVE_TYPE{$_};
205 $value |= $MOVE_TYPE{$_};
206 }
207 }
208 }
209
210 (bless [$mask, $value], $class)->normalise
211}
212
213sub Crossfire::MoveType::normalise {
214 my ($self) = @_;
215
216 if ($self->[0] & MOVE_ALL) {
217 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
218 $self->[0] &= $mask;
219 $self->[1] &= $mask;
220 }
221
222 $self->[1] &= $self->[0];
223
224 $self
225}
226
227sub Crossfire::MoveType::as_string {
228 my ($self) = @_;
229
230 my @res;
231
232 my ($mask, $value) = @$self;
233
234 for (@Crossfire::MOVE_TYPE) {
235 my $bit = $Crossfire::MOVE_TYPE{$_};
236 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
237 $mask &= ~$bit;
238 push @res, $value & $bit ? $_ : "-$_";
239 }
240 }
241
242 join " ", @res
243}
143 244
144sub load_ref($) { 245sub load_ref($) {
145 my ($path) = @_; 246 my ($path) = @_;
146 247
147 open my $fh, "<:raw:perlio", $path 248 open my $fh, "<:raw:perlio", $path
… …
197 while (my ($k, $v) = each %attack_mask) { 298 while (my ($k, $v) = each %attack_mask) {
198 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v; 299 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
199 } 300 }
200} 301}
201 302
303my %MATERIAL = reverse
304 paper => 1,
305 iron => 2,
306 glass => 4,
307 leather => 8,
308 wood => 16,
309 organic => 32,
310 stone => 64,
311 cloth => 128,
312 adamant => 256,
313 liquid => 512,
314 tin => 1024,
315 bone => 2048,
316 ice => 4096,
317
318 # guesses
319 runestone => 12,
320 bronze => 18,
321 "ancient wood" => 20,
322 glass => 36,
323 marble => 66,
324 ice => 68,
325 stone => 70,
326 stone => 80,
327 cloth => 136,
328 ironwood => 144,
329 adamantium => 258,
330 glacium => 260,
331 blood => 544,
332;
333
202# object as in "Object xxx", i.e. archetypes 334# object as in "Object xxx", i.e. archetypes
203sub normalize_object($) { 335sub normalize_object($) {
204 my ($ob) = @_; 336 my ($ob) = @_;
205 337
338 # convert material bitset to materialname, if possible
339 if (exists $ob->{material}) {
340 if (!$ob->{material}) {
341 delete $ob->{material};
342 } elsif (exists $ob->{materialname}) {
343 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
344 delete $ob->{material};
345 } else {
346 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
347 delete $ob->{material}; # assume materilname is more specific and nuke material
348 }
349 } elsif (my $name = $MATERIAL{$ob->{material}}) {
350 delete $ob->{material};
351 $ob->{materialname} = $name;
352 } else {
353 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
354 }
355 }
356
357 # check whether attachment is the same as in the archetype
358 if (exists $ob->{attach}) {
359 my $arch = $ARCH{$ob->{_name}};
360 my $js = JSON::XS->new->utf8->canonical (1);
361
362 if (defined $arch->{attach}
363 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
364 delete $ob->{attach}
365 }
366 }
367
368 # color_fg is used as default for magicmap if magicmap does not exist
369 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
370
206 # nuke outdated or never supported fields 371 # nuke outdated or never supported fields
207 delete @$ob{qw( 372 delete @$ob{qw(
208 can_knockback can_parry can_impale can_cut can_dam_armour 373 can_knockback can_parry can_impale can_cut can_dam_armour
209 can_apply pass_thru can_pass_thru 374 can_apply pass_thru can_pass_thru color_bg color_fg
210 )}; 375 )};
211 376
212 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 377 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
213 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 378 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
214 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 379 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
215 380
216 # convert movement strings to bitsets 381 # convert movement strings to bitsets
217 for my $attr (keys %FIELD_MOVEMENT) { 382 for my $attr (keys %FIELD_MOVEMENT) {
218 next unless exists $ob->{$attr}; 383 next unless exists $ob->{$attr};
219 384
220 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 385 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr};
221
222 next if $ob->{$attr} =~ /^\d+$/;
223
224 my $flags = 0;
225
226 # assume list
227 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
228 $flags |= MOVE_WALK if $flag eq "walk";
229 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
230 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
231 $flags |= MOVE_FLYING if $flag eq "flying";
232 $flags |= MOVE_SWIM if $flag eq "swim";
233 $flags |= MOVE_BOAT if $flag eq "boat";
234 $flags |= MOVE_ALL if $flag eq "all";
235
236 $flags &= ~MOVE_WALK if $flag eq "-walk";
237 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
238 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
239 $flags &= ~MOVE_FLYING if $flag eq "-flying";
240 $flags &= ~MOVE_SWIM if $flag eq "-swim";
241 $flags &= ~MOVE_BOAT if $flag eq "-boat";
242 $flags &= ~MOVE_ALL if $flag eq "-all";
243 }
244
245 $ob->{$attr} = $flags;
246 } 386 }
247 387
248 # convert outdated movement flags to new movement sets 388 # convert outdated movement flags to new movement sets
249 if (defined (my $v = delete $ob->{no_pass})) { 389 if (defined (my $v = delete $ob->{no_pass})) {
250 $ob->{move_block} = $v ? MOVE_ALL : 0; 390 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
251 } 391 }
252 if (defined (my $v = delete $ob->{slow_move})) { 392 if (defined (my $v = delete $ob->{slow_move})) {
253 $ob->{move_slow} |= MOVE_WALK; 393 $ob->{move_slow} += "walk";
254 $ob->{move_slow_penalty} = $v; 394 $ob->{move_slow_penalty} = $v;
255 } 395 }
256 if (defined (my $v = delete $ob->{walk_on})) { 396 if (defined (my $v = delete $ob->{walk_on})) {
257 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 397 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
258 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
259 : $ob->{move_on} & ~MOVE_WALK;
260 } 398 }
261 if (defined (my $v = delete $ob->{walk_off})) { 399 if (defined (my $v = delete $ob->{walk_off})) {
262 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 400 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
263 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
264 : $ob->{move_off} & ~MOVE_WALK;
265 } 401 }
266 if (defined (my $v = delete $ob->{fly_on})) { 402 if (defined (my $v = delete $ob->{fly_on})) {
267 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 403 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
268 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
269 : $ob->{move_on} & ~MOVE_FLY_LOW;
270 } 404 }
271 if (defined (my $v = delete $ob->{fly_off})) { 405 if (defined (my $v = delete $ob->{fly_off})) {
272 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 406 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
273 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
274 : $ob->{move_off} & ~MOVE_FLY_LOW;
275 } 407 }
276 if (defined (my $v = delete $ob->{flying})) { 408 if (defined (my $v = delete $ob->{flying})) {
277 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 409 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
278 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
279 : $ob->{move_type} & ~MOVE_FLY_LOW;
280 } 410 }
281 411
282 # convert idiotic event_xxx things into objects 412 # convert idiotic event_xxx things into objects
283 while (my ($event, $subtype) = each %EVENT_TYPE) { 413 while (my ($event, $subtype) = each %EVENT_TYPE) {
284 if (exists $ob->{"event_${event}_plugin"}) { 414 if (exists $ob->{"event_${event}_plugin"}) {
… …
345} 475}
346 476
347sub attr_thaw($) { 477sub attr_thaw($) {
348 my ($ob) = @_; 478 my ($ob) = @_;
349 479
350 $ob->{attach} = from_json $ob->{attach} 480 $ob->{attach} = decode_json $ob->{attach}
351 if exists $ob->{attach}; 481 if exists $ob->{attach};
352 482
353 $ob 483 $ob
354} 484}
355 485
356sub attr_freeze($) { 486sub attr_freeze($) {
357 my ($ob) = @_; 487 my ($ob) = @_;
358 488
359 $ob->{attach} = Crossfire::to_json $ob->{attach} 489 $ob->{attach} = Crossfire::encode_json $ob->{attach}
360 if exists $ob->{attach}; 490 if exists $ob->{attach};
361 491
362 $ob 492 $ob
363} 493}
364 494
… …
382sub read_arch($;$) { 512sub read_arch($;$) {
383 my ($path, $toplevel) = @_; 513 my ($path, $toplevel) = @_;
384 514
385 my %arc; 515 my %arc;
386 my ($more, $prev); 516 my ($more, $prev);
517 my $comment;
387 518
388 open my $fh, "<:raw:perlio:utf8", $path 519 open my $fh, "<:raw:perlio:utf8", $path
389 or Carp::croak "$path: $!"; 520 or Carp::croak "$path: $!";
390 521
391# binmode $fh; 522# binmode $fh;
… …
395 526
396 while (<$fh>) { 527 while (<$fh>) {
397 s/\s+$//; 528 s/\s+$//;
398 if (/^end$/i) { 529 if (/^end$/i) {
399 last; 530 last;
531
400 } elsif (/^arch (\S+)$/i) { 532 } elsif (/^arch (\S+)$/i) {
401 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 533 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
534
402 } elsif (/^lore$/i) { 535 } elsif (/^lore$/i) {
403 while (<$fh>) { 536 while (<$fh>) {
404 last if /^endlore\s*$/i; 537 last if /^endlore\s*$/i;
405 $arc{lore} .= $_; 538 $arc{lore} .= $_;
406 } 539 }
… …
415 chomp; 548 chomp;
416 push @{ $arc{anim} }, $_; 549 push @{ $arc{anim} }, $_;
417 } 550 }
418 } elsif (/^(\S+)\s*(.*)$/) { 551 } elsif (/^(\S+)\s*(.*)$/) {
419 $arc{lc $1} = $2; 552 $arc{lc $1} = $2;
420 } elsif (/^\s*($|#)/) { 553 } elsif (/^\s*#/) {
554 $arc{_comment} .= "$_\n";
555
556 } elsif (/^\s*$/) {
421 # 557 #
422 } else { 558 } else {
423 warn "$path: unparsable line '$_' in arch $arc{_name}"; 559 warn "$path: unparsable line '$_' in arch $arc{_name}";
424 } 560 }
425 } 561 }
… …
431 s/\s+$//; 567 s/\s+$//;
432 if (/^more$/i) { 568 if (/^more$/i) {
433 $more = $prev; 569 $more = $prev;
434 } elsif (/^object (\S+)$/i) { 570 } elsif (/^object (\S+)$/i) {
435 my $name = $1; 571 my $name = $1;
436 my $arc = attr_thaw normalize_object $parse_block->(_name => $name); 572 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
573 undef $comment;
574 delete $arc{_comment} unless length $arc{_comment};
437 $arc->{_atype} = 'object'; 575 $arc->{_atype} = 'object';
438 576
439 if ($more) { 577 if ($more) {
440 $more->{more} = $arc; 578 $more->{more} = $arc;
441 } else { 579 } else {
… …
443 } 581 }
444 $prev = $arc; 582 $prev = $arc;
445 $more = undef; 583 $more = undef;
446 } elsif (/^arch (\S+)$/i) { 584 } elsif (/^arch (\S+)$/i) {
447 my $name = $1; 585 my $name = $1;
448 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 586 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
587 undef $comment;
588 delete $arc{_comment} unless length $arc{_comment};
449 $arc->{_atype} = 'arch'; 589 $arc->{_atype} = 'arch';
450 590
451 if ($more) { 591 if ($more) {
452 $more->{more} = $arc; 592 $more->{more} = $arc;
453 } else { 593 } else {
… …
462 push @{$toplevel->{lev_array}}, $_+0; 602 push @{$toplevel->{lev_array}}, $_+0;
463 } 603 }
464 } else { 604 } else {
465 $toplevel->{$1} = $2; 605 $toplevel->{$1} = $2;
466 } 606 }
607 } elsif (/^\s*#/) {
608 $comment .= "$_\n";
467 } elsif (/^\s*($|#)/) { 609 } elsif (/^\s*($|#)/) {
468 # 610 #
469 } else { 611 } else {
470 die "$path: unparseable top-level line '$_'"; 612 die "$path: unparseable top-level line '$_'";
471 } 613 }
… …
491 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 633 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
492 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 634 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
493 | (delete $a{attack_movement_bits_4_7}); 635 | (delete $a{attack_movement_bits_4_7});
494 } 636 }
495 637
638 if (my $comment = delete $a{_comment}) {
639 if ($comment =~ /[^\n\s#]/) {
640 $str .= $comment;
641 }
642 }
643
496 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 644 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
497 645
498 my $inv = delete $a{inventory}; 646 my $inv = delete $a{inventory};
499 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 647 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
500 my $anim = delete $a{anim}; 648 my $anim = delete $a{anim};
649
650 if ($a{_atype} eq 'object') {
651 $str .= join "\n", "anim", @$anim, "mina\n"
652 if $anim;
653 }
501 654
502 my @kv; 655 my @kv;
503 656
504 for ($a{_name} eq "map" 657 for ($a{_name} eq "map"
505 ? @Crossfire::FIELD_ORDER_MAP 658 ? @Crossfire::FIELD_ORDER_MAP
… …
517 my ($k, $v) = @$_; 670 my ($k, $v) = @$_;
518 671
519 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 672 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
520 $v =~ s/\n$//; 673 $v =~ s/\n$//;
521 $str .= "$k\n$v\n$end\n"; 674 $str .= "$k\n$v\n$end\n";
522 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
523 if ($v & ~Crossfire::MOVE_ALL or !$v) {
524 $str .= "$k $v\n";
525
526 } elsif ($v & Crossfire::MOVE_ALLBIT) {
527 $str .= "$k all";
528
529 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
530 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
531 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
532 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
533 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
534
535 $str .= "\n";
536
537 } else {
538 $str .= $k;
539
540 $str .= " walk" if $v & Crossfire::MOVE_WALK;
541 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
542 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
543 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
544 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
545
546 $str .= "\n";
547 }
548 } else { 675 } else {
549 $str .= "$k $v\n"; 676 $str .= "$k $v\n";
550 } 677 }
551 } 678 }
552 679
553 if ($inv) { 680 if ($inv) {
554 $append->($_) for @$inv; 681 $append->($_) for @$inv;
555 } 682 }
556 683
684 $str .= "end\n";
685
557 if ($a{_atype} eq 'object') { 686 if ($a{_atype} eq 'object') {
558 $str .= join "\n", "anim", @$anim, "mina\n" 687 if ($more) {
559 if $anim;
560 }
561
562 $str .= "end\n";
563
564 if (($a{_atype} eq 'object') && $more) {
565 $str .= "\nmore\n"; 688 $str .= "more\n";
566 $append->($more) if $more; 689 $append->($more) if $more;
690 } else {
691 $str .= "\n";
692 }
567 } 693 }
568 }; 694 };
569 695
570 for (@$arch) { 696 for (@$arch) {
571 $append->($_); 697 $append->($_);
… …
600 my ($a) = @_; 726 my ($a) = @_;
601 727
602 my $o = $ARCH{$a->{_name}} 728 my $o = $ARCH{$a->{_name}}
603 or return; 729 or return;
604 730
605 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 731 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
732 unless ($face) {
733 $face = $FACE{"blank.x11"}
606 or (warn "no face data found for arch '$a->{_name}'"), return; 734 or (warn "no face data found for arch '$a->{_name}'"), return;
735 }
607 736
608 if ($face->{w} > 1 || $face->{h} > 1) { 737 if ($face->{w} > 1 || $face->{h} > 1) {
609 # bigface 738 # bigface
610 return (0, 0, $face->{w} - 1, $face->{h} - 1); 739 return (0, 0, $face->{w} - 1, $face->{h} - 1);
611 740
… …
679 808
680 my (%ignore); 809 my (%ignore);
681 my (@section_order, %section, @attr_order); 810 my (@section_order, %section, @attr_order);
682 811
683 while (my $type = shift @import) { 812 while (my $type = shift @import) {
813 push @import,
814 grep $_,
815 map $Crossfire::Data::TYPE{$_},
684 push @import, @{$type->{import} || []}; 816 @{$type->{import} || []};
685 817
686 $attr->{$_} ||= $type->{$_} 818 $attr->{$_} ||= $type->{$_}
687 for qw(name desc use); 819 for qw(name desc use);
688 820
689 for (@{$type->{ignore} || []}) { 821 for (@{$type->{ignore} || []}) {
… …
718 ]; 850 ];
719 851
720 $attr 852 $attr
721} 853}
722 854
723sub arch_edit_sections {
724# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
725# edit_type = 0;
726# else if (edit_type != 0) {
727# // all flags from 'check_type' must be unset in this arch because they get recalculated now
728# edit_type &= ~check_type;
729# }
730#
731# }
732# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
733# getAttributeValue("alive", defarch) == 1 &&
734# (getAttributeValue("monster", defarch) == 1 ||
735# getAttributeValue("generator", defarch) == 1)) {
736# // Monster: monsters/npcs/generators
737# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
738# }
739# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
740# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
741# // Walls
742# edit_type |= IGUIConstants.TILE_EDIT_WALL;
743# }
744# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
745# getAttributeValue("connected", defarch) != 0) {
746# // Connected Objects
747# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
748# }
749# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
750# arch_type == 66 || arch_type == 41 || arch_type == 95) {
751# // Exit: teleporter/exit/trapdoors
752# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
753# }
754# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
755# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
756# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
757# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
758# arch_type == 124 || arch_type == 130)) {
759# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
760# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
761# }
762# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
763# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
764# arch_type == 91 || arch_type == 21 || arch_type == 24) {
765# // Door: door/special door/gates + keys
766# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
767# }
768# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
769# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
770# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
771# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
772# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
773# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
774# arch_type == 122 || arch_type == 3)) {
775# // Equipment: weapons/armour/wands/rods
776# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
777# }
778#
779# return(edit_type);
780#
781#
782}
783
784sub cache_file($$&&) { 855sub cache_file($$&&) {
785 my ($src, $cache, $load, $create) = @_; 856 my ($src, $cache, $load, $create) = @_;
786 857
787 my ($size, $mtime) = (stat $src)[7,9] 858 my ($size, $mtime) = (stat $src)[7,9]
788 or Carp::croak "$src: $!"; 859 or Carp::croak "$src: $!";
… …
836 }, sub { 907 }, sub {
837 read_arch "$LIB/archetypes" 908 read_arch "$LIB/archetypes"
838 }; 909 };
839} 910}
840 911
912sub construct_tilecache_pb {
913 my ($idx, $cache) = @_;
914
915 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
916
917 while (my ($name, $tile) = each %$cache) {
918 my $tpb = delete $tile->{pb};
919 my $ofs = $tile->{idx};
920
921 for my $x (0 .. $tile->{w} - 1) {
922 for my $y (0 .. $tile->{h} - 1) {
923 my $idx = $ofs + $x + $y * $tile->{w};
924 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
925 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
926 }
927 }
928 }
929
930 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
931
932 $cache
933}
934
935sub use_tilecache {
936 my ($face) = @_;
937 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
938 or die "$VARDIR/tilecache.png: $!";
939 *FACE = $_[0];
940}
941
841=item load_tilecache 942=item load_tilecache
842 943
843(Re-)Load %TILE and %FACE. 944(Re-)Load %TILE and %FACE.
844 945
845=cut 946=cut
846 947
847sub load_tilecache() { 948sub load_tilecache() {
848 require Gtk2; 949 require Gtk2;
849 950
850 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 951 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
851 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
852 or die "$VARDIR/tilecache.png: $!";
853 *FACE = $_[0];
854 }, sub { 952 sub {
855 my $tile = read_pak "$LIB/crossfire.0";
856
857 my %cache; 953 my %cache;
954 my $facedata = Storable::retrieve "$LIB/facedata";
858 955
956 $facedata->{version} == 2
957 or die "$LIB/facedata: version mismatch, cannot proceed.";
958
959 my $faces = $facedata->{faceinfo};
859 my $idx = 0; 960 my $idx = 0;
860 961
861 for my $name (sort keys %$tile) { 962 for (sort keys %$faces) {
963 my ($face, $info) = ($_, $faces->{$_});
964
862 my $pb = new Gtk2::Gdk::PixbufLoader; 965 my $pb = new Gtk2::Gdk::PixbufLoader;
863 $pb->write ($tile->{$name}); 966 $pb->write ($info->{data32});
864 $pb->close; 967 $pb->close;
865 my $pb = $pb->get_pixbuf; 968 my $pb = $pb->get_pixbuf;
866 969
867 my $tile = $cache{$name} = { 970 my $tile = $cache{$face} = {
868 pb => $pb, 971 pb => $pb,
869 idx => $idx, 972 idx => $idx,
870 w => int $pb->get_width / TILESIZE, 973 w => int $pb->get_width / TILESIZE,
871 h => int $pb->get_height / TILESIZE, 974 h => int $pb->get_height / TILESIZE,
872 }; 975 };
873
874 976
875 $idx += $tile->{w} * $tile->{h}; 977 $idx += $tile->{w} * $tile->{h};
978 }
979
980 construct_tilecache_pb $idx, \%cache;
981
982 \%cache
876 } 983 };
877
878 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
879
880 while (my ($name, $tile) = each %cache) {
881 my $tpb = delete $tile->{pb};
882 my $ofs = $tile->{idx};
883
884 for my $x (0 .. $tile->{w} - 1) {
885 for my $y (0 .. $tile->{h} - 1) {
886 my $idx = $ofs + $x + $y * $tile->{w};
887 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
888 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
889 }
890 }
891 }
892
893 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
894
895 \%cache
896 };
897} 984}
898 985
899=head1 AUTHOR 986=head1 AUTHOR
900 987
901 Marc Lehmann <schmorp@schmorp.de> 988 Marc Lehmann <schmorp@schmorp.de>
… …
905 http://www.ta-sa.org/ 992 http://www.ta-sa.org/
906 993
907=cut 994=cut
908 995
9091 9961
997

Diff Legend

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