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.63 by root, Fri Mar 31 21:06:47 2006 UTC vs.
Revision 1.141 by root, Mon Mar 22 00:58:17 2010 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.1'; 11our $VERSION = '1.30';
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
29use JSON::XS qw(decode_json encode_json);
30
24our $LIB = $ENV{CROSSFIRE_LIBDIR}; 31our $LIB = $ENV{DELIANTRA_LIBDIR};
25 32
26our $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";
27 36
28mkdir $VARDIR, 0777; 37mkdir $VARDIR, 0777;
29 38
30sub TILESIZE (){ 32 } 39sub TILESIZE (){ 32 }
40sub CACHESTRIDE (){ 64 }
31 41
32our %ARCH; 42our %ARCH;
43our %FACE; # face32
33our %FACE; 44our %FACEDATA;
34our $TILE; 45our $TILE;
35 46
36our %FIELD_MULTILINE = ( 47our %FIELD_MULTILINE = (
37 msg => "endmsg", 48 msg => "endmsg",
38 lore => "endlore", 49 lore => "endlore",
… …
44 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);
45 56
46# same as in server save routine, to (hopefully) be compatible 57# same as in server save routine, to (hopefully) be compatible
47# to the other editors. 58# to the other editors.
48our @FIELD_ORDER_MAP = (qw( 59our @FIELD_ORDER_MAP = (qw(
60 file_format_version
49 name swap_time reset_timeout fixed_resettime difficulty region 61 name attach swap_time reset_timeout fixed_resettime difficulty region
50 shopitems shopgreed shopmin shopmax shoprace 62 shopitems shopgreed shopmin shopmax shoprace
51 darkness width height enter_x enter_y msg maplore 63 darkness width height enter_x enter_y msg maplore
52 unique template 64 unique template
53 outdoor temp pressure humid windspeed winddir sky nosmooth 65 outdoor temp pressure humid windspeed winddir sky nosmooth
54 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
55)); 67));
56 68
57our @FIELD_ORDER = (qw( 69our @FIELD_ORDER = (qw(
70 inherit
71
58 elevation 72 elevation
59 73
60 name name_pl custom_name title race 74 name name_pl custom_name attach title race
61 slaying skill msg lore other_arch face 75 slaying skill msg lore other_arch
62 #todo-events 76 sound sound_destroy face animation is_animated
63 animation is_animated 77 magicmap smoothlevel smoothface
64 str dex con wis pow cha int 78 str dex con wis pow cha int
65 hp maxhp sp maxsp grace maxgrace 79 hp maxhp sp maxsp grace maxgrace
66 exp perm_exp expmul 80 exp perm_exp expmul
67 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
68 nrof level direction type subtype attacktype 82 nrof level direction type subtype attacktype
… …
76 resist_life_stealing resist_disease 90 resist_life_stealing resist_disease
77 91
78 path_attuned path_repelled path_denied material materialname 92 path_attuned path_repelled path_denied material materialname
79 value carrying weight invisible state magic 93 value carrying weight invisible state magic
80 last_heal last_sp last_grace last_eat 94 last_heal last_sp last_grace last_eat
81 connected glow_radius randomitems npx_status npc_program 95 connected glow_radius randomitems tresure_env npx_status npc_program
82 run_away pick_up container will_apply smoothlevel 96 run_away pick_up container will_apply smoothlevel
83 current_weapon_script weapontype tooltype elevation client_type 97 current_weapon_script weapontype tooltype elevation client_type
84 item_power duration range 98 item_power duration range
85 range_modifier duration_modifier dam_modifier gen_sp_armour 99 range_modifier duration_modifier dam_modifier gen_sp_armour
86 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
… …
97 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
98 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
99 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
100 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
101 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
102 117
103 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
104 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
105)); 120));
106 121
… …
123sub MOVE_FLY_LOW (){ 0x02 } 138sub MOVE_FLY_LOW (){ 0x02 }
124sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
125sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
126sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
127sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
143sub MOVE_SHIP (){ 0x20 }
128sub MOVE_KNOWN (){ 0x1f } # all of above 144sub MOVE_KNOWN (){ 0x3f } # all of above
129sub MOVE_ALLBIT (){ 0x10000 }
130sub 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 {
168 ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
169 ? $_[0][1] & $MOVE_TYPE{$_[1]}
170 : undef
171 },
172 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
173 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
174 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
175 'x=' => sub { # toggle between off, + and -
176 my $cur = $_[0] >= $_[1];
177 if (!defined $cur) {
178 if ($_[0] >= "all") {
179 $_[0] -= $_[1];
180 } else {
181 $_[0] += $_[1];
182 }
183 } elsif ($cur) {
184 $_[0] -= $_[1];
185 } else {
186 $_[0] /= $_[1];
187 }
188
189 $_[0]
190 },
191 'eq' => sub { "$_[0]" eq "$_[1]" },
192 'ne' => sub { "$_[0]" ne "$_[1]" },
193 ;
194
195 sub TO_JSON {
196 $_[0][0]
197 }
198}
199
200sub Deliantra::MoveType::new {
201 my ($class, $string) = @_;
202
203 my $mask;
204 my $value;
205
206 if ($string =~ /^\s*\d+\s*$/) {
207 $mask = MOVE_ALL;
208 $value = $string+0;
209 } else {
210 for (split /\s+/, lc $string) {
211 if (s/^-//) {
212 $mask |= $MOVE_TYPE{$_};
213 $value &= ~$MOVE_TYPE{$_};
214 } else {
215 $mask |= $MOVE_TYPE{$_};
216 $value |= $MOVE_TYPE{$_};
217 }
218 }
219 }
220
221 (bless [$mask, $value], $class)->normalise
222}
223
224sub Deliantra::MoveType::normalise {
225 my ($self) = @_;
226
227 if ($self->[0] & MOVE_ALL) {
228 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
229 $self->[0] &= $mask;
230 $self->[1] &= $mask;
231 }
232
233 $self->[1] &= $self->[0];
234
235 $self
236}
237
238sub Deliantra::MoveType::as_string {
239 my ($self) = @_;
240
241 my @res;
242
243 my ($mask, $value) = @$self;
244
245 for (@Deliantra::MOVE_TYPE) {
246 my $bit = $Deliantra::MOVE_TYPE{$_};
247 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
248 $mask &= ~$bit;
249 push @res, $value & $bit ? $_ : "-$_";
250 }
251 }
252
253 join " ", @res
254}
131 255
132sub load_ref($) { 256sub load_ref($) {
133 my ($path) = @_; 257 my ($path) = @_;
134 258
135 open my $fh, "<:raw:perlio", $path 259 open my $fh, "<:raw:perlio", $path
… …
148 close $fh; 272 close $fh;
149 rename "$path~", $path 273 rename "$path~", $path
150 or die "$path: $!"; 274 or die "$path: $!";
151} 275}
152 276
277my %attack_mask = (
278 physical => 0x00000001,
279 magic => 0x00000002,
280 fire => 0x00000004,
281 electricity => 0x00000008,
282 cold => 0x00000010,
283 confusion => 0x00000020,
284 acid => 0x00000040,
285 drain => 0x00000080,
286 weaponmagic => 0x00000100,
287 ghosthit => 0x00000200,
288 poison => 0x00000400,
289 slow => 0x00000800,
290 paralyze => 0x00001000,
291 turn_undead => 0x00002000,
292 fear => 0x00004000,
293 cancellation => 0x00008000,
294 deplete => 0x00010000,
295 death => 0x00020000,
296 chaos => 0x00040000,
297 counterspell => 0x00080000,
298 godpower => 0x00100000,
299 holyword => 0x00200000,
300 blind => 0x00400000,
301 internal => 0x00800000,
302 life_stealing => 0x01000000,
303 disease => 0x02000000,
304);
305
306sub _add_resist($$$) {
307 my ($ob, $mask, $value) = @_;
308
309 while (my ($k, $v) = each %attack_mask) {
310 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
311 }
312}
313
314my %MATERIAL = reverse
315 paper => 1,
316 iron => 2,
317 glass => 4,
318 leather => 8,
319 wood => 16,
320 organic => 32,
321 stone => 64,
322 cloth => 128,
323 adamant => 256,
324 liquid => 512,
325 tin => 1024,
326 bone => 2048,
327 ice => 4096,
328
329 # guesses
330 runestone => 12,
331 bronze => 18,
332 "ancient wood" => 20,
333 glass => 36,
334 marble => 66,
335 ice => 68,
336 stone => 70,
337 stone => 80,
338 cloth => 136,
339 ironwood => 144,
340 adamantium => 258,
341 glacium => 260,
342 blood => 544,
343;
344
153# object as in "Object xxx", i.e. archetypes 345# object as in "Object xxx", i.e. archetypes
154sub normalize_object($) { 346sub normalize_object($) {
155 my ($ob) = @_; 347 my ($ob) = @_;
156 348
349 delete $ob->{editable}; # deprecated
350
351 # convert material bitset to materialname, if possible
352 if (exists $ob->{material}) {
353 if (!$ob->{material}) {
354 delete $ob->{material};
355 } elsif (exists $ob->{materialname}) {
356 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
357 delete $ob->{material};
358 } else {
359 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
360 delete $ob->{material}; # assume materilname is more specific and nuke material
361 }
362 } elsif (my $name = $MATERIAL{$ob->{material}}) {
363 delete $ob->{material};
364 $ob->{materialname} = $name;
365 } else {
366 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
367 }
368 }
369
370 # check whether attachment is the same as in the archetype
371 if (exists $ob->{attach}) {
372 my $arch = $ARCH{$ob->{_name}};
373 my $js = JSON::XS->new->utf8->canonical (1);
374
375 if (defined $arch->{attach}
376 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
377 delete $ob->{attach}
378 }
379 }
380
381 # color_fg is used as default for magicmap if magicmap does not exist
382 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
383
157 # nuke outdated or never supported fields 384 # nuke outdated or never supported fields
158 delete $ob->{$_} for qw( 385 delete @$ob{qw(
159 can_knockback can_parry can_impale can_cut can_dam_armour 386 can_knockback can_parry can_impale can_cut can_dam_armour
160 can_apply pass_thru can_pass_thru 387 can_apply pass_thru can_pass_thru color_bg color_fg
161 ); 388 )};
389
390 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
391 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
392 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
162 393
163 # convert movement strings to bitsets 394 # convert movement strings to bitsets
164 for my $attr (keys %FIELD_MOVEMENT) { 395 for my $attr (keys %FIELD_MOVEMENT) {
165 next unless exists $ob->{$attr}; 396 next unless exists $ob->{$attr};
166 397
167 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 398 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
168
169 next if $ob->{$attr} =~ /^\d+$/;
170
171 my $flags = 0;
172
173 # assume list
174 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
175 $flags |= MOVE_WALK if $flag eq "walk";
176 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
177 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
178 $flags |= MOVE_FLYING if $flag eq "flying";
179 $flags |= MOVE_SWIM if $flag eq "swim";
180 $flags |= MOVE_BOAT if $flag eq "boat";
181 $flags |= MOVE_ALL if $flag eq "all";
182
183 $flags &= ~MOVE_WALK if $flag eq "-walk";
184 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
185 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
186 $flags &= ~MOVE_FLYING if $flag eq "-flying";
187 $flags &= ~MOVE_SWIM if $flag eq "-swim";
188 $flags &= ~MOVE_BOAT if $flag eq "-boat";
189 $flags &= ~MOVE_ALL if $flag eq "-all";
190 }
191
192 $ob->{$attr} = $flags;
193 } 399 }
194 400
195 # convert outdated movement flags to new movement sets 401 # convert outdated movement flags to new movement sets
196 if (defined (my $v = delete $ob->{no_pass})) { 402 if (defined (my $v = delete $ob->{no_pass})) {
197 $ob->{move_block} = $v ? MOVE_ALL : 0; 403 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
198 } 404 }
199 if (defined (my $v = delete $ob->{slow_move})) { 405 if (defined (my $v = delete $ob->{slow_move})) {
200 $ob->{move_slow} |= MOVE_WALK; 406 $ob->{move_slow} += "walk";
201 $ob->{move_slow_penalty} = $v; 407 $ob->{move_slow_penalty} = $v;
202 } 408 }
203 if (defined (my $v = delete $ob->{walk_on})) { 409 if (defined (my $v = delete $ob->{walk_on})) {
204 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 410 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
205 : $ob->{move_on} & ~MOVE_WALK;
206 } 411 }
207 if (defined (my $v = delete $ob->{walk_off})) { 412 if (defined (my $v = delete $ob->{walk_off})) {
208 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 413 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
209 : $ob->{move_off} & ~MOVE_WALK;
210 } 414 }
211 if (defined (my $v = delete $ob->{fly_on})) { 415 if (defined (my $v = delete $ob->{fly_on})) {
212 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 416 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
213 : $ob->{move_on} & ~MOVE_FLY_LOW;
214 } 417 }
215 if (defined (my $v = delete $ob->{fly_off})) { 418 if (defined (my $v = delete $ob->{fly_off})) {
216 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 419 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
217 : $ob->{move_off} & ~MOVE_FLY_LOW;
218 } 420 }
219 if (defined (my $v = delete $ob->{flying})) { 421 if (defined (my $v = delete $ob->{flying})) {
220 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 422 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
221 : $ob->{move_type} & ~MOVE_FLY_LOW;
222 } 423 }
223 424
224 # convert idiotic event_xxx things into objects 425 # convert idiotic event_xxx things into objects
225 while (my ($event, $subtype) = each %EVENT_TYPE) { 426 while (my ($event, $subtype) = each %EVENT_TYPE) {
226 if (exists $ob->{"event_${event}_plugin"}) { 427 if (exists $ob->{"event_${event}_plugin"}) {
… …
231 name => delete $ob->{"event_${event}_options"}, 432 name => delete $ob->{"event_${event}_options"},
232 }; 433 };
233 } 434 }
234 } 435 }
235 436
437 # some archetypes had "+3" instead of the canonical "3", so fix
438 $ob->{dam} *= 1 if exists $ob->{dam};
439
236 $ob 440 $ob
237} 441}
238 442
239# arch as in "arch xxx", ie.. objects 443# arch as in "arch xxx", ie.. objects
240sub normalize_arch($) { 444sub normalize_arch($) {
241 my ($ob) = @_; 445 my ($ob) = @_;
242 446
243 normalize_object $ob; 447 normalize_object $ob;
448
449 return if $ob->{_atype} eq "object";
244 450
245 my $arch = $ARCH{$ob->{_name}} 451 my $arch = $ARCH{$ob->{_name}}
246 or (warn "$ob->{_name}: no such archetype", return $ob); 452 or (warn "$ob->{_name}: no such archetype", return $ob);
247 453
248 if ($arch->{type} == 22) { # map 454 if ($arch->{type} == 22) { # map
… …
281 } 487 }
282 488
283 $ob 489 $ob
284} 490}
285 491
492sub attr_thaw($) {
493 my ($ob) = @_;
494
495 $ob->{attach} = decode_json $ob->{attach}
496 if exists $ob->{attach};
497
498 $ob
499}
500
501sub attr_freeze($) {
502 my ($ob) = @_;
503
504 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
505 if exists $ob->{attach};
506
507 $ob
508}
509
286sub read_pak($) { 510sub read_pak($) {
287 my ($path) = @_; 511 my ($path) = @_;
288 512
289 my %pak; 513 my %pak;
290 514
… …
298 } 522 }
299 523
300 \%pak 524 \%pak
301} 525}
302 526
303sub read_arch($) { 527sub read_arch($;$) {
304 my ($path) = @_; 528 my ($path, $toplevel) = @_;
305 529
306 my %arc; 530 my %arc;
307 my ($more, $prev); 531 my ($more, $prev);
532 my $comment;
308 533
309 open my $fh, "<:raw:perlio:utf8", $path 534 open my $fh, "<:utf8", $path
310 or Carp::croak "$path: $!"; 535 or Carp::croak "$path: $!";
311 536
312 binmode $fh; 537# binmode $fh;
313 538
314 my $parse_block; $parse_block = sub { 539 my $parse_block; $parse_block = sub {
315 my %arc = @_; 540 my %arc = @_;
316 541
317 while (<$fh>) { 542 while (<$fh>) {
318 s/\s+$//; 543 s/\s+$//;
319 if (/^end$/i) { 544 if (/^end$/i) {
320 last; 545 last;
546
321 } elsif (/^arch (\S+)$/i) { 547 } elsif (/^arch (\S+)$/i) {
322 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 548 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
549
323 } elsif (/^lore$/i) { 550 } elsif (/^lore$/i) {
324 while (<$fh>) { 551 while (<$fh>) {
325 last if /^endlore\s*$/i; 552 last if /^endlore\s*$/i;
326 $arc{lore} .= $_; 553 $arc{lore} .= $_;
327 } 554 }
328 } elsif (/^msg$/i) { 555 } elsif (/^msg$/i) {
329 while (<$fh>) { 556 while (<$fh>) {
330 last if /^endmsg\s*$/i; 557 last if /^endmsg\s*$/i;
331 $arc{msg} .= $_; 558 $arc{msg} .= $_;
332 } 559 }
560 } elsif (/^anim$/i) {
561 while (<$fh>) {
562 last if /^mina\s*$/i;
563 chomp;
564 push @{ $arc{anim} }, $_;
565 }
333 } elsif (/^(\S+)\s*(.*)$/) { 566 } elsif (/^(\S+)\s*(.*)$/) {
334 $arc{lc $1} = $2; 567 $arc{lc $1} = $2;
335 } elsif (/^\s*($|#)/) { 568 } elsif (/^\s*#/) {
569 $arc{_comment} .= "$_\n";
570
571 } elsif (/^\s*$/) {
336 # 572 #
337 } else { 573 } else {
338 warn "$path: unparsable line '$_' in arch $arc{_name}"; 574 warn "$path: unparsable line '$_' in arch $arc{_name}";
339 } 575 }
340 } 576 }
… …
346 s/\s+$//; 582 s/\s+$//;
347 if (/^more$/i) { 583 if (/^more$/i) {
348 $more = $prev; 584 $more = $prev;
349 } elsif (/^object (\S+)$/i) { 585 } elsif (/^object (\S+)$/i) {
350 my $name = $1; 586 my $name = $1;
351 my $arc = normalize_object $parse_block->(_name => $name); 587 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
588 undef $comment;
589 delete $arc{_comment} unless length $arc{_comment};
590 $arc->{_atype} = 'object';
352 591
353 if ($more) { 592 if ($more) {
354 $more->{more} = $arc; 593 $more->{more} = $arc;
355 } else { 594 } else {
356 $arc{$name} = $arc; 595 $arc{$name} = $arc;
357 } 596 }
358 $prev = $arc; 597 $prev = $arc;
359 $more = undef; 598 $more = undef;
360 } elsif (/^arch (\S+)$/i) { 599 } elsif (/^arch (\S+)$/i) {
361 my $name = $1; 600 my $name = $1;
362 my $arc = normalize_arch $parse_block->(_name => $name); 601 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
602 undef $comment;
603 delete $arc{_comment} unless length $arc{_comment};
604 $arc->{_atype} = 'arch';
363 605
364 if ($more) { 606 if ($more) {
365 $more->{more} = $arc; 607 $more->{more} = $arc;
366 } else { 608 } else {
367 push @{ $arc{arch} }, $arc; 609 push @{ $arc{arch} }, $arc;
368 } 610 }
369 $prev = $arc; 611 $prev = $arc;
370 $more = undef; 612 $more = undef;
613 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
614 if ($1 eq "lev_array") {
615 while (<$fh>) {
616 last if /^endplst\s*$/;
617 push @{$toplevel->{lev_array}}, $_+0;
618 }
619 } else {
620 $toplevel->{$1} = $2;
621 }
622 } elsif (/^\s*#/) {
623 $comment .= "$_\n";
371 } elsif (/^\s*($|#)/) { 624 } elsif (/^\s*($|#)/) {
372 # 625 #
373 } else { 626 } else {
374 warn "$path: unparseable top-level line '$_'"; 627 die "$path: unparseable top-level line '$_'";
375 } 628 }
376 } 629 }
377 630
378 undef $parse_block; # work around bug in perl not freeing $fh etc. 631 undef $parse_block; # work around bug in perl not freeing $fh etc.
379 632
380 \%arc 633 \%arc
634}
635
636sub archlist_to_string {
637 my ($arch) = @_;
638
639 my $str;
640
641 my $append; $append = sub {
642 my %a = %{$_[0]};
643
644 Deliantra::attr_freeze \%a;
645 Deliantra::normalize_arch \%a;
646
647 # undo the bit-split we did before
648 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
649 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
650 | (delete $a{attack_movement_bits_4_7});
651 }
652
653 if (my $comment = delete $a{_comment}) {
654 if ($comment =~ /[^\n\s#]/) {
655 $str .= $comment;
656 }
657 }
658
659 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
660
661 my $inv = delete $a{inventory};
662 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
663 my $anim = delete $a{anim};
664
665 if ($a{_atype} eq 'object') {
666 $str .= join "\n", "anim", @$anim, "mina\n"
667 if $anim;
668 }
669
670 my @kv;
671
672 for ($a{_name} eq "map"
673 ? @Deliantra::FIELD_ORDER_MAP
674 : @Deliantra::FIELD_ORDER) {
675 push @kv, [$_, delete $a{$_}]
676 if exists $a{$_};
677 }
678
679 for (sort keys %a) {
680 next if /^_/; # ignore our _-keys
681 push @kv, [$_, delete $a{$_}];
682 }
683
684 for (@kv) {
685 my ($k, $v) = @$_;
686
687 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
688 $v =~ s/\n$//;
689 $str .= "$k\n$v\n$end\n";
690 } else {
691 $str .= "$k $v\n";
692 }
693 }
694
695 if ($inv) {
696 $append->($_) for @$inv;
697 }
698
699 $str .= "end\n";
700
701 if ($a{_atype} eq 'object') {
702 if ($more) {
703 $str .= "more\n";
704 $append->($more) if $more;
705 } else {
706 $str .= "\n";
707 }
708 }
709 };
710
711 for (@$arch) {
712 $append->($_);
713 }
714
715 $str
381} 716}
382 717
383# put all archs into a hash with editor_face as it's key 718# put all archs into a hash with editor_face as it's key
384# NOTE: the arrays in the hash values are references to 719# NOTE: the arrays in the hash values are references to
385# the archs from $ARCH 720# the archs from $ARCH
… …
406 my ($a) = @_; 741 my ($a) = @_;
407 742
408 my $o = $ARCH{$a->{_name}} 743 my $o = $ARCH{$a->{_name}}
409 or return; 744 or return;
410 745
411 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 746 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
747 unless ($face) {
748 $face = $FACE{"blank.x11"}
412 or (warn "no face data found for arch '$a->{_name}'"), return; 749 or (warn "no face data found for arch '$a->{_name}'"), return;
750 }
413 751
414 if ($face->{w} > 1 || $face->{h} > 1) { 752 if ($face->{w} > 1 || $face->{h} > 1) {
415 # bigface 753 # bigface
416 return (0, 0, $face->{w} - 1, $face->{h} - 1); 754 return (0, 0, $face->{w} - 1, $face->{h} - 1);
417 755
… …
450=cut 788=cut
451 789
452sub arch_attr($) { 790sub arch_attr($) {
453 my ($obj) = @_; 791 my ($obj) = @_;
454 792
455 require Crossfire::Data; 793 require Deliantra::Data;
456 794
457 my $root; 795 my $root;
458 my $attr = { }; 796 my $attr = { };
459 797
460 my $arch = $ARCH{ $obj->{_name} }; 798 my $arch = $ARCH{ $obj->{_name} };
461 my $type = $obj->{type} || $arch->{type}; 799 my $type = $obj->{type} || $arch->{type};
462 800
463 if ($type > 0) { 801 if ($type > 0) {
464 $root = $Crossfire::Data::ATTR{$type}; 802 $root = $Deliantra::Data::ATTR{$type};
465 } else { 803 } else {
466 my %a = (%$arch, %$obj); 804 my %a = (%$arch, %$obj);
467 805
468 if ($a{is_floor} && !$a{alive}) { 806 if ($a{is_floor} && !$a{alive}) {
469 $root = $Crossfire::Data::TYPE{Floor}; 807 $root = $Deliantra::Data::TYPE{Floor};
470 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 808 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
471 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 809 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
472 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 810 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
473 $root = $Crossfire::Data::TYPE{Wall}; 811 $root = $Deliantra::Data::TYPE{Wall};
474 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 812 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
475 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 813 $root = $Deliantra::Data::TYPE{"Weak Wall"};
476 } else { 814 } else {
477 $root = $Crossfire::Data::TYPE{Misc}; 815 $root = $Deliantra::Data::TYPE{Misc};
478 } 816 }
479 } 817 }
480 818
819 my (%ignore);
481 my @import = ($root); 820 my @import = ($root);
821
822 my @new_import;
823 while (my $type = shift @import) {
824 # first import everything we will need:
825 push @import,
826 grep $_,
827 map $Deliantra::Data::TYPE{$_},
828 @{$type->{import} || []};
829
830 # and compute the ignored attributes
831 for (@{$type->{ignore} || []}) {
832 $ignore{$_}++ for ref $_ ? @$_ : $_;
833 }
834
835 push @new_import, $type;
482 836 }
837 (@import) = @new_import;
838
839 # then add defaults to the back of the list, so they are added
840 # as last resort.
483 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 841 push @import, \%Deliantra::Data::DEFAULT_ATTR
484 unless $type == 116; 842 unless $type == 116;
485 843
486 my (%ignore);
487 my (@section_order, %section, @attr_order); 844 my (@section_order, %section, @attr_order);
488 845
846 # @import = root, imported, default
489 while (my $type = shift @import) { 847 while (my $type = pop @import) {
490 push @import, @{$type->{import} || []};
491
492 $attr->{$_} ||= $type->{$_} 848 $attr->{$_} ||= $type->{$_}
493 for qw(name desc use); 849 for qw(name desc use);
494
495 for (@{$type->{ignore} || []}) {
496 $ignore{$_}++ for ref $_ ? @$_ : $_;
497 }
498 850
499 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 851 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
500 my ($name, $attr) = @$_; 852 my ($name, $attr) = @$_;
501 push @section_order, $name; 853 push @section_order, $name;
502 for (@$attr) { 854 for (@$attr) {
503 my ($k, $v) = @$_; 855 my ($k, $v) = @$_;
504 push @attr_order, $k; 856 push @attr_order, $k;
505 $section{$name}{$k} ||= $v; 857 $section{$name}{$k} = $v; # overwrite, so that the root decides
506 }
507 } 858 }
859 }
860 }
861
862 # remove ignores for "root" type
863 for (
864 map @{$_->[1]}, # section attributes
865 [general => ($root->{attr} || [])],
866 @{$root->{section} || []}
867 ) {
868 my ($k, $v) = @$_;
869 # skip fixed attributes, if they are ignored thats fine
870 next if $v->{type} eq 'fixed';
871
872 delete $ignore{$k}; # if the attributes are defined explicitly they
873 # should NOT be ignored. ignore should mainly
874 # hit imported/inherited attributes.
508 } 875 }
509 876
510 $attr->{section} = [ 877 $attr->{section} = [
511 map !exists $section{$_} ? () : do { 878 map !exists $section{$_} ? () : do {
512 my $attr = delete $section{$_}; 879 my $attr = delete $section{$_};
… …
516 map exists $attr->{$_} && !$ignore{$_} 883 map exists $attr->{$_} && !$ignore{$_}
517 ? [$_ => delete $attr->{$_}] : (), 884 ? [$_ => delete $attr->{$_}] : (),
518 @attr_order 885 @attr_order
519 ] 886 ]
520 }, 887 },
521
522 exists $section{$_} ? [$_ => delete $section{$_}] : (), 888 exists $section{$_} ? [$_ => delete $section{$_}] : (),
523 @section_order 889 @section_order
524 ]; 890 ];
525 891
526 $attr 892 $attr
527}
528
529sub arch_edit_sections {
530# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
531# edit_type = 0;
532# else if (edit_type != 0) {
533# // all flags from 'check_type' must be unset in this arch because they get recalculated now
534# edit_type &= ~check_type;
535# }
536#
537# }
538# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
539# getAttributeValue("alive", defarch) == 1 &&
540# (getAttributeValue("monster", defarch) == 1 ||
541# getAttributeValue("generator", defarch) == 1)) {
542# // Monster: monsters/npcs/generators
543# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
544# }
545# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
546# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
547# // Walls
548# edit_type |= IGUIConstants.TILE_EDIT_WALL;
549# }
550# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
551# getAttributeValue("connected", defarch) != 0) {
552# // Connected Objects
553# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
554# }
555# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
556# arch_type == 66 || arch_type == 41 || arch_type == 95) {
557# // Exit: teleporter/exit/trapdoors
558# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
559# }
560# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
561# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
562# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
563# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
564# arch_type == 124 || arch_type == 130)) {
565# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
566# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
567# }
568# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
569# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
570# arch_type == 91 || arch_type == 21 || arch_type == 24) {
571# // Door: door/special door/gates + keys
572# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
573# }
574# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
575# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
576# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
577# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
578# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
579# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
580# arch_type == 122 || arch_type == 3)) {
581# // Equipment: weapons/armour/wands/rods
582# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
583# }
584#
585# return(edit_type);
586#
587#
588} 893}
589 894
590sub cache_file($$&&) { 895sub cache_file($$&&) {
591 my ($src, $cache, $load, $create) = @_; 896 my ($src, $cache, $load, $create) = @_;
592 897
… …
642 }, sub { 947 }, sub {
643 read_arch "$LIB/archetypes" 948 read_arch "$LIB/archetypes"
644 }; 949 };
645} 950}
646 951
952sub construct_tilecache_pb {
953 my ($idx, $cache) = @_;
954
955 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
956
957 while (my ($name, $tile) = each %$cache) {
958 my $tpb = delete $tile->{pb};
959 my $ofs = $tile->{idx};
960
961 for my $x (0 .. $tile->{w} - 1) {
962 for my $y (0 .. $tile->{h} - 1) {
963 my $idx = $ofs + $x + $y * $tile->{w};
964 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
965 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
966 }
967 }
968 }
969
970 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
971
972 $cache
973}
974
975sub use_tilecache {
976 my ($face) = @_;
977 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
978 or die "$VARDIR/tilecache.png: $!";
979 *FACE = $_[0];
980}
981
647=item load_tilecache 982=item load_tilecache
648 983
649(Re-)Load %TILE and %FACE. 984(Re-)Load %TILE and %FACE.
650 985
651=cut 986=cut
652 987
653sub load_tilecache() { 988sub load_tilecache() {
654 require Gtk2; 989 require Gtk2;
655 990
656 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 991 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
657 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
658 or die "$VARDIR/tilecache.png: $!";
659 *FACE = $_[0];
660 }, sub { 992 sub {
661 my $tile = read_pak "$LIB/crossfire.0";
662
663 my %cache; 993 my %cache;
994 my $facedata = Storable::retrieve "$LIB/facedata";
664 995
996 $facedata->{version} == 2
997 or die "$LIB/facedata: version mismatch, cannot proceed.";
998
999 my $faces = $facedata->{faceinfo};
665 my $idx = 0; 1000 my $idx = 0;
666 1001
667 for my $name (sort keys %$tile) { 1002 for (sort keys %$faces) {
1003 my ($face, $info) = ($_, $faces->{$_});
1004
668 my $pb = new Gtk2::Gdk::PixbufLoader; 1005 my $pb = new Gtk2::Gdk::PixbufLoader;
669 $pb->write ($tile->{$name}); 1006 $pb->write ($info->{data32});
670 $pb->close; 1007 $pb->close;
671 my $pb = $pb->get_pixbuf; 1008 my $pb = $pb->get_pixbuf;
672 1009
673 my $tile = $cache{$name} = { 1010 my $tile = $cache{$face} = {
674 pb => $pb, 1011 pb => $pb,
675 idx => $idx, 1012 idx => $idx,
676 w => int $pb->get_width / TILESIZE, 1013 w => int $pb->get_width / TILESIZE,
677 h => int $pb->get_height / TILESIZE, 1014 h => int $pb->get_height / TILESIZE,
678 }; 1015 };
679
680 1016
681 $idx += $tile->{w} * $tile->{h}; 1017 $idx += $tile->{w} * $tile->{h};
1018 }
1019
1020 construct_tilecache_pb $idx, \%cache;
1021
1022 \%cache
682 } 1023 };
683
684 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
685
686 while (my ($name, $tile) = each %cache) {
687 my $tpb = delete $tile->{pb};
688 my $ofs = $tile->{idx};
689
690 for my $x (0 .. $tile->{w} - 1) {
691 for my $y (0 .. $tile->{h} - 1) {
692 my $idx = $ofs + $x + $y * $tile->{w};
693 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
694 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
695 }
696 }
697 }
698
699 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
700
701 \%cache
702 };
703} 1024}
1025
1026=back
704 1027
705=head1 AUTHOR 1028=head1 AUTHOR
706 1029
707 Marc Lehmann <schmorp@schmorp.de> 1030 Marc Lehmann <schmorp@schmorp.de>
708 http://home.schmorp.de/ 1031 http://home.schmorp.de/
… …
711 http://www.ta-sa.org/ 1034 http://www.ta-sa.org/
712 1035
713=cut 1036=cut
714 1037
7151 10381
1039

Diff Legend

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