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

Diff Legend

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