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.78 by root, Sun Dec 3 01:02:05 2006 UTC vs.
Revision 1.132 by root, Wed Sep 2 22:38:57 2009 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.96'; 9our $VERSION = '1.25';
10 10
11use strict; 11use common::sense;
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 qw(freeze thaw); 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
24use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working 27use JSON::XS qw(decode_json encode_json);
25 28
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}; 29our $LIB = $ENV{DELIANTRA_LIBDIR};
37 30
38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" 31our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 32 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
40 : File::Spec->tmpdir . "/crossfire"; 33 : File::Spec->tmpdir . "/deliantra";
41 34
42mkdir $VARDIR, 0777; 35mkdir $VARDIR, 0777;
43 36
44sub TILESIZE (){ 32 } 37sub TILESIZE (){ 32 }
38sub CACHESTRIDE (){ 64 }
45 39
46our %ARCH; 40our %ARCH;
41our %FACE; # face32
47our %FACE; 42our %FACEDATA;
48our $TILE; 43our $TILE;
49 44
50our %FIELD_MULTILINE = ( 45our %FIELD_MULTILINE = (
51 msg => "endmsg", 46 msg => "endmsg",
52 lore => "endlore", 47 lore => "endlore",
… …
58 qw(move_type move_block move_allow move_on move_off move_slow); 53 qw(move_type move_block move_allow move_on move_off move_slow);
59 54
60# same as in server save routine, to (hopefully) be compatible 55# same as in server save routine, to (hopefully) be compatible
61# to the other editors. 56# to the other editors.
62our @FIELD_ORDER_MAP = (qw( 57our @FIELD_ORDER_MAP = (qw(
58 file_format_version
63 name attach swap_time reset_timeout fixed_resettime difficulty region 59 name attach swap_time reset_timeout fixed_resettime difficulty region
64 shopitems shopgreed shopmin shopmax shoprace 60 shopitems shopgreed shopmin shopmax shoprace
65 darkness width height enter_x enter_y msg maplore 61 darkness width height enter_x enter_y msg maplore
66 unique template 62 unique template
67 outdoor temp pressure humid windspeed winddir sky nosmooth 63 outdoor temp pressure humid windspeed winddir sky nosmooth
68 tile_path_1 tile_path_2 tile_path_3 tile_path_4 64 tile_path_1 tile_path_2 tile_path_3 tile_path_4
69)); 65));
70 66
71our @FIELD_ORDER = (qw( 67our @FIELD_ORDER = (qw(
68 inherit
69
72 elevation 70 elevation
73 71
74 name name_pl custom_name attach title race 72 name name_pl custom_name attach title race
75 slaying skill msg lore other_arch face 73 slaying skill msg lore other_arch
76 #todo-events 74 sound sound_destroy face animation is_animated
77 animation is_animated 75 magicmap smoothlevel smoothface
78 str dex con wis pow cha int 76 str dex con wis pow cha int
79 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
80 exp perm_exp expmul 78 exp perm_exp expmul
81 food dam luck wc ac x y speed speed_left move_state attack_movement 79 food dam luck wc ac x y speed speed_left move_state attack_movement
82 nrof level direction type subtype attacktype 80 nrof level direction type subtype attacktype
… …
90 resist_life_stealing resist_disease 88 resist_life_stealing resist_disease
91 89
92 path_attuned path_repelled path_denied material materialname 90 path_attuned path_repelled path_denied material materialname
93 value carrying weight invisible state magic 91 value carrying weight invisible state magic
94 last_heal last_sp last_grace last_eat 92 last_heal last_sp last_grace last_eat
95 connected glow_radius randomitems npx_status npc_program 93 connected glow_radius randomitems tresure_env npx_status npc_program
96 run_away pick_up container will_apply smoothlevel 94 run_away pick_up container will_apply smoothlevel
97 current_weapon_script weapontype tooltype elevation client_type 95 current_weapon_script weapontype tooltype elevation client_type
98 item_power duration range 96 item_power duration range
99 range_modifier duration_modifier dam_modifier gen_sp_armour 97 range_modifier duration_modifier dam_modifier gen_sp_armour
100 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty 98 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
… …
111 known_magical known_cursed can_use_skill been_applied has_ready_scroll 109 known_magical known_cursed can_use_skill been_applied has_ready_scroll
112 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly 110 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
113 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark 111 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
114 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage 112 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
115 activate_on_push activate_on_release is_water use_content_on_gen is_buildable 113 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
114 precious
116 115
117 body_range body_arm body_torso body_head body_neck body_skill 116 body_range body_arm body_torso body_head body_neck body_skill
118 body_finger body_shoulder body_foot body_hand body_wrist body_waist 117 body_finger body_shoulder body_foot body_hand body_wrist body_waist
119)); 118));
120 119
… …
137sub MOVE_FLY_LOW (){ 0x02 } 136sub MOVE_FLY_LOW (){ 0x02 }
138sub MOVE_FLY_HIGH (){ 0x04 } 137sub MOVE_FLY_HIGH (){ 0x04 }
139sub MOVE_FLYING (){ 0x06 } 138sub MOVE_FLYING (){ 0x06 }
140sub MOVE_SWIM (){ 0x08 } 139sub MOVE_SWIM (){ 0x08 }
141sub MOVE_BOAT (){ 0x10 } 140sub MOVE_BOAT (){ 0x10 }
141sub MOVE_SHIP (){ 0x20 }
142sub MOVE_KNOWN (){ 0x1f } # all of above 142sub MOVE_KNOWN (){ 0x3f } # all of above
143sub MOVE_ALLBIT (){ 0x10000 }
144sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 143sub MOVE_ALL (){ 0x10000 } # very special value
144
145our %MOVE_TYPE = (
146 walk => MOVE_WALK,
147 fly_low => MOVE_FLY_LOW,
148 fly_high => MOVE_FLY_HIGH,
149 flying => MOVE_FLYING,
150 swim => MOVE_SWIM,
151 boat => MOVE_BOAT,
152 ship => MOVE_SHIP,
153 all => MOVE_ALL,
154);
155
156our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
157
158{
159 package Deliantra::MoveType;
160
161 use overload
162 '=' => sub { bless [@{$_[0]}], ref $_[0] },
163 '""' => \&as_string,
164 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
165 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
166 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
167 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
168 'x=' => sub {
169 my $cur = $_[0] >= $_[1];
170 if (!defined $cur) {
171 if ($_[0] >= "all") {
172 $_[0] -= $_[1];
173 } else {
174 $_[0] += $_[1];
175 }
176 } elsif ($cur) {
177 $_[0] -= $_[1];
178 } else {
179 $_[0] /= $_[1];
180 }
181
182 $_[0]
183 },
184 'eq' => sub { "$_[0]" eq "$_[1]" },
185 'ne' => sub { "$_[0]" ne "$_[1]" },
186 ;
187
188 sub TO_JSON {
189 $_[0][0]
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}
145 248
146sub load_ref($) { 249sub load_ref($) {
147 my ($path) = @_; 250 my ($path) = @_;
148 251
149 open my $fh, "<:raw:perlio", $path 252 open my $fh, "<:raw:perlio", $path
… …
199 while (my ($k, $v) = each %attack_mask) { 302 while (my ($k, $v) = each %attack_mask) {
200 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v; 303 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
201 } 304 }
202} 305}
203 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
204# object as in "Object xxx", i.e. archetypes 338# object as in "Object xxx", i.e. archetypes
205sub normalize_object($) { 339sub normalize_object($) {
206 my ($ob) = @_; 340 my ($ob) = @_;
207 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
208 # nuke outdated or never supported fields 375 # nuke outdated or never supported fields
209 delete @$ob{qw( 376 delete @$ob{qw(
210 can_knockback can_parry can_impale can_cut can_dam_armour 377 can_knockback can_parry can_impale can_cut can_dam_armour
211 can_apply pass_thru can_pass_thru 378 can_apply pass_thru can_pass_thru color_bg color_fg
212 )}; 379 )};
213 380
214 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 381 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
215 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 382 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
216 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 383 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
217 384
218 # convert movement strings to bitsets 385 # convert movement strings to bitsets
219 for my $attr (keys %FIELD_MOVEMENT) { 386 for my $attr (keys %FIELD_MOVEMENT) {
220 next unless exists $ob->{$attr}; 387 next unless exists $ob->{$attr};
221 388
222 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 389 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
223
224 next if $ob->{$attr} =~ /^\d+$/;
225
226 my $flags = 0;
227
228 # assume list
229 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
230 $flags |= MOVE_WALK if $flag eq "walk";
231 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
232 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
233 $flags |= MOVE_FLYING if $flag eq "flying";
234 $flags |= MOVE_SWIM if $flag eq "swim";
235 $flags |= MOVE_BOAT if $flag eq "boat";
236 $flags |= MOVE_ALL if $flag eq "all";
237
238 $flags &= ~MOVE_WALK if $flag eq "-walk";
239 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
240 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
241 $flags &= ~MOVE_FLYING if $flag eq "-flying";
242 $flags &= ~MOVE_SWIM if $flag eq "-swim";
243 $flags &= ~MOVE_BOAT if $flag eq "-boat";
244 $flags &= ~MOVE_ALL if $flag eq "-all";
245 }
246
247 $ob->{$attr} = $flags;
248 } 390 }
249 391
250 # convert outdated movement flags to new movement sets 392 # convert outdated movement flags to new movement sets
251 if (defined (my $v = delete $ob->{no_pass})) { 393 if (defined (my $v = delete $ob->{no_pass})) {
252 $ob->{move_block} = $v ? MOVE_ALL : 0; 394 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
253 } 395 }
254 if (defined (my $v = delete $ob->{slow_move})) { 396 if (defined (my $v = delete $ob->{slow_move})) {
255 $ob->{move_slow} |= MOVE_WALK; 397 $ob->{move_slow} += "walk";
256 $ob->{move_slow_penalty} = $v; 398 $ob->{move_slow_penalty} = $v;
257 } 399 }
258 if (defined (my $v = delete $ob->{walk_on})) { 400 if (defined (my $v = delete $ob->{walk_on})) {
259 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 401 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
260 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
261 : $ob->{move_on} & ~MOVE_WALK;
262 } 402 }
263 if (defined (my $v = delete $ob->{walk_off})) { 403 if (defined (my $v = delete $ob->{walk_off})) {
264 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 404 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
265 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
266 : $ob->{move_off} & ~MOVE_WALK;
267 } 405 }
268 if (defined (my $v = delete $ob->{fly_on})) { 406 if (defined (my $v = delete $ob->{fly_on})) {
269 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 407 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
270 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
271 : $ob->{move_on} & ~MOVE_FLY_LOW;
272 } 408 }
273 if (defined (my $v = delete $ob->{fly_off})) { 409 if (defined (my $v = delete $ob->{fly_off})) {
274 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 410 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
275 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
276 : $ob->{move_off} & ~MOVE_FLY_LOW;
277 } 411 }
278 if (defined (my $v = delete $ob->{flying})) { 412 if (defined (my $v = delete $ob->{flying})) {
279 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 413 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
280 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
281 : $ob->{move_type} & ~MOVE_FLY_LOW;
282 } 414 }
283 415
284 # convert idiotic event_xxx things into objects 416 # convert idiotic event_xxx things into objects
285 while (my ($event, $subtype) = each %EVENT_TYPE) { 417 while (my ($event, $subtype) = each %EVENT_TYPE) {
286 if (exists $ob->{"event_${event}_plugin"}) { 418 if (exists $ob->{"event_${event}_plugin"}) {
… …
302# arch as in "arch xxx", ie.. objects 434# arch as in "arch xxx", ie.. objects
303sub normalize_arch($) { 435sub normalize_arch($) {
304 my ($ob) = @_; 436 my ($ob) = @_;
305 437
306 normalize_object $ob; 438 normalize_object $ob;
439
440 return if $ob->{_atype} eq "object";
307 441
308 my $arch = $ARCH{$ob->{_name}} 442 my $arch = $ARCH{$ob->{_name}}
309 or (warn "$ob->{_name}: no such archetype", return $ob); 443 or (warn "$ob->{_name}: no such archetype", return $ob);
310 444
311 if ($arch->{type} == 22) { # map 445 if ($arch->{type} == 22) { # map
… …
347} 481}
348 482
349sub attr_thaw($) { 483sub attr_thaw($) {
350 my ($ob) = @_; 484 my ($ob) = @_;
351 485
352 $ob->{attach} = from_json $ob->{attach} 486 $ob->{attach} = decode_json $ob->{attach}
353 if exists $ob->{attach}; 487 if exists $ob->{attach};
354 488
355 $ob 489 $ob
356} 490}
357 491
358sub attr_freeze($) { 492sub attr_freeze($) {
359 my ($ob) = @_; 493 my ($ob) = @_;
360 494
361 $ob->{attach} = Crossfire::to_json $ob->{attach} 495 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
362 if exists $ob->{attach}; 496 if exists $ob->{attach};
363 497
364 $ob 498 $ob
365} 499}
366 500
… …
384sub read_arch($;$) { 518sub read_arch($;$) {
385 my ($path, $toplevel) = @_; 519 my ($path, $toplevel) = @_;
386 520
387 my %arc; 521 my %arc;
388 my ($more, $prev); 522 my ($more, $prev);
523 my $comment;
389 524
390 open my $fh, "<:raw:perlio:utf8", $path 525 open my $fh, "<:utf8", $path
391 or Carp::croak "$path: $!"; 526 or Carp::croak "$path: $!";
392 527
393# binmode $fh; 528# binmode $fh;
394 529
395 my $parse_block; $parse_block = sub { 530 my $parse_block; $parse_block = sub {
… …
397 532
398 while (<$fh>) { 533 while (<$fh>) {
399 s/\s+$//; 534 s/\s+$//;
400 if (/^end$/i) { 535 if (/^end$/i) {
401 last; 536 last;
537
402 } elsif (/^arch (\S+)$/i) { 538 } elsif (/^arch (\S+)$/i) {
403 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 539 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
540
404 } elsif (/^lore$/i) { 541 } elsif (/^lore$/i) {
405 while (<$fh>) { 542 while (<$fh>) {
406 last if /^endlore\s*$/i; 543 last if /^endlore\s*$/i;
407 $arc{lore} .= $_; 544 $arc{lore} .= $_;
408 } 545 }
… …
417 chomp; 554 chomp;
418 push @{ $arc{anim} }, $_; 555 push @{ $arc{anim} }, $_;
419 } 556 }
420 } elsif (/^(\S+)\s*(.*)$/) { 557 } elsif (/^(\S+)\s*(.*)$/) {
421 $arc{lc $1} = $2; 558 $arc{lc $1} = $2;
422 } elsif (/^\s*($|#)/) { 559 } elsif (/^\s*#/) {
560 $arc{_comment} .= "$_\n";
561
562 } elsif (/^\s*$/) {
423 # 563 #
424 } else { 564 } else {
425 warn "$path: unparsable line '$_' in arch $arc{_name}"; 565 warn "$path: unparsable line '$_' in arch $arc{_name}";
426 } 566 }
427 } 567 }
… …
433 s/\s+$//; 573 s/\s+$//;
434 if (/^more$/i) { 574 if (/^more$/i) {
435 $more = $prev; 575 $more = $prev;
436 } elsif (/^object (\S+)$/i) { 576 } elsif (/^object (\S+)$/i) {
437 my $name = $1; 577 my $name = $1;
438 my $arc = attr_thaw normalize_object $parse_block->(_name => $name); 578 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
579 undef $comment;
580 delete $arc{_comment} unless length $arc{_comment};
439 $arc->{_atype} = 'object'; 581 $arc->{_atype} = 'object';
440 582
441 if ($more) { 583 if ($more) {
442 $more->{more} = $arc; 584 $more->{more} = $arc;
443 } else { 585 } else {
… …
445 } 587 }
446 $prev = $arc; 588 $prev = $arc;
447 $more = undef; 589 $more = undef;
448 } elsif (/^arch (\S+)$/i) { 590 } elsif (/^arch (\S+)$/i) {
449 my $name = $1; 591 my $name = $1;
450 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 592 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
593 undef $comment;
594 delete $arc{_comment} unless length $arc{_comment};
451 $arc->{_atype} = 'arch'; 595 $arc->{_atype} = 'arch';
452 596
453 if ($more) { 597 if ($more) {
454 $more->{more} = $arc; 598 $more->{more} = $arc;
455 } else { 599 } else {
… …
464 push @{$toplevel->{lev_array}}, $_+0; 608 push @{$toplevel->{lev_array}}, $_+0;
465 } 609 }
466 } else { 610 } else {
467 $toplevel->{$1} = $2; 611 $toplevel->{$1} = $2;
468 } 612 }
613 } elsif (/^\s*#/) {
614 $comment .= "$_\n";
469 } elsif (/^\s*($|#)/) { 615 } elsif (/^\s*($|#)/) {
470 # 616 #
471 } else { 617 } else {
472 die "$path: unparseable top-level line '$_'"; 618 die "$path: unparseable top-level line '$_'";
473 } 619 }
… …
484 my $str; 630 my $str;
485 631
486 my $append; $append = sub { 632 my $append; $append = sub {
487 my %a = %{$_[0]}; 633 my %a = %{$_[0]};
488 634
489 Crossfire::attr_freeze \%a; 635 Deliantra::attr_freeze \%a;
490 Crossfire::normalize_arch \%a; 636 Deliantra::normalize_arch \%a;
491 637
492 # undo the bit-split we did before 638 # undo the bit-split we did before
493 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 639 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
494 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 640 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
495 | (delete $a{attack_movement_bits_4_7}); 641 | (delete $a{attack_movement_bits_4_7});
496 } 642 }
497 643
644 if (my $comment = delete $a{_comment}) {
645 if ($comment =~ /[^\n\s#]/) {
646 $str .= $comment;
647 }
648 }
649
498 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 650 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
499 651
500 my $inv = delete $a{inventory}; 652 my $inv = delete $a{inventory};
501 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 653 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
502 my $anim = delete $a{anim}; 654 my $anim = delete $a{anim};
503 655
656 if ($a{_atype} eq 'object') {
657 $str .= join "\n", "anim", @$anim, "mina\n"
658 if $anim;
659 }
660
504 my @kv; 661 my @kv;
505 662
506 for ($a{_name} eq "map" 663 for ($a{_name} eq "map"
507 ? @Crossfire::FIELD_ORDER_MAP 664 ? @Deliantra::FIELD_ORDER_MAP
508 : @Crossfire::FIELD_ORDER) { 665 : @Deliantra::FIELD_ORDER) {
509 push @kv, [$_, delete $a{$_}] 666 push @kv, [$_, delete $a{$_}]
510 if exists $a{$_}; 667 if exists $a{$_};
511 } 668 }
512 669
513 for (sort keys %a) { 670 for (sort keys %a) {
… …
516 } 673 }
517 674
518 for (@kv) { 675 for (@kv) {
519 my ($k, $v) = @$_; 676 my ($k, $v) = @$_;
520 677
521 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 678 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
522 $v =~ s/\n$//; 679 $v =~ s/\n$//;
523 $str .= "$k\n$v\n$end\n"; 680 $str .= "$k\n$v\n$end\n";
524 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
525 if ($v & ~Crossfire::MOVE_ALL or !$v) {
526 $str .= "$k $v\n";
527
528 } elsif ($v & Crossfire::MOVE_ALLBIT) {
529 $str .= "$k all";
530
531 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
532 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
533 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
534 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
535 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
536
537 $str .= "\n";
538
539 } else {
540 $str .= $k;
541
542 $str .= " walk" if $v & Crossfire::MOVE_WALK;
543 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
544 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
545 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
546 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
547
548 $str .= "\n";
549 }
550 } else { 681 } else {
551 $str .= "$k $v\n"; 682 $str .= "$k $v\n";
552 } 683 }
553 } 684 }
554 685
555 if ($inv) { 686 if ($inv) {
556 $append->($_) for @$inv; 687 $append->($_) for @$inv;
557 } 688 }
558 689
690 $str .= "end\n";
691
559 if ($a{_atype} eq 'object') { 692 if ($a{_atype} eq 'object') {
560 $str .= join "\n", "anim", @$anim, "mina\n" 693 if ($more) {
561 if $anim;
562 }
563
564 $str .= "end\n";
565
566 if (($a{_atype} eq 'object') && $more) {
567 $str .= "\nmore\n"; 694 $str .= "more\n";
568 $append->($more) if $more; 695 $append->($more) if $more;
696 } else {
697 $str .= "\n";
698 }
569 } 699 }
570 }; 700 };
571 701
572 for (@$arch) { 702 for (@$arch) {
573 $append->($_); 703 $append->($_);
… …
602 my ($a) = @_; 732 my ($a) = @_;
603 733
604 my $o = $ARCH{$a->{_name}} 734 my $o = $ARCH{$a->{_name}}
605 or return; 735 or return;
606 736
607 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 737 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
738 unless ($face) {
739 $face = $FACE{"blank.x11"}
608 or (warn "no face data found for arch '$a->{_name}'"), return; 740 or (warn "no face data found for arch '$a->{_name}'"), return;
741 }
609 742
610 if ($face->{w} > 1 || $face->{h} > 1) { 743 if ($face->{w} > 1 || $face->{h} > 1) {
611 # bigface 744 # bigface
612 return (0, 0, $face->{w} - 1, $face->{h} - 1); 745 return (0, 0, $face->{w} - 1, $face->{h} - 1);
613 746
… …
646=cut 779=cut
647 780
648sub arch_attr($) { 781sub arch_attr($) {
649 my ($obj) = @_; 782 my ($obj) = @_;
650 783
651 require Crossfire::Data; 784 require Deliantra::Data;
652 785
653 my $root; 786 my $root;
654 my $attr = { }; 787 my $attr = { };
655 788
656 my $arch = $ARCH{ $obj->{_name} }; 789 my $arch = $ARCH{ $obj->{_name} };
657 my $type = $obj->{type} || $arch->{type}; 790 my $type = $obj->{type} || $arch->{type};
658 791
659 if ($type > 0) { 792 if ($type > 0) {
660 $root = $Crossfire::Data::ATTR{$type}; 793 $root = $Deliantra::Data::ATTR{$type};
661 } else { 794 } else {
662 my %a = (%$arch, %$obj); 795 my %a = (%$arch, %$obj);
663 796
664 if ($a{is_floor} && !$a{alive}) { 797 if ($a{is_floor} && !$a{alive}) {
665 $root = $Crossfire::Data::TYPE{Floor}; 798 $root = $Deliantra::Data::TYPE{Floor};
666 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 799 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
667 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 800 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
668 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 801 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
669 $root = $Crossfire::Data::TYPE{Wall}; 802 $root = $Deliantra::Data::TYPE{Wall};
670 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 803 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
671 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 804 $root = $Deliantra::Data::TYPE{"Weak Wall"};
672 } else { 805 } else {
673 $root = $Crossfire::Data::TYPE{Misc}; 806 $root = $Deliantra::Data::TYPE{Misc};
674 } 807 }
675 } 808 }
676 809
677 my @import = ($root); 810 my @import = ($root);
678 811
679 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 812 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
680 unless $type == 116; 813 unless $type == 116;
681 814
682 my (%ignore); 815 my (%ignore);
683 my (@section_order, %section, @attr_order); 816 my (@section_order, %section, @attr_order);
684 817
685 while (my $type = shift @import) { 818 while (my $type = shift @import) {
819 push @import,
820 grep $_,
821 map $Deliantra::Data::TYPE{$_},
686 push @import, @{$type->{import} || []}; 822 @{$type->{import} || []};
687 823
688 $attr->{$_} ||= $type->{$_} 824 $attr->{$_} ||= $type->{$_}
689 for qw(name desc use); 825 for qw(name desc use);
690 826
691 for (@{$type->{ignore} || []}) { 827 for (@{$type->{ignore} || []}) {
… …
720 ]; 856 ];
721 857
722 $attr 858 $attr
723} 859}
724 860
725sub arch_edit_sections {
726# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
727# edit_type = 0;
728# else if (edit_type != 0) {
729# // all flags from 'check_type' must be unset in this arch because they get recalculated now
730# edit_type &= ~check_type;
731# }
732#
733# }
734# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
735# getAttributeValue("alive", defarch) == 1 &&
736# (getAttributeValue("monster", defarch) == 1 ||
737# getAttributeValue("generator", defarch) == 1)) {
738# // Monster: monsters/npcs/generators
739# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
740# }
741# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
742# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
743# // Walls
744# edit_type |= IGUIConstants.TILE_EDIT_WALL;
745# }
746# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
747# getAttributeValue("connected", defarch) != 0) {
748# // Connected Objects
749# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
750# }
751# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
752# arch_type == 66 || arch_type == 41 || arch_type == 95) {
753# // Exit: teleporter/exit/trapdoors
754# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
755# }
756# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
757# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
758# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
759# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
760# arch_type == 124 || arch_type == 130)) {
761# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
762# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
763# }
764# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
765# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
766# arch_type == 91 || arch_type == 21 || arch_type == 24) {
767# // Door: door/special door/gates + keys
768# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
769# }
770# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
771# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
772# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
773# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
774# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
775# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
776# arch_type == 122 || arch_type == 3)) {
777# // Equipment: weapons/armour/wands/rods
778# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
779# }
780#
781# return(edit_type);
782#
783#
784}
785
786sub cache_file($$&&) { 861sub cache_file($$&&) {
787 my ($src, $cache, $load, $create) = @_; 862 my ($src, $cache, $load, $create) = @_;
788 863
789 my ($size, $mtime) = (stat $src)[7,9] 864 my ($size, $mtime) = (stat $src)[7,9]
790 or Carp::croak "$src: $!"; 865 or Carp::croak "$src: $!";
… …
838 }, sub { 913 }, sub {
839 read_arch "$LIB/archetypes" 914 read_arch "$LIB/archetypes"
840 }; 915 };
841} 916}
842 917
918sub construct_tilecache_pb {
919 my ($idx, $cache) = @_;
920
921 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
922
923 while (my ($name, $tile) = each %$cache) {
924 my $tpb = delete $tile->{pb};
925 my $ofs = $tile->{idx};
926
927 for my $x (0 .. $tile->{w} - 1) {
928 for my $y (0 .. $tile->{h} - 1) {
929 my $idx = $ofs + $x + $y * $tile->{w};
930 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
931 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
932 }
933 }
934 }
935
936 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
937
938 $cache
939}
940
941sub use_tilecache {
942 my ($face) = @_;
943 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
944 or die "$VARDIR/tilecache.png: $!";
945 *FACE = $_[0];
946}
947
843=item load_tilecache 948=item load_tilecache
844 949
845(Re-)Load %TILE and %FACE. 950(Re-)Load %TILE and %FACE.
846 951
847=cut 952=cut
848 953
849sub load_tilecache() { 954sub load_tilecache() {
850 require Gtk2; 955 require Gtk2;
851 956
852 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 957 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
853 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
854 or die "$VARDIR/tilecache.png: $!";
855 *FACE = $_[0];
856 }, sub { 958 sub {
857 my $tile = read_pak "$LIB/crossfire.0";
858
859 my %cache; 959 my %cache;
960 my $facedata = Storable::retrieve "$LIB/facedata";
860 961
962 $facedata->{version} == 2
963 or die "$LIB/facedata: version mismatch, cannot proceed.";
964
965 my $faces = $facedata->{faceinfo};
861 my $idx = 0; 966 my $idx = 0;
862 967
863 for my $name (sort keys %$tile) { 968 for (sort keys %$faces) {
969 my ($face, $info) = ($_, $faces->{$_});
970
864 my $pb = new Gtk2::Gdk::PixbufLoader; 971 my $pb = new Gtk2::Gdk::PixbufLoader;
865 $pb->write ($tile->{$name}); 972 $pb->write ($info->{data32});
866 $pb->close; 973 $pb->close;
867 my $pb = $pb->get_pixbuf; 974 my $pb = $pb->get_pixbuf;
868 975
869 my $tile = $cache{$name} = { 976 my $tile = $cache{$face} = {
870 pb => $pb, 977 pb => $pb,
871 idx => $idx, 978 idx => $idx,
872 w => int $pb->get_width / TILESIZE, 979 w => int $pb->get_width / TILESIZE,
873 h => int $pb->get_height / TILESIZE, 980 h => int $pb->get_height / TILESIZE,
874 }; 981 };
875
876 982
877 $idx += $tile->{w} * $tile->{h}; 983 $idx += $tile->{w} * $tile->{h};
984 }
985
986 construct_tilecache_pb $idx, \%cache;
987
988 \%cache
878 } 989 };
879
880 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
881
882 while (my ($name, $tile) = each %cache) {
883 my $tpb = delete $tile->{pb};
884 my $ofs = $tile->{idx};
885
886 for my $x (0 .. $tile->{w} - 1) {
887 for my $y (0 .. $tile->{h} - 1) {
888 my $idx = $ofs + $x + $y * $tile->{w};
889 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
890 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
891 }
892 }
893 }
894
895 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
896
897 \%cache
898 };
899} 990}
900 991
901=head1 AUTHOR 992=head1 AUTHOR
902 993
903 Marc Lehmann <schmorp@schmorp.de> 994 Marc Lehmann <schmorp@schmorp.de>
… …
907 http://www.ta-sa.org/ 998 http://www.ta-sa.org/
908 999
909=cut 1000=cut
910 1001
9111 10021
1003

Diff Legend

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