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.145 by root, Sun Nov 11 23:17:18 2012 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire - Crossfire maphandling 3Deliantra - Deliantra suppport module to read/write archetypes, maps etc.
4
5=over 4
4 6
5=cut 7=cut
6 8
7package Crossfire; 9package Deliantra;
8 10
9our $VERSION = '0.96'; 11our $VERSION = '1.31';
10 12
11use strict; 13use common::sense;
12 14
13use base 'Exporter'; 15use base 'Exporter';
14 16
15use Carp (); 17use Carp ();
16use File::Spec; 18use File::Spec;
17use List::Util qw(min max); 19use List::Util qw(min max);
18use Storable qw(freeze thaw); 20use Storable qw(freeze thaw);
19 21
20our @EXPORT = qw( 22our @EXPORT = qw(
21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents 23 read_pak read_arch
24 *ARCH $TILE *FACE *FACEDATA
25 TILESIZE CACHESTRIDE
26 editor_archs arch_extents
22); 27);
23 28
24use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working 29use JSON::XS qw(decode_json encode_json);
25 30
26sub from_json($) {
27 $JSON::Syck::ImplicitUnicode = 1;
28 JSON::Syck::Load $_[0]
29}
30
31sub to_json($) {
32 $JSON::Syck::ImplicitUnicode = 0;
33 JSON::Syck::Dump $_[0]
34}
35
36our $LIB = $ENV{CROSSFIRE_LIBDIR}; 31our $LIB = $ENV{DELIANTRA_LIBDIR};
37 32
38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" 33our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 34 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
40 : File::Spec->tmpdir . "/crossfire"; 35 : File::Spec->tmpdir . "/deliantra";
41 36
42mkdir $VARDIR, 0777; 37mkdir $VARDIR, 0777;
43 38
44sub TILESIZE (){ 32 } 39sub TILESIZE (){ 32 }
40sub CACHESTRIDE (){ 64 }
45 41
46our %ARCH; 42our %ARCH;
43our %FACE; # face32
47our %FACE; 44our %FACEDATA;
48our $TILE; 45our $TILE;
49 46
50our %FIELD_MULTILINE = ( 47our %FIELD_MULTILINE = (
51 msg => "endmsg", 48 msg => "endmsg",
52 lore => "endlore", 49 lore => "endlore",
… …
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
62 region music
64 shopitems shopgreed shopmin shopmax shoprace 63 shopitems shopgreed shopmin shopmax shoprace
65 darkness width height enter_x enter_y msg maplore 64 darkness width height enter_x enter_y msg maplore
66 unique template 65 unique template
67 outdoor temp pressure humid windspeed winddir sky nosmooth 66 outdoor temp pressure humid windspeed winddir sky nosmooth
68 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
69)); 68));
70 69
71our @FIELD_ORDER = (qw( 70our @FIELD_ORDER = (qw(
71 inherit
72
72 elevation 73 elevation
73 74
74 name name_pl custom_name attach title race 75 name name_pl custom_name attach title race
75 slaying skill msg lore other_arch face 76 slaying skill msg lore other_arch
76 #todo-events 77 sound sound_destroy face animation is_animated
77 animation is_animated 78 magicmap glyph smoothlevel smoothface
78 str dex con wis pow cha int 79 str dex con wis pow cha int
79 hp maxhp sp maxsp grace maxgrace 80 hp maxhp sp maxsp grace maxgrace
80 exp perm_exp expmul 81 exp perm_exp expmul
81 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
82 nrof level direction type subtype attacktype 83 nrof level direction type subtype attacktype
… …
90 resist_life_stealing resist_disease 91 resist_life_stealing resist_disease
91 92
92 path_attuned path_repelled path_denied material materialname 93 path_attuned path_repelled path_denied material materialname
93 value carrying weight invisible state magic 94 value carrying weight invisible state magic
94 last_heal last_sp last_grace last_eat 95 last_heal last_sp last_grace last_eat
95 connected glow_radius randomitems npx_status npc_program 96 connected glow_radius randomitems tresure_env npx_status npc_program
96 run_away pick_up container will_apply smoothlevel 97 run_away pick_up container will_apply smoothlevel
97 current_weapon_script weapontype tooltype elevation client_type 98 current_weapon_script weapontype tooltype elevation client_type
98 item_power duration range 99 item_power duration range
99 range_modifier duration_modifier dam_modifier gen_sp_armour 100 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 101 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 112 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 113 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 114 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 115 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 116 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
117 precious
116 118
117 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
118 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
119)); 121));
120 122
… …
131 trigger => 10, 133 trigger => 10,
132 close => 11, 134 close => 11,
133 timer => 12, 135 timer => 12,
134); 136);
135 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
136sub MOVE_WALK (){ 0x01 } 158sub MOVE_WALK (){ 0x01 }
137sub MOVE_FLY_LOW (){ 0x02 } 159sub MOVE_FLY_LOW (){ 0x02 }
138sub MOVE_FLY_HIGH (){ 0x04 } 160sub MOVE_FLY_HIGH (){ 0x04 }
139sub MOVE_FLYING (){ 0x06 } 161sub MOVE_FLYING (){ 0x06 }
140sub MOVE_SWIM (){ 0x08 } 162sub MOVE_SWIM (){ 0x08 }
141sub MOVE_BOAT (){ 0x10 } 163sub MOVE_BOAT (){ 0x10 }
164sub MOVE_SHIP (){ 0x20 }
142sub MOVE_KNOWN (){ 0x1f } # all of above 165sub MOVE_KNOWN (){ 0x3f } # all of above
143sub MOVE_ALLBIT (){ 0x10000 }
144sub 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}
145 276
146sub load_ref($) { 277sub load_ref($) {
147 my ($path) = @_; 278 my ($path) = @_;
148 279
149 open my $fh, "<:raw:perlio", $path 280 open my $fh, "<:raw:perlio", $path
… …
225 ice => 68, 356 ice => 68,
226 stone => 70, 357 stone => 70,
227 stone => 80, 358 stone => 80,
228 cloth => 136, 359 cloth => 136,
229 ironwood => 144, 360 ironwood => 144,
361 adamantium => 258,
230 glacium => 260, 362 glacium => 260,
231 blood => 544, 363 blood => 544,
232; 364;
233 365
234# object as in "Object xxx", i.e. archetypes 366# object as in "Object xxx", i.e. archetypes
235sub normalize_object($) { 367sub normalize_object($) {
236 my ($ob) = @_; 368 my ($ob) = @_;
369
370 delete $ob->{editable}; # deprecated
237 371
238 # convert material bitset to materialname, if possible 372 # convert material bitset to materialname, if possible
239 if (exists $ob->{material}) { 373 if (exists $ob->{material}) {
240 if (!$ob->{material}) { 374 if (!$ob->{material}) {
241 delete $ob->{material}; 375 delete $ob->{material};
… …
252 } else { 386 } else {
253 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 387 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
254 } 388 }
255 } 389 }
256 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
257 # nuke outdated or never supported fields 405 # nuke outdated or never supported fields
258 delete @$ob{qw( 406 delete @$ob{qw(
259 can_knockback can_parry can_impale can_cut can_dam_armour 407 can_knockback can_parry can_impale can_cut can_dam_armour
260 can_apply pass_thru can_pass_thru 408 can_apply pass_thru can_pass_thru color_bg color_fg
261 )}; 409 )};
262 410
263 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 411 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
264 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 412 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
265 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 413 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
266 414
267 # convert movement strings to bitsets 415 # convert movement strings to bitsets
268 for my $attr (keys %FIELD_MOVEMENT) { 416 for my $attr (keys %FIELD_MOVEMENT) {
269 next unless exists $ob->{$attr}; 417 next unless exists $ob->{$attr};
270 418
271 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 419 $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 } 420 }
298 421
299 # convert outdated movement flags to new movement sets 422 # convert outdated movement flags to new movement sets
300 if (defined (my $v = delete $ob->{no_pass})) { 423 if (defined (my $v = delete $ob->{no_pass})) {
301 $ob->{move_block} = $v ? MOVE_ALL : 0; 424 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
302 } 425 }
303 if (defined (my $v = delete $ob->{slow_move})) { 426 if (defined (my $v = delete $ob->{slow_move})) {
304 $ob->{move_slow} |= MOVE_WALK; 427 $ob->{move_slow} += "walk";
305 $ob->{move_slow_penalty} = $v; 428 $ob->{move_slow_penalty} = $v;
306 } 429 }
307 if (defined (my $v = delete $ob->{walk_on})) { 430 if (defined (my $v = delete $ob->{walk_on})) {
308 $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" }
309 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
310 : $ob->{move_on} & ~MOVE_WALK;
311 } 432 }
312 if (defined (my $v = delete $ob->{walk_off})) { 433 if (defined (my $v = delete $ob->{walk_off})) {
313 $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" }
314 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
315 : $ob->{move_off} & ~MOVE_WALK;
316 } 435 }
317 if (defined (my $v = delete $ob->{fly_on})) { 436 if (defined (my $v = delete $ob->{fly_on})) {
318 $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" }
319 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
320 : $ob->{move_on} & ~MOVE_FLY_LOW;
321 } 438 }
322 if (defined (my $v = delete $ob->{fly_off})) { 439 if (defined (my $v = delete $ob->{fly_off})) {
323 $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" }
324 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
325 : $ob->{move_off} & ~MOVE_FLY_LOW;
326 } 441 }
327 if (defined (my $v = delete $ob->{flying})) { 442 if (defined (my $v = delete $ob->{flying})) {
328 $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" }
329 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
330 : $ob->{move_type} & ~MOVE_FLY_LOW;
331 } 444 }
332 445
333 # convert idiotic event_xxx things into objects 446 # convert idiotic event_xxx things into objects
334 while (my ($event, $subtype) = each %EVENT_TYPE) { 447 while (my ($event, $subtype) = each %EVENT_TYPE) {
335 if (exists $ob->{"event_${event}_plugin"}) { 448 if (exists $ob->{"event_${event}_plugin"}) {
… …
351# arch as in "arch xxx", ie.. objects 464# arch as in "arch xxx", ie.. objects
352sub normalize_arch($) { 465sub normalize_arch($) {
353 my ($ob) = @_; 466 my ($ob) = @_;
354 467
355 normalize_object $ob; 468 normalize_object $ob;
469
470 return if $ob->{_atype} eq "object";
356 471
357 my $arch = $ARCH{$ob->{_name}} 472 my $arch = $ARCH{$ob->{_name}}
358 or (warn "$ob->{_name}: no such archetype", return $ob); 473 or (warn "$ob->{_name}: no such archetype", return $ob);
359 474
360 if ($arch->{type} == 22) { # map 475 if ($arch->{type} == 22) { # map
… …
396} 511}
397 512
398sub attr_thaw($) { 513sub attr_thaw($) {
399 my ($ob) = @_; 514 my ($ob) = @_;
400 515
401 $ob->{attach} = from_json $ob->{attach} 516 $ob->{attach} = decode_json $ob->{attach}
402 if exists $ob->{attach}; 517 if exists $ob->{attach};
403 518
404 $ob 519 $ob
405} 520}
406 521
407sub attr_freeze($) { 522sub attr_freeze($) {
408 my ($ob) = @_; 523 my ($ob) = @_;
409 524
410 $ob->{attach} = Crossfire::to_json $ob->{attach} 525 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
411 if exists $ob->{attach}; 526 if exists $ob->{attach};
412 527
413 $ob 528 $ob
414} 529}
415 530
… …
435 550
436 my %arc; 551 my %arc;
437 my ($more, $prev); 552 my ($more, $prev);
438 my $comment; 553 my $comment;
439 554
440 open my $fh, "<:raw:perlio:utf8", $path 555 open my $fh, "<:utf8", $path
441 or Carp::croak "$path: $!"; 556 or Carp::croak "$path: $!";
442 557
443# binmode $fh; 558# binmode $fh;
444 559
445 my $parse_block; $parse_block = sub { 560 my $parse_block; $parse_block = sub {
… …
545 my $str; 660 my $str;
546 661
547 my $append; $append = sub { 662 my $append; $append = sub {
548 my %a = %{$_[0]}; 663 my %a = %{$_[0]};
549 664
550 Crossfire::attr_freeze \%a; 665 Deliantra::attr_freeze \%a;
551 Crossfire::normalize_arch \%a; 666 Deliantra::normalize_arch \%a;
552 667
553 # undo the bit-split we did before 668 # undo the bit-split we did before
554 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}) {
555 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 670 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
556 | (delete $a{attack_movement_bits_4_7}); 671 | (delete $a{attack_movement_bits_4_7});
… …
566 681
567 my $inv = delete $a{inventory}; 682 my $inv = delete $a{inventory};
568 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
569 my $anim = delete $a{anim}; 684 my $anim = delete $a{anim};
570 685
686 if ($a{_atype} eq 'object') {
687 $str .= join "\n", "anim", @$anim, "mina\n"
688 if $anim;
689 }
690
571 my @kv; 691 my @kv;
572 692
573 for ($a{_name} eq "map" 693 for ($a{_name} eq "map"
574 ? @Crossfire::FIELD_ORDER_MAP 694 ? @Deliantra::FIELD_ORDER_MAP
575 : @Crossfire::FIELD_ORDER) { 695 : @Deliantra::FIELD_ORDER) {
576 push @kv, [$_, delete $a{$_}] 696 push @kv, [$_, delete $a{$_}]
577 if exists $a{$_}; 697 if exists $a{$_};
578 } 698 }
579 699
580 for (sort keys %a) { 700 for (sort keys %a) {
… …
583 } 703 }
584 704
585 for (@kv) { 705 for (@kv) {
586 my ($k, $v) = @$_; 706 my ($k, $v) = @$_;
587 707
588 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 708 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
589 $v =~ s/\n$//; 709 $v =~ s/\n$//;
590 $str .= "$k\n$v\n$end\n"; 710 $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 { 711 } else {
618 $str .= "$k $v\n"; 712 $str .= "$k $v\n";
619 } 713 }
620 } 714 }
621 715
622 if ($inv) { 716 if ($inv) {
623 $append->($_) for @$inv; 717 $append->($_) for @$inv;
624 }
625
626 if ($a{_atype} eq 'object') {
627 $str .= join "\n", "anim", @$anim, "mina\n"
628 if $anim;
629 } 718 }
630 719
631 $str .= "end\n"; 720 $str .= "end\n";
632 721
633 if ($a{_atype} eq 'object') { 722 if ($a{_atype} eq 'object') {
… …
720=cut 809=cut
721 810
722sub arch_attr($) { 811sub arch_attr($) {
723 my ($obj) = @_; 812 my ($obj) = @_;
724 813
725 require Crossfire::Data; 814 require Deliantra::Data;
726 815
727 my $root; 816 my $root;
728 my $attr = { }; 817 my $attr = { };
729 818
730 my $arch = $ARCH{ $obj->{_name} }; 819 my $arch = $ARCH{ $obj->{_name} };
731 my $type = $obj->{type} || $arch->{type}; 820 my $type = $obj->{type} || $arch->{type};
732 821
733 if ($type > 0) { 822 if ($type > 0) {
734 $root = $Crossfire::Data::ATTR{$type}; 823 $root = $Deliantra::Data::ATTR{$type};
735 } else { 824 } else {
736 my %a = (%$arch, %$obj); 825 my %a = (%$arch, %$obj);
737 826
738 if ($a{is_floor} && !$a{alive}) { 827 if ($a{is_floor} && !$a{alive}) {
739 $root = $Crossfire::Data::TYPE{Floor}; 828 $root = $Deliantra::Data::TYPE{Floor};
740 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 829 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
741 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 830 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
742 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 831 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
743 $root = $Crossfire::Data::TYPE{Wall}; 832 $root = $Deliantra::Data::TYPE{Wall};
744 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 833 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
745 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 834 $root = $Deliantra::Data::TYPE{"Weak Wall"};
746 } else { 835 } else {
747 $root = $Crossfire::Data::TYPE{Misc}; 836 $root = $Deliantra::Data::TYPE{Misc};
748 } 837 }
749 } 838 }
750 839
840 my (%ignore);
751 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;
752 857 }
858 (@import) = @new_import;
859
860 # then add defaults to the back of the list, so they are added
861 # as last resort.
753 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 862 push @import, \%Deliantra::Data::DEFAULT_ATTR
754 unless $type == 116; 863 unless $type == 116;
755 864
756 my (%ignore);
757 my (@section_order, %section, @attr_order); 865 my (@section_order, %section, @attr_order);
758 866
867 # @import = root, imported, default
759 while (my $type = shift @import) { 868 while (my $type = pop @import) {
760 push @import, @{$type->{import} || []};
761
762 $attr->{$_} ||= $type->{$_} 869 $attr->{$_} ||= $type->{$_}
763 for qw(name desc use); 870 for qw(name desc use);
764
765 for (@{$type->{ignore} || []}) {
766 $ignore{$_}++ for ref $_ ? @$_ : $_;
767 }
768 871
769 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 872 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
770 my ($name, $attr) = @$_; 873 my ($name, $attr) = @$_;
771 push @section_order, $name; 874 push @section_order, $name;
772 for (@$attr) { 875 for (@$attr) {
773 my ($k, $v) = @$_; 876 my ($k, $v) = @$_;
774 push @attr_order, $k; 877 push @attr_order, $k;
775 $section{$name}{$k} ||= $v; 878 $section{$name}{$k} = $v; # overwrite, so that the root decides
776 }
777 } 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.
778 } 896 }
779 897
780 $attr->{section} = [ 898 $attr->{section} = [
781 map !exists $section{$_} ? () : do { 899 map !exists $section{$_} ? () : do {
782 my $attr = delete $section{$_}; 900 my $attr = delete $section{$_};
… …
786 map exists $attr->{$_} && !$ignore{$_} 904 map exists $attr->{$_} && !$ignore{$_}
787 ? [$_ => delete $attr->{$_}] : (), 905 ? [$_ => delete $attr->{$_}] : (),
788 @attr_order 906 @attr_order
789 ] 907 ]
790 }, 908 },
791
792 exists $section{$_} ? [$_ => delete $section{$_}] : (), 909 exists $section{$_} ? [$_ => delete $section{$_}] : (),
793 @section_order 910 @section_order
794 ]; 911 ];
795 912
796 $attr 913 $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} 914}
859 915
860sub cache_file($$&&) { 916sub cache_file($$&&) {
861 my ($src, $cache, $load, $create) = @_; 917 my ($src, $cache, $load, $create) = @_;
862 918
… …
912 }, sub { 968 }, sub {
913 read_arch "$LIB/archetypes" 969 read_arch "$LIB/archetypes"
914 }; 970 };
915} 971}
916 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
917=item load_tilecache 1003=item load_tilecache
918 1004
919(Re-)Load %TILE and %FACE. 1005(Re-)Load %TILE and %FACE.
920 1006
921=cut 1007=cut
922 1008
923sub load_tilecache() { 1009sub load_tilecache() {
924 require Gtk2; 1010 require Gtk2;
925 1011
926 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 1012 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 { 1013 sub {
931 my $tile = read_pak "$LIB/crossfire.0";
932
933 my %cache; 1014 my %cache;
1015 my $facedata = Storable::retrieve "$LIB/faceinfo";
934 1016
1017 open my $fh, "<", "$LIB/facedata"
1018 or die "$LIB/facedata: $!";
1019
1020 $facedata->{version} == 2
1021 or die "$LIB/facedata: version mismatch, cannot proceed.";
1022
1023 my $faces = $facedata->{faceinfo};
935 my $idx = 0; 1024 my $idx = 0;
936 1025
937 for my $name (sort keys %$tile) { 1026 for (sort keys %$faces) {
1027 my ($face, $info) = ($_, $faces->{$_});
1028
938 my $pb = new Gtk2::Gdk::PixbufLoader; 1029 my $pb = new Gtk2::Gdk::PixbufLoader;
939 $pb->write ($tile->{$name});
940 $pb->close;
941 my $pb = $pb->get_pixbuf;
942 1030
943 my $tile = $cache{$name} = { 1031 if (exists $info->{data32}) {
944 pb => $pb, 1032 $pb->write ($info->{data32});
945 idx => $idx, 1033 } else {
946 w => int $pb->get_width / TILESIZE, 1034 sysseek $fh, $info->{fofs32}, 0;
947 h => int $pb->get_height / TILESIZE, 1035 sysread $fh, my $buf, $info->{size32};
948 }; 1036 $pb->write ($buf);
949
950
951 $idx += $tile->{w} * $tile->{h};
952 }
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 } 1037 }
1038 $pb->close;
1039 my $pb = $pb->get_pixbuf;
1040
1041 my $tile = $cache{$face} = {
1042 pb => $pb,
1043 idx => $idx,
1044 w => int $pb->get_width / TILESIZE,
1045 h => int $pb->get_height / TILESIZE,
966 } 1046 };
1047
1048 $idx += $tile->{w} * $tile->{h};
1049 }
1050
1051 construct_tilecache_pb $idx, \%cache;
1052
1053 \%cache
967 } 1054 };
968
969 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
970
971 \%cache
972 };
973} 1055}
1056
1057=back
974 1058
975=head1 AUTHOR 1059=head1 AUTHOR
976 1060
977 Marc Lehmann <schmorp@schmorp.de> 1061 Marc Lehmann <schmorp@schmorp.de>
978 http://home.schmorp.de/ 1062 http://home.schmorp.de/
… …
981 http://www.ta-sa.org/ 1065 http://www.ta-sa.org/
982 1066
983=cut 1067=cut
984 1068
9851 10691
1070

Diff Legend

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