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.62 by root, Tue Mar 28 14:44:52 2006 UTC vs.
Revision 1.125 by root, Sun Aug 31 09:19:22 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.22';
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
63 animation is_animated 74 face 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, "<", $path 248 open my $fh, "<:raw:perlio", $path
136 or die "$path: $!"; 249 or die "$path: $!";
137 binmode $fh;
138 local $/; 250 local $/;
139 251
140 thaw <$fh> 252 thaw <$fh>
141} 253}
142 254
143sub save_ref($$) { 255sub save_ref($$) {
144 my ($ref, $path) = @_; 256 my ($ref, $path) = @_;
145 257
146 open my $fh, ">", "$path~" 258 open my $fh, ">:raw:perlio", "$path~"
147 or die "$path~: $!"; 259 or die "$path~: $!";
148 binmode $fh;
149 print $fh freeze $ref; 260 print $fh freeze $ref;
150 close $fh; 261 close $fh;
151 rename "$path~", $path 262 rename "$path~", $path
152 or die "$path: $!"; 263 or die "$path: $!";
153} 264}
154 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
155# object as in "Object xxx", i.e. archetypes 334# object as in "Object xxx", i.e. archetypes
156sub normalize_object($) { 335sub normalize_object($) {
157 my ($ob) = @_; 336 my ($ob) = @_;
158 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
159 # nuke outdated or never supported fields 371 # nuke outdated or never supported fields
160 delete $ob->{$_} for qw( 372 delete @$ob{qw(
161 can_knockback can_parry can_impale can_cut can_dam_armour 373 can_knockback can_parry can_impale can_cut can_dam_armour
162 can_apply pass_thru can_pass_thru 374 can_apply pass_thru can_pass_thru color_bg color_fg
163 ); 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; }
164 380
165 # convert movement strings to bitsets 381 # convert movement strings to bitsets
166 for my $attr (keys %FIELD_MOVEMENT) { 382 for my $attr (keys %FIELD_MOVEMENT) {
167 next unless exists $ob->{$attr}; 383 next unless exists $ob->{$attr};
168 384
169 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 385 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
170
171 next if $ob->{$attr} =~ /^\d+$/;
172
173 my $flags = 0;
174
175 # assume list
176 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
177 $flags |= MOVE_WALK if $flag eq "walk";
178 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
179 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
180 $flags |= MOVE_FLYING if $flag eq "flying";
181 $flags |= MOVE_SWIM if $flag eq "swim";
182 $flags |= MOVE_BOAT if $flag eq "boat";
183 $flags |= MOVE_ALL if $flag eq "all";
184
185 $flags &= ~MOVE_WALK if $flag eq "-walk";
186 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
187 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
188 $flags &= ~MOVE_FLYING if $flag eq "-flying";
189 $flags &= ~MOVE_SWIM if $flag eq "-swim";
190 $flags &= ~MOVE_BOAT if $flag eq "-boat";
191 $flags &= ~MOVE_ALL if $flag eq "-all";
192 }
193
194 $ob->{$attr} = $flags;
195 } 386 }
196 387
197 # convert outdated movement flags to new movement sets 388 # convert outdated movement flags to new movement sets
198 if (defined (my $v = delete $ob->{no_pass})) { 389 if (defined (my $v = delete $ob->{no_pass})) {
199 $ob->{move_block} = $v ? MOVE_ALL : 0; 390 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
200 } 391 }
201 if (defined (my $v = delete $ob->{slow_move})) { 392 if (defined (my $v = delete $ob->{slow_move})) {
202 $ob->{move_slow} |= MOVE_WALK; 393 $ob->{move_slow} += "walk";
203 $ob->{move_slow_penalty} = $v; 394 $ob->{move_slow_penalty} = $v;
204 } 395 }
205 if (defined (my $v = delete $ob->{walk_on})) { 396 if (defined (my $v = delete $ob->{walk_on})) {
206 $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" }
207 : $ob->{move_on} & ~MOVE_WALK;
208 } 398 }
209 if (defined (my $v = delete $ob->{walk_off})) { 399 if (defined (my $v = delete $ob->{walk_off})) {
210 $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" }
211 : $ob->{move_off} & ~MOVE_WALK;
212 } 401 }
213 if (defined (my $v = delete $ob->{fly_on})) { 402 if (defined (my $v = delete $ob->{fly_on})) {
214 $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" }
215 : $ob->{move_on} & ~MOVE_FLY_LOW;
216 } 404 }
217 if (defined (my $v = delete $ob->{fly_off})) { 405 if (defined (my $v = delete $ob->{fly_off})) {
218 $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" }
219 : $ob->{move_off} & ~MOVE_FLY_LOW;
220 } 407 }
221 if (defined (my $v = delete $ob->{flying})) { 408 if (defined (my $v = delete $ob->{flying})) {
222 $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" }
223 : $ob->{move_type} & ~MOVE_FLY_LOW;
224 } 410 }
225 411
226 # convert idiotic event_xxx things into objects 412 # convert idiotic event_xxx things into objects
227 while (my ($event, $subtype) = each %EVENT_TYPE) { 413 while (my ($event, $subtype) = each %EVENT_TYPE) {
228 if (exists $ob->{"event_${event}_plugin"}) { 414 if (exists $ob->{"event_${event}_plugin"}) {
… …
232 slaying => delete $ob->{"event_${event}"}, 418 slaying => delete $ob->{"event_${event}"},
233 name => delete $ob->{"event_${event}_options"}, 419 name => delete $ob->{"event_${event}_options"},
234 }; 420 };
235 } 421 }
236 } 422 }
423
424 # some archetypes had "+3" instead of the canonical "3", so fix
425 $ob->{dam} *= 1 if exists $ob->{dam};
237 426
238 $ob 427 $ob
239} 428}
240 429
241# arch as in "arch xxx", ie.. objects 430# arch as in "arch xxx", ie.. objects
… …
283 } 472 }
284 473
285 $ob 474 $ob
286} 475}
287 476
477sub attr_thaw($) {
478 my ($ob) = @_;
479
480 $ob->{attach} = decode_json $ob->{attach}
481 if exists $ob->{attach};
482
483 $ob
484}
485
486sub attr_freeze($) {
487 my ($ob) = @_;
488
489 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
490 if exists $ob->{attach};
491
492 $ob
493}
494
288sub read_pak($) { 495sub read_pak($) {
289 my ($path) = @_; 496 my ($path) = @_;
290 497
291 my %pak; 498 my %pak;
292 499
293 open my $fh, "<", $path 500 open my $fh, "<:raw:perlio", $path
294 or Carp::croak "$_[0]: $!"; 501 or Carp::croak "$_[0]: $!";
295 binmode $fh; 502 binmode $fh;
296 while (<$fh>) { 503 while (<$fh>) {
297 my ($type, $id, $len, $path) = split; 504 my ($type, $id, $len, $path) = split;
298 $path =~ s/.*\///; 505 $path =~ s/.*\///;
… …
300 } 507 }
301 508
302 \%pak 509 \%pak
303} 510}
304 511
305sub read_arch($) { 512sub read_arch($;$) {
306 my ($path) = @_; 513 my ($path, $toplevel) = @_;
307 514
308 my %arc; 515 my %arc;
309 my ($more, $prev); 516 my ($more, $prev);
517 my $comment;
310 518
311 open my $fh, "<", $path 519 open my $fh, "<:raw:perlio:utf8", $path
312 or Carp::croak "$path: $!"; 520 or Carp::croak "$path: $!";
313 521
314 binmode $fh; 522# binmode $fh;
315 523
316 my $parse_block; $parse_block = sub { 524 my $parse_block; $parse_block = sub {
317 my %arc = @_; 525 my %arc = @_;
318 526
319 while (<$fh>) { 527 while (<$fh>) {
320 s/\s+$//; 528 s/\s+$//;
321 if (/^end$/i) { 529 if (/^end$/i) {
322 last; 530 last;
531
323 } elsif (/^arch (\S+)$/i) { 532 } elsif (/^arch (\S+)$/i) {
324 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 533 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
534
325 } elsif (/^lore$/i) { 535 } elsif (/^lore$/i) {
326 while (<$fh>) { 536 while (<$fh>) {
327 last if /^endlore\s*$/i; 537 last if /^endlore\s*$/i;
328 $arc{lore} .= $_; 538 $arc{lore} .= $_;
329 } 539 }
330 } elsif (/^msg$/i) { 540 } elsif (/^msg$/i) {
331 while (<$fh>) { 541 while (<$fh>) {
332 last if /^endmsg\s*$/i; 542 last if /^endmsg\s*$/i;
333 $arc{msg} .= $_; 543 $arc{msg} .= $_;
334 } 544 }
545 } elsif (/^anim$/i) {
546 while (<$fh>) {
547 last if /^mina\s*$/i;
548 chomp;
549 push @{ $arc{anim} }, $_;
550 }
335 } elsif (/^(\S+)\s*(.*)$/) { 551 } elsif (/^(\S+)\s*(.*)$/) {
336 $arc{lc $1} = $2; 552 $arc{lc $1} = $2;
337 } elsif (/^\s*($|#)/) { 553 } elsif (/^\s*#/) {
554 $arc{_comment} .= "$_\n";
555
556 } elsif (/^\s*$/) {
338 # 557 #
339 } else { 558 } else {
340 warn "$path: unparsable line '$_' in arch $arc{_name}"; 559 warn "$path: unparsable line '$_' in arch $arc{_name}";
341 } 560 }
342 } 561 }
… …
348 s/\s+$//; 567 s/\s+$//;
349 if (/^more$/i) { 568 if (/^more$/i) {
350 $more = $prev; 569 $more = $prev;
351 } elsif (/^object (\S+)$/i) { 570 } elsif (/^object (\S+)$/i) {
352 my $name = $1; 571 my $name = $1;
353 my $arc = 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};
575 $arc->{_atype} = 'object';
354 576
355 if ($more) { 577 if ($more) {
356 $more->{more} = $arc; 578 $more->{more} = $arc;
357 } else { 579 } else {
358 $arc{$name} = $arc; 580 $arc{$name} = $arc;
359 } 581 }
360 $prev = $arc; 582 $prev = $arc;
361 $more = undef; 583 $more = undef;
362 } elsif (/^arch (\S+)$/i) { 584 } elsif (/^arch (\S+)$/i) {
363 my $name = $1; 585 my $name = $1;
364 my $arc = 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};
589 $arc->{_atype} = 'arch';
365 590
366 if ($more) { 591 if ($more) {
367 $more->{more} = $arc; 592 $more->{more} = $arc;
368 } else { 593 } else {
369 push @{ $arc{arch} }, $arc; 594 push @{ $arc{arch} }, $arc;
370 } 595 }
371 $prev = $arc; 596 $prev = $arc;
372 $more = undef; 597 $more = undef;
598 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
599 if ($1 eq "lev_array") {
600 while (<$fh>) {
601 last if /^endplst\s*$/;
602 push @{$toplevel->{lev_array}}, $_+0;
603 }
604 } else {
605 $toplevel->{$1} = $2;
606 }
607 } elsif (/^\s*#/) {
608 $comment .= "$_\n";
373 } elsif (/^\s*($|#)/) { 609 } elsif (/^\s*($|#)/) {
374 # 610 #
375 } else { 611 } else {
376 warn "$path: unparseable top-level line '$_'"; 612 die "$path: unparseable top-level line '$_'";
377 } 613 }
378 } 614 }
379 615
380 undef $parse_block; # work around bug in perl not freeing $fh etc. 616 undef $parse_block; # work around bug in perl not freeing $fh etc.
381 617
382 \%arc 618 \%arc
619}
620
621sub archlist_to_string {
622 my ($arch) = @_;
623
624 my $str;
625
626 my $append; $append = sub {
627 my %a = %{$_[0]};
628
629 Deliantra::attr_freeze \%a;
630 Deliantra::normalize_arch \%a;
631
632 # undo the bit-split we did before
633 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
634 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
635 | (delete $a{attack_movement_bits_4_7});
636 }
637
638 if (my $comment = delete $a{_comment}) {
639 if ($comment =~ /[^\n\s#]/) {
640 $str .= $comment;
641 }
642 }
643
644 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
645
646 my $inv = delete $a{inventory};
647 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
648 my $anim = delete $a{anim};
649
650 if ($a{_atype} eq 'object') {
651 $str .= join "\n", "anim", @$anim, "mina\n"
652 if $anim;
653 }
654
655 my @kv;
656
657 for ($a{_name} eq "map"
658 ? @Deliantra::FIELD_ORDER_MAP
659 : @Deliantra::FIELD_ORDER) {
660 push @kv, [$_, delete $a{$_}]
661 if exists $a{$_};
662 }
663
664 for (sort keys %a) {
665 next if /^_/; # ignore our _-keys
666 push @kv, [$_, delete $a{$_}];
667 }
668
669 for (@kv) {
670 my ($k, $v) = @$_;
671
672 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
673 $v =~ s/\n$//;
674 $str .= "$k\n$v\n$end\n";
675 } else {
676 $str .= "$k $v\n";
677 }
678 }
679
680 if ($inv) {
681 $append->($_) for @$inv;
682 }
683
684 $str .= "end\n";
685
686 if ($a{_atype} eq 'object') {
687 if ($more) {
688 $str .= "more\n";
689 $append->($more) if $more;
690 } else {
691 $str .= "\n";
692 }
693 }
694 };
695
696 for (@$arch) {
697 $append->($_);
698 }
699
700 $str
383} 701}
384 702
385# put all archs into a hash with editor_face as it's key 703# put all archs into a hash with editor_face as it's key
386# NOTE: the arrays in the hash values are references to 704# NOTE: the arrays in the hash values are references to
387# the archs from $ARCH 705# the archs from $ARCH
… …
408 my ($a) = @_; 726 my ($a) = @_;
409 727
410 my $o = $ARCH{$a->{_name}} 728 my $o = $ARCH{$a->{_name}}
411 or return; 729 or return;
412 730
413 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"}
414 or (warn "no face data found for arch '$a->{_name}'"), return; 734 or (warn "no face data found for arch '$a->{_name}'"), return;
735 }
415 736
416 if ($face->{w} > 1 || $face->{h} > 1) { 737 if ($face->{w} > 1 || $face->{h} > 1) {
417 # bigface 738 # bigface
418 return (0, 0, $face->{w} - 1, $face->{h} - 1); 739 return (0, 0, $face->{w} - 1, $face->{h} - 1);
419 740
… …
452=cut 773=cut
453 774
454sub arch_attr($) { 775sub arch_attr($) {
455 my ($obj) = @_; 776 my ($obj) = @_;
456 777
457 require Crossfire::Data; 778 require Deliantra::Data;
458 779
459 my $root; 780 my $root;
460 my $attr = { }; 781 my $attr = { };
461 782
462 my $arch = $ARCH{ $obj->{_name} }; 783 my $arch = $ARCH{ $obj->{_name} };
463 my $type = $obj->{type} || $arch->{type}; 784 my $type = $obj->{type} || $arch->{type};
464 785
465 if ($type > 0) { 786 if ($type > 0) {
466 $root = $Crossfire::Data::ATTR{$type}; 787 $root = $Deliantra::Data::ATTR{$type};
467 } else { 788 } else {
468 my %a = (%$arch, %$obj); 789 my %a = (%$arch, %$obj);
469 790
470 if ($a{is_floor} && !$a{alive}) { 791 if ($a{is_floor} && !$a{alive}) {
471 $root = $Crossfire::Data::TYPE{Floor}; 792 $root = $Deliantra::Data::TYPE{Floor};
472 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 793 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
473 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 794 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
474 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 795 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
475 $root = $Crossfire::Data::TYPE{Wall}; 796 $root = $Deliantra::Data::TYPE{Wall};
476 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 797 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
477 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 798 $root = $Deliantra::Data::TYPE{"Weak Wall"};
478 } else { 799 } else {
479 $root = $Crossfire::Data::TYPE{Misc}; 800 $root = $Deliantra::Data::TYPE{Misc};
480 } 801 }
481 } 802 }
482 803
483 my @import = ($root); 804 my @import = ($root);
484 805
485 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 806 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
486 unless $type == 116; 807 unless $type == 116;
487 808
488 my (%ignore); 809 my (%ignore);
489 my (@section_order, %section, @attr_order); 810 my (@section_order, %section, @attr_order);
490 811
491 while (my $type = shift @import) { 812 while (my $type = shift @import) {
813 push @import,
814 grep $_,
815 map $Deliantra::Data::TYPE{$_},
492 push @import, @{$type->{import} || []}; 816 @{$type->{import} || []};
493 817
494 $attr->{$_} ||= $type->{$_} 818 $attr->{$_} ||= $type->{$_}
495 for qw(name desc use); 819 for qw(name desc use);
496 820
497 for (@{$type->{ignore} || []}) { 821 for (@{$type->{ignore} || []}) {
… …
526 ]; 850 ];
527 851
528 $attr 852 $attr
529} 853}
530 854
531sub arch_edit_sections {
532# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
533# edit_type = 0;
534# else if (edit_type != 0) {
535# // all flags from 'check_type' must be unset in this arch because they get recalculated now
536# edit_type &= ~check_type;
537# }
538#
539# }
540# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
541# getAttributeValue("alive", defarch) == 1 &&
542# (getAttributeValue("monster", defarch) == 1 ||
543# getAttributeValue("generator", defarch) == 1)) {
544# // Monster: monsters/npcs/generators
545# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
546# }
547# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
548# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
549# // Walls
550# edit_type |= IGUIConstants.TILE_EDIT_WALL;
551# }
552# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
553# getAttributeValue("connected", defarch) != 0) {
554# // Connected Objects
555# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
556# }
557# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
558# arch_type == 66 || arch_type == 41 || arch_type == 95) {
559# // Exit: teleporter/exit/trapdoors
560# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
561# }
562# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
563# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
564# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
565# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
566# arch_type == 124 || arch_type == 130)) {
567# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
568# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
569# }
570# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
571# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
572# arch_type == 91 || arch_type == 21 || arch_type == 24) {
573# // Door: door/special door/gates + keys
574# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
575# }
576# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
577# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
578# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
579# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
580# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
581# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
582# arch_type == 122 || arch_type == 3)) {
583# // Equipment: weapons/armour/wands/rods
584# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
585# }
586#
587# return(edit_type);
588#
589#
590}
591
592sub cache_file($$&&) { 855sub cache_file($$&&) {
593 my ($src, $cache, $load, $create) = @_; 856 my ($src, $cache, $load, $create) = @_;
594 857
595 my ($size, $mtime) = (stat $src)[7,9] 858 my ($size, $mtime) = (stat $src)[7,9]
596 or Carp::croak "$src: $!"; 859 or Carp::croak "$src: $!";
… …
644 }, sub { 907 }, sub {
645 read_arch "$LIB/archetypes" 908 read_arch "$LIB/archetypes"
646 }; 909 };
647} 910}
648 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
649=item load_tilecache 942=item load_tilecache
650 943
651(Re-)Load %TILE and %FACE. 944(Re-)Load %TILE and %FACE.
652 945
653=cut 946=cut
654 947
655sub load_tilecache() { 948sub load_tilecache() {
656 require Gtk2; 949 require Gtk2;
657 950
658 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 951 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
659 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
660 or die "$VARDIR/tilecache.png: $!";
661 *FACE = $_[0];
662 }, sub { 952 sub {
663 my $tile = read_pak "$LIB/crossfire.0";
664
665 my %cache; 953 my %cache;
954 my $facedata = Storable::retrieve "$LIB/facedata";
666 955
956 $facedata->{version} == 2
957 or die "$LIB/facedata: version mismatch, cannot proceed.";
958
959 my $faces = $facedata->{faceinfo};
667 my $idx = 0; 960 my $idx = 0;
668 961
669 for my $name (sort keys %$tile) { 962 for (sort keys %$faces) {
963 my ($face, $info) = ($_, $faces->{$_});
964
670 my $pb = new Gtk2::Gdk::PixbufLoader; 965 my $pb = new Gtk2::Gdk::PixbufLoader;
671 $pb->write ($tile->{$name}); 966 $pb->write ($info->{data32});
672 $pb->close; 967 $pb->close;
673 my $pb = $pb->get_pixbuf; 968 my $pb = $pb->get_pixbuf;
674 969
675 my $tile = $cache{$name} = { 970 my $tile = $cache{$face} = {
676 pb => $pb, 971 pb => $pb,
677 idx => $idx, 972 idx => $idx,
678 w => int $pb->get_width / TILESIZE, 973 w => int $pb->get_width / TILESIZE,
679 h => int $pb->get_height / TILESIZE, 974 h => int $pb->get_height / TILESIZE,
680 }; 975 };
681
682 976
683 $idx += $tile->{w} * $tile->{h}; 977 $idx += $tile->{w} * $tile->{h};
978 }
979
980 construct_tilecache_pb $idx, \%cache;
981
982 \%cache
684 } 983 };
685
686 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
687
688 while (my ($name, $tile) = each %cache) {
689 my $tpb = delete $tile->{pb};
690 my $ofs = $tile->{idx};
691
692 for my $x (0 .. $tile->{w} - 1) {
693 for my $y (0 .. $tile->{h} - 1) {
694 my $idx = $ofs + $x + $y * $tile->{w};
695 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
696 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
697 }
698 }
699 }
700
701 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
702
703 \%cache
704 };
705} 984}
706 985
707=head1 AUTHOR 986=head1 AUTHOR
708 987
709 Marc Lehmann <schmorp@schmorp.de> 988 Marc Lehmann <schmorp@schmorp.de>
… …
713 http://www.ta-sa.org/ 992 http://www.ta-sa.org/
714 993
715=cut 994=cut
716 995
7171 9961
997

Diff Legend

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