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.75 by root, Sat Oct 14 20:33:47 2006 UTC vs.
Revision 1.134 by root, Wed Oct 28 10:17:01 2009 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire - Crossfire maphandling 3Deliantra - Deliantra suppport module to read/write archetypes, maps etc.
4
5=over 4
4 6
5=cut 7=cut
6 8
7package Crossfire; 9package Deliantra;
8 10
9our $VERSION = '0.91'; 11our $VERSION = '1.25';
10 12
11use strict; 13use common::sense;
12 14
13use base 'Exporter'; 15use base 'Exporter';
14 16
15use Carp (); 17use Carp ();
16use File::Spec; 18use File::Spec;
17use List::Util qw(min max); 19use List::Util qw(min max);
18use Storable qw(freeze thaw); 20use Storable qw(freeze thaw);
19 21
20our @EXPORT = qw( 22our @EXPORT = qw(
21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents 23 read_pak read_arch
24 *ARCH $TILE *FACE *FACEDATA
25 TILESIZE CACHESTRIDE
26 editor_archs arch_extents
22); 27);
23 28
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" 33our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 34 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
40 : File::Spec->tmpdir . "/crossfire"; 35 : File::Spec->tmpdir . "/deliantra";
41 36
42mkdir $VARDIR, 0777; 37mkdir $VARDIR, 0777;
43 38
44sub TILESIZE (){ 32 } 39sub TILESIZE (){ 32 }
40sub CACHESTRIDE (){ 64 }
45 41
46our %ARCH; 42our %ARCH;
43our %FACE; # face32
47our %FACE; 44our %FACEDATA;
48our $TILE; 45our $TILE;
49 46
50our %FIELD_MULTILINE = ( 47our %FIELD_MULTILINE = (
51 msg => "endmsg", 48 msg => "endmsg",
52 lore => "endlore", 49 lore => "endlore",
… …
58 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);
59 56
60# same as in server save routine, to (hopefully) be compatible 57# same as in server save routine, to (hopefully) be compatible
61# to the other editors. 58# to the other editors.
62our @FIELD_ORDER_MAP = (qw( 59our @FIELD_ORDER_MAP = (qw(
60 file_format_version
63 name attach swap_time reset_timeout fixed_resettime difficulty region 61 name attach swap_time reset_timeout fixed_resettime difficulty region
64 shopitems shopgreed shopmin shopmax shoprace 62 shopitems shopgreed shopmin shopmax shoprace
65 darkness width height enter_x enter_y msg maplore 63 darkness width height enter_x enter_y msg maplore
66 unique template 64 unique template
67 outdoor temp pressure humid windspeed winddir sky nosmooth 65 outdoor temp pressure humid windspeed winddir sky nosmooth
68 tile_path_1 tile_path_2 tile_path_3 tile_path_4 66 tile_path_1 tile_path_2 tile_path_3 tile_path_4
69)); 67));
70 68
71our @FIELD_ORDER = (qw( 69our @FIELD_ORDER = (qw(
70 inherit
71
72 elevation 72 elevation
73 73
74 name name_pl custom_name attach title race 74 name name_pl custom_name attach title race
75 slaying skill msg lore other_arch face 75 slaying skill msg lore other_arch
76 #todo-events 76 sound sound_destroy face animation is_animated
77 animation is_animated 77 magicmap smoothlevel smoothface
78 str dex con wis pow cha int 78 str dex con wis pow cha int
79 hp maxhp sp maxsp grace maxgrace 79 hp maxhp sp maxsp grace maxgrace
80 exp perm_exp expmul 80 exp perm_exp expmul
81 food dam luck wc ac x y speed speed_left move_state attack_movement 81 food dam luck wc ac x y speed speed_left move_state attack_movement
82 nrof level direction type subtype attacktype 82 nrof level direction type subtype attacktype
… …
90 resist_life_stealing resist_disease 90 resist_life_stealing resist_disease
91 91
92 path_attuned path_repelled path_denied material materialname 92 path_attuned path_repelled path_denied material materialname
93 value carrying weight invisible state magic 93 value carrying weight invisible state magic
94 last_heal last_sp last_grace last_eat 94 last_heal last_sp last_grace last_eat
95 connected glow_radius randomitems npx_status npc_program 95 connected glow_radius randomitems tresure_env npx_status npc_program
96 run_away pick_up container will_apply smoothlevel 96 run_away pick_up container will_apply smoothlevel
97 current_weapon_script weapontype tooltype elevation client_type 97 current_weapon_script weapontype tooltype elevation client_type
98 item_power duration range 98 item_power duration range
99 range_modifier duration_modifier dam_modifier gen_sp_armour 99 range_modifier duration_modifier dam_modifier gen_sp_armour
100 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty 100 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 111 known_magical known_cursed can_use_skill been_applied has_ready_scroll
112 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly 112 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
113 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark 113 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
114 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage 114 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
115 activate_on_push activate_on_release is_water use_content_on_gen is_buildable 115 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
116 precious
116 117
117 body_range body_arm body_torso body_head body_neck body_skill 118 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 119 body_finger body_shoulder body_foot body_hand body_wrist body_waist
119)); 120));
120 121
… …
137sub MOVE_FLY_LOW (){ 0x02 } 138sub MOVE_FLY_LOW (){ 0x02 }
138sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
139sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
140sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
141sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
143sub MOVE_SHIP (){ 0x20 }
142sub MOVE_KNOWN (){ 0x1f } # all of above 144sub MOVE_KNOWN (){ 0x3f } # all of above
143sub MOVE_ALLBIT (){ 0x10000 }
144sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 145sub MOVE_ALL (){ 0x10000 } # very special value
146
147our %MOVE_TYPE = (
148 walk => MOVE_WALK,
149 fly_low => MOVE_FLY_LOW,
150 fly_high => MOVE_FLY_HIGH,
151 flying => MOVE_FLYING,
152 swim => MOVE_SWIM,
153 boat => MOVE_BOAT,
154 ship => MOVE_SHIP,
155 all => MOVE_ALL,
156);
157
158our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
159
160{
161 package Deliantra::MoveType;
162
163 use overload
164 '=' => sub { bless [@{$_[0]}], ref $_[0] },
165 '""' => \&as_string,
166 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
167 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
168 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
169 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
170 'x=' => sub {
171 my $cur = $_[0] >= $_[1];
172 if (!defined $cur) {
173 if ($_[0] >= "all") {
174 $_[0] -= $_[1];
175 } else {
176 $_[0] += $_[1];
177 }
178 } elsif ($cur) {
179 $_[0] -= $_[1];
180 } else {
181 $_[0] /= $_[1];
182 }
183
184 $_[0]
185 },
186 'eq' => sub { "$_[0]" eq "$_[1]" },
187 'ne' => sub { "$_[0]" ne "$_[1]" },
188 ;
189
190 sub TO_JSON {
191 $_[0][0]
192 }
193}
194
195sub Deliantra::MoveType::new {
196 my ($class, $string) = @_;
197
198 my $mask;
199 my $value;
200
201 if ($string =~ /^\s*\d+\s*$/) {
202 $mask = MOVE_ALL;
203 $value = $string+0;
204 } else {
205 for (split /\s+/, lc $string) {
206 if (s/^-//) {
207 $mask |= $MOVE_TYPE{$_};
208 $value &= ~$MOVE_TYPE{$_};
209 } else {
210 $mask |= $MOVE_TYPE{$_};
211 $value |= $MOVE_TYPE{$_};
212 }
213 }
214 }
215
216 (bless [$mask, $value], $class)->normalise
217}
218
219sub Deliantra::MoveType::normalise {
220 my ($self) = @_;
221
222 if ($self->[0] & MOVE_ALL) {
223 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
224 $self->[0] &= $mask;
225 $self->[1] &= $mask;
226 }
227
228 $self->[1] &= $self->[0];
229
230 $self
231}
232
233sub Deliantra::MoveType::as_string {
234 my ($self) = @_;
235
236 my @res;
237
238 my ($mask, $value) = @$self;
239
240 for (@Deliantra::MOVE_TYPE) {
241 my $bit = $Deliantra::MOVE_TYPE{$_};
242 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
243 $mask &= ~$bit;
244 push @res, $value & $bit ? $_ : "-$_";
245 }
246 }
247
248 join " ", @res
249}
145 250
146sub load_ref($) { 251sub load_ref($) {
147 my ($path) = @_; 252 my ($path) = @_;
148 253
149 open my $fh, "<:raw:perlio", $path 254 open my $fh, "<:raw:perlio", $path
… …
199 while (my ($k, $v) = each %attack_mask) { 304 while (my ($k, $v) = each %attack_mask) {
200 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v; 305 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
201 } 306 }
202} 307}
203 308
309my %MATERIAL = reverse
310 paper => 1,
311 iron => 2,
312 glass => 4,
313 leather => 8,
314 wood => 16,
315 organic => 32,
316 stone => 64,
317 cloth => 128,
318 adamant => 256,
319 liquid => 512,
320 tin => 1024,
321 bone => 2048,
322 ice => 4096,
323
324 # guesses
325 runestone => 12,
326 bronze => 18,
327 "ancient wood" => 20,
328 glass => 36,
329 marble => 66,
330 ice => 68,
331 stone => 70,
332 stone => 80,
333 cloth => 136,
334 ironwood => 144,
335 adamantium => 258,
336 glacium => 260,
337 blood => 544,
338;
339
204# object as in "Object xxx", i.e. archetypes 340# object as in "Object xxx", i.e. archetypes
205sub normalize_object($) { 341sub normalize_object($) {
206 my ($ob) = @_; 342 my ($ob) = @_;
207 343
344 # convert material bitset to materialname, if possible
345 if (exists $ob->{material}) {
346 if (!$ob->{material}) {
347 delete $ob->{material};
348 } elsif (exists $ob->{materialname}) {
349 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
350 delete $ob->{material};
351 } else {
352 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
353 delete $ob->{material}; # assume materilname is more specific and nuke material
354 }
355 } elsif (my $name = $MATERIAL{$ob->{material}}) {
356 delete $ob->{material};
357 $ob->{materialname} = $name;
358 } else {
359 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
360 }
361 }
362
363 # check whether attachment is the same as in the archetype
364 if (exists $ob->{attach}) {
365 my $arch = $ARCH{$ob->{_name}};
366 my $js = JSON::XS->new->utf8->canonical (1);
367
368 if (defined $arch->{attach}
369 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
370 delete $ob->{attach}
371 }
372 }
373
374 # color_fg is used as default for magicmap if magicmap does not exist
375 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
376
208 # nuke outdated or never supported fields 377 # nuke outdated or never supported fields
209 delete @$ob{qw( 378 delete @$ob{qw(
210 can_knockback can_parry can_impale can_cut can_dam_armour 379 can_knockback can_parry can_impale can_cut can_dam_armour
211 can_apply pass_thru can_pass_thru 380 can_apply pass_thru can_pass_thru color_bg color_fg
212 )}; 381 )};
213 382
214 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 383 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
215 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 384 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
216 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 385 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
217 386
218 # convert movement strings to bitsets 387 # convert movement strings to bitsets
219 for my $attr (keys %FIELD_MOVEMENT) { 388 for my $attr (keys %FIELD_MOVEMENT) {
220 next unless exists $ob->{$attr}; 389 next unless exists $ob->{$attr};
221 390
222 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 391 $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 } 392 }
249 393
250 # convert outdated movement flags to new movement sets 394 # convert outdated movement flags to new movement sets
251 if (defined (my $v = delete $ob->{no_pass})) { 395 if (defined (my $v = delete $ob->{no_pass})) {
252 $ob->{move_block} = $v ? MOVE_ALL : 0; 396 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
253 } 397 }
254 if (defined (my $v = delete $ob->{slow_move})) { 398 if (defined (my $v = delete $ob->{slow_move})) {
255 $ob->{move_slow} |= MOVE_WALK; 399 $ob->{move_slow} += "walk";
256 $ob->{move_slow_penalty} = $v; 400 $ob->{move_slow_penalty} = $v;
257 } 401 }
258 if (defined (my $v = delete $ob->{walk_on})) { 402 if (defined (my $v = delete $ob->{walk_on})) {
259 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 403 $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 } 404 }
263 if (defined (my $v = delete $ob->{walk_off})) { 405 if (defined (my $v = delete $ob->{walk_off})) {
264 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 406 $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 } 407 }
268 if (defined (my $v = delete $ob->{fly_on})) { 408 if (defined (my $v = delete $ob->{fly_on})) {
269 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 409 $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 } 410 }
273 if (defined (my $v = delete $ob->{fly_off})) { 411 if (defined (my $v = delete $ob->{fly_off})) {
274 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 412 $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 } 413 }
278 if (defined (my $v = delete $ob->{flying})) { 414 if (defined (my $v = delete $ob->{flying})) {
279 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 415 $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 } 416 }
283 417
284 # convert idiotic event_xxx things into objects 418 # convert idiotic event_xxx things into objects
285 while (my ($event, $subtype) = each %EVENT_TYPE) { 419 while (my ($event, $subtype) = each %EVENT_TYPE) {
286 if (exists $ob->{"event_${event}_plugin"}) { 420 if (exists $ob->{"event_${event}_plugin"}) {
… …
302# arch as in "arch xxx", ie.. objects 436# arch as in "arch xxx", ie.. objects
303sub normalize_arch($) { 437sub normalize_arch($) {
304 my ($ob) = @_; 438 my ($ob) = @_;
305 439
306 normalize_object $ob; 440 normalize_object $ob;
441
442 return if $ob->{_atype} eq "object";
307 443
308 my $arch = $ARCH{$ob->{_name}} 444 my $arch = $ARCH{$ob->{_name}}
309 or (warn "$ob->{_name}: no such archetype", return $ob); 445 or (warn "$ob->{_name}: no such archetype", return $ob);
310 446
311 if ($arch->{type} == 22) { # map 447 if ($arch->{type} == 22) { # map
… …
347} 483}
348 484
349sub attr_thaw($) { 485sub attr_thaw($) {
350 my ($ob) = @_; 486 my ($ob) = @_;
351 487
352 $ob->{attach} = from_json $ob->{attach} 488 $ob->{attach} = decode_json $ob->{attach}
353 if exists $ob->{attach}; 489 if exists $ob->{attach};
354 490
355 $ob 491 $ob
356} 492}
357 493
358sub attr_freeze($) { 494sub attr_freeze($) {
359 my ($ob) = @_; 495 my ($ob) = @_;
360 496
361 $ob->{attach} = Crossfire::to_json $ob->{attach} 497 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
362 if exists $ob->{attach}; 498 if exists $ob->{attach};
363 499
364 $ob 500 $ob
365} 501}
366 502
… …
384sub read_arch($;$) { 520sub read_arch($;$) {
385 my ($path, $toplevel) = @_; 521 my ($path, $toplevel) = @_;
386 522
387 my %arc; 523 my %arc;
388 my ($more, $prev); 524 my ($more, $prev);
525 my $comment;
389 526
390 open my $fh, "<:raw:perlio:utf8", $path 527 open my $fh, "<:utf8", $path
391 or Carp::croak "$path: $!"; 528 or Carp::croak "$path: $!";
392 529
393# binmode $fh; 530# binmode $fh;
394 531
395 my $parse_block; $parse_block = sub { 532 my $parse_block; $parse_block = sub {
… …
397 534
398 while (<$fh>) { 535 while (<$fh>) {
399 s/\s+$//; 536 s/\s+$//;
400 if (/^end$/i) { 537 if (/^end$/i) {
401 last; 538 last;
539
402 } elsif (/^arch (\S+)$/i) { 540 } elsif (/^arch (\S+)$/i) {
403 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 541 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
542
404 } elsif (/^lore$/i) { 543 } elsif (/^lore$/i) {
405 while (<$fh>) { 544 while (<$fh>) {
406 last if /^endlore\s*$/i; 545 last if /^endlore\s*$/i;
407 $arc{lore} .= $_; 546 $arc{lore} .= $_;
408 } 547 }
… …
417 chomp; 556 chomp;
418 push @{ $arc{anim} }, $_; 557 push @{ $arc{anim} }, $_;
419 } 558 }
420 } elsif (/^(\S+)\s*(.*)$/) { 559 } elsif (/^(\S+)\s*(.*)$/) {
421 $arc{lc $1} = $2; 560 $arc{lc $1} = $2;
422 } elsif (/^\s*($|#)/) { 561 } elsif (/^\s*#/) {
562 $arc{_comment} .= "$_\n";
563
564 } elsif (/^\s*$/) {
423 # 565 #
424 } else { 566 } else {
425 warn "$path: unparsable line '$_' in arch $arc{_name}"; 567 warn "$path: unparsable line '$_' in arch $arc{_name}";
426 } 568 }
427 } 569 }
… …
433 s/\s+$//; 575 s/\s+$//;
434 if (/^more$/i) { 576 if (/^more$/i) {
435 $more = $prev; 577 $more = $prev;
436 } elsif (/^object (\S+)$/i) { 578 } elsif (/^object (\S+)$/i) {
437 my $name = $1; 579 my $name = $1;
438 my $arc = attr_thaw normalize_object $parse_block->(_name => $name); 580 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
581 undef $comment;
582 delete $arc{_comment} unless length $arc{_comment};
439 $arc->{_atype} = 'object'; 583 $arc->{_atype} = 'object';
440 584
441 if ($more) { 585 if ($more) {
442 $more->{more} = $arc; 586 $more->{more} = $arc;
443 } else { 587 } else {
… …
445 } 589 }
446 $prev = $arc; 590 $prev = $arc;
447 $more = undef; 591 $more = undef;
448 } elsif (/^arch (\S+)$/i) { 592 } elsif (/^arch (\S+)$/i) {
449 my $name = $1; 593 my $name = $1;
450 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 594 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
595 undef $comment;
596 delete $arc{_comment} unless length $arc{_comment};
451 $arc->{_atype} = 'arch'; 597 $arc->{_atype} = 'arch';
452 598
453 if ($more) { 599 if ($more) {
454 $more->{more} = $arc; 600 $more->{more} = $arc;
455 } else { 601 } else {
… …
464 push @{$toplevel->{lev_array}}, $_+0; 610 push @{$toplevel->{lev_array}}, $_+0;
465 } 611 }
466 } else { 612 } else {
467 $toplevel->{$1} = $2; 613 $toplevel->{$1} = $2;
468 } 614 }
615 } elsif (/^\s*#/) {
616 $comment .= "$_\n";
469 } elsif (/^\s*($|#)/) { 617 } elsif (/^\s*($|#)/) {
470 # 618 #
471 } else { 619 } else {
472 die "$path: unparseable top-level line '$_'"; 620 die "$path: unparseable top-level line '$_'";
473 } 621 }
… …
484 my $str; 632 my $str;
485 633
486 my $append; $append = sub { 634 my $append; $append = sub {
487 my %a = %{$_[0]}; 635 my %a = %{$_[0]};
488 636
489 Crossfire::attr_freeze \%a; 637 Deliantra::attr_freeze \%a;
490 Crossfire::normalize_arch \%a; 638 Deliantra::normalize_arch \%a;
491 639
492 # undo the bit-split we did before 640 # undo the bit-split we did before
493 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 641 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}) 642 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
495 | (delete $a{attack_movement_bits_4_7}); 643 | (delete $a{attack_movement_bits_4_7});
496 } 644 }
497 645
646 if (my $comment = delete $a{_comment}) {
647 if ($comment =~ /[^\n\s#]/) {
648 $str .= $comment;
649 }
650 }
651
498 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 652 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
499 653
500 my $inv = delete $a{inventory}; 654 my $inv = delete $a{inventory};
501 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 655 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
502 my $anim = delete $a{anim}; 656 my $anim = delete $a{anim};
503 657
658 if ($a{_atype} eq 'object') {
659 $str .= join "\n", "anim", @$anim, "mina\n"
660 if $anim;
661 }
662
504 my @kv; 663 my @kv;
505 664
506 for ($a{_name} eq "map" 665 for ($a{_name} eq "map"
507 ? @Crossfire::FIELD_ORDER_MAP 666 ? @Deliantra::FIELD_ORDER_MAP
508 : @Crossfire::FIELD_ORDER) { 667 : @Deliantra::FIELD_ORDER) {
509 push @kv, [$_, delete $a{$_}] 668 push @kv, [$_, delete $a{$_}]
510 if exists $a{$_}; 669 if exists $a{$_};
511 } 670 }
512 671
513 for (sort keys %a) { 672 for (sort keys %a) {
… …
516 } 675 }
517 676
518 for (@kv) { 677 for (@kv) {
519 my ($k, $v) = @$_; 678 my ($k, $v) = @$_;
520 679
521 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 680 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
522 $v =~ s/\n$//; 681 $v =~ s/\n$//;
523 $str .= "$k\n$v\n$end\n"; 682 $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 { 683 } else {
551 $str .= "$k $v\n"; 684 $str .= "$k $v\n";
552 } 685 }
553 } 686 }
554 687
555 if ($inv) { 688 if ($inv) {
556 $append->($_) for @$inv; 689 $append->($_) for @$inv;
557 } 690 }
558 691
692 $str .= "end\n";
693
559 if ($a{_atype} eq 'object') { 694 if ($a{_atype} eq 'object') {
560 $str .= join "\n", "anim", @$anim, "mina\n" 695 if ($more) {
561 if $anim;
562 }
563
564 $str .= "end\n";
565
566 if (($a{_atype} eq 'object') && $more) {
567 $str .= "\nmore\n"; 696 $str .= "more\n";
568 $append->($more) if $more; 697 $append->($more) if $more;
698 } else {
699 $str .= "\n";
700 }
569 } 701 }
570 }; 702 };
571 703
572 for (@$arch) { 704 for (@$arch) {
573 $append->($_); 705 $append->($_);
… …
602 my ($a) = @_; 734 my ($a) = @_;
603 735
604 my $o = $ARCH{$a->{_name}} 736 my $o = $ARCH{$a->{_name}}
605 or return; 737 or return;
606 738
607 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 739 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
740 unless ($face) {
741 $face = $FACE{"blank.x11"}
608 or (warn "no face data found for arch '$a->{_name}'"), return; 742 or (warn "no face data found for arch '$a->{_name}'"), return;
743 }
609 744
610 if ($face->{w} > 1 || $face->{h} > 1) { 745 if ($face->{w} > 1 || $face->{h} > 1) {
611 # bigface 746 # bigface
612 return (0, 0, $face->{w} - 1, $face->{h} - 1); 747 return (0, 0, $face->{w} - 1, $face->{h} - 1);
613 748
… …
646=cut 781=cut
647 782
648sub arch_attr($) { 783sub arch_attr($) {
649 my ($obj) = @_; 784 my ($obj) = @_;
650 785
651 require Crossfire::Data; 786 require Deliantra::Data;
652 787
653 my $root; 788 my $root;
654 my $attr = { }; 789 my $attr = { };
655 790
656 my $arch = $ARCH{ $obj->{_name} }; 791 my $arch = $ARCH{ $obj->{_name} };
657 my $type = $obj->{type} || $arch->{type}; 792 my $type = $obj->{type} || $arch->{type};
658 793
659 if ($type > 0) { 794 if ($type > 0) {
660 $root = $Crossfire::Data::ATTR{$type}; 795 $root = $Deliantra::Data::ATTR{$type};
661 } else { 796 } else {
662 my %a = (%$arch, %$obj); 797 my %a = (%$arch, %$obj);
663 798
664 if ($a{is_floor} && !$a{alive}) { 799 if ($a{is_floor} && !$a{alive}) {
665 $root = $Crossfire::Data::TYPE{Floor}; 800 $root = $Deliantra::Data::TYPE{Floor};
666 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 801 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
667 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 802 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
668 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 803 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
669 $root = $Crossfire::Data::TYPE{Wall}; 804 $root = $Deliantra::Data::TYPE{Wall};
670 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 805 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
671 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 806 $root = $Deliantra::Data::TYPE{"Weak Wall"};
672 } else { 807 } else {
673 $root = $Crossfire::Data::TYPE{Misc}; 808 $root = $Deliantra::Data::TYPE{Misc};
674 } 809 }
675 } 810 }
676 811
677 my @import = ($root); 812 my @import = ($root);
678 813
679 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 814 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
680 unless $type == 116; 815 unless $type == 116;
681 816
682 my (%ignore); 817 my (%ignore);
683 my (@section_order, %section, @attr_order); 818 my (@section_order, %section, @attr_order);
684 819
685 while (my $type = shift @import) { 820 while (my $type = shift @import) {
821 push @import,
822 grep $_,
823 map $Deliantra::Data::TYPE{$_},
686 push @import, @{$type->{import} || []}; 824 @{$type->{import} || []};
687 825
688 $attr->{$_} ||= $type->{$_} 826 $attr->{$_} ||= $type->{$_}
689 for qw(name desc use); 827 for qw(name desc use);
690 828
691 for (@{$type->{ignore} || []}) { 829 for (@{$type->{ignore} || []}) {
… …
720 ]; 858 ];
721 859
722 $attr 860 $attr
723} 861}
724 862
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($$&&) { 863sub cache_file($$&&) {
787 my ($src, $cache, $load, $create) = @_; 864 my ($src, $cache, $load, $create) = @_;
788 865
789 my ($size, $mtime) = (stat $src)[7,9] 866 my ($size, $mtime) = (stat $src)[7,9]
790 or Carp::croak "$src: $!"; 867 or Carp::croak "$src: $!";
… …
838 }, sub { 915 }, sub {
839 read_arch "$LIB/archetypes" 916 read_arch "$LIB/archetypes"
840 }; 917 };
841} 918}
842 919
920sub construct_tilecache_pb {
921 my ($idx, $cache) = @_;
922
923 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
924
925 while (my ($name, $tile) = each %$cache) {
926 my $tpb = delete $tile->{pb};
927 my $ofs = $tile->{idx};
928
929 for my $x (0 .. $tile->{w} - 1) {
930 for my $y (0 .. $tile->{h} - 1) {
931 my $idx = $ofs + $x + $y * $tile->{w};
932 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
933 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
934 }
935 }
936 }
937
938 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
939
940 $cache
941}
942
943sub use_tilecache {
944 my ($face) = @_;
945 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
946 or die "$VARDIR/tilecache.png: $!";
947 *FACE = $_[0];
948}
949
843=item load_tilecache 950=item load_tilecache
844 951
845(Re-)Load %TILE and %FACE. 952(Re-)Load %TILE and %FACE.
846 953
847=cut 954=cut
848 955
849sub load_tilecache() { 956sub load_tilecache() {
850 require Gtk2; 957 require Gtk2;
851 958
852 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 959 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 { 960 sub {
857 my $tile = read_pak "$LIB/crossfire.0";
858
859 my %cache; 961 my %cache;
962 my $facedata = Storable::retrieve "$LIB/facedata";
860 963
964 $facedata->{version} == 2
965 or die "$LIB/facedata: version mismatch, cannot proceed.";
966
967 my $faces = $facedata->{faceinfo};
861 my $idx = 0; 968 my $idx = 0;
862 969
863 for my $name (sort keys %$tile) { 970 for (sort keys %$faces) {
971 my ($face, $info) = ($_, $faces->{$_});
972
864 my $pb = new Gtk2::Gdk::PixbufLoader; 973 my $pb = new Gtk2::Gdk::PixbufLoader;
865 $pb->write ($tile->{$name}); 974 $pb->write ($info->{data32});
866 $pb->close; 975 $pb->close;
867 my $pb = $pb->get_pixbuf; 976 my $pb = $pb->get_pixbuf;
868 977
869 my $tile = $cache{$name} = { 978 my $tile = $cache{$face} = {
870 pb => $pb, 979 pb => $pb,
871 idx => $idx, 980 idx => $idx,
872 w => int $pb->get_width / TILESIZE, 981 w => int $pb->get_width / TILESIZE,
873 h => int $pb->get_height / TILESIZE, 982 h => int $pb->get_height / TILESIZE,
874 }; 983 };
875
876 984
877 $idx += $tile->{w} * $tile->{h}; 985 $idx += $tile->{w} * $tile->{h};
986 }
987
988 construct_tilecache_pb $idx, \%cache;
989
990 \%cache
878 } 991 };
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} 992}
993
994=back
900 995
901=head1 AUTHOR 996=head1 AUTHOR
902 997
903 Marc Lehmann <schmorp@schmorp.de> 998 Marc Lehmann <schmorp@schmorp.de>
904 http://home.schmorp.de/ 999 http://home.schmorp.de/
… …
907 http://www.ta-sa.org/ 1002 http://www.ta-sa.org/
908 1003
909=cut 1004=cut
910 1005
9111 10061
1007

Diff Legend

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