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.86 by root, Wed Feb 7 00:56:06 2007 UTC vs.
Revision 1.144 by root, Sat Dec 31 03:46:50 2011 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_ALLBIT (){ 0x10000 }
145sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 166sub MOVE_ALL (){ 0x10000 } # very special value
167
168our %MOVE_TYPE = (
169 walk => MOVE_WALK,
170 fly_low => MOVE_FLY_LOW,
171 fly_high => MOVE_FLY_HIGH,
172 flying => MOVE_FLYING,
173 swim => MOVE_SWIM,
174 boat => MOVE_BOAT,
175 ship => MOVE_SHIP,
176 all => MOVE_ALL,
177);
178
179our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
180
181{
182 package Deliantra::MoveType;
183
184 use overload
185 '=' => sub { bless [@{$_[0]}], ref $_[0] },
186 '""' => \&as_string,
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 },
193 '+=' => 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 },
195 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
196 'x=' => sub { # toggle between off, + and -
197 my $cur = $_[0] >= $_[1];
198 if (!defined $cur) {
199 if ($_[0] >= "all") {
200 $_[0] -= $_[1];
201 } else {
202 $_[0] += $_[1];
203 }
204 } elsif ($cur) {
205 $_[0] -= $_[1];
206 } else {
207 $_[0] /= $_[1];
208 }
209
210 $_[0]
211 },
212 'eq' => sub { "$_[0]" eq "$_[1]" },
213 'ne' => sub { "$_[0]" ne "$_[1]" },
214 ;
215
216 sub TO_JSON {
217 $_[0][0]
218 }
219}
220
221sub Deliantra::MoveType::new {
222 my ($class, $string) = @_;
223
224 my $mask;
225 my $value;
226
227 if ($string =~ /^\s*\d+\s*$/) {
228 $mask = MOVE_ALL;
229 $value = $string+0;
230 } else {
231 for (split /\s+/, lc $string) {
232 if (s/^-//) {
233 $mask |= $MOVE_TYPE{$_};
234 $value &= ~$MOVE_TYPE{$_};
235 } else {
236 $mask |= $MOVE_TYPE{$_};
237 $value |= $MOVE_TYPE{$_};
238 }
239 }
240 }
241
242 (bless [$mask, $value], $class)->normalise
243}
244
245sub Deliantra::MoveType::normalise {
246 my ($self) = @_;
247
248 if ($self->[0] & MOVE_ALL) {
249 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
250 $self->[0] &= $mask;
251 $self->[1] &= $mask;
252 }
253
254 $self->[1] &= $self->[0];
255
256 $self
257}
258
259sub Deliantra::MoveType::as_string {
260 my ($self) = @_;
261
262 my @res;
263
264 my ($mask, $value) = @$self;
265
266 for (@Deliantra::MOVE_TYPE) {
267 my $bit = $Deliantra::MOVE_TYPE{$_};
268 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
269 $mask &= ~$bit;
270 push @res, $value & $bit ? $_ : "-$_";
271 }
272 }
273
274 join " ", @res
275}
146 276
147sub load_ref($) { 277sub load_ref($) {
148 my ($path) = @_; 278 my ($path) = @_;
149 279
150 open my $fh, "<:raw:perlio", $path 280 open my $fh, "<:raw:perlio", $path
… …
235 365
236# object as in "Object xxx", i.e. archetypes 366# object as in "Object xxx", i.e. archetypes
237sub normalize_object($) { 367sub normalize_object($) {
238 my ($ob) = @_; 368 my ($ob) = @_;
239 369
370 delete $ob->{editable}; # deprecated
371
240 # convert material bitset to materialname, if possible 372 # convert material bitset to materialname, if possible
241 if (exists $ob->{material}) { 373 if (exists $ob->{material}) {
242 if (!$ob->{material}) { 374 if (!$ob->{material}) {
243 delete $ob->{material}; 375 delete $ob->{material};
244 } elsif (exists $ob->{materialname}) { 376 } elsif (exists $ob->{materialname}) {
… …
254 } else { 386 } else {
255 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 387 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
256 } 388 }
257 } 389 }
258 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
259 # nuke outdated or never supported fields 405 # nuke outdated or never supported fields
260 delete @$ob{qw( 406 delete @$ob{qw(
261 can_knockback can_parry can_impale can_cut can_dam_armour 407 can_knockback can_parry can_impale can_cut can_dam_armour
262 can_apply pass_thru can_pass_thru 408 can_apply pass_thru can_pass_thru color_bg color_fg
263 )}; 409 )};
264 410
265 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 411 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
266 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 412 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
267 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 413 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
268 414
269 # convert movement strings to bitsets 415 # convert movement strings to bitsets
270 for my $attr (keys %FIELD_MOVEMENT) { 416 for my $attr (keys %FIELD_MOVEMENT) {
271 next unless exists $ob->{$attr}; 417 next unless exists $ob->{$attr};
272 418
273 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 419 $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 } 420 }
300 421
301 # convert outdated movement flags to new movement sets 422 # convert outdated movement flags to new movement sets
302 if (defined (my $v = delete $ob->{no_pass})) { 423 if (defined (my $v = delete $ob->{no_pass})) {
303 $ob->{move_block} = $v ? MOVE_ALL : 0; 424 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
304 } 425 }
305 if (defined (my $v = delete $ob->{slow_move})) { 426 if (defined (my $v = delete $ob->{slow_move})) {
306 $ob->{move_slow} |= MOVE_WALK; 427 $ob->{move_slow} += "walk";
307 $ob->{move_slow_penalty} = $v; 428 $ob->{move_slow_penalty} = $v;
308 } 429 }
309 if (defined (my $v = delete $ob->{walk_on})) { 430 if (defined (my $v = delete $ob->{walk_on})) {
310 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 431 $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 } 432 }
314 if (defined (my $v = delete $ob->{walk_off})) { 433 if (defined (my $v = delete $ob->{walk_off})) {
315 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 434 $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 } 435 }
319 if (defined (my $v = delete $ob->{fly_on})) { 436 if (defined (my $v = delete $ob->{fly_on})) {
320 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 437 $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 } 438 }
324 if (defined (my $v = delete $ob->{fly_off})) { 439 if (defined (my $v = delete $ob->{fly_off})) {
325 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 440 $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 } 441 }
329 if (defined (my $v = delete $ob->{flying})) { 442 if (defined (my $v = delete $ob->{flying})) {
330 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 443 $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 } 444 }
334 445
335 # convert idiotic event_xxx things into objects 446 # convert idiotic event_xxx things into objects
336 while (my ($event, $subtype) = each %EVENT_TYPE) { 447 while (my ($event, $subtype) = each %EVENT_TYPE) {
337 if (exists $ob->{"event_${event}_plugin"}) { 448 if (exists $ob->{"event_${event}_plugin"}) {
… …
353# arch as in "arch xxx", ie.. objects 464# arch as in "arch xxx", ie.. objects
354sub normalize_arch($) { 465sub normalize_arch($) {
355 my ($ob) = @_; 466 my ($ob) = @_;
356 467
357 normalize_object $ob; 468 normalize_object $ob;
469
470 return if $ob->{_atype} eq "object";
358 471
359 my $arch = $ARCH{$ob->{_name}} 472 my $arch = $ARCH{$ob->{_name}}
360 or (warn "$ob->{_name}: no such archetype", return $ob); 473 or (warn "$ob->{_name}: no such archetype", return $ob);
361 474
362 if ($arch->{type} == 22) { # map 475 if ($arch->{type} == 22) { # map
… …
398} 511}
399 512
400sub attr_thaw($) { 513sub attr_thaw($) {
401 my ($ob) = @_; 514 my ($ob) = @_;
402 515
403 $ob->{attach} = from_json $ob->{attach} 516 $ob->{attach} = decode_json $ob->{attach}
404 if exists $ob->{attach}; 517 if exists $ob->{attach};
405 518
406 $ob 519 $ob
407} 520}
408 521
409sub attr_freeze($) { 522sub attr_freeze($) {
410 my ($ob) = @_; 523 my ($ob) = @_;
411 524
412 $ob->{attach} = Crossfire::to_json $ob->{attach} 525 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
413 if exists $ob->{attach}; 526 if exists $ob->{attach};
414 527
415 $ob 528 $ob
416} 529}
417 530
… …
437 550
438 my %arc; 551 my %arc;
439 my ($more, $prev); 552 my ($more, $prev);
440 my $comment; 553 my $comment;
441 554
442 open my $fh, "<:raw:perlio:utf8", $path 555 open my $fh, "<:utf8", $path
443 or Carp::croak "$path: $!"; 556 or Carp::croak "$path: $!";
444 557
445# binmode $fh; 558# binmode $fh;
446 559
447 my $parse_block; $parse_block = sub { 560 my $parse_block; $parse_block = sub {
… …
547 my $str; 660 my $str;
548 661
549 my $append; $append = sub { 662 my $append; $append = sub {
550 my %a = %{$_[0]}; 663 my %a = %{$_[0]};
551 664
552 Crossfire::attr_freeze \%a; 665 Deliantra::attr_freeze \%a;
553 Crossfire::normalize_arch \%a; 666 Deliantra::normalize_arch \%a;
554 667
555 # undo the bit-split we did before 668 # undo the bit-split we did before
556 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}) {
557 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 670 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
558 | (delete $a{attack_movement_bits_4_7}); 671 | (delete $a{attack_movement_bits_4_7});
… …
568 681
569 my $inv = delete $a{inventory}; 682 my $inv = delete $a{inventory};
570 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 683 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
571 my $anim = delete $a{anim}; 684 my $anim = delete $a{anim};
572 685
686 if ($a{_atype} eq 'object') {
687 $str .= join "\n", "anim", @$anim, "mina\n"
688 if $anim;
689 }
690
573 my @kv; 691 my @kv;
574 692
575 for ($a{_name} eq "map" 693 for ($a{_name} eq "map"
576 ? @Crossfire::FIELD_ORDER_MAP 694 ? @Deliantra::FIELD_ORDER_MAP
577 : @Crossfire::FIELD_ORDER) { 695 : @Deliantra::FIELD_ORDER) {
578 push @kv, [$_, delete $a{$_}] 696 push @kv, [$_, delete $a{$_}]
579 if exists $a{$_}; 697 if exists $a{$_};
580 } 698 }
581 699
582 for (sort keys %a) { 700 for (sort keys %a) {
… …
585 } 703 }
586 704
587 for (@kv) { 705 for (@kv) {
588 my ($k, $v) = @$_; 706 my ($k, $v) = @$_;
589 707
590 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 708 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
591 $v =~ s/\n$//; 709 $v =~ s/\n$//;
592 $str .= "$k\n$v\n$end\n"; 710 $str .= "$k\n$v\n$end\n";
593 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
594 if ($v & ~Crossfire::MOVE_ALL or !$v) {
595 $str .= "$k $v\n";
596
597 } elsif ($v & Crossfire::MOVE_ALLBIT) {
598 $str .= "$k all";
599
600 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
601 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
602 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
603 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
604 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
605
606 $str .= "\n";
607
608 } else {
609 $str .= $k;
610
611 $str .= " walk" if $v & Crossfire::MOVE_WALK;
612 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
613 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
614 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
615 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
616
617 $str .= "\n";
618 }
619 } else { 711 } else {
620 $str .= "$k $v\n"; 712 $str .= "$k $v\n";
621 } 713 }
622 } 714 }
623 715
624 if ($inv) { 716 if ($inv) {
625 $append->($_) for @$inv; 717 $append->($_) for @$inv;
626 }
627
628 if ($a{_atype} eq 'object') {
629 $str .= join "\n", "anim", @$anim, "mina\n"
630 if $anim;
631 } 718 }
632 719
633 $str .= "end\n"; 720 $str .= "end\n";
634 721
635 if ($a{_atype} eq 'object') { 722 if ($a{_atype} eq 'object') {
… …
722=cut 809=cut
723 810
724sub arch_attr($) { 811sub arch_attr($) {
725 my ($obj) = @_; 812 my ($obj) = @_;
726 813
727 require Crossfire::Data; 814 require Deliantra::Data;
728 815
729 my $root; 816 my $root;
730 my $attr = { }; 817 my $attr = { };
731 818
732 my $arch = $ARCH{ $obj->{_name} }; 819 my $arch = $ARCH{ $obj->{_name} };
733 my $type = $obj->{type} || $arch->{type}; 820 my $type = $obj->{type} || $arch->{type};
734 821
735 if ($type > 0) { 822 if ($type > 0) {
736 $root = $Crossfire::Data::ATTR{$type}; 823 $root = $Deliantra::Data::ATTR{$type};
737 } else { 824 } else {
738 my %a = (%$arch, %$obj); 825 my %a = (%$arch, %$obj);
739 826
740 if ($a{is_floor} && !$a{alive}) { 827 if ($a{is_floor} && !$a{alive}) {
741 $root = $Crossfire::Data::TYPE{Floor}; 828 $root = $Deliantra::Data::TYPE{Floor};
742 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 829 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
743 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 830 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
744 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 831 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
745 $root = $Crossfire::Data::TYPE{Wall}; 832 $root = $Deliantra::Data::TYPE{Wall};
746 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 833 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
747 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 834 $root = $Deliantra::Data::TYPE{"Weak Wall"};
748 } else { 835 } else {
749 $root = $Crossfire::Data::TYPE{Misc}; 836 $root = $Deliantra::Data::TYPE{Misc};
750 } 837 }
751 } 838 }
752 839
840 my (%ignore);
753 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;
754 857 }
858 (@import) = @new_import;
859
860 # then add defaults to the back of the list, so they are added
861 # as last resort.
755 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 862 push @import, \%Deliantra::Data::DEFAULT_ATTR
756 unless $type == 116; 863 unless $type == 116;
757 864
758 my (%ignore);
759 my (@section_order, %section, @attr_order); 865 my (@section_order, %section, @attr_order);
760 866
867 # @import = root, imported, default
761 while (my $type = shift @import) { 868 while (my $type = pop @import) {
762 push @import, @{$type->{import} || []};
763
764 $attr->{$_} ||= $type->{$_} 869 $attr->{$_} ||= $type->{$_}
765 for qw(name desc use); 870 for qw(name desc use);
766
767 for (@{$type->{ignore} || []}) {
768 $ignore{$_}++ for ref $_ ? @$_ : $_;
769 }
770 871
771 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 872 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
772 my ($name, $attr) = @$_; 873 my ($name, $attr) = @$_;
773 push @section_order, $name; 874 push @section_order, $name;
774 for (@$attr) { 875 for (@$attr) {
775 my ($k, $v) = @$_; 876 my ($k, $v) = @$_;
776 push @attr_order, $k; 877 push @attr_order, $k;
777 $section{$name}{$k} ||= $v; 878 $section{$name}{$k} = $v; # overwrite, so that the root decides
778 }
779 } 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.
780 } 896 }
781 897
782 $attr->{section} = [ 898 $attr->{section} = [
783 map !exists $section{$_} ? () : do { 899 map !exists $section{$_} ? () : do {
784 my $attr = delete $section{$_}; 900 my $attr = delete $section{$_};
… …
788 map exists $attr->{$_} && !$ignore{$_} 904 map exists $attr->{$_} && !$ignore{$_}
789 ? [$_ => delete $attr->{$_}] : (), 905 ? [$_ => delete $attr->{$_}] : (),
790 @attr_order 906 @attr_order
791 ] 907 ]
792 }, 908 },
793
794 exists $section{$_} ? [$_ => delete $section{$_}] : (), 909 exists $section{$_} ? [$_ => delete $section{$_}] : (),
795 @section_order 910 @section_order
796 ]; 911 ];
797 912
798 $attr 913 $attr
799}
800
801sub arch_edit_sections {
802# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
803# edit_type = 0;
804# else if (edit_type != 0) {
805# // all flags from 'check_type' must be unset in this arch because they get recalculated now
806# edit_type &= ~check_type;
807# }
808#
809# }
810# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
811# getAttributeValue("alive", defarch) == 1 &&
812# (getAttributeValue("monster", defarch) == 1 ||
813# getAttributeValue("generator", defarch) == 1)) {
814# // Monster: monsters/npcs/generators
815# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
816# }
817# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
818# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
819# // Walls
820# edit_type |= IGUIConstants.TILE_EDIT_WALL;
821# }
822# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
823# getAttributeValue("connected", defarch) != 0) {
824# // Connected Objects
825# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
826# }
827# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
828# arch_type == 66 || arch_type == 41 || arch_type == 95) {
829# // Exit: teleporter/exit/trapdoors
830# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
831# }
832# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
833# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
834# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
835# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
836# arch_type == 124 || arch_type == 130)) {
837# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
838# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
839# }
840# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
841# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
842# arch_type == 91 || arch_type == 21 || arch_type == 24) {
843# // Door: door/special door/gates + keys
844# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
845# }
846# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
847# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
848# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
849# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
850# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
851# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
852# arch_type == 122 || arch_type == 3)) {
853# // Equipment: weapons/armour/wands/rods
854# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
855# }
856#
857# return(edit_type);
858#
859#
860} 914}
861 915
862sub cache_file($$&&) { 916sub cache_file($$&&) {
863 my ($src, $cache, $load, $create) = @_; 917 my ($src, $cache, $load, $create) = @_;
864 918
… …
914 }, sub { 968 }, sub {
915 read_arch "$LIB/archetypes" 969 read_arch "$LIB/archetypes"
916 }; 970 };
917} 971}
918 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
919=item load_tilecache 1003=item load_tilecache
920 1004
921(Re-)Load %TILE and %FACE. 1005(Re-)Load %TILE and %FACE.
922 1006
923=cut 1007=cut
924 1008
925sub load_tilecache() { 1009sub load_tilecache() {
926 require Gtk2; 1010 require Gtk2;
927 1011
928 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 1012 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
929 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
930 or die "$VARDIR/tilecache.png: $!";
931 *FACE = $_[0];
932 }, sub { 1013 sub {
933 my $tile = read_pak "$LIB/crossfire.0";
934
935 my %cache; 1014 my %cache;
1015 my $facedata = Storable::retrieve "$LIB/facedata";
936 1016
1017 $facedata->{version} == 2
1018 or die "$LIB/facedata: version mismatch, cannot proceed.";
1019
1020 my $faces = $facedata->{faceinfo};
937 my $idx = 0; 1021 my $idx = 0;
938 1022
939 for my $name (sort keys %$tile) { 1023 for (sort keys %$faces) {
1024 my ($face, $info) = ($_, $faces->{$_});
1025
940 my $pb = new Gtk2::Gdk::PixbufLoader; 1026 my $pb = new Gtk2::Gdk::PixbufLoader;
941 $pb->write ($tile->{$name}); 1027 $pb->write ($info->{data32});
942 $pb->close; 1028 $pb->close;
943 my $pb = $pb->get_pixbuf; 1029 my $pb = $pb->get_pixbuf;
944 1030
945 my $tile = $cache{$name} = { 1031 my $tile = $cache{$face} = {
946 pb => $pb, 1032 pb => $pb,
947 idx => $idx, 1033 idx => $idx,
948 w => int $pb->get_width / TILESIZE, 1034 w => int $pb->get_width / TILESIZE,
949 h => int $pb->get_height / TILESIZE, 1035 h => int $pb->get_height / TILESIZE,
950 }; 1036 };
951
952 1037
953 $idx += $tile->{w} * $tile->{h}; 1038 $idx += $tile->{w} * $tile->{h};
1039 }
1040
1041 construct_tilecache_pb $idx, \%cache;
1042
1043 \%cache
954 } 1044 };
955
956 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
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 % 64) * TILESIZE, TILESIZE * int $idx / 64);
967 }
968 }
969 }
970
971 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
972
973 \%cache
974 };
975} 1045}
1046
1047=back
976 1048
977=head1 AUTHOR 1049=head1 AUTHOR
978 1050
979 Marc Lehmann <schmorp@schmorp.de> 1051 Marc Lehmann <schmorp@schmorp.de>
980 http://home.schmorp.de/ 1052 http://home.schmorp.de/
… …
983 http://www.ta-sa.org/ 1055 http://www.ta-sa.org/
984 1056
985=cut 1057=cut
986 1058
9871 10591
1060

Diff Legend

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