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.57 by root, Thu Mar 23 08:55:54 2006 UTC vs.
Revision 1.88 by root, Sun Feb 18 20:20:58 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
… …
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
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
42# same as in server save routine, to (hopefully) be compatible 60# same as in server save routine, to (hopefully) be compatible
43# to the other editors. 61# to the other editors.
44our @FIELD_ORDER_MAP = (qw( 62our @FIELD_ORDER_MAP = (qw(
63 file_format_version
45 name swap_time reset_timeout fixed_resettime difficulty region 64 name attach swap_time reset_timeout fixed_resettime difficulty region
46 shopitems shopgreed shopmin shopmax shoprace 65 shopitems shopgreed shopmin shopmax shoprace
47 darkness width height enter_x enter_y msg maplore 66 darkness width height enter_x enter_y msg maplore
48 unique template 67 unique template
49 outdoor temp pressure humid windspeed winddir sky nosmooth 68 outdoor temp pressure humid windspeed winddir sky nosmooth
50 tile_path_1 tile_path_2 tile_path_3 tile_path_4 69 tile_path_1 tile_path_2 tile_path_3 tile_path_4
51)); 70));
52 71
53our @FIELD_ORDER = (qw( 72our @FIELD_ORDER = (qw(
54 elevation 73 elevation
55 74
56 name name_pl custom_name title race 75 name name_pl custom_name attach title race
57 slaying skill msg lore other_arch face 76 slaying skill msg lore other_arch face
58 #todo-events 77 #todo-events
59 animation is_animated 78 animation is_animated
60 Str Dex Con Wis Pow Cha Int 79 str dex con wis pow cha int
61 hp maxhp sp maxsp grace maxgrace 80 hp maxhp sp maxsp grace maxgrace
62 exp perm_exp expmul 81 exp perm_exp expmul
63 food dam luck wc ac x y speed speed_left move_state attack_movement 82 food dam luck wc ac x y speed speed_left move_state attack_movement
64 nrof level direction type subtype 83 nrof level direction type subtype attacktype
65 84
66 resist_physical resist_magic resist_fire resist_electricity 85 resist_physical resist_magic resist_fire resist_electricity
67 resist_cold resist_confusion resist_acid resist_drain 86 resist_cold resist_confusion resist_acid resist_drain
68 resist_weaponmagic resist_ghosthit resist_poison resist_slow 87 resist_weaponmagic resist_ghosthit resist_poison resist_slow
69 resist_paralyze resist_turn_undead resist_fear resist_cancellation 88 resist_paralyze resist_turn_undead resist_fear resist_cancellation
… …
98 117
99 body_range body_arm body_torso body_head body_neck body_skill 118 body_range body_arm body_torso body_head body_neck body_skill
100 body_finger body_shoulder body_foot body_hand body_wrist body_waist 119 body_finger body_shoulder body_foot body_hand body_wrist body_waist
101)); 120));
102 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);
136
103sub MOVE_WALK (){ 0x01 } 137sub MOVE_WALK (){ 0x01 }
104sub MOVE_FLY_LOW (){ 0x02 } 138sub MOVE_FLY_LOW (){ 0x02 }
105sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
106sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
107sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
108sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
143sub MOVE_KNOWN (){ 0x1f } # all of above
109sub MOVE_ALL (){ 0xff } 144sub MOVE_ALLBIT (){ 0x10000 }
145sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
110 146
111sub load_ref($) { 147sub load_ref($) {
112 my ($path) = @_; 148 my ($path) = @_;
113 149
114 open my $fh, "<", $path 150 open my $fh, "<:raw:perlio", $path
115 or die "$path: $!"; 151 or die "$path: $!";
116 binmode $fh;
117 local $/; 152 local $/;
118 153
119 thaw <$fh> 154 thaw <$fh>
120} 155}
121 156
122sub save_ref($$) { 157sub save_ref($$) {
123 my ($ref, $path) = @_; 158 my ($ref, $path) = @_;
124 159
125 open my $fh, ">", "$path~" 160 open my $fh, ">:raw:perlio", "$path~"
126 or die "$path~: $!"; 161 or die "$path~: $!";
127 binmode $fh;
128 print $fh freeze $ref; 162 print $fh freeze $ref;
129 close $fh; 163 close $fh;
130 rename "$path~", $path 164 rename "$path~", $path
131 or die "$path: $!"; 165 or die "$path: $!";
132} 166}
133 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
134sub normalize_object($) { 237sub normalize_object($) {
135 my ($ob) = @_; 238 my ($ob) = @_;
136 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
137 delete $ob->{$_} for qw( 260 delete @$ob{qw(
138 can_knockback can_parry can_impale can_cut can_dam_armour 261 can_knockback can_parry can_impale can_cut can_dam_armour
139 can_apply pass_thru can_pass_thru 262 can_apply pass_thru can_pass_thru
140 ); 263 )};
141 264
142 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) {
143 next unless exists $ob->{$attr}; 271 next unless exists $ob->{$attr};
272
273 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
274
144 next if $ob->{$attr} =~ /^\d+$/; 275 next if $ob->{$attr} =~ /^\d+$/;
145 276
146 my $flags = 0; 277 my $flags = 0;
147 278
148 # assume list 279 # assume list
… …
165 } 296 }
166 297
167 $ob->{$attr} = $flags; 298 $ob->{$attr} = $flags;
168 } 299 }
169 300
301 # convert outdated movement flags to new movement sets
170 if (defined (my $v = delete $ob->{no_pass})) { 302 if (defined (my $v = delete $ob->{no_pass})) {
171 $ob->{move_block} = $v ? MOVE_ALL : 0; 303 $ob->{move_block} = $v ? MOVE_ALL : 0;
172 } 304 }
173 if (defined (my $v = delete $ob->{slow_move})) { 305 if (defined (my $v = delete $ob->{slow_move})) {
174 $ob->{move_slow} |= MOVE_WALK; 306 $ob->{move_slow} |= MOVE_WALK;
175 $ob->{move_slow_penalty} = $v; 307 $ob->{move_slow_penalty} = $v;
176 } 308 }
177 if (defined (my $v = delete $ob->{walk_on})) { 309 if (defined (my $v = delete $ob->{walk_on})) {
310 $ob->{move_on} = MOVE_NONE unless exists $ob->{move_on};
178 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 311 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
179 : $ob->{move_on} & ~MOVE_WALK; 312 : $ob->{move_on} & ~MOVE_WALK;
180 } 313 }
181 if (defined (my $v = delete $ob->{walk_off})) { 314 if (defined (my $v = delete $ob->{walk_off})) {
315 $ob->{move_off} = MOVE_NONE unless exists $ob->{move_off};
182 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 316 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
183 : $ob->{move_off} & ~MOVE_WALK; 317 : $ob->{move_off} & ~MOVE_WALK;
184 } 318 }
185 if (defined (my $v = delete $ob->{fly_on})) { 319 if (defined (my $v = delete $ob->{fly_on})) {
320 $ob->{move_on} = MOVE_NONE unless exists $ob->{move_on};
186 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 321 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
187 : $ob->{move_on} & ~MOVE_FLY_LOW; 322 : $ob->{move_on} & ~MOVE_FLY_LOW;
188 } 323 }
189 if (defined (my $v = delete $ob->{fly_off})) { 324 if (defined (my $v = delete $ob->{fly_off})) {
325 $ob->{move_off} = MOVE_NONE unless exists $ob->{move_off};
190 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 326 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
191 : $ob->{move_off} & ~MOVE_FLY_LOW; 327 : $ob->{move_off} & ~MOVE_FLY_LOW;
192 } 328 }
193 if (defined (my $v = delete $ob->{flying})) { 329 if (defined (my $v = delete $ob->{flying})) {
330 $ob->{move_type} = MOVE_NONE unless exists $ob->{move_type};
194 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 331 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
195 : $ob->{move_type} & ~MOVE_FLY_LOW; 332 : $ob->{move_type} & ~MOVE_FLY_LOW;
196 } 333 }
197 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
198 $ob 350 $ob
199} 351}
200 352
353# arch as in "arch xxx", ie.. objects
201sub normalize_arch($) { 354sub normalize_arch($) {
202 my ($ob) = @_; 355 my ($ob) = @_;
203 356
204 normalize_object $ob; 357 normalize_object $ob;
205 358
… …
242 } 395 }
243 396
244 $ob 397 $ob
245} 398}
246 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
415 $ob
416}
417
247sub read_pak($) { 418sub read_pak($) {
248 my ($path) = @_; 419 my ($path) = @_;
249 420
250 my %pak; 421 my %pak;
251 422
252 open my $fh, "<", $path 423 open my $fh, "<:raw:perlio", $path
253 or Carp::croak "$_[0]: $!"; 424 or Carp::croak "$_[0]: $!";
254 binmode $fh; 425 binmode $fh;
255 while (<$fh>) { 426 while (<$fh>) {
256 my ($type, $id, $len, $path) = split; 427 my ($type, $id, $len, $path) = split;
257 $path =~ s/.*\///; 428 $path =~ s/.*\///;
… …
259 } 430 }
260 431
261 \%pak 432 \%pak
262} 433}
263 434
264sub read_arch($) { 435sub read_arch($;$) {
265 my ($path) = @_; 436 my ($path, $toplevel) = @_;
266 437
267 my %arc; 438 my %arc;
268 my ($more, $prev); 439 my ($more, $prev);
440 my $comment;
269 441
270 open my $fh, "<", $path 442 open my $fh, "<:raw:perlio:utf8", $path
271 or Carp::croak "$path: $!"; 443 or Carp::croak "$path: $!";
272 444
273 binmode $fh; 445# binmode $fh;
274 446
275 my $parse_block; $parse_block = sub { 447 my $parse_block; $parse_block = sub {
276 my %arc = @_; 448 my %arc = @_;
277 449
278 while (<$fh>) { 450 while (<$fh>) {
279 s/\s+$//; 451 s/\s+$//;
280 if (/^end$/i) { 452 if (/^end$/i) {
281 last; 453 last;
454
282 } elsif (/^arch (\S+)$/i) { 455 } elsif (/^arch (\S+)$/i) {
283 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 456 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
457
284 } elsif (/^lore$/i) { 458 } elsif (/^lore$/i) {
285 while (<$fh>) { 459 while (<$fh>) {
286 last if /^endlore\s*$/i; 460 last if /^endlore\s*$/i;
287 $arc{lore} .= $_; 461 $arc{lore} .= $_;
288 } 462 }
289 } elsif (/^msg$/i) { 463 } elsif (/^msg$/i) {
290 while (<$fh>) { 464 while (<$fh>) {
291 last if /^endmsg\s*$/i; 465 last if /^endmsg\s*$/i;
292 $arc{msg} .= $_; 466 $arc{msg} .= $_;
293 } 467 }
468 } elsif (/^anim$/i) {
469 while (<$fh>) {
470 last if /^mina\s*$/i;
471 chomp;
472 push @{ $arc{anim} }, $_;
473 }
294 } elsif (/^(\S+)\s*(.*)$/) { 474 } elsif (/^(\S+)\s*(.*)$/) {
295 $arc{lc $1} = $2; 475 $arc{lc $1} = $2;
296 } elsif (/^\s*($|#)/) { 476 } elsif (/^\s*#/) {
477 $arc{_comment} .= "$_\n";
478
479 } elsif (/^\s*$/) {
297 # 480 #
298 } else { 481 } else {
299 warn "$path: unparsable line '$_' in arch $arc{_name}"; 482 warn "$path: unparsable line '$_' in arch $arc{_name}";
300 } 483 }
301 } 484 }
… …
307 s/\s+$//; 490 s/\s+$//;
308 if (/^more$/i) { 491 if (/^more$/i) {
309 $more = $prev; 492 $more = $prev;
310 } elsif (/^object (\S+)$/i) { 493 } elsif (/^object (\S+)$/i) {
311 my $name = $1; 494 my $name = $1;
312 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';
313 499
314 if ($more) { 500 if ($more) {
315 $more->{more} = $arc; 501 $more->{more} = $arc;
316 } else { 502 } else {
317 $arc{$name} = $arc; 503 $arc{$name} = $arc;
318 } 504 }
319 $prev = $arc; 505 $prev = $arc;
320 $more = undef; 506 $more = undef;
321 } elsif (/^arch (\S+)$/i) { 507 } elsif (/^arch (\S+)$/i) {
322 my $name = $1; 508 my $name = $1;
323 my $arc = normalize_arch $parse_block->(_name => $name); 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';
324 513
325 if ($more) { 514 if ($more) {
326 $more->{more} = $arc; 515 $more->{more} = $arc;
327 } else { 516 } else {
328 push @{ $arc{arch} }, $arc; 517 push @{ $arc{arch} }, $arc;
329 } 518 }
330 $prev = $arc; 519 $prev = $arc;
331 $more = undef; 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";
332 } elsif (/^\s*($|#)/) { 532 } elsif (/^\s*($|#)/) {
333 # 533 #
334 } else { 534 } else {
335 warn "$path: unparseable top-level line '$_'"; 535 die "$path: unparseable top-level line '$_'";
336 } 536 }
337 } 537 }
338 538
339 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.
340 540
341 \%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 if ($a{_atype} eq 'object') {
574 $str .= join "\n", "anim", @$anim, "mina\n"
575 if $anim;
576 }
577
578 my @kv;
579
580 for ($a{_name} eq "map"
581 ? @Crossfire::FIELD_ORDER_MAP
582 : @Crossfire::FIELD_ORDER) {
583 push @kv, [$_, delete $a{$_}]
584 if exists $a{$_};
585 }
586
587 for (sort keys %a) {
588 next if /^_/; # ignore our _-keys
589 push @kv, [$_, delete $a{$_}];
590 }
591
592 for (@kv) {
593 my ($k, $v) = @$_;
594
595 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
596 $v =~ s/\n$//;
597 $str .= "$k\n$v\n$end\n";
598 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
599 if ($v & ~Crossfire::MOVE_ALL or !$v) {
600 $str .= "$k $v\n";
601
602 } elsif ($v & Crossfire::MOVE_ALLBIT) {
603 $str .= "$k all";
604
605 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
606 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
607 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
608 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
609 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
610
611 $str .= "\n";
612
613 } else {
614 $str .= $k;
615
616 $str .= " walk" if $v & Crossfire::MOVE_WALK;
617 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
618 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
619 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
620 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
621
622 $str .= "\n";
623 }
624 } else {
625 $str .= "$k $v\n";
626 }
627 }
628
629 if ($inv) {
630 $append->($_) for @$inv;
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
342} 650}
343 651
344# 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
345# NOTE: the arrays in the hash values are references to 653# NOTE: the arrays in the hash values are references to
346# the archs from $ARCH 654# the archs from $ARCH
347sub editor_archs { 655sub editor_archs {
348 my %paths; 656 my %paths;
349 657
350 for (keys %ARCH) { 658 for (keys %ARCH) {
351 my $arch = $ARCH{$_}; 659 my $arch = $ARCH{$_};
352 push @{$paths{$arch->{editor_folder}}}, \$arch; 660 push @{$paths{$arch->{editor_folder}}}, $arch;
353 } 661 }
354 662
355 \%paths 663 \%paths
356} 664}
357 665
… …
367 my ($a) = @_; 675 my ($a) = @_;
368 676
369 my $o = $ARCH{$a->{_name}} 677 my $o = $ARCH{$a->{_name}}
370 or return; 678 or return;
371 679
372 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"}
373 or (warn "no face data found for arch '$a->{_name}'"), return; 683 or (warn "no face data found for arch '$a->{_name}'"), return;
684 }
374 685
375 if ($face->{w} > 1 || $face->{h} > 1) { 686 if ($face->{w} > 1 || $face->{h} > 1) {
376 # bigface 687 # bigface
377 return (0, 0, $face->{w} - 1, $face->{h} - 1); 688 return (0, 0, $face->{w} - 1, $face->{h} - 1);
378 689
… …
422 my $type = $obj->{type} || $arch->{type}; 733 my $type = $obj->{type} || $arch->{type};
423 734
424 if ($type > 0) { 735 if ($type > 0) {
425 $root = $Crossfire::Data::ATTR{$type}; 736 $root = $Crossfire::Data::ATTR{$type};
426 } 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 {
427 $root = $Crossfire::Data::TYPE{Misc}; 749 $root = $Crossfire::Data::TYPE{Misc};
428
429 type:
430 for (@Crossfire::Data::ATTR0) {
431 my $req = $_->{required}
432 or die "internal error: ATTR0 without 'required'";
433
434 keys %$req;
435 while (my ($k, $v) = each %$req) {
436 next type
437 unless $obj->{$k} == $v || $arch->{$k} == $v;
438 }
439
440 $root = $_;
441 } 750 }
442 } 751 }
443 752
444 my @import = ($root); 753 my @import = ($root);
445 754
… …
487 ]; 796 ];
488 797
489 $attr 798 $attr
490} 799}
491 800
492sub arch_edit_sections {
493# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
494# edit_type = 0;
495# else if (edit_type != 0) {
496# // all flags from 'check_type' must be unset in this arch because they get recalculated now
497# edit_type &= ~check_type;
498# }
499#
500# }
501# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
502# getAttributeValue("alive", defarch) == 1 &&
503# (getAttributeValue("monster", defarch) == 1 ||
504# getAttributeValue("generator", defarch) == 1)) {
505# // Monster: monsters/npcs/generators
506# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
507# }
508# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
509# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
510# // Walls
511# edit_type |= IGUIConstants.TILE_EDIT_WALL;
512# }
513# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
514# getAttributeValue("connected", defarch) != 0) {
515# // Connected Objects
516# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
517# }
518# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
519# arch_type == 66 || arch_type == 41 || arch_type == 95) {
520# // Exit: teleporter/exit/trapdoors
521# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
522# }
523# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
524# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
525# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
526# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
527# arch_type == 124 || arch_type == 130)) {
528# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
529# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
530# }
531# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
532# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
533# arch_type == 91 || arch_type == 21 || arch_type == 24) {
534# // Door: door/special door/gates + keys
535# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
536# }
537# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
538# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
539# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
540# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
541# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
542# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
543# arch_type == 122 || arch_type == 3)) {
544# // Equipment: weapons/armour/wands/rods
545# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
546# }
547#
548# return(edit_type);
549#
550#
551}
552
553sub cache_file($$&&) { 801sub cache_file($$&&) {
554 my ($src, $cache, $load, $create) = @_; 802 my ($src, $cache, $load, $create) = @_;
555 803
556 my ($size, $mtime) = (stat $src)[7,9] 804 my ($size, $mtime) = (stat $src)[7,9]
557 or Carp::croak "$src: $!"; 805 or Carp::croak "$src: $!";
… …
619 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 867 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
620 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 868 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
621 or die "$VARDIR/tilecache.png: $!"; 869 or die "$VARDIR/tilecache.png: $!";
622 *FACE = $_[0]; 870 *FACE = $_[0];
623 }, sub { 871 }, sub {
624 require File::Temp;
625
626 my $tile = read_pak "$LIB/crossfire.0"; 872 my $tile = read_pak "$LIB/crossfire.0";
627 873
628 my %cache; 874 my %cache;
629 875
630 my $idx = 0; 876 my $idx = 0;
631 877
632 for my $name (sort keys %$tile) { 878 for my $name (sort keys %$tile) {
633 my ($fh, $filename) = File::Temp::tempfile (); 879 my $pb = new Gtk2::Gdk::PixbufLoader;
634 print $fh $tile->{$name}; 880 $pb->write ($tile->{$name});
635 close $fh; 881 $pb->close;
636 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 882 my $pb = $pb->get_pixbuf;
637 unlink $filename;
638 883
639 my $tile = $cache{$name} = { 884 my $tile = $cache{$name} = {
640 pb => $pb, 885 pb => $pb,
641 idx => $idx, 886 idx => $idx,
642 w => int $pb->get_width / TILESIZE, 887 w => int $pb->get_width / TILESIZE,
… …
660 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 905 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
661 } 906 }
662 } 907 }
663 } 908 }
664 909
665 $pb->save ("$VARDIR/tilecache.png", "png"); 910 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
666 911
667 \%cache 912 \%cache
668 }; 913 };
669} 914}
670 915

Diff Legend

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