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.72 by root, Mon Sep 4 17:58:51 2006 UTC vs.
Revision 1.128 by root, Sun Sep 28 05:58:01 2008 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.222';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
16use File::Spec; 16use File::Spec;
17use List::Util qw(min max); 17use List::Util qw(min max);
18use Storable qw(freeze thaw); 18use Storable qw(freeze thaw);
19 19
20our @EXPORT = qw( 20our @EXPORT = qw(
21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents 21 read_pak read_arch
22 *ARCH $TILE *FACE *FACEDATA
23 TILESIZE CACHESTRIDE
24 editor_archs arch_extents
22); 25);
23 26
24use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working 27use JSON::XS qw(decode_json encode_json);
25 28
26sub from_json($) {
27 $JSON::Syck::ImplicitUnicode = 1;
28 JSON::Syck::Load $_[0]
29}
30
31sub to_json($) {
32 $JSON::Syck::ImplicitUnicode = 0;
33 JSON::Syck::Dump $_[0]
34}
35
36our $LIB = $ENV{CROSSFIRE_LIBDIR}; 29our $LIB = $ENV{DELIANTRA_LIBDIR};
37 30
38our $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";
39 34
40mkdir $VARDIR, 0777; 35mkdir $VARDIR, 0777;
41 36
42sub TILESIZE (){ 32 } 37sub TILESIZE (){ 32 }
38sub CACHESTRIDE (){ 64 }
43 39
44our %ARCH; 40our %ARCH;
41our %FACE; # face32
45our %FACE; 42our %FACEDATA;
46our $TILE; 43our $TILE;
47 44
48our %FIELD_MULTILINE = ( 45our %FIELD_MULTILINE = (
49 msg => "endmsg", 46 msg => "endmsg",
50 lore => "endlore", 47 lore => "endlore",
… …
56 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);
57 54
58# same as in server save routine, to (hopefully) be compatible 55# same as in server save routine, to (hopefully) be compatible
59# to the other editors. 56# to the other editors.
60our @FIELD_ORDER_MAP = (qw( 57our @FIELD_ORDER_MAP = (qw(
58 file_format_version
61 name attach swap_time reset_timeout fixed_resettime difficulty region 59 name attach swap_time reset_timeout fixed_resettime difficulty region
62 shopitems shopgreed shopmin shopmax shoprace 60 shopitems shopgreed shopmin shopmax shoprace
63 darkness width height enter_x enter_y msg maplore 61 darkness width height enter_x enter_y msg maplore
64 unique template 62 unique template
65 outdoor temp pressure humid windspeed winddir sky nosmooth 63 outdoor temp pressure humid windspeed winddir sky nosmooth
66 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
67)); 65));
68 66
69our @FIELD_ORDER = (qw( 67our @FIELD_ORDER = (qw(
68 inherit
69
70 elevation 70 elevation
71 71
72 name name_pl custom_name attach title race 72 name name_pl custom_name attach title race
73 slaying skill msg lore other_arch face 73 slaying skill msg lore other_arch
74 #todo-events 74 sound sound_destroy face animation is_animated
75 animation is_animated 75 magicmap smoothlevel smoothface
76 str dex con wis pow cha int 76 str dex con wis pow cha int
77 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
78 exp perm_exp expmul 78 exp perm_exp expmul
79 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
80 nrof level direction type subtype attacktype 80 nrof level direction type subtype attacktype
… …
88 resist_life_stealing resist_disease 88 resist_life_stealing resist_disease
89 89
90 path_attuned path_repelled path_denied material materialname 90 path_attuned path_repelled path_denied material materialname
91 value carrying weight invisible state magic 91 value carrying weight invisible state magic
92 last_heal last_sp last_grace last_eat 92 last_heal last_sp last_grace last_eat
93 connected glow_radius randomitems npx_status npc_program 93 connected glow_radius randomitems tresure_env npx_status npc_program
94 run_away pick_up container will_apply smoothlevel 94 run_away pick_up container will_apply smoothlevel
95 current_weapon_script weapontype tooltype elevation client_type 95 current_weapon_script weapontype tooltype elevation client_type
96 item_power duration range 96 item_power duration range
97 range_modifier duration_modifier dam_modifier gen_sp_armour 97 range_modifier duration_modifier dam_modifier gen_sp_armour
98 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty 98 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
… …
109 known_magical known_cursed can_use_skill been_applied has_ready_scroll 109 known_magical known_cursed can_use_skill been_applied has_ready_scroll
110 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly 110 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
111 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark 111 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
112 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage 112 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
113 activate_on_push activate_on_release is_water use_content_on_gen is_buildable 113 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
114 precious
114 115
115 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
116 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
117)); 118));
118 119
… …
135sub MOVE_FLY_LOW (){ 0x02 } 136sub MOVE_FLY_LOW (){ 0x02 }
136sub MOVE_FLY_HIGH (){ 0x04 } 137sub MOVE_FLY_HIGH (){ 0x04 }
137sub MOVE_FLYING (){ 0x06 } 138sub MOVE_FLYING (){ 0x06 }
138sub MOVE_SWIM (){ 0x08 } 139sub MOVE_SWIM (){ 0x08 }
139sub MOVE_BOAT (){ 0x10 } 140sub MOVE_BOAT (){ 0x10 }
141sub MOVE_SHIP (){ 0x20 }
140sub MOVE_KNOWN (){ 0x1f } # all of above 142sub MOVE_KNOWN (){ 0x3f } # all of above
141sub MOVE_ALLBIT (){ 0x10000 }
142sub 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 = keys %MOVE_TYPE;
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
189sub Deliantra::MoveType::new {
190 my ($class, $string) = @_;
191
192 my $mask;
193 my $value;
194
195 if ($string =~ /^\s*\d+\s*$/) {
196 $mask = MOVE_ALL;
197 $value = $string+0;
198 } else {
199 for (split /\s+/, lc $string) {
200 if (s/^-//) {
201 $mask |= $MOVE_TYPE{$_};
202 $value &= ~$MOVE_TYPE{$_};
203 } else {
204 $mask |= $MOVE_TYPE{$_};
205 $value |= $MOVE_TYPE{$_};
206 }
207 }
208 }
209
210 (bless [$mask, $value], $class)->normalise
211}
212
213sub Deliantra::MoveType::normalise {
214 my ($self) = @_;
215
216 if ($self->[0] & MOVE_ALL) {
217 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
218 $self->[0] &= $mask;
219 $self->[1] &= $mask;
220 }
221
222 $self->[1] &= $self->[0];
223
224 $self
225}
226
227sub Deliantra::MoveType::as_string {
228 my ($self) = @_;
229
230 my @res;
231
232 my ($mask, $value) = @$self;
233
234 for (@Deliantra::MOVE_TYPE) {
235 my $bit = $Deliantra::MOVE_TYPE{$_};
236 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
237 $mask &= ~$bit;
238 push @res, $value & $bit ? $_ : "-$_";
239 }
240 }
241
242 join " ", @res
243}
143 244
144sub load_ref($) { 245sub load_ref($) {
145 my ($path) = @_; 246 my ($path) = @_;
146 247
147 open my $fh, "<:raw:perlio", $path 248 open my $fh, "<:raw:perlio", $path
… …
193 294
194sub _add_resist($$$) { 295sub _add_resist($$$) {
195 my ($ob, $mask, $value) = @_; 296 my ($ob, $mask, $value) = @_;
196 297
197 while (my ($k, $v) = each %attack_mask) { 298 while (my ($k, $v) = each %attack_mask) {
198 $ob->{"resist_$k"} += $value if $mask & $v; 299 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
199 } 300 }
200} 301}
302
303my %MATERIAL = reverse
304 paper => 1,
305 iron => 2,
306 glass => 4,
307 leather => 8,
308 wood => 16,
309 organic => 32,
310 stone => 64,
311 cloth => 128,
312 adamant => 256,
313 liquid => 512,
314 tin => 1024,
315 bone => 2048,
316 ice => 4096,
317
318 # guesses
319 runestone => 12,
320 bronze => 18,
321 "ancient wood" => 20,
322 glass => 36,
323 marble => 66,
324 ice => 68,
325 stone => 70,
326 stone => 80,
327 cloth => 136,
328 ironwood => 144,
329 adamantium => 258,
330 glacium => 260,
331 blood => 544,
332;
201 333
202# object as in "Object xxx", i.e. archetypes 334# object as in "Object xxx", i.e. archetypes
203sub normalize_object($) { 335sub normalize_object($) {
204 my ($ob) = @_; 336 my ($ob) = @_;
205 337
338 # convert material bitset to materialname, if possible
339 if (exists $ob->{material}) {
340 if (!$ob->{material}) {
341 delete $ob->{material};
342 } elsif (exists $ob->{materialname}) {
343 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
344 delete $ob->{material};
345 } else {
346 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
347 delete $ob->{material}; # assume materilname is more specific and nuke material
348 }
349 } elsif (my $name = $MATERIAL{$ob->{material}}) {
350 delete $ob->{material};
351 $ob->{materialname} = $name;
352 } else {
353 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
354 }
355 }
356
357 # check whether attachment is the same as in the archetype
358 if (exists $ob->{attach}) {
359 my $arch = $ARCH{$ob->{_name}};
360 my $js = JSON::XS->new->utf8->canonical (1);
361
362 if (defined $arch->{attach}
363 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
364 delete $ob->{attach}
365 }
366 }
367
368 # color_fg is used as default for magicmap if magicmap does not exist
369 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
370
206 # nuke outdated or never supported fields 371 # nuke outdated or never supported fields
207 delete @$ob{qw( 372 delete @$ob{qw(
208 can_knockback can_parry can_impale can_cut can_dam_armour 373 can_knockback can_parry can_impale can_cut can_dam_armour
209 can_apply pass_thru can_pass_thru 374 can_apply pass_thru can_pass_thru color_bg color_fg
210 )}; 375 )};
211 376
212 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 377 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
213 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 378 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
214 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 379 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
215 380
216 # convert movement strings to bitsets 381 # convert movement strings to bitsets
217 for my $attr (keys %FIELD_MOVEMENT) { 382 for my $attr (keys %FIELD_MOVEMENT) {
218 next unless exists $ob->{$attr}; 383 next unless exists $ob->{$attr};
219 384
220 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 385 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
221
222 next if $ob->{$attr} =~ /^\d+$/;
223
224 my $flags = 0;
225
226 # assume list
227 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
228 $flags |= MOVE_WALK if $flag eq "walk";
229 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
230 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
231 $flags |= MOVE_FLYING if $flag eq "flying";
232 $flags |= MOVE_SWIM if $flag eq "swim";
233 $flags |= MOVE_BOAT if $flag eq "boat";
234 $flags |= MOVE_ALL if $flag eq "all";
235
236 $flags &= ~MOVE_WALK if $flag eq "-walk";
237 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
238 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
239 $flags &= ~MOVE_FLYING if $flag eq "-flying";
240 $flags &= ~MOVE_SWIM if $flag eq "-swim";
241 $flags &= ~MOVE_BOAT if $flag eq "-boat";
242 $flags &= ~MOVE_ALL if $flag eq "-all";
243 }
244
245 $ob->{$attr} = $flags;
246 } 386 }
247 387
248 # convert outdated movement flags to new movement sets 388 # convert outdated movement flags to new movement sets
249 if (defined (my $v = delete $ob->{no_pass})) { 389 if (defined (my $v = delete $ob->{no_pass})) {
250 $ob->{move_block} = $v ? MOVE_ALL : 0; 390 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
251 } 391 }
252 if (defined (my $v = delete $ob->{slow_move})) { 392 if (defined (my $v = delete $ob->{slow_move})) {
253 $ob->{move_slow} |= MOVE_WALK; 393 $ob->{move_slow} += "walk";
254 $ob->{move_slow_penalty} = $v; 394 $ob->{move_slow_penalty} = $v;
255 } 395 }
256 if (defined (my $v = delete $ob->{walk_on})) { 396 if (defined (my $v = delete $ob->{walk_on})) {
257 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 397 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
258 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
259 : $ob->{move_on} & ~MOVE_WALK;
260 } 398 }
261 if (defined (my $v = delete $ob->{walk_off})) { 399 if (defined (my $v = delete $ob->{walk_off})) {
262 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 400 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
263 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
264 : $ob->{move_off} & ~MOVE_WALK;
265 } 401 }
266 if (defined (my $v = delete $ob->{fly_on})) { 402 if (defined (my $v = delete $ob->{fly_on})) {
267 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 403 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
268 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
269 : $ob->{move_on} & ~MOVE_FLY_LOW;
270 } 404 }
271 if (defined (my $v = delete $ob->{fly_off})) { 405 if (defined (my $v = delete $ob->{fly_off})) {
272 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 406 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
273 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
274 : $ob->{move_off} & ~MOVE_FLY_LOW;
275 } 407 }
276 if (defined (my $v = delete $ob->{flying})) { 408 if (defined (my $v = delete $ob->{flying})) {
277 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 409 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
278 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
279 : $ob->{move_type} & ~MOVE_FLY_LOW;
280 } 410 }
281 411
282 # convert idiotic event_xxx things into objects 412 # convert idiotic event_xxx things into objects
283 while (my ($event, $subtype) = each %EVENT_TYPE) { 413 while (my ($event, $subtype) = each %EVENT_TYPE) {
284 if (exists $ob->{"event_${event}_plugin"}) { 414 if (exists $ob->{"event_${event}_plugin"}) {
… …
289 name => delete $ob->{"event_${event}_options"}, 419 name => delete $ob->{"event_${event}_options"},
290 }; 420 };
291 } 421 }
292 } 422 }
293 423
424 # some archetypes had "+3" instead of the canonical "3", so fix
425 $ob->{dam} *= 1 if exists $ob->{dam};
426
294 $ob 427 $ob
295} 428}
296 429
297# arch as in "arch xxx", ie.. objects 430# arch as in "arch xxx", ie.. objects
298sub normalize_arch($) { 431sub normalize_arch($) {
299 my ($ob) = @_; 432 my ($ob) = @_;
300 433
301 normalize_object $ob; 434 normalize_object $ob;
435
436 return if $ob->{_atype} eq "object";
302 437
303 my $arch = $ARCH{$ob->{_name}} 438 my $arch = $ARCH{$ob->{_name}}
304 or (warn "$ob->{_name}: no such archetype", return $ob); 439 or (warn "$ob->{_name}: no such archetype", return $ob);
305 440
306 if ($arch->{type} == 22) { # map 441 if ($arch->{type} == 22) { # map
… …
342} 477}
343 478
344sub attr_thaw($) { 479sub attr_thaw($) {
345 my ($ob) = @_; 480 my ($ob) = @_;
346 481
347 $ob->{attach} = from_json $ob->{attach} 482 $ob->{attach} = decode_json $ob->{attach}
348 if exists $ob->{attach}; 483 if exists $ob->{attach};
349 484
350 $ob 485 $ob
351} 486}
352 487
353sub attr_freeze($) { 488sub attr_freeze($) {
354 my ($ob) = @_; 489 my ($ob) = @_;
355 490
356 $ob->{attach} = Crossfire::to_json $ob->{attach} 491 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
357 if exists $ob->{attach}; 492 if exists $ob->{attach};
358 493
359 $ob 494 $ob
360} 495}
361 496
… …
379sub read_arch($;$) { 514sub read_arch($;$) {
380 my ($path, $toplevel) = @_; 515 my ($path, $toplevel) = @_;
381 516
382 my %arc; 517 my %arc;
383 my ($more, $prev); 518 my ($more, $prev);
519 my $comment;
384 520
385 open my $fh, "<:raw:perlio:utf8", $path 521 open my $fh, "<:utf8", $path
386 or Carp::croak "$path: $!"; 522 or Carp::croak "$path: $!";
387 523
388# binmode $fh; 524# binmode $fh;
389 525
390 my $parse_block; $parse_block = sub { 526 my $parse_block; $parse_block = sub {
… …
392 528
393 while (<$fh>) { 529 while (<$fh>) {
394 s/\s+$//; 530 s/\s+$//;
395 if (/^end$/i) { 531 if (/^end$/i) {
396 last; 532 last;
533
397 } elsif (/^arch (\S+)$/i) { 534 } elsif (/^arch (\S+)$/i) {
398 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 535 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
536
399 } elsif (/^lore$/i) { 537 } elsif (/^lore$/i) {
400 while (<$fh>) { 538 while (<$fh>) {
401 last if /^endlore\s*$/i; 539 last if /^endlore\s*$/i;
402 $arc{lore} .= $_; 540 $arc{lore} .= $_;
403 } 541 }
… …
412 chomp; 550 chomp;
413 push @{ $arc{anim} }, $_; 551 push @{ $arc{anim} }, $_;
414 } 552 }
415 } elsif (/^(\S+)\s*(.*)$/) { 553 } elsif (/^(\S+)\s*(.*)$/) {
416 $arc{lc $1} = $2; 554 $arc{lc $1} = $2;
417 } elsif (/^\s*($|#)/) { 555 } elsif (/^\s*#/) {
556 $arc{_comment} .= "$_\n";
557
558 } elsif (/^\s*$/) {
418 # 559 #
419 } else { 560 } else {
420 warn "$path: unparsable line '$_' in arch $arc{_name}"; 561 warn "$path: unparsable line '$_' in arch $arc{_name}";
421 } 562 }
422 } 563 }
… …
428 s/\s+$//; 569 s/\s+$//;
429 if (/^more$/i) { 570 if (/^more$/i) {
430 $more = $prev; 571 $more = $prev;
431 } elsif (/^object (\S+)$/i) { 572 } elsif (/^object (\S+)$/i) {
432 my $name = $1; 573 my $name = $1;
433 my $arc = attr_thaw normalize_object $parse_block->(_name => $name); 574 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
575 undef $comment;
576 delete $arc{_comment} unless length $arc{_comment};
434 $arc->{_atype} = 'object'; 577 $arc->{_atype} = 'object';
435 578
436 if ($more) { 579 if ($more) {
437 $more->{more} = $arc; 580 $more->{more} = $arc;
438 } else { 581 } else {
… …
440 } 583 }
441 $prev = $arc; 584 $prev = $arc;
442 $more = undef; 585 $more = undef;
443 } elsif (/^arch (\S+)$/i) { 586 } elsif (/^arch (\S+)$/i) {
444 my $name = $1; 587 my $name = $1;
445 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 588 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
589 undef $comment;
590 delete $arc{_comment} unless length $arc{_comment};
446 $arc->{_atype} = 'arch'; 591 $arc->{_atype} = 'arch';
447 592
448 if ($more) { 593 if ($more) {
449 $more->{more} = $arc; 594 $more->{more} = $arc;
450 } else { 595 } else {
… …
459 push @{$toplevel->{lev_array}}, $_+0; 604 push @{$toplevel->{lev_array}}, $_+0;
460 } 605 }
461 } else { 606 } else {
462 $toplevel->{$1} = $2; 607 $toplevel->{$1} = $2;
463 } 608 }
609 } elsif (/^\s*#/) {
610 $comment .= "$_\n";
464 } elsif (/^\s*($|#)/) { 611 } elsif (/^\s*($|#)/) {
465 # 612 #
466 } else { 613 } else {
467 die "$path: unparseable top-level line '$_'"; 614 die "$path: unparseable top-level line '$_'";
468 } 615 }
… …
479 my $str; 626 my $str;
480 627
481 my $append; $append = sub { 628 my $append; $append = sub {
482 my %a = %{$_[0]}; 629 my %a = %{$_[0]};
483 630
484 Crossfire::attr_freeze \%a; 631 Deliantra::attr_freeze \%a;
485 Crossfire::normalize_arch \%a; 632 Deliantra::normalize_arch \%a;
486 633
487 # undo the bit-split we did before 634 # undo the bit-split we did before
488 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 635 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
489 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 636 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
490 | (delete $a{attack_movement_bits_4_7}); 637 | (delete $a{attack_movement_bits_4_7});
491 } 638 }
492 639
640 if (my $comment = delete $a{_comment}) {
641 if ($comment =~ /[^\n\s#]/) {
642 $str .= $comment;
643 }
644 }
645
493 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 646 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
494 647
495 my $inv = delete $a{inventory}; 648 my $inv = delete $a{inventory};
496 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 649 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
497 my $anim = delete $a{anim}; 650 my $anim = delete $a{anim};
498 651
652 if ($a{_atype} eq 'object') {
653 $str .= join "\n", "anim", @$anim, "mina\n"
654 if $anim;
655 }
656
499 my @kv; 657 my @kv;
500 658
501 for ($a{_name} eq "map" 659 for ($a{_name} eq "map"
502 ? @Crossfire::FIELD_ORDER_MAP 660 ? @Deliantra::FIELD_ORDER_MAP
503 : @Crossfire::FIELD_ORDER) { 661 : @Deliantra::FIELD_ORDER) {
504 push @kv, [$_, delete $a{$_}] 662 push @kv, [$_, delete $a{$_}]
505 if exists $a{$_}; 663 if exists $a{$_};
506 } 664 }
507 665
508 for (sort keys %a) { 666 for (sort keys %a) {
… …
511 } 669 }
512 670
513 for (@kv) { 671 for (@kv) {
514 my ($k, $v) = @$_; 672 my ($k, $v) = @$_;
515 673
516 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 674 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
517 $v =~ s/\n$//; 675 $v =~ s/\n$//;
518 $str .= "$k\n$v\n$end\n"; 676 $str .= "$k\n$v\n$end\n";
519 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
520 if ($v & ~Crossfire::MOVE_ALL or !$v) {
521 $str .= "$k $v\n";
522
523 } elsif ($v & Crossfire::MOVE_ALLBIT) {
524 $str .= "$k all";
525
526 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
527 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
528 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
529 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
530 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
531
532 $str .= "\n";
533
534 } else {
535 $str .= $k;
536
537 $str .= " walk" if $v & Crossfire::MOVE_WALK;
538 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
539 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
540 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
541 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
542
543 $str .= "\n";
544 }
545 } else { 677 } else {
546 $str .= "$k $v\n"; 678 $str .= "$k $v\n";
547 } 679 }
548 } 680 }
549 681
550 if ($inv) { 682 if ($inv) {
551 $append->($_) for @$inv; 683 $append->($_) for @$inv;
552 } 684 }
553 685
686 $str .= "end\n";
687
554 if ($a{_atype} eq 'object') { 688 if ($a{_atype} eq 'object') {
555 $str .= join "\n", "anim", @$anim, "mina\n" 689 if ($more) {
556 if $anim;
557 }
558
559 $str .= "end\n";
560
561 if (($a{_atype} eq 'object') && $more) {
562 $str .= "\nmore\n"; 690 $str .= "more\n";
563 $append->($more) if $more; 691 $append->($more) if $more;
692 } else {
693 $str .= "\n";
694 }
564 } 695 }
565 }; 696 };
566 697
567 for (@$arch) { 698 for (@$arch) {
568 $append->($_); 699 $append->($_);
… …
597 my ($a) = @_; 728 my ($a) = @_;
598 729
599 my $o = $ARCH{$a->{_name}} 730 my $o = $ARCH{$a->{_name}}
600 or return; 731 or return;
601 732
602 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 733 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
734 unless ($face) {
735 $face = $FACE{"blank.x11"}
603 or (warn "no face data found for arch '$a->{_name}'"), return; 736 or (warn "no face data found for arch '$a->{_name}'"), return;
737 }
604 738
605 if ($face->{w} > 1 || $face->{h} > 1) { 739 if ($face->{w} > 1 || $face->{h} > 1) {
606 # bigface 740 # bigface
607 return (0, 0, $face->{w} - 1, $face->{h} - 1); 741 return (0, 0, $face->{w} - 1, $face->{h} - 1);
608 742
… …
641=cut 775=cut
642 776
643sub arch_attr($) { 777sub arch_attr($) {
644 my ($obj) = @_; 778 my ($obj) = @_;
645 779
646 require Crossfire::Data; 780 require Deliantra::Data;
647 781
648 my $root; 782 my $root;
649 my $attr = { }; 783 my $attr = { };
650 784
651 my $arch = $ARCH{ $obj->{_name} }; 785 my $arch = $ARCH{ $obj->{_name} };
652 my $type = $obj->{type} || $arch->{type}; 786 my $type = $obj->{type} || $arch->{type};
653 787
654 if ($type > 0) { 788 if ($type > 0) {
655 $root = $Crossfire::Data::ATTR{$type}; 789 $root = $Deliantra::Data::ATTR{$type};
656 } else { 790 } else {
657 my %a = (%$arch, %$obj); 791 my %a = (%$arch, %$obj);
658 792
659 if ($a{is_floor} && !$a{alive}) { 793 if ($a{is_floor} && !$a{alive}) {
660 $root = $Crossfire::Data::TYPE{Floor}; 794 $root = $Deliantra::Data::TYPE{Floor};
661 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 795 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
662 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 796 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
663 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 797 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
664 $root = $Crossfire::Data::TYPE{Wall}; 798 $root = $Deliantra::Data::TYPE{Wall};
665 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 799 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
666 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 800 $root = $Deliantra::Data::TYPE{"Weak Wall"};
667 } else { 801 } else {
668 $root = $Crossfire::Data::TYPE{Misc}; 802 $root = $Deliantra::Data::TYPE{Misc};
669 } 803 }
670 } 804 }
671 805
672 my @import = ($root); 806 my @import = ($root);
673 807
674 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 808 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
675 unless $type == 116; 809 unless $type == 116;
676 810
677 my (%ignore); 811 my (%ignore);
678 my (@section_order, %section, @attr_order); 812 my (@section_order, %section, @attr_order);
679 813
680 while (my $type = shift @import) { 814 while (my $type = shift @import) {
815 push @import,
816 grep $_,
817 map $Deliantra::Data::TYPE{$_},
681 push @import, @{$type->{import} || []}; 818 @{$type->{import} || []};
682 819
683 $attr->{$_} ||= $type->{$_} 820 $attr->{$_} ||= $type->{$_}
684 for qw(name desc use); 821 for qw(name desc use);
685 822
686 for (@{$type->{ignore} || []}) { 823 for (@{$type->{ignore} || []}) {
… …
715 ]; 852 ];
716 853
717 $attr 854 $attr
718} 855}
719 856
720sub arch_edit_sections {
721# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
722# edit_type = 0;
723# else if (edit_type != 0) {
724# // all flags from 'check_type' must be unset in this arch because they get recalculated now
725# edit_type &= ~check_type;
726# }
727#
728# }
729# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
730# getAttributeValue("alive", defarch) == 1 &&
731# (getAttributeValue("monster", defarch) == 1 ||
732# getAttributeValue("generator", defarch) == 1)) {
733# // Monster: monsters/npcs/generators
734# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
735# }
736# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
737# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
738# // Walls
739# edit_type |= IGUIConstants.TILE_EDIT_WALL;
740# }
741# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
742# getAttributeValue("connected", defarch) != 0) {
743# // Connected Objects
744# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
745# }
746# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
747# arch_type == 66 || arch_type == 41 || arch_type == 95) {
748# // Exit: teleporter/exit/trapdoors
749# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
750# }
751# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
752# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
753# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
754# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
755# arch_type == 124 || arch_type == 130)) {
756# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
757# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
758# }
759# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
760# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
761# arch_type == 91 || arch_type == 21 || arch_type == 24) {
762# // Door: door/special door/gates + keys
763# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
764# }
765# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
766# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
767# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
768# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
769# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
770# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
771# arch_type == 122 || arch_type == 3)) {
772# // Equipment: weapons/armour/wands/rods
773# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
774# }
775#
776# return(edit_type);
777#
778#
779}
780
781sub cache_file($$&&) { 857sub cache_file($$&&) {
782 my ($src, $cache, $load, $create) = @_; 858 my ($src, $cache, $load, $create) = @_;
783 859
784 my ($size, $mtime) = (stat $src)[7,9] 860 my ($size, $mtime) = (stat $src)[7,9]
785 or Carp::croak "$src: $!"; 861 or Carp::croak "$src: $!";
… …
833 }, sub { 909 }, sub {
834 read_arch "$LIB/archetypes" 910 read_arch "$LIB/archetypes"
835 }; 911 };
836} 912}
837 913
914sub construct_tilecache_pb {
915 my ($idx, $cache) = @_;
916
917 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
918
919 while (my ($name, $tile) = each %$cache) {
920 my $tpb = delete $tile->{pb};
921 my $ofs = $tile->{idx};
922
923 for my $x (0 .. $tile->{w} - 1) {
924 for my $y (0 .. $tile->{h} - 1) {
925 my $idx = $ofs + $x + $y * $tile->{w};
926 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
927 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
928 }
929 }
930 }
931
932 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
933
934 $cache
935}
936
937sub use_tilecache {
938 my ($face) = @_;
939 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
940 or die "$VARDIR/tilecache.png: $!";
941 *FACE = $_[0];
942}
943
838=item load_tilecache 944=item load_tilecache
839 945
840(Re-)Load %TILE and %FACE. 946(Re-)Load %TILE and %FACE.
841 947
842=cut 948=cut
843 949
844sub load_tilecache() { 950sub load_tilecache() {
845 require Gtk2; 951 require Gtk2;
846 952
847 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 953 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
848 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
849 or die "$VARDIR/tilecache.png: $!";
850 *FACE = $_[0];
851 }, sub { 954 sub {
852 my $tile = read_pak "$LIB/crossfire.0";
853
854 my %cache; 955 my %cache;
956 my $facedata = Storable::retrieve "$LIB/facedata";
855 957
958 $facedata->{version} == 2
959 or die "$LIB/facedata: version mismatch, cannot proceed.";
960
961 my $faces = $facedata->{faceinfo};
856 my $idx = 0; 962 my $idx = 0;
857 963
858 for my $name (sort keys %$tile) { 964 for (sort keys %$faces) {
965 my ($face, $info) = ($_, $faces->{$_});
966
859 my $pb = new Gtk2::Gdk::PixbufLoader; 967 my $pb = new Gtk2::Gdk::PixbufLoader;
860 $pb->write ($tile->{$name}); 968 $pb->write ($info->{data32});
861 $pb->close; 969 $pb->close;
862 my $pb = $pb->get_pixbuf; 970 my $pb = $pb->get_pixbuf;
863 971
864 my $tile = $cache{$name} = { 972 my $tile = $cache{$face} = {
865 pb => $pb, 973 pb => $pb,
866 idx => $idx, 974 idx => $idx,
867 w => int $pb->get_width / TILESIZE, 975 w => int $pb->get_width / TILESIZE,
868 h => int $pb->get_height / TILESIZE, 976 h => int $pb->get_height / TILESIZE,
869 }; 977 };
870
871 978
872 $idx += $tile->{w} * $tile->{h}; 979 $idx += $tile->{w} * $tile->{h};
980 }
981
982 construct_tilecache_pb $idx, \%cache;
983
984 \%cache
873 } 985 };
874
875 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
876
877 while (my ($name, $tile) = each %cache) {
878 my $tpb = delete $tile->{pb};
879 my $ofs = $tile->{idx};
880
881 for my $x (0 .. $tile->{w} - 1) {
882 for my $y (0 .. $tile->{h} - 1) {
883 my $idx = $ofs + $x + $y * $tile->{w};
884 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
885 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
886 }
887 }
888 }
889
890 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
891
892 \%cache
893 };
894} 986}
895 987
896=head1 AUTHOR 988=head1 AUTHOR
897 989
898 Marc Lehmann <schmorp@schmorp.de> 990 Marc Lehmann <schmorp@schmorp.de>
… …
902 http://www.ta-sa.org/ 994 http://www.ta-sa.org/
903 995
904=cut 996=cut
905 997
9061 9981
999

Diff Legend

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