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

Diff Legend

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