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.88 by root, Sun Feb 18 20:20:58 2007 UTC vs.
Revision 1.138 by elmex, Wed Dec 16 17:00:09 2009 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire - Crossfire maphandling 3Deliantra - Deliantra suppport module to read/write archetypes, maps etc.
4
5=over 4
4 6
5=cut 7=cut
6 8
7package Crossfire; 9package Deliantra;
8 10
9our $VERSION = '0.96'; 11our $VERSION = '1.25';
10 12
11use strict; 13use common::sense;
12 14
13use base 'Exporter'; 15use base 'Exporter';
14 16
15use Carp (); 17use Carp ();
16use File::Spec; 18use File::Spec;
17use List::Util qw(min max); 19use List::Util qw(min max);
18use Storable qw(freeze thaw); 20use Storable qw(freeze thaw);
19 21
20our @EXPORT = qw( 22our @EXPORT = qw(
21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents 23 read_pak read_arch
24 *ARCH $TILE *FACE *FACEDATA
25 TILESIZE CACHESTRIDE
26 editor_archs arch_extents
22); 27);
23 28
24use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working 29use JSON::XS qw(decode_json encode_json);
25 30
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}; 31our $LIB = $ENV{DELIANTRA_LIBDIR};
37 32
38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" 33our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 34 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
40 : File::Spec->tmpdir . "/crossfire"; 35 : File::Spec->tmpdir . "/deliantra";
41 36
42mkdir $VARDIR, 0777; 37mkdir $VARDIR, 0777;
43 38
44sub TILESIZE (){ 32 } 39sub TILESIZE (){ 32 }
40sub CACHESTRIDE (){ 64 }
45 41
46our %ARCH; 42our %ARCH;
43our %FACE; # face32
47our %FACE; 44our %FACEDATA;
48our $TILE; 45our $TILE;
49 46
50our %FIELD_MULTILINE = ( 47our %FIELD_MULTILINE = (
51 msg => "endmsg", 48 msg => "endmsg",
52 lore => "endlore", 49 lore => "endlore",
… …
68 outdoor temp pressure humid windspeed winddir sky nosmooth 65 outdoor temp pressure humid windspeed winddir sky nosmooth
69 tile_path_1 tile_path_2 tile_path_3 tile_path_4 66 tile_path_1 tile_path_2 tile_path_3 tile_path_4
70)); 67));
71 68
72our @FIELD_ORDER = (qw( 69our @FIELD_ORDER = (qw(
70 inherit
71
73 elevation 72 elevation
74 73
75 name name_pl custom_name attach title race 74 name name_pl custom_name attach title race
76 slaying skill msg lore other_arch face 75 slaying skill msg lore other_arch
77 #todo-events 76 sound sound_destroy face animation is_animated
78 animation is_animated 77 magicmap smoothlevel smoothface
79 str dex con wis pow cha int 78 str dex con wis pow cha int
80 hp maxhp sp maxsp grace maxgrace 79 hp maxhp sp maxsp grace maxgrace
81 exp perm_exp expmul 80 exp perm_exp expmul
82 food dam luck wc ac x y speed speed_left move_state attack_movement 81 food dam luck wc ac x y speed speed_left move_state attack_movement
83 nrof level direction type subtype attacktype 82 nrof level direction type subtype attacktype
… …
91 resist_life_stealing resist_disease 90 resist_life_stealing resist_disease
92 91
93 path_attuned path_repelled path_denied material materialname 92 path_attuned path_repelled path_denied material materialname
94 value carrying weight invisible state magic 93 value carrying weight invisible state magic
95 last_heal last_sp last_grace last_eat 94 last_heal last_sp last_grace last_eat
96 connected glow_radius randomitems npx_status npc_program 95 connected glow_radius randomitems tresure_env npx_status npc_program
97 run_away pick_up container will_apply smoothlevel 96 run_away pick_up container will_apply smoothlevel
98 current_weapon_script weapontype tooltype elevation client_type 97 current_weapon_script weapontype tooltype elevation client_type
99 item_power duration range 98 item_power duration range
100 range_modifier duration_modifier dam_modifier gen_sp_armour 99 range_modifier duration_modifier dam_modifier gen_sp_armour
101 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty 100 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
… …
112 known_magical known_cursed can_use_skill been_applied has_ready_scroll 111 known_magical known_cursed can_use_skill been_applied has_ready_scroll
113 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly 112 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
114 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark 113 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
115 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage 114 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
116 activate_on_push activate_on_release is_water use_content_on_gen is_buildable 115 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
116 precious
117 117
118 body_range body_arm body_torso body_head body_neck body_skill 118 body_range body_arm body_torso body_head body_neck body_skill
119 body_finger body_shoulder body_foot body_hand body_wrist body_waist 119 body_finger body_shoulder body_foot body_hand body_wrist body_waist
120)); 120));
121 121
… …
138sub MOVE_FLY_LOW (){ 0x02 } 138sub MOVE_FLY_LOW (){ 0x02 }
139sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
140sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
141sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
142sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
143sub MOVE_SHIP (){ 0x20 }
143sub MOVE_KNOWN (){ 0x1f } # all of above 144sub MOVE_KNOWN (){ 0x3f } # all of above
144sub MOVE_ALLBIT (){ 0x10000 }
145sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 145sub MOVE_ALL (){ 0x10000 } # very special value
146
147our %MOVE_TYPE = (
148 walk => MOVE_WALK,
149 fly_low => MOVE_FLY_LOW,
150 fly_high => MOVE_FLY_HIGH,
151 flying => MOVE_FLYING,
152 swim => MOVE_SWIM,
153 boat => MOVE_BOAT,
154 ship => MOVE_SHIP,
155 all => MOVE_ALL,
156);
157
158our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
159
160{
161 package Deliantra::MoveType;
162
163 use overload
164 '=' => sub { bless [@{$_[0]}], ref $_[0] },
165 '""' => \&as_string,
166 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
167 '<=' => sub {
168 ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
169 ? $_[0][1] & $MOVE_TYPE{$_[1]}
170 : undef
171 },
172 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
173 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
174 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
175 'x=' => sub { # toggle between off, + and -
176 my $cur = $_[0] >= $_[1];
177 if (!defined $cur) {
178 if ($_[0] >= "all") {
179 $_[0] -= $_[1];
180 } else {
181 $_[0] += $_[1];
182 }
183 } elsif ($cur) {
184 $_[0] -= $_[1];
185 } else {
186 $_[0] /= $_[1];
187 }
188
189 $_[0]
190 },
191 'eq' => sub { "$_[0]" eq "$_[1]" },
192 'ne' => sub { "$_[0]" ne "$_[1]" },
193 ;
194
195 sub TO_JSON {
196 $_[0][0]
197 }
198}
199
200sub Deliantra::MoveType::new {
201 my ($class, $string) = @_;
202
203 my $mask;
204 my $value;
205
206 if ($string =~ /^\s*\d+\s*$/) {
207 $mask = MOVE_ALL;
208 $value = $string+0;
209 } else {
210 for (split /\s+/, lc $string) {
211 if (s/^-//) {
212 $mask |= $MOVE_TYPE{$_};
213 $value &= ~$MOVE_TYPE{$_};
214 } else {
215 $mask |= $MOVE_TYPE{$_};
216 $value |= $MOVE_TYPE{$_};
217 }
218 }
219 }
220
221 (bless [$mask, $value], $class)->normalise
222}
223
224sub Deliantra::MoveType::normalise {
225 my ($self) = @_;
226
227 if ($self->[0] & MOVE_ALL) {
228 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
229 $self->[0] &= $mask;
230 $self->[1] &= $mask;
231 }
232
233 $self->[1] &= $self->[0];
234
235 $self
236}
237
238sub Deliantra::MoveType::as_string {
239 my ($self) = @_;
240
241 my @res;
242
243 my ($mask, $value) = @$self;
244
245 for (@Deliantra::MOVE_TYPE) {
246 my $bit = $Deliantra::MOVE_TYPE{$_};
247 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
248 $mask &= ~$bit;
249 push @res, $value & $bit ? $_ : "-$_";
250 }
251 }
252
253 join " ", @res
254}
146 255
147sub load_ref($) { 256sub load_ref($) {
148 my ($path) = @_; 257 my ($path) = @_;
149 258
150 open my $fh, "<:raw:perlio", $path 259 open my $fh, "<:raw:perlio", $path
… …
235 344
236# object as in "Object xxx", i.e. archetypes 345# object as in "Object xxx", i.e. archetypes
237sub normalize_object($) { 346sub normalize_object($) {
238 my ($ob) = @_; 347 my ($ob) = @_;
239 348
349 delete $ob->{editable}; # deprecated
350
240 # convert material bitset to materialname, if possible 351 # convert material bitset to materialname, if possible
241 if (exists $ob->{material}) { 352 if (exists $ob->{material}) {
242 if (!$ob->{material}) { 353 if (!$ob->{material}) {
243 delete $ob->{material}; 354 delete $ob->{material};
244 } elsif (exists $ob->{materialname}) { 355 } elsif (exists $ob->{materialname}) {
… …
254 } else { 365 } else {
255 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 366 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
256 } 367 }
257 } 368 }
258 369
370 # check whether attachment is the same as in the archetype
371 if (exists $ob->{attach}) {
372 my $arch = $ARCH{$ob->{_name}};
373 my $js = JSON::XS->new->utf8->canonical (1);
374
375 if (defined $arch->{attach}
376 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
377 delete $ob->{attach}
378 }
379 }
380
381 # color_fg is used as default for magicmap if magicmap does not exist
382 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
383
259 # nuke outdated or never supported fields 384 # nuke outdated or never supported fields
260 delete @$ob{qw( 385 delete @$ob{qw(
261 can_knockback can_parry can_impale can_cut can_dam_armour 386 can_knockback can_parry can_impale can_cut can_dam_armour
262 can_apply pass_thru can_pass_thru 387 can_apply pass_thru can_pass_thru color_bg color_fg
263 )}; 388 )};
264 389
265 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 390 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
266 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 391 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
267 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 392 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
268 393
269 # convert movement strings to bitsets 394 # convert movement strings to bitsets
270 for my $attr (keys %FIELD_MOVEMENT) { 395 for my $attr (keys %FIELD_MOVEMENT) {
271 next unless exists $ob->{$attr}; 396 next unless exists $ob->{$attr};
272 397
273 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 398 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
274
275 next if $ob->{$attr} =~ /^\d+$/;
276
277 my $flags = 0;
278
279 # assume list
280 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
281 $flags |= MOVE_WALK if $flag eq "walk";
282 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
283 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
284 $flags |= MOVE_FLYING if $flag eq "flying";
285 $flags |= MOVE_SWIM if $flag eq "swim";
286 $flags |= MOVE_BOAT if $flag eq "boat";
287 $flags |= MOVE_ALL if $flag eq "all";
288
289 $flags &= ~MOVE_WALK if $flag eq "-walk";
290 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
291 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
292 $flags &= ~MOVE_FLYING if $flag eq "-flying";
293 $flags &= ~MOVE_SWIM if $flag eq "-swim";
294 $flags &= ~MOVE_BOAT if $flag eq "-boat";
295 $flags &= ~MOVE_ALL if $flag eq "-all";
296 }
297
298 $ob->{$attr} = $flags;
299 } 399 }
300 400
301 # convert outdated movement flags to new movement sets 401 # convert outdated movement flags to new movement sets
302 if (defined (my $v = delete $ob->{no_pass})) { 402 if (defined (my $v = delete $ob->{no_pass})) {
303 $ob->{move_block} = $v ? MOVE_ALL : 0; 403 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
304 } 404 }
305 if (defined (my $v = delete $ob->{slow_move})) { 405 if (defined (my $v = delete $ob->{slow_move})) {
306 $ob->{move_slow} |= MOVE_WALK; 406 $ob->{move_slow} += "walk";
307 $ob->{move_slow_penalty} = $v; 407 $ob->{move_slow_penalty} = $v;
308 } 408 }
309 if (defined (my $v = delete $ob->{walk_on})) { 409 if (defined (my $v = delete $ob->{walk_on})) {
310 $ob->{move_on} = MOVE_NONE unless exists $ob->{move_on}; 410 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
311 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
312 : $ob->{move_on} & ~MOVE_WALK;
313 } 411 }
314 if (defined (my $v = delete $ob->{walk_off})) { 412 if (defined (my $v = delete $ob->{walk_off})) {
315 $ob->{move_off} = MOVE_NONE unless exists $ob->{move_off}; 413 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
316 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
317 : $ob->{move_off} & ~MOVE_WALK;
318 } 414 }
319 if (defined (my $v = delete $ob->{fly_on})) { 415 if (defined (my $v = delete $ob->{fly_on})) {
320 $ob->{move_on} = MOVE_NONE unless exists $ob->{move_on}; 416 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
321 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
322 : $ob->{move_on} & ~MOVE_FLY_LOW;
323 } 417 }
324 if (defined (my $v = delete $ob->{fly_off})) { 418 if (defined (my $v = delete $ob->{fly_off})) {
325 $ob->{move_off} = MOVE_NONE unless exists $ob->{move_off}; 419 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
326 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
327 : $ob->{move_off} & ~MOVE_FLY_LOW;
328 } 420 }
329 if (defined (my $v = delete $ob->{flying})) { 421 if (defined (my $v = delete $ob->{flying})) {
330 $ob->{move_type} = MOVE_NONE unless exists $ob->{move_type}; 422 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
331 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
332 : $ob->{move_type} & ~MOVE_FLY_LOW;
333 } 423 }
334 424
335 # convert idiotic event_xxx things into objects 425 # convert idiotic event_xxx things into objects
336 while (my ($event, $subtype) = each %EVENT_TYPE) { 426 while (my ($event, $subtype) = each %EVENT_TYPE) {
337 if (exists $ob->{"event_${event}_plugin"}) { 427 if (exists $ob->{"event_${event}_plugin"}) {
… …
353# arch as in "arch xxx", ie.. objects 443# arch as in "arch xxx", ie.. objects
354sub normalize_arch($) { 444sub normalize_arch($) {
355 my ($ob) = @_; 445 my ($ob) = @_;
356 446
357 normalize_object $ob; 447 normalize_object $ob;
448
449 return if $ob->{_atype} eq "object";
358 450
359 my $arch = $ARCH{$ob->{_name}} 451 my $arch = $ARCH{$ob->{_name}}
360 or (warn "$ob->{_name}: no such archetype", return $ob); 452 or (warn "$ob->{_name}: no such archetype", return $ob);
361 453
362 if ($arch->{type} == 22) { # map 454 if ($arch->{type} == 22) { # map
… …
398} 490}
399 491
400sub attr_thaw($) { 492sub attr_thaw($) {
401 my ($ob) = @_; 493 my ($ob) = @_;
402 494
403 $ob->{attach} = from_json $ob->{attach} 495 $ob->{attach} = decode_json $ob->{attach}
404 if exists $ob->{attach}; 496 if exists $ob->{attach};
405 497
406 $ob 498 $ob
407} 499}
408 500
409sub attr_freeze($) { 501sub attr_freeze($) {
410 my ($ob) = @_; 502 my ($ob) = @_;
411 503
412 $ob->{attach} = Crossfire::to_json $ob->{attach} 504 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
413 if exists $ob->{attach}; 505 if exists $ob->{attach};
414 506
415 $ob 507 $ob
416} 508}
417 509
… …
437 529
438 my %arc; 530 my %arc;
439 my ($more, $prev); 531 my ($more, $prev);
440 my $comment; 532 my $comment;
441 533
442 open my $fh, "<:raw:perlio:utf8", $path 534 open my $fh, "<:utf8", $path
443 or Carp::croak "$path: $!"; 535 or Carp::croak "$path: $!";
444 536
445# binmode $fh; 537# binmode $fh;
446 538
447 my $parse_block; $parse_block = sub { 539 my $parse_block; $parse_block = sub {
… …
547 my $str; 639 my $str;
548 640
549 my $append; $append = sub { 641 my $append; $append = sub {
550 my %a = %{$_[0]}; 642 my %a = %{$_[0]};
551 643
552 Crossfire::attr_freeze \%a; 644 Deliantra::attr_freeze \%a;
553 Crossfire::normalize_arch \%a; 645 Deliantra::normalize_arch \%a;
554 646
555 # undo the bit-split we did before 647 # undo the bit-split we did before
556 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 648 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
557 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 649 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
558 | (delete $a{attack_movement_bits_4_7}); 650 | (delete $a{attack_movement_bits_4_7});
… …
576 } 668 }
577 669
578 my @kv; 670 my @kv;
579 671
580 for ($a{_name} eq "map" 672 for ($a{_name} eq "map"
581 ? @Crossfire::FIELD_ORDER_MAP 673 ? @Deliantra::FIELD_ORDER_MAP
582 : @Crossfire::FIELD_ORDER) { 674 : @Deliantra::FIELD_ORDER) {
583 push @kv, [$_, delete $a{$_}] 675 push @kv, [$_, delete $a{$_}]
584 if exists $a{$_}; 676 if exists $a{$_};
585 } 677 }
586 678
587 for (sort keys %a) { 679 for (sort keys %a) {
… …
590 } 682 }
591 683
592 for (@kv) { 684 for (@kv) {
593 my ($k, $v) = @$_; 685 my ($k, $v) = @$_;
594 686
595 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 687 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
596 $v =~ s/\n$//; 688 $v =~ s/\n$//;
597 $str .= "$k\n$v\n$end\n"; 689 $str .= "$k\n$v\n$end\n";
598 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
599 if ($v & ~Crossfire::MOVE_ALL or !$v) {
600 $str .= "$k $v\n";
601
602 } elsif ($v & Crossfire::MOVE_ALLBIT) {
603 $str .= "$k all";
604
605 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
606 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
607 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
608 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
609 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
610
611 $str .= "\n";
612
613 } else {
614 $str .= $k;
615
616 $str .= " walk" if $v & Crossfire::MOVE_WALK;
617 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
618 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
619 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
620 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
621
622 $str .= "\n";
623 }
624 } else { 690 } else {
625 $str .= "$k $v\n"; 691 $str .= "$k $v\n";
626 } 692 }
627 } 693 }
628 694
… …
722=cut 788=cut
723 789
724sub arch_attr($) { 790sub arch_attr($) {
725 my ($obj) = @_; 791 my ($obj) = @_;
726 792
727 require Crossfire::Data; 793 require Deliantra::Data;
728 794
729 my $root; 795 my $root;
730 my $attr = { }; 796 my $attr = { };
731 797
732 my $arch = $ARCH{ $obj->{_name} }; 798 my $arch = $ARCH{ $obj->{_name} };
733 my $type = $obj->{type} || $arch->{type}; 799 my $type = $obj->{type} || $arch->{type};
734 800
735 if ($type > 0) { 801 if ($type > 0) {
736 $root = $Crossfire::Data::ATTR{$type}; 802 $root = $Deliantra::Data::ATTR{$type};
737 } else { 803 } else {
738 my %a = (%$arch, %$obj); 804 my %a = (%$arch, %$obj);
739 805
740 if ($a{is_floor} && !$a{alive}) { 806 if ($a{is_floor} && !$a{alive}) {
741 $root = $Crossfire::Data::TYPE{Floor}; 807 $root = $Deliantra::Data::TYPE{Floor};
742 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 808 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
743 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 809 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
744 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 810 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
745 $root = $Crossfire::Data::TYPE{Wall}; 811 $root = $Deliantra::Data::TYPE{Wall};
746 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 812 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
747 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 813 $root = $Deliantra::Data::TYPE{"Weak Wall"};
748 } else { 814 } else {
749 $root = $Crossfire::Data::TYPE{Misc}; 815 $root = $Deliantra::Data::TYPE{Misc};
750 } 816 }
751 } 817 }
752 818
753 my @import = ($root); 819 my @import = ($root);
754 820
755 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 821 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
756 unless $type == 116; 822 unless $type == 116;
757 823
758 my (%ignore); 824 my (%ignore);
759 my (@section_order, %section, @attr_order); 825 my (@section_order, %section, @attr_order);
760 826
761 while (my $type = shift @import) { 827 while (my $type = shift @import) {
828 push @import,
829 grep $_,
830 map $Deliantra::Data::TYPE{$_},
762 push @import, @{$type->{import} || []}; 831 @{$type->{import} || []};
763 832
764 $attr->{$_} ||= $type->{$_} 833 $attr->{$_} ||= $type->{$_}
765 for qw(name desc use); 834 for qw(name desc use);
766 835
767 for (@{$type->{ignore} || []}) { 836 for (@{$type->{ignore} || []}) {
… …
777 $section{$name}{$k} ||= $v; 846 $section{$name}{$k} ||= $v;
778 } 847 }
779 } 848 }
780 } 849 }
781 850
851 # remove ignores for "root" type
852 for (map @{$_->[1]}, # section attributes
853 [general => ($root->{attr} || [])],
854 @{$root->{section} || []})
855 {
856 my ($k, $v) = @$_;
857 # skip fixed attributes, if they are ignored thats fine
858 next if $v->{type} eq 'fixed';
859
860 delete $ignore{$k}; # if the attributes are defined explicitly they
861 # should NOT be ignored. ignore should mainly
862 # hit imported/inherited attributes.
863 }
864
782 $attr->{section} = [ 865 $attr->{section} = [
783 map !exists $section{$_} ? () : do { 866 map !exists $section{$_} ? () : do {
784 my $attr = delete $section{$_}; 867 my $attr = delete $section{$_};
785 868
786 [ 869 [
… …
788 map exists $attr->{$_} && !$ignore{$_} 871 map exists $attr->{$_} && !$ignore{$_}
789 ? [$_ => delete $attr->{$_}] : (), 872 ? [$_ => delete $attr->{$_}] : (),
790 @attr_order 873 @attr_order
791 ] 874 ]
792 }, 875 },
793
794 exists $section{$_} ? [$_ => delete $section{$_}] : (), 876 exists $section{$_} ? [$_ => delete $section{$_}] : (),
795 @section_order 877 @section_order
796 ]; 878 ];
797 879
798 $attr 880 $attr
… …
853 }, sub { 935 }, sub {
854 read_arch "$LIB/archetypes" 936 read_arch "$LIB/archetypes"
855 }; 937 };
856} 938}
857 939
940sub construct_tilecache_pb {
941 my ($idx, $cache) = @_;
942
943 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
944
945 while (my ($name, $tile) = each %$cache) {
946 my $tpb = delete $tile->{pb};
947 my $ofs = $tile->{idx};
948
949 for my $x (0 .. $tile->{w} - 1) {
950 for my $y (0 .. $tile->{h} - 1) {
951 my $idx = $ofs + $x + $y * $tile->{w};
952 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
953 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
954 }
955 }
956 }
957
958 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
959
960 $cache
961}
962
963sub use_tilecache {
964 my ($face) = @_;
965 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
966 or die "$VARDIR/tilecache.png: $!";
967 *FACE = $_[0];
968}
969
858=item load_tilecache 970=item load_tilecache
859 971
860(Re-)Load %TILE and %FACE. 972(Re-)Load %TILE and %FACE.
861 973
862=cut 974=cut
863 975
864sub load_tilecache() { 976sub load_tilecache() {
865 require Gtk2; 977 require Gtk2;
866 978
867 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 979 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
868 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
869 or die "$VARDIR/tilecache.png: $!";
870 *FACE = $_[0];
871 }, sub { 980 sub {
872 my $tile = read_pak "$LIB/crossfire.0";
873
874 my %cache; 981 my %cache;
982 my $facedata = Storable::retrieve "$LIB/facedata";
875 983
984 $facedata->{version} == 2
985 or die "$LIB/facedata: version mismatch, cannot proceed.";
986
987 my $faces = $facedata->{faceinfo};
876 my $idx = 0; 988 my $idx = 0;
877 989
878 for my $name (sort keys %$tile) { 990 for (sort keys %$faces) {
991 my ($face, $info) = ($_, $faces->{$_});
992
879 my $pb = new Gtk2::Gdk::PixbufLoader; 993 my $pb = new Gtk2::Gdk::PixbufLoader;
880 $pb->write ($tile->{$name}); 994 $pb->write ($info->{data32});
881 $pb->close; 995 $pb->close;
882 my $pb = $pb->get_pixbuf; 996 my $pb = $pb->get_pixbuf;
883 997
884 my $tile = $cache{$name} = { 998 my $tile = $cache{$face} = {
885 pb => $pb, 999 pb => $pb,
886 idx => $idx, 1000 idx => $idx,
887 w => int $pb->get_width / TILESIZE, 1001 w => int $pb->get_width / TILESIZE,
888 h => int $pb->get_height / TILESIZE, 1002 h => int $pb->get_height / TILESIZE,
889 }; 1003 };
890
891 1004
892 $idx += $tile->{w} * $tile->{h}; 1005 $idx += $tile->{w} * $tile->{h};
1006 }
1007
1008 construct_tilecache_pb $idx, \%cache;
1009
1010 \%cache
893 } 1011 };
894
895 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
896
897 while (my ($name, $tile) = each %cache) {
898 my $tpb = delete $tile->{pb};
899 my $ofs = $tile->{idx};
900
901 for my $x (0 .. $tile->{w} - 1) {
902 for my $y (0 .. $tile->{h} - 1) {
903 my $idx = $ofs + $x + $y * $tile->{w};
904 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
905 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
906 }
907 }
908 }
909
910 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
911
912 \%cache
913 };
914} 1012}
1013
1014=back
915 1015
916=head1 AUTHOR 1016=head1 AUTHOR
917 1017
918 Marc Lehmann <schmorp@schmorp.de> 1018 Marc Lehmann <schmorp@schmorp.de>
919 http://home.schmorp.de/ 1019 http://home.schmorp.de/
… …
922 http://www.ta-sa.org/ 1022 http://www.ta-sa.org/
923 1023
924=cut 1024=cut
925 1025
9261 10261
1027

Diff Legend

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