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.80 by root, Tue Feb 6 22:08:14 2007 UTC vs.
Revision 1.131 by root, Tue Sep 1 21:37:25 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.96'; 9our $VERSION = '1.24';
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
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" 31our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 32 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
40 : File::Spec->tmpdir . "/crossfire"; 33 : File::Spec->tmpdir . "/deliantra";
41 34
42mkdir $VARDIR, 0777; 35mkdir $VARDIR, 0777;
43 36
44sub TILESIZE (){ 32 } 37sub TILESIZE (){ 32 }
38sub CACHESTRIDE (){ 64 }
45 39
46our %ARCH; 40our %ARCH;
41our %FACE; # face32
47our %FACE; 42our %FACEDATA;
48our $TILE; 43our $TILE;
49 44
50our %FIELD_MULTILINE = ( 45our %FIELD_MULTILINE = (
51 msg => "endmsg", 46 msg => "endmsg",
52 lore => "endlore", 47 lore => "endlore",
… …
58 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);
59 54
60# same as in server save routine, to (hopefully) be compatible 55# same as in server save routine, to (hopefully) be compatible
61# to the other editors. 56# to the other editors.
62our @FIELD_ORDER_MAP = (qw( 57our @FIELD_ORDER_MAP = (qw(
58 file_format_version
63 name attach swap_time reset_timeout fixed_resettime difficulty region 59 name attach swap_time reset_timeout fixed_resettime difficulty region
64 shopitems shopgreed shopmin shopmax shoprace 60 shopitems shopgreed shopmin shopmax shoprace
65 darkness width height enter_x enter_y msg maplore 61 darkness width height enter_x enter_y msg maplore
66 unique template 62 unique template
67 outdoor temp pressure humid windspeed winddir sky nosmooth 63 outdoor temp pressure humid windspeed winddir sky nosmooth
68 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
69)); 65));
70 66
71our @FIELD_ORDER = (qw( 67our @FIELD_ORDER = (qw(
68 inherit
69
72 elevation 70 elevation
73 71
74 name name_pl custom_name attach title race 72 name name_pl custom_name attach title race
75 slaying skill msg lore other_arch face 73 slaying skill msg lore other_arch
76 #todo-events 74 sound sound_destroy face animation is_animated
77 animation is_animated 75 magicmap smoothlevel smoothface
78 str dex con wis pow cha int 76 str dex con wis pow cha int
79 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
80 exp perm_exp expmul 78 exp perm_exp expmul
81 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
82 nrof level direction type subtype attacktype 80 nrof level direction type subtype attacktype
… …
90 resist_life_stealing resist_disease 88 resist_life_stealing resist_disease
91 89
92 path_attuned path_repelled path_denied material materialname 90 path_attuned path_repelled path_denied material materialname
93 value carrying weight invisible state magic 91 value carrying weight invisible state magic
94 last_heal last_sp last_grace last_eat 92 last_heal last_sp last_grace last_eat
95 connected glow_radius randomitems npx_status npc_program 93 connected glow_radius randomitems tresure_env npx_status npc_program
96 run_away pick_up container will_apply smoothlevel 94 run_away pick_up container will_apply smoothlevel
97 current_weapon_script weapontype tooltype elevation client_type 95 current_weapon_script weapontype tooltype elevation client_type
98 item_power duration range 96 item_power duration range
99 range_modifier duration_modifier dam_modifier gen_sp_armour 97 range_modifier duration_modifier dam_modifier gen_sp_armour
100 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
… …
111 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
112 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
113 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
114 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
115 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
116 115
117 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
118 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
119)); 118));
120 119
… …
137sub MOVE_FLY_LOW (){ 0x02 } 136sub MOVE_FLY_LOW (){ 0x02 }
138sub MOVE_FLY_HIGH (){ 0x04 } 137sub MOVE_FLY_HIGH (){ 0x04 }
139sub MOVE_FLYING (){ 0x06 } 138sub MOVE_FLYING (){ 0x06 }
140sub MOVE_SWIM (){ 0x08 } 139sub MOVE_SWIM (){ 0x08 }
141sub MOVE_BOAT (){ 0x10 } 140sub MOVE_BOAT (){ 0x10 }
141sub MOVE_SHIP (){ 0x20 }
142sub MOVE_KNOWN (){ 0x1f } # all of above 142sub MOVE_KNOWN (){ 0x3f } # all of above
143sub MOVE_ALLBIT (){ 0x10000 }
144sub 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 ship boat swim flying fly_high fly_low walk);
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}
145 248
146sub load_ref($) { 249sub load_ref($) {
147 my ($path) = @_; 250 my ($path) = @_;
148 251
149 open my $fh, "<:raw:perlio", $path 252 open my $fh, "<:raw:perlio", $path
… …
199 while (my ($k, $v) = each %attack_mask) { 302 while (my ($k, $v) = each %attack_mask) {
200 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v; 303 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
201 } 304 }
202} 305}
203 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
204# object as in "Object xxx", i.e. archetypes 338# object as in "Object xxx", i.e. archetypes
205sub normalize_object($) { 339sub normalize_object($) {
206 my ($ob) = @_; 340 my ($ob) = @_;
207 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
208 # nuke outdated or never supported fields 375 # nuke outdated or never supported fields
209 delete @$ob{qw( 376 delete @$ob{qw(
210 can_knockback can_parry can_impale can_cut can_dam_armour 377 can_knockback can_parry can_impale can_cut can_dam_armour
211 can_apply pass_thru can_pass_thru 378 can_apply pass_thru can_pass_thru color_bg color_fg
212 )}; 379 )};
213 380
214 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 381 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
215 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 382 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
216 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 383 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
217 384
218 # convert movement strings to bitsets 385 # convert movement strings to bitsets
219 for my $attr (keys %FIELD_MOVEMENT) { 386 for my $attr (keys %FIELD_MOVEMENT) {
220 next unless exists $ob->{$attr}; 387 next unless exists $ob->{$attr};
221 388
222 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 389 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
223
224 next if $ob->{$attr} =~ /^\d+$/;
225
226 my $flags = 0;
227
228 # assume list
229 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
230 $flags |= MOVE_WALK if $flag eq "walk";
231 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
232 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
233 $flags |= MOVE_FLYING if $flag eq "flying";
234 $flags |= MOVE_SWIM if $flag eq "swim";
235 $flags |= MOVE_BOAT if $flag eq "boat";
236 $flags |= MOVE_ALL if $flag eq "all";
237
238 $flags &= ~MOVE_WALK if $flag eq "-walk";
239 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
240 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
241 $flags &= ~MOVE_FLYING if $flag eq "-flying";
242 $flags &= ~MOVE_SWIM if $flag eq "-swim";
243 $flags &= ~MOVE_BOAT if $flag eq "-boat";
244 $flags &= ~MOVE_ALL if $flag eq "-all";
245 }
246
247 $ob->{$attr} = $flags;
248 } 390 }
249 391
250 # convert outdated movement flags to new movement sets 392 # convert outdated movement flags to new movement sets
251 if (defined (my $v = delete $ob->{no_pass})) { 393 if (defined (my $v = delete $ob->{no_pass})) {
252 $ob->{move_block} = $v ? MOVE_ALL : 0; 394 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
253 } 395 }
254 if (defined (my $v = delete $ob->{slow_move})) { 396 if (defined (my $v = delete $ob->{slow_move})) {
255 $ob->{move_slow} |= MOVE_WALK; 397 $ob->{move_slow} += "walk";
256 $ob->{move_slow_penalty} = $v; 398 $ob->{move_slow_penalty} = $v;
257 } 399 }
258 if (defined (my $v = delete $ob->{walk_on})) { 400 if (defined (my $v = delete $ob->{walk_on})) {
259 $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" }
260 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
261 : $ob->{move_on} & ~MOVE_WALK;
262 } 402 }
263 if (defined (my $v = delete $ob->{walk_off})) { 403 if (defined (my $v = delete $ob->{walk_off})) {
264 $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" }
265 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
266 : $ob->{move_off} & ~MOVE_WALK;
267 } 405 }
268 if (defined (my $v = delete $ob->{fly_on})) { 406 if (defined (my $v = delete $ob->{fly_on})) {
269 $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" }
270 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
271 : $ob->{move_on} & ~MOVE_FLY_LOW;
272 } 408 }
273 if (defined (my $v = delete $ob->{fly_off})) { 409 if (defined (my $v = delete $ob->{fly_off})) {
274 $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" }
275 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
276 : $ob->{move_off} & ~MOVE_FLY_LOW;
277 } 411 }
278 if (defined (my $v = delete $ob->{flying})) { 412 if (defined (my $v = delete $ob->{flying})) {
279 $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" }
280 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
281 : $ob->{move_type} & ~MOVE_FLY_LOW;
282 } 414 }
283 415
284 # convert idiotic event_xxx things into objects 416 # convert idiotic event_xxx things into objects
285 while (my ($event, $subtype) = each %EVENT_TYPE) { 417 while (my ($event, $subtype) = each %EVENT_TYPE) {
286 if (exists $ob->{"event_${event}_plugin"}) { 418 if (exists $ob->{"event_${event}_plugin"}) {
… …
302# arch as in "arch xxx", ie.. objects 434# arch as in "arch xxx", ie.. objects
303sub normalize_arch($) { 435sub normalize_arch($) {
304 my ($ob) = @_; 436 my ($ob) = @_;
305 437
306 normalize_object $ob; 438 normalize_object $ob;
439
440 return if $ob->{_atype} eq "object";
307 441
308 my $arch = $ARCH{$ob->{_name}} 442 my $arch = $ARCH{$ob->{_name}}
309 or (warn "$ob->{_name}: no such archetype", return $ob); 443 or (warn "$ob->{_name}: no such archetype", return $ob);
310 444
311 if ($arch->{type} == 22) { # map 445 if ($arch->{type} == 22) { # map
… …
347} 481}
348 482
349sub attr_thaw($) { 483sub attr_thaw($) {
350 my ($ob) = @_; 484 my ($ob) = @_;
351 485
352 $ob->{attach} = from_json $ob->{attach} 486 $ob->{attach} = decode_json $ob->{attach}
353 if exists $ob->{attach}; 487 if exists $ob->{attach};
354 488
355 $ob 489 $ob
356} 490}
357 491
358sub attr_freeze($) { 492sub attr_freeze($) {
359 my ($ob) = @_; 493 my ($ob) = @_;
360 494
361 $ob->{attach} = Crossfire::to_json $ob->{attach} 495 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
362 if exists $ob->{attach}; 496 if exists $ob->{attach};
363 497
364 $ob 498 $ob
365} 499}
366 500
… …
386 520
387 my %arc; 521 my %arc;
388 my ($more, $prev); 522 my ($more, $prev);
389 my $comment; 523 my $comment;
390 524
391 open my $fh, "<:raw:perlio:utf8", $path 525 open my $fh, "<:utf8", $path
392 or Carp::croak "$path: $!"; 526 or Carp::croak "$path: $!";
393 527
394# binmode $fh; 528# binmode $fh;
395 529
396 my $parse_block; $parse_block = sub { 530 my $parse_block; $parse_block = sub {
… …
421 push @{ $arc{anim} }, $_; 555 push @{ $arc{anim} }, $_;
422 } 556 }
423 } elsif (/^(\S+)\s*(.*)$/) { 557 } elsif (/^(\S+)\s*(.*)$/) {
424 $arc{lc $1} = $2; 558 $arc{lc $1} = $2;
425 } elsif (/^\s*#/) { 559 } elsif (/^\s*#/) {
426 $arc{_comment} .= $_; 560 $arc{_comment} .= "$_\n";
427 561
428 } elsif (/^\s*$/) { 562 } elsif (/^\s*$/) {
429 # 563 #
430 } else { 564 } else {
431 warn "$path: unparsable line '$_' in arch $arc{_name}"; 565 warn "$path: unparsable line '$_' in arch $arc{_name}";
… …
437 571
438 while (<$fh>) { 572 while (<$fh>) {
439 s/\s+$//; 573 s/\s+$//;
440 if (/^more$/i) { 574 if (/^more$/i) {
441 $more = $prev; 575 $more = $prev;
442 } elsif (/^\s*#/) {
443 $comment .= $_;
444 } elsif (/^object (\S+)$/i) { 576 } elsif (/^object (\S+)$/i) {
445 my $name = $1; 577 my $name = $1;
446 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment); 578 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
579 undef $comment;
447 delete $arc{_comment} unless length $arc{_comment}; 580 delete $arc{_comment} unless length $arc{_comment};
448 $arc->{_atype} = 'object'; 581 $arc->{_atype} = 'object';
449 582
450 if ($more) { 583 if ($more) {
451 $more->{more} = $arc; 584 $more->{more} = $arc;
… …
455 $prev = $arc; 588 $prev = $arc;
456 $more = undef; 589 $more = undef;
457 } elsif (/^arch (\S+)$/i) { 590 } elsif (/^arch (\S+)$/i) {
458 my $name = $1; 591 my $name = $1;
459 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment); 592 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
593 undef $comment;
460 delete $arc{_comment} unless length $arc{_comment}; 594 delete $arc{_comment} unless length $arc{_comment};
461 $arc->{_atype} = 'arch'; 595 $arc->{_atype} = 'arch';
462 596
463 if ($more) { 597 if ($more) {
464 $more->{more} = $arc; 598 $more->{more} = $arc;
… …
474 push @{$toplevel->{lev_array}}, $_+0; 608 push @{$toplevel->{lev_array}}, $_+0;
475 } 609 }
476 } else { 610 } else {
477 $toplevel->{$1} = $2; 611 $toplevel->{$1} = $2;
478 } 612 }
613 } elsif (/^\s*#/) {
614 $comment .= "$_\n";
479 } elsif (/^\s*($|#)/) { 615 } elsif (/^\s*($|#)/) {
480 # 616 #
481 } else { 617 } else {
482 die "$path: unparseable top-level line '$_'"; 618 die "$path: unparseable top-level line '$_'";
483 } 619 }
… …
494 my $str; 630 my $str;
495 631
496 my $append; $append = sub { 632 my $append; $append = sub {
497 my %a = %{$_[0]}; 633 my %a = %{$_[0]};
498 634
499 Crossfire::attr_freeze \%a; 635 Deliantra::attr_freeze \%a;
500 Crossfire::normalize_arch \%a; 636 Deliantra::normalize_arch \%a;
501 637
502 # undo the bit-split we did before 638 # undo the bit-split we did before
503 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 639 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
504 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 640 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
505 | (delete $a{attack_movement_bits_4_7}); 641 | (delete $a{attack_movement_bits_4_7});
506 } 642 }
507 643
644 if (my $comment = delete $a{_comment}) {
645 if ($comment =~ /[^\n\s#]/) {
646 $str .= $comment;
647 }
648 }
649
508 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 650 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
509 651
510 my $inv = delete $a{inventory}; 652 my $inv = delete $a{inventory};
511 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 653 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
512 my $anim = delete $a{anim}; 654 my $anim = delete $a{anim};
513 655
656 if ($a{_atype} eq 'object') {
657 $str .= join "\n", "anim", @$anim, "mina\n"
658 if $anim;
659 }
660
514 my @kv; 661 my @kv;
515 662
516 for ($a{_name} eq "map" 663 for ($a{_name} eq "map"
517 ? @Crossfire::FIELD_ORDER_MAP 664 ? @Deliantra::FIELD_ORDER_MAP
518 : @Crossfire::FIELD_ORDER) { 665 : @Deliantra::FIELD_ORDER) {
519 push @kv, [$_, delete $a{$_}] 666 push @kv, [$_, delete $a{$_}]
520 if exists $a{$_}; 667 if exists $a{$_};
521 } 668 }
522 669
523 for (sort keys %a) { 670 for (sort keys %a) {
… …
526 } 673 }
527 674
528 for (@kv) { 675 for (@kv) {
529 my ($k, $v) = @$_; 676 my ($k, $v) = @$_;
530 677
531 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 678 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
532 $v =~ s/\n$//; 679 $v =~ s/\n$//;
533 $str .= "$k\n$v\n$end\n"; 680 $str .= "$k\n$v\n$end\n";
534 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
535 if ($v & ~Crossfire::MOVE_ALL or !$v) {
536 $str .= "$k $v\n";
537
538 } elsif ($v & Crossfire::MOVE_ALLBIT) {
539 $str .= "$k all";
540
541 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
542 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
543 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
544 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
545 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
546
547 $str .= "\n";
548
549 } else {
550 $str .= $k;
551
552 $str .= " walk" if $v & Crossfire::MOVE_WALK;
553 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
554 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
555 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
556 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
557
558 $str .= "\n";
559 }
560 } else { 681 } else {
561 $str .= "$k $v\n"; 682 $str .= "$k $v\n";
562 } 683 }
563 } 684 }
564 685
565 if ($inv) { 686 if ($inv) {
566 $append->($_) for @$inv; 687 $append->($_) for @$inv;
567 } 688 }
568 689
690 $str .= "end\n";
691
569 if ($a{_atype} eq 'object') { 692 if ($a{_atype} eq 'object') {
570 $str .= join "\n", "anim", @$anim, "mina\n" 693 if ($more) {
571 if $anim;
572 }
573
574 $str .= "end\n";
575
576 if (($a{_atype} eq 'object') && $more) {
577 $str .= "\nmore\n"; 694 $str .= "more\n";
578 $append->($more) if $more; 695 $append->($more) if $more;
696 } else {
697 $str .= "\n";
698 }
579 } 699 }
580 }; 700 };
581 701
582 for (@$arch) { 702 for (@$arch) {
583 $append->($_); 703 $append->($_);
… …
659=cut 779=cut
660 780
661sub arch_attr($) { 781sub arch_attr($) {
662 my ($obj) = @_; 782 my ($obj) = @_;
663 783
664 require Crossfire::Data; 784 require Deliantra::Data;
665 785
666 my $root; 786 my $root;
667 my $attr = { }; 787 my $attr = { };
668 788
669 my $arch = $ARCH{ $obj->{_name} }; 789 my $arch = $ARCH{ $obj->{_name} };
670 my $type = $obj->{type} || $arch->{type}; 790 my $type = $obj->{type} || $arch->{type};
671 791
672 if ($type > 0) { 792 if ($type > 0) {
673 $root = $Crossfire::Data::ATTR{$type}; 793 $root = $Deliantra::Data::ATTR{$type};
674 } else { 794 } else {
675 my %a = (%$arch, %$obj); 795 my %a = (%$arch, %$obj);
676 796
677 if ($a{is_floor} && !$a{alive}) { 797 if ($a{is_floor} && !$a{alive}) {
678 $root = $Crossfire::Data::TYPE{Floor}; 798 $root = $Deliantra::Data::TYPE{Floor};
679 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 799 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
680 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 800 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
681 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 801 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
682 $root = $Crossfire::Data::TYPE{Wall}; 802 $root = $Deliantra::Data::TYPE{Wall};
683 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 803 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
684 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 804 $root = $Deliantra::Data::TYPE{"Weak Wall"};
685 } else { 805 } else {
686 $root = $Crossfire::Data::TYPE{Misc}; 806 $root = $Deliantra::Data::TYPE{Misc};
687 } 807 }
688 } 808 }
689 809
690 my @import = ($root); 810 my @import = ($root);
691 811
692 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 812 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
693 unless $type == 116; 813 unless $type == 116;
694 814
695 my (%ignore); 815 my (%ignore);
696 my (@section_order, %section, @attr_order); 816 my (@section_order, %section, @attr_order);
697 817
698 while (my $type = shift @import) { 818 while (my $type = shift @import) {
819 push @import,
820 grep $_,
821 map $Deliantra::Data::TYPE{$_},
699 push @import, @{$type->{import} || []}; 822 @{$type->{import} || []};
700 823
701 $attr->{$_} ||= $type->{$_} 824 $attr->{$_} ||= $type->{$_}
702 for qw(name desc use); 825 for qw(name desc use);
703 826
704 for (@{$type->{ignore} || []}) { 827 for (@{$type->{ignore} || []}) {
… …
733 ]; 856 ];
734 857
735 $attr 858 $attr
736} 859}
737 860
738sub arch_edit_sections {
739# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
740# edit_type = 0;
741# else if (edit_type != 0) {
742# // all flags from 'check_type' must be unset in this arch because they get recalculated now
743# edit_type &= ~check_type;
744# }
745#
746# }
747# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
748# getAttributeValue("alive", defarch) == 1 &&
749# (getAttributeValue("monster", defarch) == 1 ||
750# getAttributeValue("generator", defarch) == 1)) {
751# // Monster: monsters/npcs/generators
752# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
753# }
754# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
755# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
756# // Walls
757# edit_type |= IGUIConstants.TILE_EDIT_WALL;
758# }
759# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
760# getAttributeValue("connected", defarch) != 0) {
761# // Connected Objects
762# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
763# }
764# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
765# arch_type == 66 || arch_type == 41 || arch_type == 95) {
766# // Exit: teleporter/exit/trapdoors
767# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
768# }
769# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
770# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
771# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
772# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
773# arch_type == 124 || arch_type == 130)) {
774# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
775# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
776# }
777# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
778# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
779# arch_type == 91 || arch_type == 21 || arch_type == 24) {
780# // Door: door/special door/gates + keys
781# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
782# }
783# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
784# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
785# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
786# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
787# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
788# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
789# arch_type == 122 || arch_type == 3)) {
790# // Equipment: weapons/armour/wands/rods
791# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
792# }
793#
794# return(edit_type);
795#
796#
797}
798
799sub cache_file($$&&) { 861sub cache_file($$&&) {
800 my ($src, $cache, $load, $create) = @_; 862 my ($src, $cache, $load, $create) = @_;
801 863
802 my ($size, $mtime) = (stat $src)[7,9] 864 my ($size, $mtime) = (stat $src)[7,9]
803 or Carp::croak "$src: $!"; 865 or Carp::croak "$src: $!";
… …
851 }, sub { 913 }, sub {
852 read_arch "$LIB/archetypes" 914 read_arch "$LIB/archetypes"
853 }; 915 };
854} 916}
855 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
856=item load_tilecache 948=item load_tilecache
857 949
858(Re-)Load %TILE and %FACE. 950(Re-)Load %TILE and %FACE.
859 951
860=cut 952=cut
861 953
862sub load_tilecache() { 954sub load_tilecache() {
863 require Gtk2; 955 require Gtk2;
864 956
865 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 957 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
866 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
867 or die "$VARDIR/tilecache.png: $!";
868 *FACE = $_[0];
869 }, sub { 958 sub {
870 my $tile = read_pak "$LIB/crossfire.0";
871
872 my %cache; 959 my %cache;
960 my $facedata = Storable::retrieve "$LIB/facedata";
873 961
962 $facedata->{version} == 2
963 or die "$LIB/facedata: version mismatch, cannot proceed.";
964
965 my $faces = $facedata->{faceinfo};
874 my $idx = 0; 966 my $idx = 0;
875 967
876 for my $name (sort keys %$tile) { 968 for (sort keys %$faces) {
969 my ($face, $info) = ($_, $faces->{$_});
970
877 my $pb = new Gtk2::Gdk::PixbufLoader; 971 my $pb = new Gtk2::Gdk::PixbufLoader;
878 $pb->write ($tile->{$name}); 972 $pb->write ($info->{data32});
879 $pb->close; 973 $pb->close;
880 my $pb = $pb->get_pixbuf; 974 my $pb = $pb->get_pixbuf;
881 975
882 my $tile = $cache{$name} = { 976 my $tile = $cache{$face} = {
883 pb => $pb, 977 pb => $pb,
884 idx => $idx, 978 idx => $idx,
885 w => int $pb->get_width / TILESIZE, 979 w => int $pb->get_width / TILESIZE,
886 h => int $pb->get_height / TILESIZE, 980 h => int $pb->get_height / TILESIZE,
887 }; 981 };
888
889 982
890 $idx += $tile->{w} * $tile->{h}; 983 $idx += $tile->{w} * $tile->{h};
984 }
985
986 construct_tilecache_pb $idx, \%cache;
987
988 \%cache
891 } 989 };
892
893 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
894
895 while (my ($name, $tile) = each %cache) {
896 my $tpb = delete $tile->{pb};
897 my $ofs = $tile->{idx};
898
899 for my $x (0 .. $tile->{w} - 1) {
900 for my $y (0 .. $tile->{h} - 1) {
901 my $idx = $ofs + $x + $y * $tile->{w};
902 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
903 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
904 }
905 }
906 }
907
908 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
909
910 \%cache
911 };
912} 990}
913 991
914=head1 AUTHOR 992=head1 AUTHOR
915 993
916 Marc Lehmann <schmorp@schmorp.de> 994 Marc Lehmann <schmorp@schmorp.de>
… …
920 http://www.ta-sa.org/ 998 http://www.ta-sa.org/
921 999
922=cut 1000=cut
923 1001
9241 10021
1003

Diff Legend

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