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.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.96'; 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 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
208 # nuke outdated or never supported fields 379 # nuke outdated or never supported fields
209 delete @$ob{qw( 380 delete @$ob{qw(
210 can_knockback can_parry can_impale can_cut can_dam_armour 381 can_knockback can_parry can_impale can_cut can_dam_armour
211 can_apply pass_thru can_pass_thru 382 can_apply pass_thru can_pass_thru color_bg color_fg
212 )}; 383 )};
213 384
214 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 385 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
215 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 386 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
216 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 387 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
217 388
218 # convert movement strings to bitsets 389 # convert movement strings to bitsets
219 for my $attr (keys %FIELD_MOVEMENT) { 390 for my $attr (keys %FIELD_MOVEMENT) {
220 next unless exists $ob->{$attr}; 391 next unless exists $ob->{$attr};
221 392
222 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 393 $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 } 394 }
249 395
250 # convert outdated movement flags to new movement sets 396 # convert outdated movement flags to new movement sets
251 if (defined (my $v = delete $ob->{no_pass})) { 397 if (defined (my $v = delete $ob->{no_pass})) {
252 $ob->{move_block} = $v ? MOVE_ALL : 0; 398 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
253 } 399 }
254 if (defined (my $v = delete $ob->{slow_move})) { 400 if (defined (my $v = delete $ob->{slow_move})) {
255 $ob->{move_slow} |= MOVE_WALK; 401 $ob->{move_slow} += "walk";
256 $ob->{move_slow_penalty} = $v; 402 $ob->{move_slow_penalty} = $v;
257 } 403 }
258 if (defined (my $v = delete $ob->{walk_on})) { 404 if (defined (my $v = delete $ob->{walk_on})) {
259 $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" }
260 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
261 : $ob->{move_on} & ~MOVE_WALK;
262 } 406 }
263 if (defined (my $v = delete $ob->{walk_off})) { 407 if (defined (my $v = delete $ob->{walk_off})) {
264 $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" }
265 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
266 : $ob->{move_off} & ~MOVE_WALK;
267 } 409 }
268 if (defined (my $v = delete $ob->{fly_on})) { 410 if (defined (my $v = delete $ob->{fly_on})) {
269 $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" }
270 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
271 : $ob->{move_on} & ~MOVE_FLY_LOW;
272 } 412 }
273 if (defined (my $v = delete $ob->{fly_off})) { 413 if (defined (my $v = delete $ob->{fly_off})) {
274 $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" }
275 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
276 : $ob->{move_off} & ~MOVE_FLY_LOW;
277 } 415 }
278 if (defined (my $v = delete $ob->{flying})) { 416 if (defined (my $v = delete $ob->{flying})) {
279 $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" }
280 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
281 : $ob->{move_type} & ~MOVE_FLY_LOW;
282 } 418 }
283 419
284 # convert idiotic event_xxx things into objects 420 # convert idiotic event_xxx things into objects
285 while (my ($event, $subtype) = each %EVENT_TYPE) { 421 while (my ($event, $subtype) = each %EVENT_TYPE) {
286 if (exists $ob->{"event_${event}_plugin"}) { 422 if (exists $ob->{"event_${event}_plugin"}) {
… …
302# arch as in "arch xxx", ie.. objects 438# arch as in "arch xxx", ie.. objects
303sub normalize_arch($) { 439sub normalize_arch($) {
304 my ($ob) = @_; 440 my ($ob) = @_;
305 441
306 normalize_object $ob; 442 normalize_object $ob;
443
444 return if $ob->{_atype} eq "object";
307 445
308 my $arch = $ARCH{$ob->{_name}} 446 my $arch = $ARCH{$ob->{_name}}
309 or (warn "$ob->{_name}: no such archetype", return $ob); 447 or (warn "$ob->{_name}: no such archetype", return $ob);
310 448
311 if ($arch->{type} == 22) { # map 449 if ($arch->{type} == 22) { # map
… …
347} 485}
348 486
349sub attr_thaw($) { 487sub attr_thaw($) {
350 my ($ob) = @_; 488 my ($ob) = @_;
351 489
352 $ob->{attach} = from_json $ob->{attach} 490 $ob->{attach} = decode_json $ob->{attach}
353 if exists $ob->{attach}; 491 if exists $ob->{attach};
354 492
355 $ob 493 $ob
356} 494}
357 495
358sub attr_freeze($) { 496sub attr_freeze($) {
359 my ($ob) = @_; 497 my ($ob) = @_;
360 498
361 $ob->{attach} = Crossfire::to_json $ob->{attach} 499 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
362 if exists $ob->{attach}; 500 if exists $ob->{attach};
363 501
364 $ob 502 $ob
365} 503}
366 504
… …
384sub read_arch($;$) { 522sub read_arch($;$) {
385 my ($path, $toplevel) = @_; 523 my ($path, $toplevel) = @_;
386 524
387 my %arc; 525 my %arc;
388 my ($more, $prev); 526 my ($more, $prev);
527 my $comment;
389 528
390 open my $fh, "<:raw:perlio:utf8", $path 529 open my $fh, "<:utf8", $path
391 or Carp::croak "$path: $!"; 530 or Carp::croak "$path: $!";
392 531
393# binmode $fh; 532# binmode $fh;
394 533
395 my $parse_block; $parse_block = sub { 534 my $parse_block; $parse_block = sub {
… …
397 536
398 while (<$fh>) { 537 while (<$fh>) {
399 s/\s+$//; 538 s/\s+$//;
400 if (/^end$/i) { 539 if (/^end$/i) {
401 last; 540 last;
541
402 } elsif (/^arch (\S+)$/i) { 542 } elsif (/^arch (\S+)$/i) {
403 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 543 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
544
404 } elsif (/^lore$/i) { 545 } elsif (/^lore$/i) {
405 while (<$fh>) { 546 while (<$fh>) {
406 last if /^endlore\s*$/i; 547 last if /^endlore\s*$/i;
407 $arc{lore} .= $_; 548 $arc{lore} .= $_;
408 } 549 }
… …
417 chomp; 558 chomp;
418 push @{ $arc{anim} }, $_; 559 push @{ $arc{anim} }, $_;
419 } 560 }
420 } elsif (/^(\S+)\s*(.*)$/) { 561 } elsif (/^(\S+)\s*(.*)$/) {
421 $arc{lc $1} = $2; 562 $arc{lc $1} = $2;
422 } elsif (/^\s*($|#)/) { 563 } elsif (/^\s*#/) {
564 $arc{_comment} .= "$_\n";
565
566 } elsif (/^\s*$/) {
423 # 567 #
424 } else { 568 } else {
425 warn "$path: unparsable line '$_' in arch $arc{_name}"; 569 warn "$path: unparsable line '$_' in arch $arc{_name}";
426 } 570 }
427 } 571 }
… …
433 s/\s+$//; 577 s/\s+$//;
434 if (/^more$/i) { 578 if (/^more$/i) {
435 $more = $prev; 579 $more = $prev;
436 } elsif (/^object (\S+)$/i) { 580 } elsif (/^object (\S+)$/i) {
437 my $name = $1; 581 my $name = $1;
438 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};
439 $arc->{_atype} = 'object'; 585 $arc->{_atype} = 'object';
440 586
441 if ($more) { 587 if ($more) {
442 $more->{more} = $arc; 588 $more->{more} = $arc;
443 } else { 589 } else {
… …
445 } 591 }
446 $prev = $arc; 592 $prev = $arc;
447 $more = undef; 593 $more = undef;
448 } elsif (/^arch (\S+)$/i) { 594 } elsif (/^arch (\S+)$/i) {
449 my $name = $1; 595 my $name = $1;
450 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};
451 $arc->{_atype} = 'arch'; 599 $arc->{_atype} = 'arch';
452 600
453 if ($more) { 601 if ($more) {
454 $more->{more} = $arc; 602 $more->{more} = $arc;
455 } else { 603 } else {
… …
464 push @{$toplevel->{lev_array}}, $_+0; 612 push @{$toplevel->{lev_array}}, $_+0;
465 } 613 }
466 } else { 614 } else {
467 $toplevel->{$1} = $2; 615 $toplevel->{$1} = $2;
468 } 616 }
617 } elsif (/^\s*#/) {
618 $comment .= "$_\n";
469 } elsif (/^\s*($|#)/) { 619 } elsif (/^\s*($|#)/) {
470 # 620 #
471 } else { 621 } else {
472 die "$path: unparseable top-level line '$_'"; 622 die "$path: unparseable top-level line '$_'";
473 } 623 }
… …
484 my $str; 634 my $str;
485 635
486 my $append; $append = sub { 636 my $append; $append = sub {
487 my %a = %{$_[0]}; 637 my %a = %{$_[0]};
488 638
489 Crossfire::attr_freeze \%a; 639 Deliantra::attr_freeze \%a;
490 Crossfire::normalize_arch \%a; 640 Deliantra::normalize_arch \%a;
491 641
492 # undo the bit-split we did before 642 # undo the bit-split we did before
493 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}) {
494 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 644 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
495 | (delete $a{attack_movement_bits_4_7}); 645 | (delete $a{attack_movement_bits_4_7});
496 } 646 }
497 647
648 if (my $comment = delete $a{_comment}) {
649 if ($comment =~ /[^\n\s#]/) {
650 $str .= $comment;
651 }
652 }
653
498 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 654 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
499 655
500 my $inv = delete $a{inventory}; 656 my $inv = delete $a{inventory};
501 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
502 my $anim = delete $a{anim}; 658 my $anim = delete $a{anim};
503 659
660 if ($a{_atype} eq 'object') {
661 $str .= join "\n", "anim", @$anim, "mina\n"
662 if $anim;
663 }
664
504 my @kv; 665 my @kv;
505 666
506 for ($a{_name} eq "map" 667 for ($a{_name} eq "map"
507 ? @Crossfire::FIELD_ORDER_MAP 668 ? @Deliantra::FIELD_ORDER_MAP
508 : @Crossfire::FIELD_ORDER) { 669 : @Deliantra::FIELD_ORDER) {
509 push @kv, [$_, delete $a{$_}] 670 push @kv, [$_, delete $a{$_}]
510 if exists $a{$_}; 671 if exists $a{$_};
511 } 672 }
512 673
513 for (sort keys %a) { 674 for (sort keys %a) {
… …
516 } 677 }
517 678
518 for (@kv) { 679 for (@kv) {
519 my ($k, $v) = @$_; 680 my ($k, $v) = @$_;
520 681
521 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 682 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
522 $v =~ s/\n$//; 683 $v =~ s/\n$//;
523 $str .= "$k\n$v\n$end\n"; 684 $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 { 685 } else {
551 $str .= "$k $v\n"; 686 $str .= "$k $v\n";
552 } 687 }
553 } 688 }
554 689
555 if ($inv) { 690 if ($inv) {
556 $append->($_) for @$inv; 691 $append->($_) for @$inv;
557 } 692 }
558 693
694 $str .= "end\n";
695
559 if ($a{_atype} eq 'object') { 696 if ($a{_atype} eq 'object') {
560 $str .= join "\n", "anim", @$anim, "mina\n" 697 if ($more) {
561 if $anim;
562 }
563
564 $str .= "end\n";
565
566 if (($a{_atype} eq 'object') && $more) {
567 $str .= "\nmore\n"; 698 $str .= "more\n";
568 $append->($more) if $more; 699 $append->($more) if $more;
700 } else {
701 $str .= "\n";
702 }
569 } 703 }
570 }; 704 };
571 705
572 for (@$arch) { 706 for (@$arch) {
573 $append->($_); 707 $append->($_);
… …
602 my ($a) = @_; 736 my ($a) = @_;
603 737
604 my $o = $ARCH{$a->{_name}} 738 my $o = $ARCH{$a->{_name}}
605 or return; 739 or return;
606 740
607 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"}
608 or (warn "no face data found for arch '$a->{_name}'"), return; 744 or (warn "no face data found for arch '$a->{_name}'"), return;
745 }
609 746
610 if ($face->{w} > 1 || $face->{h} > 1) { 747 if ($face->{w} > 1 || $face->{h} > 1) {
611 # bigface 748 # bigface
612 return (0, 0, $face->{w} - 1, $face->{h} - 1); 749 return (0, 0, $face->{w} - 1, $face->{h} - 1);
613 750
… …
646=cut 783=cut
647 784
648sub arch_attr($) { 785sub arch_attr($) {
649 my ($obj) = @_; 786 my ($obj) = @_;
650 787
651 require Crossfire::Data; 788 require Deliantra::Data;
652 789
653 my $root; 790 my $root;
654 my $attr = { }; 791 my $attr = { };
655 792
656 my $arch = $ARCH{ $obj->{_name} }; 793 my $arch = $ARCH{ $obj->{_name} };
657 my $type = $obj->{type} || $arch->{type}; 794 my $type = $obj->{type} || $arch->{type};
658 795
659 if ($type > 0) { 796 if ($type > 0) {
660 $root = $Crossfire::Data::ATTR{$type}; 797 $root = $Deliantra::Data::ATTR{$type};
661 } else { 798 } else {
662 my %a = (%$arch, %$obj); 799 my %a = (%$arch, %$obj);
663 800
664 if ($a{is_floor} && !$a{alive}) { 801 if ($a{is_floor} && !$a{alive}) {
665 $root = $Crossfire::Data::TYPE{Floor}; 802 $root = $Deliantra::Data::TYPE{Floor};
666 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 803 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
667 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 804 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
668 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 805 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
669 $root = $Crossfire::Data::TYPE{Wall}; 806 $root = $Deliantra::Data::TYPE{Wall};
670 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 807 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
671 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 808 $root = $Deliantra::Data::TYPE{"Weak Wall"};
672 } else { 809 } else {
673 $root = $Crossfire::Data::TYPE{Misc}; 810 $root = $Deliantra::Data::TYPE{Misc};
674 } 811 }
675 } 812 }
676 813
677 my @import = ($root); 814 my @import = ($root);
678 815
679 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 816 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
680 unless $type == 116; 817 unless $type == 116;
681 818
682 my (%ignore); 819 my (%ignore);
683 my (@section_order, %section, @attr_order); 820 my (@section_order, %section, @attr_order);
684 821
685 while (my $type = shift @import) { 822 while (my $type = shift @import) {
823 push @import,
824 grep $_,
825 map $Deliantra::Data::TYPE{$_},
686 push @import, @{$type->{import} || []}; 826 @{$type->{import} || []};
687 827
688 $attr->{$_} ||= $type->{$_} 828 $attr->{$_} ||= $type->{$_}
689 for qw(name desc use); 829 for qw(name desc use);
690 830
691 for (@{$type->{ignore} || []}) { 831 for (@{$type->{ignore} || []}) {
… …
720 ]; 860 ];
721 861
722 $attr 862 $attr
723} 863}
724 864
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($$&&) { 865sub cache_file($$&&) {
787 my ($src, $cache, $load, $create) = @_; 866 my ($src, $cache, $load, $create) = @_;
788 867
789 my ($size, $mtime) = (stat $src)[7,9] 868 my ($size, $mtime) = (stat $src)[7,9]
790 or Carp::croak "$src: $!"; 869 or Carp::croak "$src: $!";
… …
838 }, sub { 917 }, sub {
839 read_arch "$LIB/archetypes" 918 read_arch "$LIB/archetypes"
840 }; 919 };
841} 920}
842 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
843=item load_tilecache 952=item load_tilecache
844 953
845(Re-)Load %TILE and %FACE. 954(Re-)Load %TILE and %FACE.
846 955
847=cut 956=cut
848 957
849sub load_tilecache() { 958sub load_tilecache() {
850 require Gtk2; 959 require Gtk2;
851 960
852 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 961 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 { 962 sub {
857 my $tile = read_pak "$LIB/crossfire.0";
858
859 my %cache; 963 my %cache;
964 my $facedata = Storable::retrieve "$LIB/facedata";
860 965
966 $facedata->{version} == 2
967 or die "$LIB/facedata: version mismatch, cannot proceed.";
968
969 my $faces = $facedata->{faceinfo};
861 my $idx = 0; 970 my $idx = 0;
862 971
863 for my $name (sort keys %$tile) { 972 for (sort keys %$faces) {
973 my ($face, $info) = ($_, $faces->{$_});
974
864 my $pb = new Gtk2::Gdk::PixbufLoader; 975 my $pb = new Gtk2::Gdk::PixbufLoader;
865 $pb->write ($tile->{$name}); 976 $pb->write ($info->{data32});
866 $pb->close; 977 $pb->close;
867 my $pb = $pb->get_pixbuf; 978 my $pb = $pb->get_pixbuf;
868 979
869 my $tile = $cache{$name} = { 980 my $tile = $cache{$face} = {
870 pb => $pb, 981 pb => $pb,
871 idx => $idx, 982 idx => $idx,
872 w => int $pb->get_width / TILESIZE, 983 w => int $pb->get_width / TILESIZE,
873 h => int $pb->get_height / TILESIZE, 984 h => int $pb->get_height / TILESIZE,
874 }; 985 };
875
876 986
877 $idx += $tile->{w} * $tile->{h}; 987 $idx += $tile->{w} * $tile->{h};
988 }
989
990 construct_tilecache_pb $idx, \%cache;
991
992 \%cache
878 } 993 };
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} 994}
995
996=back
900 997
901=head1 AUTHOR 998=head1 AUTHOR
902 999
903 Marc Lehmann <schmorp@schmorp.de> 1000 Marc Lehmann <schmorp@schmorp.de>
904 http://home.schmorp.de/ 1001 http://home.schmorp.de/
… …
907 http://www.ta-sa.org/ 1004 http://www.ta-sa.org/
908 1005
909=cut 1006=cut
910 1007
9111 10081
1009

Diff Legend

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