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.120 by root, Wed Dec 26 18:26:15 2007 UTC

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

Diff Legend

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