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.91 by root, Sat Mar 3 19:06:03 2007 UTC vs.
Revision 1.145 by root, Sun Nov 11 23:17:18 2012 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.31';
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 glyph 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
… …
132 trigger => 10, 133 trigger => 10,
133 close => 11, 134 close => 11,
134 timer => 12, 135 timer => 12,
135); 136);
136 137
138# 1 up 2 right 4 down 8 left
139our %WALLDIR = (
140 0 => 0,
141 1_2 => 1,
142 1_4 => 2,
143 2_2_1 => 3,
144 1_1 => 4,
145 2_1_1 => 5,
146 2_2_2 => 6,
147 3_2 => 7,
148 1_3 => 8,
149 2_2_4 => 9,
150 2_1_2 => 10,
151 3_1 => 11,
152 2_2_3 => 12,
153 3_4 => 13,
154 3_3 => 14,
155 4 => 15,
156);
157
137sub MOVE_WALK (){ 0x01 } 158sub MOVE_WALK (){ 0x01 }
138sub MOVE_FLY_LOW (){ 0x02 } 159sub MOVE_FLY_LOW (){ 0x02 }
139sub MOVE_FLY_HIGH (){ 0x04 } 160sub MOVE_FLY_HIGH (){ 0x04 }
140sub MOVE_FLYING (){ 0x06 } 161sub MOVE_FLYING (){ 0x06 }
141sub MOVE_SWIM (){ 0x08 } 162sub MOVE_SWIM (){ 0x08 }
142sub MOVE_BOAT (){ 0x10 } 163sub MOVE_BOAT (){ 0x10 }
164sub MOVE_SHIP (){ 0x20 }
143sub MOVE_KNOWN (){ 0x1f } # all of above 165sub MOVE_KNOWN (){ 0x3f } # all of above
144sub MOVE_ALL (){ 0x10000 } # very special value 166sub MOVE_ALL (){ 0x10000 } # very special value
145 167
146our %MOVE_TYPE = ( 168our %MOVE_TYPE = (
147 walk => MOVE_WALK, 169 walk => MOVE_WALK,
148 fly_low => MOVE_FLY_LOW, 170 fly_low => MOVE_FLY_LOW,
149 fly_high => MOVE_FLY_HIGH, 171 fly_high => MOVE_FLY_HIGH,
150 flying => MOVE_FLYING, 172 flying => MOVE_FLYING,
151 swim => MOVE_SWIM, 173 swim => MOVE_SWIM,
152 boat => MOVE_BOAT, 174 boat => MOVE_BOAT,
175 ship => MOVE_SHIP,
153 all => MOVE_ALL, 176 all => MOVE_ALL,
154); 177);
155 178
156our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat); 179our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
157 180
158{ 181{
159 package Crossfire::MoveType; 182 package Deliantra::MoveType;
160 183
161 use overload 184 use overload
185 '=' => sub { bless [@{$_[0]}], ref $_[0] },
162 '""' => \&as_string, 186 '""' => \&as_string,
163 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef }, 187 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
188 '<=' => sub {
189 ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
190 ? $_[0][1] & $MOVE_TYPE{$_[1]}
191 : undef
192 },
164 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise }, 193 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
165 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 194 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
166 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 195 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
167 'x=' => sub { 196 'x=' => sub { # toggle between off, + and -
168 my $cur = $_[0] >= $_[1]; 197 my $cur = $_[0] >= $_[1];
169 if (!defined $cur) { 198 if (!defined $cur) {
199 if ($_[0] >= "all") {
200 $_[0] -= $_[1];
201 } else {
170 $_[0] += $_[1]; 202 $_[0] += $_[1];
203 }
171 } elsif ($cur) { 204 } elsif ($cur) {
172 $_[0] -= $_[1]; 205 $_[0] -= $_[1];
173 } else { 206 } else {
174 $_[0] /= $_[1]; 207 $_[0] /= $_[1];
175 } 208 }
… …
177 $_[0] 210 $_[0]
178 }, 211 },
179 'eq' => sub { "$_[0]" eq "$_[1]" }, 212 'eq' => sub { "$_[0]" eq "$_[1]" },
180 'ne' => sub { "$_[0]" ne "$_[1]" }, 213 'ne' => sub { "$_[0]" ne "$_[1]" },
181 ; 214 ;
182}
183 215
184sub Crossfire::MoveType::new { 216 sub TO_JSON {
217 $_[0][0]
218 }
219}
220
221sub Deliantra::MoveType::new {
185 my ($class, $string) = @_; 222 my ($class, $string) = @_;
186 223
187 my $mask; 224 my $mask;
188 my $value; 225 my $value;
189 226
227 if ($string =~ /^\s*\d+\s*$/) {
228 $mask = MOVE_ALL;
229 $value = $string+0;
230 } else {
190 for (split /\s+/, lc $string) { 231 for (split /\s+/, lc $string) {
191 if (s/^-//) { 232 if (s/^-//) {
192 $mask |= $MOVE_TYPE{$_}; 233 $mask |= $MOVE_TYPE{$_};
193 $value &= ~$MOVE_TYPE{$_}; 234 $value &= ~$MOVE_TYPE{$_};
194 } else { 235 } else {
195 $mask |= $MOVE_TYPE{$_}; 236 $mask |= $MOVE_TYPE{$_};
196 $value |= $MOVE_TYPE{$_}; 237 $value |= $MOVE_TYPE{$_};
238 }
197 } 239 }
198 } 240 }
199 241
200 (bless [$mask, $value], $class)->normalise 242 (bless [$mask, $value], $class)->normalise
201} 243}
202 244
203sub Crossfire::MoveType::normalise { 245sub Deliantra::MoveType::normalise {
204 my ($self) = @_; 246 my ($self) = @_;
205 247
206 if ($self->[0] & MOVE_ALL) { 248 if ($self->[0] & MOVE_ALL) {
207 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); 249 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
208 $self->[0] &= $mask; 250 $self->[0] &= $mask;
… …
212 $self->[1] &= $self->[0]; 254 $self->[1] &= $self->[0];
213 255
214 $self 256 $self
215} 257}
216 258
217sub Crossfire::MoveType::as_string { 259sub Deliantra::MoveType::as_string {
218 my ($self) = @_; 260 my ($self) = @_;
219 261
220 my @res; 262 my @res;
221 263
222 my ($mask, $value) = @$self; 264 my ($mask, $value) = @$self;
223 265
224 for (@Crossfire::MOVE_TYPE) { 266 for (@Deliantra::MOVE_TYPE) {
225 my $bit = $Crossfire::MOVE_TYPE{$_}; 267 my $bit = $Deliantra::MOVE_TYPE{$_};
226 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 268 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
227 $mask &= ~$bit; 269 $mask &= ~$bit;
228 push @res, $value & $bit ? $_ : "-$_"; 270 push @res, $value & $bit ? $_ : "-$_";
229 } 271 }
230 } 272 }
… …
323 365
324# object as in "Object xxx", i.e. archetypes 366# object as in "Object xxx", i.e. archetypes
325sub normalize_object($) { 367sub normalize_object($) {
326 my ($ob) = @_; 368 my ($ob) = @_;
327 369
370 delete $ob->{editable}; # deprecated
371
328 # convert material bitset to materialname, if possible 372 # convert material bitset to materialname, if possible
329 if (exists $ob->{material}) { 373 if (exists $ob->{material}) {
330 if (!$ob->{material}) { 374 if (!$ob->{material}) {
331 delete $ob->{material}; 375 delete $ob->{material};
332 } elsif (exists $ob->{materialname}) { 376 } elsif (exists $ob->{materialname}) {
… …
342 } else { 386 } else {
343 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 387 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
344 } 388 }
345 } 389 }
346 390
391 # check whether attachment is the same as in the archetype
392 if (exists $ob->{attach}) {
393 my $arch = $ARCH{$ob->{_name}};
394 my $js = JSON::XS->new->utf8->canonical (1);
395
396 if (defined $arch->{attach}
397 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
398 delete $ob->{attach}
399 }
400 }
401
402 # color_fg is used as default for magicmap if magicmap does not exist
403 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
404
347 # nuke outdated or never supported fields 405 # nuke outdated or never supported fields
348 delete @$ob{qw( 406 delete @$ob{qw(
349 can_knockback can_parry can_impale can_cut can_dam_armour 407 can_knockback can_parry can_impale can_cut can_dam_armour
350 can_apply pass_thru can_pass_thru 408 can_apply pass_thru can_pass_thru color_bg color_fg
351 )}; 409 )};
352 410
353 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 411 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
354 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 412 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
355 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 413 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
356 414
357 # convert movement strings to bitsets 415 # convert movement strings to bitsets
358 for my $attr (keys %FIELD_MOVEMENT) { 416 for my $attr (keys %FIELD_MOVEMENT) {
359 next unless exists $ob->{$attr}; 417 next unless exists $ob->{$attr};
360 418
361 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 419 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
362 } 420 }
363 421
364 # convert outdated movement flags to new movement sets 422 # convert outdated movement flags to new movement sets
365 if (defined (my $v = delete $ob->{no_pass})) { 423 if (defined (my $v = delete $ob->{no_pass})) {
366 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 424 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
367 } 425 }
368 if (defined (my $v = delete $ob->{slow_move})) { 426 if (defined (my $v = delete $ob->{slow_move})) {
369 $ob->{move_slow} += "walk"; 427 $ob->{move_slow} += "walk";
370 $ob->{move_slow_penalty} = $v; 428 $ob->{move_slow_penalty} = $v;
371 } 429 }
372 if (defined (my $v = delete $ob->{walk_on})) { 430 if (defined (my $v = delete $ob->{walk_on})) {
373 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" } 431 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
374 } 432 }
375 if (defined (my $v = delete $ob->{walk_off})) { 433 if (defined (my $v = delete $ob->{walk_off})) {
376 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" } 434 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
377 } 435 }
378 if (defined (my $v = delete $ob->{fly_on})) { 436 if (defined (my $v = delete $ob->{fly_on})) {
379 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" } 437 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
380 } 438 }
381 if (defined (my $v = delete $ob->{fly_off})) { 439 if (defined (my $v = delete $ob->{fly_off})) {
382 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" } 440 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
383 } 441 }
384 if (defined (my $v = delete $ob->{flying})) { 442 if (defined (my $v = delete $ob->{flying})) {
385 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" } 443 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
386 } 444 }
387 445
388 # convert idiotic event_xxx things into objects 446 # convert idiotic event_xxx things into objects
389 while (my ($event, $subtype) = each %EVENT_TYPE) { 447 while (my ($event, $subtype) = each %EVENT_TYPE) {
390 if (exists $ob->{"event_${event}_plugin"}) { 448 if (exists $ob->{"event_${event}_plugin"}) {
… …
406# arch as in "arch xxx", ie.. objects 464# arch as in "arch xxx", ie.. objects
407sub normalize_arch($) { 465sub normalize_arch($) {
408 my ($ob) = @_; 466 my ($ob) = @_;
409 467
410 normalize_object $ob; 468 normalize_object $ob;
469
470 return if $ob->{_atype} eq "object";
411 471
412 my $arch = $ARCH{$ob->{_name}} 472 my $arch = $ARCH{$ob->{_name}}
413 or (warn "$ob->{_name}: no such archetype", return $ob); 473 or (warn "$ob->{_name}: no such archetype", return $ob);
414 474
415 if ($arch->{type} == 22) { # map 475 if ($arch->{type} == 22) { # map
… …
451} 511}
452 512
453sub attr_thaw($) { 513sub attr_thaw($) {
454 my ($ob) = @_; 514 my ($ob) = @_;
455 515
456 $ob->{attach} = from_json $ob->{attach} 516 $ob->{attach} = decode_json $ob->{attach}
457 if exists $ob->{attach}; 517 if exists $ob->{attach};
458 518
459 $ob 519 $ob
460} 520}
461 521
462sub attr_freeze($) { 522sub attr_freeze($) {
463 my ($ob) = @_; 523 my ($ob) = @_;
464 524
465 $ob->{attach} = Crossfire::to_json $ob->{attach} 525 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
466 if exists $ob->{attach}; 526 if exists $ob->{attach};
467 527
468 $ob 528 $ob
469} 529}
470 530
… …
490 550
491 my %arc; 551 my %arc;
492 my ($more, $prev); 552 my ($more, $prev);
493 my $comment; 553 my $comment;
494 554
495 open my $fh, "<:raw:perlio:utf8", $path 555 open my $fh, "<:utf8", $path
496 or Carp::croak "$path: $!"; 556 or Carp::croak "$path: $!";
497 557
498# binmode $fh; 558# binmode $fh;
499 559
500 my $parse_block; $parse_block = sub { 560 my $parse_block; $parse_block = sub {
… …
600 my $str; 660 my $str;
601 661
602 my $append; $append = sub { 662 my $append; $append = sub {
603 my %a = %{$_[0]}; 663 my %a = %{$_[0]};
604 664
605 Crossfire::attr_freeze \%a; 665 Deliantra::attr_freeze \%a;
606 Crossfire::normalize_arch \%a; 666 Deliantra::normalize_arch \%a;
607 667
608 # undo the bit-split we did before 668 # undo the bit-split we did before
609 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 669 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
610 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 670 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
611 | (delete $a{attack_movement_bits_4_7}); 671 | (delete $a{attack_movement_bits_4_7});
… …
629 } 689 }
630 690
631 my @kv; 691 my @kv;
632 692
633 for ($a{_name} eq "map" 693 for ($a{_name} eq "map"
634 ? @Crossfire::FIELD_ORDER_MAP 694 ? @Deliantra::FIELD_ORDER_MAP
635 : @Crossfire::FIELD_ORDER) { 695 : @Deliantra::FIELD_ORDER) {
636 push @kv, [$_, delete $a{$_}] 696 push @kv, [$_, delete $a{$_}]
637 if exists $a{$_}; 697 if exists $a{$_};
638 } 698 }
639 699
640 for (sort keys %a) { 700 for (sort keys %a) {
… …
643 } 703 }
644 704
645 for (@kv) { 705 for (@kv) {
646 my ($k, $v) = @$_; 706 my ($k, $v) = @$_;
647 707
648 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 708 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
649 $v =~ s/\n$//; 709 $v =~ s/\n$//;
650 $str .= "$k\n$v\n$end\n"; 710 $str .= "$k\n$v\n$end\n";
651 } else { 711 } else {
652 $str .= "$k $v\n"; 712 $str .= "$k $v\n";
653 } 713 }
… …
749=cut 809=cut
750 810
751sub arch_attr($) { 811sub arch_attr($) {
752 my ($obj) = @_; 812 my ($obj) = @_;
753 813
754 require Crossfire::Data; 814 require Deliantra::Data;
755 815
756 my $root; 816 my $root;
757 my $attr = { }; 817 my $attr = { };
758 818
759 my $arch = $ARCH{ $obj->{_name} }; 819 my $arch = $ARCH{ $obj->{_name} };
760 my $type = $obj->{type} || $arch->{type}; 820 my $type = $obj->{type} || $arch->{type};
761 821
762 if ($type > 0) { 822 if ($type > 0) {
763 $root = $Crossfire::Data::ATTR{$type}; 823 $root = $Deliantra::Data::ATTR{$type};
764 } else { 824 } else {
765 my %a = (%$arch, %$obj); 825 my %a = (%$arch, %$obj);
766 826
767 if ($a{is_floor} && !$a{alive}) { 827 if ($a{is_floor} && !$a{alive}) {
768 $root = $Crossfire::Data::TYPE{Floor}; 828 $root = $Deliantra::Data::TYPE{Floor};
769 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 829 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
770 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 830 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
771 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 831 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
772 $root = $Crossfire::Data::TYPE{Wall}; 832 $root = $Deliantra::Data::TYPE{Wall};
773 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 833 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
774 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 834 $root = $Deliantra::Data::TYPE{"Weak Wall"};
775 } else { 835 } else {
776 $root = $Crossfire::Data::TYPE{Misc}; 836 $root = $Deliantra::Data::TYPE{Misc};
777 } 837 }
778 } 838 }
779 839
840 my (%ignore);
780 my @import = ($root); 841 my @import = ($root);
842
843 my @new_import;
844 while (my $type = shift @import) {
845 # first import everything we will need:
846 push @import,
847 grep $_,
848 map $Deliantra::Data::TYPE{$_},
849 @{$type->{import} || []};
850
851 # and compute the ignored attributes
852 for (@{$type->{ignore} || []}) {
853 $ignore{$_}++ for ref $_ ? @$_ : $_;
854 }
855
856 push @new_import, $type;
781 857 }
858 (@import) = @new_import;
859
860 # then add defaults to the back of the list, so they are added
861 # as last resort.
782 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 862 push @import, \%Deliantra::Data::DEFAULT_ATTR
783 unless $type == 116; 863 unless $type == 116;
784 864
785 my (%ignore);
786 my (@section_order, %section, @attr_order); 865 my (@section_order, %section, @attr_order);
787 866
867 # @import = root, imported, default
788 while (my $type = shift @import) { 868 while (my $type = pop @import) {
789 push @import, @{$type->{import} || []};
790
791 $attr->{$_} ||= $type->{$_} 869 $attr->{$_} ||= $type->{$_}
792 for qw(name desc use); 870 for qw(name desc use);
793
794 for (@{$type->{ignore} || []}) {
795 $ignore{$_}++ for ref $_ ? @$_ : $_;
796 }
797 871
798 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 872 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
799 my ($name, $attr) = @$_; 873 my ($name, $attr) = @$_;
800 push @section_order, $name; 874 push @section_order, $name;
801 for (@$attr) { 875 for (@$attr) {
802 my ($k, $v) = @$_; 876 my ($k, $v) = @$_;
803 push @attr_order, $k; 877 push @attr_order, $k;
804 $section{$name}{$k} ||= $v; 878 $section{$name}{$k} = $v; # overwrite, so that the root decides
805 }
806 } 879 }
880 }
881 }
882
883 # remove ignores for "root" type
884 for (
885 map @{$_->[1]}, # section attributes
886 [general => ($root->{attr} || [])],
887 @{$root->{section} || []}
888 ) {
889 my ($k, $v) = @$_;
890 # skip fixed attributes, if they are ignored thats fine
891 next if $v->{type} eq 'fixed';
892
893 delete $ignore{$k}; # if the attributes are defined explicitly they
894 # should NOT be ignored. ignore should mainly
895 # hit imported/inherited attributes.
807 } 896 }
808 897
809 $attr->{section} = [ 898 $attr->{section} = [
810 map !exists $section{$_} ? () : do { 899 map !exists $section{$_} ? () : do {
811 my $attr = delete $section{$_}; 900 my $attr = delete $section{$_};
… …
815 map exists $attr->{$_} && !$ignore{$_} 904 map exists $attr->{$_} && !$ignore{$_}
816 ? [$_ => delete $attr->{$_}] : (), 905 ? [$_ => delete $attr->{$_}] : (),
817 @attr_order 906 @attr_order
818 ] 907 ]
819 }, 908 },
820
821 exists $section{$_} ? [$_ => delete $section{$_}] : (), 909 exists $section{$_} ? [$_ => delete $section{$_}] : (),
822 @section_order 910 @section_order
823 ]; 911 ];
824 912
825 $attr 913 $attr
826} 914}
… …
880 }, sub { 968 }, sub {
881 read_arch "$LIB/archetypes" 969 read_arch "$LIB/archetypes"
882 }; 970 };
883} 971}
884 972
973sub construct_tilecache_pb {
974 my ($idx, $cache) = @_;
975
976 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
977
978 while (my ($name, $tile) = each %$cache) {
979 my $tpb = delete $tile->{pb};
980 my $ofs = $tile->{idx};
981
982 for my $x (0 .. $tile->{w} - 1) {
983 for my $y (0 .. $tile->{h} - 1) {
984 my $idx = $ofs + $x + $y * $tile->{w};
985 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
986 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
987 }
988 }
989 }
990
991 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
992
993 $cache
994}
995
996sub use_tilecache {
997 my ($face) = @_;
998 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
999 or die "$VARDIR/tilecache.png: $!";
1000 *FACE = $_[0];
1001}
1002
885=item load_tilecache 1003=item load_tilecache
886 1004
887(Re-)Load %TILE and %FACE. 1005(Re-)Load %TILE and %FACE.
888 1006
889=cut 1007=cut
890 1008
891sub load_tilecache() { 1009sub load_tilecache() {
892 require Gtk2; 1010 require Gtk2;
893 1011
894 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 1012 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
895 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
896 or die "$VARDIR/tilecache.png: $!";
897 *FACE = $_[0];
898 }, sub { 1013 sub {
899 my $tile = read_pak "$LIB/crossfire.0";
900
901 my %cache; 1014 my %cache;
1015 my $facedata = Storable::retrieve "$LIB/faceinfo";
902 1016
1017 open my $fh, "<", "$LIB/facedata"
1018 or die "$LIB/facedata: $!";
1019
1020 $facedata->{version} == 2
1021 or die "$LIB/facedata: version mismatch, cannot proceed.";
1022
1023 my $faces = $facedata->{faceinfo};
903 my $idx = 0; 1024 my $idx = 0;
904 1025
905 for my $name (sort keys %$tile) { 1026 for (sort keys %$faces) {
1027 my ($face, $info) = ($_, $faces->{$_});
1028
906 my $pb = new Gtk2::Gdk::PixbufLoader; 1029 my $pb = new Gtk2::Gdk::PixbufLoader;
907 $pb->write ($tile->{$name});
908 $pb->close;
909 my $pb = $pb->get_pixbuf;
910 1030
911 my $tile = $cache{$name} = { 1031 if (exists $info->{data32}) {
912 pb => $pb, 1032 $pb->write ($info->{data32});
913 idx => $idx, 1033 } else {
914 w => int $pb->get_width / TILESIZE, 1034 sysseek $fh, $info->{fofs32}, 0;
915 h => int $pb->get_height / TILESIZE, 1035 sysread $fh, my $buf, $info->{size32};
916 }; 1036 $pb->write ($buf);
917
918
919 $idx += $tile->{w} * $tile->{h};
920 }
921
922 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
923
924 while (my ($name, $tile) = each %cache) {
925 my $tpb = delete $tile->{pb};
926 my $ofs = $tile->{idx};
927
928 for my $x (0 .. $tile->{w} - 1) {
929 for my $y (0 .. $tile->{h} - 1) {
930 my $idx = $ofs + $x + $y * $tile->{w};
931 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
932 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
933 } 1037 }
1038 $pb->close;
1039 my $pb = $pb->get_pixbuf;
1040
1041 my $tile = $cache{$face} = {
1042 pb => $pb,
1043 idx => $idx,
1044 w => int $pb->get_width / TILESIZE,
1045 h => int $pb->get_height / TILESIZE,
934 } 1046 };
1047
1048 $idx += $tile->{w} * $tile->{h};
1049 }
1050
1051 construct_tilecache_pb $idx, \%cache;
1052
1053 \%cache
935 } 1054 };
936
937 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
938
939 \%cache
940 };
941} 1055}
1056
1057=back
942 1058
943=head1 AUTHOR 1059=head1 AUTHOR
944 1060
945 Marc Lehmann <schmorp@schmorp.de> 1061 Marc Lehmann <schmorp@schmorp.de>
946 http://home.schmorp.de/ 1062 http://home.schmorp.de/
… …
949 http://www.ta-sa.org/ 1065 http://www.ta-sa.org/
950 1066
951=cut 1067=cut
952 1068
9531 10691
1070

Diff Legend

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