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.132 by root, Wed Sep 2 22:38:57 2009 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.25';
10 10
11use strict; 11use common::sense;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
15use Carp (); 15use Carp ();
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
27use JSON::XS qw(decode_json encode_json);
28
24our $LIB = $ENV{CROSSFIRE_LIBDIR}; 29our $LIB = $ENV{DELIANTRA_LIBDIR};
25 30
26our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; 31our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
32 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
33 : File::Spec->tmpdir . "/deliantra";
27 34
28mkdir $VARDIR, 0777; 35mkdir $VARDIR, 0777;
29 36
30sub TILESIZE (){ 32 } 37sub TILESIZE (){ 32 }
38sub CACHESTRIDE (){ 64 }
31 39
32our %ARCH; 40our %ARCH;
41our %FACE; # face32
33our %FACE; 42our %FACEDATA;
34our $TILE; 43our $TILE;
35 44
36our %FIELD_MULTILINE = ( 45our %FIELD_MULTILINE = (
37 msg => "endmsg", 46 msg => "endmsg",
38 lore => "endlore", 47 lore => "endlore",
… …
44 qw(move_type move_block move_allow move_on move_off move_slow); 53 qw(move_type move_block move_allow move_on move_off move_slow);
45 54
46# same as in server save routine, to (hopefully) be compatible 55# same as in server save routine, to (hopefully) be compatible
47# to the other editors. 56# to the other editors.
48our @FIELD_ORDER_MAP = (qw( 57our @FIELD_ORDER_MAP = (qw(
58 file_format_version
49 name swap_time reset_timeout fixed_resettime difficulty region 59 name attach swap_time reset_timeout fixed_resettime difficulty region
50 shopitems shopgreed shopmin shopmax shoprace 60 shopitems shopgreed shopmin shopmax shoprace
51 darkness width height enter_x enter_y msg maplore 61 darkness width height enter_x enter_y msg maplore
52 unique template 62 unique template
53 outdoor temp pressure humid windspeed winddir sky nosmooth 63 outdoor temp pressure humid windspeed winddir sky nosmooth
54 tile_path_1 tile_path_2 tile_path_3 tile_path_4 64 tile_path_1 tile_path_2 tile_path_3 tile_path_4
55)); 65));
56 66
57our @FIELD_ORDER = (qw( 67our @FIELD_ORDER = (qw(
68 inherit
69
58 elevation 70 elevation
59 71
60 name name_pl custom_name title race 72 name name_pl custom_name attach title race
61 slaying skill msg lore other_arch face 73 slaying skill msg lore other_arch
62 #todo-events 74 sound sound_destroy face animation is_animated
63 animation is_animated 75 magicmap smoothlevel smoothface
64 str dex con wis pow cha int 76 str dex con wis pow cha int
65 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
66 exp perm_exp expmul 78 exp perm_exp expmul
67 food dam luck wc ac x y speed speed_left move_state attack_movement 79 food dam luck wc ac x y speed speed_left move_state attack_movement
68 nrof level direction type subtype attacktype 80 nrof level direction type subtype attacktype
… …
76 resist_life_stealing resist_disease 88 resist_life_stealing resist_disease
77 89
78 path_attuned path_repelled path_denied material materialname 90 path_attuned path_repelled path_denied material materialname
79 value carrying weight invisible state magic 91 value carrying weight invisible state magic
80 last_heal last_sp last_grace last_eat 92 last_heal last_sp last_grace last_eat
81 connected glow_radius randomitems npx_status npc_program 93 connected glow_radius randomitems tresure_env npx_status npc_program
82 run_away pick_up container will_apply smoothlevel 94 run_away pick_up container will_apply smoothlevel
83 current_weapon_script weapontype tooltype elevation client_type 95 current_weapon_script weapontype tooltype elevation client_type
84 item_power duration range 96 item_power duration range
85 range_modifier duration_modifier dam_modifier gen_sp_armour 97 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 98 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 109 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 110 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 111 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 112 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 113 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
114 precious
102 115
103 body_range body_arm body_torso body_head body_neck body_skill 116 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 117 body_finger body_shoulder body_foot body_hand body_wrist body_waist
105)); 118));
106 119
… …
123sub MOVE_FLY_LOW (){ 0x02 } 136sub MOVE_FLY_LOW (){ 0x02 }
124sub MOVE_FLY_HIGH (){ 0x04 } 137sub MOVE_FLY_HIGH (){ 0x04 }
125sub MOVE_FLYING (){ 0x06 } 138sub MOVE_FLYING (){ 0x06 }
126sub MOVE_SWIM (){ 0x08 } 139sub MOVE_SWIM (){ 0x08 }
127sub MOVE_BOAT (){ 0x10 } 140sub MOVE_BOAT (){ 0x10 }
141sub MOVE_SHIP (){ 0x20 }
128sub MOVE_KNOWN (){ 0x1f } # all of above 142sub MOVE_KNOWN (){ 0x3f } # all of above
129sub MOVE_ALLBIT (){ 0x10000 }
130sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 143sub MOVE_ALL (){ 0x10000 } # very special value
144
145our %MOVE_TYPE = (
146 walk => MOVE_WALK,
147 fly_low => MOVE_FLY_LOW,
148 fly_high => MOVE_FLY_HIGH,
149 flying => MOVE_FLYING,
150 swim => MOVE_SWIM,
151 boat => MOVE_BOAT,
152 ship => MOVE_SHIP,
153 all => MOVE_ALL,
154);
155
156our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
157
158{
159 package Deliantra::MoveType;
160
161 use overload
162 '=' => sub { bless [@{$_[0]}], ref $_[0] },
163 '""' => \&as_string,
164 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
165 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
166 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
167 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
168 'x=' => sub {
169 my $cur = $_[0] >= $_[1];
170 if (!defined $cur) {
171 if ($_[0] >= "all") {
172 $_[0] -= $_[1];
173 } else {
174 $_[0] += $_[1];
175 }
176 } elsif ($cur) {
177 $_[0] -= $_[1];
178 } else {
179 $_[0] /= $_[1];
180 }
181
182 $_[0]
183 },
184 'eq' => sub { "$_[0]" eq "$_[1]" },
185 'ne' => sub { "$_[0]" ne "$_[1]" },
186 ;
187
188 sub TO_JSON {
189 $_[0][0]
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"}) {
… …
236 name => delete $ob->{"event_${event}_options"}, 423 name => delete $ob->{"event_${event}_options"},
237 }; 424 };
238 } 425 }
239 } 426 }
240 427
428 # some archetypes had "+3" instead of the canonical "3", so fix
429 $ob->{dam} *= 1 if exists $ob->{dam};
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
245sub normalize_arch($) { 435sub normalize_arch($) {
246 my ($ob) = @_; 436 my ($ob) = @_;
247 437
248 normalize_object $ob; 438 normalize_object $ob;
439
440 return if $ob->{_atype} eq "object";
249 441
250 my $arch = $ARCH{$ob->{_name}} 442 my $arch = $ARCH{$ob->{_name}}
251 or (warn "$ob->{_name}: no such archetype", return $ob); 443 or (warn "$ob->{_name}: no such archetype", return $ob);
252 444
253 if ($arch->{type} == 22) { # map 445 if ($arch->{type} == 22) { # map
… …
286 } 478 }
287 479
288 $ob 480 $ob
289} 481}
290 482
483sub attr_thaw($) {
484 my ($ob) = @_;
485
486 $ob->{attach} = decode_json $ob->{attach}
487 if exists $ob->{attach};
488
489 $ob
490}
491
492sub attr_freeze($) {
493 my ($ob) = @_;
494
495 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
496 if exists $ob->{attach};
497
498 $ob
499}
500
291sub read_pak($) { 501sub read_pak($) {
292 my ($path) = @_; 502 my ($path) = @_;
293 503
294 my %pak; 504 my %pak;
295 505
… …
308sub read_arch($;$) { 518sub read_arch($;$) {
309 my ($path, $toplevel) = @_; 519 my ($path, $toplevel) = @_;
310 520
311 my %arc; 521 my %arc;
312 my ($more, $prev); 522 my ($more, $prev);
523 my $comment;
313 524
314 open my $fh, "<:raw:perlio:utf8", $path 525 open my $fh, "<:utf8", $path
315 or Carp::croak "$path: $!"; 526 or Carp::croak "$path: $!";
316 527
317# binmode $fh; 528# binmode $fh;
318 529
319 my $parse_block; $parse_block = sub { 530 my $parse_block; $parse_block = sub {
… …
321 532
322 while (<$fh>) { 533 while (<$fh>) {
323 s/\s+$//; 534 s/\s+$//;
324 if (/^end$/i) { 535 if (/^end$/i) {
325 last; 536 last;
537
326 } elsif (/^arch (\S+)$/i) { 538 } elsif (/^arch (\S+)$/i) {
327 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 539 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
540
328 } elsif (/^lore$/i) { 541 } elsif (/^lore$/i) {
329 while (<$fh>) { 542 while (<$fh>) {
330 last if /^endlore\s*$/i; 543 last if /^endlore\s*$/i;
331 $arc{lore} .= $_; 544 $arc{lore} .= $_;
332 } 545 }
… …
341 chomp; 554 chomp;
342 push @{ $arc{anim} }, $_; 555 push @{ $arc{anim} }, $_;
343 } 556 }
344 } elsif (/^(\S+)\s*(.*)$/) { 557 } elsif (/^(\S+)\s*(.*)$/) {
345 $arc{lc $1} = $2; 558 $arc{lc $1} = $2;
346 } elsif (/^\s*($|#)/) { 559 } elsif (/^\s*#/) {
560 $arc{_comment} .= "$_\n";
561
562 } elsif (/^\s*$/) {
347 # 563 #
348 } else { 564 } else {
349 warn "$path: unparsable line '$_' in arch $arc{_name}"; 565 warn "$path: unparsable line '$_' in arch $arc{_name}";
350 } 566 }
351 } 567 }
… …
357 s/\s+$//; 573 s/\s+$//;
358 if (/^more$/i) { 574 if (/^more$/i) {
359 $more = $prev; 575 $more = $prev;
360 } elsif (/^object (\S+)$/i) { 576 } elsif (/^object (\S+)$/i) {
361 my $name = $1; 577 my $name = $1;
362 my $arc = normalize_object $parse_block->(_name => $name); 578 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
579 undef $comment;
580 delete $arc{_comment} unless length $arc{_comment};
581 $arc->{_atype} = 'object';
363 582
364 if ($more) { 583 if ($more) {
365 $more->{more} = $arc; 584 $more->{more} = $arc;
366 } else { 585 } else {
367 $arc{$name} = $arc; 586 $arc{$name} = $arc;
368 } 587 }
369 $prev = $arc; 588 $prev = $arc;
370 $more = undef; 589 $more = undef;
371 } elsif (/^arch (\S+)$/i) { 590 } elsif (/^arch (\S+)$/i) {
372 my $name = $1; 591 my $name = $1;
373 my $arc = normalize_arch $parse_block->(_name => $name); 592 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
593 undef $comment;
594 delete $arc{_comment} unless length $arc{_comment};
595 $arc->{_atype} = 'arch';
374 596
375 if ($more) { 597 if ($more) {
376 $more->{more} = $arc; 598 $more->{more} = $arc;
377 } else { 599 } else {
378 push @{ $arc{arch} }, $arc; 600 push @{ $arc{arch} }, $arc;
… …
386 push @{$toplevel->{lev_array}}, $_+0; 608 push @{$toplevel->{lev_array}}, $_+0;
387 } 609 }
388 } else { 610 } else {
389 $toplevel->{$1} = $2; 611 $toplevel->{$1} = $2;
390 } 612 }
613 } elsif (/^\s*#/) {
614 $comment .= "$_\n";
391 } elsif (/^\s*($|#)/) { 615 } elsif (/^\s*($|#)/) {
392 # 616 #
393 } else { 617 } else {
394 die "$path: unparseable top-level line '$_'"; 618 die "$path: unparseable top-level line '$_'";
395 } 619 }
396 } 620 }
397 621
398 undef $parse_block; # work around bug in perl not freeing $fh etc. 622 undef $parse_block; # work around bug in perl not freeing $fh etc.
399 623
400 \%arc 624 \%arc
625}
626
627sub archlist_to_string {
628 my ($arch) = @_;
629
630 my $str;
631
632 my $append; $append = sub {
633 my %a = %{$_[0]};
634
635 Deliantra::attr_freeze \%a;
636 Deliantra::normalize_arch \%a;
637
638 # undo the bit-split we did before
639 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
640 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
641 | (delete $a{attack_movement_bits_4_7});
642 }
643
644 if (my $comment = delete $a{_comment}) {
645 if ($comment =~ /[^\n\s#]/) {
646 $str .= $comment;
647 }
648 }
649
650 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
651
652 my $inv = delete $a{inventory};
653 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
654 my $anim = delete $a{anim};
655
656 if ($a{_atype} eq 'object') {
657 $str .= join "\n", "anim", @$anim, "mina\n"
658 if $anim;
659 }
660
661 my @kv;
662
663 for ($a{_name} eq "map"
664 ? @Deliantra::FIELD_ORDER_MAP
665 : @Deliantra::FIELD_ORDER) {
666 push @kv, [$_, delete $a{$_}]
667 if exists $a{$_};
668 }
669
670 for (sort keys %a) {
671 next if /^_/; # ignore our _-keys
672 push @kv, [$_, delete $a{$_}];
673 }
674
675 for (@kv) {
676 my ($k, $v) = @$_;
677
678 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
679 $v =~ s/\n$//;
680 $str .= "$k\n$v\n$end\n";
681 } else {
682 $str .= "$k $v\n";
683 }
684 }
685
686 if ($inv) {
687 $append->($_) for @$inv;
688 }
689
690 $str .= "end\n";
691
692 if ($a{_atype} eq 'object') {
693 if ($more) {
694 $str .= "more\n";
695 $append->($more) if $more;
696 } else {
697 $str .= "\n";
698 }
699 }
700 };
701
702 for (@$arch) {
703 $append->($_);
704 }
705
706 $str
401} 707}
402 708
403# put all archs into a hash with editor_face as it's key 709# put all archs into a hash with editor_face as it's key
404# NOTE: the arrays in the hash values are references to 710# NOTE: the arrays in the hash values are references to
405# the archs from $ARCH 711# the archs from $ARCH
… …
426 my ($a) = @_; 732 my ($a) = @_;
427 733
428 my $o = $ARCH{$a->{_name}} 734 my $o = $ARCH{$a->{_name}}
429 or return; 735 or return;
430 736
431 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 737 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
738 unless ($face) {
739 $face = $FACE{"blank.x11"}
432 or (warn "no face data found for arch '$a->{_name}'"), return; 740 or (warn "no face data found for arch '$a->{_name}'"), return;
741 }
433 742
434 if ($face->{w} > 1 || $face->{h} > 1) { 743 if ($face->{w} > 1 || $face->{h} > 1) {
435 # bigface 744 # bigface
436 return (0, 0, $face->{w} - 1, $face->{h} - 1); 745 return (0, 0, $face->{w} - 1, $face->{h} - 1);
437 746
… …
470=cut 779=cut
471 780
472sub arch_attr($) { 781sub arch_attr($) {
473 my ($obj) = @_; 782 my ($obj) = @_;
474 783
475 require Crossfire::Data; 784 require Deliantra::Data;
476 785
477 my $root; 786 my $root;
478 my $attr = { }; 787 my $attr = { };
479 788
480 my $arch = $ARCH{ $obj->{_name} }; 789 my $arch = $ARCH{ $obj->{_name} };
481 my $type = $obj->{type} || $arch->{type}; 790 my $type = $obj->{type} || $arch->{type};
482 791
483 if ($type > 0) { 792 if ($type > 0) {
484 $root = $Crossfire::Data::ATTR{$type}; 793 $root = $Deliantra::Data::ATTR{$type};
485 } else { 794 } else {
486 my %a = (%$arch, %$obj); 795 my %a = (%$arch, %$obj);
487 796
488 if ($a{is_floor} && !$a{alive}) { 797 if ($a{is_floor} && !$a{alive}) {
489 $root = $Crossfire::Data::TYPE{Floor}; 798 $root = $Deliantra::Data::TYPE{Floor};
490 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 799 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
491 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 800 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
492 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 801 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
493 $root = $Crossfire::Data::TYPE{Wall}; 802 $root = $Deliantra::Data::TYPE{Wall};
494 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 803 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
495 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 804 $root = $Deliantra::Data::TYPE{"Weak Wall"};
496 } else { 805 } else {
497 $root = $Crossfire::Data::TYPE{Misc}; 806 $root = $Deliantra::Data::TYPE{Misc};
498 } 807 }
499 } 808 }
500 809
501 my @import = ($root); 810 my @import = ($root);
502 811
503 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 812 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
504 unless $type == 116; 813 unless $type == 116;
505 814
506 my (%ignore); 815 my (%ignore);
507 my (@section_order, %section, @attr_order); 816 my (@section_order, %section, @attr_order);
508 817
509 while (my $type = shift @import) { 818 while (my $type = shift @import) {
819 push @import,
820 grep $_,
821 map $Deliantra::Data::TYPE{$_},
510 push @import, @{$type->{import} || []}; 822 @{$type->{import} || []};
511 823
512 $attr->{$_} ||= $type->{$_} 824 $attr->{$_} ||= $type->{$_}
513 for qw(name desc use); 825 for qw(name desc use);
514 826
515 for (@{$type->{ignore} || []}) { 827 for (@{$type->{ignore} || []}) {
… …
544 ]; 856 ];
545 857
546 $attr 858 $attr
547} 859}
548 860
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($$&&) { 861sub cache_file($$&&) {
611 my ($src, $cache, $load, $create) = @_; 862 my ($src, $cache, $load, $create) = @_;
612 863
613 my ($size, $mtime) = (stat $src)[7,9] 864 my ($size, $mtime) = (stat $src)[7,9]
614 or Carp::croak "$src: $!"; 865 or Carp::croak "$src: $!";
… …
662 }, sub { 913 }, sub {
663 read_arch "$LIB/archetypes" 914 read_arch "$LIB/archetypes"
664 }; 915 };
665} 916}
666 917
918sub construct_tilecache_pb {
919 my ($idx, $cache) = @_;
920
921 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
922
923 while (my ($name, $tile) = each %$cache) {
924 my $tpb = delete $tile->{pb};
925 my $ofs = $tile->{idx};
926
927 for my $x (0 .. $tile->{w} - 1) {
928 for my $y (0 .. $tile->{h} - 1) {
929 my $idx = $ofs + $x + $y * $tile->{w};
930 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
931 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
932 }
933 }
934 }
935
936 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
937
938 $cache
939}
940
941sub use_tilecache {
942 my ($face) = @_;
943 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
944 or die "$VARDIR/tilecache.png: $!";
945 *FACE = $_[0];
946}
947
667=item load_tilecache 948=item load_tilecache
668 949
669(Re-)Load %TILE and %FACE. 950(Re-)Load %TILE and %FACE.
670 951
671=cut 952=cut
672 953
673sub load_tilecache() { 954sub load_tilecache() {
674 require Gtk2; 955 require Gtk2;
675 956
676 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 957 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 { 958 sub {
681 my $tile = read_pak "$LIB/crossfire.0";
682
683 my %cache; 959 my %cache;
960 my $facedata = Storable::retrieve "$LIB/facedata";
684 961
962 $facedata->{version} == 2
963 or die "$LIB/facedata: version mismatch, cannot proceed.";
964
965 my $faces = $facedata->{faceinfo};
685 my $idx = 0; 966 my $idx = 0;
686 967
687 for my $name (sort keys %$tile) { 968 for (sort keys %$faces) {
969 my ($face, $info) = ($_, $faces->{$_});
970
688 my $pb = new Gtk2::Gdk::PixbufLoader; 971 my $pb = new Gtk2::Gdk::PixbufLoader;
689 $pb->write ($tile->{$name}); 972 $pb->write ($info->{data32});
690 $pb->close; 973 $pb->close;
691 my $pb = $pb->get_pixbuf; 974 my $pb = $pb->get_pixbuf;
692 975
693 my $tile = $cache{$name} = { 976 my $tile = $cache{$face} = {
694 pb => $pb, 977 pb => $pb,
695 idx => $idx, 978 idx => $idx,
696 w => int $pb->get_width / TILESIZE, 979 w => int $pb->get_width / TILESIZE,
697 h => int $pb->get_height / TILESIZE, 980 h => int $pb->get_height / TILESIZE,
698 }; 981 };
699
700 982
701 $idx += $tile->{w} * $tile->{h}; 983 $idx += $tile->{w} * $tile->{h};
984 }
985
986 construct_tilecache_pb $idx, \%cache;
987
988 \%cache
702 } 989 };
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} 990}
724 991
725=head1 AUTHOR 992=head1 AUTHOR
726 993
727 Marc Lehmann <schmorp@schmorp.de> 994 Marc Lehmann <schmorp@schmorp.de>
… …
731 http://www.ta-sa.org/ 998 http://www.ta-sa.org/
732 999
733=cut 1000=cut
734 1001
7351 10021
1003

Diff Legend

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