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.84 by root, Wed Feb 7 00:22:34 2007 UTC vs.
Revision 1.120 by root, Wed Dec 26 18:26:15 2007 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.14';
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($) { 29our $LIB = $ENV{DELIANTRA_LIBDIR} || $ENV{CROSSFIRE_LIBDIR};
27 $JSON::Syck::ImplicitUnicode = 1;
28 JSON::Syck::Load $_[0]
29}
30 30
31sub to_json($) {
32 $JSON::Syck::ImplicitUnicode = 0;
33 JSON::Syck::Dump $_[0]
34}
35
36our $LIB = $ENV{CROSSFIRE_LIBDIR};
37
38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" 31our $OLDDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 32 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
40 : File::Spec->tmpdir . "/crossfire"; 33 : File::Spec->tmpdir . "/crossfire";
41 34
35our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
36 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
37 : File::Spec->tmpdir . "/deliantra";
38
42mkdir $VARDIR, 0777; 39mkdir $VARDIR, 0777;
43 40
44sub TILESIZE (){ 32 } 41sub TILESIZE (){ 32 }
42sub CACHESTRIDE (){ 64 }
45 43
46our %ARCH; 44our %ARCH;
45our %FACE; # face32
47our %FACE; 46our %FACEDATA;
48our $TILE; 47our $TILE;
49 48
50our %FIELD_MULTILINE = ( 49our %FIELD_MULTILINE = (
51 msg => "endmsg", 50 msg => "endmsg",
52 lore => "endlore", 51 lore => "endlore",
… …
58 qw(move_type move_block move_allow move_on move_off move_slow); 57 qw(move_type move_block move_allow move_on move_off move_slow);
59 58
60# same as in server save routine, to (hopefully) be compatible 59# same as in server save routine, to (hopefully) be compatible
61# to the other editors. 60# to the other editors.
62our @FIELD_ORDER_MAP = (qw( 61our @FIELD_ORDER_MAP = (qw(
62 file_format_version
63 name attach swap_time reset_timeout fixed_resettime difficulty region 63 name attach swap_time reset_timeout fixed_resettime difficulty region
64 shopitems shopgreed shopmin shopmax shoprace 64 shopitems shopgreed shopmin shopmax shoprace
65 darkness width height enter_x enter_y msg maplore 65 darkness width height enter_x enter_y msg maplore
66 unique template 66 unique template
67 outdoor temp pressure humid windspeed winddir sky nosmooth 67 outdoor temp pressure humid windspeed winddir sky nosmooth
68 tile_path_1 tile_path_2 tile_path_3 tile_path_4 68 tile_path_1 tile_path_2 tile_path_3 tile_path_4
69)); 69));
70 70
71our @FIELD_ORDER = (qw( 71our @FIELD_ORDER = (qw(
72 inherit
73
72 elevation 74 elevation
73 75
74 name name_pl custom_name attach title race 76 name name_pl custom_name attach title race
75 slaying skill msg lore other_arch face 77 slaying skill msg lore other_arch
76 #todo-events
77 animation is_animated 78 face animation is_animated
79 magicmap smoothlevel smoothface
78 str dex con wis pow cha int 80 str dex con wis pow cha int
79 hp maxhp sp maxsp grace maxgrace 81 hp maxhp sp maxsp grace maxgrace
80 exp perm_exp expmul 82 exp perm_exp expmul
81 food dam luck wc ac x y speed speed_left move_state attack_movement 83 food dam luck wc ac x y speed speed_left move_state attack_movement
82 nrof level direction type subtype attacktype 84 nrof level direction type subtype attacktype
… …
90 resist_life_stealing resist_disease 92 resist_life_stealing resist_disease
91 93
92 path_attuned path_repelled path_denied material materialname 94 path_attuned path_repelled path_denied material materialname
93 value carrying weight invisible state magic 95 value carrying weight invisible state magic
94 last_heal last_sp last_grace last_eat 96 last_heal last_sp last_grace last_eat
95 connected glow_radius randomitems npx_status npc_program 97 connected glow_radius randomitems tresure_env npx_status npc_program
96 run_away pick_up container will_apply smoothlevel 98 run_away pick_up container will_apply smoothlevel
97 current_weapon_script weapontype tooltype elevation client_type 99 current_weapon_script weapontype tooltype elevation client_type
98 item_power duration range 100 item_power duration range
99 range_modifier duration_modifier dam_modifier gen_sp_armour 101 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 102 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 113 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 114 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 115 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 116 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 117 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
118 precious
116 119
117 body_range body_arm body_torso body_head body_neck body_skill 120 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 121 body_finger body_shoulder body_foot body_hand body_wrist body_waist
119)); 122));
120 123
… …
137sub MOVE_FLY_LOW (){ 0x02 } 140sub MOVE_FLY_LOW (){ 0x02 }
138sub MOVE_FLY_HIGH (){ 0x04 } 141sub MOVE_FLY_HIGH (){ 0x04 }
139sub MOVE_FLYING (){ 0x06 } 142sub MOVE_FLYING (){ 0x06 }
140sub MOVE_SWIM (){ 0x08 } 143sub MOVE_SWIM (){ 0x08 }
141sub MOVE_BOAT (){ 0x10 } 144sub MOVE_BOAT (){ 0x10 }
145sub MOVE_SHIP (){ 0x20 }
142sub MOVE_KNOWN (){ 0x1f } # all of above 146sub MOVE_KNOWN (){ 0x3f } # all of above
143sub MOVE_ALLBIT (){ 0x10000 }
144sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 147sub MOVE_ALL (){ 0x10000 } # very special value
148
149our %MOVE_TYPE = (
150 walk => MOVE_WALK,
151 fly_low => MOVE_FLY_LOW,
152 fly_high => MOVE_FLY_HIGH,
153 flying => MOVE_FLYING,
154 swim => MOVE_SWIM,
155 boat => MOVE_BOAT,
156 ship => MOVE_SHIP,
157 all => MOVE_ALL,
158);
159
160our @MOVE_TYPE = keys %MOVE_TYPE;
161
162{
163 package Deliantra::MoveType;
164
165 use overload
166 '=' => sub { bless [@{$_[0]}], ref $_[0] },
167 '""' => \&as_string,
168 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
169 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
170 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
171 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
172 'x=' => sub {
173 my $cur = $_[0] >= $_[1];
174 if (!defined $cur) {
175 if ($_[0] >= "all") {
176 $_[0] -= $_[1];
177 } else {
178 $_[0] += $_[1];
179 }
180 } elsif ($cur) {
181 $_[0] -= $_[1];
182 } else {
183 $_[0] /= $_[1];
184 }
185
186 $_[0]
187 },
188 'eq' => sub { "$_[0]" eq "$_[1]" },
189 'ne' => sub { "$_[0]" ne "$_[1]" },
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
… …
225 ice => 68, 328 ice => 68,
226 stone => 70, 329 stone => 70,
227 stone => 80, 330 stone => 80,
228 cloth => 136, 331 cloth => 136,
229 ironwood => 144, 332 ironwood => 144,
333 adamantium => 258,
230 glacium => 260, 334 glacium => 260,
231 blood => 544, 335 blood => 544,
232; 336;
233 337
234# object as in "Object xxx", i.e. archetypes 338# object as in "Object xxx", i.e. archetypes
… …
252 } else { 356 } else {
253 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 357 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
254 } 358 }
255 } 359 }
256 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
257 # nuke outdated or never supported fields 375 # nuke outdated or never supported fields
258 delete @$ob{qw( 376 delete @$ob{qw(
259 can_knockback can_parry can_impale can_cut can_dam_armour 377 can_knockback can_parry can_impale can_cut can_dam_armour
260 can_apply pass_thru can_pass_thru 378 can_apply pass_thru can_pass_thru color_bg color_fg
261 )}; 379 )};
262 380
263 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 381 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
264 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 382 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
265 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 383 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
266 384
267 # convert movement strings to bitsets 385 # convert movement strings to bitsets
268 for my $attr (keys %FIELD_MOVEMENT) { 386 for my $attr (keys %FIELD_MOVEMENT) {
269 next unless exists $ob->{$attr}; 387 next unless exists $ob->{$attr};
270 388
271 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 389 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
272
273 next if $ob->{$attr} =~ /^\d+$/;
274
275 my $flags = 0;
276
277 # assume list
278 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
279 $flags |= MOVE_WALK if $flag eq "walk";
280 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
281 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
282 $flags |= MOVE_FLYING if $flag eq "flying";
283 $flags |= MOVE_SWIM if $flag eq "swim";
284 $flags |= MOVE_BOAT if $flag eq "boat";
285 $flags |= MOVE_ALL if $flag eq "all";
286
287 $flags &= ~MOVE_WALK if $flag eq "-walk";
288 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
289 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
290 $flags &= ~MOVE_FLYING if $flag eq "-flying";
291 $flags &= ~MOVE_SWIM if $flag eq "-swim";
292 $flags &= ~MOVE_BOAT if $flag eq "-boat";
293 $flags &= ~MOVE_ALL if $flag eq "-all";
294 }
295
296 $ob->{$attr} = $flags;
297 } 390 }
298 391
299 # convert outdated movement flags to new movement sets 392 # convert outdated movement flags to new movement sets
300 if (defined (my $v = delete $ob->{no_pass})) { 393 if (defined (my $v = delete $ob->{no_pass})) {
301 $ob->{move_block} = $v ? MOVE_ALL : 0; 394 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
302 } 395 }
303 if (defined (my $v = delete $ob->{slow_move})) { 396 if (defined (my $v = delete $ob->{slow_move})) {
304 $ob->{move_slow} |= MOVE_WALK; 397 $ob->{move_slow} += "walk";
305 $ob->{move_slow_penalty} = $v; 398 $ob->{move_slow_penalty} = $v;
306 } 399 }
307 if (defined (my $v = delete $ob->{walk_on})) { 400 if (defined (my $v = delete $ob->{walk_on})) {
308 $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" }
309 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
310 : $ob->{move_on} & ~MOVE_WALK;
311 } 402 }
312 if (defined (my $v = delete $ob->{walk_off})) { 403 if (defined (my $v = delete $ob->{walk_off})) {
313 $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" }
314 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
315 : $ob->{move_off} & ~MOVE_WALK;
316 } 405 }
317 if (defined (my $v = delete $ob->{fly_on})) { 406 if (defined (my $v = delete $ob->{fly_on})) {
318 $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" }
319 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
320 : $ob->{move_on} & ~MOVE_FLY_LOW;
321 } 408 }
322 if (defined (my $v = delete $ob->{fly_off})) { 409 if (defined (my $v = delete $ob->{fly_off})) {
323 $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" }
324 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
325 : $ob->{move_off} & ~MOVE_FLY_LOW;
326 } 411 }
327 if (defined (my $v = delete $ob->{flying})) { 412 if (defined (my $v = delete $ob->{flying})) {
328 $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" }
329 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
330 : $ob->{move_type} & ~MOVE_FLY_LOW;
331 } 414 }
332 415
333 # convert idiotic event_xxx things into objects 416 # convert idiotic event_xxx things into objects
334 while (my ($event, $subtype) = each %EVENT_TYPE) { 417 while (my ($event, $subtype) = each %EVENT_TYPE) {
335 if (exists $ob->{"event_${event}_plugin"}) { 418 if (exists $ob->{"event_${event}_plugin"}) {
… …
396} 479}
397 480
398sub attr_thaw($) { 481sub attr_thaw($) {
399 my ($ob) = @_; 482 my ($ob) = @_;
400 483
401 $ob->{attach} = from_json $ob->{attach} 484 $ob->{attach} = decode_json $ob->{attach}
402 if exists $ob->{attach}; 485 if exists $ob->{attach};
403 486
404 $ob 487 $ob
405} 488}
406 489
407sub attr_freeze($) { 490sub attr_freeze($) {
408 my ($ob) = @_; 491 my ($ob) = @_;
409 492
410 $ob->{attach} = Crossfire::to_json $ob->{attach} 493 $ob->{attach} = Deliantra::encode_json $ob->{attach}
411 if exists $ob->{attach}; 494 if exists $ob->{attach};
412 495
413 $ob 496 $ob
414} 497}
415 498
… …
545 my $str; 628 my $str;
546 629
547 my $append; $append = sub { 630 my $append; $append = sub {
548 my %a = %{$_[0]}; 631 my %a = %{$_[0]};
549 632
550 Crossfire::attr_freeze \%a; 633 Deliantra::attr_freeze \%a;
551 Crossfire::normalize_arch \%a; 634 Deliantra::normalize_arch \%a;
552 635
553 # undo the bit-split we did before 636 # undo the bit-split we did before
554 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 637 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
555 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 638 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
556 | (delete $a{attack_movement_bits_4_7}); 639 | (delete $a{attack_movement_bits_4_7});
… …
566 649
567 my $inv = delete $a{inventory}; 650 my $inv = delete $a{inventory};
568 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 651 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
569 my $anim = delete $a{anim}; 652 my $anim = delete $a{anim};
570 653
654 if ($a{_atype} eq 'object') {
655 $str .= join "\n", "anim", @$anim, "mina\n"
656 if $anim;
657 }
658
571 my @kv; 659 my @kv;
572 660
573 for ($a{_name} eq "map" 661 for ($a{_name} eq "map"
574 ? @Crossfire::FIELD_ORDER_MAP 662 ? @Deliantra::FIELD_ORDER_MAP
575 : @Crossfire::FIELD_ORDER) { 663 : @Deliantra::FIELD_ORDER) {
576 push @kv, [$_, delete $a{$_}] 664 push @kv, [$_, delete $a{$_}]
577 if exists $a{$_}; 665 if exists $a{$_};
578 } 666 }
579 667
580 for (sort keys %a) { 668 for (sort keys %a) {
… …
583 } 671 }
584 672
585 for (@kv) { 673 for (@kv) {
586 my ($k, $v) = @$_; 674 my ($k, $v) = @$_;
587 675
588 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 676 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
589 $v =~ s/\n$//; 677 $v =~ s/\n$//;
590 $str .= "$k\n$v\n$end\n"; 678 $str .= "$k\n$v\n$end\n";
591 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
592 if ($v & ~Crossfire::MOVE_ALL or !$v) {
593 $str .= "$k $v\n";
594
595 } elsif ($v & Crossfire::MOVE_ALLBIT) {
596 $str .= "$k all";
597
598 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
599 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
600 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
601 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
602 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
603
604 $str .= "\n";
605
606 } else {
607 $str .= $k;
608
609 $str .= " walk" if $v & Crossfire::MOVE_WALK;
610 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
611 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
612 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
613 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
614
615 $str .= "\n";
616 }
617 } else { 679 } else {
618 $str .= "$k $v\n"; 680 $str .= "$k $v\n";
619 } 681 }
620 } 682 }
621 683
622 if ($inv) { 684 if ($inv) {
623 $append->($_) for @$inv; 685 $append->($_) for @$inv;
624 }
625
626 if ($a{_atype} eq 'object') {
627 $str .= join "\n", "anim", @$anim, "mina\n"
628 if $anim;
629 } 686 }
630 687
631 $str .= "end\n"; 688 $str .= "end\n";
632 689
633 if ($a{_atype} eq 'object') { 690 if ($a{_atype} eq 'object') {
… …
720=cut 777=cut
721 778
722sub arch_attr($) { 779sub arch_attr($) {
723 my ($obj) = @_; 780 my ($obj) = @_;
724 781
725 require Crossfire::Data; 782 require Deliantra::Data;
726 783
727 my $root; 784 my $root;
728 my $attr = { }; 785 my $attr = { };
729 786
730 my $arch = $ARCH{ $obj->{_name} }; 787 my $arch = $ARCH{ $obj->{_name} };
731 my $type = $obj->{type} || $arch->{type}; 788 my $type = $obj->{type} || $arch->{type};
732 789
733 if ($type > 0) { 790 if ($type > 0) {
734 $root = $Crossfire::Data::ATTR{$type}; 791 $root = $Deliantra::Data::ATTR{$type};
735 } else { 792 } else {
736 my %a = (%$arch, %$obj); 793 my %a = (%$arch, %$obj);
737 794
738 if ($a{is_floor} && !$a{alive}) { 795 if ($a{is_floor} && !$a{alive}) {
739 $root = $Crossfire::Data::TYPE{Floor}; 796 $root = $Deliantra::Data::TYPE{Floor};
740 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 797 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
741 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 798 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
742 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 799 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
743 $root = $Crossfire::Data::TYPE{Wall}; 800 $root = $Deliantra::Data::TYPE{Wall};
744 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 801 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
745 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 802 $root = $Deliantra::Data::TYPE{"Weak Wall"};
746 } else { 803 } else {
747 $root = $Crossfire::Data::TYPE{Misc}; 804 $root = $Deliantra::Data::TYPE{Misc};
748 } 805 }
749 } 806 }
750 807
751 my @import = ($root); 808 my @import = ($root);
752 809
753 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 810 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
754 unless $type == 116; 811 unless $type == 116;
755 812
756 my (%ignore); 813 my (%ignore);
757 my (@section_order, %section, @attr_order); 814 my (@section_order, %section, @attr_order);
758 815
759 while (my $type = shift @import) { 816 while (my $type = shift @import) {
817 push @import,
818 grep $_,
819 map $Deliantra::Data::TYPE{$_},
760 push @import, @{$type->{import} || []}; 820 @{$type->{import} || []};
761 821
762 $attr->{$_} ||= $type->{$_} 822 $attr->{$_} ||= $type->{$_}
763 for qw(name desc use); 823 for qw(name desc use);
764 824
765 for (@{$type->{ignore} || []}) { 825 for (@{$type->{ignore} || []}) {
… …
794 ]; 854 ];
795 855
796 $attr 856 $attr
797} 857}
798 858
799sub arch_edit_sections {
800# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
801# edit_type = 0;
802# else if (edit_type != 0) {
803# // all flags from 'check_type' must be unset in this arch because they get recalculated now
804# edit_type &= ~check_type;
805# }
806#
807# }
808# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
809# getAttributeValue("alive", defarch) == 1 &&
810# (getAttributeValue("monster", defarch) == 1 ||
811# getAttributeValue("generator", defarch) == 1)) {
812# // Monster: monsters/npcs/generators
813# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
814# }
815# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
816# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
817# // Walls
818# edit_type |= IGUIConstants.TILE_EDIT_WALL;
819# }
820# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
821# getAttributeValue("connected", defarch) != 0) {
822# // Connected Objects
823# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
824# }
825# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
826# arch_type == 66 || arch_type == 41 || arch_type == 95) {
827# // Exit: teleporter/exit/trapdoors
828# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
829# }
830# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
831# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
832# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
833# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
834# arch_type == 124 || arch_type == 130)) {
835# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
836# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
837# }
838# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
839# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
840# arch_type == 91 || arch_type == 21 || arch_type == 24) {
841# // Door: door/special door/gates + keys
842# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
843# }
844# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
845# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
846# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
847# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
848# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
849# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
850# arch_type == 122 || arch_type == 3)) {
851# // Equipment: weapons/armour/wands/rods
852# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
853# }
854#
855# return(edit_type);
856#
857#
858}
859
860sub cache_file($$&&) { 859sub cache_file($$&&) {
861 my ($src, $cache, $load, $create) = @_; 860 my ($src, $cache, $load, $create) = @_;
862 861
863 my ($size, $mtime) = (stat $src)[7,9] 862 my ($size, $mtime) = (stat $src)[7,9]
864 or Carp::croak "$src: $!"; 863 or Carp::croak "$src: $!";
… …
912 }, sub { 911 }, sub {
913 read_arch "$LIB/archetypes" 912 read_arch "$LIB/archetypes"
914 }; 913 };
915} 914}
916 915
916sub construct_tilecache_pb {
917 my ($idx, $cache) = @_;
918
919 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
920
921 while (my ($name, $tile) = each %$cache) {
922 my $tpb = delete $tile->{pb};
923 my $ofs = $tile->{idx};
924
925 for my $x (0 .. $tile->{w} - 1) {
926 for my $y (0 .. $tile->{h} - 1) {
927 my $idx = $ofs + $x + $y * $tile->{w};
928 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
929 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
930 }
931 }
932 }
933
934 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
935
936 $cache
937}
938
939sub use_tilecache {
940 my ($face) = @_;
941 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
942 or die "$VARDIR/tilecache.png: $!";
943 *FACE = $_[0];
944}
945
917=item load_tilecache 946=item load_tilecache
918 947
919(Re-)Load %TILE and %FACE. 948(Re-)Load %TILE and %FACE.
920 949
921=cut 950=cut
922 951
923sub load_tilecache() { 952sub load_tilecache() {
924 require Gtk2; 953 require Gtk2;
925 954
926 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 955 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
927 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
928 or die "$VARDIR/tilecache.png: $!";
929 *FACE = $_[0];
930 }, sub { 956 sub {
931 my $tile = read_pak "$LIB/crossfire.0";
932
933 my %cache; 957 my %cache;
958 my $facedata = Storable::retrieve "$LIB/facedata";
934 959
960 $facedata->{version} == 2
961 or die "$LIB/facedata: version mismatch, cannot proceed.";
962
963 my $faces = $facedata->{faceinfo};
935 my $idx = 0; 964 my $idx = 0;
936 965
937 for my $name (sort keys %$tile) { 966 for (sort keys %$faces) {
967 my ($face, $info) = ($_, $faces->{$_});
968
938 my $pb = new Gtk2::Gdk::PixbufLoader; 969 my $pb = new Gtk2::Gdk::PixbufLoader;
939 $pb->write ($tile->{$name}); 970 $pb->write ($info->{data32});
940 $pb->close; 971 $pb->close;
941 my $pb = $pb->get_pixbuf; 972 my $pb = $pb->get_pixbuf;
942 973
943 my $tile = $cache{$name} = { 974 my $tile = $cache{$face} = {
944 pb => $pb, 975 pb => $pb,
945 idx => $idx, 976 idx => $idx,
946 w => int $pb->get_width / TILESIZE, 977 w => int $pb->get_width / TILESIZE,
947 h => int $pb->get_height / TILESIZE, 978 h => int $pb->get_height / TILESIZE,
948 }; 979 };
949
950 980
951 $idx += $tile->{w} * $tile->{h}; 981 $idx += $tile->{w} * $tile->{h};
982 }
983
984 construct_tilecache_pb $idx, \%cache;
985
986 \%cache
952 } 987 };
953
954 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
955
956 while (my ($name, $tile) = each %cache) {
957 my $tpb = delete $tile->{pb};
958 my $ofs = $tile->{idx};
959
960 for my $x (0 .. $tile->{w} - 1) {
961 for my $y (0 .. $tile->{h} - 1) {
962 my $idx = $ofs + $x + $y * $tile->{w};
963 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
964 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
965 }
966 }
967 }
968
969 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
970
971 \%cache
972 };
973} 988}
974 989
975=head1 AUTHOR 990=head1 AUTHOR
976 991
977 Marc Lehmann <schmorp@schmorp.de> 992 Marc Lehmann <schmorp@schmorp.de>
… …
981 http://www.ta-sa.org/ 996 http://www.ta-sa.org/
982 997
983=cut 998=cut
984 999
9851 10001
1001

Diff Legend

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