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.101 by root, Tue Apr 10 09:37:03 2007 UTC

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

Diff Legend

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