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.129 by root, Sun Jan 11 22:03:03 2009 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.9'; 9our $VERSION = '1.23';
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" : File::Spec->tmpdir . "/crossfire"; 31our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
32 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
33 : File::Spec->tmpdir . "/deliantra";
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 74 sound sound_destroy face animation is_animated
75 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 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}
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 Deliantra::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 Deliantra::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 Deliantra::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 Deliantra::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 Deliantra::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 Deliantra::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 Deliantra::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"}) {
… …
300# arch as in "arch xxx", ie.. objects 430# arch as in "arch xxx", ie.. objects
301sub normalize_arch($) { 431sub normalize_arch($) {
302 my ($ob) = @_; 432 my ($ob) = @_;
303 433
304 normalize_object $ob; 434 normalize_object $ob;
435
436 return if $ob->{_atype} eq "object";
305 437
306 my $arch = $ARCH{$ob->{_name}} 438 my $arch = $ARCH{$ob->{_name}}
307 or (warn "$ob->{_name}: no such archetype", return $ob); 439 or (warn "$ob->{_name}: no such archetype", return $ob);
308 440
309 if ($arch->{type} == 22) { # map 441 if ($arch->{type} == 22) { # map
… …
345} 477}
346 478
347sub attr_thaw($) { 479sub attr_thaw($) {
348 my ($ob) = @_; 480 my ($ob) = @_;
349 481
350 $ob->{attach} = from_json $ob->{attach} 482 $ob->{attach} = decode_json $ob->{attach}
351 if exists $ob->{attach}; 483 if exists $ob->{attach};
352 484
353 $ob 485 $ob
354} 486}
355 487
356sub attr_freeze($) { 488sub attr_freeze($) {
357 my ($ob) = @_; 489 my ($ob) = @_;
358 490
359 $ob->{attach} = Crossfire::to_json $ob->{attach} 491 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
360 if exists $ob->{attach}; 492 if exists $ob->{attach};
361 493
362 $ob 494 $ob
363} 495}
364 496
… …
382sub read_arch($;$) { 514sub read_arch($;$) {
383 my ($path, $toplevel) = @_; 515 my ($path, $toplevel) = @_;
384 516
385 my %arc; 517 my %arc;
386 my ($more, $prev); 518 my ($more, $prev);
519 my $comment;
387 520
388 open my $fh, "<:raw:perlio:utf8", $path 521 open my $fh, "<:utf8", $path
389 or Carp::croak "$path: $!"; 522 or Carp::croak "$path: $!";
390 523
391# binmode $fh; 524# binmode $fh;
392 525
393 my $parse_block; $parse_block = sub { 526 my $parse_block; $parse_block = sub {
… …
395 528
396 while (<$fh>) { 529 while (<$fh>) {
397 s/\s+$//; 530 s/\s+$//;
398 if (/^end$/i) { 531 if (/^end$/i) {
399 last; 532 last;
533
400 } elsif (/^arch (\S+)$/i) { 534 } elsif (/^arch (\S+)$/i) {
401 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 535 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
536
402 } elsif (/^lore$/i) { 537 } elsif (/^lore$/i) {
403 while (<$fh>) { 538 while (<$fh>) {
404 last if /^endlore\s*$/i; 539 last if /^endlore\s*$/i;
405 $arc{lore} .= $_; 540 $arc{lore} .= $_;
406 } 541 }
… …
415 chomp; 550 chomp;
416 push @{ $arc{anim} }, $_; 551 push @{ $arc{anim} }, $_;
417 } 552 }
418 } elsif (/^(\S+)\s*(.*)$/) { 553 } elsif (/^(\S+)\s*(.*)$/) {
419 $arc{lc $1} = $2; 554 $arc{lc $1} = $2;
420 } elsif (/^\s*($|#)/) { 555 } elsif (/^\s*#/) {
556 $arc{_comment} .= "$_\n";
557
558 } elsif (/^\s*$/) {
421 # 559 #
422 } else { 560 } else {
423 warn "$path: unparsable line '$_' in arch $arc{_name}"; 561 warn "$path: unparsable line '$_' in arch $arc{_name}";
424 } 562 }
425 } 563 }
… …
431 s/\s+$//; 569 s/\s+$//;
432 if (/^more$/i) { 570 if (/^more$/i) {
433 $more = $prev; 571 $more = $prev;
434 } elsif (/^object (\S+)$/i) { 572 } elsif (/^object (\S+)$/i) {
435 my $name = $1; 573 my $name = $1;
436 my $arc = attr_thaw normalize_object $parse_block->(_name => $name); 574 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
575 undef $comment;
576 delete $arc{_comment} unless length $arc{_comment};
437 $arc->{_atype} = 'object'; 577 $arc->{_atype} = 'object';
438 578
439 if ($more) { 579 if ($more) {
440 $more->{more} = $arc; 580 $more->{more} = $arc;
441 } else { 581 } else {
… …
443 } 583 }
444 $prev = $arc; 584 $prev = $arc;
445 $more = undef; 585 $more = undef;
446 } elsif (/^arch (\S+)$/i) { 586 } elsif (/^arch (\S+)$/i) {
447 my $name = $1; 587 my $name = $1;
448 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 588 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
589 undef $comment;
590 delete $arc{_comment} unless length $arc{_comment};
449 $arc->{_atype} = 'arch'; 591 $arc->{_atype} = 'arch';
450 592
451 if ($more) { 593 if ($more) {
452 $more->{more} = $arc; 594 $more->{more} = $arc;
453 } else { 595 } else {
… …
462 push @{$toplevel->{lev_array}}, $_+0; 604 push @{$toplevel->{lev_array}}, $_+0;
463 } 605 }
464 } else { 606 } else {
465 $toplevel->{$1} = $2; 607 $toplevel->{$1} = $2;
466 } 608 }
609 } elsif (/^\s*#/) {
610 $comment .= "$_\n";
467 } elsif (/^\s*($|#)/) { 611 } elsif (/^\s*($|#)/) {
468 # 612 #
469 } else { 613 } else {
470 die "$path: unparseable top-level line '$_'"; 614 die "$path: unparseable top-level line '$_'";
471 } 615 }
… …
482 my $str; 626 my $str;
483 627
484 my $append; $append = sub { 628 my $append; $append = sub {
485 my %a = %{$_[0]}; 629 my %a = %{$_[0]};
486 630
487 Crossfire::attr_freeze \%a; 631 Deliantra::attr_freeze \%a;
488 Crossfire::normalize_arch \%a; 632 Deliantra::normalize_arch \%a;
489 633
490 # undo the bit-split we did before 634 # undo the bit-split we did before
491 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 635 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}) 636 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
493 | (delete $a{attack_movement_bits_4_7}); 637 | (delete $a{attack_movement_bits_4_7});
494 } 638 }
495 639
640 if (my $comment = delete $a{_comment}) {
641 if ($comment =~ /[^\n\s#]/) {
642 $str .= $comment;
643 }
644 }
645
496 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 646 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
497 647
498 my $inv = delete $a{inventory}; 648 my $inv = delete $a{inventory};
499 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 649 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
500 my $anim = delete $a{anim}; 650 my $anim = delete $a{anim};
501 651
652 if ($a{_atype} eq 'object') {
653 $str .= join "\n", "anim", @$anim, "mina\n"
654 if $anim;
655 }
656
502 my @kv; 657 my @kv;
503 658
504 for ($a{_name} eq "map" 659 for ($a{_name} eq "map"
505 ? @Crossfire::FIELD_ORDER_MAP 660 ? @Deliantra::FIELD_ORDER_MAP
506 : @Crossfire::FIELD_ORDER) { 661 : @Deliantra::FIELD_ORDER) {
507 push @kv, [$_, delete $a{$_}] 662 push @kv, [$_, delete $a{$_}]
508 if exists $a{$_}; 663 if exists $a{$_};
509 } 664 }
510 665
511 for (sort keys %a) { 666 for (sort keys %a) {
… …
514 } 669 }
515 670
516 for (@kv) { 671 for (@kv) {
517 my ($k, $v) = @$_; 672 my ($k, $v) = @$_;
518 673
519 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 674 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
520 $v =~ s/\n$//; 675 $v =~ s/\n$//;
521 $str .= "$k\n$v\n$end\n"; 676 $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 { 677 } else {
549 $str .= "$k $v\n"; 678 $str .= "$k $v\n";
550 } 679 }
551 } 680 }
552 681
553 if ($inv) { 682 if ($inv) {
554 $append->($_) for @$inv; 683 $append->($_) for @$inv;
555 } 684 }
556 685
686 $str .= "end\n";
687
557 if ($a{_atype} eq 'object') { 688 if ($a{_atype} eq 'object') {
558 $str .= join "\n", "anim", @$anim, "mina\n" 689 if ($more) {
559 if $anim;
560 }
561
562 $str .= "end\n";
563
564 if (($a{_atype} eq 'object') && $more) {
565 $str .= "\nmore\n"; 690 $str .= "more\n";
566 $append->($more) if $more; 691 $append->($more) if $more;
692 } else {
693 $str .= "\n";
694 }
567 } 695 }
568 }; 696 };
569 697
570 for (@$arch) { 698 for (@$arch) {
571 $append->($_); 699 $append->($_);
… …
600 my ($a) = @_; 728 my ($a) = @_;
601 729
602 my $o = $ARCH{$a->{_name}} 730 my $o = $ARCH{$a->{_name}}
603 or return; 731 or return;
604 732
605 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 733 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
734 unless ($face) {
735 $face = $FACE{"blank.x11"}
606 or (warn "no face data found for arch '$a->{_name}'"), return; 736 or (warn "no face data found for arch '$a->{_name}'"), return;
737 }
607 738
608 if ($face->{w} > 1 || $face->{h} > 1) { 739 if ($face->{w} > 1 || $face->{h} > 1) {
609 # bigface 740 # bigface
610 return (0, 0, $face->{w} - 1, $face->{h} - 1); 741 return (0, 0, $face->{w} - 1, $face->{h} - 1);
611 742
… …
644=cut 775=cut
645 776
646sub arch_attr($) { 777sub arch_attr($) {
647 my ($obj) = @_; 778 my ($obj) = @_;
648 779
649 require Crossfire::Data; 780 require Deliantra::Data;
650 781
651 my $root; 782 my $root;
652 my $attr = { }; 783 my $attr = { };
653 784
654 my $arch = $ARCH{ $obj->{_name} }; 785 my $arch = $ARCH{ $obj->{_name} };
655 my $type = $obj->{type} || $arch->{type}; 786 my $type = $obj->{type} || $arch->{type};
656 787
657 if ($type > 0) { 788 if ($type > 0) {
658 $root = $Crossfire::Data::ATTR{$type}; 789 $root = $Deliantra::Data::ATTR{$type};
659 } else { 790 } else {
660 my %a = (%$arch, %$obj); 791 my %a = (%$arch, %$obj);
661 792
662 if ($a{is_floor} && !$a{alive}) { 793 if ($a{is_floor} && !$a{alive}) {
663 $root = $Crossfire::Data::TYPE{Floor}; 794 $root = $Deliantra::Data::TYPE{Floor};
664 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 795 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
665 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 796 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
666 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 797 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
667 $root = $Crossfire::Data::TYPE{Wall}; 798 $root = $Deliantra::Data::TYPE{Wall};
668 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 799 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
669 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 800 $root = $Deliantra::Data::TYPE{"Weak Wall"};
670 } else { 801 } else {
671 $root = $Crossfire::Data::TYPE{Misc}; 802 $root = $Deliantra::Data::TYPE{Misc};
672 } 803 }
673 } 804 }
674 805
675 my @import = ($root); 806 my @import = ($root);
676 807
677 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 808 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
678 unless $type == 116; 809 unless $type == 116;
679 810
680 my (%ignore); 811 my (%ignore);
681 my (@section_order, %section, @attr_order); 812 my (@section_order, %section, @attr_order);
682 813
683 while (my $type = shift @import) { 814 while (my $type = shift @import) {
815 push @import,
816 grep $_,
817 map $Deliantra::Data::TYPE{$_},
684 push @import, @{$type->{import} || []}; 818 @{$type->{import} || []};
685 819
686 $attr->{$_} ||= $type->{$_} 820 $attr->{$_} ||= $type->{$_}
687 for qw(name desc use); 821 for qw(name desc use);
688 822
689 for (@{$type->{ignore} || []}) { 823 for (@{$type->{ignore} || []}) {
… …
718 ]; 852 ];
719 853
720 $attr 854 $attr
721} 855}
722 856
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($$&&) { 857sub cache_file($$&&) {
785 my ($src, $cache, $load, $create) = @_; 858 my ($src, $cache, $load, $create) = @_;
786 859
787 my ($size, $mtime) = (stat $src)[7,9] 860 my ($size, $mtime) = (stat $src)[7,9]
788 or Carp::croak "$src: $!"; 861 or Carp::croak "$src: $!";
… …
836 }, sub { 909 }, sub {
837 read_arch "$LIB/archetypes" 910 read_arch "$LIB/archetypes"
838 }; 911 };
839} 912}
840 913
914sub construct_tilecache_pb {
915 my ($idx, $cache) = @_;
916
917 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
918
919 while (my ($name, $tile) = each %$cache) {
920 my $tpb = delete $tile->{pb};
921 my $ofs = $tile->{idx};
922
923 for my $x (0 .. $tile->{w} - 1) {
924 for my $y (0 .. $tile->{h} - 1) {
925 my $idx = $ofs + $x + $y * $tile->{w};
926 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
927 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
928 }
929 }
930 }
931
932 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
933
934 $cache
935}
936
937sub use_tilecache {
938 my ($face) = @_;
939 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
940 or die "$VARDIR/tilecache.png: $!";
941 *FACE = $_[0];
942}
943
841=item load_tilecache 944=item load_tilecache
842 945
843(Re-)Load %TILE and %FACE. 946(Re-)Load %TILE and %FACE.
844 947
845=cut 948=cut
846 949
847sub load_tilecache() { 950sub load_tilecache() {
848 require Gtk2; 951 require Gtk2;
849 952
850 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 953 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 { 954 sub {
855 my $tile = read_pak "$LIB/crossfire.0";
856
857 my %cache; 955 my %cache;
956 my $facedata = Storable::retrieve "$LIB/facedata";
858 957
958 $facedata->{version} == 2
959 or die "$LIB/facedata: version mismatch, cannot proceed.";
960
961 my $faces = $facedata->{faceinfo};
859 my $idx = 0; 962 my $idx = 0;
860 963
861 for my $name (sort keys %$tile) { 964 for (sort keys %$faces) {
965 my ($face, $info) = ($_, $faces->{$_});
966
862 my $pb = new Gtk2::Gdk::PixbufLoader; 967 my $pb = new Gtk2::Gdk::PixbufLoader;
863 $pb->write ($tile->{$name}); 968 $pb->write ($info->{data32});
864 $pb->close; 969 $pb->close;
865 my $pb = $pb->get_pixbuf; 970 my $pb = $pb->get_pixbuf;
866 971
867 my $tile = $cache{$name} = { 972 my $tile = $cache{$face} = {
868 pb => $pb, 973 pb => $pb,
869 idx => $idx, 974 idx => $idx,
870 w => int $pb->get_width / TILESIZE, 975 w => int $pb->get_width / TILESIZE,
871 h => int $pb->get_height / TILESIZE, 976 h => int $pb->get_height / TILESIZE,
872 }; 977 };
873
874 978
875 $idx += $tile->{w} * $tile->{h}; 979 $idx += $tile->{w} * $tile->{h};
980 }
981
982 construct_tilecache_pb $idx, \%cache;
983
984 \%cache
876 } 985 };
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} 986}
898 987
899=head1 AUTHOR 988=head1 AUTHOR
900 989
901 Marc Lehmann <schmorp@schmorp.de> 990 Marc Lehmann <schmorp@schmorp.de>
… …
905 http://www.ta-sa.org/ 994 http://www.ta-sa.org/
906 995
907=cut 996=cut
908 997
9091 9981
999

Diff Legend

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