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.86 by root, Wed Feb 7 00:56:06 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 file_format_version
64 name attach swap_time reset_timeout fixed_resettime difficulty region
65 shopitems shopgreed shopmin shopmax shoprace
66 darkness width height enter_x enter_y msg maplore
67 unique template
68 outdoor temp pressure humid windspeed winddir sky nosmooth
69 tile_path_1 tile_path_2 tile_path_3 tile_path_4
70));
71
43our @FIELD_ORDER = (qw(name name_pl)); 72our @FIELD_ORDER = (qw(
73 elevation
74
75 name name_pl custom_name attach title race
76 slaying skill msg lore other_arch face
77 #todo-events
78 animation is_animated
79 str dex con wis pow cha int
80 hp maxhp sp maxsp grace maxgrace
81 exp perm_exp expmul
82 food dam luck wc ac x y speed speed_left move_state attack_movement
83 nrof level direction type subtype attacktype
84
85 resist_physical resist_magic resist_fire resist_electricity
86 resist_cold resist_confusion resist_acid resist_drain
87 resist_weaponmagic resist_ghosthit resist_poison resist_slow
88 resist_paralyze resist_turn_undead resist_fear resist_cancellation
89 resist_deplete resist_death resist_chaos resist_counterspell
90 resist_godpower resist_holyword resist_blind resist_internal
91 resist_life_stealing resist_disease
92
93 path_attuned path_repelled path_denied material materialname
94 value carrying weight invisible state magic
95 last_heal last_sp last_grace last_eat
96 connected glow_radius randomitems npx_status npc_program
97 run_away pick_up container will_apply smoothlevel
98 current_weapon_script weapontype tooltype elevation client_type
99 item_power duration range
100 range_modifier duration_modifier dam_modifier gen_sp_armour
101 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
102
103 alive wiz was_wiz applied unpaid can_use_shield no_pick is_animated monster
104 friendly generator is_thrown auto_apply treasure player sold see_invisible
105 can_roll overlay_floor is_turnable is_used_up identified reflecting changing
106 splitting hitback startequip blocksview undead scared unaggressive
107 reflect_missile reflect_spell no_magic no_fix_player is_lightable tear_down
108 run_away pick_up unique no_drop can_cast_spell can_use_scroll can_use_range
109 can_use_bow can_use_armour can_use_weapon can_use_ring has_ready_range
110 has_ready_bow xrays is_floor lifesave no_strength sleep stand_still
111 random_move only_attack confused stealth cursed damned see_anywhere
112 known_magical known_cursed can_use_skill been_applied has_ready_scroll
113 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
114 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
115 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
116 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
117
118 body_range body_arm body_torso body_head body_neck body_skill
119 body_finger body_shoulder body_foot body_hand body_wrist body_waist
120));
121
122our %EVENT_TYPE = (
123 apply => 1,
124 attack => 2,
125 death => 3,
126 drop => 4,
127 pickup => 5,
128 say => 6,
129 stop => 7,
130 time => 8,
131 throw => 9,
132 trigger => 10,
133 close => 11,
134 timer => 12,
135);
44 136
45sub MOVE_WALK (){ 0x01 } 137sub MOVE_WALK (){ 0x01 }
46sub MOVE_FLY_LOW (){ 0x02 } 138sub MOVE_FLY_LOW (){ 0x02 }
47sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
48sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
49sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
50sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
143sub MOVE_KNOWN (){ 0x1f } # all of above
51sub MOVE_ALL (){ 0xff } 144sub MOVE_ALLBIT (){ 0x10000 }
145sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
52 146
53sub load_ref($) { 147sub load_ref($) {
54 my ($path) = @_; 148 my ($path) = @_;
55 149
56 open my $fh, "<", $path 150 open my $fh, "<:raw:perlio", $path
57 or die "$path: $!"; 151 or die "$path: $!";
58 binmode $fh;
59 local $/; 152 local $/;
60 153
61 Storable::thaw <$fh> 154 thaw <$fh>
62} 155}
63 156
64sub save_ref($$) { 157sub save_ref($$) {
65 my ($ref, $path) = @_; 158 my ($ref, $path) = @_;
66 159
67 open my $fh, ">", "$path~" 160 open my $fh, ">:raw:perlio", "$path~"
68 or die "$path~: $!"; 161 or die "$path~: $!";
69 binmode $fh;
70 print $fh Storable::freeze $ref; 162 print $fh freeze $ref;
71 close $fh; 163 close $fh;
72 rename "$path~", $path 164 rename "$path~", $path
73 or die "$path: $!"; 165 or die "$path: $!";
74} 166}
75 167
168my %attack_mask = (
169 physical => 0x00000001,
170 magic => 0x00000002,
171 fire => 0x00000004,
172 electricity => 0x00000008,
173 cold => 0x00000010,
174 confusion => 0x00000020,
175 acid => 0x00000040,
176 drain => 0x00000080,
177 weaponmagic => 0x00000100,
178 ghosthit => 0x00000200,
179 poison => 0x00000400,
180 slow => 0x00000800,
181 paralyze => 0x00001000,
182 turn_undead => 0x00002000,
183 fear => 0x00004000,
184 cancellation => 0x00008000,
185 deplete => 0x00010000,
186 death => 0x00020000,
187 chaos => 0x00040000,
188 counterspell => 0x00080000,
189 godpower => 0x00100000,
190 holyword => 0x00200000,
191 blind => 0x00400000,
192 internal => 0x00800000,
193 life_stealing => 0x01000000,
194 disease => 0x02000000,
195);
196
197sub _add_resist($$$) {
198 my ($ob, $mask, $value) = @_;
199
200 while (my ($k, $v) = each %attack_mask) {
201 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
202 }
203}
204
205my %MATERIAL = reverse
206 paper => 1,
207 iron => 2,
208 glass => 4,
209 leather => 8,
210 wood => 16,
211 organic => 32,
212 stone => 64,
213 cloth => 128,
214 adamant => 256,
215 liquid => 512,
216 tin => 1024,
217 bone => 2048,
218 ice => 4096,
219
220 # guesses
221 runestone => 12,
222 bronze => 18,
223 "ancient wood" => 20,
224 glass => 36,
225 marble => 66,
226 ice => 68,
227 stone => 70,
228 stone => 80,
229 cloth => 136,
230 ironwood => 144,
231 adamantium => 258,
232 glacium => 260,
233 blood => 544,
234;
235
236# object as in "Object xxx", i.e. archetypes
76sub normalize_object($) { 237sub normalize_object($) {
77 my ($ob) = @_; 238 my ($ob) = @_;
78 239
240 # convert material bitset to materialname, if possible
241 if (exists $ob->{material}) {
242 if (!$ob->{material}) {
243 delete $ob->{material};
244 } elsif (exists $ob->{materialname}) {
245 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
246 delete $ob->{material};
247 } else {
248 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
249 delete $ob->{material}; # assume materilname is more specific and nuke material
250 }
251 } elsif (my $name = $MATERIAL{$ob->{material}}) {
252 delete $ob->{material};
253 $ob->{materialname} = $name;
254 } else {
255 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
256 }
257 }
258
259 # nuke outdated or never supported fields
79 delete $ob->{$_} for qw( 260 delete @$ob{qw(
80 can_knockback can_parry can_impale can_cut can_dam_armour 261 can_knockback can_parry can_impale can_cut can_dam_armour
81 can_apply pass_thru can_pass_thru 262 can_apply pass_thru can_pass_thru
82 ); 263 )};
83 264
84 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 265 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
266 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
267 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
268
269 # convert movement strings to bitsets
270 for my $attr (keys %FIELD_MOVEMENT) {
85 next unless exists $ob->{$attr}; 271 next unless exists $ob->{$attr};
272
273 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
274
86 next if $ob->{$attr} =~ /^\d+$/; 275 next if $ob->{$attr} =~ /^\d+$/;
87 276
88 my $flags = 0; 277 my $flags = 0;
89 278
90 # assume list 279 # assume list
… …
107 } 296 }
108 297
109 $ob->{$attr} = $flags; 298 $ob->{$attr} = $flags;
110 } 299 }
111 300
301 # convert outdated movement flags to new movement sets
112 if (defined (my $v = delete $ob->{no_pass})) { 302 if (defined (my $v = delete $ob->{no_pass})) {
113 $ob->{move_block} = $v ? MOVE_ALL : 0; 303 $ob->{move_block} = $v ? MOVE_ALL : 0;
114 } 304 }
115 if (defined (my $v = delete $ob->{slow_move})) { 305 if (defined (my $v = delete $ob->{slow_move})) {
116 $ob->{move_slow} |= MOVE_WALK; 306 $ob->{move_slow} |= MOVE_WALK;
117 $ob->{move_slow_penalty} = $v; 307 $ob->{move_slow_penalty} = $v;
118 } 308 }
119 if (defined (my $v = delete $ob->{walk_on})) { 309 if (defined (my $v = delete $ob->{walk_on})) {
310 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
120 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 311 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
121 : $ob->{move_on} & ~MOVE_WALK; 312 : $ob->{move_on} & ~MOVE_WALK;
122 } 313 }
123 if (defined (my $v = delete $ob->{walk_off})) { 314 if (defined (my $v = delete $ob->{walk_off})) {
315 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
124 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 316 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
125 : $ob->{move_off} & ~MOVE_WALK; 317 : $ob->{move_off} & ~MOVE_WALK;
126 } 318 }
127 if (defined (my $v = delete $ob->{fly_on})) { 319 if (defined (my $v = delete $ob->{fly_on})) {
320 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
128 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 321 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
129 : $ob->{move_on} & ~MOVE_FLY_LOW; 322 : $ob->{move_on} & ~MOVE_FLY_LOW;
130 } 323 }
131 if (defined (my $v = delete $ob->{fly_off})) { 324 if (defined (my $v = delete $ob->{fly_off})) {
325 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
132 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 326 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
133 : $ob->{move_off} & ~MOVE_FLY_LOW; 327 : $ob->{move_off} & ~MOVE_FLY_LOW;
134 } 328 }
135 if (defined (my $v = delete $ob->{flying})) { 329 if (defined (my $v = delete $ob->{flying})) {
330 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type};
136 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 331 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
137 : $ob->{move_type} & ~MOVE_FLY_LOW; 332 : $ob->{move_type} & ~MOVE_FLY_LOW;
138 } 333 }
139 334
335 # convert idiotic event_xxx things into objects
336 while (my ($event, $subtype) = each %EVENT_TYPE) {
337 if (exists $ob->{"event_${event}_plugin"}) {
338 push @{$ob->{inventory}}, {
339 _name => "event_$event",
340 title => delete $ob->{"event_${event}_plugin"},
341 slaying => delete $ob->{"event_${event}"},
342 name => delete $ob->{"event_${event}_options"},
343 };
344 }
345 }
346
347 # some archetypes had "+3" instead of the canonical "3", so fix
348 $ob->{dam} *= 1 if exists $ob->{dam};
349
140 $ob 350 $ob
141} 351}
142 352
353# arch as in "arch xxx", ie.. objects
143sub normalize_arch($) { 354sub normalize_arch($) {
144 my ($ob) = @_; 355 my ($ob) = @_;
145 356
146 normalize_object $ob; 357 normalize_object $ob;
147 358
… …
174 delete $ob->{$k}; 385 delete $ob->{$k};
175 } 386 }
176 } 387 }
177 } 388 }
178 389
390 # a speciality for the editor
391 if (exists $ob->{attack_movement}) {
392 my $am = delete $ob->{attack_movement};
393 $ob->{attack_movement_bits_0_3} = $am & 15;
394 $ob->{attack_movement_bits_4_7} = $am & 240;
395 }
396
397 $ob
398}
399
400sub attr_thaw($) {
401 my ($ob) = @_;
402
403 $ob->{attach} = from_json $ob->{attach}
404 if exists $ob->{attach};
405
406 $ob
407}
408
409sub attr_freeze($) {
410 my ($ob) = @_;
411
412 $ob->{attach} = Crossfire::to_json $ob->{attach}
413 if exists $ob->{attach};
414
179 $ob 415 $ob
180} 416}
181 417
182sub read_pak($) { 418sub read_pak($) {
183 my ($path) = @_; 419 my ($path) = @_;
184 420
185 my %pak; 421 my %pak;
186 422
187 open my $fh, "<", $path 423 open my $fh, "<:raw:perlio", $path
188 or Carp::croak "$_[0]: $!"; 424 or Carp::croak "$_[0]: $!";
189 binmode $fh; 425 binmode $fh;
190 while (<$fh>) { 426 while (<$fh>) {
191 my ($type, $id, $len, $path) = split; 427 my ($type, $id, $len, $path) = split;
192 $path =~ s/.*\///; 428 $path =~ s/.*\///;
… …
194 } 430 }
195 431
196 \%pak 432 \%pak
197} 433}
198 434
199sub read_arch($) { 435sub read_arch($;$) {
200 my ($path) = @_; 436 my ($path, $toplevel) = @_;
201 437
202 my %arc; 438 my %arc;
203 my ($more, $prev); 439 my ($more, $prev);
440 my $comment;
204 441
205 open my $fh, "<", $path 442 open my $fh, "<:raw:perlio:utf8", $path
206 or Carp::croak "$path: $!"; 443 or Carp::croak "$path: $!";
207 444
208 binmode $fh; 445# binmode $fh;
209 446
210 my $parse_block; $parse_block = sub { 447 my $parse_block; $parse_block = sub {
211 my %arc = @_; 448 my %arc = @_;
212 449
213 while (<$fh>) { 450 while (<$fh>) {
214 s/\s+$//; 451 s/\s+$//;
215 if (/^end$/i) { 452 if (/^end$/i) {
216 last; 453 last;
454
217 } elsif (/^arch (\S+)$/) { 455 } elsif (/^arch (\S+)$/i) {
218 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 456 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
457
219 } elsif (/^lore$/) { 458 } elsif (/^lore$/i) {
220 while (<$fh>) { 459 while (<$fh>) {
221 last if /^endlore\s*$/i; 460 last if /^endlore\s*$/i;
222 $arc{lore} .= $_; 461 $arc{lore} .= $_;
223 } 462 }
224 } elsif (/^msg$/) { 463 } elsif (/^msg$/i) {
225 while (<$fh>) { 464 while (<$fh>) {
226 last if /^endmsg\s*$/i; 465 last if /^endmsg\s*$/i;
227 $arc{msg} .= $_; 466 $arc{msg} .= $_;
228 } 467 }
468 } elsif (/^anim$/i) {
469 while (<$fh>) {
470 last if /^mina\s*$/i;
471 chomp;
472 push @{ $arc{anim} }, $_;
473 }
229 } elsif (/^(\S+)\s*(.*)$/) { 474 } elsif (/^(\S+)\s*(.*)$/) {
230 $arc{lc $1} = $2; 475 $arc{lc $1} = $2;
231 } elsif (/^\s*($|#)/) { 476 } elsif (/^\s*#/) {
477 $arc{_comment} .= "$_\n";
478
479 } elsif (/^\s*$/) {
232 # 480 #
233 } else { 481 } else {
234 warn "$path: unparsable line '$_' in arch $arc{_name}"; 482 warn "$path: unparsable line '$_' in arch $arc{_name}";
235 } 483 }
236 } 484 }
… …
242 s/\s+$//; 490 s/\s+$//;
243 if (/^more$/i) { 491 if (/^more$/i) {
244 $more = $prev; 492 $more = $prev;
245 } elsif (/^object (\S+)$/i) { 493 } elsif (/^object (\S+)$/i) {
246 my $name = $1; 494 my $name = $1;
247 my $arc = normalize_object $parse_block->(_name => $name); 495 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
496 undef $comment;
497 delete $arc{_comment} unless length $arc{_comment};
498 $arc->{_atype} = 'object';
248 499
249 if ($more) { 500 if ($more) {
250 $more->{more} = $arc; 501 $more->{more} = $arc;
251 } else { 502 } else {
252 $arc{$name} = $arc; 503 $arc{$name} = $arc;
253 } 504 }
254 $prev = $arc; 505 $prev = $arc;
255 $more = undef; 506 $more = undef;
256 } elsif (/^arch (\S+)$/i) { 507 } elsif (/^arch (\S+)$/i) {
257 push @{ $arc{arch} }, normalize_arch $parse_block->(_name => $1); 508 my $name = $1;
509 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
510 undef $comment;
511 delete $arc{_comment} unless length $arc{_comment};
512 $arc->{_atype} = 'arch';
513
514 if ($more) {
515 $more->{more} = $arc;
516 } else {
517 push @{ $arc{arch} }, $arc;
518 }
519 $prev = $arc;
520 $more = undef;
521 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
522 if ($1 eq "lev_array") {
523 while (<$fh>) {
524 last if /^endplst\s*$/;
525 push @{$toplevel->{lev_array}}, $_+0;
526 }
527 } else {
528 $toplevel->{$1} = $2;
529 }
530 } elsif (/^\s*#/) {
531 $comment .= "$_\n";
258 } elsif (/^\s*($|#)/) { 532 } elsif (/^\s*($|#)/) {
259 # 533 #
260 } else { 534 } else {
261 warn "$path: unparseable top-level line '$_'"; 535 die "$path: unparseable top-level line '$_'";
262 } 536 }
263 } 537 }
264 538
265 undef $parse_block; # work around bug in perl not freeing $fh etc. 539 undef $parse_block; # work around bug in perl not freeing $fh etc.
266 540
267 \%arc 541 \%arc
542}
543
544sub archlist_to_string {
545 my ($arch) = @_;
546
547 my $str;
548
549 my $append; $append = sub {
550 my %a = %{$_[0]};
551
552 Crossfire::attr_freeze \%a;
553 Crossfire::normalize_arch \%a;
554
555 # undo the bit-split we did before
556 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
557 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
558 | (delete $a{attack_movement_bits_4_7});
559 }
560
561 if (my $comment = delete $a{_comment}) {
562 if ($comment =~ /[^\n\s#]/) {
563 $str .= $comment;
564 }
565 }
566
567 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
568
569 my $inv = delete $a{inventory};
570 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
571 my $anim = delete $a{anim};
572
573 my @kv;
574
575 for ($a{_name} eq "map"
576 ? @Crossfire::FIELD_ORDER_MAP
577 : @Crossfire::FIELD_ORDER) {
578 push @kv, [$_, delete $a{$_}]
579 if exists $a{$_};
580 }
581
582 for (sort keys %a) {
583 next if /^_/; # ignore our _-keys
584 push @kv, [$_, delete $a{$_}];
585 }
586
587 for (@kv) {
588 my ($k, $v) = @$_;
589
590 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
591 $v =~ s/\n$//;
592 $str .= "$k\n$v\n$end\n";
593 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
594 if ($v & ~Crossfire::MOVE_ALL or !$v) {
595 $str .= "$k $v\n";
596
597 } elsif ($v & Crossfire::MOVE_ALLBIT) {
598 $str .= "$k all";
599
600 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
601 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
602 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
603 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
604 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
605
606 $str .= "\n";
607
608 } else {
609 $str .= $k;
610
611 $str .= " walk" if $v & Crossfire::MOVE_WALK;
612 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
613 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
614 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
615 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
616
617 $str .= "\n";
618 }
619 } else {
620 $str .= "$k $v\n";
621 }
622 }
623
624 if ($inv) {
625 $append->($_) for @$inv;
626 }
627
628 if ($a{_atype} eq 'object') {
629 $str .= join "\n", "anim", @$anim, "mina\n"
630 if $anim;
631 }
632
633 $str .= "end\n";
634
635 if ($a{_atype} eq 'object') {
636 if ($more) {
637 $str .= "more\n";
638 $append->($more) if $more;
639 } else {
640 $str .= "\n";
641 }
642 }
643 };
644
645 for (@$arch) {
646 $append->($_);
647 }
648
649 $str
268} 650}
269 651
270# put all archs into a hash with editor_face as it's key 652# put all archs into a hash with editor_face as it's key
271# NOTE: the arrays in the hash values are references to 653# NOTE: the arrays in the hash values are references to
272# the archs from $ARCH 654# the archs from $ARCH
273sub editor_archs { 655sub editor_archs {
274 my %paths; 656 my %paths;
275 657
276 for (keys %ARCH) { 658 for (keys %ARCH) {
277 my $arch = $ARCH{$_}; 659 my $arch = $ARCH{$_};
278 push @{$paths{$arch->{editor_folder}}}, \$arch; 660 push @{$paths{$arch->{editor_folder}}}, $arch;
279 } 661 }
280 662
281 \%paths 663 \%paths
282} 664}
283 665
… …
293 my ($a) = @_; 675 my ($a) = @_;
294 676
295 my $o = $ARCH{$a->{_name}} 677 my $o = $ARCH{$a->{_name}}
296 or return; 678 or return;
297 679
298 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 680 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
681 unless ($face) {
682 $face = $FACE{"blank.x11"}
299 or (warn "no face data found for arch '$a->{_name}'"), return; 683 or (warn "no face data found for arch '$a->{_name}'"), return;
684 }
300 685
301 if ($face->{w} > 1 || $face->{h} > 1) { 686 if ($face->{w} > 1 || $face->{h} > 1) {
302 # bigface 687 # bigface
303 return (0, 0, $face->{w} - 1, $face->{h} - 1); 688 return (0, 0, $face->{w} - 1, $face->{h} - 1);
304 689
… …
348 my $type = $obj->{type} || $arch->{type}; 733 my $type = $obj->{type} || $arch->{type};
349 734
350 if ($type > 0) { 735 if ($type > 0) {
351 $root = $Crossfire::Data::ATTR{$type}; 736 $root = $Crossfire::Data::ATTR{$type};
352 } else { 737 } else {
738 my %a = (%$arch, %$obj);
739
740 if ($a{is_floor} && !$a{alive}) {
741 $root = $Crossfire::Data::TYPE{Floor};
742 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
743 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
744 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
745 $root = $Crossfire::Data::TYPE{Wall};
746 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
747 $root = $Crossfire::Data::TYPE{"Weak Wall"};
748 } else {
353 $root = $Crossfire::Data::TYPE{Misc}; 749 $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 } 750 }
368 } 751 }
369 752
370 my @import = ($root); 753 my @import = ($root);
371 754
… …
545 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 928 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
546 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 929 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
547 or die "$VARDIR/tilecache.png: $!"; 930 or die "$VARDIR/tilecache.png: $!";
548 *FACE = $_[0]; 931 *FACE = $_[0];
549 }, sub { 932 }, sub {
550 require File::Temp;
551
552 my $tile = read_pak "$LIB/crossfire.0"; 933 my $tile = read_pak "$LIB/crossfire.0";
553 934
554 my %cache; 935 my %cache;
555 936
556 my $idx = 0; 937 my $idx = 0;
557 938
558 for my $name (sort keys %$tile) { 939 for my $name (sort keys %$tile) {
559 my ($fh, $filename) = File::Temp::tempfile (); 940 my $pb = new Gtk2::Gdk::PixbufLoader;
560 print $fh $tile->{$name}; 941 $pb->write ($tile->{$name});
561 close $fh; 942 $pb->close;
562 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 943 my $pb = $pb->get_pixbuf;
563 unlink $filename;
564 944
565 my $tile = $cache{$name} = { 945 my $tile = $cache{$name} = {
566 pb => $pb, 946 pb => $pb,
567 idx => $idx, 947 idx => $idx,
568 w => int $pb->get_width / TILESIZE, 948 w => int $pb->get_width / TILESIZE,
… …
586 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 966 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
587 } 967 }
588 } 968 }
589 } 969 }
590 970
591 $pb->save ("$VARDIR/tilecache.png", "png"); 971 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
592 972
593 \%cache 973 \%cache
594 }; 974 };
595} 975}
596 976

Diff Legend

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