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.78 by root, Sun Dec 3 01:02:05 2006 UTC vs.
Revision 1.126 by root, Tue Sep 9 09:50:24 2008 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire - Crossfire maphandling 3Deliantra - Deliantra suppport module to read/write archetypes, maps etc.
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Deliantra;
8 8
9our $VERSION = '0.96'; 9our $VERSION = '1.221';
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 28
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
36our $LIB = $ENV{CROSSFIRE_LIBDIR}; 29our $LIB = $ENV{DELIANTRA_LIBDIR};
37 30
38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" 31our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 32 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
40 : File::Spec->tmpdir . "/crossfire"; 33 : File::Spec->tmpdir . "/deliantra";
41 34
42mkdir $VARDIR, 0777; 35mkdir $VARDIR, 0777;
43 36
44sub TILESIZE (){ 32 } 37sub TILESIZE (){ 32 }
38sub CACHESTRIDE (){ 64 }
45 39
46our %ARCH; 40our %ARCH;
41our %FACE; # face32
47our %FACE; 42our %FACEDATA;
48our $TILE; 43our $TILE;
49 44
50our %FIELD_MULTILINE = ( 45our %FIELD_MULTILINE = (
51 msg => "endmsg", 46 msg => "endmsg",
52 lore => "endlore", 47 lore => "endlore",
… …
58 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);
59 54
60# same as in server save routine, to (hopefully) be compatible 55# same as in server save routine, to (hopefully) be compatible
61# to the other editors. 56# to the other editors.
62our @FIELD_ORDER_MAP = (qw( 57our @FIELD_ORDER_MAP = (qw(
58 file_format_version
63 name attach swap_time reset_timeout fixed_resettime difficulty region 59 name attach swap_time reset_timeout fixed_resettime difficulty region
64 shopitems shopgreed shopmin shopmax shoprace 60 shopitems shopgreed shopmin shopmax shoprace
65 darkness width height enter_x enter_y msg maplore 61 darkness width height enter_x enter_y msg maplore
66 unique template 62 unique template
67 outdoor temp pressure humid windspeed winddir sky nosmooth 63 outdoor temp pressure humid windspeed winddir sky nosmooth
68 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
69)); 65));
70 66
71our @FIELD_ORDER = (qw( 67our @FIELD_ORDER = (qw(
68 inherit
69
72 elevation 70 elevation
73 71
74 name name_pl custom_name attach title race 72 name name_pl custom_name attach title race
75 slaying skill msg lore other_arch face 73 slaying skill msg lore other_arch
76 #todo-events
77 animation is_animated 74 face animation is_animated
75 magicmap smoothlevel smoothface
78 str dex con wis pow cha int 76 str dex con wis pow cha int
79 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
80 exp perm_exp expmul 78 exp perm_exp expmul
81 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
82 nrof level direction type subtype attacktype 80 nrof level direction type subtype attacktype
… …
90 resist_life_stealing resist_disease 88 resist_life_stealing resist_disease
91 89
92 path_attuned path_repelled path_denied material materialname 90 path_attuned path_repelled path_denied material materialname
93 value carrying weight invisible state magic 91 value carrying weight invisible state magic
94 last_heal last_sp last_grace last_eat 92 last_heal last_sp last_grace last_eat
95 connected glow_radius randomitems npx_status npc_program 93 connected glow_radius randomitems tresure_env npx_status npc_program
96 run_away pick_up container will_apply smoothlevel 94 run_away pick_up container will_apply smoothlevel
97 current_weapon_script weapontype tooltype elevation client_type 95 current_weapon_script weapontype tooltype elevation client_type
98 item_power duration range 96 item_power duration range
99 range_modifier duration_modifier dam_modifier gen_sp_armour 97 range_modifier duration_modifier dam_modifier gen_sp_armour
100 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
… …
111 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
112 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
113 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
114 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
115 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
116 115
117 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
118 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
119)); 118));
120 119
… …
137sub MOVE_FLY_LOW (){ 0x02 } 136sub MOVE_FLY_LOW (){ 0x02 }
138sub MOVE_FLY_HIGH (){ 0x04 } 137sub MOVE_FLY_HIGH (){ 0x04 }
139sub MOVE_FLYING (){ 0x06 } 138sub MOVE_FLYING (){ 0x06 }
140sub MOVE_SWIM (){ 0x08 } 139sub MOVE_SWIM (){ 0x08 }
141sub MOVE_BOAT (){ 0x10 } 140sub MOVE_BOAT (){ 0x10 }
141sub MOVE_SHIP (){ 0x20 }
142sub MOVE_KNOWN (){ 0x1f } # all of above 142sub MOVE_KNOWN (){ 0x3f } # all of above
143sub MOVE_ALLBIT (){ 0x10000 }
144sub 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 Deliantra::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 Deliantra::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 Deliantra::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 Deliantra::MoveType::as_string {
228 my ($self) = @_;
229
230 my @res;
231
232 my ($mask, $value) = @$self;
233
234 for (@Deliantra::MOVE_TYPE) {
235 my $bit = $Deliantra::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}
145 244
146sub load_ref($) { 245sub load_ref($) {
147 my ($path) = @_; 246 my ($path) = @_;
148 247
149 open my $fh, "<:raw:perlio", $path 248 open my $fh, "<:raw:perlio", $path
… …
199 while (my ($k, $v) = each %attack_mask) { 298 while (my ($k, $v) = each %attack_mask) {
200 $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;
201 } 300 }
202} 301}
203 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
204# object as in "Object xxx", i.e. archetypes 334# object as in "Object xxx", i.e. archetypes
205sub normalize_object($) { 335sub normalize_object($) {
206 my ($ob) = @_; 336 my ($ob) = @_;
207 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
208 # nuke outdated or never supported fields 371 # nuke outdated or never supported fields
209 delete @$ob{qw( 372 delete @$ob{qw(
210 can_knockback can_parry can_impale can_cut can_dam_armour 373 can_knockback can_parry can_impale can_cut can_dam_armour
211 can_apply pass_thru can_pass_thru 374 can_apply pass_thru can_pass_thru color_bg color_fg
212 )}; 375 )};
213 376
214 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 377 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
215 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 378 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
216 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 379 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
217 380
218 # convert movement strings to bitsets 381 # convert movement strings to bitsets
219 for my $attr (keys %FIELD_MOVEMENT) { 382 for my $attr (keys %FIELD_MOVEMENT) {
220 next unless exists $ob->{$attr}; 383 next unless exists $ob->{$attr};
221 384
222 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 385 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
223
224 next if $ob->{$attr} =~ /^\d+$/;
225
226 my $flags = 0;
227
228 # assume list
229 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
230 $flags |= MOVE_WALK if $flag eq "walk";
231 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
232 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
233 $flags |= MOVE_FLYING if $flag eq "flying";
234 $flags |= MOVE_SWIM if $flag eq "swim";
235 $flags |= MOVE_BOAT if $flag eq "boat";
236 $flags |= MOVE_ALL if $flag eq "all";
237
238 $flags &= ~MOVE_WALK if $flag eq "-walk";
239 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
240 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
241 $flags &= ~MOVE_FLYING if $flag eq "-flying";
242 $flags &= ~MOVE_SWIM if $flag eq "-swim";
243 $flags &= ~MOVE_BOAT if $flag eq "-boat";
244 $flags &= ~MOVE_ALL if $flag eq "-all";
245 }
246
247 $ob->{$attr} = $flags;
248 } 386 }
249 387
250 # convert outdated movement flags to new movement sets 388 # convert outdated movement flags to new movement sets
251 if (defined (my $v = delete $ob->{no_pass})) { 389 if (defined (my $v = delete $ob->{no_pass})) {
252 $ob->{move_block} = $v ? MOVE_ALL : 0; 390 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
253 } 391 }
254 if (defined (my $v = delete $ob->{slow_move})) { 392 if (defined (my $v = delete $ob->{slow_move})) {
255 $ob->{move_slow} |= MOVE_WALK; 393 $ob->{move_slow} += "walk";
256 $ob->{move_slow_penalty} = $v; 394 $ob->{move_slow_penalty} = $v;
257 } 395 }
258 if (defined (my $v = delete $ob->{walk_on})) { 396 if (defined (my $v = delete $ob->{walk_on})) {
259 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 397 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
260 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
261 : $ob->{move_on} & ~MOVE_WALK;
262 } 398 }
263 if (defined (my $v = delete $ob->{walk_off})) { 399 if (defined (my $v = delete $ob->{walk_off})) {
264 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 400 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
265 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
266 : $ob->{move_off} & ~MOVE_WALK;
267 } 401 }
268 if (defined (my $v = delete $ob->{fly_on})) { 402 if (defined (my $v = delete $ob->{fly_on})) {
269 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 403 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
270 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
271 : $ob->{move_on} & ~MOVE_FLY_LOW;
272 } 404 }
273 if (defined (my $v = delete $ob->{fly_off})) { 405 if (defined (my $v = delete $ob->{fly_off})) {
274 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 406 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
275 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
276 : $ob->{move_off} & ~MOVE_FLY_LOW;
277 } 407 }
278 if (defined (my $v = delete $ob->{flying})) { 408 if (defined (my $v = delete $ob->{flying})) {
279 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 409 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
280 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
281 : $ob->{move_type} & ~MOVE_FLY_LOW;
282 } 410 }
283 411
284 # convert idiotic event_xxx things into objects 412 # convert idiotic event_xxx things into objects
285 while (my ($event, $subtype) = each %EVENT_TYPE) { 413 while (my ($event, $subtype) = each %EVENT_TYPE) {
286 if (exists $ob->{"event_${event}_plugin"}) { 414 if (exists $ob->{"event_${event}_plugin"}) {
… …
347} 475}
348 476
349sub attr_thaw($) { 477sub attr_thaw($) {
350 my ($ob) = @_; 478 my ($ob) = @_;
351 479
352 $ob->{attach} = from_json $ob->{attach} 480 $ob->{attach} = decode_json $ob->{attach}
353 if exists $ob->{attach}; 481 if exists $ob->{attach};
354 482
355 $ob 483 $ob
356} 484}
357 485
358sub attr_freeze($) { 486sub attr_freeze($) {
359 my ($ob) = @_; 487 my ($ob) = @_;
360 488
361 $ob->{attach} = Crossfire::to_json $ob->{attach} 489 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
362 if exists $ob->{attach}; 490 if exists $ob->{attach};
363 491
364 $ob 492 $ob
365} 493}
366 494
… …
384sub read_arch($;$) { 512sub read_arch($;$) {
385 my ($path, $toplevel) = @_; 513 my ($path, $toplevel) = @_;
386 514
387 my %arc; 515 my %arc;
388 my ($more, $prev); 516 my ($more, $prev);
517 my $comment;
389 518
390 open my $fh, "<:raw:perlio:utf8", $path 519 open my $fh, "<:raw:perlio:utf8", $path
391 or Carp::croak "$path: $!"; 520 or Carp::croak "$path: $!";
392 521
393# binmode $fh; 522# binmode $fh;
… …
397 526
398 while (<$fh>) { 527 while (<$fh>) {
399 s/\s+$//; 528 s/\s+$//;
400 if (/^end$/i) { 529 if (/^end$/i) {
401 last; 530 last;
531
402 } elsif (/^arch (\S+)$/i) { 532 } elsif (/^arch (\S+)$/i) {
403 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 533 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
534
404 } elsif (/^lore$/i) { 535 } elsif (/^lore$/i) {
405 while (<$fh>) { 536 while (<$fh>) {
406 last if /^endlore\s*$/i; 537 last if /^endlore\s*$/i;
407 $arc{lore} .= $_; 538 $arc{lore} .= $_;
408 } 539 }
… …
417 chomp; 548 chomp;
418 push @{ $arc{anim} }, $_; 549 push @{ $arc{anim} }, $_;
419 } 550 }
420 } elsif (/^(\S+)\s*(.*)$/) { 551 } elsif (/^(\S+)\s*(.*)$/) {
421 $arc{lc $1} = $2; 552 $arc{lc $1} = $2;
422 } elsif (/^\s*($|#)/) { 553 } elsif (/^\s*#/) {
554 $arc{_comment} .= "$_\n";
555
556 } elsif (/^\s*$/) {
423 # 557 #
424 } else { 558 } else {
425 warn "$path: unparsable line '$_' in arch $arc{_name}"; 559 warn "$path: unparsable line '$_' in arch $arc{_name}";
426 } 560 }
427 } 561 }
… …
433 s/\s+$//; 567 s/\s+$//;
434 if (/^more$/i) { 568 if (/^more$/i) {
435 $more = $prev; 569 $more = $prev;
436 } elsif (/^object (\S+)$/i) { 570 } elsif (/^object (\S+)$/i) {
437 my $name = $1; 571 my $name = $1;
438 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};
439 $arc->{_atype} = 'object'; 575 $arc->{_atype} = 'object';
440 576
441 if ($more) { 577 if ($more) {
442 $more->{more} = $arc; 578 $more->{more} = $arc;
443 } else { 579 } else {
… …
445 } 581 }
446 $prev = $arc; 582 $prev = $arc;
447 $more = undef; 583 $more = undef;
448 } elsif (/^arch (\S+)$/i) { 584 } elsif (/^arch (\S+)$/i) {
449 my $name = $1; 585 my $name = $1;
450 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};
451 $arc->{_atype} = 'arch'; 589 $arc->{_atype} = 'arch';
452 590
453 if ($more) { 591 if ($more) {
454 $more->{more} = $arc; 592 $more->{more} = $arc;
455 } else { 593 } else {
… …
464 push @{$toplevel->{lev_array}}, $_+0; 602 push @{$toplevel->{lev_array}}, $_+0;
465 } 603 }
466 } else { 604 } else {
467 $toplevel->{$1} = $2; 605 $toplevel->{$1} = $2;
468 } 606 }
607 } elsif (/^\s*#/) {
608 $comment .= "$_\n";
469 } elsif (/^\s*($|#)/) { 609 } elsif (/^\s*($|#)/) {
470 # 610 #
471 } else { 611 } else {
472 die "$path: unparseable top-level line '$_'"; 612 die "$path: unparseable top-level line '$_'";
473 } 613 }
… …
484 my $str; 624 my $str;
485 625
486 my $append; $append = sub { 626 my $append; $append = sub {
487 my %a = %{$_[0]}; 627 my %a = %{$_[0]};
488 628
489 Crossfire::attr_freeze \%a; 629 Deliantra::attr_freeze \%a;
490 Crossfire::normalize_arch \%a; 630 Deliantra::normalize_arch \%a;
491 631
492 # undo the bit-split we did before 632 # undo the bit-split we did before
493 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}) {
494 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 634 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
495 | (delete $a{attack_movement_bits_4_7}); 635 | (delete $a{attack_movement_bits_4_7});
496 } 636 }
497 637
638 if (my $comment = delete $a{_comment}) {
639 if ($comment =~ /[^\n\s#]/) {
640 $str .= $comment;
641 }
642 }
643
498 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 644 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
499 645
500 my $inv = delete $a{inventory}; 646 my $inv = delete $a{inventory};
501 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
502 my $anim = delete $a{anim}; 648 my $anim = delete $a{anim};
503 649
650 if ($a{_atype} eq 'object') {
651 $str .= join "\n", "anim", @$anim, "mina\n"
652 if $anim;
653 }
654
504 my @kv; 655 my @kv;
505 656
506 for ($a{_name} eq "map" 657 for ($a{_name} eq "map"
507 ? @Crossfire::FIELD_ORDER_MAP 658 ? @Deliantra::FIELD_ORDER_MAP
508 : @Crossfire::FIELD_ORDER) { 659 : @Deliantra::FIELD_ORDER) {
509 push @kv, [$_, delete $a{$_}] 660 push @kv, [$_, delete $a{$_}]
510 if exists $a{$_}; 661 if exists $a{$_};
511 } 662 }
512 663
513 for (sort keys %a) { 664 for (sort keys %a) {
… …
516 } 667 }
517 668
518 for (@kv) { 669 for (@kv) {
519 my ($k, $v) = @$_; 670 my ($k, $v) = @$_;
520 671
521 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 672 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
522 $v =~ s/\n$//; 673 $v =~ s/\n$//;
523 $str .= "$k\n$v\n$end\n"; 674 $str .= "$k\n$v\n$end\n";
524 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
525 if ($v & ~Crossfire::MOVE_ALL or !$v) {
526 $str .= "$k $v\n";
527
528 } elsif ($v & Crossfire::MOVE_ALLBIT) {
529 $str .= "$k all";
530
531 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
532 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
533 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
534 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
535 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
536
537 $str .= "\n";
538
539 } else {
540 $str .= $k;
541
542 $str .= " walk" if $v & Crossfire::MOVE_WALK;
543 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
544 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
545 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
546 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
547
548 $str .= "\n";
549 }
550 } else { 675 } else {
551 $str .= "$k $v\n"; 676 $str .= "$k $v\n";
552 } 677 }
553 } 678 }
554 679
555 if ($inv) { 680 if ($inv) {
556 $append->($_) for @$inv; 681 $append->($_) for @$inv;
557 } 682 }
558 683
684 $str .= "end\n";
685
559 if ($a{_atype} eq 'object') { 686 if ($a{_atype} eq 'object') {
560 $str .= join "\n", "anim", @$anim, "mina\n" 687 if ($more) {
561 if $anim;
562 }
563
564 $str .= "end\n";
565
566 if (($a{_atype} eq 'object') && $more) {
567 $str .= "\nmore\n"; 688 $str .= "more\n";
568 $append->($more) if $more; 689 $append->($more) if $more;
690 } else {
691 $str .= "\n";
692 }
569 } 693 }
570 }; 694 };
571 695
572 for (@$arch) { 696 for (@$arch) {
573 $append->($_); 697 $append->($_);
… …
602 my ($a) = @_; 726 my ($a) = @_;
603 727
604 my $o = $ARCH{$a->{_name}} 728 my $o = $ARCH{$a->{_name}}
605 or return; 729 or return;
606 730
607 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"}
608 or (warn "no face data found for arch '$a->{_name}'"), return; 734 or (warn "no face data found for arch '$a->{_name}'"), return;
735 }
609 736
610 if ($face->{w} > 1 || $face->{h} > 1) { 737 if ($face->{w} > 1 || $face->{h} > 1) {
611 # bigface 738 # bigface
612 return (0, 0, $face->{w} - 1, $face->{h} - 1); 739 return (0, 0, $face->{w} - 1, $face->{h} - 1);
613 740
… …
646=cut 773=cut
647 774
648sub arch_attr($) { 775sub arch_attr($) {
649 my ($obj) = @_; 776 my ($obj) = @_;
650 777
651 require Crossfire::Data; 778 require Deliantra::Data;
652 779
653 my $root; 780 my $root;
654 my $attr = { }; 781 my $attr = { };
655 782
656 my $arch = $ARCH{ $obj->{_name} }; 783 my $arch = $ARCH{ $obj->{_name} };
657 my $type = $obj->{type} || $arch->{type}; 784 my $type = $obj->{type} || $arch->{type};
658 785
659 if ($type > 0) { 786 if ($type > 0) {
660 $root = $Crossfire::Data::ATTR{$type}; 787 $root = $Deliantra::Data::ATTR{$type};
661 } else { 788 } else {
662 my %a = (%$arch, %$obj); 789 my %a = (%$arch, %$obj);
663 790
664 if ($a{is_floor} && !$a{alive}) { 791 if ($a{is_floor} && !$a{alive}) {
665 $root = $Crossfire::Data::TYPE{Floor}; 792 $root = $Deliantra::Data::TYPE{Floor};
666 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 793 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
667 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 794 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
668 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 795 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
669 $root = $Crossfire::Data::TYPE{Wall}; 796 $root = $Deliantra::Data::TYPE{Wall};
670 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 797 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
671 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 798 $root = $Deliantra::Data::TYPE{"Weak Wall"};
672 } else { 799 } else {
673 $root = $Crossfire::Data::TYPE{Misc}; 800 $root = $Deliantra::Data::TYPE{Misc};
674 } 801 }
675 } 802 }
676 803
677 my @import = ($root); 804 my @import = ($root);
678 805
679 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 806 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
680 unless $type == 116; 807 unless $type == 116;
681 808
682 my (%ignore); 809 my (%ignore);
683 my (@section_order, %section, @attr_order); 810 my (@section_order, %section, @attr_order);
684 811
685 while (my $type = shift @import) { 812 while (my $type = shift @import) {
813 push @import,
814 grep $_,
815 map $Deliantra::Data::TYPE{$_},
686 push @import, @{$type->{import} || []}; 816 @{$type->{import} || []};
687 817
688 $attr->{$_} ||= $type->{$_} 818 $attr->{$_} ||= $type->{$_}
689 for qw(name desc use); 819 for qw(name desc use);
690 820
691 for (@{$type->{ignore} || []}) { 821 for (@{$type->{ignore} || []}) {
… …
720 ]; 850 ];
721 851
722 $attr 852 $attr
723} 853}
724 854
725sub arch_edit_sections {
726# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
727# edit_type = 0;
728# else if (edit_type != 0) {
729# // all flags from 'check_type' must be unset in this arch because they get recalculated now
730# edit_type &= ~check_type;
731# }
732#
733# }
734# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
735# getAttributeValue("alive", defarch) == 1 &&
736# (getAttributeValue("monster", defarch) == 1 ||
737# getAttributeValue("generator", defarch) == 1)) {
738# // Monster: monsters/npcs/generators
739# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
740# }
741# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
742# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
743# // Walls
744# edit_type |= IGUIConstants.TILE_EDIT_WALL;
745# }
746# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
747# getAttributeValue("connected", defarch) != 0) {
748# // Connected Objects
749# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
750# }
751# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
752# arch_type == 66 || arch_type == 41 || arch_type == 95) {
753# // Exit: teleporter/exit/trapdoors
754# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
755# }
756# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
757# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
758# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
759# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
760# arch_type == 124 || arch_type == 130)) {
761# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
762# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
763# }
764# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
765# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
766# arch_type == 91 || arch_type == 21 || arch_type == 24) {
767# // Door: door/special door/gates + keys
768# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
769# }
770# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
771# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
772# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
773# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
774# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
775# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
776# arch_type == 122 || arch_type == 3)) {
777# // Equipment: weapons/armour/wands/rods
778# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
779# }
780#
781# return(edit_type);
782#
783#
784}
785
786sub cache_file($$&&) { 855sub cache_file($$&&) {
787 my ($src, $cache, $load, $create) = @_; 856 my ($src, $cache, $load, $create) = @_;
788 857
789 my ($size, $mtime) = (stat $src)[7,9] 858 my ($size, $mtime) = (stat $src)[7,9]
790 or Carp::croak "$src: $!"; 859 or Carp::croak "$src: $!";
… …
838 }, sub { 907 }, sub {
839 read_arch "$LIB/archetypes" 908 read_arch "$LIB/archetypes"
840 }; 909 };
841} 910}
842 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
843=item load_tilecache 942=item load_tilecache
844 943
845(Re-)Load %TILE and %FACE. 944(Re-)Load %TILE and %FACE.
846 945
847=cut 946=cut
848 947
849sub load_tilecache() { 948sub load_tilecache() {
850 require Gtk2; 949 require Gtk2;
851 950
852 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 951 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
853 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
854 or die "$VARDIR/tilecache.png: $!";
855 *FACE = $_[0];
856 }, sub { 952 sub {
857 my $tile = read_pak "$LIB/crossfire.0";
858
859 my %cache; 953 my %cache;
954 my $facedata = Storable::retrieve "$LIB/facedata";
860 955
956 $facedata->{version} == 2
957 or die "$LIB/facedata: version mismatch, cannot proceed.";
958
959 my $faces = $facedata->{faceinfo};
861 my $idx = 0; 960 my $idx = 0;
862 961
863 for my $name (sort keys %$tile) { 962 for (sort keys %$faces) {
963 my ($face, $info) = ($_, $faces->{$_});
964
864 my $pb = new Gtk2::Gdk::PixbufLoader; 965 my $pb = new Gtk2::Gdk::PixbufLoader;
865 $pb->write ($tile->{$name}); 966 $pb->write ($info->{data32});
866 $pb->close; 967 $pb->close;
867 my $pb = $pb->get_pixbuf; 968 my $pb = $pb->get_pixbuf;
868 969
869 my $tile = $cache{$name} = { 970 my $tile = $cache{$face} = {
870 pb => $pb, 971 pb => $pb,
871 idx => $idx, 972 idx => $idx,
872 w => int $pb->get_width / TILESIZE, 973 w => int $pb->get_width / TILESIZE,
873 h => int $pb->get_height / TILESIZE, 974 h => int $pb->get_height / TILESIZE,
874 }; 975 };
875
876 976
877 $idx += $tile->{w} * $tile->{h}; 977 $idx += $tile->{w} * $tile->{h};
978 }
979
980 construct_tilecache_pb $idx, \%cache;
981
982 \%cache
878 } 983 };
879
880 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
881
882 while (my ($name, $tile) = each %cache) {
883 my $tpb = delete $tile->{pb};
884 my $ofs = $tile->{idx};
885
886 for my $x (0 .. $tile->{w} - 1) {
887 for my $y (0 .. $tile->{h} - 1) {
888 my $idx = $ofs + $x + $y * $tile->{w};
889 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
890 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
891 }
892 }
893 }
894
895 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
896
897 \%cache
898 };
899} 984}
900 985
901=head1 AUTHOR 986=head1 AUTHOR
902 987
903 Marc Lehmann <schmorp@schmorp.de> 988 Marc Lehmann <schmorp@schmorp.de>
… …
907 http://www.ta-sa.org/ 992 http://www.ta-sa.org/
908 993
909=cut 994=cut
910 995
9111 9961
997

Diff Legend

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