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.73 by root, Tue Sep 12 02:18:06 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.9'; 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
24use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working 29use JSON::XS qw(decode_json encode_json);
25 30
26sub from_json($) {
27 $JSON::Syck::ImplicitUnicode = 1;
28 JSON::Syck::Load $_[0]
29}
30
31sub to_json($) {
32 $JSON::Syck::ImplicitUnicode = 0;
33 JSON::Syck::Dump $_[0]
34}
35
36our $LIB = $ENV{CROSSFIRE_LIBDIR}; 31our $LIB = $ENV{DELIANTRA_LIBDIR};
37 32
38our $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";
39 36
40mkdir $VARDIR, 0777; 37mkdir $VARDIR, 0777;
41 38
42sub TILESIZE (){ 32 } 39sub TILESIZE (){ 32 }
40sub CACHESTRIDE (){ 64 }
43 41
44our %ARCH; 42our %ARCH;
43our %FACE; # face32
45our %FACE; 44our %FACEDATA;
46our $TILE; 45our $TILE;
47 46
48our %FIELD_MULTILINE = ( 47our %FIELD_MULTILINE = (
49 msg => "endmsg", 48 msg => "endmsg",
50 lore => "endlore", 49 lore => "endlore",
… …
56 qw(move_type move_block move_allow move_on move_off move_slow); 55 qw(move_type move_block move_allow move_on move_off move_slow);
57 56
58# same as in server save routine, to (hopefully) be compatible 57# same as in server save routine, to (hopefully) be compatible
59# to the other editors. 58# to the other editors.
60our @FIELD_ORDER_MAP = (qw( 59our @FIELD_ORDER_MAP = (qw(
60 file_format_version
61 name attach swap_time reset_timeout fixed_resettime difficulty region 61 name attach swap_time reset_timeout fixed_resettime difficulty
62 region music
62 shopitems shopgreed shopmin shopmax shoprace 63 shopitems shopgreed shopmin shopmax shoprace
63 darkness width height enter_x enter_y msg maplore 64 darkness width height enter_x enter_y msg maplore
64 unique template 65 unique template
65 outdoor temp pressure humid windspeed winddir sky nosmooth 66 outdoor temp pressure humid windspeed winddir sky nosmooth
66 tile_path_1 tile_path_2 tile_path_3 tile_path_4 67 tile_path_1 tile_path_2 tile_path_3 tile_path_4
67)); 68));
68 69
69our @FIELD_ORDER = (qw( 70our @FIELD_ORDER = (qw(
71 inherit
72
70 elevation 73 elevation
71 74
72 name name_pl custom_name attach title race 75 name name_pl custom_name attach title race
73 slaying skill msg lore other_arch face 76 slaying skill msg lore other_arch
74 #todo-events 77 sound sound_destroy face animation is_animated
75 animation is_animated 78 magicmap smoothlevel smoothface
76 str dex con wis pow cha int 79 str dex con wis pow cha int
77 hp maxhp sp maxsp grace maxgrace 80 hp maxhp sp maxsp grace maxgrace
78 exp perm_exp expmul 81 exp perm_exp expmul
79 food dam luck wc ac x y speed speed_left move_state attack_movement 82 food dam luck wc ac x y speed speed_left move_state attack_movement
80 nrof level direction type subtype attacktype 83 nrof level direction type subtype attacktype
… …
88 resist_life_stealing resist_disease 91 resist_life_stealing resist_disease
89 92
90 path_attuned path_repelled path_denied material materialname 93 path_attuned path_repelled path_denied material materialname
91 value carrying weight invisible state magic 94 value carrying weight invisible state magic
92 last_heal last_sp last_grace last_eat 95 last_heal last_sp last_grace last_eat
93 connected glow_radius randomitems npx_status npc_program 96 connected glow_radius randomitems tresure_env npx_status npc_program
94 run_away pick_up container will_apply smoothlevel 97 run_away pick_up container will_apply smoothlevel
95 current_weapon_script weapontype tooltype elevation client_type 98 current_weapon_script weapontype tooltype elevation client_type
96 item_power duration range 99 item_power duration range
97 range_modifier duration_modifier dam_modifier gen_sp_armour 100 range_modifier duration_modifier dam_modifier gen_sp_armour
98 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty 101 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
… …
109 known_magical known_cursed can_use_skill been_applied has_ready_scroll 112 known_magical known_cursed can_use_skill been_applied has_ready_scroll
110 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly 113 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
111 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark 114 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
112 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage 115 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
113 activate_on_push activate_on_release is_water use_content_on_gen is_buildable 116 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
117 precious
114 118
115 body_range body_arm body_torso body_head body_neck body_skill 119 body_range body_arm body_torso body_head body_neck body_skill
116 body_finger body_shoulder body_foot body_hand body_wrist body_waist 120 body_finger body_shoulder body_foot body_hand body_wrist body_waist
117)); 121));
118 122
… …
135sub MOVE_FLY_LOW (){ 0x02 } 139sub MOVE_FLY_LOW (){ 0x02 }
136sub MOVE_FLY_HIGH (){ 0x04 } 140sub MOVE_FLY_HIGH (){ 0x04 }
137sub MOVE_FLYING (){ 0x06 } 141sub MOVE_FLYING (){ 0x06 }
138sub MOVE_SWIM (){ 0x08 } 142sub MOVE_SWIM (){ 0x08 }
139sub MOVE_BOAT (){ 0x10 } 143sub MOVE_BOAT (){ 0x10 }
144sub MOVE_SHIP (){ 0x20 }
140sub MOVE_KNOWN (){ 0x1f } # all of above 145sub MOVE_KNOWN (){ 0x3f } # all of above
141sub MOVE_ALLBIT (){ 0x10000 }
142sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 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}
143 256
144sub load_ref($) { 257sub load_ref($) {
145 my ($path) = @_; 258 my ($path) = @_;
146 259
147 open my $fh, "<:raw:perlio", $path 260 open my $fh, "<:raw:perlio", $path
… …
197 while (my ($k, $v) = each %attack_mask) { 310 while (my ($k, $v) = each %attack_mask) {
198 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v; 311 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
199 } 312 }
200} 313}
201 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
202# object as in "Object xxx", i.e. archetypes 346# object as in "Object xxx", i.e. archetypes
203sub normalize_object($) { 347sub normalize_object($) {
204 my ($ob) = @_; 348 my ($ob) = @_;
205 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
206 # nuke outdated or never supported fields 385 # nuke outdated or never supported fields
207 delete @$ob{qw( 386 delete @$ob{qw(
208 can_knockback can_parry can_impale can_cut can_dam_armour 387 can_knockback can_parry can_impale can_cut can_dam_armour
209 can_apply pass_thru can_pass_thru 388 can_apply pass_thru can_pass_thru color_bg color_fg
210 )}; 389 )};
211 390
212 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 391 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
213 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 392 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
214 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 393 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
215 394
216 # convert movement strings to bitsets 395 # convert movement strings to bitsets
217 for my $attr (keys %FIELD_MOVEMENT) { 396 for my $attr (keys %FIELD_MOVEMENT) {
218 next unless exists $ob->{$attr}; 397 next unless exists $ob->{$attr};
219 398
220 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 399 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
221
222 next if $ob->{$attr} =~ /^\d+$/;
223
224 my $flags = 0;
225
226 # assume list
227 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
228 $flags |= MOVE_WALK if $flag eq "walk";
229 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
230 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
231 $flags |= MOVE_FLYING if $flag eq "flying";
232 $flags |= MOVE_SWIM if $flag eq "swim";
233 $flags |= MOVE_BOAT if $flag eq "boat";
234 $flags |= MOVE_ALL if $flag eq "all";
235
236 $flags &= ~MOVE_WALK if $flag eq "-walk";
237 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
238 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
239 $flags &= ~MOVE_FLYING if $flag eq "-flying";
240 $flags &= ~MOVE_SWIM if $flag eq "-swim";
241 $flags &= ~MOVE_BOAT if $flag eq "-boat";
242 $flags &= ~MOVE_ALL if $flag eq "-all";
243 }
244
245 $ob->{$attr} = $flags;
246 } 400 }
247 401
248 # convert outdated movement flags to new movement sets 402 # convert outdated movement flags to new movement sets
249 if (defined (my $v = delete $ob->{no_pass})) { 403 if (defined (my $v = delete $ob->{no_pass})) {
250 $ob->{move_block} = $v ? MOVE_ALL : 0; 404 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
251 } 405 }
252 if (defined (my $v = delete $ob->{slow_move})) { 406 if (defined (my $v = delete $ob->{slow_move})) {
253 $ob->{move_slow} |= MOVE_WALK; 407 $ob->{move_slow} += "walk";
254 $ob->{move_slow_penalty} = $v; 408 $ob->{move_slow_penalty} = $v;
255 } 409 }
256 if (defined (my $v = delete $ob->{walk_on})) { 410 if (defined (my $v = delete $ob->{walk_on})) {
257 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 411 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
258 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
259 : $ob->{move_on} & ~MOVE_WALK;
260 } 412 }
261 if (defined (my $v = delete $ob->{walk_off})) { 413 if (defined (my $v = delete $ob->{walk_off})) {
262 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 414 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
263 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
264 : $ob->{move_off} & ~MOVE_WALK;
265 } 415 }
266 if (defined (my $v = delete $ob->{fly_on})) { 416 if (defined (my $v = delete $ob->{fly_on})) {
267 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 417 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
268 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
269 : $ob->{move_on} & ~MOVE_FLY_LOW;
270 } 418 }
271 if (defined (my $v = delete $ob->{fly_off})) { 419 if (defined (my $v = delete $ob->{fly_off})) {
272 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 420 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
273 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
274 : $ob->{move_off} & ~MOVE_FLY_LOW;
275 } 421 }
276 if (defined (my $v = delete $ob->{flying})) { 422 if (defined (my $v = delete $ob->{flying})) {
277 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 423 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
278 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
279 : $ob->{move_type} & ~MOVE_FLY_LOW;
280 } 424 }
281 425
282 # convert idiotic event_xxx things into objects 426 # convert idiotic event_xxx things into objects
283 while (my ($event, $subtype) = each %EVENT_TYPE) { 427 while (my ($event, $subtype) = each %EVENT_TYPE) {
284 if (exists $ob->{"event_${event}_plugin"}) { 428 if (exists $ob->{"event_${event}_plugin"}) {
… …
300# arch as in "arch xxx", ie.. objects 444# arch as in "arch xxx", ie.. objects
301sub normalize_arch($) { 445sub normalize_arch($) {
302 my ($ob) = @_; 446 my ($ob) = @_;
303 447
304 normalize_object $ob; 448 normalize_object $ob;
449
450 return if $ob->{_atype} eq "object";
305 451
306 my $arch = $ARCH{$ob->{_name}} 452 my $arch = $ARCH{$ob->{_name}}
307 or (warn "$ob->{_name}: no such archetype", return $ob); 453 or (warn "$ob->{_name}: no such archetype", return $ob);
308 454
309 if ($arch->{type} == 22) { # map 455 if ($arch->{type} == 22) { # map
… …
345} 491}
346 492
347sub attr_thaw($) { 493sub attr_thaw($) {
348 my ($ob) = @_; 494 my ($ob) = @_;
349 495
350 $ob->{attach} = from_json $ob->{attach} 496 $ob->{attach} = decode_json $ob->{attach}
351 if exists $ob->{attach}; 497 if exists $ob->{attach};
352 498
353 $ob 499 $ob
354} 500}
355 501
356sub attr_freeze($) { 502sub attr_freeze($) {
357 my ($ob) = @_; 503 my ($ob) = @_;
358 504
359 $ob->{attach} = Crossfire::to_json $ob->{attach} 505 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
360 if exists $ob->{attach}; 506 if exists $ob->{attach};
361 507
362 $ob 508 $ob
363} 509}
364 510
… …
382sub read_arch($;$) { 528sub read_arch($;$) {
383 my ($path, $toplevel) = @_; 529 my ($path, $toplevel) = @_;
384 530
385 my %arc; 531 my %arc;
386 my ($more, $prev); 532 my ($more, $prev);
533 my $comment;
387 534
388 open my $fh, "<:raw:perlio:utf8", $path 535 open my $fh, "<:utf8", $path
389 or Carp::croak "$path: $!"; 536 or Carp::croak "$path: $!";
390 537
391# binmode $fh; 538# binmode $fh;
392 539
393 my $parse_block; $parse_block = sub { 540 my $parse_block; $parse_block = sub {
… …
395 542
396 while (<$fh>) { 543 while (<$fh>) {
397 s/\s+$//; 544 s/\s+$//;
398 if (/^end$/i) { 545 if (/^end$/i) {
399 last; 546 last;
547
400 } elsif (/^arch (\S+)$/i) { 548 } elsif (/^arch (\S+)$/i) {
401 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 549 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
550
402 } elsif (/^lore$/i) { 551 } elsif (/^lore$/i) {
403 while (<$fh>) { 552 while (<$fh>) {
404 last if /^endlore\s*$/i; 553 last if /^endlore\s*$/i;
405 $arc{lore} .= $_; 554 $arc{lore} .= $_;
406 } 555 }
… …
415 chomp; 564 chomp;
416 push @{ $arc{anim} }, $_; 565 push @{ $arc{anim} }, $_;
417 } 566 }
418 } elsif (/^(\S+)\s*(.*)$/) { 567 } elsif (/^(\S+)\s*(.*)$/) {
419 $arc{lc $1} = $2; 568 $arc{lc $1} = $2;
420 } elsif (/^\s*($|#)/) { 569 } elsif (/^\s*#/) {
570 $arc{_comment} .= "$_\n";
571
572 } elsif (/^\s*$/) {
421 # 573 #
422 } else { 574 } else {
423 warn "$path: unparsable line '$_' in arch $arc{_name}"; 575 warn "$path: unparsable line '$_' in arch $arc{_name}";
424 } 576 }
425 } 577 }
… …
431 s/\s+$//; 583 s/\s+$//;
432 if (/^more$/i) { 584 if (/^more$/i) {
433 $more = $prev; 585 $more = $prev;
434 } elsif (/^object (\S+)$/i) { 586 } elsif (/^object (\S+)$/i) {
435 my $name = $1; 587 my $name = $1;
436 my $arc = attr_thaw 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};
437 $arc->{_atype} = 'object'; 591 $arc->{_atype} = 'object';
438 592
439 if ($more) { 593 if ($more) {
440 $more->{more} = $arc; 594 $more->{more} = $arc;
441 } else { 595 } else {
… …
443 } 597 }
444 $prev = $arc; 598 $prev = $arc;
445 $more = undef; 599 $more = undef;
446 } elsif (/^arch (\S+)$/i) { 600 } elsif (/^arch (\S+)$/i) {
447 my $name = $1; 601 my $name = $1;
448 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 602 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
603 undef $comment;
604 delete $arc{_comment} unless length $arc{_comment};
449 $arc->{_atype} = 'arch'; 605 $arc->{_atype} = 'arch';
450 606
451 if ($more) { 607 if ($more) {
452 $more->{more} = $arc; 608 $more->{more} = $arc;
453 } else { 609 } else {
… …
462 push @{$toplevel->{lev_array}}, $_+0; 618 push @{$toplevel->{lev_array}}, $_+0;
463 } 619 }
464 } else { 620 } else {
465 $toplevel->{$1} = $2; 621 $toplevel->{$1} = $2;
466 } 622 }
623 } elsif (/^\s*#/) {
624 $comment .= "$_\n";
467 } elsif (/^\s*($|#)/) { 625 } elsif (/^\s*($|#)/) {
468 # 626 #
469 } else { 627 } else {
470 die "$path: unparseable top-level line '$_'"; 628 die "$path: unparseable top-level line '$_'";
471 } 629 }
… …
482 my $str; 640 my $str;
483 641
484 my $append; $append = sub { 642 my $append; $append = sub {
485 my %a = %{$_[0]}; 643 my %a = %{$_[0]};
486 644
487 Crossfire::attr_freeze \%a; 645 Deliantra::attr_freeze \%a;
488 Crossfire::normalize_arch \%a; 646 Deliantra::normalize_arch \%a;
489 647
490 # undo the bit-split we did before 648 # undo the bit-split we did before
491 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 649 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
492 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 650 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
493 | (delete $a{attack_movement_bits_4_7}); 651 | (delete $a{attack_movement_bits_4_7});
494 } 652 }
495 653
654 if (my $comment = delete $a{_comment}) {
655 if ($comment =~ /[^\n\s#]/) {
656 $str .= $comment;
657 }
658 }
659
496 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 660 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
497 661
498 my $inv = delete $a{inventory}; 662 my $inv = delete $a{inventory};
499 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 663 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
500 my $anim = delete $a{anim}; 664 my $anim = delete $a{anim};
501 665
666 if ($a{_atype} eq 'object') {
667 $str .= join "\n", "anim", @$anim, "mina\n"
668 if $anim;
669 }
670
502 my @kv; 671 my @kv;
503 672
504 for ($a{_name} eq "map" 673 for ($a{_name} eq "map"
505 ? @Crossfire::FIELD_ORDER_MAP 674 ? @Deliantra::FIELD_ORDER_MAP
506 : @Crossfire::FIELD_ORDER) { 675 : @Deliantra::FIELD_ORDER) {
507 push @kv, [$_, delete $a{$_}] 676 push @kv, [$_, delete $a{$_}]
508 if exists $a{$_}; 677 if exists $a{$_};
509 } 678 }
510 679
511 for (sort keys %a) { 680 for (sort keys %a) {
… …
514 } 683 }
515 684
516 for (@kv) { 685 for (@kv) {
517 my ($k, $v) = @$_; 686 my ($k, $v) = @$_;
518 687
519 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 688 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
520 $v =~ s/\n$//; 689 $v =~ s/\n$//;
521 $str .= "$k\n$v\n$end\n"; 690 $str .= "$k\n$v\n$end\n";
522 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
523 if ($v & ~Crossfire::MOVE_ALL or !$v) {
524 $str .= "$k $v\n";
525
526 } elsif ($v & Crossfire::MOVE_ALLBIT) {
527 $str .= "$k all";
528
529 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
530 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
531 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
532 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
533 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
534
535 $str .= "\n";
536
537 } else {
538 $str .= $k;
539
540 $str .= " walk" if $v & Crossfire::MOVE_WALK;
541 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
542 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
543 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
544 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
545
546 $str .= "\n";
547 }
548 } else { 691 } else {
549 $str .= "$k $v\n"; 692 $str .= "$k $v\n";
550 } 693 }
551 } 694 }
552 695
553 if ($inv) { 696 if ($inv) {
554 $append->($_) for @$inv; 697 $append->($_) for @$inv;
555 } 698 }
556 699
700 $str .= "end\n";
701
557 if ($a{_atype} eq 'object') { 702 if ($a{_atype} eq 'object') {
558 $str .= join "\n", "anim", @$anim, "mina\n" 703 if ($more) {
559 if $anim;
560 }
561
562 $str .= "end\n";
563
564 if (($a{_atype} eq 'object') && $more) {
565 $str .= "\nmore\n"; 704 $str .= "more\n";
566 $append->($more) if $more; 705 $append->($more) if $more;
706 } else {
707 $str .= "\n";
708 }
567 } 709 }
568 }; 710 };
569 711
570 for (@$arch) { 712 for (@$arch) {
571 $append->($_); 713 $append->($_);
… …
600 my ($a) = @_; 742 my ($a) = @_;
601 743
602 my $o = $ARCH{$a->{_name}} 744 my $o = $ARCH{$a->{_name}}
603 or return; 745 or return;
604 746
605 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"}
606 or (warn "no face data found for arch '$a->{_name}'"), return; 750 or (warn "no face data found for arch '$a->{_name}'"), return;
751 }
607 752
608 if ($face->{w} > 1 || $face->{h} > 1) { 753 if ($face->{w} > 1 || $face->{h} > 1) {
609 # bigface 754 # bigface
610 return (0, 0, $face->{w} - 1, $face->{h} - 1); 755 return (0, 0, $face->{w} - 1, $face->{h} - 1);
611 756
… …
644=cut 789=cut
645 790
646sub arch_attr($) { 791sub arch_attr($) {
647 my ($obj) = @_; 792 my ($obj) = @_;
648 793
649 require Crossfire::Data; 794 require Deliantra::Data;
650 795
651 my $root; 796 my $root;
652 my $attr = { }; 797 my $attr = { };
653 798
654 my $arch = $ARCH{ $obj->{_name} }; 799 my $arch = $ARCH{ $obj->{_name} };
655 my $type = $obj->{type} || $arch->{type}; 800 my $type = $obj->{type} || $arch->{type};
656 801
657 if ($type > 0) { 802 if ($type > 0) {
658 $root = $Crossfire::Data::ATTR{$type}; 803 $root = $Deliantra::Data::ATTR{$type};
659 } else { 804 } else {
660 my %a = (%$arch, %$obj); 805 my %a = (%$arch, %$obj);
661 806
662 if ($a{is_floor} && !$a{alive}) { 807 if ($a{is_floor} && !$a{alive}) {
663 $root = $Crossfire::Data::TYPE{Floor}; 808 $root = $Deliantra::Data::TYPE{Floor};
664 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 809 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
665 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 810 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
666 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 811 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
667 $root = $Crossfire::Data::TYPE{Wall}; 812 $root = $Deliantra::Data::TYPE{Wall};
668 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 813 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
669 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 814 $root = $Deliantra::Data::TYPE{"Weak Wall"};
670 } else { 815 } else {
671 $root = $Crossfire::Data::TYPE{Misc}; 816 $root = $Deliantra::Data::TYPE{Misc};
672 } 817 }
673 } 818 }
674 819
820 my (%ignore);
675 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;
676 837 }
838 (@import) = @new_import;
839
840 # then add defaults to the back of the list, so they are added
841 # as last resort.
677 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 842 push @import, \%Deliantra::Data::DEFAULT_ATTR
678 unless $type == 116; 843 unless $type == 116;
679 844
680 my (%ignore);
681 my (@section_order, %section, @attr_order); 845 my (@section_order, %section, @attr_order);
682 846
847 # @import = root, imported, default
683 while (my $type = shift @import) { 848 while (my $type = pop @import) {
684 push @import, @{$type->{import} || []};
685
686 $attr->{$_} ||= $type->{$_} 849 $attr->{$_} ||= $type->{$_}
687 for qw(name desc use); 850 for qw(name desc use);
688
689 for (@{$type->{ignore} || []}) {
690 $ignore{$_}++ for ref $_ ? @$_ : $_;
691 }
692 851
693 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 852 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
694 my ($name, $attr) = @$_; 853 my ($name, $attr) = @$_;
695 push @section_order, $name; 854 push @section_order, $name;
696 for (@$attr) { 855 for (@$attr) {
697 my ($k, $v) = @$_; 856 my ($k, $v) = @$_;
698 push @attr_order, $k; 857 push @attr_order, $k;
699 $section{$name}{$k} ||= $v; 858 $section{$name}{$k} = $v; # overwrite, so that the root decides
700 }
701 } 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.
702 } 876 }
703 877
704 $attr->{section} = [ 878 $attr->{section} = [
705 map !exists $section{$_} ? () : do { 879 map !exists $section{$_} ? () : do {
706 my $attr = delete $section{$_}; 880 my $attr = delete $section{$_};
… …
710 map exists $attr->{$_} && !$ignore{$_} 884 map exists $attr->{$_} && !$ignore{$_}
711 ? [$_ => delete $attr->{$_}] : (), 885 ? [$_ => delete $attr->{$_}] : (),
712 @attr_order 886 @attr_order
713 ] 887 ]
714 }, 888 },
715
716 exists $section{$_} ? [$_ => delete $section{$_}] : (), 889 exists $section{$_} ? [$_ => delete $section{$_}] : (),
717 @section_order 890 @section_order
718 ]; 891 ];
719 892
720 $attr 893 $attr
721}
722
723sub arch_edit_sections {
724# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
725# edit_type = 0;
726# else if (edit_type != 0) {
727# // all flags from 'check_type' must be unset in this arch because they get recalculated now
728# edit_type &= ~check_type;
729# }
730#
731# }
732# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
733# getAttributeValue("alive", defarch) == 1 &&
734# (getAttributeValue("monster", defarch) == 1 ||
735# getAttributeValue("generator", defarch) == 1)) {
736# // Monster: monsters/npcs/generators
737# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
738# }
739# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
740# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
741# // Walls
742# edit_type |= IGUIConstants.TILE_EDIT_WALL;
743# }
744# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
745# getAttributeValue("connected", defarch) != 0) {
746# // Connected Objects
747# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
748# }
749# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
750# arch_type == 66 || arch_type == 41 || arch_type == 95) {
751# // Exit: teleporter/exit/trapdoors
752# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
753# }
754# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
755# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
756# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
757# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
758# arch_type == 124 || arch_type == 130)) {
759# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
760# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
761# }
762# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
763# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
764# arch_type == 91 || arch_type == 21 || arch_type == 24) {
765# // Door: door/special door/gates + keys
766# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
767# }
768# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
769# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
770# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
771# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
772# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
773# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
774# arch_type == 122 || arch_type == 3)) {
775# // Equipment: weapons/armour/wands/rods
776# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
777# }
778#
779# return(edit_type);
780#
781#
782} 894}
783 895
784sub cache_file($$&&) { 896sub cache_file($$&&) {
785 my ($src, $cache, $load, $create) = @_; 897 my ($src, $cache, $load, $create) = @_;
786 898
… …
836 }, sub { 948 }, sub {
837 read_arch "$LIB/archetypes" 949 read_arch "$LIB/archetypes"
838 }; 950 };
839} 951}
840 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
841=item load_tilecache 983=item load_tilecache
842 984
843(Re-)Load %TILE and %FACE. 985(Re-)Load %TILE and %FACE.
844 986
845=cut 987=cut
846 988
847sub load_tilecache() { 989sub load_tilecache() {
848 require Gtk2; 990 require Gtk2;
849 991
850 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 992 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
851 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
852 or die "$VARDIR/tilecache.png: $!";
853 *FACE = $_[0];
854 }, sub { 993 sub {
855 my $tile = read_pak "$LIB/crossfire.0";
856
857 my %cache; 994 my %cache;
995 my $facedata = Storable::retrieve "$LIB/facedata";
858 996
997 $facedata->{version} == 2
998 or die "$LIB/facedata: version mismatch, cannot proceed.";
999
1000 my $faces = $facedata->{faceinfo};
859 my $idx = 0; 1001 my $idx = 0;
860 1002
861 for my $name (sort keys %$tile) { 1003 for (sort keys %$faces) {
1004 my ($face, $info) = ($_, $faces->{$_});
1005
862 my $pb = new Gtk2::Gdk::PixbufLoader; 1006 my $pb = new Gtk2::Gdk::PixbufLoader;
863 $pb->write ($tile->{$name}); 1007 $pb->write ($info->{data32});
864 $pb->close; 1008 $pb->close;
865 my $pb = $pb->get_pixbuf; 1009 my $pb = $pb->get_pixbuf;
866 1010
867 my $tile = $cache{$name} = { 1011 my $tile = $cache{$face} = {
868 pb => $pb, 1012 pb => $pb,
869 idx => $idx, 1013 idx => $idx,
870 w => int $pb->get_width / TILESIZE, 1014 w => int $pb->get_width / TILESIZE,
871 h => int $pb->get_height / TILESIZE, 1015 h => int $pb->get_height / TILESIZE,
872 }; 1016 };
873
874 1017
875 $idx += $tile->{w} * $tile->{h}; 1018 $idx += $tile->{w} * $tile->{h};
1019 }
1020
1021 construct_tilecache_pb $idx, \%cache;
1022
1023 \%cache
876 } 1024 };
877
878 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
879
880 while (my ($name, $tile) = each %cache) {
881 my $tpb = delete $tile->{pb};
882 my $ofs = $tile->{idx};
883
884 for my $x (0 .. $tile->{w} - 1) {
885 for my $y (0 .. $tile->{h} - 1) {
886 my $idx = $ofs + $x + $y * $tile->{w};
887 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
888 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
889 }
890 }
891 }
892
893 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
894
895 \%cache
896 };
897} 1025}
1026
1027=back
898 1028
899=head1 AUTHOR 1029=head1 AUTHOR
900 1030
901 Marc Lehmann <schmorp@schmorp.de> 1031 Marc Lehmann <schmorp@schmorp.de>
902 http://home.schmorp.de/ 1032 http://home.schmorp.de/
… …
905 http://www.ta-sa.org/ 1035 http://www.ta-sa.org/
906 1036
907=cut 1037=cut
908 1038
9091 10391
1040

Diff Legend

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