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.142 by root, Sat May 15 00:30:53 2010 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.30';
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",
… …
59 56
60# same as in server save routine, to (hopefully) be compatible 57# same as in server save routine, to (hopefully) be compatible
61# to the other editors. 58# to the other editors.
62our @FIELD_ORDER_MAP = (qw( 59our @FIELD_ORDER_MAP = (qw(
63 file_format_version 60 file_format_version
64 name attach swap_time reset_timeout fixed_resettime difficulty region 61 name attach swap_time reset_timeout fixed_resettime difficulty
62 region music
65 shopitems shopgreed shopmin shopmax shoprace 63 shopitems shopgreed shopmin shopmax shoprace
66 darkness width height enter_x enter_y msg maplore 64 darkness width height enter_x enter_y msg maplore
67 unique template 65 unique template
68 outdoor temp pressure humid windspeed winddir sky nosmooth 66 outdoor temp pressure humid windspeed winddir sky nosmooth
69 tile_path_1 tile_path_2 tile_path_3 tile_path_4 67 tile_path_1 tile_path_2 tile_path_3 tile_path_4
70)); 68));
71 69
72our @FIELD_ORDER = (qw( 70our @FIELD_ORDER = (qw(
71 inherit
72
73 elevation 73 elevation
74 74
75 name name_pl custom_name attach title race 75 name name_pl custom_name attach title race
76 slaying skill msg lore other_arch face 76 slaying skill msg lore other_arch
77 #todo-events 77 sound sound_destroy face animation is_animated
78 animation is_animated 78 magicmap smoothlevel smoothface
79 str dex con wis pow cha int 79 str dex con wis pow cha int
80 hp maxhp sp maxsp grace maxgrace 80 hp maxhp sp maxsp grace maxgrace
81 exp perm_exp expmul 81 exp perm_exp expmul
82 food dam luck wc ac x y speed speed_left move_state attack_movement 82 food dam luck wc ac x y speed speed_left move_state attack_movement
83 nrof level direction type subtype attacktype 83 nrof level direction type subtype attacktype
… …
91 resist_life_stealing resist_disease 91 resist_life_stealing resist_disease
92 92
93 path_attuned path_repelled path_denied material materialname 93 path_attuned path_repelled path_denied material materialname
94 value carrying weight invisible state magic 94 value carrying weight invisible state magic
95 last_heal last_sp last_grace last_eat 95 last_heal last_sp last_grace last_eat
96 connected glow_radius randomitems npx_status npc_program 96 connected glow_radius randomitems tresure_env npx_status npc_program
97 run_away pick_up container will_apply smoothlevel 97 run_away pick_up container will_apply smoothlevel
98 current_weapon_script weapontype tooltype elevation client_type 98 current_weapon_script weapontype tooltype elevation client_type
99 item_power duration range 99 item_power duration range
100 range_modifier duration_modifier dam_modifier gen_sp_armour 100 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 101 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 112 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 113 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 114 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 115 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 116 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
117 precious
117 118
118 body_range body_arm body_torso body_head body_neck body_skill 119 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 120 body_finger body_shoulder body_foot body_hand body_wrist body_waist
120)); 121));
121 122
… …
138sub MOVE_FLY_LOW (){ 0x02 } 139sub MOVE_FLY_LOW (){ 0x02 }
139sub MOVE_FLY_HIGH (){ 0x04 } 140sub MOVE_FLY_HIGH (){ 0x04 }
140sub MOVE_FLYING (){ 0x06 } 141sub MOVE_FLYING (){ 0x06 }
141sub MOVE_SWIM (){ 0x08 } 142sub MOVE_SWIM (){ 0x08 }
142sub MOVE_BOAT (){ 0x10 } 143sub MOVE_BOAT (){ 0x10 }
144sub MOVE_SHIP (){ 0x20 }
143sub MOVE_KNOWN (){ 0x1f } # all of above 145sub MOVE_KNOWN (){ 0x3f } # all of above
144sub MOVE_ALLBIT (){ 0x10000 }
145sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 146sub MOVE_ALL (){ 0x10000 } # very special value
147
148our %MOVE_TYPE = (
149 walk => MOVE_WALK,
150 fly_low => MOVE_FLY_LOW,
151 fly_high => MOVE_FLY_HIGH,
152 flying => MOVE_FLYING,
153 swim => MOVE_SWIM,
154 boat => MOVE_BOAT,
155 ship => MOVE_SHIP,
156 all => MOVE_ALL,
157);
158
159our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
160
161{
162 package Deliantra::MoveType;
163
164 use overload
165 '=' => sub { bless [@{$_[0]}], ref $_[0] },
166 '""' => \&as_string,
167 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
168 '<=' => sub {
169 ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
170 ? $_[0][1] & $MOVE_TYPE{$_[1]}
171 : undef
172 },
173 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
174 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
175 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
176 'x=' => sub { # toggle between off, + and -
177 my $cur = $_[0] >= $_[1];
178 if (!defined $cur) {
179 if ($_[0] >= "all") {
180 $_[0] -= $_[1];
181 } else {
182 $_[0] += $_[1];
183 }
184 } elsif ($cur) {
185 $_[0] -= $_[1];
186 } else {
187 $_[0] /= $_[1];
188 }
189
190 $_[0]
191 },
192 'eq' => sub { "$_[0]" eq "$_[1]" },
193 'ne' => sub { "$_[0]" ne "$_[1]" },
194 ;
195
196 sub TO_JSON {
197 $_[0][0]
198 }
199}
200
201sub Deliantra::MoveType::new {
202 my ($class, $string) = @_;
203
204 my $mask;
205 my $value;
206
207 if ($string =~ /^\s*\d+\s*$/) {
208 $mask = MOVE_ALL;
209 $value = $string+0;
210 } else {
211 for (split /\s+/, lc $string) {
212 if (s/^-//) {
213 $mask |= $MOVE_TYPE{$_};
214 $value &= ~$MOVE_TYPE{$_};
215 } else {
216 $mask |= $MOVE_TYPE{$_};
217 $value |= $MOVE_TYPE{$_};
218 }
219 }
220 }
221
222 (bless [$mask, $value], $class)->normalise
223}
224
225sub Deliantra::MoveType::normalise {
226 my ($self) = @_;
227
228 if ($self->[0] & MOVE_ALL) {
229 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
230 $self->[0] &= $mask;
231 $self->[1] &= $mask;
232 }
233
234 $self->[1] &= $self->[0];
235
236 $self
237}
238
239sub Deliantra::MoveType::as_string {
240 my ($self) = @_;
241
242 my @res;
243
244 my ($mask, $value) = @$self;
245
246 for (@Deliantra::MOVE_TYPE) {
247 my $bit = $Deliantra::MOVE_TYPE{$_};
248 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
249 $mask &= ~$bit;
250 push @res, $value & $bit ? $_ : "-$_";
251 }
252 }
253
254 join " ", @res
255}
146 256
147sub load_ref($) { 257sub load_ref($) {
148 my ($path) = @_; 258 my ($path) = @_;
149 259
150 open my $fh, "<:raw:perlio", $path 260 open my $fh, "<:raw:perlio", $path
… …
235 345
236# object as in "Object xxx", i.e. archetypes 346# object as in "Object xxx", i.e. archetypes
237sub normalize_object($) { 347sub normalize_object($) {
238 my ($ob) = @_; 348 my ($ob) = @_;
239 349
350 delete $ob->{editable}; # deprecated
351
240 # convert material bitset to materialname, if possible 352 # convert material bitset to materialname, if possible
241 if (exists $ob->{material}) { 353 if (exists $ob->{material}) {
242 if (!$ob->{material}) { 354 if (!$ob->{material}) {
243 delete $ob->{material}; 355 delete $ob->{material};
244 } elsif (exists $ob->{materialname}) { 356 } elsif (exists $ob->{materialname}) {
… …
254 } else { 366 } else {
255 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 367 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
256 } 368 }
257 } 369 }
258 370
371 # check whether attachment is the same as in the archetype
372 if (exists $ob->{attach}) {
373 my $arch = $ARCH{$ob->{_name}};
374 my $js = JSON::XS->new->utf8->canonical (1);
375
376 if (defined $arch->{attach}
377 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
378 delete $ob->{attach}
379 }
380 }
381
382 # color_fg is used as default for magicmap if magicmap does not exist
383 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
384
259 # nuke outdated or never supported fields 385 # nuke outdated or never supported fields
260 delete @$ob{qw( 386 delete @$ob{qw(
261 can_knockback can_parry can_impale can_cut can_dam_armour 387 can_knockback can_parry can_impale can_cut can_dam_armour
262 can_apply pass_thru can_pass_thru 388 can_apply pass_thru can_pass_thru color_bg color_fg
263 )}; 389 )};
264 390
265 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 391 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
266 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 392 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
267 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 393 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
268 394
269 # convert movement strings to bitsets 395 # convert movement strings to bitsets
270 for my $attr (keys %FIELD_MOVEMENT) { 396 for my $attr (keys %FIELD_MOVEMENT) {
271 next unless exists $ob->{$attr}; 397 next unless exists $ob->{$attr};
272 398
273 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 399 $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 } 400 }
300 401
301 # convert outdated movement flags to new movement sets 402 # convert outdated movement flags to new movement sets
302 if (defined (my $v = delete $ob->{no_pass})) { 403 if (defined (my $v = delete $ob->{no_pass})) {
303 $ob->{move_block} = $v ? MOVE_ALL : 0; 404 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
304 } 405 }
305 if (defined (my $v = delete $ob->{slow_move})) { 406 if (defined (my $v = delete $ob->{slow_move})) {
306 $ob->{move_slow} |= MOVE_WALK; 407 $ob->{move_slow} += "walk";
307 $ob->{move_slow_penalty} = $v; 408 $ob->{move_slow_penalty} = $v;
308 } 409 }
309 if (defined (my $v = delete $ob->{walk_on})) { 410 if (defined (my $v = delete $ob->{walk_on})) {
310 $ob->{move_on} = MOVE_NONE unless exists $ob->{move_on}; 411 $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 } 412 }
314 if (defined (my $v = delete $ob->{walk_off})) { 413 if (defined (my $v = delete $ob->{walk_off})) {
315 $ob->{move_off} = MOVE_NONE unless exists $ob->{move_off}; 414 $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 } 415 }
319 if (defined (my $v = delete $ob->{fly_on})) { 416 if (defined (my $v = delete $ob->{fly_on})) {
320 $ob->{move_on} = MOVE_NONE unless exists $ob->{move_on}; 417 $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 } 418 }
324 if (defined (my $v = delete $ob->{fly_off})) { 419 if (defined (my $v = delete $ob->{fly_off})) {
325 $ob->{move_off} = MOVE_NONE unless exists $ob->{move_off}; 420 $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 } 421 }
329 if (defined (my $v = delete $ob->{flying})) { 422 if (defined (my $v = delete $ob->{flying})) {
330 $ob->{move_type} = MOVE_NONE unless exists $ob->{move_type}; 423 $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 } 424 }
334 425
335 # convert idiotic event_xxx things into objects 426 # convert idiotic event_xxx things into objects
336 while (my ($event, $subtype) = each %EVENT_TYPE) { 427 while (my ($event, $subtype) = each %EVENT_TYPE) {
337 if (exists $ob->{"event_${event}_plugin"}) { 428 if (exists $ob->{"event_${event}_plugin"}) {
… …
353# arch as in "arch xxx", ie.. objects 444# arch as in "arch xxx", ie.. objects
354sub normalize_arch($) { 445sub normalize_arch($) {
355 my ($ob) = @_; 446 my ($ob) = @_;
356 447
357 normalize_object $ob; 448 normalize_object $ob;
449
450 return if $ob->{_atype} eq "object";
358 451
359 my $arch = $ARCH{$ob->{_name}} 452 my $arch = $ARCH{$ob->{_name}}
360 or (warn "$ob->{_name}: no such archetype", return $ob); 453 or (warn "$ob->{_name}: no such archetype", return $ob);
361 454
362 if ($arch->{type} == 22) { # map 455 if ($arch->{type} == 22) { # map
… …
398} 491}
399 492
400sub attr_thaw($) { 493sub attr_thaw($) {
401 my ($ob) = @_; 494 my ($ob) = @_;
402 495
403 $ob->{attach} = from_json $ob->{attach} 496 $ob->{attach} = decode_json $ob->{attach}
404 if exists $ob->{attach}; 497 if exists $ob->{attach};
405 498
406 $ob 499 $ob
407} 500}
408 501
409sub attr_freeze($) { 502sub attr_freeze($) {
410 my ($ob) = @_; 503 my ($ob) = @_;
411 504
412 $ob->{attach} = Crossfire::to_json $ob->{attach} 505 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
413 if exists $ob->{attach}; 506 if exists $ob->{attach};
414 507
415 $ob 508 $ob
416} 509}
417 510
… …
437 530
438 my %arc; 531 my %arc;
439 my ($more, $prev); 532 my ($more, $prev);
440 my $comment; 533 my $comment;
441 534
442 open my $fh, "<:raw:perlio:utf8", $path 535 open my $fh, "<:utf8", $path
443 or Carp::croak "$path: $!"; 536 or Carp::croak "$path: $!";
444 537
445# binmode $fh; 538# binmode $fh;
446 539
447 my $parse_block; $parse_block = sub { 540 my $parse_block; $parse_block = sub {
… …
547 my $str; 640 my $str;
548 641
549 my $append; $append = sub { 642 my $append; $append = sub {
550 my %a = %{$_[0]}; 643 my %a = %{$_[0]};
551 644
552 Crossfire::attr_freeze \%a; 645 Deliantra::attr_freeze \%a;
553 Crossfire::normalize_arch \%a; 646 Deliantra::normalize_arch \%a;
554 647
555 # undo the bit-split we did before 648 # undo the bit-split we did before
556 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 649 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}) 650 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
558 | (delete $a{attack_movement_bits_4_7}); 651 | (delete $a{attack_movement_bits_4_7});
… …
576 } 669 }
577 670
578 my @kv; 671 my @kv;
579 672
580 for ($a{_name} eq "map" 673 for ($a{_name} eq "map"
581 ? @Crossfire::FIELD_ORDER_MAP 674 ? @Deliantra::FIELD_ORDER_MAP
582 : @Crossfire::FIELD_ORDER) { 675 : @Deliantra::FIELD_ORDER) {
583 push @kv, [$_, delete $a{$_}] 676 push @kv, [$_, delete $a{$_}]
584 if exists $a{$_}; 677 if exists $a{$_};
585 } 678 }
586 679
587 for (sort keys %a) { 680 for (sort keys %a) {
… …
590 } 683 }
591 684
592 for (@kv) { 685 for (@kv) {
593 my ($k, $v) = @$_; 686 my ($k, $v) = @$_;
594 687
595 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 688 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
596 $v =~ s/\n$//; 689 $v =~ s/\n$//;
597 $str .= "$k\n$v\n$end\n"; 690 $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 { 691 } else {
625 $str .= "$k $v\n"; 692 $str .= "$k $v\n";
626 } 693 }
627 } 694 }
628 695
… …
722=cut 789=cut
723 790
724sub arch_attr($) { 791sub arch_attr($) {
725 my ($obj) = @_; 792 my ($obj) = @_;
726 793
727 require Crossfire::Data; 794 require Deliantra::Data;
728 795
729 my $root; 796 my $root;
730 my $attr = { }; 797 my $attr = { };
731 798
732 my $arch = $ARCH{ $obj->{_name} }; 799 my $arch = $ARCH{ $obj->{_name} };
733 my $type = $obj->{type} || $arch->{type}; 800 my $type = $obj->{type} || $arch->{type};
734 801
735 if ($type > 0) { 802 if ($type > 0) {
736 $root = $Crossfire::Data::ATTR{$type}; 803 $root = $Deliantra::Data::ATTR{$type};
737 } else { 804 } else {
738 my %a = (%$arch, %$obj); 805 my %a = (%$arch, %$obj);
739 806
740 if ($a{is_floor} && !$a{alive}) { 807 if ($a{is_floor} && !$a{alive}) {
741 $root = $Crossfire::Data::TYPE{Floor}; 808 $root = $Deliantra::Data::TYPE{Floor};
742 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 809 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
743 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 810 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
744 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 811 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
745 $root = $Crossfire::Data::TYPE{Wall}; 812 $root = $Deliantra::Data::TYPE{Wall};
746 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 813 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
747 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 814 $root = $Deliantra::Data::TYPE{"Weak Wall"};
748 } else { 815 } else {
749 $root = $Crossfire::Data::TYPE{Misc}; 816 $root = $Deliantra::Data::TYPE{Misc};
750 } 817 }
751 } 818 }
752 819
820 my (%ignore);
753 my @import = ($root); 821 my @import = ($root);
822
823 my @new_import;
824 while (my $type = shift @import) {
825 # first import everything we will need:
826 push @import,
827 grep $_,
828 map $Deliantra::Data::TYPE{$_},
829 @{$type->{import} || []};
830
831 # and compute the ignored attributes
832 for (@{$type->{ignore} || []}) {
833 $ignore{$_}++ for ref $_ ? @$_ : $_;
834 }
835
836 push @new_import, $type;
754 837 }
838 (@import) = @new_import;
839
840 # then add defaults to the back of the list, so they are added
841 # as last resort.
755 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 842 push @import, \%Deliantra::Data::DEFAULT_ATTR
756 unless $type == 116; 843 unless $type == 116;
757 844
758 my (%ignore);
759 my (@section_order, %section, @attr_order); 845 my (@section_order, %section, @attr_order);
760 846
847 # @import = root, imported, default
761 while (my $type = shift @import) { 848 while (my $type = pop @import) {
762 push @import, @{$type->{import} || []};
763
764 $attr->{$_} ||= $type->{$_} 849 $attr->{$_} ||= $type->{$_}
765 for qw(name desc use); 850 for qw(name desc use);
766
767 for (@{$type->{ignore} || []}) {
768 $ignore{$_}++ for ref $_ ? @$_ : $_;
769 }
770 851
771 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 852 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
772 my ($name, $attr) = @$_; 853 my ($name, $attr) = @$_;
773 push @section_order, $name; 854 push @section_order, $name;
774 for (@$attr) { 855 for (@$attr) {
775 my ($k, $v) = @$_; 856 my ($k, $v) = @$_;
776 push @attr_order, $k; 857 push @attr_order, $k;
777 $section{$name}{$k} ||= $v; 858 $section{$name}{$k} = $v; # overwrite, so that the root decides
778 }
779 } 859 }
860 }
861 }
862
863 # remove ignores for "root" type
864 for (
865 map @{$_->[1]}, # section attributes
866 [general => ($root->{attr} || [])],
867 @{$root->{section} || []}
868 ) {
869 my ($k, $v) = @$_;
870 # skip fixed attributes, if they are ignored thats fine
871 next if $v->{type} eq 'fixed';
872
873 delete $ignore{$k}; # if the attributes are defined explicitly they
874 # should NOT be ignored. ignore should mainly
875 # hit imported/inherited attributes.
780 } 876 }
781 877
782 $attr->{section} = [ 878 $attr->{section} = [
783 map !exists $section{$_} ? () : do { 879 map !exists $section{$_} ? () : do {
784 my $attr = delete $section{$_}; 880 my $attr = delete $section{$_};
… …
788 map exists $attr->{$_} && !$ignore{$_} 884 map exists $attr->{$_} && !$ignore{$_}
789 ? [$_ => delete $attr->{$_}] : (), 885 ? [$_ => delete $attr->{$_}] : (),
790 @attr_order 886 @attr_order
791 ] 887 ]
792 }, 888 },
793
794 exists $section{$_} ? [$_ => delete $section{$_}] : (), 889 exists $section{$_} ? [$_ => delete $section{$_}] : (),
795 @section_order 890 @section_order
796 ]; 891 ];
797 892
798 $attr 893 $attr
799} 894}
… …
853 }, sub { 948 }, sub {
854 read_arch "$LIB/archetypes" 949 read_arch "$LIB/archetypes"
855 }; 950 };
856} 951}
857 952
953sub construct_tilecache_pb {
954 my ($idx, $cache) = @_;
955
956 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
957
958 while (my ($name, $tile) = each %$cache) {
959 my $tpb = delete $tile->{pb};
960 my $ofs = $tile->{idx};
961
962 for my $x (0 .. $tile->{w} - 1) {
963 for my $y (0 .. $tile->{h} - 1) {
964 my $idx = $ofs + $x + $y * $tile->{w};
965 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
966 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
967 }
968 }
969 }
970
971 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
972
973 $cache
974}
975
976sub use_tilecache {
977 my ($face) = @_;
978 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
979 or die "$VARDIR/tilecache.png: $!";
980 *FACE = $_[0];
981}
982
858=item load_tilecache 983=item load_tilecache
859 984
860(Re-)Load %TILE and %FACE. 985(Re-)Load %TILE and %FACE.
861 986
862=cut 987=cut
863 988
864sub load_tilecache() { 989sub load_tilecache() {
865 require Gtk2; 990 require Gtk2;
866 991
867 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 992 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 { 993 sub {
872 my $tile = read_pak "$LIB/crossfire.0";
873
874 my %cache; 994 my %cache;
995 my $facedata = Storable::retrieve "$LIB/facedata";
875 996
997 $facedata->{version} == 2
998 or die "$LIB/facedata: version mismatch, cannot proceed.";
999
1000 my $faces = $facedata->{faceinfo};
876 my $idx = 0; 1001 my $idx = 0;
877 1002
878 for my $name (sort keys %$tile) { 1003 for (sort keys %$faces) {
1004 my ($face, $info) = ($_, $faces->{$_});
1005
879 my $pb = new Gtk2::Gdk::PixbufLoader; 1006 my $pb = new Gtk2::Gdk::PixbufLoader;
880 $pb->write ($tile->{$name}); 1007 $pb->write ($info->{data32});
881 $pb->close; 1008 $pb->close;
882 my $pb = $pb->get_pixbuf; 1009 my $pb = $pb->get_pixbuf;
883 1010
884 my $tile = $cache{$name} = { 1011 my $tile = $cache{$face} = {
885 pb => $pb, 1012 pb => $pb,
886 idx => $idx, 1013 idx => $idx,
887 w => int $pb->get_width / TILESIZE, 1014 w => int $pb->get_width / TILESIZE,
888 h => int $pb->get_height / TILESIZE, 1015 h => int $pb->get_height / TILESIZE,
889 }; 1016 };
890
891 1017
892 $idx += $tile->{w} * $tile->{h}; 1018 $idx += $tile->{w} * $tile->{h};
1019 }
1020
1021 construct_tilecache_pb $idx, \%cache;
1022
1023 \%cache
893 } 1024 };
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} 1025}
1026
1027=back
915 1028
916=head1 AUTHOR 1029=head1 AUTHOR
917 1030
918 Marc Lehmann <schmorp@schmorp.de> 1031 Marc Lehmann <schmorp@schmorp.de>
919 http://home.schmorp.de/ 1032 http://home.schmorp.de/
… …
922 http://www.ta-sa.org/ 1035 http://www.ta-sa.org/
923 1036
924=cut 1037=cut
925 1038
9261 10391
1040

Diff Legend

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