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.53 by root, Wed Mar 22 03:32:09 2006 UTC vs.
Revision 1.73 by root, Tue Sep 12 02:18:06 2006 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.1'; 9our $VERSION = '0.9';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
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 *ARCH TILESIZE $TILE *FACE editor_archs arch_extents
22); 22);
23
24use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working
25
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}
23 35
24our $LIB = $ENV{CROSSFIRE_LIBDIR}; 36our $LIB = $ENV{CROSSFIRE_LIBDIR};
25 37
26our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; 38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire";
27 39
… …
37 msg => "endmsg", 49 msg => "endmsg",
38 lore => "endlore", 50 lore => "endlore",
39 maplore => "endmaplore", 51 maplore => "endmaplore",
40); 52);
41 53
42# not used yet, maybe alphabetical is ok 54# movement bit type, PITA
55our %FIELD_MOVEMENT = map +($_ => undef),
56 qw(move_type move_block move_allow move_on move_off move_slow);
57
58# same as in server save routine, to (hopefully) be compatible
59# to the other editors.
60our @FIELD_ORDER_MAP = (qw(
61 name attach swap_time reset_timeout fixed_resettime difficulty region
62 shopitems shopgreed shopmin shopmax shoprace
63 darkness width height enter_x enter_y msg maplore
64 unique template
65 outdoor temp pressure humid windspeed winddir sky nosmooth
66 tile_path_1 tile_path_2 tile_path_3 tile_path_4
67));
68
43our @FIELD_ORDER = (qw(name name_pl)); 69our @FIELD_ORDER = (qw(
70 elevation
71
72 name name_pl custom_name attach title race
73 slaying skill msg lore other_arch face
74 #todo-events
75 animation is_animated
76 str dex con wis pow cha int
77 hp maxhp sp maxsp grace maxgrace
78 exp perm_exp expmul
79 food dam luck wc ac x y speed speed_left move_state attack_movement
80 nrof level direction type subtype attacktype
81
82 resist_physical resist_magic resist_fire resist_electricity
83 resist_cold resist_confusion resist_acid resist_drain
84 resist_weaponmagic resist_ghosthit resist_poison resist_slow
85 resist_paralyze resist_turn_undead resist_fear resist_cancellation
86 resist_deplete resist_death resist_chaos resist_counterspell
87 resist_godpower resist_holyword resist_blind resist_internal
88 resist_life_stealing resist_disease
89
90 path_attuned path_repelled path_denied material materialname
91 value carrying weight invisible state magic
92 last_heal last_sp last_grace last_eat
93 connected glow_radius randomitems npx_status npc_program
94 run_away pick_up container will_apply smoothlevel
95 current_weapon_script weapontype tooltype elevation client_type
96 item_power duration range
97 range_modifier duration_modifier dam_modifier gen_sp_armour
98 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
99
100 alive wiz was_wiz applied unpaid can_use_shield no_pick is_animated monster
101 friendly generator is_thrown auto_apply treasure player sold see_invisible
102 can_roll overlay_floor is_turnable is_used_up identified reflecting changing
103 splitting hitback startequip blocksview undead scared unaggressive
104 reflect_missile reflect_spell no_magic no_fix_player is_lightable tear_down
105 run_away pick_up unique no_drop can_cast_spell can_use_scroll can_use_range
106 can_use_bow can_use_armour can_use_weapon can_use_ring has_ready_range
107 has_ready_bow xrays is_floor lifesave no_strength sleep stand_still
108 random_move only_attack confused stealth cursed damned see_anywhere
109 known_magical known_cursed can_use_skill been_applied has_ready_scroll
110 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
111 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
112 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
113 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
114
115 body_range body_arm body_torso body_head body_neck body_skill
116 body_finger body_shoulder body_foot body_hand body_wrist body_waist
117));
118
119our %EVENT_TYPE = (
120 apply => 1,
121 attack => 2,
122 death => 3,
123 drop => 4,
124 pickup => 5,
125 say => 6,
126 stop => 7,
127 time => 8,
128 throw => 9,
129 trigger => 10,
130 close => 11,
131 timer => 12,
132);
44 133
45sub MOVE_WALK (){ 0x01 } 134sub MOVE_WALK (){ 0x01 }
46sub MOVE_FLY_LOW (){ 0x02 } 135sub MOVE_FLY_LOW (){ 0x02 }
47sub MOVE_FLY_HIGH (){ 0x04 } 136sub MOVE_FLY_HIGH (){ 0x04 }
48sub MOVE_FLYING (){ 0x06 } 137sub MOVE_FLYING (){ 0x06 }
49sub MOVE_SWIM (){ 0x08 } 138sub MOVE_SWIM (){ 0x08 }
50sub MOVE_BOAT (){ 0x10 } 139sub MOVE_BOAT (){ 0x10 }
140sub MOVE_KNOWN (){ 0x1f } # all of above
51sub MOVE_ALL (){ 0xff } 141sub MOVE_ALLBIT (){ 0x10000 }
142sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
52 143
53sub load_ref($) { 144sub load_ref($) {
54 my ($path) = @_; 145 my ($path) = @_;
55 146
56 open my $fh, "<", $path 147 open my $fh, "<:raw:perlio", $path
57 or die "$path: $!"; 148 or die "$path: $!";
58 binmode $fh;
59 local $/; 149 local $/;
60 150
61 thaw <$fh> 151 thaw <$fh>
62} 152}
63 153
64sub save_ref($$) { 154sub save_ref($$) {
65 my ($ref, $path) = @_; 155 my ($ref, $path) = @_;
66 156
67 open my $fh, ">", "$path~" 157 open my $fh, ">:raw:perlio", "$path~"
68 or die "$path~: $!"; 158 or die "$path~: $!";
69 binmode $fh;
70 print $fh freeze $ref; 159 print $fh freeze $ref;
71 close $fh; 160 close $fh;
72 rename "$path~", $path 161 rename "$path~", $path
73 or die "$path: $!"; 162 or die "$path: $!";
74} 163}
75 164
165my %attack_mask = (
166 physical => 0x00000001,
167 magic => 0x00000002,
168 fire => 0x00000004,
169 electricity => 0x00000008,
170 cold => 0x00000010,
171 confusion => 0x00000020,
172 acid => 0x00000040,
173 drain => 0x00000080,
174 weaponmagic => 0x00000100,
175 ghosthit => 0x00000200,
176 poison => 0x00000400,
177 slow => 0x00000800,
178 paralyze => 0x00001000,
179 turn_undead => 0x00002000,
180 fear => 0x00004000,
181 cancellation => 0x00008000,
182 deplete => 0x00010000,
183 death => 0x00020000,
184 chaos => 0x00040000,
185 counterspell => 0x00080000,
186 godpower => 0x00100000,
187 holyword => 0x00200000,
188 blind => 0x00400000,
189 internal => 0x00800000,
190 life_stealing => 0x01000000,
191 disease => 0x02000000,
192);
193
194sub _add_resist($$$) {
195 my ($ob, $mask, $value) = @_;
196
197 while (my ($k, $v) = each %attack_mask) {
198 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
199 }
200}
201
202# object as in "Object xxx", i.e. archetypes
76sub normalize_object($) { 203sub normalize_object($) {
77 my ($ob) = @_; 204 my ($ob) = @_;
78 205
206 # nuke outdated or never supported fields
79 delete $ob->{$_} for qw( 207 delete @$ob{qw(
80 can_knockback can_parry can_impale can_cut can_dam_armour 208 can_knockback can_parry can_impale can_cut can_dam_armour
81 can_apply pass_thru can_pass_thru 209 can_apply pass_thru can_pass_thru
82 ); 210 )};
83 211
84 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 212 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
213 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
214 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
215
216 # convert movement strings to bitsets
217 for my $attr (keys %FIELD_MOVEMENT) {
85 next unless exists $ob->{$attr}; 218 next unless exists $ob->{$attr};
219
220 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
221
86 next if $ob->{$attr} =~ /^\d+$/; 222 next if $ob->{$attr} =~ /^\d+$/;
87 223
88 my $flags = 0; 224 my $flags = 0;
89 225
90 # assume list 226 # assume list
… …
107 } 243 }
108 244
109 $ob->{$attr} = $flags; 245 $ob->{$attr} = $flags;
110 } 246 }
111 247
248 # convert outdated movement flags to new movement sets
112 if (defined (my $v = delete $ob->{no_pass})) { 249 if (defined (my $v = delete $ob->{no_pass})) {
113 $ob->{move_block} = $v ? MOVE_ALL : 0; 250 $ob->{move_block} = $v ? MOVE_ALL : 0;
114 } 251 }
115 if (defined (my $v = delete $ob->{slow_move})) { 252 if (defined (my $v = delete $ob->{slow_move})) {
116 $ob->{move_slow} |= MOVE_WALK; 253 $ob->{move_slow} |= MOVE_WALK;
117 $ob->{move_slow_penalty} = $v; 254 $ob->{move_slow_penalty} = $v;
118 } 255 }
119 if (defined (my $v = delete $ob->{walk_on})) { 256 if (defined (my $v = delete $ob->{walk_on})) {
257 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
120 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 258 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
121 : $ob->{move_on} & ~MOVE_WALK; 259 : $ob->{move_on} & ~MOVE_WALK;
122 } 260 }
123 if (defined (my $v = delete $ob->{walk_off})) { 261 if (defined (my $v = delete $ob->{walk_off})) {
262 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
124 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 263 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
125 : $ob->{move_off} & ~MOVE_WALK; 264 : $ob->{move_off} & ~MOVE_WALK;
126 } 265 }
127 if (defined (my $v = delete $ob->{fly_on})) { 266 if (defined (my $v = delete $ob->{fly_on})) {
267 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
128 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 268 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
129 : $ob->{move_on} & ~MOVE_FLY_LOW; 269 : $ob->{move_on} & ~MOVE_FLY_LOW;
130 } 270 }
131 if (defined (my $v = delete $ob->{fly_off})) { 271 if (defined (my $v = delete $ob->{fly_off})) {
272 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
132 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 273 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
133 : $ob->{move_off} & ~MOVE_FLY_LOW; 274 : $ob->{move_off} & ~MOVE_FLY_LOW;
134 } 275 }
135 if (defined (my $v = delete $ob->{flying})) { 276 if (defined (my $v = delete $ob->{flying})) {
277 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type};
136 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 278 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
137 : $ob->{move_type} & ~MOVE_FLY_LOW; 279 : $ob->{move_type} & ~MOVE_FLY_LOW;
138 } 280 }
139 281
282 # convert idiotic event_xxx things into objects
283 while (my ($event, $subtype) = each %EVENT_TYPE) {
284 if (exists $ob->{"event_${event}_plugin"}) {
285 push @{$ob->{inventory}}, {
286 _name => "event_$event",
287 title => delete $ob->{"event_${event}_plugin"},
288 slaying => delete $ob->{"event_${event}"},
289 name => delete $ob->{"event_${event}_options"},
290 };
291 }
292 }
293
294 # some archetypes had "+3" instead of the canonical "3", so fix
295 $ob->{dam} *= 1 if exists $ob->{dam};
296
140 $ob 297 $ob
141} 298}
142 299
300# arch as in "arch xxx", ie.. objects
143sub normalize_arch($) { 301sub normalize_arch($) {
144 my ($ob) = @_; 302 my ($ob) = @_;
145 303
146 normalize_object $ob; 304 normalize_object $ob;
147 305
… …
174 delete $ob->{$k}; 332 delete $ob->{$k};
175 } 333 }
176 } 334 }
177 } 335 }
178 336
337 # a speciality for the editor
338 if (exists $ob->{attack_movement}) {
339 my $am = delete $ob->{attack_movement};
340 $ob->{attack_movement_bits_0_3} = $am & 15;
341 $ob->{attack_movement_bits_4_7} = $am & 240;
342 }
343
344 $ob
345}
346
347sub attr_thaw($) {
348 my ($ob) = @_;
349
350 $ob->{attach} = from_json $ob->{attach}
351 if exists $ob->{attach};
352
353 $ob
354}
355
356sub attr_freeze($) {
357 my ($ob) = @_;
358
359 $ob->{attach} = Crossfire::to_json $ob->{attach}
360 if exists $ob->{attach};
361
179 $ob 362 $ob
180} 363}
181 364
182sub read_pak($) { 365sub read_pak($) {
183 my ($path) = @_; 366 my ($path) = @_;
184 367
185 my %pak; 368 my %pak;
186 369
187 open my $fh, "<", $path 370 open my $fh, "<:raw:perlio", $path
188 or Carp::croak "$_[0]: $!"; 371 or Carp::croak "$_[0]: $!";
189 binmode $fh; 372 binmode $fh;
190 while (<$fh>) { 373 while (<$fh>) {
191 my ($type, $id, $len, $path) = split; 374 my ($type, $id, $len, $path) = split;
192 $path =~ s/.*\///; 375 $path =~ s/.*\///;
… …
194 } 377 }
195 378
196 \%pak 379 \%pak
197} 380}
198 381
199sub read_arch($) { 382sub read_arch($;$) {
200 my ($path) = @_; 383 my ($path, $toplevel) = @_;
201 384
202 my %arc; 385 my %arc;
203 my ($more, $prev); 386 my ($more, $prev);
204 387
205 open my $fh, "<", $path 388 open my $fh, "<:raw:perlio:utf8", $path
206 or Carp::croak "$path: $!"; 389 or Carp::croak "$path: $!";
207 390
208 binmode $fh; 391# binmode $fh;
209 392
210 my $parse_block; $parse_block = sub { 393 my $parse_block; $parse_block = sub {
211 my %arc = @_; 394 my %arc = @_;
212 395
213 while (<$fh>) { 396 while (<$fh>) {
214 s/\s+$//; 397 s/\s+$//;
215 if (/^end$/i) { 398 if (/^end$/i) {
216 last; 399 last;
217 } elsif (/^arch (\S+)$/) { 400 } elsif (/^arch (\S+)$/i) {
218 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 401 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
219 } elsif (/^lore$/) { 402 } elsif (/^lore$/i) {
220 while (<$fh>) { 403 while (<$fh>) {
221 last if /^endlore\s*$/i; 404 last if /^endlore\s*$/i;
222 $arc{lore} .= $_; 405 $arc{lore} .= $_;
223 } 406 }
224 } elsif (/^msg$/) { 407 } elsif (/^msg$/i) {
225 while (<$fh>) { 408 while (<$fh>) {
226 last if /^endmsg\s*$/i; 409 last if /^endmsg\s*$/i;
227 $arc{msg} .= $_; 410 $arc{msg} .= $_;
411 }
412 } elsif (/^anim$/i) {
413 while (<$fh>) {
414 last if /^mina\s*$/i;
415 chomp;
416 push @{ $arc{anim} }, $_;
228 } 417 }
229 } elsif (/^(\S+)\s*(.*)$/) { 418 } elsif (/^(\S+)\s*(.*)$/) {
230 $arc{lc $1} = $2; 419 $arc{lc $1} = $2;
231 } elsif (/^\s*($|#)/) { 420 } elsif (/^\s*($|#)/) {
232 # 421 #
… …
242 s/\s+$//; 431 s/\s+$//;
243 if (/^more$/i) { 432 if (/^more$/i) {
244 $more = $prev; 433 $more = $prev;
245 } elsif (/^object (\S+)$/i) { 434 } elsif (/^object (\S+)$/i) {
246 my $name = $1; 435 my $name = $1;
247 my $arc = normalize_object $parse_block->(_name => $name); 436 my $arc = attr_thaw normalize_object $parse_block->(_name => $name);
437 $arc->{_atype} = 'object';
248 438
249 if ($more) { 439 if ($more) {
250 $more->{more} = $arc; 440 $more->{more} = $arc;
251 } else { 441 } else {
252 $arc{$name} = $arc; 442 $arc{$name} = $arc;
253 } 443 }
254 $prev = $arc; 444 $prev = $arc;
255 $more = undef; 445 $more = undef;
256 } elsif (/^arch (\S+)$/i) { 446 } elsif (/^arch (\S+)$/i) {
447 my $name = $1;
257 push @{ $arc{arch} }, normalize_arch $parse_block->(_name => $1); 448 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name);
449 $arc->{_atype} = 'arch';
450
451 if ($more) {
452 $more->{more} = $arc;
453 } else {
454 push @{ $arc{arch} }, $arc;
455 }
456 $prev = $arc;
457 $more = undef;
458 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
459 if ($1 eq "lev_array") {
460 while (<$fh>) {
461 last if /^endplst\s*$/;
462 push @{$toplevel->{lev_array}}, $_+0;
463 }
464 } else {
465 $toplevel->{$1} = $2;
466 }
258 } elsif (/^\s*($|#)/) { 467 } elsif (/^\s*($|#)/) {
259 # 468 #
260 } else { 469 } else {
261 warn "$path: unparseable top-level line '$_'"; 470 die "$path: unparseable top-level line '$_'";
262 } 471 }
263 } 472 }
264 473
265 undef $parse_block; # work around bug in perl not freeing $fh etc. 474 undef $parse_block; # work around bug in perl not freeing $fh etc.
266 475
267 \%arc 476 \%arc
477}
478
479sub archlist_to_string {
480 my ($arch) = @_;
481
482 my $str;
483
484 my $append; $append = sub {
485 my %a = %{$_[0]};
486
487 Crossfire::attr_freeze \%a;
488 Crossfire::normalize_arch \%a;
489
490 # undo the bit-split we did before
491 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
492 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
493 | (delete $a{attack_movement_bits_4_7});
494 }
495
496 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
497
498 my $inv = delete $a{inventory};
499 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
500 my $anim = delete $a{anim};
501
502 my @kv;
503
504 for ($a{_name} eq "map"
505 ? @Crossfire::FIELD_ORDER_MAP
506 : @Crossfire::FIELD_ORDER) {
507 push @kv, [$_, delete $a{$_}]
508 if exists $a{$_};
509 }
510
511 for (sort keys %a) {
512 next if /^_/; # ignore our _-keys
513 push @kv, [$_, delete $a{$_}];
514 }
515
516 for (@kv) {
517 my ($k, $v) = @$_;
518
519 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
520 $v =~ s/\n$//;
521 $str .= "$k\n$v\n$end\n";
522 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
523 if ($v & ~Crossfire::MOVE_ALL or !$v) {
524 $str .= "$k $v\n";
525
526 } elsif ($v & Crossfire::MOVE_ALLBIT) {
527 $str .= "$k all";
528
529 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
530 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
531 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
532 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
533 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
534
535 $str .= "\n";
536
537 } else {
538 $str .= $k;
539
540 $str .= " walk" if $v & Crossfire::MOVE_WALK;
541 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
542 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
543 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
544 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
545
546 $str .= "\n";
547 }
548 } else {
549 $str .= "$k $v\n";
550 }
551 }
552
553 if ($inv) {
554 $append->($_) for @$inv;
555 }
556
557 if ($a{_atype} eq 'object') {
558 $str .= join "\n", "anim", @$anim, "mina\n"
559 if $anim;
560 }
561
562 $str .= "end\n";
563
564 if (($a{_atype} eq 'object') && $more) {
565 $str .= "\nmore\n";
566 $append->($more) if $more;
567 }
568 };
569
570 for (@$arch) {
571 $append->($_);
572 }
573
574 $str
268} 575}
269 576
270# put all archs into a hash with editor_face as it's key 577# put all archs into a hash with editor_face as it's key
271# NOTE: the arrays in the hash values are references to 578# NOTE: the arrays in the hash values are references to
272# the archs from $ARCH 579# the archs from $ARCH
273sub editor_archs { 580sub editor_archs {
274 my %paths; 581 my %paths;
275 582
276 for (keys %ARCH) { 583 for (keys %ARCH) {
277 my $arch = $ARCH{$_}; 584 my $arch = $ARCH{$_};
278 push @{$paths{$arch->{editor_folder}}}, \$arch; 585 push @{$paths{$arch->{editor_folder}}}, $arch;
279 } 586 }
280 587
281 \%paths 588 \%paths
282} 589}
283 590
… …
348 my $type = $obj->{type} || $arch->{type}; 655 my $type = $obj->{type} || $arch->{type};
349 656
350 if ($type > 0) { 657 if ($type > 0) {
351 $root = $Crossfire::Data::ATTR{$type}; 658 $root = $Crossfire::Data::ATTR{$type};
352 } else { 659 } else {
660 my %a = (%$arch, %$obj);
661
662 if ($a{is_floor} && !$a{alive}) {
663 $root = $Crossfire::Data::TYPE{Floor};
664 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
665 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
666 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
667 $root = $Crossfire::Data::TYPE{Wall};
668 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
669 $root = $Crossfire::Data::TYPE{"Weak Wall"};
670 } else {
353 $root = $Crossfire::Data::TYPE{Misc}; 671 $root = $Crossfire::Data::TYPE{Misc};
354
355 type:
356 for (@Crossfire::Data::ATTR0) {
357 my $req = $_->{required}
358 or die "internal error: ATTR0 without 'required'";
359
360 keys %$req;
361 while (my ($k, $v) = each %$req) {
362 next type
363 unless $obj->{$k} == $v || $arch->{$k} == $v;
364 }
365
366 $root = $_;
367 } 672 }
368 } 673 }
369 674
370 my @import = ($root); 675 my @import = ($root);
371 676
… …
545 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 850 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
546 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 851 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
547 or die "$VARDIR/tilecache.png: $!"; 852 or die "$VARDIR/tilecache.png: $!";
548 *FACE = $_[0]; 853 *FACE = $_[0];
549 }, sub { 854 }, sub {
550 require File::Temp;
551
552 my $tile = read_pak "$LIB/crossfire.0"; 855 my $tile = read_pak "$LIB/crossfire.0";
553 856
554 my %cache; 857 my %cache;
555 858
556 my $idx = 0; 859 my $idx = 0;
557 860
558 for my $name (sort keys %$tile) { 861 for my $name (sort keys %$tile) {
559 my ($fh, $filename) = File::Temp::tempfile (); 862 my $pb = new Gtk2::Gdk::PixbufLoader;
560 print $fh $tile->{$name}; 863 $pb->write ($tile->{$name});
561 close $fh; 864 $pb->close;
562 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 865 my $pb = $pb->get_pixbuf;
563 unlink $filename;
564 866
565 my $tile = $cache{$name} = { 867 my $tile = $cache{$name} = {
566 pb => $pb, 868 pb => $pb,
567 idx => $idx, 869 idx => $idx,
568 w => int $pb->get_width / TILESIZE, 870 w => int $pb->get_width / TILESIZE,
… …
586 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 888 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
587 } 889 }
588 } 890 }
589 } 891 }
590 892
591 $pb->save ("$VARDIR/tilecache.png", "png"); 893 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
592 894
593 \%cache 895 \%cache
594 }; 896 };
595} 897}
596 898

Diff Legend

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