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.85 by root, Wed Feb 7 00:44:18 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",
… …
58 qw(move_type move_block move_allow move_on move_off move_slow); 55 qw(move_type move_block move_allow move_on move_off move_slow);
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(
60 file_format_version
63 name attach swap_time reset_timeout fixed_resettime difficulty region 61 name attach swap_time reset_timeout fixed_resettime difficulty region
64 shopitems shopgreed shopmin shopmax shoprace 62 shopitems shopgreed shopmin shopmax shoprace
65 darkness width height enter_x enter_y msg maplore 63 darkness width height enter_x enter_y msg maplore
66 unique template 64 unique template
67 outdoor temp pressure humid windspeed winddir sky nosmooth 65 outdoor temp pressure humid windspeed winddir sky nosmooth
68 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
69)); 67));
70 68
71our @FIELD_ORDER = (qw( 69our @FIELD_ORDER = (qw(
70 inherit
71
72 elevation 72 elevation
73 73
74 name name_pl custom_name attach title race 74 name name_pl custom_name attach title race
75 slaying skill msg lore other_arch face 75 slaying skill msg lore other_arch
76 #todo-events 76 sound sound_destroy face animation is_animated
77 animation is_animated 77 magicmap smoothlevel smoothface
78 str dex con wis pow cha int 78 str dex con wis pow cha int
79 hp maxhp sp maxsp grace maxgrace 79 hp maxhp sp maxsp grace maxgrace
80 exp perm_exp expmul 80 exp perm_exp expmul
81 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
82 nrof level direction type subtype attacktype 82 nrof level direction type subtype attacktype
… …
90 resist_life_stealing resist_disease 90 resist_life_stealing resist_disease
91 91
92 path_attuned path_repelled path_denied material materialname 92 path_attuned path_repelled path_denied material materialname
93 value carrying weight invisible state magic 93 value carrying weight invisible state magic
94 last_heal last_sp last_grace last_eat 94 last_heal last_sp last_grace last_eat
95 connected glow_radius randomitems npx_status npc_program 95 connected glow_radius randomitems tresure_env npx_status npc_program
96 run_away pick_up container will_apply smoothlevel 96 run_away pick_up container will_apply smoothlevel
97 current_weapon_script weapontype tooltype elevation client_type 97 current_weapon_script weapontype tooltype elevation client_type
98 item_power duration range 98 item_power duration range
99 range_modifier duration_modifier dam_modifier gen_sp_armour 99 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 100 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 111 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 112 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 113 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 114 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 115 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
116 precious
116 117
117 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
118 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
119)); 120));
120 121
… …
137sub MOVE_FLY_LOW (){ 0x02 } 138sub MOVE_FLY_LOW (){ 0x02 }
138sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
139sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
140sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
141sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
143sub MOVE_SHIP (){ 0x20 }
142sub MOVE_KNOWN (){ 0x1f } # all of above 144sub MOVE_KNOWN (){ 0x3f } # all of above
143sub MOVE_ALLBIT (){ 0x10000 }
144sub 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}
145 255
146sub load_ref($) { 256sub load_ref($) {
147 my ($path) = @_; 257 my ($path) = @_;
148 258
149 open my $fh, "<:raw:perlio", $path 259 open my $fh, "<:raw:perlio", $path
… …
234 344
235# object as in "Object xxx", i.e. archetypes 345# object as in "Object xxx", i.e. archetypes
236sub normalize_object($) { 346sub normalize_object($) {
237 my ($ob) = @_; 347 my ($ob) = @_;
238 348
349 delete $ob->{editable}; # deprecated
350
239 # convert material bitset to materialname, if possible 351 # convert material bitset to materialname, if possible
240 if (exists $ob->{material}) { 352 if (exists $ob->{material}) {
241 if (!$ob->{material}) { 353 if (!$ob->{material}) {
242 delete $ob->{material}; 354 delete $ob->{material};
243 } elsif (exists $ob->{materialname}) { 355 } elsif (exists $ob->{materialname}) {
… …
253 } else { 365 } else {
254 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 366 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
255 } 367 }
256 } 368 }
257 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
258 # nuke outdated or never supported fields 384 # nuke outdated or never supported fields
259 delete @$ob{qw( 385 delete @$ob{qw(
260 can_knockback can_parry can_impale can_cut can_dam_armour 386 can_knockback can_parry can_impale can_cut can_dam_armour
261 can_apply pass_thru can_pass_thru 387 can_apply pass_thru can_pass_thru color_bg color_fg
262 )}; 388 )};
263 389
264 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 390 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
265 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 391 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
266 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 392 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
267 393
268 # convert movement strings to bitsets 394 # convert movement strings to bitsets
269 for my $attr (keys %FIELD_MOVEMENT) { 395 for my $attr (keys %FIELD_MOVEMENT) {
270 next unless exists $ob->{$attr}; 396 next unless exists $ob->{$attr};
271 397
272 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 398 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
273
274 next if $ob->{$attr} =~ /^\d+$/;
275
276 my $flags = 0;
277
278 # assume list
279 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
280 $flags |= MOVE_WALK if $flag eq "walk";
281 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
282 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
283 $flags |= MOVE_FLYING if $flag eq "flying";
284 $flags |= MOVE_SWIM if $flag eq "swim";
285 $flags |= MOVE_BOAT if $flag eq "boat";
286 $flags |= MOVE_ALL if $flag eq "all";
287
288 $flags &= ~MOVE_WALK if $flag eq "-walk";
289 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
290 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
291 $flags &= ~MOVE_FLYING if $flag eq "-flying";
292 $flags &= ~MOVE_SWIM if $flag eq "-swim";
293 $flags &= ~MOVE_BOAT if $flag eq "-boat";
294 $flags &= ~MOVE_ALL if $flag eq "-all";
295 }
296
297 $ob->{$attr} = $flags;
298 } 399 }
299 400
300 # convert outdated movement flags to new movement sets 401 # convert outdated movement flags to new movement sets
301 if (defined (my $v = delete $ob->{no_pass})) { 402 if (defined (my $v = delete $ob->{no_pass})) {
302 $ob->{move_block} = $v ? MOVE_ALL : 0; 403 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
303 } 404 }
304 if (defined (my $v = delete $ob->{slow_move})) { 405 if (defined (my $v = delete $ob->{slow_move})) {
305 $ob->{move_slow} |= MOVE_WALK; 406 $ob->{move_slow} += "walk";
306 $ob->{move_slow_penalty} = $v; 407 $ob->{move_slow_penalty} = $v;
307 } 408 }
308 if (defined (my $v = delete $ob->{walk_on})) { 409 if (defined (my $v = delete $ob->{walk_on})) {
309 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 410 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
310 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
311 : $ob->{move_on} & ~MOVE_WALK;
312 } 411 }
313 if (defined (my $v = delete $ob->{walk_off})) { 412 if (defined (my $v = delete $ob->{walk_off})) {
314 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 413 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
315 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
316 : $ob->{move_off} & ~MOVE_WALK;
317 } 414 }
318 if (defined (my $v = delete $ob->{fly_on})) { 415 if (defined (my $v = delete $ob->{fly_on})) {
319 $ob->{move_on} = MOVE_ALL 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" }
320 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
321 : $ob->{move_on} & ~MOVE_FLY_LOW;
322 } 417 }
323 if (defined (my $v = delete $ob->{fly_off})) { 418 if (defined (my $v = delete $ob->{fly_off})) {
324 $ob->{move_off} = MOVE_ALL 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" }
325 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
326 : $ob->{move_off} & ~MOVE_FLY_LOW;
327 } 420 }
328 if (defined (my $v = delete $ob->{flying})) { 421 if (defined (my $v = delete $ob->{flying})) {
329 $ob->{move_type} = MOVE_ALL 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" }
330 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
331 : $ob->{move_type} & ~MOVE_FLY_LOW;
332 } 423 }
333 424
334 # convert idiotic event_xxx things into objects 425 # convert idiotic event_xxx things into objects
335 while (my ($event, $subtype) = each %EVENT_TYPE) { 426 while (my ($event, $subtype) = each %EVENT_TYPE) {
336 if (exists $ob->{"event_${event}_plugin"}) { 427 if (exists $ob->{"event_${event}_plugin"}) {
… …
352# arch as in "arch xxx", ie.. objects 443# arch as in "arch xxx", ie.. objects
353sub normalize_arch($) { 444sub normalize_arch($) {
354 my ($ob) = @_; 445 my ($ob) = @_;
355 446
356 normalize_object $ob; 447 normalize_object $ob;
448
449 return if $ob->{_atype} eq "object";
357 450
358 my $arch = $ARCH{$ob->{_name}} 451 my $arch = $ARCH{$ob->{_name}}
359 or (warn "$ob->{_name}: no such archetype", return $ob); 452 or (warn "$ob->{_name}: no such archetype", return $ob);
360 453
361 if ($arch->{type} == 22) { # map 454 if ($arch->{type} == 22) { # map
… …
397} 490}
398 491
399sub attr_thaw($) { 492sub attr_thaw($) {
400 my ($ob) = @_; 493 my ($ob) = @_;
401 494
402 $ob->{attach} = from_json $ob->{attach} 495 $ob->{attach} = decode_json $ob->{attach}
403 if exists $ob->{attach}; 496 if exists $ob->{attach};
404 497
405 $ob 498 $ob
406} 499}
407 500
408sub attr_freeze($) { 501sub attr_freeze($) {
409 my ($ob) = @_; 502 my ($ob) = @_;
410 503
411 $ob->{attach} = Crossfire::to_json $ob->{attach} 504 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
412 if exists $ob->{attach}; 505 if exists $ob->{attach};
413 506
414 $ob 507 $ob
415} 508}
416 509
… …
436 529
437 my %arc; 530 my %arc;
438 my ($more, $prev); 531 my ($more, $prev);
439 my $comment; 532 my $comment;
440 533
441 open my $fh, "<:raw:perlio:utf8", $path 534 open my $fh, "<:utf8", $path
442 or Carp::croak "$path: $!"; 535 or Carp::croak "$path: $!";
443 536
444# binmode $fh; 537# binmode $fh;
445 538
446 my $parse_block; $parse_block = sub { 539 my $parse_block; $parse_block = sub {
… …
546 my $str; 639 my $str;
547 640
548 my $append; $append = sub { 641 my $append; $append = sub {
549 my %a = %{$_[0]}; 642 my %a = %{$_[0]};
550 643
551 Crossfire::attr_freeze \%a; 644 Deliantra::attr_freeze \%a;
552 Crossfire::normalize_arch \%a; 645 Deliantra::normalize_arch \%a;
553 646
554 # undo the bit-split we did before 647 # undo the bit-split we did before
555 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}) {
556 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 649 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
557 | (delete $a{attack_movement_bits_4_7}); 650 | (delete $a{attack_movement_bits_4_7});
… …
567 660
568 my $inv = delete $a{inventory}; 661 my $inv = delete $a{inventory};
569 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 662 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
570 my $anim = delete $a{anim}; 663 my $anim = delete $a{anim};
571 664
665 if ($a{_atype} eq 'object') {
666 $str .= join "\n", "anim", @$anim, "mina\n"
667 if $anim;
668 }
669
572 my @kv; 670 my @kv;
573 671
574 for ($a{_name} eq "map" 672 for ($a{_name} eq "map"
575 ? @Crossfire::FIELD_ORDER_MAP 673 ? @Deliantra::FIELD_ORDER_MAP
576 : @Crossfire::FIELD_ORDER) { 674 : @Deliantra::FIELD_ORDER) {
577 push @kv, [$_, delete $a{$_}] 675 push @kv, [$_, delete $a{$_}]
578 if exists $a{$_}; 676 if exists $a{$_};
579 } 677 }
580 678
581 for (sort keys %a) { 679 for (sort keys %a) {
… …
584 } 682 }
585 683
586 for (@kv) { 684 for (@kv) {
587 my ($k, $v) = @$_; 685 my ($k, $v) = @$_;
588 686
589 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 687 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
590 $v =~ s/\n$//; 688 $v =~ s/\n$//;
591 $str .= "$k\n$v\n$end\n"; 689 $str .= "$k\n$v\n$end\n";
592 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
593 if ($v & ~Crossfire::MOVE_ALL or !$v) {
594 $str .= "$k $v\n";
595
596 } elsif ($v & Crossfire::MOVE_ALLBIT) {
597 $str .= "$k all";
598
599 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
600 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
601 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
602 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
603 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
604
605 $str .= "\n";
606
607 } else {
608 $str .= $k;
609
610 $str .= " walk" if $v & Crossfire::MOVE_WALK;
611 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
612 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
613 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
614 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
615
616 $str .= "\n";
617 }
618 } else { 690 } else {
619 $str .= "$k $v\n"; 691 $str .= "$k $v\n";
620 } 692 }
621 } 693 }
622 694
623 if ($inv) { 695 if ($inv) {
624 $append->($_) for @$inv; 696 $append->($_) for @$inv;
625 }
626
627 if ($a{_atype} eq 'object') {
628 $str .= join "\n", "anim", @$anim, "mina\n"
629 if $anim;
630 } 697 }
631 698
632 $str .= "end\n"; 699 $str .= "end\n";
633 700
634 if ($a{_atype} eq 'object') { 701 if ($a{_atype} eq 'object') {
… …
721=cut 788=cut
722 789
723sub arch_attr($) { 790sub arch_attr($) {
724 my ($obj) = @_; 791 my ($obj) = @_;
725 792
726 require Crossfire::Data; 793 require Deliantra::Data;
727 794
728 my $root; 795 my $root;
729 my $attr = { }; 796 my $attr = { };
730 797
731 my $arch = $ARCH{ $obj->{_name} }; 798 my $arch = $ARCH{ $obj->{_name} };
732 my $type = $obj->{type} || $arch->{type}; 799 my $type = $obj->{type} || $arch->{type};
733 800
734 if ($type > 0) { 801 if ($type > 0) {
735 $root = $Crossfire::Data::ATTR{$type}; 802 $root = $Deliantra::Data::ATTR{$type};
736 } else { 803 } else {
737 my %a = (%$arch, %$obj); 804 my %a = (%$arch, %$obj);
738 805
739 if ($a{is_floor} && !$a{alive}) { 806 if ($a{is_floor} && !$a{alive}) {
740 $root = $Crossfire::Data::TYPE{Floor}; 807 $root = $Deliantra::Data::TYPE{Floor};
741 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 808 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
742 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 809 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
743 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 810 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
744 $root = $Crossfire::Data::TYPE{Wall}; 811 $root = $Deliantra::Data::TYPE{Wall};
745 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 812 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
746 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 813 $root = $Deliantra::Data::TYPE{"Weak Wall"};
747 } else { 814 } else {
748 $root = $Crossfire::Data::TYPE{Misc}; 815 $root = $Deliantra::Data::TYPE{Misc};
749 } 816 }
750 } 817 }
751 818
752 my @import = ($root); 819 my @import = ($root);
753 820
754 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 821 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
755 unless $type == 116; 822 unless $type == 116;
756 823
757 my (%ignore); 824 my (%ignore);
758 my (@section_order, %section, @attr_order); 825 my (@section_order, %section, @attr_order);
759 826
760 while (my $type = shift @import) { 827 while (my $type = shift @import) {
828 push @import,
829 grep $_,
830 map $Deliantra::Data::TYPE{$_},
761 push @import, @{$type->{import} || []}; 831 @{$type->{import} || []};
762 832
763 $attr->{$_} ||= $type->{$_} 833 $attr->{$_} ||= $type->{$_}
764 for qw(name desc use); 834 for qw(name desc use);
765 835
766 for (@{$type->{ignore} || []}) { 836 for (@{$type->{ignore} || []}) {
… …
776 $section{$name}{$k} ||= $v; 846 $section{$name}{$k} ||= $v;
777 } 847 }
778 } 848 }
779 } 849 }
780 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
781 $attr->{section} = [ 865 $attr->{section} = [
782 map !exists $section{$_} ? () : do { 866 map !exists $section{$_} ? () : do {
783 my $attr = delete $section{$_}; 867 my $attr = delete $section{$_};
784 868
785 [ 869 [
… …
787 map exists $attr->{$_} && !$ignore{$_} 871 map exists $attr->{$_} && !$ignore{$_}
788 ? [$_ => delete $attr->{$_}] : (), 872 ? [$_ => delete $attr->{$_}] : (),
789 @attr_order 873 @attr_order
790 ] 874 ]
791 }, 875 },
792
793 exists $section{$_} ? [$_ => delete $section{$_}] : (), 876 exists $section{$_} ? [$_ => delete $section{$_}] : (),
794 @section_order 877 @section_order
795 ]; 878 ];
796 879
797 $attr 880 $attr
798}
799
800sub arch_edit_sections {
801# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
802# edit_type = 0;
803# else if (edit_type != 0) {
804# // all flags from 'check_type' must be unset in this arch because they get recalculated now
805# edit_type &= ~check_type;
806# }
807#
808# }
809# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
810# getAttributeValue("alive", defarch) == 1 &&
811# (getAttributeValue("monster", defarch) == 1 ||
812# getAttributeValue("generator", defarch) == 1)) {
813# // Monster: monsters/npcs/generators
814# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
815# }
816# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
817# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
818# // Walls
819# edit_type |= IGUIConstants.TILE_EDIT_WALL;
820# }
821# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
822# getAttributeValue("connected", defarch) != 0) {
823# // Connected Objects
824# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
825# }
826# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
827# arch_type == 66 || arch_type == 41 || arch_type == 95) {
828# // Exit: teleporter/exit/trapdoors
829# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
830# }
831# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
832# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
833# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
834# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
835# arch_type == 124 || arch_type == 130)) {
836# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
837# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
838# }
839# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
840# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
841# arch_type == 91 || arch_type == 21 || arch_type == 24) {
842# // Door: door/special door/gates + keys
843# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
844# }
845# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
846# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
847# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
848# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
849# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
850# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
851# arch_type == 122 || arch_type == 3)) {
852# // Equipment: weapons/armour/wands/rods
853# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
854# }
855#
856# return(edit_type);
857#
858#
859} 881}
860 882
861sub cache_file($$&&) { 883sub cache_file($$&&) {
862 my ($src, $cache, $load, $create) = @_; 884 my ($src, $cache, $load, $create) = @_;
863 885
… …
913 }, sub { 935 }, sub {
914 read_arch "$LIB/archetypes" 936 read_arch "$LIB/archetypes"
915 }; 937 };
916} 938}
917 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
918=item load_tilecache 970=item load_tilecache
919 971
920(Re-)Load %TILE and %FACE. 972(Re-)Load %TILE and %FACE.
921 973
922=cut 974=cut
923 975
924sub load_tilecache() { 976sub load_tilecache() {
925 require Gtk2; 977 require Gtk2;
926 978
927 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 979 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
928 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
929 or die "$VARDIR/tilecache.png: $!";
930 *FACE = $_[0];
931 }, sub { 980 sub {
932 my $tile = read_pak "$LIB/crossfire.0";
933
934 my %cache; 981 my %cache;
982 my $facedata = Storable::retrieve "$LIB/facedata";
935 983
984 $facedata->{version} == 2
985 or die "$LIB/facedata: version mismatch, cannot proceed.";
986
987 my $faces = $facedata->{faceinfo};
936 my $idx = 0; 988 my $idx = 0;
937 989
938 for my $name (sort keys %$tile) { 990 for (sort keys %$faces) {
991 my ($face, $info) = ($_, $faces->{$_});
992
939 my $pb = new Gtk2::Gdk::PixbufLoader; 993 my $pb = new Gtk2::Gdk::PixbufLoader;
940 $pb->write ($tile->{$name}); 994 $pb->write ($info->{data32});
941 $pb->close; 995 $pb->close;
942 my $pb = $pb->get_pixbuf; 996 my $pb = $pb->get_pixbuf;
943 997
944 my $tile = $cache{$name} = { 998 my $tile = $cache{$face} = {
945 pb => $pb, 999 pb => $pb,
946 idx => $idx, 1000 idx => $idx,
947 w => int $pb->get_width / TILESIZE, 1001 w => int $pb->get_width / TILESIZE,
948 h => int $pb->get_height / TILESIZE, 1002 h => int $pb->get_height / TILESIZE,
949 }; 1003 };
950
951 1004
952 $idx += $tile->{w} * $tile->{h}; 1005 $idx += $tile->{w} * $tile->{h};
1006 }
1007
1008 construct_tilecache_pb $idx, \%cache;
1009
1010 \%cache
953 } 1011 };
954
955 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
956
957 while (my ($name, $tile) = each %cache) {
958 my $tpb = delete $tile->{pb};
959 my $ofs = $tile->{idx};
960
961 for my $x (0 .. $tile->{w} - 1) {
962 for my $y (0 .. $tile->{h} - 1) {
963 my $idx = $ofs + $x + $y * $tile->{w};
964 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
965 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
966 }
967 }
968 }
969
970 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
971
972 \%cache
973 };
974} 1012}
1013
1014=back
975 1015
976=head1 AUTHOR 1016=head1 AUTHOR
977 1017
978 Marc Lehmann <schmorp@schmorp.de> 1018 Marc Lehmann <schmorp@schmorp.de>
979 http://home.schmorp.de/ 1019 http://home.schmorp.de/
… …
982 http://www.ta-sa.org/ 1022 http://www.ta-sa.org/
983 1023
984=cut 1024=cut
985 1025
9861 10261
1027

Diff Legend

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