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

Diff Legend

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