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.69 by root, Thu Aug 3 10:51:26 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
24our $LIB = $ENV{CROSSFIRE_LIBDIR}; 27use JSON::XS qw(decode_json encode_json);
25 28
26our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; 29our $LIB = $ENV{DELIANTRA_LIBDIR} || $ENV{CROSSFIRE_LIBDIR};
30
31our $OLDDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire"
32 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
33 : File::Spec->tmpdir . "/crossfire";
34
35our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
36 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
37 : File::Spec->tmpdir . "/deliantra";
27 38
28mkdir $VARDIR, 0777; 39mkdir $VARDIR, 0777;
29 40
30sub TILESIZE (){ 32 } 41sub TILESIZE (){ 32 }
42sub CACHESTRIDE (){ 64 }
31 43
32our %ARCH; 44our %ARCH;
45our %FACE; # face32
33our %FACE; 46our %FACEDATA;
34our $TILE; 47our $TILE;
35 48
36our %FIELD_MULTILINE = ( 49our %FIELD_MULTILINE = (
37 msg => "endmsg", 50 msg => "endmsg",
38 lore => "endlore", 51 lore => "endlore",
… …
44 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);
45 58
46# same as in server save routine, to (hopefully) be compatible 59# same as in server save routine, to (hopefully) be compatible
47# to the other editors. 60# to the other editors.
48our @FIELD_ORDER_MAP = (qw( 61our @FIELD_ORDER_MAP = (qw(
62 file_format_version
49 name swap_time reset_timeout fixed_resettime difficulty region 63 name attach swap_time reset_timeout fixed_resettime difficulty region
50 shopitems shopgreed shopmin shopmax shoprace 64 shopitems shopgreed shopmin shopmax shoprace
51 darkness width height enter_x enter_y msg maplore 65 darkness width height enter_x enter_y msg maplore
52 unique template 66 unique template
53 outdoor temp pressure humid windspeed winddir sky nosmooth 67 outdoor temp pressure humid windspeed winddir sky nosmooth
54 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
55)); 69));
56 70
57our @FIELD_ORDER = (qw( 71our @FIELD_ORDER = (qw(
72 inherit
73
58 elevation 74 elevation
59 75
60 name name_pl custom_name title race 76 name name_pl custom_name attach title race
61 slaying skill msg lore other_arch face 77 slaying skill msg lore other_arch
62 #todo-events
63 animation is_animated 78 face animation is_animated
79 magicmap smoothlevel smoothface
64 str dex con wis pow cha int 80 str dex con wis pow cha int
65 hp maxhp sp maxsp grace maxgrace 81 hp maxhp sp maxsp grace maxgrace
66 exp perm_exp expmul 82 exp perm_exp expmul
67 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
68 nrof level direction type subtype attacktype 84 nrof level direction type subtype attacktype
… …
76 resist_life_stealing resist_disease 92 resist_life_stealing resist_disease
77 93
78 path_attuned path_repelled path_denied material materialname 94 path_attuned path_repelled path_denied material materialname
79 value carrying weight invisible state magic 95 value carrying weight invisible state magic
80 last_heal last_sp last_grace last_eat 96 last_heal last_sp last_grace last_eat
81 connected glow_radius randomitems npx_status npc_program 97 connected glow_radius randomitems tresure_env npx_status npc_program
82 run_away pick_up container will_apply smoothlevel 98 run_away pick_up container will_apply smoothlevel
83 current_weapon_script weapontype tooltype elevation client_type 99 current_weapon_script weapontype tooltype elevation client_type
84 item_power duration range 100 item_power duration range
85 range_modifier duration_modifier dam_modifier gen_sp_armour 101 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 102 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 113 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 114 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 115 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 116 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 117 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
118 precious
102 119
103 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
104 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
105)); 122));
106 123
… …
123sub MOVE_FLY_LOW (){ 0x02 } 140sub MOVE_FLY_LOW (){ 0x02 }
124sub MOVE_FLY_HIGH (){ 0x04 } 141sub MOVE_FLY_HIGH (){ 0x04 }
125sub MOVE_FLYING (){ 0x06 } 142sub MOVE_FLYING (){ 0x06 }
126sub MOVE_SWIM (){ 0x08 } 143sub MOVE_SWIM (){ 0x08 }
127sub MOVE_BOAT (){ 0x10 } 144sub MOVE_BOAT (){ 0x10 }
145sub MOVE_SHIP (){ 0x20 }
128sub MOVE_KNOWN (){ 0x1f } # all of above 146sub MOVE_KNOWN (){ 0x3f } # all of above
129sub MOVE_ALLBIT (){ 0x10000 }
130sub 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}
131 248
132sub load_ref($) { 249sub load_ref($) {
133 my ($path) = @_; 250 my ($path) = @_;
134 251
135 open my $fh, "<:raw:perlio", $path 252 open my $fh, "<:raw:perlio", $path
… …
148 close $fh; 265 close $fh;
149 rename "$path~", $path 266 rename "$path~", $path
150 or die "$path: $!"; 267 or die "$path: $!";
151} 268}
152 269
270my %attack_mask = (
271 physical => 0x00000001,
272 magic => 0x00000002,
273 fire => 0x00000004,
274 electricity => 0x00000008,
275 cold => 0x00000010,
276 confusion => 0x00000020,
277 acid => 0x00000040,
278 drain => 0x00000080,
279 weaponmagic => 0x00000100,
280 ghosthit => 0x00000200,
281 poison => 0x00000400,
282 slow => 0x00000800,
283 paralyze => 0x00001000,
284 turn_undead => 0x00002000,
285 fear => 0x00004000,
286 cancellation => 0x00008000,
287 deplete => 0x00010000,
288 death => 0x00020000,
289 chaos => 0x00040000,
290 counterspell => 0x00080000,
291 godpower => 0x00100000,
292 holyword => 0x00200000,
293 blind => 0x00400000,
294 internal => 0x00800000,
295 life_stealing => 0x01000000,
296 disease => 0x02000000,
297);
298
299sub _add_resist($$$) {
300 my ($ob, $mask, $value) = @_;
301
302 while (my ($k, $v) = each %attack_mask) {
303 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
304 }
305}
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
153# object as in "Object xxx", i.e. archetypes 338# object as in "Object xxx", i.e. archetypes
154sub normalize_object($) { 339sub normalize_object($) {
155 my ($ob) = @_; 340 my ($ob) = @_;
156 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
157 # nuke outdated or never supported fields 375 # nuke outdated or never supported fields
158 delete $ob->{$_} for qw( 376 delete @$ob{qw(
159 can_knockback can_parry can_impale can_cut can_dam_armour 377 can_knockback can_parry can_impale can_cut can_dam_armour
160 can_apply pass_thru can_pass_thru 378 can_apply pass_thru can_pass_thru color_bg color_fg
161 ); 379 )};
380
381 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
382 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
383 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
162 384
163 # convert movement strings to bitsets 385 # convert movement strings to bitsets
164 for my $attr (keys %FIELD_MOVEMENT) { 386 for my $attr (keys %FIELD_MOVEMENT) {
165 next unless exists $ob->{$attr}; 387 next unless exists $ob->{$attr};
166 388
167 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 389 $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 } 390 }
194 391
195 # convert outdated movement flags to new movement sets 392 # convert outdated movement flags to new movement sets
196 if (defined (my $v = delete $ob->{no_pass})) { 393 if (defined (my $v = delete $ob->{no_pass})) {
197 $ob->{move_block} = $v ? MOVE_ALL : 0; 394 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
198 } 395 }
199 if (defined (my $v = delete $ob->{slow_move})) { 396 if (defined (my $v = delete $ob->{slow_move})) {
200 $ob->{move_slow} |= MOVE_WALK; 397 $ob->{move_slow} += "walk";
201 $ob->{move_slow_penalty} = $v; 398 $ob->{move_slow_penalty} = $v;
202 } 399 }
203 if (defined (my $v = delete $ob->{walk_on})) { 400 if (defined (my $v = delete $ob->{walk_on})) {
204 $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" }
205 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
206 : $ob->{move_on} & ~MOVE_WALK;
207 } 402 }
208 if (defined (my $v = delete $ob->{walk_off})) { 403 if (defined (my $v = delete $ob->{walk_off})) {
209 $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" }
210 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
211 : $ob->{move_off} & ~MOVE_WALK;
212 } 405 }
213 if (defined (my $v = delete $ob->{fly_on})) { 406 if (defined (my $v = delete $ob->{fly_on})) {
214 $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" }
215 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
216 : $ob->{move_on} & ~MOVE_FLY_LOW;
217 } 408 }
218 if (defined (my $v = delete $ob->{fly_off})) { 409 if (defined (my $v = delete $ob->{fly_off})) {
219 $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" }
220 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
221 : $ob->{move_off} & ~MOVE_FLY_LOW;
222 } 411 }
223 if (defined (my $v = delete $ob->{flying})) { 412 if (defined (my $v = delete $ob->{flying})) {
224 $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" }
225 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
226 : $ob->{move_type} & ~MOVE_FLY_LOW;
227 } 414 }
228 415
229 # convert idiotic event_xxx things into objects 416 # convert idiotic event_xxx things into objects
230 while (my ($event, $subtype) = each %EVENT_TYPE) { 417 while (my ($event, $subtype) = each %EVENT_TYPE) {
231 if (exists $ob->{"event_${event}_plugin"}) { 418 if (exists $ob->{"event_${event}_plugin"}) {
… …
235 slaying => delete $ob->{"event_${event}"}, 422 slaying => delete $ob->{"event_${event}"},
236 name => delete $ob->{"event_${event}_options"}, 423 name => delete $ob->{"event_${event}_options"},
237 }; 424 };
238 } 425 }
239 } 426 }
427
428 # some archetypes had "+3" instead of the canonical "3", so fix
429 $ob->{dam} *= 1 if exists $ob->{dam};
240 430
241 $ob 431 $ob
242} 432}
243 433
244# arch as in "arch xxx", ie.. objects 434# arch as in "arch xxx", ie.. objects
… …
286 } 476 }
287 477
288 $ob 478 $ob
289} 479}
290 480
481sub attr_thaw($) {
482 my ($ob) = @_;
483
484 $ob->{attach} = decode_json $ob->{attach}
485 if exists $ob->{attach};
486
487 $ob
488}
489
490sub attr_freeze($) {
491 my ($ob) = @_;
492
493 $ob->{attach} = Deliantra::encode_json $ob->{attach}
494 if exists $ob->{attach};
495
496 $ob
497}
498
291sub read_pak($) { 499sub read_pak($) {
292 my ($path) = @_; 500 my ($path) = @_;
293 501
294 my %pak; 502 my %pak;
295 503
… …
308sub read_arch($;$) { 516sub read_arch($;$) {
309 my ($path, $toplevel) = @_; 517 my ($path, $toplevel) = @_;
310 518
311 my %arc; 519 my %arc;
312 my ($more, $prev); 520 my ($more, $prev);
521 my $comment;
313 522
314 open my $fh, "<:raw:perlio:utf8", $path 523 open my $fh, "<:raw:perlio:utf8", $path
315 or Carp::croak "$path: $!"; 524 or Carp::croak "$path: $!";
316 525
317# binmode $fh; 526# binmode $fh;
… …
321 530
322 while (<$fh>) { 531 while (<$fh>) {
323 s/\s+$//; 532 s/\s+$//;
324 if (/^end$/i) { 533 if (/^end$/i) {
325 last; 534 last;
535
326 } elsif (/^arch (\S+)$/i) { 536 } elsif (/^arch (\S+)$/i) {
327 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 537 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
538
328 } elsif (/^lore$/i) { 539 } elsif (/^lore$/i) {
329 while (<$fh>) { 540 while (<$fh>) {
330 last if /^endlore\s*$/i; 541 last if /^endlore\s*$/i;
331 $arc{lore} .= $_; 542 $arc{lore} .= $_;
332 } 543 }
… …
341 chomp; 552 chomp;
342 push @{ $arc{anim} }, $_; 553 push @{ $arc{anim} }, $_;
343 } 554 }
344 } elsif (/^(\S+)\s*(.*)$/) { 555 } elsif (/^(\S+)\s*(.*)$/) {
345 $arc{lc $1} = $2; 556 $arc{lc $1} = $2;
346 } elsif (/^\s*($|#)/) { 557 } elsif (/^\s*#/) {
558 $arc{_comment} .= "$_\n";
559
560 } elsif (/^\s*$/) {
347 # 561 #
348 } else { 562 } else {
349 warn "$path: unparsable line '$_' in arch $arc{_name}"; 563 warn "$path: unparsable line '$_' in arch $arc{_name}";
350 } 564 }
351 } 565 }
… …
357 s/\s+$//; 571 s/\s+$//;
358 if (/^more$/i) { 572 if (/^more$/i) {
359 $more = $prev; 573 $more = $prev;
360 } elsif (/^object (\S+)$/i) { 574 } elsif (/^object (\S+)$/i) {
361 my $name = $1; 575 my $name = $1;
362 my $arc = 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};
579 $arc->{_atype} = 'object';
363 580
364 if ($more) { 581 if ($more) {
365 $more->{more} = $arc; 582 $more->{more} = $arc;
366 } else { 583 } else {
367 $arc{$name} = $arc; 584 $arc{$name} = $arc;
368 } 585 }
369 $prev = $arc; 586 $prev = $arc;
370 $more = undef; 587 $more = undef;
371 } elsif (/^arch (\S+)$/i) { 588 } elsif (/^arch (\S+)$/i) {
372 my $name = $1; 589 my $name = $1;
373 my $arc = 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};
593 $arc->{_atype} = 'arch';
374 594
375 if ($more) { 595 if ($more) {
376 $more->{more} = $arc; 596 $more->{more} = $arc;
377 } else { 597 } else {
378 push @{ $arc{arch} }, $arc; 598 push @{ $arc{arch} }, $arc;
… …
386 push @{$toplevel->{lev_array}}, $_+0; 606 push @{$toplevel->{lev_array}}, $_+0;
387 } 607 }
388 } else { 608 } else {
389 $toplevel->{$1} = $2; 609 $toplevel->{$1} = $2;
390 } 610 }
611 } elsif (/^\s*#/) {
612 $comment .= "$_\n";
391 } elsif (/^\s*($|#)/) { 613 } elsif (/^\s*($|#)/) {
392 # 614 #
393 } else { 615 } else {
394 die "$path: unparseable top-level line '$_'"; 616 die "$path: unparseable top-level line '$_'";
395 } 617 }
396 } 618 }
397 619
398 undef $parse_block; # work around bug in perl not freeing $fh etc. 620 undef $parse_block; # work around bug in perl not freeing $fh etc.
399 621
400 \%arc 622 \%arc
623}
624
625sub archlist_to_string {
626 my ($arch) = @_;
627
628 my $str;
629
630 my $append; $append = sub {
631 my %a = %{$_[0]};
632
633 Deliantra::attr_freeze \%a;
634 Deliantra::normalize_arch \%a;
635
636 # undo the bit-split we did before
637 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
638 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
639 | (delete $a{attack_movement_bits_4_7});
640 }
641
642 if (my $comment = delete $a{_comment}) {
643 if ($comment =~ /[^\n\s#]/) {
644 $str .= $comment;
645 }
646 }
647
648 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
649
650 my $inv = delete $a{inventory};
651 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
652 my $anim = delete $a{anim};
653
654 if ($a{_atype} eq 'object') {
655 $str .= join "\n", "anim", @$anim, "mina\n"
656 if $anim;
657 }
658
659 my @kv;
660
661 for ($a{_name} eq "map"
662 ? @Deliantra::FIELD_ORDER_MAP
663 : @Deliantra::FIELD_ORDER) {
664 push @kv, [$_, delete $a{$_}]
665 if exists $a{$_};
666 }
667
668 for (sort keys %a) {
669 next if /^_/; # ignore our _-keys
670 push @kv, [$_, delete $a{$_}];
671 }
672
673 for (@kv) {
674 my ($k, $v) = @$_;
675
676 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
677 $v =~ s/\n$//;
678 $str .= "$k\n$v\n$end\n";
679 } else {
680 $str .= "$k $v\n";
681 }
682 }
683
684 if ($inv) {
685 $append->($_) for @$inv;
686 }
687
688 $str .= "end\n";
689
690 if ($a{_atype} eq 'object') {
691 if ($more) {
692 $str .= "more\n";
693 $append->($more) if $more;
694 } else {
695 $str .= "\n";
696 }
697 }
698 };
699
700 for (@$arch) {
701 $append->($_);
702 }
703
704 $str
401} 705}
402 706
403# put all archs into a hash with editor_face as it's key 707# put all archs into a hash with editor_face as it's key
404# NOTE: the arrays in the hash values are references to 708# NOTE: the arrays in the hash values are references to
405# the archs from $ARCH 709# the archs from $ARCH
… …
426 my ($a) = @_; 730 my ($a) = @_;
427 731
428 my $o = $ARCH{$a->{_name}} 732 my $o = $ARCH{$a->{_name}}
429 or return; 733 or return;
430 734
431 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"}
432 or (warn "no face data found for arch '$a->{_name}'"), return; 738 or (warn "no face data found for arch '$a->{_name}'"), return;
739 }
433 740
434 if ($face->{w} > 1 || $face->{h} > 1) { 741 if ($face->{w} > 1 || $face->{h} > 1) {
435 # bigface 742 # bigface
436 return (0, 0, $face->{w} - 1, $face->{h} - 1); 743 return (0, 0, $face->{w} - 1, $face->{h} - 1);
437 744
… …
470=cut 777=cut
471 778
472sub arch_attr($) { 779sub arch_attr($) {
473 my ($obj) = @_; 780 my ($obj) = @_;
474 781
475 require Crossfire::Data; 782 require Deliantra::Data;
476 783
477 my $root; 784 my $root;
478 my $attr = { }; 785 my $attr = { };
479 786
480 my $arch = $ARCH{ $obj->{_name} }; 787 my $arch = $ARCH{ $obj->{_name} };
481 my $type = $obj->{type} || $arch->{type}; 788 my $type = $obj->{type} || $arch->{type};
482 789
483 if ($type > 0) { 790 if ($type > 0) {
484 $root = $Crossfire::Data::ATTR{$type}; 791 $root = $Deliantra::Data::ATTR{$type};
485 } else { 792 } else {
486 my %a = (%$arch, %$obj); 793 my %a = (%$arch, %$obj);
487 794
488 if ($a{is_floor} && !$a{alive}) { 795 if ($a{is_floor} && !$a{alive}) {
489 $root = $Crossfire::Data::TYPE{Floor}; 796 $root = $Deliantra::Data::TYPE{Floor};
490 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 797 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
491 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 798 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
492 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 799 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
493 $root = $Crossfire::Data::TYPE{Wall}; 800 $root = $Deliantra::Data::TYPE{Wall};
494 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 801 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
495 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 802 $root = $Deliantra::Data::TYPE{"Weak Wall"};
496 } else { 803 } else {
497 $root = $Crossfire::Data::TYPE{Misc}; 804 $root = $Deliantra::Data::TYPE{Misc};
498 } 805 }
499 } 806 }
500 807
501 my @import = ($root); 808 my @import = ($root);
502 809
503 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 810 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
504 unless $type == 116; 811 unless $type == 116;
505 812
506 my (%ignore); 813 my (%ignore);
507 my (@section_order, %section, @attr_order); 814 my (@section_order, %section, @attr_order);
508 815
509 while (my $type = shift @import) { 816 while (my $type = shift @import) {
817 push @import,
818 grep $_,
819 map $Deliantra::Data::TYPE{$_},
510 push @import, @{$type->{import} || []}; 820 @{$type->{import} || []};
511 821
512 $attr->{$_} ||= $type->{$_} 822 $attr->{$_} ||= $type->{$_}
513 for qw(name desc use); 823 for qw(name desc use);
514 824
515 for (@{$type->{ignore} || []}) { 825 for (@{$type->{ignore} || []}) {
… …
544 ]; 854 ];
545 855
546 $attr 856 $attr
547} 857}
548 858
549sub arch_edit_sections {
550# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
551# edit_type = 0;
552# else if (edit_type != 0) {
553# // all flags from 'check_type' must be unset in this arch because they get recalculated now
554# edit_type &= ~check_type;
555# }
556#
557# }
558# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
559# getAttributeValue("alive", defarch) == 1 &&
560# (getAttributeValue("monster", defarch) == 1 ||
561# getAttributeValue("generator", defarch) == 1)) {
562# // Monster: monsters/npcs/generators
563# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
564# }
565# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
566# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
567# // Walls
568# edit_type |= IGUIConstants.TILE_EDIT_WALL;
569# }
570# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
571# getAttributeValue("connected", defarch) != 0) {
572# // Connected Objects
573# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
574# }
575# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
576# arch_type == 66 || arch_type == 41 || arch_type == 95) {
577# // Exit: teleporter/exit/trapdoors
578# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
579# }
580# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
581# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
582# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
583# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
584# arch_type == 124 || arch_type == 130)) {
585# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
586# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
587# }
588# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
589# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
590# arch_type == 91 || arch_type == 21 || arch_type == 24) {
591# // Door: door/special door/gates + keys
592# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
593# }
594# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
595# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
596# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
597# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
598# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
599# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
600# arch_type == 122 || arch_type == 3)) {
601# // Equipment: weapons/armour/wands/rods
602# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
603# }
604#
605# return(edit_type);
606#
607#
608}
609
610sub cache_file($$&&) { 859sub cache_file($$&&) {
611 my ($src, $cache, $load, $create) = @_; 860 my ($src, $cache, $load, $create) = @_;
612 861
613 my ($size, $mtime) = (stat $src)[7,9] 862 my ($size, $mtime) = (stat $src)[7,9]
614 or Carp::croak "$src: $!"; 863 or Carp::croak "$src: $!";
… …
662 }, sub { 911 }, sub {
663 read_arch "$LIB/archetypes" 912 read_arch "$LIB/archetypes"
664 }; 913 };
665} 914}
666 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
667=item load_tilecache 946=item load_tilecache
668 947
669(Re-)Load %TILE and %FACE. 948(Re-)Load %TILE and %FACE.
670 949
671=cut 950=cut
672 951
673sub load_tilecache() { 952sub load_tilecache() {
674 require Gtk2; 953 require Gtk2;
675 954
676 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 955 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
677 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
678 or die "$VARDIR/tilecache.png: $!";
679 *FACE = $_[0];
680 }, sub { 956 sub {
681 my $tile = read_pak "$LIB/crossfire.0";
682
683 my %cache; 957 my %cache;
958 my $facedata = Storable::retrieve "$LIB/facedata";
684 959
960 $facedata->{version} == 2
961 or die "$LIB/facedata: version mismatch, cannot proceed.";
962
963 my $faces = $facedata->{faceinfo};
685 my $idx = 0; 964 my $idx = 0;
686 965
687 for my $name (sort keys %$tile) { 966 for (sort keys %$faces) {
967 my ($face, $info) = ($_, $faces->{$_});
968
688 my $pb = new Gtk2::Gdk::PixbufLoader; 969 my $pb = new Gtk2::Gdk::PixbufLoader;
689 $pb->write ($tile->{$name}); 970 $pb->write ($info->{data32});
690 $pb->close; 971 $pb->close;
691 my $pb = $pb->get_pixbuf; 972 my $pb = $pb->get_pixbuf;
692 973
693 my $tile = $cache{$name} = { 974 my $tile = $cache{$face} = {
694 pb => $pb, 975 pb => $pb,
695 idx => $idx, 976 idx => $idx,
696 w => int $pb->get_width / TILESIZE, 977 w => int $pb->get_width / TILESIZE,
697 h => int $pb->get_height / TILESIZE, 978 h => int $pb->get_height / TILESIZE,
698 }; 979 };
699
700 980
701 $idx += $tile->{w} * $tile->{h}; 981 $idx += $tile->{w} * $tile->{h};
982 }
983
984 construct_tilecache_pb $idx, \%cache;
985
986 \%cache
702 } 987 };
703
704 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
705
706 while (my ($name, $tile) = each %cache) {
707 my $tpb = delete $tile->{pb};
708 my $ofs = $tile->{idx};
709
710 for my $x (0 .. $tile->{w} - 1) {
711 for my $y (0 .. $tile->{h} - 1) {
712 my $idx = $ofs + $x + $y * $tile->{w};
713 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
714 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
715 }
716 }
717 }
718
719 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
720
721 \%cache
722 };
723} 988}
724 989
725=head1 AUTHOR 990=head1 AUTHOR
726 991
727 Marc Lehmann <schmorp@schmorp.de> 992 Marc Lehmann <schmorp@schmorp.de>
… …
731 http://www.ta-sa.org/ 996 http://www.ta-sa.org/
732 997
733=cut 998=cut
734 999
7351 10001
1001

Diff Legend

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