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.52 by root, Mon Mar 20 02:15:36 2006 UTC vs.
Revision 1.126 by root, Tue Sep 9 09:50:24 2008 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire - Crossfire maphandling 3Deliantra - Deliantra suppport module to read/write archetypes, maps etc.
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Deliantra;
8 8
9our $VERSION = '0.1'; 9our $VERSION = '1.221';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
15use Carp (); 15use Carp ();
16use File::Spec; 16use File::Spec;
17use List::Util qw(min max); 17use List::Util qw(min max);
18use Storable; 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",
39 maplore => "endmaplore", 48 maplore => "endmaplore",
40); 49);
41 50
42# not used yet, maybe alphabetical is ok 51# movement bit type, PITA
52our %FIELD_MOVEMENT = map +($_ => undef),
53 qw(move_type move_block move_allow move_on move_off move_slow);
54
55# same as in server save routine, to (hopefully) be compatible
56# to the other editors.
57our @FIELD_ORDER_MAP = (qw(
58 file_format_version
59 name attach swap_time reset_timeout fixed_resettime difficulty region
60 shopitems shopgreed shopmin shopmax shoprace
61 darkness width height enter_x enter_y msg maplore
62 unique template
63 outdoor temp pressure humid windspeed winddir sky nosmooth
64 tile_path_1 tile_path_2 tile_path_3 tile_path_4
65));
66
43our @FIELD_ORDER = (qw(name name_pl)); 67our @FIELD_ORDER = (qw(
68 inherit
69
70 elevation
71
72 name name_pl custom_name attach title race
73 slaying skill msg lore other_arch
74 face animation is_animated
75 magicmap smoothlevel smoothface
76 str dex con wis pow cha int
77 hp maxhp sp maxsp grace maxgrace
78 exp perm_exp expmul
79 food dam luck wc ac x y speed speed_left move_state attack_movement
80 nrof level direction type subtype attacktype
81
82 resist_physical resist_magic resist_fire resist_electricity
83 resist_cold resist_confusion resist_acid resist_drain
84 resist_weaponmagic resist_ghosthit resist_poison resist_slow
85 resist_paralyze resist_turn_undead resist_fear resist_cancellation
86 resist_deplete resist_death resist_chaos resist_counterspell
87 resist_godpower resist_holyword resist_blind resist_internal
88 resist_life_stealing resist_disease
89
90 path_attuned path_repelled path_denied material materialname
91 value carrying weight invisible state magic
92 last_heal last_sp last_grace last_eat
93 connected glow_radius randomitems tresure_env npx_status npc_program
94 run_away pick_up container will_apply smoothlevel
95 current_weapon_script weapontype tooltype elevation client_type
96 item_power duration range
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
99
100 alive wiz was_wiz applied unpaid can_use_shield no_pick is_animated monster
101 friendly generator is_thrown auto_apply treasure player sold see_invisible
102 can_roll overlay_floor is_turnable is_used_up identified reflecting changing
103 splitting hitback startequip blocksview undead scared unaggressive
104 reflect_missile reflect_spell no_magic no_fix_player is_lightable tear_down
105 run_away pick_up unique no_drop can_cast_spell can_use_scroll can_use_range
106 can_use_bow can_use_armour can_use_weapon can_use_ring has_ready_range
107 has_ready_bow xrays is_floor lifesave no_strength sleep stand_still
108 random_move only_attack confused stealth cursed damned see_anywhere
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
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
113 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
114 precious
115
116 body_range body_arm body_torso body_head body_neck body_skill
117 body_finger body_shoulder body_foot body_hand body_wrist body_waist
118));
119
120our %EVENT_TYPE = (
121 apply => 1,
122 attack => 2,
123 death => 3,
124 drop => 4,
125 pickup => 5,
126 say => 6,
127 stop => 7,
128 time => 8,
129 throw => 9,
130 trigger => 10,
131 close => 11,
132 timer => 12,
133);
44 134
45sub MOVE_WALK (){ 0x01 } 135sub MOVE_WALK (){ 0x01 }
46sub MOVE_FLY_LOW (){ 0x02 } 136sub MOVE_FLY_LOW (){ 0x02 }
47sub MOVE_FLY_HIGH (){ 0x04 } 137sub MOVE_FLY_HIGH (){ 0x04 }
48sub MOVE_FLYING (){ 0x06 } 138sub MOVE_FLYING (){ 0x06 }
49sub MOVE_SWIM (){ 0x08 } 139sub MOVE_SWIM (){ 0x08 }
50sub MOVE_BOAT (){ 0x10 } 140sub MOVE_BOAT (){ 0x10 }
51sub MOVE_ALL (){ 0xff } 141sub MOVE_SHIP (){ 0x20 }
142sub MOVE_KNOWN (){ 0x3f } # all of above
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}
52 244
53sub load_ref($) { 245sub load_ref($) {
54 my ($path) = @_; 246 my ($path) = @_;
55 247
56 open my $fh, "<", $path 248 open my $fh, "<:raw:perlio", $path
57 or die "$path: $!"; 249 or die "$path: $!";
58 binmode $fh;
59 local $/; 250 local $/;
60 251
61 Storable::thaw <$fh> 252 thaw <$fh>
62} 253}
63 254
64sub save_ref($$) { 255sub save_ref($$) {
65 my ($ref, $path) = @_; 256 my ($ref, $path) = @_;
66 257
67 open my $fh, ">", "$path~" 258 open my $fh, ">:raw:perlio", "$path~"
68 or die "$path~: $!"; 259 or die "$path~: $!";
69 binmode $fh;
70 print $fh Storable::freeze $ref; 260 print $fh freeze $ref;
71 close $fh; 261 close $fh;
72 rename "$path~", $path 262 rename "$path~", $path
73 or die "$path: $!"; 263 or die "$path: $!";
74} 264}
75 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
334# object as in "Object xxx", i.e. archetypes
76sub normalize_object($) { 335sub normalize_object($) {
77 my ($ob) = @_; 336 my ($ob) = @_;
78 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
371 # nuke outdated or never supported fields
79 delete $ob->{$_} for qw( 372 delete @$ob{qw(
80 can_knockback can_parry can_impale can_cut can_dam_armour 373 can_knockback can_parry can_impale can_cut can_dam_armour
81 can_apply pass_thru can_pass_thru 374 can_apply pass_thru can_pass_thru color_bg color_fg
82 ); 375 )};
83 376
84 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 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; }
380
381 # convert movement strings to bitsets
382 for my $attr (keys %FIELD_MOVEMENT) {
85 next unless exists $ob->{$attr}; 383 next unless exists $ob->{$attr};
86 next if $ob->{$attr} =~ /^\d+$/;
87 384
88 my $flags = 0; 385 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
89
90 # assume list
91 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
92 $flags |= MOVE_WALK if $flag eq "walk";
93 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
94 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
95 $flags |= MOVE_FLYING if $flag eq "flying";
96 $flags |= MOVE_SWIM if $flag eq "swim";
97 $flags |= MOVE_BOAT if $flag eq "boat";
98 $flags |= MOVE_ALL if $flag eq "all";
99
100 $flags &= ~MOVE_WALK if $flag eq "-walk";
101 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
102 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
103 $flags &= ~MOVE_FLYING if $flag eq "-flying";
104 $flags &= ~MOVE_SWIM if $flag eq "-swim";
105 $flags &= ~MOVE_BOAT if $flag eq "-boat";
106 $flags &= ~MOVE_ALL if $flag eq "-all";
107 }
108
109 $ob->{$attr} = $flags;
110 } 386 }
111 387
388 # convert outdated movement flags to new movement sets
112 if (defined (my $v = delete $ob->{no_pass})) { 389 if (defined (my $v = delete $ob->{no_pass})) {
113 $ob->{move_block} = $v ? MOVE_ALL : 0; 390 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
114 } 391 }
115 if (defined (my $v = delete $ob->{slow_move})) { 392 if (defined (my $v = delete $ob->{slow_move})) {
116 $ob->{move_slow} |= MOVE_WALK; 393 $ob->{move_slow} += "walk";
117 $ob->{move_slow_penalty} = $v; 394 $ob->{move_slow_penalty} = $v;
118 } 395 }
119 if (defined (my $v = delete $ob->{walk_on})) { 396 if (defined (my $v = delete $ob->{walk_on})) {
120 $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" }
121 : $ob->{move_on} & ~MOVE_WALK;
122 } 398 }
123 if (defined (my $v = delete $ob->{walk_off})) { 399 if (defined (my $v = delete $ob->{walk_off})) {
124 $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" }
125 : $ob->{move_off} & ~MOVE_WALK;
126 } 401 }
127 if (defined (my $v = delete $ob->{fly_on})) { 402 if (defined (my $v = delete $ob->{fly_on})) {
128 $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" }
129 : $ob->{move_on} & ~MOVE_FLY_LOW;
130 } 404 }
131 if (defined (my $v = delete $ob->{fly_off})) { 405 if (defined (my $v = delete $ob->{fly_off})) {
132 $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" }
133 : $ob->{move_off} & ~MOVE_FLY_LOW;
134 } 407 }
135 if (defined (my $v = delete $ob->{flying})) { 408 if (defined (my $v = delete $ob->{flying})) {
136 $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" }
137 : $ob->{move_type} & ~MOVE_FLY_LOW;
138 } 410 }
411
412 # convert idiotic event_xxx things into objects
413 while (my ($event, $subtype) = each %EVENT_TYPE) {
414 if (exists $ob->{"event_${event}_plugin"}) {
415 push @{$ob->{inventory}}, {
416 _name => "event_$event",
417 title => delete $ob->{"event_${event}_plugin"},
418 slaying => delete $ob->{"event_${event}"},
419 name => delete $ob->{"event_${event}_options"},
420 };
421 }
422 }
423
424 # some archetypes had "+3" instead of the canonical "3", so fix
425 $ob->{dam} *= 1 if exists $ob->{dam};
139 426
140 $ob 427 $ob
141} 428}
142 429
430# arch as in "arch xxx", ie.. objects
143sub normalize_arch($) { 431sub normalize_arch($) {
144 my ($ob) = @_; 432 my ($ob) = @_;
145 433
146 normalize_object $ob; 434 normalize_object $ob;
147 435
… …
174 delete $ob->{$k}; 462 delete $ob->{$k};
175 } 463 }
176 } 464 }
177 } 465 }
178 466
467 # a speciality for the editor
468 if (exists $ob->{attack_movement}) {
469 my $am = delete $ob->{attack_movement};
470 $ob->{attack_movement_bits_0_3} = $am & 15;
471 $ob->{attack_movement_bits_4_7} = $am & 240;
472 }
473
474 $ob
475}
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
179 $ob 492 $ob
180} 493}
181 494
182sub read_pak($) { 495sub read_pak($) {
183 my ($path) = @_; 496 my ($path) = @_;
184 497
185 my %pak; 498 my %pak;
186 499
187 open my $fh, "<", $path 500 open my $fh, "<:raw:perlio", $path
188 or Carp::croak "$_[0]: $!"; 501 or Carp::croak "$_[0]: $!";
189 binmode $fh; 502 binmode $fh;
190 while (<$fh>) { 503 while (<$fh>) {
191 my ($type, $id, $len, $path) = split; 504 my ($type, $id, $len, $path) = split;
192 $path =~ s/.*\///; 505 $path =~ s/.*\///;
… …
194 } 507 }
195 508
196 \%pak 509 \%pak
197} 510}
198 511
199sub read_arch($) { 512sub read_arch($;$) {
200 my ($path) = @_; 513 my ($path, $toplevel) = @_;
201 514
202 my %arc; 515 my %arc;
203 my ($more, $prev); 516 my ($more, $prev);
517 my $comment;
204 518
205 open my $fh, "<", $path 519 open my $fh, "<:raw:perlio:utf8", $path
206 or Carp::croak "$path: $!"; 520 or Carp::croak "$path: $!";
207 521
208 binmode $fh; 522# binmode $fh;
209 523
210 my $parse_block; $parse_block = sub { 524 my $parse_block; $parse_block = sub {
211 my %arc = @_; 525 my %arc = @_;
212 526
213 while (<$fh>) { 527 while (<$fh>) {
214 s/\s+$//; 528 s/\s+$//;
215 if (/^end$/i) { 529 if (/^end$/i) {
216 last; 530 last;
531
217 } elsif (/^arch (\S+)$/) { 532 } elsif (/^arch (\S+)$/i) {
218 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 533 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
534
219 } elsif (/^lore$/) { 535 } elsif (/^lore$/i) {
220 while (<$fh>) { 536 while (<$fh>) {
221 last if /^endlore\s*$/i; 537 last if /^endlore\s*$/i;
222 $arc{lore} .= $_; 538 $arc{lore} .= $_;
223 } 539 }
224 } elsif (/^msg$/) { 540 } elsif (/^msg$/i) {
225 while (<$fh>) { 541 while (<$fh>) {
226 last if /^endmsg\s*$/i; 542 last if /^endmsg\s*$/i;
227 $arc{msg} .= $_; 543 $arc{msg} .= $_;
228 } 544 }
545 } elsif (/^anim$/i) {
546 while (<$fh>) {
547 last if /^mina\s*$/i;
548 chomp;
549 push @{ $arc{anim} }, $_;
550 }
229 } elsif (/^(\S+)\s*(.*)$/) { 551 } elsif (/^(\S+)\s*(.*)$/) {
230 $arc{lc $1} = $2; 552 $arc{lc $1} = $2;
231 } elsif (/^\s*($|#)/) { 553 } elsif (/^\s*#/) {
554 $arc{_comment} .= "$_\n";
555
556 } elsif (/^\s*$/) {
232 # 557 #
233 } else { 558 } else {
234 warn "$path: unparsable line '$_' in arch $arc{_name}"; 559 warn "$path: unparsable line '$_' in arch $arc{_name}";
235 } 560 }
236 } 561 }
… …
242 s/\s+$//; 567 s/\s+$//;
243 if (/^more$/i) { 568 if (/^more$/i) {
244 $more = $prev; 569 $more = $prev;
245 } elsif (/^object (\S+)$/i) { 570 } elsif (/^object (\S+)$/i) {
246 my $name = $1; 571 my $name = $1;
247 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';
248 576
249 if ($more) { 577 if ($more) {
250 $more->{more} = $arc; 578 $more->{more} = $arc;
251 } else { 579 } else {
252 $arc{$name} = $arc; 580 $arc{$name} = $arc;
253 } 581 }
254 $prev = $arc; 582 $prev = $arc;
255 $more = undef; 583 $more = undef;
256 } elsif (/^arch (\S+)$/i) { 584 } elsif (/^arch (\S+)$/i) {
257 push @{ $arc{arch} }, normalize_arch $parse_block->(_name => $1); 585 my $name = $1;
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';
590
591 if ($more) {
592 $more->{more} = $arc;
593 } else {
594 push @{ $arc{arch} }, $arc;
595 }
596 $prev = $arc;
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";
258 } elsif (/^\s*($|#)/) { 609 } elsif (/^\s*($|#)/) {
259 # 610 #
260 } else { 611 } else {
261 warn "$path: unparseable top-level line '$_'"; 612 die "$path: unparseable top-level line '$_'";
262 } 613 }
263 } 614 }
264 615
265 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.
266 617
267 \%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
268} 701}
269 702
270# 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
271# NOTE: the arrays in the hash values are references to 704# NOTE: the arrays in the hash values are references to
272# the archs from $ARCH 705# the archs from $ARCH
273sub editor_archs { 706sub editor_archs {
274 my %paths; 707 my %paths;
275 708
276 for (keys %ARCH) { 709 for (keys %ARCH) {
277 my $arch = $ARCH{$_}; 710 my $arch = $ARCH{$_};
278 push @{$paths{$arch->{editor_folder}}}, \$arch; 711 push @{$paths{$arch->{editor_folder}}}, $arch;
279 } 712 }
280 713
281 \%paths 714 \%paths
282} 715}
283 716
… …
293 my ($a) = @_; 726 my ($a) = @_;
294 727
295 my $o = $ARCH{$a->{_name}} 728 my $o = $ARCH{$a->{_name}}
296 or return; 729 or return;
297 730
298 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"}
299 or (warn "no face data found for arch '$a->{_name}'"), return; 734 or (warn "no face data found for arch '$a->{_name}'"), return;
735 }
300 736
301 if ($face->{w} > 1 || $face->{h} > 1) { 737 if ($face->{w} > 1 || $face->{h} > 1) {
302 # bigface 738 # bigface
303 return (0, 0, $face->{w} - 1, $face->{h} - 1); 739 return (0, 0, $face->{w} - 1, $face->{h} - 1);
304 740
… …
337=cut 773=cut
338 774
339sub arch_attr($) { 775sub arch_attr($) {
340 my ($obj) = @_; 776 my ($obj) = @_;
341 777
342 require Crossfire::Data; 778 require Deliantra::Data;
343 779
344 my $root; 780 my $root;
345 my $attr = { }; 781 my $attr = { };
346 782
347 my $arch = $ARCH{ $obj->{_name} }; 783 my $arch = $ARCH{ $obj->{_name} };
348 my $type = $obj->{type} || $arch->{type}; 784 my $type = $obj->{type} || $arch->{type};
349 785
350 if ($type > 0) { 786 if ($type > 0) {
351 $root = $Crossfire::Data::ATTR{$type}; 787 $root = $Deliantra::Data::ATTR{$type};
352 } else { 788 } else {
789 my %a = (%$arch, %$obj);
790
791 if ($a{is_floor} && !$a{alive}) {
792 $root = $Deliantra::Data::TYPE{Floor};
793 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
794 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
795 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
796 $root = $Deliantra::Data::TYPE{Wall};
797 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
798 $root = $Deliantra::Data::TYPE{"Weak Wall"};
799 } else {
353 $root = $Crossfire::Data::TYPE{Misc}; 800 $root = $Deliantra::Data::TYPE{Misc};
354
355 type:
356 for (@Crossfire::Data::ATTR0) {
357 my $req = $_->{required}
358 or die "internal error: ATTR0 without 'required'";
359
360 keys %$req;
361 while (my ($k, $v) = each %$req) {
362 next type
363 unless $obj->{$k} == $v || $arch->{$k} == $v;
364 }
365
366 $root = $_;
367 } 801 }
368 } 802 }
369 803
370 my @import = ($root); 804 my @import = ($root);
371 805
372 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 806 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
373 unless $type == 116; 807 unless $type == 116;
374 808
375 my (%ignore); 809 my (%ignore);
376 my (@section_order, %section, @attr_order); 810 my (@section_order, %section, @attr_order);
377 811
378 while (my $type = shift @import) { 812 while (my $type = shift @import) {
813 push @import,
814 grep $_,
815 map $Deliantra::Data::TYPE{$_},
379 push @import, @{$type->{import} || []}; 816 @{$type->{import} || []};
380 817
381 $attr->{$_} ||= $type->{$_} 818 $attr->{$_} ||= $type->{$_}
382 for qw(name desc use); 819 for qw(name desc use);
383 820
384 for (@{$type->{ignore} || []}) { 821 for (@{$type->{ignore} || []}) {
… …
413 ]; 850 ];
414 851
415 $attr 852 $attr
416} 853}
417 854
418sub arch_edit_sections {
419# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
420# edit_type = 0;
421# else if (edit_type != 0) {
422# // all flags from 'check_type' must be unset in this arch because they get recalculated now
423# edit_type &= ~check_type;
424# }
425#
426# }
427# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
428# getAttributeValue("alive", defarch) == 1 &&
429# (getAttributeValue("monster", defarch) == 1 ||
430# getAttributeValue("generator", defarch) == 1)) {
431# // Monster: monsters/npcs/generators
432# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
433# }
434# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
435# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
436# // Walls
437# edit_type |= IGUIConstants.TILE_EDIT_WALL;
438# }
439# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
440# getAttributeValue("connected", defarch) != 0) {
441# // Connected Objects
442# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
443# }
444# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
445# arch_type == 66 || arch_type == 41 || arch_type == 95) {
446# // Exit: teleporter/exit/trapdoors
447# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
448# }
449# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
450# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
451# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
452# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
453# arch_type == 124 || arch_type == 130)) {
454# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
455# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
456# }
457# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
458# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
459# arch_type == 91 || arch_type == 21 || arch_type == 24) {
460# // Door: door/special door/gates + keys
461# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
462# }
463# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
464# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
465# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
466# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
467# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
468# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
469# arch_type == 122 || arch_type == 3)) {
470# // Equipment: weapons/armour/wands/rods
471# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
472# }
473#
474# return(edit_type);
475#
476#
477}
478
479sub cache_file($$&&) { 855sub cache_file($$&&) {
480 my ($src, $cache, $load, $create) = @_; 856 my ($src, $cache, $load, $create) = @_;
481 857
482 my ($size, $mtime) = (stat $src)[7,9] 858 my ($size, $mtime) = (stat $src)[7,9]
483 or Carp::croak "$src: $!"; 859 or Carp::croak "$src: $!";
… …
531 }, sub { 907 }, sub {
532 read_arch "$LIB/archetypes" 908 read_arch "$LIB/archetypes"
533 }; 909 };
534} 910}
535 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
536=item load_tilecache 942=item load_tilecache
537 943
538(Re-)Load %TILE and %FACE. 944(Re-)Load %TILE and %FACE.
539 945
540=cut 946=cut
541 947
542sub load_tilecache() { 948sub load_tilecache() {
543 require Gtk2; 949 require Gtk2;
544 950
545 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 951 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
546 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
547 or die "$VARDIR/tilecache.png: $!";
548 *FACE = $_[0];
549 }, sub { 952 sub {
550 require File::Temp;
551
552 my $tile = read_pak "$LIB/crossfire.0";
553
554 my %cache; 953 my %cache;
954 my $facedata = Storable::retrieve "$LIB/facedata";
555 955
956 $facedata->{version} == 2
957 or die "$LIB/facedata: version mismatch, cannot proceed.";
958
959 my $faces = $facedata->{faceinfo};
556 my $idx = 0; 960 my $idx = 0;
557 961
558 for my $name (sort keys %$tile) { 962 for (sort keys %$faces) {
559 my ($fh, $filename) = File::Temp::tempfile (); 963 my ($face, $info) = ($_, $faces->{$_});
560 print $fh $tile->{$name}; 964
561 close $fh;
562 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 965 my $pb = new Gtk2::Gdk::PixbufLoader;
563 unlink $filename; 966 $pb->write ($info->{data32});
967 $pb->close;
968 my $pb = $pb->get_pixbuf;
564 969
565 my $tile = $cache{$name} = { 970 my $tile = $cache{$face} = {
566 pb => $pb, 971 pb => $pb,
567 idx => $idx, 972 idx => $idx,
568 w => int $pb->get_width / TILESIZE, 973 w => int $pb->get_width / TILESIZE,
569 h => int $pb->get_height / TILESIZE, 974 h => int $pb->get_height / TILESIZE,
570 }; 975 };
571
572 976
573 $idx += $tile->{w} * $tile->{h}; 977 $idx += $tile->{w} * $tile->{h};
978 }
979
980 construct_tilecache_pb $idx, \%cache;
981
982 \%cache
574 } 983 };
575
576 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
577
578 while (my ($name, $tile) = each %cache) {
579 my $tpb = delete $tile->{pb};
580 my $ofs = $tile->{idx};
581
582 for my $x (0 .. $tile->{w} - 1) {
583 for my $y (0 .. $tile->{h} - 1) {
584 my $idx = $ofs + $x + $y * $tile->{w};
585 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
586 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
587 }
588 }
589 }
590
591 $pb->save ("$VARDIR/tilecache.png", "png");
592
593 \%cache
594 };
595} 984}
596 985
597=head1 AUTHOR 986=head1 AUTHOR
598 987
599 Marc Lehmann <schmorp@schmorp.de> 988 Marc Lehmann <schmorp@schmorp.de>
… …
603 http://www.ta-sa.org/ 992 http://www.ta-sa.org/
604 993
605=cut 994=cut
606 995
6071 9961
997

Diff Legend

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