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.63 by root, Fri Mar 31 21:06:47 2006 UTC vs.
Revision 1.128 by root, Sun Sep 28 05:58:01 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.1'; 9our $VERSION = '1.222';
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
27use JSON::XS qw(decode_json encode_json);
28
24our $LIB = $ENV{CROSSFIRE_LIBDIR}; 29our $LIB = $ENV{DELIANTRA_LIBDIR};
25 30
26our $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";
27 34
28mkdir $VARDIR, 0777; 35mkdir $VARDIR, 0777;
29 36
30sub TILESIZE (){ 32 } 37sub TILESIZE (){ 32 }
38sub CACHESTRIDE (){ 64 }
31 39
32our %ARCH; 40our %ARCH;
41our %FACE; # face32
33our %FACE; 42our %FACEDATA;
34our $TILE; 43our $TILE;
35 44
36our %FIELD_MULTILINE = ( 45our %FIELD_MULTILINE = (
37 msg => "endmsg", 46 msg => "endmsg",
38 lore => "endlore", 47 lore => "endlore",
… …
44 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);
45 54
46# same as in server save routine, to (hopefully) be compatible 55# same as in server save routine, to (hopefully) be compatible
47# to the other editors. 56# to the other editors.
48our @FIELD_ORDER_MAP = (qw( 57our @FIELD_ORDER_MAP = (qw(
58 file_format_version
49 name swap_time reset_timeout fixed_resettime difficulty region 59 name attach swap_time reset_timeout fixed_resettime difficulty region
50 shopitems shopgreed shopmin shopmax shoprace 60 shopitems shopgreed shopmin shopmax shoprace
51 darkness width height enter_x enter_y msg maplore 61 darkness width height enter_x enter_y msg maplore
52 unique template 62 unique template
53 outdoor temp pressure humid windspeed winddir sky nosmooth 63 outdoor temp pressure humid windspeed winddir sky nosmooth
54 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
55)); 65));
56 66
57our @FIELD_ORDER = (qw( 67our @FIELD_ORDER = (qw(
68 inherit
69
58 elevation 70 elevation
59 71
60 name name_pl custom_name title race 72 name name_pl custom_name attach title race
61 slaying skill msg lore other_arch face 73 slaying skill msg lore other_arch
62 #todo-events 74 sound sound_destroy face animation is_animated
63 animation is_animated 75 magicmap smoothlevel smoothface
64 str dex con wis pow cha int 76 str dex con wis pow cha int
65 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
66 exp perm_exp expmul 78 exp perm_exp expmul
67 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
68 nrof level direction type subtype attacktype 80 nrof level direction type subtype attacktype
… …
76 resist_life_stealing resist_disease 88 resist_life_stealing resist_disease
77 89
78 path_attuned path_repelled path_denied material materialname 90 path_attuned path_repelled path_denied material materialname
79 value carrying weight invisible state magic 91 value carrying weight invisible state magic
80 last_heal last_sp last_grace last_eat 92 last_heal last_sp last_grace last_eat
81 connected glow_radius randomitems npx_status npc_program 93 connected glow_radius randomitems tresure_env npx_status npc_program
82 run_away pick_up container will_apply smoothlevel 94 run_away pick_up container will_apply smoothlevel
83 current_weapon_script weapontype tooltype elevation client_type 95 current_weapon_script weapontype tooltype elevation client_type
84 item_power duration range 96 item_power duration range
85 range_modifier duration_modifier dam_modifier gen_sp_armour 97 range_modifier duration_modifier dam_modifier gen_sp_armour
86 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
… …
97 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
98 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
99 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
100 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
101 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
102 115
103 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
104 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
105)); 118));
106 119
… …
123sub MOVE_FLY_LOW (){ 0x02 } 136sub MOVE_FLY_LOW (){ 0x02 }
124sub MOVE_FLY_HIGH (){ 0x04 } 137sub MOVE_FLY_HIGH (){ 0x04 }
125sub MOVE_FLYING (){ 0x06 } 138sub MOVE_FLYING (){ 0x06 }
126sub MOVE_SWIM (){ 0x08 } 139sub MOVE_SWIM (){ 0x08 }
127sub MOVE_BOAT (){ 0x10 } 140sub MOVE_BOAT (){ 0x10 }
141sub MOVE_SHIP (){ 0x20 }
128sub MOVE_KNOWN (){ 0x1f } # all of above 142sub MOVE_KNOWN (){ 0x3f } # all of above
129sub MOVE_ALLBIT (){ 0x10000 }
130sub 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}
131 244
132sub load_ref($) { 245sub load_ref($) {
133 my ($path) = @_; 246 my ($path) = @_;
134 247
135 open my $fh, "<:raw:perlio", $path 248 open my $fh, "<:raw:perlio", $path
… …
148 close $fh; 261 close $fh;
149 rename "$path~", $path 262 rename "$path~", $path
150 or die "$path: $!"; 263 or die "$path: $!";
151} 264}
152 265
266my %attack_mask = (
267 physical => 0x00000001,
268 magic => 0x00000002,
269 fire => 0x00000004,
270 electricity => 0x00000008,
271 cold => 0x00000010,
272 confusion => 0x00000020,
273 acid => 0x00000040,
274 drain => 0x00000080,
275 weaponmagic => 0x00000100,
276 ghosthit => 0x00000200,
277 poison => 0x00000400,
278 slow => 0x00000800,
279 paralyze => 0x00001000,
280 turn_undead => 0x00002000,
281 fear => 0x00004000,
282 cancellation => 0x00008000,
283 deplete => 0x00010000,
284 death => 0x00020000,
285 chaos => 0x00040000,
286 counterspell => 0x00080000,
287 godpower => 0x00100000,
288 holyword => 0x00200000,
289 blind => 0x00400000,
290 internal => 0x00800000,
291 life_stealing => 0x01000000,
292 disease => 0x02000000,
293);
294
295sub _add_resist($$$) {
296 my ($ob, $mask, $value) = @_;
297
298 while (my ($k, $v) = each %attack_mask) {
299 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
300 }
301}
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
153# object as in "Object xxx", i.e. archetypes 334# object as in "Object xxx", i.e. archetypes
154sub normalize_object($) { 335sub normalize_object($) {
155 my ($ob) = @_; 336 my ($ob) = @_;
156 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
157 # nuke outdated or never supported fields 371 # nuke outdated or never supported fields
158 delete $ob->{$_} for qw( 372 delete @$ob{qw(
159 can_knockback can_parry can_impale can_cut can_dam_armour 373 can_knockback can_parry can_impale can_cut can_dam_armour
160 can_apply pass_thru can_pass_thru 374 can_apply pass_thru can_pass_thru color_bg color_fg
161 ); 375 )};
376
377 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
378 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
379 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
162 380
163 # convert movement strings to bitsets 381 # convert movement strings to bitsets
164 for my $attr (keys %FIELD_MOVEMENT) { 382 for my $attr (keys %FIELD_MOVEMENT) {
165 next unless exists $ob->{$attr}; 383 next unless exists $ob->{$attr};
166 384
167 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 385 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
168
169 next if $ob->{$attr} =~ /^\d+$/;
170
171 my $flags = 0;
172
173 # assume list
174 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
175 $flags |= MOVE_WALK if $flag eq "walk";
176 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
177 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
178 $flags |= MOVE_FLYING if $flag eq "flying";
179 $flags |= MOVE_SWIM if $flag eq "swim";
180 $flags |= MOVE_BOAT if $flag eq "boat";
181 $flags |= MOVE_ALL if $flag eq "all";
182
183 $flags &= ~MOVE_WALK if $flag eq "-walk";
184 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
185 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
186 $flags &= ~MOVE_FLYING if $flag eq "-flying";
187 $flags &= ~MOVE_SWIM if $flag eq "-swim";
188 $flags &= ~MOVE_BOAT if $flag eq "-boat";
189 $flags &= ~MOVE_ALL if $flag eq "-all";
190 }
191
192 $ob->{$attr} = $flags;
193 } 386 }
194 387
195 # convert outdated movement flags to new movement sets 388 # convert outdated movement flags to new movement sets
196 if (defined (my $v = delete $ob->{no_pass})) { 389 if (defined (my $v = delete $ob->{no_pass})) {
197 $ob->{move_block} = $v ? MOVE_ALL : 0; 390 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
198 } 391 }
199 if (defined (my $v = delete $ob->{slow_move})) { 392 if (defined (my $v = delete $ob->{slow_move})) {
200 $ob->{move_slow} |= MOVE_WALK; 393 $ob->{move_slow} += "walk";
201 $ob->{move_slow_penalty} = $v; 394 $ob->{move_slow_penalty} = $v;
202 } 395 }
203 if (defined (my $v = delete $ob->{walk_on})) { 396 if (defined (my $v = delete $ob->{walk_on})) {
204 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 397 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
205 : $ob->{move_on} & ~MOVE_WALK;
206 } 398 }
207 if (defined (my $v = delete $ob->{walk_off})) { 399 if (defined (my $v = delete $ob->{walk_off})) {
208 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 400 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
209 : $ob->{move_off} & ~MOVE_WALK;
210 } 401 }
211 if (defined (my $v = delete $ob->{fly_on})) { 402 if (defined (my $v = delete $ob->{fly_on})) {
212 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 403 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
213 : $ob->{move_on} & ~MOVE_FLY_LOW;
214 } 404 }
215 if (defined (my $v = delete $ob->{fly_off})) { 405 if (defined (my $v = delete $ob->{fly_off})) {
216 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 406 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
217 : $ob->{move_off} & ~MOVE_FLY_LOW;
218 } 407 }
219 if (defined (my $v = delete $ob->{flying})) { 408 if (defined (my $v = delete $ob->{flying})) {
220 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 409 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
221 : $ob->{move_type} & ~MOVE_FLY_LOW;
222 } 410 }
223 411
224 # convert idiotic event_xxx things into objects 412 # convert idiotic event_xxx things into objects
225 while (my ($event, $subtype) = each %EVENT_TYPE) { 413 while (my ($event, $subtype) = each %EVENT_TYPE) {
226 if (exists $ob->{"event_${event}_plugin"}) { 414 if (exists $ob->{"event_${event}_plugin"}) {
… …
231 name => delete $ob->{"event_${event}_options"}, 419 name => delete $ob->{"event_${event}_options"},
232 }; 420 };
233 } 421 }
234 } 422 }
235 423
424 # some archetypes had "+3" instead of the canonical "3", so fix
425 $ob->{dam} *= 1 if exists $ob->{dam};
426
236 $ob 427 $ob
237} 428}
238 429
239# arch as in "arch xxx", ie.. objects 430# arch as in "arch xxx", ie.. objects
240sub normalize_arch($) { 431sub normalize_arch($) {
241 my ($ob) = @_; 432 my ($ob) = @_;
242 433
243 normalize_object $ob; 434 normalize_object $ob;
435
436 return if $ob->{_atype} eq "object";
244 437
245 my $arch = $ARCH{$ob->{_name}} 438 my $arch = $ARCH{$ob->{_name}}
246 or (warn "$ob->{_name}: no such archetype", return $ob); 439 or (warn "$ob->{_name}: no such archetype", return $ob);
247 440
248 if ($arch->{type} == 22) { # map 441 if ($arch->{type} == 22) { # map
… …
281 } 474 }
282 475
283 $ob 476 $ob
284} 477}
285 478
479sub attr_thaw($) {
480 my ($ob) = @_;
481
482 $ob->{attach} = decode_json $ob->{attach}
483 if exists $ob->{attach};
484
485 $ob
486}
487
488sub attr_freeze($) {
489 my ($ob) = @_;
490
491 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
492 if exists $ob->{attach};
493
494 $ob
495}
496
286sub read_pak($) { 497sub read_pak($) {
287 my ($path) = @_; 498 my ($path) = @_;
288 499
289 my %pak; 500 my %pak;
290 501
… …
298 } 509 }
299 510
300 \%pak 511 \%pak
301} 512}
302 513
303sub read_arch($) { 514sub read_arch($;$) {
304 my ($path) = @_; 515 my ($path, $toplevel) = @_;
305 516
306 my %arc; 517 my %arc;
307 my ($more, $prev); 518 my ($more, $prev);
519 my $comment;
308 520
309 open my $fh, "<:raw:perlio:utf8", $path 521 open my $fh, "<:utf8", $path
310 or Carp::croak "$path: $!"; 522 or Carp::croak "$path: $!";
311 523
312 binmode $fh; 524# binmode $fh;
313 525
314 my $parse_block; $parse_block = sub { 526 my $parse_block; $parse_block = sub {
315 my %arc = @_; 527 my %arc = @_;
316 528
317 while (<$fh>) { 529 while (<$fh>) {
318 s/\s+$//; 530 s/\s+$//;
319 if (/^end$/i) { 531 if (/^end$/i) {
320 last; 532 last;
533
321 } elsif (/^arch (\S+)$/i) { 534 } elsif (/^arch (\S+)$/i) {
322 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 535 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
536
323 } elsif (/^lore$/i) { 537 } elsif (/^lore$/i) {
324 while (<$fh>) { 538 while (<$fh>) {
325 last if /^endlore\s*$/i; 539 last if /^endlore\s*$/i;
326 $arc{lore} .= $_; 540 $arc{lore} .= $_;
327 } 541 }
328 } elsif (/^msg$/i) { 542 } elsif (/^msg$/i) {
329 while (<$fh>) { 543 while (<$fh>) {
330 last if /^endmsg\s*$/i; 544 last if /^endmsg\s*$/i;
331 $arc{msg} .= $_; 545 $arc{msg} .= $_;
332 } 546 }
547 } elsif (/^anim$/i) {
548 while (<$fh>) {
549 last if /^mina\s*$/i;
550 chomp;
551 push @{ $arc{anim} }, $_;
552 }
333 } elsif (/^(\S+)\s*(.*)$/) { 553 } elsif (/^(\S+)\s*(.*)$/) {
334 $arc{lc $1} = $2; 554 $arc{lc $1} = $2;
335 } elsif (/^\s*($|#)/) { 555 } elsif (/^\s*#/) {
556 $arc{_comment} .= "$_\n";
557
558 } elsif (/^\s*$/) {
336 # 559 #
337 } else { 560 } else {
338 warn "$path: unparsable line '$_' in arch $arc{_name}"; 561 warn "$path: unparsable line '$_' in arch $arc{_name}";
339 } 562 }
340 } 563 }
… …
346 s/\s+$//; 569 s/\s+$//;
347 if (/^more$/i) { 570 if (/^more$/i) {
348 $more = $prev; 571 $more = $prev;
349 } elsif (/^object (\S+)$/i) { 572 } elsif (/^object (\S+)$/i) {
350 my $name = $1; 573 my $name = $1;
351 my $arc = 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};
577 $arc->{_atype} = 'object';
352 578
353 if ($more) { 579 if ($more) {
354 $more->{more} = $arc; 580 $more->{more} = $arc;
355 } else { 581 } else {
356 $arc{$name} = $arc; 582 $arc{$name} = $arc;
357 } 583 }
358 $prev = $arc; 584 $prev = $arc;
359 $more = undef; 585 $more = undef;
360 } elsif (/^arch (\S+)$/i) { 586 } elsif (/^arch (\S+)$/i) {
361 my $name = $1; 587 my $name = $1;
362 my $arc = 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};
591 $arc->{_atype} = 'arch';
363 592
364 if ($more) { 593 if ($more) {
365 $more->{more} = $arc; 594 $more->{more} = $arc;
366 } else { 595 } else {
367 push @{ $arc{arch} }, $arc; 596 push @{ $arc{arch} }, $arc;
368 } 597 }
369 $prev = $arc; 598 $prev = $arc;
370 $more = undef; 599 $more = undef;
600 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
601 if ($1 eq "lev_array") {
602 while (<$fh>) {
603 last if /^endplst\s*$/;
604 push @{$toplevel->{lev_array}}, $_+0;
605 }
606 } else {
607 $toplevel->{$1} = $2;
608 }
609 } elsif (/^\s*#/) {
610 $comment .= "$_\n";
371 } elsif (/^\s*($|#)/) { 611 } elsif (/^\s*($|#)/) {
372 # 612 #
373 } else { 613 } else {
374 warn "$path: unparseable top-level line '$_'"; 614 die "$path: unparseable top-level line '$_'";
375 } 615 }
376 } 616 }
377 617
378 undef $parse_block; # work around bug in perl not freeing $fh etc. 618 undef $parse_block; # work around bug in perl not freeing $fh etc.
379 619
380 \%arc 620 \%arc
621}
622
623sub archlist_to_string {
624 my ($arch) = @_;
625
626 my $str;
627
628 my $append; $append = sub {
629 my %a = %{$_[0]};
630
631 Deliantra::attr_freeze \%a;
632 Deliantra::normalize_arch \%a;
633
634 # undo the bit-split we did before
635 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
636 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
637 | (delete $a{attack_movement_bits_4_7});
638 }
639
640 if (my $comment = delete $a{_comment}) {
641 if ($comment =~ /[^\n\s#]/) {
642 $str .= $comment;
643 }
644 }
645
646 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
647
648 my $inv = delete $a{inventory};
649 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
650 my $anim = delete $a{anim};
651
652 if ($a{_atype} eq 'object') {
653 $str .= join "\n", "anim", @$anim, "mina\n"
654 if $anim;
655 }
656
657 my @kv;
658
659 for ($a{_name} eq "map"
660 ? @Deliantra::FIELD_ORDER_MAP
661 : @Deliantra::FIELD_ORDER) {
662 push @kv, [$_, delete $a{$_}]
663 if exists $a{$_};
664 }
665
666 for (sort keys %a) {
667 next if /^_/; # ignore our _-keys
668 push @kv, [$_, delete $a{$_}];
669 }
670
671 for (@kv) {
672 my ($k, $v) = @$_;
673
674 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
675 $v =~ s/\n$//;
676 $str .= "$k\n$v\n$end\n";
677 } else {
678 $str .= "$k $v\n";
679 }
680 }
681
682 if ($inv) {
683 $append->($_) for @$inv;
684 }
685
686 $str .= "end\n";
687
688 if ($a{_atype} eq 'object') {
689 if ($more) {
690 $str .= "more\n";
691 $append->($more) if $more;
692 } else {
693 $str .= "\n";
694 }
695 }
696 };
697
698 for (@$arch) {
699 $append->($_);
700 }
701
702 $str
381} 703}
382 704
383# put all archs into a hash with editor_face as it's key 705# put all archs into a hash with editor_face as it's key
384# NOTE: the arrays in the hash values are references to 706# NOTE: the arrays in the hash values are references to
385# the archs from $ARCH 707# the archs from $ARCH
… …
406 my ($a) = @_; 728 my ($a) = @_;
407 729
408 my $o = $ARCH{$a->{_name}} 730 my $o = $ARCH{$a->{_name}}
409 or return; 731 or return;
410 732
411 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"}
412 or (warn "no face data found for arch '$a->{_name}'"), return; 736 or (warn "no face data found for arch '$a->{_name}'"), return;
737 }
413 738
414 if ($face->{w} > 1 || $face->{h} > 1) { 739 if ($face->{w} > 1 || $face->{h} > 1) {
415 # bigface 740 # bigface
416 return (0, 0, $face->{w} - 1, $face->{h} - 1); 741 return (0, 0, $face->{w} - 1, $face->{h} - 1);
417 742
… …
450=cut 775=cut
451 776
452sub arch_attr($) { 777sub arch_attr($) {
453 my ($obj) = @_; 778 my ($obj) = @_;
454 779
455 require Crossfire::Data; 780 require Deliantra::Data;
456 781
457 my $root; 782 my $root;
458 my $attr = { }; 783 my $attr = { };
459 784
460 my $arch = $ARCH{ $obj->{_name} }; 785 my $arch = $ARCH{ $obj->{_name} };
461 my $type = $obj->{type} || $arch->{type}; 786 my $type = $obj->{type} || $arch->{type};
462 787
463 if ($type > 0) { 788 if ($type > 0) {
464 $root = $Crossfire::Data::ATTR{$type}; 789 $root = $Deliantra::Data::ATTR{$type};
465 } else { 790 } else {
466 my %a = (%$arch, %$obj); 791 my %a = (%$arch, %$obj);
467 792
468 if ($a{is_floor} && !$a{alive}) { 793 if ($a{is_floor} && !$a{alive}) {
469 $root = $Crossfire::Data::TYPE{Floor}; 794 $root = $Deliantra::Data::TYPE{Floor};
470 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 795 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
471 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 796 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
472 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 797 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
473 $root = $Crossfire::Data::TYPE{Wall}; 798 $root = $Deliantra::Data::TYPE{Wall};
474 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 799 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
475 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 800 $root = $Deliantra::Data::TYPE{"Weak Wall"};
476 } else { 801 } else {
477 $root = $Crossfire::Data::TYPE{Misc}; 802 $root = $Deliantra::Data::TYPE{Misc};
478 } 803 }
479 } 804 }
480 805
481 my @import = ($root); 806 my @import = ($root);
482 807
483 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 808 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
484 unless $type == 116; 809 unless $type == 116;
485 810
486 my (%ignore); 811 my (%ignore);
487 my (@section_order, %section, @attr_order); 812 my (@section_order, %section, @attr_order);
488 813
489 while (my $type = shift @import) { 814 while (my $type = shift @import) {
815 push @import,
816 grep $_,
817 map $Deliantra::Data::TYPE{$_},
490 push @import, @{$type->{import} || []}; 818 @{$type->{import} || []};
491 819
492 $attr->{$_} ||= $type->{$_} 820 $attr->{$_} ||= $type->{$_}
493 for qw(name desc use); 821 for qw(name desc use);
494 822
495 for (@{$type->{ignore} || []}) { 823 for (@{$type->{ignore} || []}) {
… …
524 ]; 852 ];
525 853
526 $attr 854 $attr
527} 855}
528 856
529sub arch_edit_sections {
530# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
531# edit_type = 0;
532# else if (edit_type != 0) {
533# // all flags from 'check_type' must be unset in this arch because they get recalculated now
534# edit_type &= ~check_type;
535# }
536#
537# }
538# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
539# getAttributeValue("alive", defarch) == 1 &&
540# (getAttributeValue("monster", defarch) == 1 ||
541# getAttributeValue("generator", defarch) == 1)) {
542# // Monster: monsters/npcs/generators
543# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
544# }
545# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
546# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
547# // Walls
548# edit_type |= IGUIConstants.TILE_EDIT_WALL;
549# }
550# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
551# getAttributeValue("connected", defarch) != 0) {
552# // Connected Objects
553# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
554# }
555# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
556# arch_type == 66 || arch_type == 41 || arch_type == 95) {
557# // Exit: teleporter/exit/trapdoors
558# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
559# }
560# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
561# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
562# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
563# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
564# arch_type == 124 || arch_type == 130)) {
565# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
566# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
567# }
568# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
569# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
570# arch_type == 91 || arch_type == 21 || arch_type == 24) {
571# // Door: door/special door/gates + keys
572# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
573# }
574# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
575# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
576# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
577# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
578# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
579# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
580# arch_type == 122 || arch_type == 3)) {
581# // Equipment: weapons/armour/wands/rods
582# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
583# }
584#
585# return(edit_type);
586#
587#
588}
589
590sub cache_file($$&&) { 857sub cache_file($$&&) {
591 my ($src, $cache, $load, $create) = @_; 858 my ($src, $cache, $load, $create) = @_;
592 859
593 my ($size, $mtime) = (stat $src)[7,9] 860 my ($size, $mtime) = (stat $src)[7,9]
594 or Carp::croak "$src: $!"; 861 or Carp::croak "$src: $!";
… …
642 }, sub { 909 }, sub {
643 read_arch "$LIB/archetypes" 910 read_arch "$LIB/archetypes"
644 }; 911 };
645} 912}
646 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
647=item load_tilecache 944=item load_tilecache
648 945
649(Re-)Load %TILE and %FACE. 946(Re-)Load %TILE and %FACE.
650 947
651=cut 948=cut
652 949
653sub load_tilecache() { 950sub load_tilecache() {
654 require Gtk2; 951 require Gtk2;
655 952
656 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 953 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
657 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
658 or die "$VARDIR/tilecache.png: $!";
659 *FACE = $_[0];
660 }, sub { 954 sub {
661 my $tile = read_pak "$LIB/crossfire.0";
662
663 my %cache; 955 my %cache;
956 my $facedata = Storable::retrieve "$LIB/facedata";
664 957
958 $facedata->{version} == 2
959 or die "$LIB/facedata: version mismatch, cannot proceed.";
960
961 my $faces = $facedata->{faceinfo};
665 my $idx = 0; 962 my $idx = 0;
666 963
667 for my $name (sort keys %$tile) { 964 for (sort keys %$faces) {
965 my ($face, $info) = ($_, $faces->{$_});
966
668 my $pb = new Gtk2::Gdk::PixbufLoader; 967 my $pb = new Gtk2::Gdk::PixbufLoader;
669 $pb->write ($tile->{$name}); 968 $pb->write ($info->{data32});
670 $pb->close; 969 $pb->close;
671 my $pb = $pb->get_pixbuf; 970 my $pb = $pb->get_pixbuf;
672 971
673 my $tile = $cache{$name} = { 972 my $tile = $cache{$face} = {
674 pb => $pb, 973 pb => $pb,
675 idx => $idx, 974 idx => $idx,
676 w => int $pb->get_width / TILESIZE, 975 w => int $pb->get_width / TILESIZE,
677 h => int $pb->get_height / TILESIZE, 976 h => int $pb->get_height / TILESIZE,
678 }; 977 };
679
680 978
681 $idx += $tile->{w} * $tile->{h}; 979 $idx += $tile->{w} * $tile->{h};
980 }
981
982 construct_tilecache_pb $idx, \%cache;
983
984 \%cache
682 } 985 };
683
684 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
685
686 while (my ($name, $tile) = each %cache) {
687 my $tpb = delete $tile->{pb};
688 my $ofs = $tile->{idx};
689
690 for my $x (0 .. $tile->{w} - 1) {
691 for my $y (0 .. $tile->{h} - 1) {
692 my $idx = $ofs + $x + $y * $tile->{w};
693 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
694 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
695 }
696 }
697 }
698
699 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
700
701 \%cache
702 };
703} 986}
704 987
705=head1 AUTHOR 988=head1 AUTHOR
706 989
707 Marc Lehmann <schmorp@schmorp.de> 990 Marc Lehmann <schmorp@schmorp.de>
… …
711 http://www.ta-sa.org/ 994 http://www.ta-sa.org/
712 995
713=cut 996=cut
714 997
7151 9981
999

Diff Legend

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