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.94 by root, Sat Mar 3 20:07:04 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
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 }
51sub MOVE_ALL (){ 0xff } 143sub MOVE_KNOWN (){ 0x1f } # all of above
144sub MOVE_ALL (){ 0x10000 } # very special value
145
146our %MOVE_TYPE = (
147 walk => MOVE_WALK,
148 fly_low => MOVE_FLY_LOW,
149 fly_high => MOVE_FLY_HIGH,
150 flying => MOVE_FLYING,
151 swim => MOVE_SWIM,
152 boat => MOVE_BOAT,
153 all => MOVE_ALL,
154);
155
156our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat);
157
158{
159 package Crossfire::MoveType;
160
161 use overload
162 '=' => sub { bless [@{$_[0]}], ref $_[0] },
163 '""' => \&as_string,
164 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
165 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
166 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
167 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
168 'x=' => sub {
169 my $cur = $_[0] >= $_[1];
170 if (!defined $cur) {
171 if ($_[0] >= "all") {
172 $_[0] -= $_[1];
173 } else {
174 $_[0] += $_[1];
175 }
176 } elsif ($cur) {
177 $_[0] -= $_[1];
178 } else {
179 $_[0] /= $_[1];
180 }
181
182 $_[0]
183 },
184 'eq' => sub { "$_[0]" eq "$_[1]" },
185 'ne' => sub { "$_[0]" ne "$_[1]" },
186 ;
187}
188
189sub Crossfire::MoveType::new {
190 my ($class, $string) = @_;
191
192 my $mask;
193 my $value;
194
195 if ($string =~ /^\s*\d+\s*$/) {
196 $mask = MOVE_ALL;
197 $value = $string+0;
198 } else {
199 for (split /\s+/, lc $string) {
200 if (s/^-//) {
201 $mask |= $MOVE_TYPE{$_};
202 $value &= ~$MOVE_TYPE{$_};
203 } else {
204 $mask |= $MOVE_TYPE{$_};
205 $value |= $MOVE_TYPE{$_};
206 }
207 }
208 }
209
210 (bless [$mask, $value], $class)->normalise
211}
212
213sub Crossfire::MoveType::normalise {
214 my ($self) = @_;
215
216 if ($self->[0] & MOVE_ALL) {
217 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
218 $self->[0] &= $mask;
219 $self->[1] &= $mask;
220 }
221
222 $self->[1] &= $self->[0];
223
224 $self
225}
226
227sub Crossfire::MoveType::as_string {
228 my ($self) = @_;
229
230 my @res;
231
232 my ($mask, $value) = @$self;
233
234 for (@Crossfire::MOVE_TYPE) {
235 my $bit = $Crossfire::MOVE_TYPE{$_};
236 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
237 $mask &= ~$bit;
238 push @res, $value & $bit ? $_ : "-$_";
239 }
240 }
241
242 join " ", @res
243}
52 244
53sub load_ref($) { 245sub load_ref($) {
54 my ($path) = @_; 246 my ($path) = @_;
55 247
56 open my $fh, "<", $path 248 open my $fh, "<:raw:perlio", $path
57 or die "$path: $!"; 249 or die "$path: $!";
58 binmode $fh;
59 local $/; 250 local $/;
60 251
61 thaw <$fh> 252 thaw <$fh>
62} 253}
63 254
64sub save_ref($$) { 255sub save_ref($$) {
65 my ($ref, $path) = @_; 256 my ($ref, $path) = @_;
66 257
67 open my $fh, ">", "$path~" 258 open my $fh, ">:raw:perlio", "$path~"
68 or die "$path~: $!"; 259 or die "$path~: $!";
69 binmode $fh;
70 print $fh freeze $ref; 260 print $fh freeze $ref;
71 close $fh; 261 close $fh;
72 rename "$path~", $path 262 rename "$path~", $path
73 or die "$path: $!"; 263 or die "$path: $!";
74} 264}
75 265
266my %attack_mask = (
267 physical => 0x00000001,
268 magic => 0x00000002,
269 fire => 0x00000004,
270 electricity => 0x00000008,
271 cold => 0x00000010,
272 confusion => 0x00000020,
273 acid => 0x00000040,
274 drain => 0x00000080,
275 weaponmagic => 0x00000100,
276 ghosthit => 0x00000200,
277 poison => 0x00000400,
278 slow => 0x00000800,
279 paralyze => 0x00001000,
280 turn_undead => 0x00002000,
281 fear => 0x00004000,
282 cancellation => 0x00008000,
283 deplete => 0x00010000,
284 death => 0x00020000,
285 chaos => 0x00040000,
286 counterspell => 0x00080000,
287 godpower => 0x00100000,
288 holyword => 0x00200000,
289 blind => 0x00400000,
290 internal => 0x00800000,
291 life_stealing => 0x01000000,
292 disease => 0x02000000,
293);
294
295sub _add_resist($$$) {
296 my ($ob, $mask, $value) = @_;
297
298 while (my ($k, $v) = each %attack_mask) {
299 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
300 }
301}
302
303my %MATERIAL = reverse
304 paper => 1,
305 iron => 2,
306 glass => 4,
307 leather => 8,
308 wood => 16,
309 organic => 32,
310 stone => 64,
311 cloth => 128,
312 adamant => 256,
313 liquid => 512,
314 tin => 1024,
315 bone => 2048,
316 ice => 4096,
317
318 # guesses
319 runestone => 12,
320 bronze => 18,
321 "ancient wood" => 20,
322 glass => 36,
323 marble => 66,
324 ice => 68,
325 stone => 70,
326 stone => 80,
327 cloth => 136,
328 ironwood => 144,
329 adamantium => 258,
330 glacium => 260,
331 blood => 544,
332;
333
334# object as in "Object xxx", i.e. archetypes
76sub normalize_object($) { 335sub normalize_object($) {
77 my ($ob) = @_; 336 my ($ob) = @_;
78 337
338 # convert material bitset to materialname, if possible
339 if (exists $ob->{material}) {
340 if (!$ob->{material}) {
341 delete $ob->{material};
342 } elsif (exists $ob->{materialname}) {
343 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
344 delete $ob->{material};
345 } else {
346 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
347 delete $ob->{material}; # assume materilname is more specific and nuke material
348 }
349 } elsif (my $name = $MATERIAL{$ob->{material}}) {
350 delete $ob->{material};
351 $ob->{materialname} = $name;
352 } else {
353 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
354 }
355 }
356
357 # nuke outdated or never supported fields
79 delete $ob->{$_} for qw( 358 delete @$ob{qw(
80 can_knockback can_parry can_impale can_cut can_dam_armour 359 can_knockback can_parry can_impale can_cut can_dam_armour
81 can_apply pass_thru can_pass_thru 360 can_apply pass_thru can_pass_thru
82 ); 361 )};
83 362
84 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 363 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
364 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
365 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
366
367 # convert movement strings to bitsets
368 for my $attr (keys %FIELD_MOVEMENT) {
85 next unless exists $ob->{$attr}; 369 next unless exists $ob->{$attr};
86 next if $ob->{$attr} =~ /^\d+$/;
87 370
88 my $flags = 0; 371 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr};
89
90 # assume list
91 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
92 $flags |= MOVE_WALK if $flag eq "walk";
93 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
94 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
95 $flags |= MOVE_FLYING if $flag eq "flying";
96 $flags |= MOVE_SWIM if $flag eq "swim";
97 $flags |= MOVE_BOAT if $flag eq "boat";
98 $flags |= MOVE_ALL if $flag eq "all";
99
100 $flags &= ~MOVE_WALK if $flag eq "-walk";
101 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
102 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
103 $flags &= ~MOVE_FLYING if $flag eq "-flying";
104 $flags &= ~MOVE_SWIM if $flag eq "-swim";
105 $flags &= ~MOVE_BOAT if $flag eq "-boat";
106 $flags &= ~MOVE_ALL if $flag eq "-all";
107 }
108
109 $ob->{$attr} = $flags;
110 } 372 }
111 373
374 # convert outdated movement flags to new movement sets
112 if (defined (my $v = delete $ob->{no_pass})) { 375 if (defined (my $v = delete $ob->{no_pass})) {
113 $ob->{move_block} = $v ? MOVE_ALL : 0; 376 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
114 } 377 }
115 if (defined (my $v = delete $ob->{slow_move})) { 378 if (defined (my $v = delete $ob->{slow_move})) {
116 $ob->{move_slow} |= MOVE_WALK; 379 $ob->{move_slow} += "walk";
117 $ob->{move_slow_penalty} = $v; 380 $ob->{move_slow_penalty} = $v;
118 } 381 }
119 if (defined (my $v = delete $ob->{walk_on})) { 382 if (defined (my $v = delete $ob->{walk_on})) {
120 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 383 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
121 : $ob->{move_on} & ~MOVE_WALK;
122 } 384 }
123 if (defined (my $v = delete $ob->{walk_off})) { 385 if (defined (my $v = delete $ob->{walk_off})) {
124 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 386 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
125 : $ob->{move_off} & ~MOVE_WALK;
126 } 387 }
127 if (defined (my $v = delete $ob->{fly_on})) { 388 if (defined (my $v = delete $ob->{fly_on})) {
128 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 389 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
129 : $ob->{move_on} & ~MOVE_FLY_LOW;
130 } 390 }
131 if (defined (my $v = delete $ob->{fly_off})) { 391 if (defined (my $v = delete $ob->{fly_off})) {
132 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 392 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
133 : $ob->{move_off} & ~MOVE_FLY_LOW;
134 } 393 }
135 if (defined (my $v = delete $ob->{flying})) { 394 if (defined (my $v = delete $ob->{flying})) {
136 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 395 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
137 : $ob->{move_type} & ~MOVE_FLY_LOW;
138 } 396 }
397
398 # convert idiotic event_xxx things into objects
399 while (my ($event, $subtype) = each %EVENT_TYPE) {
400 if (exists $ob->{"event_${event}_plugin"}) {
401 push @{$ob->{inventory}}, {
402 _name => "event_$event",
403 title => delete $ob->{"event_${event}_plugin"},
404 slaying => delete $ob->{"event_${event}"},
405 name => delete $ob->{"event_${event}_options"},
406 };
407 }
408 }
409
410 # some archetypes had "+3" instead of the canonical "3", so fix
411 $ob->{dam} *= 1 if exists $ob->{dam};
139 412
140 $ob 413 $ob
141} 414}
142 415
416# arch as in "arch xxx", ie.. objects
143sub normalize_arch($) { 417sub normalize_arch($) {
144 my ($ob) = @_; 418 my ($ob) = @_;
145 419
146 normalize_object $ob; 420 normalize_object $ob;
147 421
… …
174 delete $ob->{$k}; 448 delete $ob->{$k};
175 } 449 }
176 } 450 }
177 } 451 }
178 452
453 # a speciality for the editor
454 if (exists $ob->{attack_movement}) {
455 my $am = delete $ob->{attack_movement};
456 $ob->{attack_movement_bits_0_3} = $am & 15;
457 $ob->{attack_movement_bits_4_7} = $am & 240;
458 }
459
460 $ob
461}
462
463sub attr_thaw($) {
464 my ($ob) = @_;
465
466 $ob->{attach} = from_json $ob->{attach}
467 if exists $ob->{attach};
468
469 $ob
470}
471
472sub attr_freeze($) {
473 my ($ob) = @_;
474
475 $ob->{attach} = Crossfire::to_json $ob->{attach}
476 if exists $ob->{attach};
477
179 $ob 478 $ob
180} 479}
181 480
182sub read_pak($) { 481sub read_pak($) {
183 my ($path) = @_; 482 my ($path) = @_;
184 483
185 my %pak; 484 my %pak;
186 485
187 open my $fh, "<", $path 486 open my $fh, "<:raw:perlio", $path
188 or Carp::croak "$_[0]: $!"; 487 or Carp::croak "$_[0]: $!";
189 binmode $fh; 488 binmode $fh;
190 while (<$fh>) { 489 while (<$fh>) {
191 my ($type, $id, $len, $path) = split; 490 my ($type, $id, $len, $path) = split;
192 $path =~ s/.*\///; 491 $path =~ s/.*\///;
… …
194 } 493 }
195 494
196 \%pak 495 \%pak
197} 496}
198 497
199sub read_arch($) { 498sub read_arch($;$) {
200 my ($path) = @_; 499 my ($path, $toplevel) = @_;
201 500
202 my %arc; 501 my %arc;
203 my ($more, $prev); 502 my ($more, $prev);
503 my $comment;
204 504
205 open my $fh, "<", $path 505 open my $fh, "<:raw:perlio:utf8", $path
206 or Carp::croak "$path: $!"; 506 or Carp::croak "$path: $!";
207 507
208 binmode $fh; 508# binmode $fh;
209 509
210 my $parse_block; $parse_block = sub { 510 my $parse_block; $parse_block = sub {
211 my %arc = @_; 511 my %arc = @_;
212 512
213 while (<$fh>) { 513 while (<$fh>) {
214 s/\s+$//; 514 s/\s+$//;
215 if (/^end$/i) { 515 if (/^end$/i) {
216 last; 516 last;
517
217 } elsif (/^arch (\S+)$/) { 518 } elsif (/^arch (\S+)$/i) {
218 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 519 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
520
219 } elsif (/^lore$/) { 521 } elsif (/^lore$/i) {
220 while (<$fh>) { 522 while (<$fh>) {
221 last if /^endlore\s*$/i; 523 last if /^endlore\s*$/i;
222 $arc{lore} .= $_; 524 $arc{lore} .= $_;
223 } 525 }
224 } elsif (/^msg$/) { 526 } elsif (/^msg$/i) {
225 while (<$fh>) { 527 while (<$fh>) {
226 last if /^endmsg\s*$/i; 528 last if /^endmsg\s*$/i;
227 $arc{msg} .= $_; 529 $arc{msg} .= $_;
228 } 530 }
531 } elsif (/^anim$/i) {
532 while (<$fh>) {
533 last if /^mina\s*$/i;
534 chomp;
535 push @{ $arc{anim} }, $_;
536 }
229 } elsif (/^(\S+)\s*(.*)$/) { 537 } elsif (/^(\S+)\s*(.*)$/) {
230 $arc{lc $1} = $2; 538 $arc{lc $1} = $2;
231 } elsif (/^\s*($|#)/) { 539 } elsif (/^\s*#/) {
540 $arc{_comment} .= "$_\n";
541
542 } elsif (/^\s*$/) {
232 # 543 #
233 } else { 544 } else {
234 warn "$path: unparsable line '$_' in arch $arc{_name}"; 545 warn "$path: unparsable line '$_' in arch $arc{_name}";
235 } 546 }
236 } 547 }
… …
242 s/\s+$//; 553 s/\s+$//;
243 if (/^more$/i) { 554 if (/^more$/i) {
244 $more = $prev; 555 $more = $prev;
245 } elsif (/^object (\S+)$/i) { 556 } elsif (/^object (\S+)$/i) {
246 my $name = $1; 557 my $name = $1;
247 my $arc = normalize_object $parse_block->(_name => $name); 558 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
559 undef $comment;
560 delete $arc{_comment} unless length $arc{_comment};
561 $arc->{_atype} = 'object';
248 562
249 if ($more) { 563 if ($more) {
250 $more->{more} = $arc; 564 $more->{more} = $arc;
251 } else { 565 } else {
252 $arc{$name} = $arc; 566 $arc{$name} = $arc;
253 } 567 }
254 $prev = $arc; 568 $prev = $arc;
255 $more = undef; 569 $more = undef;
256 } elsif (/^arch (\S+)$/i) { 570 } elsif (/^arch (\S+)$/i) {
257 push @{ $arc{arch} }, normalize_arch $parse_block->(_name => $1); 571 my $name = $1;
572 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
573 undef $comment;
574 delete $arc{_comment} unless length $arc{_comment};
575 $arc->{_atype} = 'arch';
576
577 if ($more) {
578 $more->{more} = $arc;
579 } else {
580 push @{ $arc{arch} }, $arc;
581 }
582 $prev = $arc;
583 $more = undef;
584 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
585 if ($1 eq "lev_array") {
586 while (<$fh>) {
587 last if /^endplst\s*$/;
588 push @{$toplevel->{lev_array}}, $_+0;
589 }
590 } else {
591 $toplevel->{$1} = $2;
592 }
593 } elsif (/^\s*#/) {
594 $comment .= "$_\n";
258 } elsif (/^\s*($|#)/) { 595 } elsif (/^\s*($|#)/) {
259 # 596 #
260 } else { 597 } else {
261 warn "$path: unparseable top-level line '$_'"; 598 die "$path: unparseable top-level line '$_'";
262 } 599 }
263 } 600 }
264 601
265 undef $parse_block; # work around bug in perl not freeing $fh etc. 602 undef $parse_block; # work around bug in perl not freeing $fh etc.
266 603
267 \%arc 604 \%arc
605}
606
607sub archlist_to_string {
608 my ($arch) = @_;
609
610 my $str;
611
612 my $append; $append = sub {
613 my %a = %{$_[0]};
614
615 Crossfire::attr_freeze \%a;
616 Crossfire::normalize_arch \%a;
617
618 # undo the bit-split we did before
619 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
620 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
621 | (delete $a{attack_movement_bits_4_7});
622 }
623
624 if (my $comment = delete $a{_comment}) {
625 if ($comment =~ /[^\n\s#]/) {
626 $str .= $comment;
627 }
628 }
629
630 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
631
632 my $inv = delete $a{inventory};
633 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
634 my $anim = delete $a{anim};
635
636 if ($a{_atype} eq 'object') {
637 $str .= join "\n", "anim", @$anim, "mina\n"
638 if $anim;
639 }
640
641 my @kv;
642
643 for ($a{_name} eq "map"
644 ? @Crossfire::FIELD_ORDER_MAP
645 : @Crossfire::FIELD_ORDER) {
646 push @kv, [$_, delete $a{$_}]
647 if exists $a{$_};
648 }
649
650 for (sort keys %a) {
651 next if /^_/; # ignore our _-keys
652 push @kv, [$_, delete $a{$_}];
653 }
654
655 for (@kv) {
656 my ($k, $v) = @$_;
657
658 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
659 $v =~ s/\n$//;
660 $str .= "$k\n$v\n$end\n";
661 } else {
662 $str .= "$k $v\n";
663 }
664 }
665
666 if ($inv) {
667 $append->($_) for @$inv;
668 }
669
670 $str .= "end\n";
671
672 if ($a{_atype} eq 'object') {
673 if ($more) {
674 $str .= "more\n";
675 $append->($more) if $more;
676 } else {
677 $str .= "\n";
678 }
679 }
680 };
681
682 for (@$arch) {
683 $append->($_);
684 }
685
686 $str
268} 687}
269 688
270# put all archs into a hash with editor_face as it's key 689# put all archs into a hash with editor_face as it's key
271# NOTE: the arrays in the hash values are references to 690# NOTE: the arrays in the hash values are references to
272# the archs from $ARCH 691# the archs from $ARCH
273sub editor_archs { 692sub editor_archs {
274 my %paths; 693 my %paths;
275 694
276 for (keys %ARCH) { 695 for (keys %ARCH) {
277 my $arch = $ARCH{$_}; 696 my $arch = $ARCH{$_};
278 push @{$paths{$arch->{editor_folder}}}, \$arch; 697 push @{$paths{$arch->{editor_folder}}}, $arch;
279 } 698 }
280 699
281 \%paths 700 \%paths
282} 701}
283 702
… …
293 my ($a) = @_; 712 my ($a) = @_;
294 713
295 my $o = $ARCH{$a->{_name}} 714 my $o = $ARCH{$a->{_name}}
296 or return; 715 or return;
297 716
298 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 717 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
718 unless ($face) {
719 $face = $FACE{"blank.x11"}
299 or (warn "no face data found for arch '$a->{_name}'"), return; 720 or (warn "no face data found for arch '$a->{_name}'"), return;
721 }
300 722
301 if ($face->{w} > 1 || $face->{h} > 1) { 723 if ($face->{w} > 1 || $face->{h} > 1) {
302 # bigface 724 # bigface
303 return (0, 0, $face->{w} - 1, $face->{h} - 1); 725 return (0, 0, $face->{w} - 1, $face->{h} - 1);
304 726
… …
348 my $type = $obj->{type} || $arch->{type}; 770 my $type = $obj->{type} || $arch->{type};
349 771
350 if ($type > 0) { 772 if ($type > 0) {
351 $root = $Crossfire::Data::ATTR{$type}; 773 $root = $Crossfire::Data::ATTR{$type};
352 } else { 774 } else {
775 my %a = (%$arch, %$obj);
776
777 if ($a{is_floor} && !$a{alive}) {
778 $root = $Crossfire::Data::TYPE{Floor};
779 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
780 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
781 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
782 $root = $Crossfire::Data::TYPE{Wall};
783 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
784 $root = $Crossfire::Data::TYPE{"Weak Wall"};
785 } else {
353 $root = $Crossfire::Data::TYPE{Misc}; 786 $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 } 787 }
368 } 788 }
369 789
370 my @import = ($root); 790 my @import = ($root);
371 791
… …
413 ]; 833 ];
414 834
415 $attr 835 $attr
416} 836}
417 837
418sub arch_edit_sections {
419# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
420# edit_type = 0;
421# else if (edit_type != 0) {
422# // all flags from 'check_type' must be unset in this arch because they get recalculated now
423# edit_type &= ~check_type;
424# }
425#
426# }
427# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
428# getAttributeValue("alive", defarch) == 1 &&
429# (getAttributeValue("monster", defarch) == 1 ||
430# getAttributeValue("generator", defarch) == 1)) {
431# // Monster: monsters/npcs/generators
432# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
433# }
434# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
435# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
436# // Walls
437# edit_type |= IGUIConstants.TILE_EDIT_WALL;
438# }
439# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
440# getAttributeValue("connected", defarch) != 0) {
441# // Connected Objects
442# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
443# }
444# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
445# arch_type == 66 || arch_type == 41 || arch_type == 95) {
446# // Exit: teleporter/exit/trapdoors
447# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
448# }
449# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
450# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
451# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
452# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
453# arch_type == 124 || arch_type == 130)) {
454# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
455# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
456# }
457# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
458# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
459# arch_type == 91 || arch_type == 21 || arch_type == 24) {
460# // Door: door/special door/gates + keys
461# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
462# }
463# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
464# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
465# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
466# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
467# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
468# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
469# arch_type == 122 || arch_type == 3)) {
470# // Equipment: weapons/armour/wands/rods
471# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
472# }
473#
474# return(edit_type);
475#
476#
477}
478
479sub cache_file($$&&) { 838sub cache_file($$&&) {
480 my ($src, $cache, $load, $create) = @_; 839 my ($src, $cache, $load, $create) = @_;
481 840
482 my ($size, $mtime) = (stat $src)[7,9] 841 my ($size, $mtime) = (stat $src)[7,9]
483 or Carp::croak "$src: $!"; 842 or Carp::croak "$src: $!";
… …
545 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 904 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
546 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 905 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
547 or die "$VARDIR/tilecache.png: $!"; 906 or die "$VARDIR/tilecache.png: $!";
548 *FACE = $_[0]; 907 *FACE = $_[0];
549 }, sub { 908 }, sub {
550 require File::Temp;
551
552 my $tile = read_pak "$LIB/crossfire.0"; 909 my $tile = read_pak "$LIB/crossfire.0";
553 910
554 my %cache; 911 my %cache;
555 912
556 my $idx = 0; 913 my $idx = 0;
557 914
558 for my $name (sort keys %$tile) { 915 for my $name (sort keys %$tile) {
559 my ($fh, $filename) = File::Temp::tempfile (); 916 my $pb = new Gtk2::Gdk::PixbufLoader;
560 print $fh $tile->{$name}; 917 $pb->write ($tile->{$name});
561 close $fh; 918 $pb->close;
562 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 919 my $pb = $pb->get_pixbuf;
563 unlink $filename;
564 920
565 my $tile = $cache{$name} = { 921 my $tile = $cache{$name} = {
566 pb => $pb, 922 pb => $pb,
567 idx => $idx, 923 idx => $idx,
568 w => int $pb->get_width / TILESIZE, 924 w => int $pb->get_width / TILESIZE,
… …
586 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 942 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
587 } 943 }
588 } 944 }
589 } 945 }
590 946
591 $pb->save ("$VARDIR/tilecache.png", "png"); 947 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
592 948
593 \%cache 949 \%cache
594 }; 950 };
595} 951}
596 952

Diff Legend

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