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.135 by root, Tue Nov 3 14:56:58 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.9'; 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" : 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 region
62 shopitems shopgreed shopmin shopmax shoprace 62 shopitems shopgreed shopmin shopmax shoprace
63 darkness width height enter_x enter_y msg maplore 63 darkness width height enter_x enter_y msg maplore
64 unique template 64 unique template
65 outdoor temp pressure humid windspeed winddir sky nosmooth 65 outdoor temp pressure humid windspeed winddir sky nosmooth
66 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
67)); 67));
68 68
69our @FIELD_ORDER = (qw( 69our @FIELD_ORDER = (qw(
70 inherit
71
70 elevation 72 elevation
71 73
72 name name_pl custom_name attach title race 74 name name_pl custom_name attach title race
73 slaying skill msg lore other_arch face 75 slaying skill msg lore other_arch
74 #todo-events 76 sound sound_destroy face animation is_animated
75 animation is_animated 77 magicmap smoothlevel smoothface
76 str dex con wis pow cha int 78 str dex con wis pow cha int
77 hp maxhp sp maxsp grace maxgrace 79 hp maxhp sp maxsp grace maxgrace
78 exp perm_exp expmul 80 exp perm_exp expmul
79 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
80 nrof level direction type subtype attacktype 82 nrof level direction type subtype attacktype
… …
88 resist_life_stealing resist_disease 90 resist_life_stealing resist_disease
89 91
90 path_attuned path_repelled path_denied material materialname 92 path_attuned path_repelled path_denied material materialname
91 value carrying weight invisible state magic 93 value carrying weight invisible state magic
92 last_heal last_sp last_grace last_eat 94 last_heal last_sp last_grace last_eat
93 connected glow_radius randomitems npx_status npc_program 95 connected glow_radius randomitems tresure_env npx_status npc_program
94 run_away pick_up container will_apply smoothlevel 96 run_away pick_up container will_apply smoothlevel
95 current_weapon_script weapontype tooltype elevation client_type 97 current_weapon_script weapontype tooltype elevation client_type
96 item_power duration range 98 item_power duration range
97 range_modifier duration_modifier dam_modifier gen_sp_armour 99 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 100 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 111 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 112 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 113 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 114 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 115 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
116 precious
114 117
115 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
116 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
117)); 120));
118 121
… …
135sub MOVE_FLY_LOW (){ 0x02 } 138sub MOVE_FLY_LOW (){ 0x02 }
136sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
137sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
138sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
139sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
143sub MOVE_SHIP (){ 0x20 }
140sub MOVE_KNOWN (){ 0x1f } # all of above 144sub MOVE_KNOWN (){ 0x3f } # all of above
141sub MOVE_ALLBIT (){ 0x10000 }
142sub 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}
143 250
144sub load_ref($) { 251sub load_ref($) {
145 my ($path) = @_; 252 my ($path) = @_;
146 253
147 open my $fh, "<:raw:perlio", $path 254 open my $fh, "<:raw:perlio", $path
… …
197 while (my ($k, $v) = each %attack_mask) { 304 while (my ($k, $v) = each %attack_mask) {
198 $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;
199 } 306 }
200} 307}
201 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
202# object as in "Object xxx", i.e. archetypes 340# object as in "Object xxx", i.e. archetypes
203sub normalize_object($) { 341sub normalize_object($) {
204 my ($ob) = @_; 342 my ($ob) = @_;
205 343
344 delete $ob->{editable}; # deprecated
345
346 # convert material bitset to materialname, if possible
347 if (exists $ob->{material}) {
348 if (!$ob->{material}) {
349 delete $ob->{material};
350 } elsif (exists $ob->{materialname}) {
351 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
352 delete $ob->{material};
353 } else {
354 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
355 delete $ob->{material}; # assume materilname is more specific and nuke material
356 }
357 } elsif (my $name = $MATERIAL{$ob->{material}}) {
358 delete $ob->{material};
359 $ob->{materialname} = $name;
360 } else {
361 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
362 }
363 }
364
365 # check whether attachment is the same as in the archetype
366 if (exists $ob->{attach}) {
367 my $arch = $ARCH{$ob->{_name}};
368 my $js = JSON::XS->new->utf8->canonical (1);
369
370 if (defined $arch->{attach}
371 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
372 delete $ob->{attach}
373 }
374 }
375
376 # color_fg is used as default for magicmap if magicmap does not exist
377 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
378
206 # nuke outdated or never supported fields 379 # nuke outdated or never supported fields
207 delete @$ob{qw( 380 delete @$ob{qw(
208 can_knockback can_parry can_impale can_cut can_dam_armour 381 can_knockback can_parry can_impale can_cut can_dam_armour
209 can_apply pass_thru can_pass_thru 382 can_apply pass_thru can_pass_thru color_bg color_fg
210 )}; 383 )};
211 384
212 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 385 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
213 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 386 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
214 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 387 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
215 388
216 # convert movement strings to bitsets 389 # convert movement strings to bitsets
217 for my $attr (keys %FIELD_MOVEMENT) { 390 for my $attr (keys %FIELD_MOVEMENT) {
218 next unless exists $ob->{$attr}; 391 next unless exists $ob->{$attr};
219 392
220 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 393 $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 } 394 }
247 395
248 # convert outdated movement flags to new movement sets 396 # convert outdated movement flags to new movement sets
249 if (defined (my $v = delete $ob->{no_pass})) { 397 if (defined (my $v = delete $ob->{no_pass})) {
250 $ob->{move_block} = $v ? MOVE_ALL : 0; 398 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
251 } 399 }
252 if (defined (my $v = delete $ob->{slow_move})) { 400 if (defined (my $v = delete $ob->{slow_move})) {
253 $ob->{move_slow} |= MOVE_WALK; 401 $ob->{move_slow} += "walk";
254 $ob->{move_slow_penalty} = $v; 402 $ob->{move_slow_penalty} = $v;
255 } 403 }
256 if (defined (my $v = delete $ob->{walk_on})) { 404 if (defined (my $v = delete $ob->{walk_on})) {
257 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 405 $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 } 406 }
261 if (defined (my $v = delete $ob->{walk_off})) { 407 if (defined (my $v = delete $ob->{walk_off})) {
262 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 408 $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 } 409 }
266 if (defined (my $v = delete $ob->{fly_on})) { 410 if (defined (my $v = delete $ob->{fly_on})) {
267 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 411 $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 } 412 }
271 if (defined (my $v = delete $ob->{fly_off})) { 413 if (defined (my $v = delete $ob->{fly_off})) {
272 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 414 $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 } 415 }
276 if (defined (my $v = delete $ob->{flying})) { 416 if (defined (my $v = delete $ob->{flying})) {
277 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 417 $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 } 418 }
281 419
282 # convert idiotic event_xxx things into objects 420 # convert idiotic event_xxx things into objects
283 while (my ($event, $subtype) = each %EVENT_TYPE) { 421 while (my ($event, $subtype) = each %EVENT_TYPE) {
284 if (exists $ob->{"event_${event}_plugin"}) { 422 if (exists $ob->{"event_${event}_plugin"}) {
… …
300# arch as in "arch xxx", ie.. objects 438# arch as in "arch xxx", ie.. objects
301sub normalize_arch($) { 439sub normalize_arch($) {
302 my ($ob) = @_; 440 my ($ob) = @_;
303 441
304 normalize_object $ob; 442 normalize_object $ob;
443
444 return if $ob->{_atype} eq "object";
305 445
306 my $arch = $ARCH{$ob->{_name}} 446 my $arch = $ARCH{$ob->{_name}}
307 or (warn "$ob->{_name}: no such archetype", return $ob); 447 or (warn "$ob->{_name}: no such archetype", return $ob);
308 448
309 if ($arch->{type} == 22) { # map 449 if ($arch->{type} == 22) { # map
… …
345} 485}
346 486
347sub attr_thaw($) { 487sub attr_thaw($) {
348 my ($ob) = @_; 488 my ($ob) = @_;
349 489
350 $ob->{attach} = from_json $ob->{attach} 490 $ob->{attach} = decode_json $ob->{attach}
351 if exists $ob->{attach}; 491 if exists $ob->{attach};
352 492
353 $ob 493 $ob
354} 494}
355 495
356sub attr_freeze($) { 496sub attr_freeze($) {
357 my ($ob) = @_; 497 my ($ob) = @_;
358 498
359 $ob->{attach} = Crossfire::to_json $ob->{attach} 499 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
360 if exists $ob->{attach}; 500 if exists $ob->{attach};
361 501
362 $ob 502 $ob
363} 503}
364 504
… …
382sub read_arch($;$) { 522sub read_arch($;$) {
383 my ($path, $toplevel) = @_; 523 my ($path, $toplevel) = @_;
384 524
385 my %arc; 525 my %arc;
386 my ($more, $prev); 526 my ($more, $prev);
527 my $comment;
387 528
388 open my $fh, "<:raw:perlio:utf8", $path 529 open my $fh, "<:utf8", $path
389 or Carp::croak "$path: $!"; 530 or Carp::croak "$path: $!";
390 531
391# binmode $fh; 532# binmode $fh;
392 533
393 my $parse_block; $parse_block = sub { 534 my $parse_block; $parse_block = sub {
… …
395 536
396 while (<$fh>) { 537 while (<$fh>) {
397 s/\s+$//; 538 s/\s+$//;
398 if (/^end$/i) { 539 if (/^end$/i) {
399 last; 540 last;
541
400 } elsif (/^arch (\S+)$/i) { 542 } elsif (/^arch (\S+)$/i) {
401 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 543 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
544
402 } elsif (/^lore$/i) { 545 } elsif (/^lore$/i) {
403 while (<$fh>) { 546 while (<$fh>) {
404 last if /^endlore\s*$/i; 547 last if /^endlore\s*$/i;
405 $arc{lore} .= $_; 548 $arc{lore} .= $_;
406 } 549 }
… …
415 chomp; 558 chomp;
416 push @{ $arc{anim} }, $_; 559 push @{ $arc{anim} }, $_;
417 } 560 }
418 } elsif (/^(\S+)\s*(.*)$/) { 561 } elsif (/^(\S+)\s*(.*)$/) {
419 $arc{lc $1} = $2; 562 $arc{lc $1} = $2;
420 } elsif (/^\s*($|#)/) { 563 } elsif (/^\s*#/) {
564 $arc{_comment} .= "$_\n";
565
566 } elsif (/^\s*$/) {
421 # 567 #
422 } else { 568 } else {
423 warn "$path: unparsable line '$_' in arch $arc{_name}"; 569 warn "$path: unparsable line '$_' in arch $arc{_name}";
424 } 570 }
425 } 571 }
… …
431 s/\s+$//; 577 s/\s+$//;
432 if (/^more$/i) { 578 if (/^more$/i) {
433 $more = $prev; 579 $more = $prev;
434 } elsif (/^object (\S+)$/i) { 580 } elsif (/^object (\S+)$/i) {
435 my $name = $1; 581 my $name = $1;
436 my $arc = attr_thaw normalize_object $parse_block->(_name => $name); 582 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
583 undef $comment;
584 delete $arc{_comment} unless length $arc{_comment};
437 $arc->{_atype} = 'object'; 585 $arc->{_atype} = 'object';
438 586
439 if ($more) { 587 if ($more) {
440 $more->{more} = $arc; 588 $more->{more} = $arc;
441 } else { 589 } else {
… …
443 } 591 }
444 $prev = $arc; 592 $prev = $arc;
445 $more = undef; 593 $more = undef;
446 } elsif (/^arch (\S+)$/i) { 594 } elsif (/^arch (\S+)$/i) {
447 my $name = $1; 595 my $name = $1;
448 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 596 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
597 undef $comment;
598 delete $arc{_comment} unless length $arc{_comment};
449 $arc->{_atype} = 'arch'; 599 $arc->{_atype} = 'arch';
450 600
451 if ($more) { 601 if ($more) {
452 $more->{more} = $arc; 602 $more->{more} = $arc;
453 } else { 603 } else {
… …
462 push @{$toplevel->{lev_array}}, $_+0; 612 push @{$toplevel->{lev_array}}, $_+0;
463 } 613 }
464 } else { 614 } else {
465 $toplevel->{$1} = $2; 615 $toplevel->{$1} = $2;
466 } 616 }
617 } elsif (/^\s*#/) {
618 $comment .= "$_\n";
467 } elsif (/^\s*($|#)/) { 619 } elsif (/^\s*($|#)/) {
468 # 620 #
469 } else { 621 } else {
470 die "$path: unparseable top-level line '$_'"; 622 die "$path: unparseable top-level line '$_'";
471 } 623 }
… …
482 my $str; 634 my $str;
483 635
484 my $append; $append = sub { 636 my $append; $append = sub {
485 my %a = %{$_[0]}; 637 my %a = %{$_[0]};
486 638
487 Crossfire::attr_freeze \%a; 639 Deliantra::attr_freeze \%a;
488 Crossfire::normalize_arch \%a; 640 Deliantra::normalize_arch \%a;
489 641
490 # undo the bit-split we did before 642 # undo the bit-split we did before
491 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 643 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}) 644 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
493 | (delete $a{attack_movement_bits_4_7}); 645 | (delete $a{attack_movement_bits_4_7});
494 } 646 }
495 647
648 if (my $comment = delete $a{_comment}) {
649 if ($comment =~ /[^\n\s#]/) {
650 $str .= $comment;
651 }
652 }
653
496 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 654 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
497 655
498 my $inv = delete $a{inventory}; 656 my $inv = delete $a{inventory};
499 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 657 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
500 my $anim = delete $a{anim}; 658 my $anim = delete $a{anim};
501 659
660 if ($a{_atype} eq 'object') {
661 $str .= join "\n", "anim", @$anim, "mina\n"
662 if $anim;
663 }
664
502 my @kv; 665 my @kv;
503 666
504 for ($a{_name} eq "map" 667 for ($a{_name} eq "map"
505 ? @Crossfire::FIELD_ORDER_MAP 668 ? @Deliantra::FIELD_ORDER_MAP
506 : @Crossfire::FIELD_ORDER) { 669 : @Deliantra::FIELD_ORDER) {
507 push @kv, [$_, delete $a{$_}] 670 push @kv, [$_, delete $a{$_}]
508 if exists $a{$_}; 671 if exists $a{$_};
509 } 672 }
510 673
511 for (sort keys %a) { 674 for (sort keys %a) {
… …
514 } 677 }
515 678
516 for (@kv) { 679 for (@kv) {
517 my ($k, $v) = @$_; 680 my ($k, $v) = @$_;
518 681
519 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 682 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
520 $v =~ s/\n$//; 683 $v =~ s/\n$//;
521 $str .= "$k\n$v\n$end\n"; 684 $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 { 685 } else {
549 $str .= "$k $v\n"; 686 $str .= "$k $v\n";
550 } 687 }
551 } 688 }
552 689
553 if ($inv) { 690 if ($inv) {
554 $append->($_) for @$inv; 691 $append->($_) for @$inv;
555 } 692 }
556 693
694 $str .= "end\n";
695
557 if ($a{_atype} eq 'object') { 696 if ($a{_atype} eq 'object') {
558 $str .= join "\n", "anim", @$anim, "mina\n" 697 if ($more) {
559 if $anim;
560 }
561
562 $str .= "end\n";
563
564 if (($a{_atype} eq 'object') && $more) {
565 $str .= "\nmore\n"; 698 $str .= "more\n";
566 $append->($more) if $more; 699 $append->($more) if $more;
700 } else {
701 $str .= "\n";
702 }
567 } 703 }
568 }; 704 };
569 705
570 for (@$arch) { 706 for (@$arch) {
571 $append->($_); 707 $append->($_);
… …
600 my ($a) = @_; 736 my ($a) = @_;
601 737
602 my $o = $ARCH{$a->{_name}} 738 my $o = $ARCH{$a->{_name}}
603 or return; 739 or return;
604 740
605 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 741 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
742 unless ($face) {
743 $face = $FACE{"blank.x11"}
606 or (warn "no face data found for arch '$a->{_name}'"), return; 744 or (warn "no face data found for arch '$a->{_name}'"), return;
745 }
607 746
608 if ($face->{w} > 1 || $face->{h} > 1) { 747 if ($face->{w} > 1 || $face->{h} > 1) {
609 # bigface 748 # bigface
610 return (0, 0, $face->{w} - 1, $face->{h} - 1); 749 return (0, 0, $face->{w} - 1, $face->{h} - 1);
611 750
… …
644=cut 783=cut
645 784
646sub arch_attr($) { 785sub arch_attr($) {
647 my ($obj) = @_; 786 my ($obj) = @_;
648 787
649 require Crossfire::Data; 788 require Deliantra::Data;
650 789
651 my $root; 790 my $root;
652 my $attr = { }; 791 my $attr = { };
653 792
654 my $arch = $ARCH{ $obj->{_name} }; 793 my $arch = $ARCH{ $obj->{_name} };
655 my $type = $obj->{type} || $arch->{type}; 794 my $type = $obj->{type} || $arch->{type};
656 795
657 if ($type > 0) { 796 if ($type > 0) {
658 $root = $Crossfire::Data::ATTR{$type}; 797 $root = $Deliantra::Data::ATTR{$type};
659 } else { 798 } else {
660 my %a = (%$arch, %$obj); 799 my %a = (%$arch, %$obj);
661 800
662 if ($a{is_floor} && !$a{alive}) { 801 if ($a{is_floor} && !$a{alive}) {
663 $root = $Crossfire::Data::TYPE{Floor}; 802 $root = $Deliantra::Data::TYPE{Floor};
664 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 803 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
665 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 804 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
666 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 805 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
667 $root = $Crossfire::Data::TYPE{Wall}; 806 $root = $Deliantra::Data::TYPE{Wall};
668 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 807 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
669 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 808 $root = $Deliantra::Data::TYPE{"Weak Wall"};
670 } else { 809 } else {
671 $root = $Crossfire::Data::TYPE{Misc}; 810 $root = $Deliantra::Data::TYPE{Misc};
672 } 811 }
673 } 812 }
674 813
675 my @import = ($root); 814 my @import = ($root);
676 815
677 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 816 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
678 unless $type == 116; 817 unless $type == 116;
679 818
680 my (%ignore); 819 my (%ignore);
681 my (@section_order, %section, @attr_order); 820 my (@section_order, %section, @attr_order);
682 821
683 while (my $type = shift @import) { 822 while (my $type = shift @import) {
823 push @import,
824 grep $_,
825 map $Deliantra::Data::TYPE{$_},
684 push @import, @{$type->{import} || []}; 826 @{$type->{import} || []};
685 827
686 $attr->{$_} ||= $type->{$_} 828 $attr->{$_} ||= $type->{$_}
687 for qw(name desc use); 829 for qw(name desc use);
688 830
689 for (@{$type->{ignore} || []}) { 831 for (@{$type->{ignore} || []}) {
… …
718 ]; 860 ];
719 861
720 $attr 862 $attr
721} 863}
722 864
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}
783
784sub cache_file($$&&) { 865sub cache_file($$&&) {
785 my ($src, $cache, $load, $create) = @_; 866 my ($src, $cache, $load, $create) = @_;
786 867
787 my ($size, $mtime) = (stat $src)[7,9] 868 my ($size, $mtime) = (stat $src)[7,9]
788 or Carp::croak "$src: $!"; 869 or Carp::croak "$src: $!";
… …
836 }, sub { 917 }, sub {
837 read_arch "$LIB/archetypes" 918 read_arch "$LIB/archetypes"
838 }; 919 };
839} 920}
840 921
922sub construct_tilecache_pb {
923 my ($idx, $cache) = @_;
924
925 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
926
927 while (my ($name, $tile) = each %$cache) {
928 my $tpb = delete $tile->{pb};
929 my $ofs = $tile->{idx};
930
931 for my $x (0 .. $tile->{w} - 1) {
932 for my $y (0 .. $tile->{h} - 1) {
933 my $idx = $ofs + $x + $y * $tile->{w};
934 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
935 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
936 }
937 }
938 }
939
940 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
941
942 $cache
943}
944
945sub use_tilecache {
946 my ($face) = @_;
947 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
948 or die "$VARDIR/tilecache.png: $!";
949 *FACE = $_[0];
950}
951
841=item load_tilecache 952=item load_tilecache
842 953
843(Re-)Load %TILE and %FACE. 954(Re-)Load %TILE and %FACE.
844 955
845=cut 956=cut
846 957
847sub load_tilecache() { 958sub load_tilecache() {
848 require Gtk2; 959 require Gtk2;
849 960
850 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 961 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 { 962 sub {
855 my $tile = read_pak "$LIB/crossfire.0";
856
857 my %cache; 963 my %cache;
964 my $facedata = Storable::retrieve "$LIB/facedata";
858 965
966 $facedata->{version} == 2
967 or die "$LIB/facedata: version mismatch, cannot proceed.";
968
969 my $faces = $facedata->{faceinfo};
859 my $idx = 0; 970 my $idx = 0;
860 971
861 for my $name (sort keys %$tile) { 972 for (sort keys %$faces) {
973 my ($face, $info) = ($_, $faces->{$_});
974
862 my $pb = new Gtk2::Gdk::PixbufLoader; 975 my $pb = new Gtk2::Gdk::PixbufLoader;
863 $pb->write ($tile->{$name}); 976 $pb->write ($info->{data32});
864 $pb->close; 977 $pb->close;
865 my $pb = $pb->get_pixbuf; 978 my $pb = $pb->get_pixbuf;
866 979
867 my $tile = $cache{$name} = { 980 my $tile = $cache{$face} = {
868 pb => $pb, 981 pb => $pb,
869 idx => $idx, 982 idx => $idx,
870 w => int $pb->get_width / TILESIZE, 983 w => int $pb->get_width / TILESIZE,
871 h => int $pb->get_height / TILESIZE, 984 h => int $pb->get_height / TILESIZE,
872 }; 985 };
873
874 986
875 $idx += $tile->{w} * $tile->{h}; 987 $idx += $tile->{w} * $tile->{h};
988 }
989
990 construct_tilecache_pb $idx, \%cache;
991
992 \%cache
876 } 993 };
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} 994}
995
996=back
898 997
899=head1 AUTHOR 998=head1 AUTHOR
900 999
901 Marc Lehmann <schmorp@schmorp.de> 1000 Marc Lehmann <schmorp@schmorp.de>
902 http://home.schmorp.de/ 1001 http://home.schmorp.de/
… …
905 http://www.ta-sa.org/ 1004 http://www.ta-sa.org/
906 1005
907=cut 1006=cut
908 1007
9091 10081
1009

Diff Legend

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