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.52 by root, Mon Mar 20 02:15:36 2006 UTC vs.
Revision 1.80 by root, Tue Feb 6 22:08:14 2007 UTC

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

Diff Legend

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