ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra/Deliantra.pm
(Generate patch)

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.84 by root, Wed Feb 7 00:22:34 2007 UTC vs.
Revision 1.140 by elmex, Fri Mar 19 23:11:43 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.29';
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
… …
225 ice => 68, 335 ice => 68,
226 stone => 70, 336 stone => 70,
227 stone => 80, 337 stone => 80,
228 cloth => 136, 338 cloth => 136,
229 ironwood => 144, 339 ironwood => 144,
340 adamantium => 258,
230 glacium => 260, 341 glacium => 260,
231 blood => 544, 342 blood => 544,
232; 343;
233 344
234# object as in "Object xxx", i.e. archetypes 345# object as in "Object xxx", i.e. archetypes
235sub normalize_object($) { 346sub normalize_object($) {
236 my ($ob) = @_; 347 my ($ob) = @_;
348
349 delete $ob->{editable}; # deprecated
237 350
238 # convert material bitset to materialname, if possible 351 # convert material bitset to materialname, if possible
239 if (exists $ob->{material}) { 352 if (exists $ob->{material}) {
240 if (!$ob->{material}) { 353 if (!$ob->{material}) {
241 delete $ob->{material}; 354 delete $ob->{material};
… …
252 } else { 365 } else {
253 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 366 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
254 } 367 }
255 } 368 }
256 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
257 # nuke outdated or never supported fields 384 # nuke outdated or never supported fields
258 delete @$ob{qw( 385 delete @$ob{qw(
259 can_knockback can_parry can_impale can_cut can_dam_armour 386 can_knockback can_parry can_impale can_cut can_dam_armour
260 can_apply pass_thru can_pass_thru 387 can_apply pass_thru can_pass_thru color_bg color_fg
261 )}; 388 )};
262 389
263 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 390 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
264 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 391 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
265 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 392 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
266 393
267 # convert movement strings to bitsets 394 # convert movement strings to bitsets
268 for my $attr (keys %FIELD_MOVEMENT) { 395 for my $attr (keys %FIELD_MOVEMENT) {
269 next unless exists $ob->{$attr}; 396 next unless exists $ob->{$attr};
270 397
271 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 398 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
272
273 next if $ob->{$attr} =~ /^\d+$/;
274
275 my $flags = 0;
276
277 # assume list
278 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
279 $flags |= MOVE_WALK if $flag eq "walk";
280 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
281 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
282 $flags |= MOVE_FLYING if $flag eq "flying";
283 $flags |= MOVE_SWIM if $flag eq "swim";
284 $flags |= MOVE_BOAT if $flag eq "boat";
285 $flags |= MOVE_ALL if $flag eq "all";
286
287 $flags &= ~MOVE_WALK if $flag eq "-walk";
288 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
289 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
290 $flags &= ~MOVE_FLYING if $flag eq "-flying";
291 $flags &= ~MOVE_SWIM if $flag eq "-swim";
292 $flags &= ~MOVE_BOAT if $flag eq "-boat";
293 $flags &= ~MOVE_ALL if $flag eq "-all";
294 }
295
296 $ob->{$attr} = $flags;
297 } 399 }
298 400
299 # convert outdated movement flags to new movement sets 401 # convert outdated movement flags to new movement sets
300 if (defined (my $v = delete $ob->{no_pass})) { 402 if (defined (my $v = delete $ob->{no_pass})) {
301 $ob->{move_block} = $v ? MOVE_ALL : 0; 403 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
302 } 404 }
303 if (defined (my $v = delete $ob->{slow_move})) { 405 if (defined (my $v = delete $ob->{slow_move})) {
304 $ob->{move_slow} |= MOVE_WALK; 406 $ob->{move_slow} += "walk";
305 $ob->{move_slow_penalty} = $v; 407 $ob->{move_slow_penalty} = $v;
306 } 408 }
307 if (defined (my $v = delete $ob->{walk_on})) { 409 if (defined (my $v = delete $ob->{walk_on})) {
308 $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" }
309 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
310 : $ob->{move_on} & ~MOVE_WALK;
311 } 411 }
312 if (defined (my $v = delete $ob->{walk_off})) { 412 if (defined (my $v = delete $ob->{walk_off})) {
313 $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" }
314 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
315 : $ob->{move_off} & ~MOVE_WALK;
316 } 414 }
317 if (defined (my $v = delete $ob->{fly_on})) { 415 if (defined (my $v = delete $ob->{fly_on})) {
318 $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" }
319 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
320 : $ob->{move_on} & ~MOVE_FLY_LOW;
321 } 417 }
322 if (defined (my $v = delete $ob->{fly_off})) { 418 if (defined (my $v = delete $ob->{fly_off})) {
323 $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" }
324 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
325 : $ob->{move_off} & ~MOVE_FLY_LOW;
326 } 420 }
327 if (defined (my $v = delete $ob->{flying})) { 421 if (defined (my $v = delete $ob->{flying})) {
328 $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" }
329 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
330 : $ob->{move_type} & ~MOVE_FLY_LOW;
331 } 423 }
332 424
333 # convert idiotic event_xxx things into objects 425 # convert idiotic event_xxx things into objects
334 while (my ($event, $subtype) = each %EVENT_TYPE) { 426 while (my ($event, $subtype) = each %EVENT_TYPE) {
335 if (exists $ob->{"event_${event}_plugin"}) { 427 if (exists $ob->{"event_${event}_plugin"}) {
… …
351# arch as in "arch xxx", ie.. objects 443# arch as in "arch xxx", ie.. objects
352sub normalize_arch($) { 444sub normalize_arch($) {
353 my ($ob) = @_; 445 my ($ob) = @_;
354 446
355 normalize_object $ob; 447 normalize_object $ob;
448
449 return if $ob->{_atype} eq "object";
356 450
357 my $arch = $ARCH{$ob->{_name}} 451 my $arch = $ARCH{$ob->{_name}}
358 or (warn "$ob->{_name}: no such archetype", return $ob); 452 or (warn "$ob->{_name}: no such archetype", return $ob);
359 453
360 if ($arch->{type} == 22) { # map 454 if ($arch->{type} == 22) { # map
… …
396} 490}
397 491
398sub attr_thaw($) { 492sub attr_thaw($) {
399 my ($ob) = @_; 493 my ($ob) = @_;
400 494
401 $ob->{attach} = from_json $ob->{attach} 495 $ob->{attach} = decode_json $ob->{attach}
402 if exists $ob->{attach}; 496 if exists $ob->{attach};
403 497
404 $ob 498 $ob
405} 499}
406 500
407sub attr_freeze($) { 501sub attr_freeze($) {
408 my ($ob) = @_; 502 my ($ob) = @_;
409 503
410 $ob->{attach} = Crossfire::to_json $ob->{attach} 504 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
411 if exists $ob->{attach}; 505 if exists $ob->{attach};
412 506
413 $ob 507 $ob
414} 508}
415 509
… …
435 529
436 my %arc; 530 my %arc;
437 my ($more, $prev); 531 my ($more, $prev);
438 my $comment; 532 my $comment;
439 533
440 open my $fh, "<:raw:perlio:utf8", $path 534 open my $fh, "<:utf8", $path
441 or Carp::croak "$path: $!"; 535 or Carp::croak "$path: $!";
442 536
443# binmode $fh; 537# binmode $fh;
444 538
445 my $parse_block; $parse_block = sub { 539 my $parse_block; $parse_block = sub {
… …
545 my $str; 639 my $str;
546 640
547 my $append; $append = sub { 641 my $append; $append = sub {
548 my %a = %{$_[0]}; 642 my %a = %{$_[0]};
549 643
550 Crossfire::attr_freeze \%a; 644 Deliantra::attr_freeze \%a;
551 Crossfire::normalize_arch \%a; 645 Deliantra::normalize_arch \%a;
552 646
553 # undo the bit-split we did before 647 # undo the bit-split we did before
554 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}) {
555 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 649 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
556 | (delete $a{attack_movement_bits_4_7}); 650 | (delete $a{attack_movement_bits_4_7});
… …
566 660
567 my $inv = delete $a{inventory}; 661 my $inv = delete $a{inventory};
568 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
569 my $anim = delete $a{anim}; 663 my $anim = delete $a{anim};
570 664
665 if ($a{_atype} eq 'object') {
666 $str .= join "\n", "anim", @$anim, "mina\n"
667 if $anim;
668 }
669
571 my @kv; 670 my @kv;
572 671
573 for ($a{_name} eq "map" 672 for ($a{_name} eq "map"
574 ? @Crossfire::FIELD_ORDER_MAP 673 ? @Deliantra::FIELD_ORDER_MAP
575 : @Crossfire::FIELD_ORDER) { 674 : @Deliantra::FIELD_ORDER) {
576 push @kv, [$_, delete $a{$_}] 675 push @kv, [$_, delete $a{$_}]
577 if exists $a{$_}; 676 if exists $a{$_};
578 } 677 }
579 678
580 for (sort keys %a) { 679 for (sort keys %a) {
… …
583 } 682 }
584 683
585 for (@kv) { 684 for (@kv) {
586 my ($k, $v) = @$_; 685 my ($k, $v) = @$_;
587 686
588 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 687 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
589 $v =~ s/\n$//; 688 $v =~ s/\n$//;
590 $str .= "$k\n$v\n$end\n"; 689 $str .= "$k\n$v\n$end\n";
591 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
592 if ($v & ~Crossfire::MOVE_ALL or !$v) {
593 $str .= "$k $v\n";
594
595 } elsif ($v & Crossfire::MOVE_ALLBIT) {
596 $str .= "$k all";
597
598 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
599 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
600 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
601 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
602 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
603
604 $str .= "\n";
605
606 } else {
607 $str .= $k;
608
609 $str .= " walk" if $v & Crossfire::MOVE_WALK;
610 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
611 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
612 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
613 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
614
615 $str .= "\n";
616 }
617 } else { 690 } else {
618 $str .= "$k $v\n"; 691 $str .= "$k $v\n";
619 } 692 }
620 } 693 }
621 694
622 if ($inv) { 695 if ($inv) {
623 $append->($_) for @$inv; 696 $append->($_) for @$inv;
624 }
625
626 if ($a{_atype} eq 'object') {
627 $str .= join "\n", "anim", @$anim, "mina\n"
628 if $anim;
629 } 697 }
630 698
631 $str .= "end\n"; 699 $str .= "end\n";
632 700
633 if ($a{_atype} eq 'object') { 701 if ($a{_atype} eq 'object') {
… …
720=cut 788=cut
721 789
722sub arch_attr($) { 790sub arch_attr($) {
723 my ($obj) = @_; 791 my ($obj) = @_;
724 792
725 require Crossfire::Data; 793 require Deliantra::Data;
726 794
727 my $root; 795 my $root;
728 my $attr = { }; 796 my $attr = { };
729 797
730 my $arch = $ARCH{ $obj->{_name} }; 798 my $arch = $ARCH{ $obj->{_name} };
731 my $type = $obj->{type} || $arch->{type}; 799 my $type = $obj->{type} || $arch->{type};
732 800
733 if ($type > 0) { 801 if ($type > 0) {
734 $root = $Crossfire::Data::ATTR{$type}; 802 $root = $Deliantra::Data::ATTR{$type};
735 } else { 803 } else {
736 my %a = (%$arch, %$obj); 804 my %a = (%$arch, %$obj);
737 805
738 if ($a{is_floor} && !$a{alive}) { 806 if ($a{is_floor} && !$a{alive}) {
739 $root = $Crossfire::Data::TYPE{Floor}; 807 $root = $Deliantra::Data::TYPE{Floor};
740 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 808 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
741 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 809 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
742 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 810 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
743 $root = $Crossfire::Data::TYPE{Wall}; 811 $root = $Deliantra::Data::TYPE{Wall};
744 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 812 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
745 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 813 $root = $Deliantra::Data::TYPE{"Weak Wall"};
746 } else { 814 } else {
747 $root = $Crossfire::Data::TYPE{Misc}; 815 $root = $Deliantra::Data::TYPE{Misc};
748 } 816 }
749 } 817 }
750 818
819 my (%ignore);
751 my @import = ($root); 820 my @import = ($root);
821
822 my @new_import;
823 while (my $type = shift @import) {
824 # first import everything we will need:
825 push @import,
826 grep $_,
827 map $Deliantra::Data::TYPE{$_},
828 @{$type->{import} || []};
829
830 # and compute the ignored attributes
831 for (@{$type->{ignore} || []}) {
832 $ignore{$_}++ for ref $_ ? @$_ : $_;
833 }
834
835 push @new_import, $type;
752 836 }
837 (@import) = @new_import;
838
839 # then add defaults to the back of the list, so they are added
840 # as last resort.
753 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 841 push @import, \%Deliantra::Data::DEFAULT_ATTR
754 unless $type == 116; 842 unless $type == 116;
755 843
756 my (%ignore);
757 my (@section_order, %section, @attr_order); 844 my (@section_order, %section, @attr_order);
758 845
846 # @import = root, imported, default
759 while (my $type = shift @import) { 847 while (my $type = pop @import) {
760 push @import, @{$type->{import} || []};
761
762 $attr->{$_} ||= $type->{$_} 848 $attr->{$_} ||= $type->{$_}
763 for qw(name desc use); 849 for qw(name desc use);
764
765 for (@{$type->{ignore} || []}) {
766 $ignore{$_}++ for ref $_ ? @$_ : $_;
767 }
768 850
769 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 851 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
770 my ($name, $attr) = @$_; 852 my ($name, $attr) = @$_;
771 push @section_order, $name; 853 push @section_order, $name;
772 for (@$attr) { 854 for (@$attr) {
773 my ($k, $v) = @$_; 855 my ($k, $v) = @$_;
774 push @attr_order, $k; 856 push @attr_order, $k;
775 $section{$name}{$k} ||= $v; 857 $section{$name}{$k} = $v; # overwrite, so that the root decides
776 }
777 } 858 }
859 }
860 }
861
862 # remove ignores for "root" type
863 for (
864 map @{$_->[1]}, # section attributes
865 [general => ($root->{attr} || [])],
866 @{$root->{section} || []}
867 ) {
868 my ($k, $v) = @$_;
869 # skip fixed attributes, if they are ignored thats fine
870 next if $v->{type} eq 'fixed';
871
872 delete $ignore{$k}; # if the attributes are defined explicitly they
873 # should NOT be ignored. ignore should mainly
874 # hit imported/inherited attributes.
778 } 875 }
779 876
780 $attr->{section} = [ 877 $attr->{section} = [
781 map !exists $section{$_} ? () : do { 878 map !exists $section{$_} ? () : do {
782 my $attr = delete $section{$_}; 879 my $attr = delete $section{$_};
… …
786 map exists $attr->{$_} && !$ignore{$_} 883 map exists $attr->{$_} && !$ignore{$_}
787 ? [$_ => delete $attr->{$_}] : (), 884 ? [$_ => delete $attr->{$_}] : (),
788 @attr_order 885 @attr_order
789 ] 886 ]
790 }, 887 },
791
792 exists $section{$_} ? [$_ => delete $section{$_}] : (), 888 exists $section{$_} ? [$_ => delete $section{$_}] : (),
793 @section_order 889 @section_order
794 ]; 890 ];
795 891
796 $attr 892 $attr
797}
798
799sub arch_edit_sections {
800# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
801# edit_type = 0;
802# else if (edit_type != 0) {
803# // all flags from 'check_type' must be unset in this arch because they get recalculated now
804# edit_type &= ~check_type;
805# }
806#
807# }
808# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
809# getAttributeValue("alive", defarch) == 1 &&
810# (getAttributeValue("monster", defarch) == 1 ||
811# getAttributeValue("generator", defarch) == 1)) {
812# // Monster: monsters/npcs/generators
813# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
814# }
815# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
816# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
817# // Walls
818# edit_type |= IGUIConstants.TILE_EDIT_WALL;
819# }
820# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
821# getAttributeValue("connected", defarch) != 0) {
822# // Connected Objects
823# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
824# }
825# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
826# arch_type == 66 || arch_type == 41 || arch_type == 95) {
827# // Exit: teleporter/exit/trapdoors
828# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
829# }
830# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
831# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
832# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
833# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
834# arch_type == 124 || arch_type == 130)) {
835# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
836# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
837# }
838# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
839# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
840# arch_type == 91 || arch_type == 21 || arch_type == 24) {
841# // Door: door/special door/gates + keys
842# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
843# }
844# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
845# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
846# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
847# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
848# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
849# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
850# arch_type == 122 || arch_type == 3)) {
851# // Equipment: weapons/armour/wands/rods
852# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
853# }
854#
855# return(edit_type);
856#
857#
858} 893}
859 894
860sub cache_file($$&&) { 895sub cache_file($$&&) {
861 my ($src, $cache, $load, $create) = @_; 896 my ($src, $cache, $load, $create) = @_;
862 897
… …
912 }, sub { 947 }, sub {
913 read_arch "$LIB/archetypes" 948 read_arch "$LIB/archetypes"
914 }; 949 };
915} 950}
916 951
952sub construct_tilecache_pb {
953 my ($idx, $cache) = @_;
954
955 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
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 % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
966 }
967 }
968 }
969
970 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
971
972 $cache
973}
974
975sub use_tilecache {
976 my ($face) = @_;
977 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
978 or die "$VARDIR/tilecache.png: $!";
979 *FACE = $_[0];
980}
981
917=item load_tilecache 982=item load_tilecache
918 983
919(Re-)Load %TILE and %FACE. 984(Re-)Load %TILE and %FACE.
920 985
921=cut 986=cut
922 987
923sub load_tilecache() { 988sub load_tilecache() {
924 require Gtk2; 989 require Gtk2;
925 990
926 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 991 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
927 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
928 or die "$VARDIR/tilecache.png: $!";
929 *FACE = $_[0];
930 }, sub { 992 sub {
931 my $tile = read_pak "$LIB/crossfire.0";
932
933 my %cache; 993 my %cache;
994 my $facedata = Storable::retrieve "$LIB/facedata";
934 995
996 $facedata->{version} == 2
997 or die "$LIB/facedata: version mismatch, cannot proceed.";
998
999 my $faces = $facedata->{faceinfo};
935 my $idx = 0; 1000 my $idx = 0;
936 1001
937 for my $name (sort keys %$tile) { 1002 for (sort keys %$faces) {
1003 my ($face, $info) = ($_, $faces->{$_});
1004
938 my $pb = new Gtk2::Gdk::PixbufLoader; 1005 my $pb = new Gtk2::Gdk::PixbufLoader;
939 $pb->write ($tile->{$name}); 1006 $pb->write ($info->{data32});
940 $pb->close; 1007 $pb->close;
941 my $pb = $pb->get_pixbuf; 1008 my $pb = $pb->get_pixbuf;
942 1009
943 my $tile = $cache{$name} = { 1010 my $tile = $cache{$face} = {
944 pb => $pb, 1011 pb => $pb,
945 idx => $idx, 1012 idx => $idx,
946 w => int $pb->get_width / TILESIZE, 1013 w => int $pb->get_width / TILESIZE,
947 h => int $pb->get_height / TILESIZE, 1014 h => int $pb->get_height / TILESIZE,
948 }; 1015 };
949
950 1016
951 $idx += $tile->{w} * $tile->{h}; 1017 $idx += $tile->{w} * $tile->{h};
1018 }
1019
1020 construct_tilecache_pb $idx, \%cache;
1021
1022 \%cache
952 } 1023 };
953
954 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
955
956 while (my ($name, $tile) = each %cache) {
957 my $tpb = delete $tile->{pb};
958 my $ofs = $tile->{idx};
959
960 for my $x (0 .. $tile->{w} - 1) {
961 for my $y (0 .. $tile->{h} - 1) {
962 my $idx = $ofs + $x + $y * $tile->{w};
963 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
964 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
965 }
966 }
967 }
968
969 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
970
971 \%cache
972 };
973} 1024}
1025
1026=back
974 1027
975=head1 AUTHOR 1028=head1 AUTHOR
976 1029
977 Marc Lehmann <schmorp@schmorp.de> 1030 Marc Lehmann <schmorp@schmorp.de>
978 http://home.schmorp.de/ 1031 http://home.schmorp.de/
… …
981 http://www.ta-sa.org/ 1034 http://www.ta-sa.org/
982 1035
983=cut 1036=cut
984 1037
9851 10381
1039

Diff Legend

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