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.81 by root, Tue Feb 6 22:27:44 2007 UTC vs.
Revision 1.142 by root, Sat May 15 00:30:53 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.30';
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 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
… …
137sub MOVE_FLY_LOW (){ 0x02 } 139sub MOVE_FLY_LOW (){ 0x02 }
138sub MOVE_FLY_HIGH (){ 0x04 } 140sub MOVE_FLY_HIGH (){ 0x04 }
139sub MOVE_FLYING (){ 0x06 } 141sub MOVE_FLYING (){ 0x06 }
140sub MOVE_SWIM (){ 0x08 } 142sub MOVE_SWIM (){ 0x08 }
141sub MOVE_BOAT (){ 0x10 } 143sub MOVE_BOAT (){ 0x10 }
144sub MOVE_SHIP (){ 0x20 }
142sub MOVE_KNOWN (){ 0x1f } # all of above 145sub MOVE_KNOWN (){ 0x3f } # all of above
143sub MOVE_ALLBIT (){ 0x10000 }
144sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 146sub MOVE_ALL (){ 0x10000 } # very special value
147
148our %MOVE_TYPE = (
149 walk => MOVE_WALK,
150 fly_low => MOVE_FLY_LOW,
151 fly_high => MOVE_FLY_HIGH,
152 flying => MOVE_FLYING,
153 swim => MOVE_SWIM,
154 boat => MOVE_BOAT,
155 ship => MOVE_SHIP,
156 all => MOVE_ALL,
157);
158
159our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
160
161{
162 package Deliantra::MoveType;
163
164 use overload
165 '=' => sub { bless [@{$_[0]}], ref $_[0] },
166 '""' => \&as_string,
167 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
168 '<=' => sub {
169 ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
170 ? $_[0][1] & $MOVE_TYPE{$_[1]}
171 : undef
172 },
173 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
174 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
175 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
176 'x=' => sub { # toggle between off, + and -
177 my $cur = $_[0] >= $_[1];
178 if (!defined $cur) {
179 if ($_[0] >= "all") {
180 $_[0] -= $_[1];
181 } else {
182 $_[0] += $_[1];
183 }
184 } elsif ($cur) {
185 $_[0] -= $_[1];
186 } else {
187 $_[0] /= $_[1];
188 }
189
190 $_[0]
191 },
192 'eq' => sub { "$_[0]" eq "$_[1]" },
193 'ne' => sub { "$_[0]" ne "$_[1]" },
194 ;
195
196 sub TO_JSON {
197 $_[0][0]
198 }
199}
200
201sub Deliantra::MoveType::new {
202 my ($class, $string) = @_;
203
204 my $mask;
205 my $value;
206
207 if ($string =~ /^\s*\d+\s*$/) {
208 $mask = MOVE_ALL;
209 $value = $string+0;
210 } else {
211 for (split /\s+/, lc $string) {
212 if (s/^-//) {
213 $mask |= $MOVE_TYPE{$_};
214 $value &= ~$MOVE_TYPE{$_};
215 } else {
216 $mask |= $MOVE_TYPE{$_};
217 $value |= $MOVE_TYPE{$_};
218 }
219 }
220 }
221
222 (bless [$mask, $value], $class)->normalise
223}
224
225sub Deliantra::MoveType::normalise {
226 my ($self) = @_;
227
228 if ($self->[0] & MOVE_ALL) {
229 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
230 $self->[0] &= $mask;
231 $self->[1] &= $mask;
232 }
233
234 $self->[1] &= $self->[0];
235
236 $self
237}
238
239sub Deliantra::MoveType::as_string {
240 my ($self) = @_;
241
242 my @res;
243
244 my ($mask, $value) = @$self;
245
246 for (@Deliantra::MOVE_TYPE) {
247 my $bit = $Deliantra::MOVE_TYPE{$_};
248 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
249 $mask &= ~$bit;
250 push @res, $value & $bit ? $_ : "-$_";
251 }
252 }
253
254 join " ", @res
255}
145 256
146sub load_ref($) { 257sub load_ref($) {
147 my ($path) = @_; 258 my ($path) = @_;
148 259
149 open my $fh, "<:raw:perlio", $path 260 open my $fh, "<:raw:perlio", $path
… …
199 while (my ($k, $v) = each %attack_mask) { 310 while (my ($k, $v) = each %attack_mask) {
200 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v; 311 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
201 } 312 }
202} 313}
203 314
315my %MATERIAL = reverse
316 paper => 1,
317 iron => 2,
318 glass => 4,
319 leather => 8,
320 wood => 16,
321 organic => 32,
322 stone => 64,
323 cloth => 128,
324 adamant => 256,
325 liquid => 512,
326 tin => 1024,
327 bone => 2048,
328 ice => 4096,
329
330 # guesses
331 runestone => 12,
332 bronze => 18,
333 "ancient wood" => 20,
334 glass => 36,
335 marble => 66,
336 ice => 68,
337 stone => 70,
338 stone => 80,
339 cloth => 136,
340 ironwood => 144,
341 adamantium => 258,
342 glacium => 260,
343 blood => 544,
344;
345
204# object as in "Object xxx", i.e. archetypes 346# object as in "Object xxx", i.e. archetypes
205sub normalize_object($) { 347sub normalize_object($) {
206 my ($ob) = @_; 348 my ($ob) = @_;
207 349
350 delete $ob->{editable}; # deprecated
351
352 # convert material bitset to materialname, if possible
353 if (exists $ob->{material}) {
354 if (!$ob->{material}) {
355 delete $ob->{material};
356 } elsif (exists $ob->{materialname}) {
357 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
358 delete $ob->{material};
359 } else {
360 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
361 delete $ob->{material}; # assume materilname is more specific and nuke material
362 }
363 } elsif (my $name = $MATERIAL{$ob->{material}}) {
364 delete $ob->{material};
365 $ob->{materialname} = $name;
366 } else {
367 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
368 }
369 }
370
371 # check whether attachment is the same as in the archetype
372 if (exists $ob->{attach}) {
373 my $arch = $ARCH{$ob->{_name}};
374 my $js = JSON::XS->new->utf8->canonical (1);
375
376 if (defined $arch->{attach}
377 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
378 delete $ob->{attach}
379 }
380 }
381
382 # color_fg is used as default for magicmap if magicmap does not exist
383 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
384
208 # nuke outdated or never supported fields 385 # nuke outdated or never supported fields
209 delete @$ob{qw( 386 delete @$ob{qw(
210 can_knockback can_parry can_impale can_cut can_dam_armour 387 can_knockback can_parry can_impale can_cut can_dam_armour
211 can_apply pass_thru can_pass_thru 388 can_apply pass_thru can_pass_thru color_bg color_fg
212 )}; 389 )};
213 390
214 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 391 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
215 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 392 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
216 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 393 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
217 394
218 # convert movement strings to bitsets 395 # convert movement strings to bitsets
219 for my $attr (keys %FIELD_MOVEMENT) { 396 for my $attr (keys %FIELD_MOVEMENT) {
220 next unless exists $ob->{$attr}; 397 next unless exists $ob->{$attr};
221 398
222 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 399 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
223
224 next if $ob->{$attr} =~ /^\d+$/;
225
226 my $flags = 0;
227
228 # assume list
229 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
230 $flags |= MOVE_WALK if $flag eq "walk";
231 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
232 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
233 $flags |= MOVE_FLYING if $flag eq "flying";
234 $flags |= MOVE_SWIM if $flag eq "swim";
235 $flags |= MOVE_BOAT if $flag eq "boat";
236 $flags |= MOVE_ALL if $flag eq "all";
237
238 $flags &= ~MOVE_WALK if $flag eq "-walk";
239 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
240 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
241 $flags &= ~MOVE_FLYING if $flag eq "-flying";
242 $flags &= ~MOVE_SWIM if $flag eq "-swim";
243 $flags &= ~MOVE_BOAT if $flag eq "-boat";
244 $flags &= ~MOVE_ALL if $flag eq "-all";
245 }
246
247 $ob->{$attr} = $flags;
248 } 400 }
249 401
250 # convert outdated movement flags to new movement sets 402 # convert outdated movement flags to new movement sets
251 if (defined (my $v = delete $ob->{no_pass})) { 403 if (defined (my $v = delete $ob->{no_pass})) {
252 $ob->{move_block} = $v ? MOVE_ALL : 0; 404 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
253 } 405 }
254 if (defined (my $v = delete $ob->{slow_move})) { 406 if (defined (my $v = delete $ob->{slow_move})) {
255 $ob->{move_slow} |= MOVE_WALK; 407 $ob->{move_slow} += "walk";
256 $ob->{move_slow_penalty} = $v; 408 $ob->{move_slow_penalty} = $v;
257 } 409 }
258 if (defined (my $v = delete $ob->{walk_on})) { 410 if (defined (my $v = delete $ob->{walk_on})) {
259 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 411 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
260 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
261 : $ob->{move_on} & ~MOVE_WALK;
262 } 412 }
263 if (defined (my $v = delete $ob->{walk_off})) { 413 if (defined (my $v = delete $ob->{walk_off})) {
264 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 414 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
265 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
266 : $ob->{move_off} & ~MOVE_WALK;
267 } 415 }
268 if (defined (my $v = delete $ob->{fly_on})) { 416 if (defined (my $v = delete $ob->{fly_on})) {
269 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 417 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
270 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
271 : $ob->{move_on} & ~MOVE_FLY_LOW;
272 } 418 }
273 if (defined (my $v = delete $ob->{fly_off})) { 419 if (defined (my $v = delete $ob->{fly_off})) {
274 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 420 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
275 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
276 : $ob->{move_off} & ~MOVE_FLY_LOW;
277 } 421 }
278 if (defined (my $v = delete $ob->{flying})) { 422 if (defined (my $v = delete $ob->{flying})) {
279 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 423 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
280 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
281 : $ob->{move_type} & ~MOVE_FLY_LOW;
282 } 424 }
283 425
284 # convert idiotic event_xxx things into objects 426 # convert idiotic event_xxx things into objects
285 while (my ($event, $subtype) = each %EVENT_TYPE) { 427 while (my ($event, $subtype) = each %EVENT_TYPE) {
286 if (exists $ob->{"event_${event}_plugin"}) { 428 if (exists $ob->{"event_${event}_plugin"}) {
… …
302# arch as in "arch xxx", ie.. objects 444# arch as in "arch xxx", ie.. objects
303sub normalize_arch($) { 445sub normalize_arch($) {
304 my ($ob) = @_; 446 my ($ob) = @_;
305 447
306 normalize_object $ob; 448 normalize_object $ob;
449
450 return if $ob->{_atype} eq "object";
307 451
308 my $arch = $ARCH{$ob->{_name}} 452 my $arch = $ARCH{$ob->{_name}}
309 or (warn "$ob->{_name}: no such archetype", return $ob); 453 or (warn "$ob->{_name}: no such archetype", return $ob);
310 454
311 if ($arch->{type} == 22) { # map 455 if ($arch->{type} == 22) { # map
… …
347} 491}
348 492
349sub attr_thaw($) { 493sub attr_thaw($) {
350 my ($ob) = @_; 494 my ($ob) = @_;
351 495
352 $ob->{attach} = from_json $ob->{attach} 496 $ob->{attach} = decode_json $ob->{attach}
353 if exists $ob->{attach}; 497 if exists $ob->{attach};
354 498
355 $ob 499 $ob
356} 500}
357 501
358sub attr_freeze($) { 502sub attr_freeze($) {
359 my ($ob) = @_; 503 my ($ob) = @_;
360 504
361 $ob->{attach} = Crossfire::to_json $ob->{attach} 505 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
362 if exists $ob->{attach}; 506 if exists $ob->{attach};
363 507
364 $ob 508 $ob
365} 509}
366 510
… …
386 530
387 my %arc; 531 my %arc;
388 my ($more, $prev); 532 my ($more, $prev);
389 my $comment; 533 my $comment;
390 534
391 open my $fh, "<:raw:perlio:utf8", $path 535 open my $fh, "<:utf8", $path
392 or Carp::croak "$path: $!"; 536 or Carp::croak "$path: $!";
393 537
394# binmode $fh; 538# binmode $fh;
395 539
396 my $parse_block; $parse_block = sub { 540 my $parse_block; $parse_block = sub {
… …
496 my $str; 640 my $str;
497 641
498 my $append; $append = sub { 642 my $append; $append = sub {
499 my %a = %{$_[0]}; 643 my %a = %{$_[0]};
500 644
501 Crossfire::attr_freeze \%a; 645 Deliantra::attr_freeze \%a;
502 Crossfire::normalize_arch \%a; 646 Deliantra::normalize_arch \%a;
503 647
504 # undo the bit-split we did before 648 # undo the bit-split we did before
505 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 649 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
506 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 650 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
507 | (delete $a{attack_movement_bits_4_7}); 651 | (delete $a{attack_movement_bits_4_7});
… …
517 661
518 my $inv = delete $a{inventory}; 662 my $inv = delete $a{inventory};
519 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 663 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
520 my $anim = delete $a{anim}; 664 my $anim = delete $a{anim};
521 665
666 if ($a{_atype} eq 'object') {
667 $str .= join "\n", "anim", @$anim, "mina\n"
668 if $anim;
669 }
670
522 my @kv; 671 my @kv;
523 672
524 for ($a{_name} eq "map" 673 for ($a{_name} eq "map"
525 ? @Crossfire::FIELD_ORDER_MAP 674 ? @Deliantra::FIELD_ORDER_MAP
526 : @Crossfire::FIELD_ORDER) { 675 : @Deliantra::FIELD_ORDER) {
527 push @kv, [$_, delete $a{$_}] 676 push @kv, [$_, delete $a{$_}]
528 if exists $a{$_}; 677 if exists $a{$_};
529 } 678 }
530 679
531 for (sort keys %a) { 680 for (sort keys %a) {
… …
534 } 683 }
535 684
536 for (@kv) { 685 for (@kv) {
537 my ($k, $v) = @$_; 686 my ($k, $v) = @$_;
538 687
539 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 688 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
540 $v =~ s/\n$//; 689 $v =~ s/\n$//;
541 $str .= "$k\n$v\n$end\n"; 690 $str .= "$k\n$v\n$end\n";
542 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
543 if ($v & ~Crossfire::MOVE_ALL or !$v) {
544 $str .= "$k $v\n";
545
546 } elsif ($v & Crossfire::MOVE_ALLBIT) {
547 $str .= "$k all";
548
549 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
550 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
551 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
552 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
553 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
554
555 $str .= "\n";
556
557 } else {
558 $str .= $k;
559
560 $str .= " walk" if $v & Crossfire::MOVE_WALK;
561 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
562 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
563 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
564 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
565
566 $str .= "\n";
567 }
568 } else { 691 } else {
569 $str .= "$k $v\n"; 692 $str .= "$k $v\n";
570 } 693 }
571 } 694 }
572 695
573 if ($inv) { 696 if ($inv) {
574 $append->($_) for @$inv; 697 $append->($_) for @$inv;
575 }
576
577 if ($a{_atype} eq 'object') {
578 $str .= join "\n", "anim", @$anim, "mina\n"
579 if $anim;
580 } 698 }
581 699
582 $str .= "end\n"; 700 $str .= "end\n";
583 701
584 if ($a{_atype} eq 'object') { 702 if ($a{_atype} eq 'object') {
… …
671=cut 789=cut
672 790
673sub arch_attr($) { 791sub arch_attr($) {
674 my ($obj) = @_; 792 my ($obj) = @_;
675 793
676 require Crossfire::Data; 794 require Deliantra::Data;
677 795
678 my $root; 796 my $root;
679 my $attr = { }; 797 my $attr = { };
680 798
681 my $arch = $ARCH{ $obj->{_name} }; 799 my $arch = $ARCH{ $obj->{_name} };
682 my $type = $obj->{type} || $arch->{type}; 800 my $type = $obj->{type} || $arch->{type};
683 801
684 if ($type > 0) { 802 if ($type > 0) {
685 $root = $Crossfire::Data::ATTR{$type}; 803 $root = $Deliantra::Data::ATTR{$type};
686 } else { 804 } else {
687 my %a = (%$arch, %$obj); 805 my %a = (%$arch, %$obj);
688 806
689 if ($a{is_floor} && !$a{alive}) { 807 if ($a{is_floor} && !$a{alive}) {
690 $root = $Crossfire::Data::TYPE{Floor}; 808 $root = $Deliantra::Data::TYPE{Floor};
691 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 809 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
692 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 810 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
693 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 811 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
694 $root = $Crossfire::Data::TYPE{Wall}; 812 $root = $Deliantra::Data::TYPE{Wall};
695 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 813 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
696 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 814 $root = $Deliantra::Data::TYPE{"Weak Wall"};
697 } else { 815 } else {
698 $root = $Crossfire::Data::TYPE{Misc}; 816 $root = $Deliantra::Data::TYPE{Misc};
699 } 817 }
700 } 818 }
701 819
820 my (%ignore);
702 my @import = ($root); 821 my @import = ($root);
822
823 my @new_import;
824 while (my $type = shift @import) {
825 # first import everything we will need:
826 push @import,
827 grep $_,
828 map $Deliantra::Data::TYPE{$_},
829 @{$type->{import} || []};
830
831 # and compute the ignored attributes
832 for (@{$type->{ignore} || []}) {
833 $ignore{$_}++ for ref $_ ? @$_ : $_;
834 }
835
836 push @new_import, $type;
703 837 }
838 (@import) = @new_import;
839
840 # then add defaults to the back of the list, so they are added
841 # as last resort.
704 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 842 push @import, \%Deliantra::Data::DEFAULT_ATTR
705 unless $type == 116; 843 unless $type == 116;
706 844
707 my (%ignore);
708 my (@section_order, %section, @attr_order); 845 my (@section_order, %section, @attr_order);
709 846
847 # @import = root, imported, default
710 while (my $type = shift @import) { 848 while (my $type = pop @import) {
711 push @import, @{$type->{import} || []};
712
713 $attr->{$_} ||= $type->{$_} 849 $attr->{$_} ||= $type->{$_}
714 for qw(name desc use); 850 for qw(name desc use);
715
716 for (@{$type->{ignore} || []}) {
717 $ignore{$_}++ for ref $_ ? @$_ : $_;
718 }
719 851
720 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 852 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
721 my ($name, $attr) = @$_; 853 my ($name, $attr) = @$_;
722 push @section_order, $name; 854 push @section_order, $name;
723 for (@$attr) { 855 for (@$attr) {
724 my ($k, $v) = @$_; 856 my ($k, $v) = @$_;
725 push @attr_order, $k; 857 push @attr_order, $k;
726 $section{$name}{$k} ||= $v; 858 $section{$name}{$k} = $v; # overwrite, so that the root decides
727 }
728 } 859 }
860 }
861 }
862
863 # remove ignores for "root" type
864 for (
865 map @{$_->[1]}, # section attributes
866 [general => ($root->{attr} || [])],
867 @{$root->{section} || []}
868 ) {
869 my ($k, $v) = @$_;
870 # skip fixed attributes, if they are ignored thats fine
871 next if $v->{type} eq 'fixed';
872
873 delete $ignore{$k}; # if the attributes are defined explicitly they
874 # should NOT be ignored. ignore should mainly
875 # hit imported/inherited attributes.
729 } 876 }
730 877
731 $attr->{section} = [ 878 $attr->{section} = [
732 map !exists $section{$_} ? () : do { 879 map !exists $section{$_} ? () : do {
733 my $attr = delete $section{$_}; 880 my $attr = delete $section{$_};
… …
737 map exists $attr->{$_} && !$ignore{$_} 884 map exists $attr->{$_} && !$ignore{$_}
738 ? [$_ => delete $attr->{$_}] : (), 885 ? [$_ => delete $attr->{$_}] : (),
739 @attr_order 886 @attr_order
740 ] 887 ]
741 }, 888 },
742
743 exists $section{$_} ? [$_ => delete $section{$_}] : (), 889 exists $section{$_} ? [$_ => delete $section{$_}] : (),
744 @section_order 890 @section_order
745 ]; 891 ];
746 892
747 $attr 893 $attr
748}
749
750sub arch_edit_sections {
751# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
752# edit_type = 0;
753# else if (edit_type != 0) {
754# // all flags from 'check_type' must be unset in this arch because they get recalculated now
755# edit_type &= ~check_type;
756# }
757#
758# }
759# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
760# getAttributeValue("alive", defarch) == 1 &&
761# (getAttributeValue("monster", defarch) == 1 ||
762# getAttributeValue("generator", defarch) == 1)) {
763# // Monster: monsters/npcs/generators
764# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
765# }
766# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
767# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
768# // Walls
769# edit_type |= IGUIConstants.TILE_EDIT_WALL;
770# }
771# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
772# getAttributeValue("connected", defarch) != 0) {
773# // Connected Objects
774# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
775# }
776# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
777# arch_type == 66 || arch_type == 41 || arch_type == 95) {
778# // Exit: teleporter/exit/trapdoors
779# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
780# }
781# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
782# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
783# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
784# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
785# arch_type == 124 || arch_type == 130)) {
786# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
787# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
788# }
789# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
790# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
791# arch_type == 91 || arch_type == 21 || arch_type == 24) {
792# // Door: door/special door/gates + keys
793# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
794# }
795# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
796# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
797# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
798# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
799# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
800# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
801# arch_type == 122 || arch_type == 3)) {
802# // Equipment: weapons/armour/wands/rods
803# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
804# }
805#
806# return(edit_type);
807#
808#
809} 894}
810 895
811sub cache_file($$&&) { 896sub cache_file($$&&) {
812 my ($src, $cache, $load, $create) = @_; 897 my ($src, $cache, $load, $create) = @_;
813 898
… …
863 }, sub { 948 }, sub {
864 read_arch "$LIB/archetypes" 949 read_arch "$LIB/archetypes"
865 }; 950 };
866} 951}
867 952
953sub construct_tilecache_pb {
954 my ($idx, $cache) = @_;
955
956 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
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 % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
967 }
968 }
969 }
970
971 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
972
973 $cache
974}
975
976sub use_tilecache {
977 my ($face) = @_;
978 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
979 or die "$VARDIR/tilecache.png: $!";
980 *FACE = $_[0];
981}
982
868=item load_tilecache 983=item load_tilecache
869 984
870(Re-)Load %TILE and %FACE. 985(Re-)Load %TILE and %FACE.
871 986
872=cut 987=cut
873 988
874sub load_tilecache() { 989sub load_tilecache() {
875 require Gtk2; 990 require Gtk2;
876 991
877 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 992 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
878 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
879 or die "$VARDIR/tilecache.png: $!";
880 *FACE = $_[0];
881 }, sub { 993 sub {
882 my $tile = read_pak "$LIB/crossfire.0";
883
884 my %cache; 994 my %cache;
995 my $facedata = Storable::retrieve "$LIB/facedata";
885 996
997 $facedata->{version} == 2
998 or die "$LIB/facedata: version mismatch, cannot proceed.";
999
1000 my $faces = $facedata->{faceinfo};
886 my $idx = 0; 1001 my $idx = 0;
887 1002
888 for my $name (sort keys %$tile) { 1003 for (sort keys %$faces) {
1004 my ($face, $info) = ($_, $faces->{$_});
1005
889 my $pb = new Gtk2::Gdk::PixbufLoader; 1006 my $pb = new Gtk2::Gdk::PixbufLoader;
890 $pb->write ($tile->{$name}); 1007 $pb->write ($info->{data32});
891 $pb->close; 1008 $pb->close;
892 my $pb = $pb->get_pixbuf; 1009 my $pb = $pb->get_pixbuf;
893 1010
894 my $tile = $cache{$name} = { 1011 my $tile = $cache{$face} = {
895 pb => $pb, 1012 pb => $pb,
896 idx => $idx, 1013 idx => $idx,
897 w => int $pb->get_width / TILESIZE, 1014 w => int $pb->get_width / TILESIZE,
898 h => int $pb->get_height / TILESIZE, 1015 h => int $pb->get_height / TILESIZE,
899 }; 1016 };
900
901 1017
902 $idx += $tile->{w} * $tile->{h}; 1018 $idx += $tile->{w} * $tile->{h};
1019 }
1020
1021 construct_tilecache_pb $idx, \%cache;
1022
1023 \%cache
903 } 1024 };
904
905 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
906
907 while (my ($name, $tile) = each %cache) {
908 my $tpb = delete $tile->{pb};
909 my $ofs = $tile->{idx};
910
911 for my $x (0 .. $tile->{w} - 1) {
912 for my $y (0 .. $tile->{h} - 1) {
913 my $idx = $ofs + $x + $y * $tile->{w};
914 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
915 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
916 }
917 }
918 }
919
920 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
921
922 \%cache
923 };
924} 1025}
1026
1027=back
925 1028
926=head1 AUTHOR 1029=head1 AUTHOR
927 1030
928 Marc Lehmann <schmorp@schmorp.de> 1031 Marc Lehmann <schmorp@schmorp.de>
929 http://home.schmorp.de/ 1032 http://home.schmorp.de/
… …
932 http://www.ta-sa.org/ 1035 http://www.ta-sa.org/
933 1036
934=cut 1037=cut
935 1038
9361 10391
1040

Diff Legend

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