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

Diff Legend

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