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.53 by root, Wed Mar 22 03:32:09 2006 UTC vs.
Revision 1.135 by root, Tue Nov 3 14:56:58 2009 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire - Crossfire maphandling 3Deliantra - Deliantra suppport module to read/write archetypes, maps etc.
4
5=over 4
4 6
5=cut 7=cut
6 8
7package Crossfire; 9package Deliantra;
8 10
9our $VERSION = '0.1'; 11our $VERSION = '1.25';
10 12
11use strict; 13use common::sense;
12 14
13use base 'Exporter'; 15use base 'Exporter';
14 16
15use Carp (); 17use Carp ();
16use File::Spec; 18use File::Spec;
17use List::Util qw(min max); 19use List::Util qw(min max);
18use Storable qw(freeze thaw); 20use Storable qw(freeze thaw);
19 21
20our @EXPORT = qw( 22our @EXPORT = qw(
21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents 23 read_pak read_arch
24 *ARCH $TILE *FACE *FACEDATA
25 TILESIZE CACHESTRIDE
26 editor_archs arch_extents
22); 27);
23 28
29use JSON::XS qw(decode_json encode_json);
30
24our $LIB = $ENV{CROSSFIRE_LIBDIR}; 31our $LIB = $ENV{DELIANTRA_LIBDIR};
25 32
26our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; 33our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
34 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
35 : File::Spec->tmpdir . "/deliantra";
27 36
28mkdir $VARDIR, 0777; 37mkdir $VARDIR, 0777;
29 38
30sub TILESIZE (){ 32 } 39sub TILESIZE (){ 32 }
40sub CACHESTRIDE (){ 64 }
31 41
32our %ARCH; 42our %ARCH;
43our %FACE; # face32
33our %FACE; 44our %FACEDATA;
34our $TILE; 45our $TILE;
35 46
36our %FIELD_MULTILINE = ( 47our %FIELD_MULTILINE = (
37 msg => "endmsg", 48 msg => "endmsg",
38 lore => "endlore", 49 lore => "endlore",
39 maplore => "endmaplore", 50 maplore => "endmaplore",
40); 51);
41 52
42# not used yet, maybe alphabetical is ok 53# movement bit type, PITA
54our %FIELD_MOVEMENT = map +($_ => undef),
55 qw(move_type move_block move_allow move_on move_off move_slow);
56
57# same as in server save routine, to (hopefully) be compatible
58# to the other editors.
59our @FIELD_ORDER_MAP = (qw(
60 file_format_version
61 name attach swap_time reset_timeout fixed_resettime difficulty region
62 shopitems shopgreed shopmin shopmax shoprace
63 darkness width height enter_x enter_y msg maplore
64 unique template
65 outdoor temp pressure humid windspeed winddir sky nosmooth
66 tile_path_1 tile_path_2 tile_path_3 tile_path_4
67));
68
43our @FIELD_ORDER = (qw(name name_pl)); 69our @FIELD_ORDER = (qw(
70 inherit
71
72 elevation
73
74 name name_pl custom_name attach title race
75 slaying skill msg lore other_arch
76 sound sound_destroy face animation is_animated
77 magicmap smoothlevel smoothface
78 str dex con wis pow cha int
79 hp maxhp sp maxsp grace maxgrace
80 exp perm_exp expmul
81 food dam luck wc ac x y speed speed_left move_state attack_movement
82 nrof level direction type subtype attacktype
83
84 resist_physical resist_magic resist_fire resist_electricity
85 resist_cold resist_confusion resist_acid resist_drain
86 resist_weaponmagic resist_ghosthit resist_poison resist_slow
87 resist_paralyze resist_turn_undead resist_fear resist_cancellation
88 resist_deplete resist_death resist_chaos resist_counterspell
89 resist_godpower resist_holyword resist_blind resist_internal
90 resist_life_stealing resist_disease
91
92 path_attuned path_repelled path_denied material materialname
93 value carrying weight invisible state magic
94 last_heal last_sp last_grace last_eat
95 connected glow_radius randomitems tresure_env npx_status npc_program
96 run_away pick_up container will_apply smoothlevel
97 current_weapon_script weapontype tooltype elevation client_type
98 item_power duration range
99 range_modifier duration_modifier dam_modifier gen_sp_armour
100 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
101
102 alive wiz was_wiz applied unpaid can_use_shield no_pick is_animated monster
103 friendly generator is_thrown auto_apply treasure player sold see_invisible
104 can_roll overlay_floor is_turnable is_used_up identified reflecting changing
105 splitting hitback startequip blocksview undead scared unaggressive
106 reflect_missile reflect_spell no_magic no_fix_player is_lightable tear_down
107 run_away pick_up unique no_drop can_cast_spell can_use_scroll can_use_range
108 can_use_bow can_use_armour can_use_weapon can_use_ring has_ready_range
109 has_ready_bow xrays is_floor lifesave no_strength sleep stand_still
110 random_move only_attack confused stealth cursed damned see_anywhere
111 known_magical known_cursed can_use_skill been_applied has_ready_scroll
112 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
113 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
114 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
115 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
116 precious
117
118 body_range body_arm body_torso body_head body_neck body_skill
119 body_finger body_shoulder body_foot body_hand body_wrist body_waist
120));
121
122our %EVENT_TYPE = (
123 apply => 1,
124 attack => 2,
125 death => 3,
126 drop => 4,
127 pickup => 5,
128 say => 6,
129 stop => 7,
130 time => 8,
131 throw => 9,
132 trigger => 10,
133 close => 11,
134 timer => 12,
135);
44 136
45sub MOVE_WALK (){ 0x01 } 137sub MOVE_WALK (){ 0x01 }
46sub MOVE_FLY_LOW (){ 0x02 } 138sub MOVE_FLY_LOW (){ 0x02 }
47sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
48sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
49sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
50sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
51sub MOVE_ALL (){ 0xff } 143sub MOVE_SHIP (){ 0x20 }
144sub MOVE_KNOWN (){ 0x3f } # all of above
145sub MOVE_ALL (){ 0x10000 } # very special value
146
147our %MOVE_TYPE = (
148 walk => MOVE_WALK,
149 fly_low => MOVE_FLY_LOW,
150 fly_high => MOVE_FLY_HIGH,
151 flying => MOVE_FLYING,
152 swim => MOVE_SWIM,
153 boat => MOVE_BOAT,
154 ship => MOVE_SHIP,
155 all => MOVE_ALL,
156);
157
158our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
159
160{
161 package Deliantra::MoveType;
162
163 use overload
164 '=' => sub { bless [@{$_[0]}], ref $_[0] },
165 '""' => \&as_string,
166 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
167 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
168 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
169 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
170 'x=' => sub {
171 my $cur = $_[0] >= $_[1];
172 if (!defined $cur) {
173 if ($_[0] >= "all") {
174 $_[0] -= $_[1];
175 } else {
176 $_[0] += $_[1];
177 }
178 } elsif ($cur) {
179 $_[0] -= $_[1];
180 } else {
181 $_[0] /= $_[1];
182 }
183
184 $_[0]
185 },
186 'eq' => sub { "$_[0]" eq "$_[1]" },
187 'ne' => sub { "$_[0]" ne "$_[1]" },
188 ;
189
190 sub TO_JSON {
191 $_[0][0]
192 }
193}
194
195sub Deliantra::MoveType::new {
196 my ($class, $string) = @_;
197
198 my $mask;
199 my $value;
200
201 if ($string =~ /^\s*\d+\s*$/) {
202 $mask = MOVE_ALL;
203 $value = $string+0;
204 } else {
205 for (split /\s+/, lc $string) {
206 if (s/^-//) {
207 $mask |= $MOVE_TYPE{$_};
208 $value &= ~$MOVE_TYPE{$_};
209 } else {
210 $mask |= $MOVE_TYPE{$_};
211 $value |= $MOVE_TYPE{$_};
212 }
213 }
214 }
215
216 (bless [$mask, $value], $class)->normalise
217}
218
219sub Deliantra::MoveType::normalise {
220 my ($self) = @_;
221
222 if ($self->[0] & MOVE_ALL) {
223 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
224 $self->[0] &= $mask;
225 $self->[1] &= $mask;
226 }
227
228 $self->[1] &= $self->[0];
229
230 $self
231}
232
233sub Deliantra::MoveType::as_string {
234 my ($self) = @_;
235
236 my @res;
237
238 my ($mask, $value) = @$self;
239
240 for (@Deliantra::MOVE_TYPE) {
241 my $bit = $Deliantra::MOVE_TYPE{$_};
242 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
243 $mask &= ~$bit;
244 push @res, $value & $bit ? $_ : "-$_";
245 }
246 }
247
248 join " ", @res
249}
52 250
53sub load_ref($) { 251sub load_ref($) {
54 my ($path) = @_; 252 my ($path) = @_;
55 253
56 open my $fh, "<", $path 254 open my $fh, "<:raw:perlio", $path
57 or die "$path: $!"; 255 or die "$path: $!";
58 binmode $fh;
59 local $/; 256 local $/;
60 257
61 thaw <$fh> 258 thaw <$fh>
62} 259}
63 260
64sub save_ref($$) { 261sub save_ref($$) {
65 my ($ref, $path) = @_; 262 my ($ref, $path) = @_;
66 263
67 open my $fh, ">", "$path~" 264 open my $fh, ">:raw:perlio", "$path~"
68 or die "$path~: $!"; 265 or die "$path~: $!";
69 binmode $fh;
70 print $fh freeze $ref; 266 print $fh freeze $ref;
71 close $fh; 267 close $fh;
72 rename "$path~", $path 268 rename "$path~", $path
73 or die "$path: $!"; 269 or die "$path: $!";
74} 270}
75 271
272my %attack_mask = (
273 physical => 0x00000001,
274 magic => 0x00000002,
275 fire => 0x00000004,
276 electricity => 0x00000008,
277 cold => 0x00000010,
278 confusion => 0x00000020,
279 acid => 0x00000040,
280 drain => 0x00000080,
281 weaponmagic => 0x00000100,
282 ghosthit => 0x00000200,
283 poison => 0x00000400,
284 slow => 0x00000800,
285 paralyze => 0x00001000,
286 turn_undead => 0x00002000,
287 fear => 0x00004000,
288 cancellation => 0x00008000,
289 deplete => 0x00010000,
290 death => 0x00020000,
291 chaos => 0x00040000,
292 counterspell => 0x00080000,
293 godpower => 0x00100000,
294 holyword => 0x00200000,
295 blind => 0x00400000,
296 internal => 0x00800000,
297 life_stealing => 0x01000000,
298 disease => 0x02000000,
299);
300
301sub _add_resist($$$) {
302 my ($ob, $mask, $value) = @_;
303
304 while (my ($k, $v) = each %attack_mask) {
305 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
306 }
307}
308
309my %MATERIAL = reverse
310 paper => 1,
311 iron => 2,
312 glass => 4,
313 leather => 8,
314 wood => 16,
315 organic => 32,
316 stone => 64,
317 cloth => 128,
318 adamant => 256,
319 liquid => 512,
320 tin => 1024,
321 bone => 2048,
322 ice => 4096,
323
324 # guesses
325 runestone => 12,
326 bronze => 18,
327 "ancient wood" => 20,
328 glass => 36,
329 marble => 66,
330 ice => 68,
331 stone => 70,
332 stone => 80,
333 cloth => 136,
334 ironwood => 144,
335 adamantium => 258,
336 glacium => 260,
337 blood => 544,
338;
339
340# object as in "Object xxx", i.e. archetypes
76sub normalize_object($) { 341sub normalize_object($) {
77 my ($ob) = @_; 342 my ($ob) = @_;
78 343
344 delete $ob->{editable}; # deprecated
345
346 # convert material bitset to materialname, if possible
347 if (exists $ob->{material}) {
348 if (!$ob->{material}) {
349 delete $ob->{material};
350 } elsif (exists $ob->{materialname}) {
351 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
352 delete $ob->{material};
353 } else {
354 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
355 delete $ob->{material}; # assume materilname is more specific and nuke material
356 }
357 } elsif (my $name = $MATERIAL{$ob->{material}}) {
358 delete $ob->{material};
359 $ob->{materialname} = $name;
360 } else {
361 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
362 }
363 }
364
365 # check whether attachment is the same as in the archetype
366 if (exists $ob->{attach}) {
367 my $arch = $ARCH{$ob->{_name}};
368 my $js = JSON::XS->new->utf8->canonical (1);
369
370 if (defined $arch->{attach}
371 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
372 delete $ob->{attach}
373 }
374 }
375
376 # color_fg is used as default for magicmap if magicmap does not exist
377 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
378
379 # nuke outdated or never supported fields
79 delete $ob->{$_} for qw( 380 delete @$ob{qw(
80 can_knockback can_parry can_impale can_cut can_dam_armour 381 can_knockback can_parry can_impale can_cut can_dam_armour
81 can_apply pass_thru can_pass_thru 382 can_apply pass_thru can_pass_thru color_bg color_fg
82 ); 383 )};
83 384
84 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 385 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
386 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
387 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
388
389 # convert movement strings to bitsets
390 for my $attr (keys %FIELD_MOVEMENT) {
85 next unless exists $ob->{$attr}; 391 next unless exists $ob->{$attr};
86 next if $ob->{$attr} =~ /^\d+$/;
87 392
88 my $flags = 0; 393 $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 } 394 }
111 395
396 # convert outdated movement flags to new movement sets
112 if (defined (my $v = delete $ob->{no_pass})) { 397 if (defined (my $v = delete $ob->{no_pass})) {
113 $ob->{move_block} = $v ? MOVE_ALL : 0; 398 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
114 } 399 }
115 if (defined (my $v = delete $ob->{slow_move})) { 400 if (defined (my $v = delete $ob->{slow_move})) {
116 $ob->{move_slow} |= MOVE_WALK; 401 $ob->{move_slow} += "walk";
117 $ob->{move_slow_penalty} = $v; 402 $ob->{move_slow_penalty} = $v;
118 } 403 }
119 if (defined (my $v = delete $ob->{walk_on})) { 404 if (defined (my $v = delete $ob->{walk_on})) {
120 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 405 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
121 : $ob->{move_on} & ~MOVE_WALK;
122 } 406 }
123 if (defined (my $v = delete $ob->{walk_off})) { 407 if (defined (my $v = delete $ob->{walk_off})) {
124 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 408 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
125 : $ob->{move_off} & ~MOVE_WALK;
126 } 409 }
127 if (defined (my $v = delete $ob->{fly_on})) { 410 if (defined (my $v = delete $ob->{fly_on})) {
128 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 411 $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 } 412 }
131 if (defined (my $v = delete $ob->{fly_off})) { 413 if (defined (my $v = delete $ob->{fly_off})) {
132 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 414 $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 } 415 }
135 if (defined (my $v = delete $ob->{flying})) { 416 if (defined (my $v = delete $ob->{flying})) {
136 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 417 $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 } 418 }
419
420 # convert idiotic event_xxx things into objects
421 while (my ($event, $subtype) = each %EVENT_TYPE) {
422 if (exists $ob->{"event_${event}_plugin"}) {
423 push @{$ob->{inventory}}, {
424 _name => "event_$event",
425 title => delete $ob->{"event_${event}_plugin"},
426 slaying => delete $ob->{"event_${event}"},
427 name => delete $ob->{"event_${event}_options"},
428 };
429 }
430 }
431
432 # some archetypes had "+3" instead of the canonical "3", so fix
433 $ob->{dam} *= 1 if exists $ob->{dam};
139 434
140 $ob 435 $ob
141} 436}
142 437
438# arch as in "arch xxx", ie.. objects
143sub normalize_arch($) { 439sub normalize_arch($) {
144 my ($ob) = @_; 440 my ($ob) = @_;
145 441
146 normalize_object $ob; 442 normalize_object $ob;
443
444 return if $ob->{_atype} eq "object";
147 445
148 my $arch = $ARCH{$ob->{_name}} 446 my $arch = $ARCH{$ob->{_name}}
149 or (warn "$ob->{_name}: no such archetype", return $ob); 447 or (warn "$ob->{_name}: no such archetype", return $ob);
150 448
151 if ($arch->{type} == 22) { # map 449 if ($arch->{type} == 22) { # map
… …
174 delete $ob->{$k}; 472 delete $ob->{$k};
175 } 473 }
176 } 474 }
177 } 475 }
178 476
477 # a speciality for the editor
478 if (exists $ob->{attack_movement}) {
479 my $am = delete $ob->{attack_movement};
480 $ob->{attack_movement_bits_0_3} = $am & 15;
481 $ob->{attack_movement_bits_4_7} = $am & 240;
482 }
483
484 $ob
485}
486
487sub attr_thaw($) {
488 my ($ob) = @_;
489
490 $ob->{attach} = decode_json $ob->{attach}
491 if exists $ob->{attach};
492
493 $ob
494}
495
496sub attr_freeze($) {
497 my ($ob) = @_;
498
499 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
500 if exists $ob->{attach};
501
179 $ob 502 $ob
180} 503}
181 504
182sub read_pak($) { 505sub read_pak($) {
183 my ($path) = @_; 506 my ($path) = @_;
184 507
185 my %pak; 508 my %pak;
186 509
187 open my $fh, "<", $path 510 open my $fh, "<:raw:perlio", $path
188 or Carp::croak "$_[0]: $!"; 511 or Carp::croak "$_[0]: $!";
189 binmode $fh; 512 binmode $fh;
190 while (<$fh>) { 513 while (<$fh>) {
191 my ($type, $id, $len, $path) = split; 514 my ($type, $id, $len, $path) = split;
192 $path =~ s/.*\///; 515 $path =~ s/.*\///;
… …
194 } 517 }
195 518
196 \%pak 519 \%pak
197} 520}
198 521
199sub read_arch($) { 522sub read_arch($;$) {
200 my ($path) = @_; 523 my ($path, $toplevel) = @_;
201 524
202 my %arc; 525 my %arc;
203 my ($more, $prev); 526 my ($more, $prev);
527 my $comment;
204 528
205 open my $fh, "<", $path 529 open my $fh, "<:utf8", $path
206 or Carp::croak "$path: $!"; 530 or Carp::croak "$path: $!";
207 531
208 binmode $fh; 532# binmode $fh;
209 533
210 my $parse_block; $parse_block = sub { 534 my $parse_block; $parse_block = sub {
211 my %arc = @_; 535 my %arc = @_;
212 536
213 while (<$fh>) { 537 while (<$fh>) {
214 s/\s+$//; 538 s/\s+$//;
215 if (/^end$/i) { 539 if (/^end$/i) {
216 last; 540 last;
541
217 } elsif (/^arch (\S+)$/) { 542 } elsif (/^arch (\S+)$/i) {
218 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 543 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
544
219 } elsif (/^lore$/) { 545 } elsif (/^lore$/i) {
220 while (<$fh>) { 546 while (<$fh>) {
221 last if /^endlore\s*$/i; 547 last if /^endlore\s*$/i;
222 $arc{lore} .= $_; 548 $arc{lore} .= $_;
223 } 549 }
224 } elsif (/^msg$/) { 550 } elsif (/^msg$/i) {
225 while (<$fh>) { 551 while (<$fh>) {
226 last if /^endmsg\s*$/i; 552 last if /^endmsg\s*$/i;
227 $arc{msg} .= $_; 553 $arc{msg} .= $_;
228 } 554 }
555 } elsif (/^anim$/i) {
556 while (<$fh>) {
557 last if /^mina\s*$/i;
558 chomp;
559 push @{ $arc{anim} }, $_;
560 }
229 } elsif (/^(\S+)\s*(.*)$/) { 561 } elsif (/^(\S+)\s*(.*)$/) {
230 $arc{lc $1} = $2; 562 $arc{lc $1} = $2;
231 } elsif (/^\s*($|#)/) { 563 } elsif (/^\s*#/) {
564 $arc{_comment} .= "$_\n";
565
566 } elsif (/^\s*$/) {
232 # 567 #
233 } else { 568 } else {
234 warn "$path: unparsable line '$_' in arch $arc{_name}"; 569 warn "$path: unparsable line '$_' in arch $arc{_name}";
235 } 570 }
236 } 571 }
… …
242 s/\s+$//; 577 s/\s+$//;
243 if (/^more$/i) { 578 if (/^more$/i) {
244 $more = $prev; 579 $more = $prev;
245 } elsif (/^object (\S+)$/i) { 580 } elsif (/^object (\S+)$/i) {
246 my $name = $1; 581 my $name = $1;
247 my $arc = normalize_object $parse_block->(_name => $name); 582 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
583 undef $comment;
584 delete $arc{_comment} unless length $arc{_comment};
585 $arc->{_atype} = 'object';
248 586
249 if ($more) { 587 if ($more) {
250 $more->{more} = $arc; 588 $more->{more} = $arc;
251 } else { 589 } else {
252 $arc{$name} = $arc; 590 $arc{$name} = $arc;
253 } 591 }
254 $prev = $arc; 592 $prev = $arc;
255 $more = undef; 593 $more = undef;
256 } elsif (/^arch (\S+)$/i) { 594 } elsif (/^arch (\S+)$/i) {
257 push @{ $arc{arch} }, normalize_arch $parse_block->(_name => $1); 595 my $name = $1;
596 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
597 undef $comment;
598 delete $arc{_comment} unless length $arc{_comment};
599 $arc->{_atype} = 'arch';
600
601 if ($more) {
602 $more->{more} = $arc;
603 } else {
604 push @{ $arc{arch} }, $arc;
605 }
606 $prev = $arc;
607 $more = undef;
608 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
609 if ($1 eq "lev_array") {
610 while (<$fh>) {
611 last if /^endplst\s*$/;
612 push @{$toplevel->{lev_array}}, $_+0;
613 }
614 } else {
615 $toplevel->{$1} = $2;
616 }
617 } elsif (/^\s*#/) {
618 $comment .= "$_\n";
258 } elsif (/^\s*($|#)/) { 619 } elsif (/^\s*($|#)/) {
259 # 620 #
260 } else { 621 } else {
261 warn "$path: unparseable top-level line '$_'"; 622 die "$path: unparseable top-level line '$_'";
262 } 623 }
263 } 624 }
264 625
265 undef $parse_block; # work around bug in perl not freeing $fh etc. 626 undef $parse_block; # work around bug in perl not freeing $fh etc.
266 627
267 \%arc 628 \%arc
629}
630
631sub archlist_to_string {
632 my ($arch) = @_;
633
634 my $str;
635
636 my $append; $append = sub {
637 my %a = %{$_[0]};
638
639 Deliantra::attr_freeze \%a;
640 Deliantra::normalize_arch \%a;
641
642 # undo the bit-split we did before
643 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
644 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
645 | (delete $a{attack_movement_bits_4_7});
646 }
647
648 if (my $comment = delete $a{_comment}) {
649 if ($comment =~ /[^\n\s#]/) {
650 $str .= $comment;
651 }
652 }
653
654 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
655
656 my $inv = delete $a{inventory};
657 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
658 my $anim = delete $a{anim};
659
660 if ($a{_atype} eq 'object') {
661 $str .= join "\n", "anim", @$anim, "mina\n"
662 if $anim;
663 }
664
665 my @kv;
666
667 for ($a{_name} eq "map"
668 ? @Deliantra::FIELD_ORDER_MAP
669 : @Deliantra::FIELD_ORDER) {
670 push @kv, [$_, delete $a{$_}]
671 if exists $a{$_};
672 }
673
674 for (sort keys %a) {
675 next if /^_/; # ignore our _-keys
676 push @kv, [$_, delete $a{$_}];
677 }
678
679 for (@kv) {
680 my ($k, $v) = @$_;
681
682 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
683 $v =~ s/\n$//;
684 $str .= "$k\n$v\n$end\n";
685 } else {
686 $str .= "$k $v\n";
687 }
688 }
689
690 if ($inv) {
691 $append->($_) for @$inv;
692 }
693
694 $str .= "end\n";
695
696 if ($a{_atype} eq 'object') {
697 if ($more) {
698 $str .= "more\n";
699 $append->($more) if $more;
700 } else {
701 $str .= "\n";
702 }
703 }
704 };
705
706 for (@$arch) {
707 $append->($_);
708 }
709
710 $str
268} 711}
269 712
270# put all archs into a hash with editor_face as it's key 713# put all archs into a hash with editor_face as it's key
271# NOTE: the arrays in the hash values are references to 714# NOTE: the arrays in the hash values are references to
272# the archs from $ARCH 715# the archs from $ARCH
273sub editor_archs { 716sub editor_archs {
274 my %paths; 717 my %paths;
275 718
276 for (keys %ARCH) { 719 for (keys %ARCH) {
277 my $arch = $ARCH{$_}; 720 my $arch = $ARCH{$_};
278 push @{$paths{$arch->{editor_folder}}}, \$arch; 721 push @{$paths{$arch->{editor_folder}}}, $arch;
279 } 722 }
280 723
281 \%paths 724 \%paths
282} 725}
283 726
… …
293 my ($a) = @_; 736 my ($a) = @_;
294 737
295 my $o = $ARCH{$a->{_name}} 738 my $o = $ARCH{$a->{_name}}
296 or return; 739 or return;
297 740
298 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 741 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
742 unless ($face) {
743 $face = $FACE{"blank.x11"}
299 or (warn "no face data found for arch '$a->{_name}'"), return; 744 or (warn "no face data found for arch '$a->{_name}'"), return;
745 }
300 746
301 if ($face->{w} > 1 || $face->{h} > 1) { 747 if ($face->{w} > 1 || $face->{h} > 1) {
302 # bigface 748 # bigface
303 return (0, 0, $face->{w} - 1, $face->{h} - 1); 749 return (0, 0, $face->{w} - 1, $face->{h} - 1);
304 750
… …
337=cut 783=cut
338 784
339sub arch_attr($) { 785sub arch_attr($) {
340 my ($obj) = @_; 786 my ($obj) = @_;
341 787
342 require Crossfire::Data; 788 require Deliantra::Data;
343 789
344 my $root; 790 my $root;
345 my $attr = { }; 791 my $attr = { };
346 792
347 my $arch = $ARCH{ $obj->{_name} }; 793 my $arch = $ARCH{ $obj->{_name} };
348 my $type = $obj->{type} || $arch->{type}; 794 my $type = $obj->{type} || $arch->{type};
349 795
350 if ($type > 0) { 796 if ($type > 0) {
351 $root = $Crossfire::Data::ATTR{$type}; 797 $root = $Deliantra::Data::ATTR{$type};
352 } else { 798 } else {
799 my %a = (%$arch, %$obj);
800
801 if ($a{is_floor} && !$a{alive}) {
802 $root = $Deliantra::Data::TYPE{Floor};
803 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
804 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
805 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
806 $root = $Deliantra::Data::TYPE{Wall};
807 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
808 $root = $Deliantra::Data::TYPE{"Weak Wall"};
809 } else {
353 $root = $Crossfire::Data::TYPE{Misc}; 810 $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 } 811 }
368 } 812 }
369 813
370 my @import = ($root); 814 my @import = ($root);
371 815
372 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 816 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
373 unless $type == 116; 817 unless $type == 116;
374 818
375 my (%ignore); 819 my (%ignore);
376 my (@section_order, %section, @attr_order); 820 my (@section_order, %section, @attr_order);
377 821
378 while (my $type = shift @import) { 822 while (my $type = shift @import) {
823 push @import,
824 grep $_,
825 map $Deliantra::Data::TYPE{$_},
379 push @import, @{$type->{import} || []}; 826 @{$type->{import} || []};
380 827
381 $attr->{$_} ||= $type->{$_} 828 $attr->{$_} ||= $type->{$_}
382 for qw(name desc use); 829 for qw(name desc use);
383 830
384 for (@{$type->{ignore} || []}) { 831 for (@{$type->{ignore} || []}) {
… …
413 ]; 860 ];
414 861
415 $attr 862 $attr
416} 863}
417 864
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($$&&) { 865sub cache_file($$&&) {
480 my ($src, $cache, $load, $create) = @_; 866 my ($src, $cache, $load, $create) = @_;
481 867
482 my ($size, $mtime) = (stat $src)[7,9] 868 my ($size, $mtime) = (stat $src)[7,9]
483 or Carp::croak "$src: $!"; 869 or Carp::croak "$src: $!";
… …
531 }, sub { 917 }, sub {
532 read_arch "$LIB/archetypes" 918 read_arch "$LIB/archetypes"
533 }; 919 };
534} 920}
535 921
922sub construct_tilecache_pb {
923 my ($idx, $cache) = @_;
924
925 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
926
927 while (my ($name, $tile) = each %$cache) {
928 my $tpb = delete $tile->{pb};
929 my $ofs = $tile->{idx};
930
931 for my $x (0 .. $tile->{w} - 1) {
932 for my $y (0 .. $tile->{h} - 1) {
933 my $idx = $ofs + $x + $y * $tile->{w};
934 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
935 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
936 }
937 }
938 }
939
940 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
941
942 $cache
943}
944
945sub use_tilecache {
946 my ($face) = @_;
947 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
948 or die "$VARDIR/tilecache.png: $!";
949 *FACE = $_[0];
950}
951
536=item load_tilecache 952=item load_tilecache
537 953
538(Re-)Load %TILE and %FACE. 954(Re-)Load %TILE and %FACE.
539 955
540=cut 956=cut
541 957
542sub load_tilecache() { 958sub load_tilecache() {
543 require Gtk2; 959 require Gtk2;
544 960
545 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 961 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 { 962 sub {
550 require File::Temp;
551
552 my $tile = read_pak "$LIB/crossfire.0";
553
554 my %cache; 963 my %cache;
964 my $facedata = Storable::retrieve "$LIB/facedata";
555 965
966 $facedata->{version} == 2
967 or die "$LIB/facedata: version mismatch, cannot proceed.";
968
969 my $faces = $facedata->{faceinfo};
556 my $idx = 0; 970 my $idx = 0;
557 971
558 for my $name (sort keys %$tile) { 972 for (sort keys %$faces) {
559 my ($fh, $filename) = File::Temp::tempfile (); 973 my ($face, $info) = ($_, $faces->{$_});
560 print $fh $tile->{$name}; 974
561 close $fh;
562 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 975 my $pb = new Gtk2::Gdk::PixbufLoader;
563 unlink $filename; 976 $pb->write ($info->{data32});
977 $pb->close;
978 my $pb = $pb->get_pixbuf;
564 979
565 my $tile = $cache{$name} = { 980 my $tile = $cache{$face} = {
566 pb => $pb, 981 pb => $pb,
567 idx => $idx, 982 idx => $idx,
568 w => int $pb->get_width / TILESIZE, 983 w => int $pb->get_width / TILESIZE,
569 h => int $pb->get_height / TILESIZE, 984 h => int $pb->get_height / TILESIZE,
570 }; 985 };
571
572 986
573 $idx += $tile->{w} * $tile->{h}; 987 $idx += $tile->{w} * $tile->{h};
988 }
989
990 construct_tilecache_pb $idx, \%cache;
991
992 \%cache
574 } 993 };
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} 994}
995
996=back
596 997
597=head1 AUTHOR 998=head1 AUTHOR
598 999
599 Marc Lehmann <schmorp@schmorp.de> 1000 Marc Lehmann <schmorp@schmorp.de>
600 http://home.schmorp.de/ 1001 http://home.schmorp.de/
… …
603 http://www.ta-sa.org/ 1004 http://www.ta-sa.org/
604 1005
605=cut 1006=cut
606 1007
6071 10081
1009

Diff Legend

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