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.130 by root, Thu Jun 25 13:15:56 2009 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire - Crossfire maphandling 3Deliantra - Deliantra suppport module to read/write archetypes, maps etc.
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Deliantra;
8 8
9our $VERSION = '0.96'; 9our $VERSION = '1.23';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
16use File::Spec; 16use File::Spec;
17use List::Util qw(min max); 17use List::Util qw(min max);
18use Storable qw(freeze thaw); 18use Storable qw(freeze thaw);
19 19
20our @EXPORT = qw( 20our @EXPORT = qw(
21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents 21 read_pak read_arch
22 *ARCH $TILE *FACE *FACEDATA
23 TILESIZE CACHESTRIDE
24 editor_archs arch_extents
22); 25);
23 26
24use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working 27use JSON::XS qw(decode_json encode_json);
25 28
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}; 29our $LIB = $ENV{DELIANTRA_LIBDIR};
37 30
38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" 31our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 32 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
40 : File::Spec->tmpdir . "/crossfire"; 33 : File::Spec->tmpdir . "/deliantra";
41 34
42mkdir $VARDIR, 0777; 35mkdir $VARDIR, 0777;
43 36
44sub TILESIZE (){ 32 } 37sub TILESIZE (){ 32 }
38sub CACHESTRIDE (){ 64 }
45 39
46our %ARCH; 40our %ARCH;
41our %FACE; # face32
47our %FACE; 42our %FACEDATA;
48our $TILE; 43our $TILE;
49 44
50our %FIELD_MULTILINE = ( 45our %FIELD_MULTILINE = (
51 msg => "endmsg", 46 msg => "endmsg",
52 lore => "endlore", 47 lore => "endlore",
… …
58 qw(move_type move_block move_allow move_on move_off move_slow); 53 qw(move_type move_block move_allow move_on move_off move_slow);
59 54
60# same as in server save routine, to (hopefully) be compatible 55# same as in server save routine, to (hopefully) be compatible
61# to the other editors. 56# to the other editors.
62our @FIELD_ORDER_MAP = (qw( 57our @FIELD_ORDER_MAP = (qw(
58 file_format_version
63 name attach swap_time reset_timeout fixed_resettime difficulty region 59 name attach swap_time reset_timeout fixed_resettime difficulty region
64 shopitems shopgreed shopmin shopmax shoprace 60 shopitems shopgreed shopmin shopmax shoprace
65 darkness width height enter_x enter_y msg maplore 61 darkness width height enter_x enter_y msg maplore
66 unique template 62 unique template
67 outdoor temp pressure humid windspeed winddir sky nosmooth 63 outdoor temp pressure humid windspeed winddir sky nosmooth
68 tile_path_1 tile_path_2 tile_path_3 tile_path_4 64 tile_path_1 tile_path_2 tile_path_3 tile_path_4
69)); 65));
70 66
71our @FIELD_ORDER = (qw( 67our @FIELD_ORDER = (qw(
68 inherit
69
72 elevation 70 elevation
73 71
74 name name_pl custom_name attach title race 72 name name_pl custom_name attach title race
75 slaying skill msg lore other_arch face 73 slaying skill msg lore other_arch
76 #todo-events 74 sound sound_destroy face animation is_animated
77 animation is_animated 75 magicmap smoothlevel smoothface
78 str dex con wis pow cha int 76 str dex con wis pow cha int
79 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
80 exp perm_exp expmul 78 exp perm_exp expmul
81 food dam luck wc ac x y speed speed_left move_state attack_movement 79 food dam luck wc ac x y speed speed_left move_state attack_movement
82 nrof level direction type subtype attacktype 80 nrof level direction type subtype attacktype
… …
90 resist_life_stealing resist_disease 88 resist_life_stealing resist_disease
91 89
92 path_attuned path_repelled path_denied material materialname 90 path_attuned path_repelled path_denied material materialname
93 value carrying weight invisible state magic 91 value carrying weight invisible state magic
94 last_heal last_sp last_grace last_eat 92 last_heal last_sp last_grace last_eat
95 connected glow_radius randomitems npx_status npc_program 93 connected glow_radius randomitems tresure_env npx_status npc_program
96 run_away pick_up container will_apply smoothlevel 94 run_away pick_up container will_apply smoothlevel
97 current_weapon_script weapontype tooltype elevation client_type 95 current_weapon_script weapontype tooltype elevation client_type
98 item_power duration range 96 item_power duration range
99 range_modifier duration_modifier dam_modifier gen_sp_armour 97 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 98 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 109 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 110 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 111 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 112 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 113 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
114 precious
116 115
117 body_range body_arm body_torso body_head body_neck body_skill 116 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 117 body_finger body_shoulder body_foot body_hand body_wrist body_waist
119)); 118));
120 119
… …
137sub MOVE_FLY_LOW (){ 0x02 } 136sub MOVE_FLY_LOW (){ 0x02 }
138sub MOVE_FLY_HIGH (){ 0x04 } 137sub MOVE_FLY_HIGH (){ 0x04 }
139sub MOVE_FLYING (){ 0x06 } 138sub MOVE_FLYING (){ 0x06 }
140sub MOVE_SWIM (){ 0x08 } 139sub MOVE_SWIM (){ 0x08 }
141sub MOVE_BOAT (){ 0x10 } 140sub MOVE_BOAT (){ 0x10 }
141sub MOVE_SHIP (){ 0x20 }
142sub MOVE_KNOWN (){ 0x1f } # all of above 142sub MOVE_KNOWN (){ 0x3f } # all of above
143sub MOVE_ALLBIT (){ 0x10000 }
144sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 143sub MOVE_ALL (){ 0x10000 } # very special value
144
145our %MOVE_TYPE = (
146 walk => MOVE_WALK,
147 fly_low => MOVE_FLY_LOW,
148 fly_high => MOVE_FLY_HIGH,
149 flying => MOVE_FLYING,
150 swim => MOVE_SWIM,
151 boat => MOVE_BOAT,
152 ship => MOVE_SHIP,
153 all => MOVE_ALL,
154);
155
156our @MOVE_TYPE = keys %MOVE_TYPE;
157
158{
159 package Deliantra::MoveType;
160
161 use overload
162 '=' => sub { bless [@{$_[0]}], ref $_[0] },
163 '""' => \&as_string,
164 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
165 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
166 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
167 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
168 'x=' => sub {
169 my $cur = $_[0] >= $_[1];
170 if (!defined $cur) {
171 if ($_[0] >= "all") {
172 $_[0] -= $_[1];
173 } else {
174 $_[0] += $_[1];
175 }
176 } elsif ($cur) {
177 $_[0] -= $_[1];
178 } else {
179 $_[0] /= $_[1];
180 }
181
182 $_[0]
183 },
184 'eq' => sub { "$_[0]" eq "$_[1]" },
185 'ne' => sub { "$_[0]" ne "$_[1]" },
186 ;
187
188 sub TO_JSON {
189 $_[0][0]
190 }
191}
192
193sub Deliantra::MoveType::new {
194 my ($class, $string) = @_;
195
196 my $mask;
197 my $value;
198
199 if ($string =~ /^\s*\d+\s*$/) {
200 $mask = MOVE_ALL;
201 $value = $string+0;
202 } else {
203 for (split /\s+/, lc $string) {
204 if (s/^-//) {
205 $mask |= $MOVE_TYPE{$_};
206 $value &= ~$MOVE_TYPE{$_};
207 } else {
208 $mask |= $MOVE_TYPE{$_};
209 $value |= $MOVE_TYPE{$_};
210 }
211 }
212 }
213
214 (bless [$mask, $value], $class)->normalise
215}
216
217sub Deliantra::MoveType::normalise {
218 my ($self) = @_;
219
220 if ($self->[0] & MOVE_ALL) {
221 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
222 $self->[0] &= $mask;
223 $self->[1] &= $mask;
224 }
225
226 $self->[1] &= $self->[0];
227
228 $self
229}
230
231sub Deliantra::MoveType::as_string {
232 my ($self) = @_;
233
234 my @res;
235
236 my ($mask, $value) = @$self;
237
238 for (@Deliantra::MOVE_TYPE) {
239 my $bit = $Deliantra::MOVE_TYPE{$_};
240 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
241 $mask &= ~$bit;
242 push @res, $value & $bit ? $_ : "-$_";
243 }
244 }
245
246 join " ", @res
247}
145 248
146sub load_ref($) { 249sub load_ref($) {
147 my ($path) = @_; 250 my ($path) = @_;
148 251
149 open my $fh, "<:raw:perlio", $path 252 open my $fh, "<:raw:perlio", $path
… …
213 adamant => 256, 316 adamant => 256,
214 liquid => 512, 317 liquid => 512,
215 tin => 1024, 318 tin => 1024,
216 bone => 2048, 319 bone => 2048,
217 ice => 4096, 320 ice => 4096,
321
322 # guesses
323 runestone => 12,
324 bronze => 18,
325 "ancient wood" => 20,
326 glass => 36,
327 marble => 66,
328 ice => 68,
329 stone => 70,
330 stone => 80,
331 cloth => 136,
332 ironwood => 144,
333 adamantium => 258,
334 glacium => 260,
335 blood => 544,
218; 336;
219 337
220# object as in "Object xxx", i.e. archetypes 338# object as in "Object xxx", i.e. archetypes
221sub normalize_object($) { 339sub normalize_object($) {
222 my ($ob) = @_; 340 my ($ob) = @_;
… …
230 delete $ob->{material}; 348 delete $ob->{material};
231 } else { 349 } else {
232 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n"; 350 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 351 delete $ob->{material}; # assume materilname is more specific and nuke material
234 } 352 }
353 } elsif (my $name = $MATERIAL{$ob->{material}}) {
354 delete $ob->{material};
355 $ob->{materialname} = $name;
235 } else { 356 } else {
236 if (my $name = $MATERIAL{$ob->{material}}) { 357 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
237 delete $ob->{material};
238 $ob->{materialname} = $name;
239 } 358 }
240 }
241 } 359 }
360
361 # check whether attachment is the same as in the archetype
362 if (exists $ob->{attach}) {
363 my $arch = $ARCH{$ob->{_name}};
364 my $js = JSON::XS->new->utf8->canonical (1);
365
366 if (defined $arch->{attach}
367 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
368 delete $ob->{attach}
369 }
370 }
371
372 # color_fg is used as default for magicmap if magicmap does not exist
373 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
242 374
243 # nuke outdated or never supported fields 375 # nuke outdated or never supported fields
244 delete @$ob{qw( 376 delete @$ob{qw(
245 can_knockback can_parry can_impale can_cut can_dam_armour 377 can_knockback can_parry can_impale can_cut can_dam_armour
246 can_apply pass_thru can_pass_thru 378 can_apply pass_thru can_pass_thru color_bg color_fg
247 )}; 379 )};
248 380
249 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 381 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
250 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 382 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
251 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 383 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
252 384
253 # convert movement strings to bitsets 385 # convert movement strings to bitsets
254 for my $attr (keys %FIELD_MOVEMENT) { 386 for my $attr (keys %FIELD_MOVEMENT) {
255 next unless exists $ob->{$attr}; 387 next unless exists $ob->{$attr};
256 388
257 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 389 $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 } 390 }
284 391
285 # convert outdated movement flags to new movement sets 392 # convert outdated movement flags to new movement sets
286 if (defined (my $v = delete $ob->{no_pass})) { 393 if (defined (my $v = delete $ob->{no_pass})) {
287 $ob->{move_block} = $v ? MOVE_ALL : 0; 394 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
288 } 395 }
289 if (defined (my $v = delete $ob->{slow_move})) { 396 if (defined (my $v = delete $ob->{slow_move})) {
290 $ob->{move_slow} |= MOVE_WALK; 397 $ob->{move_slow} += "walk";
291 $ob->{move_slow_penalty} = $v; 398 $ob->{move_slow_penalty} = $v;
292 } 399 }
293 if (defined (my $v = delete $ob->{walk_on})) { 400 if (defined (my $v = delete $ob->{walk_on})) {
294 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 401 $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 } 402 }
298 if (defined (my $v = delete $ob->{walk_off})) { 403 if (defined (my $v = delete $ob->{walk_off})) {
299 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 404 $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 } 405 }
303 if (defined (my $v = delete $ob->{fly_on})) { 406 if (defined (my $v = delete $ob->{fly_on})) {
304 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 407 $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 } 408 }
308 if (defined (my $v = delete $ob->{fly_off})) { 409 if (defined (my $v = delete $ob->{fly_off})) {
309 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 410 $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 } 411 }
313 if (defined (my $v = delete $ob->{flying})) { 412 if (defined (my $v = delete $ob->{flying})) {
314 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 413 $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 } 414 }
318 415
319 # convert idiotic event_xxx things into objects 416 # convert idiotic event_xxx things into objects
320 while (my ($event, $subtype) = each %EVENT_TYPE) { 417 while (my ($event, $subtype) = each %EVENT_TYPE) {
321 if (exists $ob->{"event_${event}_plugin"}) { 418 if (exists $ob->{"event_${event}_plugin"}) {
… …
337# arch as in "arch xxx", ie.. objects 434# arch as in "arch xxx", ie.. objects
338sub normalize_arch($) { 435sub normalize_arch($) {
339 my ($ob) = @_; 436 my ($ob) = @_;
340 437
341 normalize_object $ob; 438 normalize_object $ob;
439
440 return if $ob->{_atype} eq "object";
342 441
343 my $arch = $ARCH{$ob->{_name}} 442 my $arch = $ARCH{$ob->{_name}}
344 or (warn "$ob->{_name}: no such archetype", return $ob); 443 or (warn "$ob->{_name}: no such archetype", return $ob);
345 444
346 if ($arch->{type} == 22) { # map 445 if ($arch->{type} == 22) { # map
… …
382} 481}
383 482
384sub attr_thaw($) { 483sub attr_thaw($) {
385 my ($ob) = @_; 484 my ($ob) = @_;
386 485
387 $ob->{attach} = from_json $ob->{attach} 486 $ob->{attach} = decode_json $ob->{attach}
388 if exists $ob->{attach}; 487 if exists $ob->{attach};
389 488
390 $ob 489 $ob
391} 490}
392 491
393sub attr_freeze($) { 492sub attr_freeze($) {
394 my ($ob) = @_; 493 my ($ob) = @_;
395 494
396 $ob->{attach} = Crossfire::to_json $ob->{attach} 495 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
397 if exists $ob->{attach}; 496 if exists $ob->{attach};
398 497
399 $ob 498 $ob
400} 499}
401 500
… …
421 520
422 my %arc; 521 my %arc;
423 my ($more, $prev); 522 my ($more, $prev);
424 my $comment; 523 my $comment;
425 524
426 open my $fh, "<:raw:perlio:utf8", $path 525 open my $fh, "<:utf8", $path
427 or Carp::croak "$path: $!"; 526 or Carp::croak "$path: $!";
428 527
429# binmode $fh; 528# binmode $fh;
430 529
431 my $parse_block; $parse_block = sub { 530 my $parse_block; $parse_block = sub {
… …
531 my $str; 630 my $str;
532 631
533 my $append; $append = sub { 632 my $append; $append = sub {
534 my %a = %{$_[0]}; 633 my %a = %{$_[0]};
535 634
536 Crossfire::attr_freeze \%a; 635 Deliantra::attr_freeze \%a;
537 Crossfire::normalize_arch \%a; 636 Deliantra::normalize_arch \%a;
538 637
539 # undo the bit-split we did before 638 # undo the bit-split we did before
540 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 639 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}) 640 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
542 | (delete $a{attack_movement_bits_4_7}); 641 | (delete $a{attack_movement_bits_4_7});
… …
552 651
553 my $inv = delete $a{inventory}; 652 my $inv = delete $a{inventory};
554 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 653 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
555 my $anim = delete $a{anim}; 654 my $anim = delete $a{anim};
556 655
656 if ($a{_atype} eq 'object') {
657 $str .= join "\n", "anim", @$anim, "mina\n"
658 if $anim;
659 }
660
557 my @kv; 661 my @kv;
558 662
559 for ($a{_name} eq "map" 663 for ($a{_name} eq "map"
560 ? @Crossfire::FIELD_ORDER_MAP 664 ? @Deliantra::FIELD_ORDER_MAP
561 : @Crossfire::FIELD_ORDER) { 665 : @Deliantra::FIELD_ORDER) {
562 push @kv, [$_, delete $a{$_}] 666 push @kv, [$_, delete $a{$_}]
563 if exists $a{$_}; 667 if exists $a{$_};
564 } 668 }
565 669
566 for (sort keys %a) { 670 for (sort keys %a) {
… …
569 } 673 }
570 674
571 for (@kv) { 675 for (@kv) {
572 my ($k, $v) = @$_; 676 my ($k, $v) = @$_;
573 677
574 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 678 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
575 $v =~ s/\n$//; 679 $v =~ s/\n$//;
576 $str .= "$k\n$v\n$end\n"; 680 $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 { 681 } else {
604 $str .= "$k $v\n"; 682 $str .= "$k $v\n";
605 } 683 }
606 } 684 }
607 685
608 if ($inv) { 686 if ($inv) {
609 $append->($_) for @$inv; 687 $append->($_) for @$inv;
610 }
611
612 if ($a{_atype} eq 'object') {
613 $str .= join "\n", "anim", @$anim, "mina\n"
614 if $anim;
615 } 688 }
616 689
617 $str .= "end\n"; 690 $str .= "end\n";
618 691
619 if ($a{_atype} eq 'object') { 692 if ($a{_atype} eq 'object') {
… …
706=cut 779=cut
707 780
708sub arch_attr($) { 781sub arch_attr($) {
709 my ($obj) = @_; 782 my ($obj) = @_;
710 783
711 require Crossfire::Data; 784 require Deliantra::Data;
712 785
713 my $root; 786 my $root;
714 my $attr = { }; 787 my $attr = { };
715 788
716 my $arch = $ARCH{ $obj->{_name} }; 789 my $arch = $ARCH{ $obj->{_name} };
717 my $type = $obj->{type} || $arch->{type}; 790 my $type = $obj->{type} || $arch->{type};
718 791
719 if ($type > 0) { 792 if ($type > 0) {
720 $root = $Crossfire::Data::ATTR{$type}; 793 $root = $Deliantra::Data::ATTR{$type};
721 } else { 794 } else {
722 my %a = (%$arch, %$obj); 795 my %a = (%$arch, %$obj);
723 796
724 if ($a{is_floor} && !$a{alive}) { 797 if ($a{is_floor} && !$a{alive}) {
725 $root = $Crossfire::Data::TYPE{Floor}; 798 $root = $Deliantra::Data::TYPE{Floor};
726 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 799 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
727 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 800 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
728 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 801 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
729 $root = $Crossfire::Data::TYPE{Wall}; 802 $root = $Deliantra::Data::TYPE{Wall};
730 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 803 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
731 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 804 $root = $Deliantra::Data::TYPE{"Weak Wall"};
732 } else { 805 } else {
733 $root = $Crossfire::Data::TYPE{Misc}; 806 $root = $Deliantra::Data::TYPE{Misc};
734 } 807 }
735 } 808 }
736 809
737 my @import = ($root); 810 my @import = ($root);
738 811
739 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 812 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
740 unless $type == 116; 813 unless $type == 116;
741 814
742 my (%ignore); 815 my (%ignore);
743 my (@section_order, %section, @attr_order); 816 my (@section_order, %section, @attr_order);
744 817
745 while (my $type = shift @import) { 818 while (my $type = shift @import) {
819 push @import,
820 grep $_,
821 map $Deliantra::Data::TYPE{$_},
746 push @import, @{$type->{import} || []}; 822 @{$type->{import} || []};
747 823
748 $attr->{$_} ||= $type->{$_} 824 $attr->{$_} ||= $type->{$_}
749 for qw(name desc use); 825 for qw(name desc use);
750 826
751 for (@{$type->{ignore} || []}) { 827 for (@{$type->{ignore} || []}) {
… …
780 ]; 856 ];
781 857
782 $attr 858 $attr
783} 859}
784 860
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}
845
846sub cache_file($$&&) { 861sub cache_file($$&&) {
847 my ($src, $cache, $load, $create) = @_; 862 my ($src, $cache, $load, $create) = @_;
848 863
849 my ($size, $mtime) = (stat $src)[7,9] 864 my ($size, $mtime) = (stat $src)[7,9]
850 or Carp::croak "$src: $!"; 865 or Carp::croak "$src: $!";
… …
898 }, sub { 913 }, sub {
899 read_arch "$LIB/archetypes" 914 read_arch "$LIB/archetypes"
900 }; 915 };
901} 916}
902 917
918sub construct_tilecache_pb {
919 my ($idx, $cache) = @_;
920
921 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
922
923 while (my ($name, $tile) = each %$cache) {
924 my $tpb = delete $tile->{pb};
925 my $ofs = $tile->{idx};
926
927 for my $x (0 .. $tile->{w} - 1) {
928 for my $y (0 .. $tile->{h} - 1) {
929 my $idx = $ofs + $x + $y * $tile->{w};
930 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
931 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
932 }
933 }
934 }
935
936 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
937
938 $cache
939}
940
941sub use_tilecache {
942 my ($face) = @_;
943 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
944 or die "$VARDIR/tilecache.png: $!";
945 *FACE = $_[0];
946}
947
903=item load_tilecache 948=item load_tilecache
904 949
905(Re-)Load %TILE and %FACE. 950(Re-)Load %TILE and %FACE.
906 951
907=cut 952=cut
908 953
909sub load_tilecache() { 954sub load_tilecache() {
910 require Gtk2; 955 require Gtk2;
911 956
912 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 957 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 { 958 sub {
917 my $tile = read_pak "$LIB/crossfire.0";
918
919 my %cache; 959 my %cache;
960 my $facedata = Storable::retrieve "$LIB/facedata";
920 961
962 $facedata->{version} == 2
963 or die "$LIB/facedata: version mismatch, cannot proceed.";
964
965 my $faces = $facedata->{faceinfo};
921 my $idx = 0; 966 my $idx = 0;
922 967
923 for my $name (sort keys %$tile) { 968 for (sort keys %$faces) {
969 my ($face, $info) = ($_, $faces->{$_});
970
924 my $pb = new Gtk2::Gdk::PixbufLoader; 971 my $pb = new Gtk2::Gdk::PixbufLoader;
925 $pb->write ($tile->{$name}); 972 $pb->write ($info->{data32});
926 $pb->close; 973 $pb->close;
927 my $pb = $pb->get_pixbuf; 974 my $pb = $pb->get_pixbuf;
928 975
929 my $tile = $cache{$name} = { 976 my $tile = $cache{$face} = {
930 pb => $pb, 977 pb => $pb,
931 idx => $idx, 978 idx => $idx,
932 w => int $pb->get_width / TILESIZE, 979 w => int $pb->get_width / TILESIZE,
933 h => int $pb->get_height / TILESIZE, 980 h => int $pb->get_height / TILESIZE,
934 }; 981 };
935
936 982
937 $idx += $tile->{w} * $tile->{h}; 983 $idx += $tile->{w} * $tile->{h};
984 }
985
986 construct_tilecache_pb $idx, \%cache;
987
988 \%cache
938 } 989 };
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} 990}
960 991
961=head1 AUTHOR 992=head1 AUTHOR
962 993
963 Marc Lehmann <schmorp@schmorp.de> 994 Marc Lehmann <schmorp@schmorp.de>
… …
967 http://www.ta-sa.org/ 998 http://www.ta-sa.org/
968 999
969=cut 1000=cut
970 1001
9711 10021
1003

Diff Legend

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