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.82 by root, Tue Feb 6 23:53:26 2007 UTC vs.
Revision 1.141 by root, Mon Mar 22 00:58:17 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 region
64 shopitems shopgreed shopmin shopmax shoprace 62 shopitems shopgreed shopmin shopmax shoprace
65 darkness width height enter_x enter_y msg maplore 63 darkness width height enter_x enter_y msg maplore
66 unique template 64 unique template
67 outdoor temp pressure humid windspeed winddir sky nosmooth 65 outdoor temp pressure humid windspeed winddir sky nosmooth
68 tile_path_1 tile_path_2 tile_path_3 tile_path_4 66 tile_path_1 tile_path_2 tile_path_3 tile_path_4
69)); 67));
70 68
71our @FIELD_ORDER = (qw( 69our @FIELD_ORDER = (qw(
70 inherit
71
72 elevation 72 elevation
73 73
74 name name_pl custom_name attach title race 74 name name_pl custom_name attach title race
75 slaying skill msg lore other_arch face 75 slaying skill msg lore other_arch
76 #todo-events 76 sound sound_destroy face animation is_animated
77 animation is_animated 77 magicmap smoothlevel smoothface
78 str dex con wis pow cha int 78 str dex con wis pow cha int
79 hp maxhp sp maxsp grace maxgrace 79 hp maxhp sp maxsp grace maxgrace
80 exp perm_exp expmul 80 exp perm_exp expmul
81 food dam luck wc ac x y speed speed_left move_state attack_movement 81 food dam luck wc ac x y speed speed_left move_state attack_movement
82 nrof level direction type subtype attacktype 82 nrof level direction type subtype attacktype
… …
90 resist_life_stealing resist_disease 90 resist_life_stealing resist_disease
91 91
92 path_attuned path_repelled path_denied material materialname 92 path_attuned path_repelled path_denied material materialname
93 value carrying weight invisible state magic 93 value carrying weight invisible state magic
94 last_heal last_sp last_grace last_eat 94 last_heal last_sp last_grace last_eat
95 connected glow_radius randomitems npx_status npc_program 95 connected glow_radius randomitems tresure_env npx_status npc_program
96 run_away pick_up container will_apply smoothlevel 96 run_away pick_up container will_apply smoothlevel
97 current_weapon_script weapontype tooltype elevation client_type 97 current_weapon_script weapontype tooltype elevation client_type
98 item_power duration range 98 item_power duration range
99 range_modifier duration_modifier dam_modifier gen_sp_armour 99 range_modifier duration_modifier dam_modifier gen_sp_armour
100 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty 100 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
… …
111 known_magical known_cursed can_use_skill been_applied has_ready_scroll 111 known_magical known_cursed can_use_skill been_applied has_ready_scroll
112 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly 112 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
113 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark 113 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
114 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage 114 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
115 activate_on_push activate_on_release is_water use_content_on_gen is_buildable 115 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
116 precious
116 117
117 body_range body_arm body_torso body_head body_neck body_skill 118 body_range body_arm body_torso body_head body_neck body_skill
118 body_finger body_shoulder body_foot body_hand body_wrist body_waist 119 body_finger body_shoulder body_foot body_hand body_wrist body_waist
119)); 120));
120 121
… …
137sub MOVE_FLY_LOW (){ 0x02 } 138sub MOVE_FLY_LOW (){ 0x02 }
138sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
139sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
140sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
141sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
143sub MOVE_SHIP (){ 0x20 }
142sub MOVE_KNOWN (){ 0x1f } # all of above 144sub MOVE_KNOWN (){ 0x3f } # all of above
143sub MOVE_ALLBIT (){ 0x10000 }
144sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 145sub MOVE_ALL (){ 0x10000 } # very special value
146
147our %MOVE_TYPE = (
148 walk => MOVE_WALK,
149 fly_low => MOVE_FLY_LOW,
150 fly_high => MOVE_FLY_HIGH,
151 flying => MOVE_FLYING,
152 swim => MOVE_SWIM,
153 boat => MOVE_BOAT,
154 ship => MOVE_SHIP,
155 all => MOVE_ALL,
156);
157
158our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
159
160{
161 package Deliantra::MoveType;
162
163 use overload
164 '=' => sub { bless [@{$_[0]}], ref $_[0] },
165 '""' => \&as_string,
166 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
167 '<=' => sub {
168 ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
169 ? $_[0][1] & $MOVE_TYPE{$_[1]}
170 : undef
171 },
172 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
173 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
174 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
175 'x=' => sub { # toggle between off, + and -
176 my $cur = $_[0] >= $_[1];
177 if (!defined $cur) {
178 if ($_[0] >= "all") {
179 $_[0] -= $_[1];
180 } else {
181 $_[0] += $_[1];
182 }
183 } elsif ($cur) {
184 $_[0] -= $_[1];
185 } else {
186 $_[0] /= $_[1];
187 }
188
189 $_[0]
190 },
191 'eq' => sub { "$_[0]" eq "$_[1]" },
192 'ne' => sub { "$_[0]" ne "$_[1]" },
193 ;
194
195 sub TO_JSON {
196 $_[0][0]
197 }
198}
199
200sub Deliantra::MoveType::new {
201 my ($class, $string) = @_;
202
203 my $mask;
204 my $value;
205
206 if ($string =~ /^\s*\d+\s*$/) {
207 $mask = MOVE_ALL;
208 $value = $string+0;
209 } else {
210 for (split /\s+/, lc $string) {
211 if (s/^-//) {
212 $mask |= $MOVE_TYPE{$_};
213 $value &= ~$MOVE_TYPE{$_};
214 } else {
215 $mask |= $MOVE_TYPE{$_};
216 $value |= $MOVE_TYPE{$_};
217 }
218 }
219 }
220
221 (bless [$mask, $value], $class)->normalise
222}
223
224sub Deliantra::MoveType::normalise {
225 my ($self) = @_;
226
227 if ($self->[0] & MOVE_ALL) {
228 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
229 $self->[0] &= $mask;
230 $self->[1] &= $mask;
231 }
232
233 $self->[1] &= $self->[0];
234
235 $self
236}
237
238sub Deliantra::MoveType::as_string {
239 my ($self) = @_;
240
241 my @res;
242
243 my ($mask, $value) = @$self;
244
245 for (@Deliantra::MOVE_TYPE) {
246 my $bit = $Deliantra::MOVE_TYPE{$_};
247 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
248 $mask &= ~$bit;
249 push @res, $value & $bit ? $_ : "-$_";
250 }
251 }
252
253 join " ", @res
254}
145 255
146sub load_ref($) { 256sub load_ref($) {
147 my ($path) = @_; 257 my ($path) = @_;
148 258
149 open my $fh, "<:raw:perlio", $path 259 open my $fh, "<:raw:perlio", $path
… …
213 adamant => 256, 323 adamant => 256,
214 liquid => 512, 324 liquid => 512,
215 tin => 1024, 325 tin => 1024,
216 bone => 2048, 326 bone => 2048,
217 ice => 4096, 327 ice => 4096,
328
329 # guesses
330 runestone => 12,
331 bronze => 18,
332 "ancient wood" => 20,
333 glass => 36,
334 marble => 66,
335 ice => 68,
336 stone => 70,
337 stone => 80,
338 cloth => 136,
339 ironwood => 144,
340 adamantium => 258,
341 glacium => 260,
342 blood => 544,
218; 343;
219 344
220# object as in "Object xxx", i.e. archetypes 345# object as in "Object xxx", i.e. archetypes
221sub normalize_object($) { 346sub normalize_object($) {
222 my ($ob) = @_; 347 my ($ob) = @_;
348
349 delete $ob->{editable}; # deprecated
223 350
224 # convert material bitset to materialname, if possible 351 # convert material bitset to materialname, if possible
225 if (exists $ob->{material}) { 352 if (exists $ob->{material}) {
226 if (!$ob->{material}) { 353 if (!$ob->{material}) {
227 delete $ob->{material}; 354 delete $ob->{material};
… …
230 delete $ob->{material}; 357 delete $ob->{material};
231 } else { 358 } else {
232 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n"; 359 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
233 delete $ob->{material}; # assume materilname is more specific and nuke material 360 delete $ob->{material}; # assume materilname is more specific and nuke material
234 } 361 }
362 } elsif (my $name = $MATERIAL{$ob->{material}}) {
363 delete $ob->{material};
364 $ob->{materialname} = $name;
235 } else { 365 } else {
236 if (my $name = $MATERIAL{$ob->{material}}) { 366 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
237 delete $ob->{material};
238 $ob->{materialname} = $name;
239 } 367 }
240 }
241 } 368 }
369
370 # check whether attachment is the same as in the archetype
371 if (exists $ob->{attach}) {
372 my $arch = $ARCH{$ob->{_name}};
373 my $js = JSON::XS->new->utf8->canonical (1);
374
375 if (defined $arch->{attach}
376 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
377 delete $ob->{attach}
378 }
379 }
380
381 # color_fg is used as default for magicmap if magicmap does not exist
382 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
242 383
243 # nuke outdated or never supported fields 384 # nuke outdated or never supported fields
244 delete @$ob{qw( 385 delete @$ob{qw(
245 can_knockback can_parry can_impale can_cut can_dam_armour 386 can_knockback can_parry can_impale can_cut can_dam_armour
246 can_apply pass_thru can_pass_thru 387 can_apply pass_thru can_pass_thru color_bg color_fg
247 )}; 388 )};
248 389
249 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 390 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
250 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 391 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
251 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 392 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
252 393
253 # convert movement strings to bitsets 394 # convert movement strings to bitsets
254 for my $attr (keys %FIELD_MOVEMENT) { 395 for my $attr (keys %FIELD_MOVEMENT) {
255 next unless exists $ob->{$attr}; 396 next unless exists $ob->{$attr};
256 397
257 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 398 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
258
259 next if $ob->{$attr} =~ /^\d+$/;
260
261 my $flags = 0;
262
263 # assume list
264 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
265 $flags |= MOVE_WALK if $flag eq "walk";
266 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
267 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
268 $flags |= MOVE_FLYING if $flag eq "flying";
269 $flags |= MOVE_SWIM if $flag eq "swim";
270 $flags |= MOVE_BOAT if $flag eq "boat";
271 $flags |= MOVE_ALL if $flag eq "all";
272
273 $flags &= ~MOVE_WALK if $flag eq "-walk";
274 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
275 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
276 $flags &= ~MOVE_FLYING if $flag eq "-flying";
277 $flags &= ~MOVE_SWIM if $flag eq "-swim";
278 $flags &= ~MOVE_BOAT if $flag eq "-boat";
279 $flags &= ~MOVE_ALL if $flag eq "-all";
280 }
281
282 $ob->{$attr} = $flags;
283 } 399 }
284 400
285 # convert outdated movement flags to new movement sets 401 # convert outdated movement flags to new movement sets
286 if (defined (my $v = delete $ob->{no_pass})) { 402 if (defined (my $v = delete $ob->{no_pass})) {
287 $ob->{move_block} = $v ? MOVE_ALL : 0; 403 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
288 } 404 }
289 if (defined (my $v = delete $ob->{slow_move})) { 405 if (defined (my $v = delete $ob->{slow_move})) {
290 $ob->{move_slow} |= MOVE_WALK; 406 $ob->{move_slow} += "walk";
291 $ob->{move_slow_penalty} = $v; 407 $ob->{move_slow_penalty} = $v;
292 } 408 }
293 if (defined (my $v = delete $ob->{walk_on})) { 409 if (defined (my $v = delete $ob->{walk_on})) {
294 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 410 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
295 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
296 : $ob->{move_on} & ~MOVE_WALK;
297 } 411 }
298 if (defined (my $v = delete $ob->{walk_off})) { 412 if (defined (my $v = delete $ob->{walk_off})) {
299 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 413 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
300 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
301 : $ob->{move_off} & ~MOVE_WALK;
302 } 414 }
303 if (defined (my $v = delete $ob->{fly_on})) { 415 if (defined (my $v = delete $ob->{fly_on})) {
304 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 416 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
305 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
306 : $ob->{move_on} & ~MOVE_FLY_LOW;
307 } 417 }
308 if (defined (my $v = delete $ob->{fly_off})) { 418 if (defined (my $v = delete $ob->{fly_off})) {
309 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 419 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
310 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
311 : $ob->{move_off} & ~MOVE_FLY_LOW;
312 } 420 }
313 if (defined (my $v = delete $ob->{flying})) { 421 if (defined (my $v = delete $ob->{flying})) {
314 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 422 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
315 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
316 : $ob->{move_type} & ~MOVE_FLY_LOW;
317 } 423 }
318 424
319 # convert idiotic event_xxx things into objects 425 # convert idiotic event_xxx things into objects
320 while (my ($event, $subtype) = each %EVENT_TYPE) { 426 while (my ($event, $subtype) = each %EVENT_TYPE) {
321 if (exists $ob->{"event_${event}_plugin"}) { 427 if (exists $ob->{"event_${event}_plugin"}) {
… …
337# arch as in "arch xxx", ie.. objects 443# arch as in "arch xxx", ie.. objects
338sub normalize_arch($) { 444sub normalize_arch($) {
339 my ($ob) = @_; 445 my ($ob) = @_;
340 446
341 normalize_object $ob; 447 normalize_object $ob;
448
449 return if $ob->{_atype} eq "object";
342 450
343 my $arch = $ARCH{$ob->{_name}} 451 my $arch = $ARCH{$ob->{_name}}
344 or (warn "$ob->{_name}: no such archetype", return $ob); 452 or (warn "$ob->{_name}: no such archetype", return $ob);
345 453
346 if ($arch->{type} == 22) { # map 454 if ($arch->{type} == 22) { # map
… …
382} 490}
383 491
384sub attr_thaw($) { 492sub attr_thaw($) {
385 my ($ob) = @_; 493 my ($ob) = @_;
386 494
387 $ob->{attach} = from_json $ob->{attach} 495 $ob->{attach} = decode_json $ob->{attach}
388 if exists $ob->{attach}; 496 if exists $ob->{attach};
389 497
390 $ob 498 $ob
391} 499}
392 500
393sub attr_freeze($) { 501sub attr_freeze($) {
394 my ($ob) = @_; 502 my ($ob) = @_;
395 503
396 $ob->{attach} = Crossfire::to_json $ob->{attach} 504 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
397 if exists $ob->{attach}; 505 if exists $ob->{attach};
398 506
399 $ob 507 $ob
400} 508}
401 509
… …
421 529
422 my %arc; 530 my %arc;
423 my ($more, $prev); 531 my ($more, $prev);
424 my $comment; 532 my $comment;
425 533
426 open my $fh, "<:raw:perlio:utf8", $path 534 open my $fh, "<:utf8", $path
427 or Carp::croak "$path: $!"; 535 or Carp::croak "$path: $!";
428 536
429# binmode $fh; 537# binmode $fh;
430 538
431 my $parse_block; $parse_block = sub { 539 my $parse_block; $parse_block = sub {
… …
531 my $str; 639 my $str;
532 640
533 my $append; $append = sub { 641 my $append; $append = sub {
534 my %a = %{$_[0]}; 642 my %a = %{$_[0]};
535 643
536 Crossfire::attr_freeze \%a; 644 Deliantra::attr_freeze \%a;
537 Crossfire::normalize_arch \%a; 645 Deliantra::normalize_arch \%a;
538 646
539 # undo the bit-split we did before 647 # undo the bit-split we did before
540 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 648 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
541 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 649 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
542 | (delete $a{attack_movement_bits_4_7}); 650 | (delete $a{attack_movement_bits_4_7});
… …
552 660
553 my $inv = delete $a{inventory}; 661 my $inv = delete $a{inventory};
554 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 662 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
555 my $anim = delete $a{anim}; 663 my $anim = delete $a{anim};
556 664
665 if ($a{_atype} eq 'object') {
666 $str .= join "\n", "anim", @$anim, "mina\n"
667 if $anim;
668 }
669
557 my @kv; 670 my @kv;
558 671
559 for ($a{_name} eq "map" 672 for ($a{_name} eq "map"
560 ? @Crossfire::FIELD_ORDER_MAP 673 ? @Deliantra::FIELD_ORDER_MAP
561 : @Crossfire::FIELD_ORDER) { 674 : @Deliantra::FIELD_ORDER) {
562 push @kv, [$_, delete $a{$_}] 675 push @kv, [$_, delete $a{$_}]
563 if exists $a{$_}; 676 if exists $a{$_};
564 } 677 }
565 678
566 for (sort keys %a) { 679 for (sort keys %a) {
… …
569 } 682 }
570 683
571 for (@kv) { 684 for (@kv) {
572 my ($k, $v) = @$_; 685 my ($k, $v) = @$_;
573 686
574 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 687 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
575 $v =~ s/\n$//; 688 $v =~ s/\n$//;
576 $str .= "$k\n$v\n$end\n"; 689 $str .= "$k\n$v\n$end\n";
577 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
578 if ($v & ~Crossfire::MOVE_ALL or !$v) {
579 $str .= "$k $v\n";
580
581 } elsif ($v & Crossfire::MOVE_ALLBIT) {
582 $str .= "$k all";
583
584 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
585 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
586 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
587 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
588 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
589
590 $str .= "\n";
591
592 } else {
593 $str .= $k;
594
595 $str .= " walk" if $v & Crossfire::MOVE_WALK;
596 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
597 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
598 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
599 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
600
601 $str .= "\n";
602 }
603 } else { 690 } else {
604 $str .= "$k $v\n"; 691 $str .= "$k $v\n";
605 } 692 }
606 } 693 }
607 694
608 if ($inv) { 695 if ($inv) {
609 $append->($_) for @$inv; 696 $append->($_) for @$inv;
610 }
611
612 if ($a{_atype} eq 'object') {
613 $str .= join "\n", "anim", @$anim, "mina\n"
614 if $anim;
615 } 697 }
616 698
617 $str .= "end\n"; 699 $str .= "end\n";
618 700
619 if ($a{_atype} eq 'object') { 701 if ($a{_atype} eq 'object') {
… …
706=cut 788=cut
707 789
708sub arch_attr($) { 790sub arch_attr($) {
709 my ($obj) = @_; 791 my ($obj) = @_;
710 792
711 require Crossfire::Data; 793 require Deliantra::Data;
712 794
713 my $root; 795 my $root;
714 my $attr = { }; 796 my $attr = { };
715 797
716 my $arch = $ARCH{ $obj->{_name} }; 798 my $arch = $ARCH{ $obj->{_name} };
717 my $type = $obj->{type} || $arch->{type}; 799 my $type = $obj->{type} || $arch->{type};
718 800
719 if ($type > 0) { 801 if ($type > 0) {
720 $root = $Crossfire::Data::ATTR{$type}; 802 $root = $Deliantra::Data::ATTR{$type};
721 } else { 803 } else {
722 my %a = (%$arch, %$obj); 804 my %a = (%$arch, %$obj);
723 805
724 if ($a{is_floor} && !$a{alive}) { 806 if ($a{is_floor} && !$a{alive}) {
725 $root = $Crossfire::Data::TYPE{Floor}; 807 $root = $Deliantra::Data::TYPE{Floor};
726 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 808 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
727 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 809 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
728 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 810 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
729 $root = $Crossfire::Data::TYPE{Wall}; 811 $root = $Deliantra::Data::TYPE{Wall};
730 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 812 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
731 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 813 $root = $Deliantra::Data::TYPE{"Weak Wall"};
732 } else { 814 } else {
733 $root = $Crossfire::Data::TYPE{Misc}; 815 $root = $Deliantra::Data::TYPE{Misc};
734 } 816 }
735 } 817 }
736 818
819 my (%ignore);
737 my @import = ($root); 820 my @import = ($root);
821
822 my @new_import;
823 while (my $type = shift @import) {
824 # first import everything we will need:
825 push @import,
826 grep $_,
827 map $Deliantra::Data::TYPE{$_},
828 @{$type->{import} || []};
829
830 # and compute the ignored attributes
831 for (@{$type->{ignore} || []}) {
832 $ignore{$_}++ for ref $_ ? @$_ : $_;
833 }
834
835 push @new_import, $type;
738 836 }
837 (@import) = @new_import;
838
839 # then add defaults to the back of the list, so they are added
840 # as last resort.
739 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 841 push @import, \%Deliantra::Data::DEFAULT_ATTR
740 unless $type == 116; 842 unless $type == 116;
741 843
742 my (%ignore);
743 my (@section_order, %section, @attr_order); 844 my (@section_order, %section, @attr_order);
744 845
846 # @import = root, imported, default
745 while (my $type = shift @import) { 847 while (my $type = pop @import) {
746 push @import, @{$type->{import} || []};
747
748 $attr->{$_} ||= $type->{$_} 848 $attr->{$_} ||= $type->{$_}
749 for qw(name desc use); 849 for qw(name desc use);
750
751 for (@{$type->{ignore} || []}) {
752 $ignore{$_}++ for ref $_ ? @$_ : $_;
753 }
754 850
755 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 851 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
756 my ($name, $attr) = @$_; 852 my ($name, $attr) = @$_;
757 push @section_order, $name; 853 push @section_order, $name;
758 for (@$attr) { 854 for (@$attr) {
759 my ($k, $v) = @$_; 855 my ($k, $v) = @$_;
760 push @attr_order, $k; 856 push @attr_order, $k;
761 $section{$name}{$k} ||= $v; 857 $section{$name}{$k} = $v; # overwrite, so that the root decides
762 }
763 } 858 }
859 }
860 }
861
862 # remove ignores for "root" type
863 for (
864 map @{$_->[1]}, # section attributes
865 [general => ($root->{attr} || [])],
866 @{$root->{section} || []}
867 ) {
868 my ($k, $v) = @$_;
869 # skip fixed attributes, if they are ignored thats fine
870 next if $v->{type} eq 'fixed';
871
872 delete $ignore{$k}; # if the attributes are defined explicitly they
873 # should NOT be ignored. ignore should mainly
874 # hit imported/inherited attributes.
764 } 875 }
765 876
766 $attr->{section} = [ 877 $attr->{section} = [
767 map !exists $section{$_} ? () : do { 878 map !exists $section{$_} ? () : do {
768 my $attr = delete $section{$_}; 879 my $attr = delete $section{$_};
… …
772 map exists $attr->{$_} && !$ignore{$_} 883 map exists $attr->{$_} && !$ignore{$_}
773 ? [$_ => delete $attr->{$_}] : (), 884 ? [$_ => delete $attr->{$_}] : (),
774 @attr_order 885 @attr_order
775 ] 886 ]
776 }, 887 },
777
778 exists $section{$_} ? [$_ => delete $section{$_}] : (), 888 exists $section{$_} ? [$_ => delete $section{$_}] : (),
779 @section_order 889 @section_order
780 ]; 890 ];
781 891
782 $attr 892 $attr
783}
784
785sub arch_edit_sections {
786# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
787# edit_type = 0;
788# else if (edit_type != 0) {
789# // all flags from 'check_type' must be unset in this arch because they get recalculated now
790# edit_type &= ~check_type;
791# }
792#
793# }
794# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
795# getAttributeValue("alive", defarch) == 1 &&
796# (getAttributeValue("monster", defarch) == 1 ||
797# getAttributeValue("generator", defarch) == 1)) {
798# // Monster: monsters/npcs/generators
799# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
800# }
801# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
802# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
803# // Walls
804# edit_type |= IGUIConstants.TILE_EDIT_WALL;
805# }
806# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
807# getAttributeValue("connected", defarch) != 0) {
808# // Connected Objects
809# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
810# }
811# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
812# arch_type == 66 || arch_type == 41 || arch_type == 95) {
813# // Exit: teleporter/exit/trapdoors
814# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
815# }
816# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
817# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
818# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
819# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
820# arch_type == 124 || arch_type == 130)) {
821# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
822# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
823# }
824# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
825# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
826# arch_type == 91 || arch_type == 21 || arch_type == 24) {
827# // Door: door/special door/gates + keys
828# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
829# }
830# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
831# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
832# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
833# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
834# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
835# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
836# arch_type == 122 || arch_type == 3)) {
837# // Equipment: weapons/armour/wands/rods
838# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
839# }
840#
841# return(edit_type);
842#
843#
844} 893}
845 894
846sub cache_file($$&&) { 895sub cache_file($$&&) {
847 my ($src, $cache, $load, $create) = @_; 896 my ($src, $cache, $load, $create) = @_;
848 897
… …
898 }, sub { 947 }, sub {
899 read_arch "$LIB/archetypes" 948 read_arch "$LIB/archetypes"
900 }; 949 };
901} 950}
902 951
952sub construct_tilecache_pb {
953 my ($idx, $cache) = @_;
954
955 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
956
957 while (my ($name, $tile) = each %$cache) {
958 my $tpb = delete $tile->{pb};
959 my $ofs = $tile->{idx};
960
961 for my $x (0 .. $tile->{w} - 1) {
962 for my $y (0 .. $tile->{h} - 1) {
963 my $idx = $ofs + $x + $y * $tile->{w};
964 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
965 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
966 }
967 }
968 }
969
970 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
971
972 $cache
973}
974
975sub use_tilecache {
976 my ($face) = @_;
977 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
978 or die "$VARDIR/tilecache.png: $!";
979 *FACE = $_[0];
980}
981
903=item load_tilecache 982=item load_tilecache
904 983
905(Re-)Load %TILE and %FACE. 984(Re-)Load %TILE and %FACE.
906 985
907=cut 986=cut
908 987
909sub load_tilecache() { 988sub load_tilecache() {
910 require Gtk2; 989 require Gtk2;
911 990
912 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 991 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
913 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
914 or die "$VARDIR/tilecache.png: $!";
915 *FACE = $_[0];
916 }, sub { 992 sub {
917 my $tile = read_pak "$LIB/crossfire.0";
918
919 my %cache; 993 my %cache;
994 my $facedata = Storable::retrieve "$LIB/facedata";
920 995
996 $facedata->{version} == 2
997 or die "$LIB/facedata: version mismatch, cannot proceed.";
998
999 my $faces = $facedata->{faceinfo};
921 my $idx = 0; 1000 my $idx = 0;
922 1001
923 for my $name (sort keys %$tile) { 1002 for (sort keys %$faces) {
1003 my ($face, $info) = ($_, $faces->{$_});
1004
924 my $pb = new Gtk2::Gdk::PixbufLoader; 1005 my $pb = new Gtk2::Gdk::PixbufLoader;
925 $pb->write ($tile->{$name}); 1006 $pb->write ($info->{data32});
926 $pb->close; 1007 $pb->close;
927 my $pb = $pb->get_pixbuf; 1008 my $pb = $pb->get_pixbuf;
928 1009
929 my $tile = $cache{$name} = { 1010 my $tile = $cache{$face} = {
930 pb => $pb, 1011 pb => $pb,
931 idx => $idx, 1012 idx => $idx,
932 w => int $pb->get_width / TILESIZE, 1013 w => int $pb->get_width / TILESIZE,
933 h => int $pb->get_height / TILESIZE, 1014 h => int $pb->get_height / TILESIZE,
934 }; 1015 };
935
936 1016
937 $idx += $tile->{w} * $tile->{h}; 1017 $idx += $tile->{w} * $tile->{h};
1018 }
1019
1020 construct_tilecache_pb $idx, \%cache;
1021
1022 \%cache
938 } 1023 };
939
940 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
941
942 while (my ($name, $tile) = each %cache) {
943 my $tpb = delete $tile->{pb};
944 my $ofs = $tile->{idx};
945
946 for my $x (0 .. $tile->{w} - 1) {
947 for my $y (0 .. $tile->{h} - 1) {
948 my $idx = $ofs + $x + $y * $tile->{w};
949 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
950 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
951 }
952 }
953 }
954
955 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
956
957 \%cache
958 };
959} 1024}
1025
1026=back
960 1027
961=head1 AUTHOR 1028=head1 AUTHOR
962 1029
963 Marc Lehmann <schmorp@schmorp.de> 1030 Marc Lehmann <schmorp@schmorp.de>
964 http://home.schmorp.de/ 1031 http://home.schmorp.de/
… …
967 http://www.ta-sa.org/ 1034 http://www.ta-sa.org/
968 1035
969=cut 1036=cut
970 1037
9711 10381
1039

Diff Legend

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