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.83 by root, Wed Feb 7 00:14:48 2007 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.96'; 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" 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 = 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}
145 244
146sub load_ref($) { 245sub load_ref($) {
147 my ($path) = @_; 246 my ($path) = @_;
148 247
149 open my $fh, "<:raw:perlio", $path 248 open my $fh, "<:raw:perlio", $path
… …
225 ice => 68, 324 ice => 68,
226 stone => 70, 325 stone => 70,
227 stone => 80, 326 stone => 80,
228 cloth => 136, 327 cloth => 136,
229 ironwood => 144, 328 ironwood => 144,
329 adamantium => 258,
330 glacium => 260,
230 blood => 544, 331 blood => 544,
231; 332;
232 333
233# object as in "Object xxx", i.e. archetypes 334# object as in "Object xxx", i.e. archetypes
234sub normalize_object($) { 335sub normalize_object($) {
… …
251 } else { 352 } else {
252 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 353 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
253 } 354 }
254 } 355 }
255 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
256 # nuke outdated or never supported fields 371 # nuke outdated or never supported fields
257 delete @$ob{qw( 372 delete @$ob{qw(
258 can_knockback can_parry can_impale can_cut can_dam_armour 373 can_knockback can_parry can_impale can_cut can_dam_armour
259 can_apply pass_thru can_pass_thru 374 can_apply pass_thru can_pass_thru color_bg color_fg
260 )}; 375 )};
261 376
262 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 377 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
263 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 378 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
264 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 379 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
265 380
266 # convert movement strings to bitsets 381 # convert movement strings to bitsets
267 for my $attr (keys %FIELD_MOVEMENT) { 382 for my $attr (keys %FIELD_MOVEMENT) {
268 next unless exists $ob->{$attr}; 383 next unless exists $ob->{$attr};
269 384
270 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 385 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
271
272 next if $ob->{$attr} =~ /^\d+$/;
273
274 my $flags = 0;
275
276 # assume list
277 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
278 $flags |= MOVE_WALK if $flag eq "walk";
279 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
280 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
281 $flags |= MOVE_FLYING if $flag eq "flying";
282 $flags |= MOVE_SWIM if $flag eq "swim";
283 $flags |= MOVE_BOAT if $flag eq "boat";
284 $flags |= MOVE_ALL if $flag eq "all";
285
286 $flags &= ~MOVE_WALK if $flag eq "-walk";
287 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
288 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
289 $flags &= ~MOVE_FLYING if $flag eq "-flying";
290 $flags &= ~MOVE_SWIM if $flag eq "-swim";
291 $flags &= ~MOVE_BOAT if $flag eq "-boat";
292 $flags &= ~MOVE_ALL if $flag eq "-all";
293 }
294
295 $ob->{$attr} = $flags;
296 } 386 }
297 387
298 # convert outdated movement flags to new movement sets 388 # convert outdated movement flags to new movement sets
299 if (defined (my $v = delete $ob->{no_pass})) { 389 if (defined (my $v = delete $ob->{no_pass})) {
300 $ob->{move_block} = $v ? MOVE_ALL : 0; 390 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
301 } 391 }
302 if (defined (my $v = delete $ob->{slow_move})) { 392 if (defined (my $v = delete $ob->{slow_move})) {
303 $ob->{move_slow} |= MOVE_WALK; 393 $ob->{move_slow} += "walk";
304 $ob->{move_slow_penalty} = $v; 394 $ob->{move_slow_penalty} = $v;
305 } 395 }
306 if (defined (my $v = delete $ob->{walk_on})) { 396 if (defined (my $v = delete $ob->{walk_on})) {
307 $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" }
308 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
309 : $ob->{move_on} & ~MOVE_WALK;
310 } 398 }
311 if (defined (my $v = delete $ob->{walk_off})) { 399 if (defined (my $v = delete $ob->{walk_off})) {
312 $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" }
313 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
314 : $ob->{move_off} & ~MOVE_WALK;
315 } 401 }
316 if (defined (my $v = delete $ob->{fly_on})) { 402 if (defined (my $v = delete $ob->{fly_on})) {
317 $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" }
318 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
319 : $ob->{move_on} & ~MOVE_FLY_LOW;
320 } 404 }
321 if (defined (my $v = delete $ob->{fly_off})) { 405 if (defined (my $v = delete $ob->{fly_off})) {
322 $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" }
323 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
324 : $ob->{move_off} & ~MOVE_FLY_LOW;
325 } 407 }
326 if (defined (my $v = delete $ob->{flying})) { 408 if (defined (my $v = delete $ob->{flying})) {
327 $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" }
328 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
329 : $ob->{move_type} & ~MOVE_FLY_LOW;
330 } 410 }
331 411
332 # convert idiotic event_xxx things into objects 412 # convert idiotic event_xxx things into objects
333 while (my ($event, $subtype) = each %EVENT_TYPE) { 413 while (my ($event, $subtype) = each %EVENT_TYPE) {
334 if (exists $ob->{"event_${event}_plugin"}) { 414 if (exists $ob->{"event_${event}_plugin"}) {
… …
350# arch as in "arch xxx", ie.. objects 430# arch as in "arch xxx", ie.. objects
351sub normalize_arch($) { 431sub normalize_arch($) {
352 my ($ob) = @_; 432 my ($ob) = @_;
353 433
354 normalize_object $ob; 434 normalize_object $ob;
435
436 return if $ob->{_atype} eq "object";
355 437
356 my $arch = $ARCH{$ob->{_name}} 438 my $arch = $ARCH{$ob->{_name}}
357 or (warn "$ob->{_name}: no such archetype", return $ob); 439 or (warn "$ob->{_name}: no such archetype", return $ob);
358 440
359 if ($arch->{type} == 22) { # map 441 if ($arch->{type} == 22) { # map
… …
395} 477}
396 478
397sub attr_thaw($) { 479sub attr_thaw($) {
398 my ($ob) = @_; 480 my ($ob) = @_;
399 481
400 $ob->{attach} = from_json $ob->{attach} 482 $ob->{attach} = decode_json $ob->{attach}
401 if exists $ob->{attach}; 483 if exists $ob->{attach};
402 484
403 $ob 485 $ob
404} 486}
405 487
406sub attr_freeze($) { 488sub attr_freeze($) {
407 my ($ob) = @_; 489 my ($ob) = @_;
408 490
409 $ob->{attach} = Crossfire::to_json $ob->{attach} 491 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
410 if exists $ob->{attach}; 492 if exists $ob->{attach};
411 493
412 $ob 494 $ob
413} 495}
414 496
… …
434 516
435 my %arc; 517 my %arc;
436 my ($more, $prev); 518 my ($more, $prev);
437 my $comment; 519 my $comment;
438 520
439 open my $fh, "<:raw:perlio:utf8", $path 521 open my $fh, "<:utf8", $path
440 or Carp::croak "$path: $!"; 522 or Carp::croak "$path: $!";
441 523
442# binmode $fh; 524# binmode $fh;
443 525
444 my $parse_block; $parse_block = sub { 526 my $parse_block; $parse_block = sub {
… …
544 my $str; 626 my $str;
545 627
546 my $append; $append = sub { 628 my $append; $append = sub {
547 my %a = %{$_[0]}; 629 my %a = %{$_[0]};
548 630
549 Crossfire::attr_freeze \%a; 631 Deliantra::attr_freeze \%a;
550 Crossfire::normalize_arch \%a; 632 Deliantra::normalize_arch \%a;
551 633
552 # undo the bit-split we did before 634 # undo the bit-split we did before
553 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}) {
554 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 636 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
555 | (delete $a{attack_movement_bits_4_7}); 637 | (delete $a{attack_movement_bits_4_7});
… …
565 647
566 my $inv = delete $a{inventory}; 648 my $inv = delete $a{inventory};
567 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
568 my $anim = delete $a{anim}; 650 my $anim = delete $a{anim};
569 651
652 if ($a{_atype} eq 'object') {
653 $str .= join "\n", "anim", @$anim, "mina\n"
654 if $anim;
655 }
656
570 my @kv; 657 my @kv;
571 658
572 for ($a{_name} eq "map" 659 for ($a{_name} eq "map"
573 ? @Crossfire::FIELD_ORDER_MAP 660 ? @Deliantra::FIELD_ORDER_MAP
574 : @Crossfire::FIELD_ORDER) { 661 : @Deliantra::FIELD_ORDER) {
575 push @kv, [$_, delete $a{$_}] 662 push @kv, [$_, delete $a{$_}]
576 if exists $a{$_}; 663 if exists $a{$_};
577 } 664 }
578 665
579 for (sort keys %a) { 666 for (sort keys %a) {
… …
582 } 669 }
583 670
584 for (@kv) { 671 for (@kv) {
585 my ($k, $v) = @$_; 672 my ($k, $v) = @$_;
586 673
587 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 674 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
588 $v =~ s/\n$//; 675 $v =~ s/\n$//;
589 $str .= "$k\n$v\n$end\n"; 676 $str .= "$k\n$v\n$end\n";
590 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
591 if ($v & ~Crossfire::MOVE_ALL or !$v) {
592 $str .= "$k $v\n";
593
594 } elsif ($v & Crossfire::MOVE_ALLBIT) {
595 $str .= "$k all";
596
597 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
598 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
599 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
600 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
601 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
602
603 $str .= "\n";
604
605 } else {
606 $str .= $k;
607
608 $str .= " walk" if $v & Crossfire::MOVE_WALK;
609 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
610 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
611 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
612 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
613
614 $str .= "\n";
615 }
616 } else { 677 } else {
617 $str .= "$k $v\n"; 678 $str .= "$k $v\n";
618 } 679 }
619 } 680 }
620 681
621 if ($inv) { 682 if ($inv) {
622 $append->($_) for @$inv; 683 $append->($_) for @$inv;
623 }
624
625 if ($a{_atype} eq 'object') {
626 $str .= join "\n", "anim", @$anim, "mina\n"
627 if $anim;
628 } 684 }
629 685
630 $str .= "end\n"; 686 $str .= "end\n";
631 687
632 if ($a{_atype} eq 'object') { 688 if ($a{_atype} eq 'object') {
… …
719=cut 775=cut
720 776
721sub arch_attr($) { 777sub arch_attr($) {
722 my ($obj) = @_; 778 my ($obj) = @_;
723 779
724 require Crossfire::Data; 780 require Deliantra::Data;
725 781
726 my $root; 782 my $root;
727 my $attr = { }; 783 my $attr = { };
728 784
729 my $arch = $ARCH{ $obj->{_name} }; 785 my $arch = $ARCH{ $obj->{_name} };
730 my $type = $obj->{type} || $arch->{type}; 786 my $type = $obj->{type} || $arch->{type};
731 787
732 if ($type > 0) { 788 if ($type > 0) {
733 $root = $Crossfire::Data::ATTR{$type}; 789 $root = $Deliantra::Data::ATTR{$type};
734 } else { 790 } else {
735 my %a = (%$arch, %$obj); 791 my %a = (%$arch, %$obj);
736 792
737 if ($a{is_floor} && !$a{alive}) { 793 if ($a{is_floor} && !$a{alive}) {
738 $root = $Crossfire::Data::TYPE{Floor}; 794 $root = $Deliantra::Data::TYPE{Floor};
739 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 795 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
740 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 796 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
741 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 797 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
742 $root = $Crossfire::Data::TYPE{Wall}; 798 $root = $Deliantra::Data::TYPE{Wall};
743 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 799 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
744 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 800 $root = $Deliantra::Data::TYPE{"Weak Wall"};
745 } else { 801 } else {
746 $root = $Crossfire::Data::TYPE{Misc}; 802 $root = $Deliantra::Data::TYPE{Misc};
747 } 803 }
748 } 804 }
749 805
750 my @import = ($root); 806 my @import = ($root);
751 807
752 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 808 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
753 unless $type == 116; 809 unless $type == 116;
754 810
755 my (%ignore); 811 my (%ignore);
756 my (@section_order, %section, @attr_order); 812 my (@section_order, %section, @attr_order);
757 813
758 while (my $type = shift @import) { 814 while (my $type = shift @import) {
815 push @import,
816 grep $_,
817 map $Deliantra::Data::TYPE{$_},
759 push @import, @{$type->{import} || []}; 818 @{$type->{import} || []};
760 819
761 $attr->{$_} ||= $type->{$_} 820 $attr->{$_} ||= $type->{$_}
762 for qw(name desc use); 821 for qw(name desc use);
763 822
764 for (@{$type->{ignore} || []}) { 823 for (@{$type->{ignore} || []}) {
… …
793 ]; 852 ];
794 853
795 $attr 854 $attr
796} 855}
797 856
798sub arch_edit_sections {
799# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
800# edit_type = 0;
801# else if (edit_type != 0) {
802# // all flags from 'check_type' must be unset in this arch because they get recalculated now
803# edit_type &= ~check_type;
804# }
805#
806# }
807# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
808# getAttributeValue("alive", defarch) == 1 &&
809# (getAttributeValue("monster", defarch) == 1 ||
810# getAttributeValue("generator", defarch) == 1)) {
811# // Monster: monsters/npcs/generators
812# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
813# }
814# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
815# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
816# // Walls
817# edit_type |= IGUIConstants.TILE_EDIT_WALL;
818# }
819# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
820# getAttributeValue("connected", defarch) != 0) {
821# // Connected Objects
822# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
823# }
824# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
825# arch_type == 66 || arch_type == 41 || arch_type == 95) {
826# // Exit: teleporter/exit/trapdoors
827# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
828# }
829# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
830# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
831# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
832# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
833# arch_type == 124 || arch_type == 130)) {
834# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
835# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
836# }
837# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
838# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
839# arch_type == 91 || arch_type == 21 || arch_type == 24) {
840# // Door: door/special door/gates + keys
841# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
842# }
843# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
844# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
845# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
846# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
847# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
848# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
849# arch_type == 122 || arch_type == 3)) {
850# // Equipment: weapons/armour/wands/rods
851# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
852# }
853#
854# return(edit_type);
855#
856#
857}
858
859sub cache_file($$&&) { 857sub cache_file($$&&) {
860 my ($src, $cache, $load, $create) = @_; 858 my ($src, $cache, $load, $create) = @_;
861 859
862 my ($size, $mtime) = (stat $src)[7,9] 860 my ($size, $mtime) = (stat $src)[7,9]
863 or Carp::croak "$src: $!"; 861 or Carp::croak "$src: $!";
… …
911 }, sub { 909 }, sub {
912 read_arch "$LIB/archetypes" 910 read_arch "$LIB/archetypes"
913 }; 911 };
914} 912}
915 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
916=item load_tilecache 944=item load_tilecache
917 945
918(Re-)Load %TILE and %FACE. 946(Re-)Load %TILE and %FACE.
919 947
920=cut 948=cut
921 949
922sub load_tilecache() { 950sub load_tilecache() {
923 require Gtk2; 951 require Gtk2;
924 952
925 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 953 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
926 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
927 or die "$VARDIR/tilecache.png: $!";
928 *FACE = $_[0];
929 }, sub { 954 sub {
930 my $tile = read_pak "$LIB/crossfire.0";
931
932 my %cache; 955 my %cache;
956 my $facedata = Storable::retrieve "$LIB/facedata";
933 957
958 $facedata->{version} == 2
959 or die "$LIB/facedata: version mismatch, cannot proceed.";
960
961 my $faces = $facedata->{faceinfo};
934 my $idx = 0; 962 my $idx = 0;
935 963
936 for my $name (sort keys %$tile) { 964 for (sort keys %$faces) {
965 my ($face, $info) = ($_, $faces->{$_});
966
937 my $pb = new Gtk2::Gdk::PixbufLoader; 967 my $pb = new Gtk2::Gdk::PixbufLoader;
938 $pb->write ($tile->{$name}); 968 $pb->write ($info->{data32});
939 $pb->close; 969 $pb->close;
940 my $pb = $pb->get_pixbuf; 970 my $pb = $pb->get_pixbuf;
941 971
942 my $tile = $cache{$name} = { 972 my $tile = $cache{$face} = {
943 pb => $pb, 973 pb => $pb,
944 idx => $idx, 974 idx => $idx,
945 w => int $pb->get_width / TILESIZE, 975 w => int $pb->get_width / TILESIZE,
946 h => int $pb->get_height / TILESIZE, 976 h => int $pb->get_height / TILESIZE,
947 }; 977 };
948
949 978
950 $idx += $tile->{w} * $tile->{h}; 979 $idx += $tile->{w} * $tile->{h};
980 }
981
982 construct_tilecache_pb $idx, \%cache;
983
984 \%cache
951 } 985 };
952
953 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
954
955 while (my ($name, $tile) = each %cache) {
956 my $tpb = delete $tile->{pb};
957 my $ofs = $tile->{idx};
958
959 for my $x (0 .. $tile->{w} - 1) {
960 for my $y (0 .. $tile->{h} - 1) {
961 my $idx = $ofs + $x + $y * $tile->{w};
962 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
963 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
964 }
965 }
966 }
967
968 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
969
970 \%cache
971 };
972} 986}
973 987
974=head1 AUTHOR 988=head1 AUTHOR
975 989
976 Marc Lehmann <schmorp@schmorp.de> 990 Marc Lehmann <schmorp@schmorp.de>
… …
980 http://www.ta-sa.org/ 994 http://www.ta-sa.org/
981 995
982=cut 996=cut
983 997
9841 9981
999

Diff Legend

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