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.67 by root, Sun Jul 30 16:05:11 2006 UTC vs.
Revision 1.114 by root, Sun Sep 16 13:28:41 2007 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.8'; 9our $VERSION = '1.0';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
16use File::Spec; 16use File::Spec;
17use List::Util qw(min max); 17use List::Util qw(min max);
18use Storable qw(freeze thaw); 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
22 *ARCH $TILE *FACE *FACEDATA
23 TILESIZE CACHESTRIDE
24 editor_archs arch_extents
22); 25);
23 26
27use JSON::XS qw(from_json to_json);
28
24our $LIB = $ENV{CROSSFIRE_LIBDIR}; 29our $LIB = $ENV{CROSSFIRE_LIBDIR};
25 30
26our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; 31our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire"
32 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
33 : File::Spec->tmpdir . "/crossfire";
27 34
28mkdir $VARDIR, 0777; 35mkdir $VARDIR, 0777;
29 36
30sub TILESIZE (){ 32 } 37sub TILESIZE (){ 32 }
38sub CACHESTRIDE (){ 64 }
31 39
32our %ARCH; 40our %ARCH;
41our %FACE; # face32
33our %FACE; 42our %FACEDATA;
34our $TILE; 43our $TILE;
35 44
36our %FIELD_MULTILINE = ( 45our %FIELD_MULTILINE = (
37 msg => "endmsg", 46 msg => "endmsg",
38 lore => "endlore", 47 lore => "endlore",
… …
44 qw(move_type move_block move_allow move_on move_off move_slow); 53 qw(move_type move_block move_allow move_on move_off move_slow);
45 54
46# same as in server save routine, to (hopefully) be compatible 55# same as in server save routine, to (hopefully) be compatible
47# to the other editors. 56# to the other editors.
48our @FIELD_ORDER_MAP = (qw( 57our @FIELD_ORDER_MAP = (qw(
58 file_format_version
49 name swap_time reset_timeout fixed_resettime difficulty region 59 name attach swap_time reset_timeout fixed_resettime difficulty region
50 shopitems shopgreed shopmin shopmax shoprace 60 shopitems shopgreed shopmin shopmax shoprace
51 darkness width height enter_x enter_y msg maplore 61 darkness width height enter_x enter_y msg maplore
52 unique template 62 unique template
53 outdoor temp pressure humid windspeed winddir sky nosmooth 63 outdoor temp pressure humid windspeed winddir sky nosmooth
54 tile_path_1 tile_path_2 tile_path_3 tile_path_4 64 tile_path_1 tile_path_2 tile_path_3 tile_path_4
55)); 65));
56 66
57our @FIELD_ORDER = (qw( 67our @FIELD_ORDER = (qw(
68 inherit
69
58 elevation 70 elevation
59 71
60 name name_pl custom_name title race 72 name name_pl custom_name attach title race
61 slaying skill msg lore other_arch face 73 slaying skill msg lore other_arch
62 #todo-events
63 animation is_animated 74 face animation is_animated
75 magicmap smoothlevel smoothface
64 str dex con wis pow cha int 76 str dex con wis pow cha int
65 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
66 exp perm_exp expmul 78 exp perm_exp expmul
67 food dam luck wc ac x y speed speed_left move_state attack_movement 79 food dam luck wc ac x y speed speed_left move_state attack_movement
68 nrof level direction type subtype attacktype 80 nrof level direction type subtype attacktype
… …
76 resist_life_stealing resist_disease 88 resist_life_stealing resist_disease
77 89
78 path_attuned path_repelled path_denied material materialname 90 path_attuned path_repelled path_denied material materialname
79 value carrying weight invisible state magic 91 value carrying weight invisible state magic
80 last_heal last_sp last_grace last_eat 92 last_heal last_sp last_grace last_eat
81 connected glow_radius randomitems npx_status npc_program 93 connected glow_radius randomitems tresure_env npx_status npc_program
82 run_away pick_up container will_apply smoothlevel 94 run_away pick_up container will_apply smoothlevel
83 current_weapon_script weapontype tooltype elevation client_type 95 current_weapon_script weapontype tooltype elevation client_type
84 item_power duration range 96 item_power duration range
85 range_modifier duration_modifier dam_modifier gen_sp_armour 97 range_modifier duration_modifier dam_modifier gen_sp_armour
86 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty 98 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
… …
97 known_magical known_cursed can_use_skill been_applied has_ready_scroll 109 known_magical known_cursed can_use_skill been_applied has_ready_scroll
98 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly 110 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
99 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark 111 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
100 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage 112 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
101 activate_on_push activate_on_release is_water use_content_on_gen is_buildable 113 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
114 precious
102 115
103 body_range body_arm body_torso body_head body_neck body_skill 116 body_range body_arm body_torso body_head body_neck body_skill
104 body_finger body_shoulder body_foot body_hand body_wrist body_waist 117 body_finger body_shoulder body_foot body_hand body_wrist body_waist
105)); 118));
106 119
… …
123sub MOVE_FLY_LOW (){ 0x02 } 136sub MOVE_FLY_LOW (){ 0x02 }
124sub MOVE_FLY_HIGH (){ 0x04 } 137sub MOVE_FLY_HIGH (){ 0x04 }
125sub MOVE_FLYING (){ 0x06 } 138sub MOVE_FLYING (){ 0x06 }
126sub MOVE_SWIM (){ 0x08 } 139sub MOVE_SWIM (){ 0x08 }
127sub MOVE_BOAT (){ 0x10 } 140sub MOVE_BOAT (){ 0x10 }
141sub MOVE_SHIP (){ 0x20 }
128sub MOVE_KNOWN (){ 0x1f } # all of above 142sub MOVE_KNOWN (){ 0x3f } # all of above
129sub MOVE_ALLBIT (){ 0x10000 }
130sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 143sub MOVE_ALL (){ 0x10000 } # very special value
144
145our %MOVE_TYPE = (
146 walk => MOVE_WALK,
147 fly_low => MOVE_FLY_LOW,
148 fly_high => MOVE_FLY_HIGH,
149 flying => MOVE_FLYING,
150 swim => MOVE_SWIM,
151 boat => MOVE_BOAT,
152 ship => MOVE_SHIP,
153 all => MOVE_ALL,
154);
155
156our @MOVE_TYPE = keys %MOVE_TYPE;
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}
131 244
132sub load_ref($) { 245sub load_ref($) {
133 my ($path) = @_; 246 my ($path) = @_;
134 247
135 open my $fh, "<:raw:perlio", $path 248 open my $fh, "<:raw:perlio", $path
… …
148 close $fh; 261 close $fh;
149 rename "$path~", $path 262 rename "$path~", $path
150 or die "$path: $!"; 263 or die "$path: $!";
151} 264}
152 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
153# object as in "Object xxx", i.e. archetypes 334# object as in "Object xxx", i.e. archetypes
154sub normalize_object($) { 335sub normalize_object($) {
155 my ($ob) = @_; 336 my ($ob) = @_;
156 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 # check whether attachment is the same as in the archetype
358 if (exists $ob->{attach}) {
359 my $arch = $ARCH{$ob->{_name}};
360 my $js = JSON::XS->new->utf8->canonical (1);
361
362 if (defined $arch->{attach}
363 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
364 delete $ob->{attach}
365 }
366 }
367
368 # color_fg is used as default for magicmap if magicmap does not exist
369 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
370
157 # nuke outdated or never supported fields 371 # nuke outdated or never supported fields
158 delete $ob->{$_} for qw( 372 delete @$ob{qw(
159 can_knockback can_parry can_impale can_cut can_dam_armour 373 can_knockback can_parry can_impale can_cut can_dam_armour
160 can_apply pass_thru can_pass_thru 374 can_apply pass_thru can_pass_thru color_bg color_fg
161 ); 375 )};
376
377 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
378 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
379 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
162 380
163 # convert movement strings to bitsets 381 # convert movement strings to bitsets
164 for my $attr (keys %FIELD_MOVEMENT) { 382 for my $attr (keys %FIELD_MOVEMENT) {
165 next unless exists $ob->{$attr}; 383 next unless exists $ob->{$attr};
166 384
167 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 385 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr};
168
169 next if $ob->{$attr} =~ /^\d+$/;
170
171 my $flags = 0;
172
173 # assume list
174 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
175 $flags |= MOVE_WALK if $flag eq "walk";
176 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
177 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
178 $flags |= MOVE_FLYING if $flag eq "flying";
179 $flags |= MOVE_SWIM if $flag eq "swim";
180 $flags |= MOVE_BOAT if $flag eq "boat";
181 $flags |= MOVE_ALL if $flag eq "all";
182
183 $flags &= ~MOVE_WALK if $flag eq "-walk";
184 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
185 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
186 $flags &= ~MOVE_FLYING if $flag eq "-flying";
187 $flags &= ~MOVE_SWIM if $flag eq "-swim";
188 $flags &= ~MOVE_BOAT if $flag eq "-boat";
189 $flags &= ~MOVE_ALL if $flag eq "-all";
190 }
191
192 $ob->{$attr} = $flags;
193 } 386 }
194 387
195 # convert outdated movement flags to new movement sets 388 # convert outdated movement flags to new movement sets
196 if (defined (my $v = delete $ob->{no_pass})) { 389 if (defined (my $v = delete $ob->{no_pass})) {
197 $ob->{move_block} = $v ? MOVE_ALL : 0; 390 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
198 } 391 }
199 if (defined (my $v = delete $ob->{slow_move})) { 392 if (defined (my $v = delete $ob->{slow_move})) {
200 $ob->{move_slow} |= MOVE_WALK; 393 $ob->{move_slow} += "walk";
201 $ob->{move_slow_penalty} = $v; 394 $ob->{move_slow_penalty} = $v;
202 } 395 }
203 if (defined (my $v = delete $ob->{walk_on})) { 396 if (defined (my $v = delete $ob->{walk_on})) {
204 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 397 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
205 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
206 : $ob->{move_on} & ~MOVE_WALK;
207 } 398 }
208 if (defined (my $v = delete $ob->{walk_off})) { 399 if (defined (my $v = delete $ob->{walk_off})) {
209 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 400 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
210 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
211 : $ob->{move_off} & ~MOVE_WALK;
212 } 401 }
213 if (defined (my $v = delete $ob->{fly_on})) { 402 if (defined (my $v = delete $ob->{fly_on})) {
214 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 403 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
215 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
216 : $ob->{move_on} & ~MOVE_FLY_LOW;
217 } 404 }
218 if (defined (my $v = delete $ob->{fly_off})) { 405 if (defined (my $v = delete $ob->{fly_off})) {
219 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 406 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
220 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
221 : $ob->{move_off} & ~MOVE_FLY_LOW;
222 } 407 }
223 if (defined (my $v = delete $ob->{flying})) { 408 if (defined (my $v = delete $ob->{flying})) {
224 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 409 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
225 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
226 : $ob->{move_type} & ~MOVE_FLY_LOW;
227 } 410 }
228 411
229 # convert idiotic event_xxx things into objects 412 # convert idiotic event_xxx things into objects
230 while (my ($event, $subtype) = each %EVENT_TYPE) { 413 while (my ($event, $subtype) = each %EVENT_TYPE) {
231 if (exists $ob->{"event_${event}_plugin"}) { 414 if (exists $ob->{"event_${event}_plugin"}) {
… …
235 slaying => delete $ob->{"event_${event}"}, 418 slaying => delete $ob->{"event_${event}"},
236 name => delete $ob->{"event_${event}_options"}, 419 name => delete $ob->{"event_${event}_options"},
237 }; 420 };
238 } 421 }
239 } 422 }
423
424 # some archetypes had "+3" instead of the canonical "3", so fix
425 $ob->{dam} *= 1 if exists $ob->{dam};
240 426
241 $ob 427 $ob
242} 428}
243 429
244# arch as in "arch xxx", ie.. objects 430# arch as in "arch xxx", ie.. objects
… …
286 } 472 }
287 473
288 $ob 474 $ob
289} 475}
290 476
477sub attr_thaw($) {
478 my ($ob) = @_;
479
480 $ob->{attach} = from_json $ob->{attach}
481 if exists $ob->{attach};
482
483 $ob
484}
485
486sub attr_freeze($) {
487 my ($ob) = @_;
488
489 $ob->{attach} = Crossfire::to_json $ob->{attach}
490 if exists $ob->{attach};
491
492 $ob
493}
494
291sub read_pak($) { 495sub read_pak($) {
292 my ($path) = @_; 496 my ($path) = @_;
293 497
294 my %pak; 498 my %pak;
295 499
… …
308sub read_arch($;$) { 512sub read_arch($;$) {
309 my ($path, $toplevel) = @_; 513 my ($path, $toplevel) = @_;
310 514
311 my %arc; 515 my %arc;
312 my ($more, $prev); 516 my ($more, $prev);
517 my $comment;
313 518
314 open my $fh, "<:raw:perlio:utf8", $path 519 open my $fh, "<:raw:perlio:utf8", $path
315 or Carp::croak "$path: $!"; 520 or Carp::croak "$path: $!";
316 521
317 binmode $fh; 522# binmode $fh;
318 523
319 my $parse_block; $parse_block = sub { 524 my $parse_block; $parse_block = sub {
320 my %arc = @_; 525 my %arc = @_;
321 526
322 while (<$fh>) { 527 while (<$fh>) {
323 s/\s+$//; 528 s/\s+$//;
324 if (/^end$/i) { 529 if (/^end$/i) {
325 last; 530 last;
531
326 } elsif (/^arch (\S+)$/i) { 532 } elsif (/^arch (\S+)$/i) {
327 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 533 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
534
328 } elsif (/^lore$/i) { 535 } elsif (/^lore$/i) {
329 while (<$fh>) { 536 while (<$fh>) {
330 last if /^endlore\s*$/i; 537 last if /^endlore\s*$/i;
331 $arc{lore} .= $_; 538 $arc{lore} .= $_;
332 } 539 }
… …
341 chomp; 548 chomp;
342 push @{ $arc{anim} }, $_; 549 push @{ $arc{anim} }, $_;
343 } 550 }
344 } elsif (/^(\S+)\s*(.*)$/) { 551 } elsif (/^(\S+)\s*(.*)$/) {
345 $arc{lc $1} = $2; 552 $arc{lc $1} = $2;
346 } elsif (/^\s*($|#)/) { 553 } elsif (/^\s*#/) {
554 $arc{_comment} .= "$_\n";
555
556 } elsif (/^\s*$/) {
347 # 557 #
348 } else { 558 } else {
349 warn "$path: unparsable line '$_' in arch $arc{_name}"; 559 warn "$path: unparsable line '$_' in arch $arc{_name}";
350 } 560 }
351 } 561 }
… …
357 s/\s+$//; 567 s/\s+$//;
358 if (/^more$/i) { 568 if (/^more$/i) {
359 $more = $prev; 569 $more = $prev;
360 } elsif (/^object (\S+)$/i) { 570 } elsif (/^object (\S+)$/i) {
361 my $name = $1; 571 my $name = $1;
362 my $arc = normalize_object $parse_block->(_name => $name); 572 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
573 undef $comment;
574 delete $arc{_comment} unless length $arc{_comment};
575 $arc->{_atype} = 'object';
363 576
364 if ($more) { 577 if ($more) {
365 $more->{more} = $arc; 578 $more->{more} = $arc;
366 } else { 579 } else {
367 $arc{$name} = $arc; 580 $arc{$name} = $arc;
368 } 581 }
369 $prev = $arc; 582 $prev = $arc;
370 $more = undef; 583 $more = undef;
371 } elsif (/^arch (\S+)$/i) { 584 } elsif (/^arch (\S+)$/i) {
372 my $name = $1; 585 my $name = $1;
373 my $arc = normalize_arch $parse_block->(_name => $name); 586 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
587 undef $comment;
588 delete $arc{_comment} unless length $arc{_comment};
589 $arc->{_atype} = 'arch';
374 590
375 if ($more) { 591 if ($more) {
376 $more->{more} = $arc; 592 $more->{more} = $arc;
377 } else { 593 } else {
378 push @{ $arc{arch} }, $arc; 594 push @{ $arc{arch} }, $arc;
… …
386 push @{$toplevel->{lev_array}}, $_+0; 602 push @{$toplevel->{lev_array}}, $_+0;
387 } 603 }
388 } else { 604 } else {
389 $toplevel->{$1} = $2; 605 $toplevel->{$1} = $2;
390 } 606 }
607 } elsif (/^\s*#/) {
608 $comment .= "$_\n";
391 } elsif (/^\s*($|#)/) { 609 } elsif (/^\s*($|#)/) {
392 # 610 #
393 } else { 611 } else {
394 die "$path: unparseable top-level line '$_'"; 612 die "$path: unparseable top-level line '$_'";
395 } 613 }
396 } 614 }
397 615
398 undef $parse_block; # work around bug in perl not freeing $fh etc. 616 undef $parse_block; # work around bug in perl not freeing $fh etc.
399 617
400 \%arc 618 \%arc
619}
620
621sub archlist_to_string {
622 my ($arch) = @_;
623
624 my $str;
625
626 my $append; $append = sub {
627 my %a = %{$_[0]};
628
629 Crossfire::attr_freeze \%a;
630 Crossfire::normalize_arch \%a;
631
632 # undo the bit-split we did before
633 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
634 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
635 | (delete $a{attack_movement_bits_4_7});
636 }
637
638 if (my $comment = delete $a{_comment}) {
639 if ($comment =~ /[^\n\s#]/) {
640 $str .= $comment;
641 }
642 }
643
644 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
645
646 my $inv = delete $a{inventory};
647 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
648 my $anim = delete $a{anim};
649
650 if ($a{_atype} eq 'object') {
651 $str .= join "\n", "anim", @$anim, "mina\n"
652 if $anim;
653 }
654
655 my @kv;
656
657 for ($a{_name} eq "map"
658 ? @Crossfire::FIELD_ORDER_MAP
659 : @Crossfire::FIELD_ORDER) {
660 push @kv, [$_, delete $a{$_}]
661 if exists $a{$_};
662 }
663
664 for (sort keys %a) {
665 next if /^_/; # ignore our _-keys
666 push @kv, [$_, delete $a{$_}];
667 }
668
669 for (@kv) {
670 my ($k, $v) = @$_;
671
672 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
673 $v =~ s/\n$//;
674 $str .= "$k\n$v\n$end\n";
675 } else {
676 $str .= "$k $v\n";
677 }
678 }
679
680 if ($inv) {
681 $append->($_) for @$inv;
682 }
683
684 $str .= "end\n";
685
686 if ($a{_atype} eq 'object') {
687 if ($more) {
688 $str .= "more\n";
689 $append->($more) if $more;
690 } else {
691 $str .= "\n";
692 }
693 }
694 };
695
696 for (@$arch) {
697 $append->($_);
698 }
699
700 $str
401} 701}
402 702
403# put all archs into a hash with editor_face as it's key 703# put all archs into a hash with editor_face as it's key
404# NOTE: the arrays in the hash values are references to 704# NOTE: the arrays in the hash values are references to
405# the archs from $ARCH 705# the archs from $ARCH
… …
426 my ($a) = @_; 726 my ($a) = @_;
427 727
428 my $o = $ARCH{$a->{_name}} 728 my $o = $ARCH{$a->{_name}}
429 or return; 729 or return;
430 730
431 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 731 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
732 unless ($face) {
733 $face = $FACE{"blank.x11"}
432 or (warn "no face data found for arch '$a->{_name}'"), return; 734 or (warn "no face data found for arch '$a->{_name}'"), return;
735 }
433 736
434 if ($face->{w} > 1 || $face->{h} > 1) { 737 if ($face->{w} > 1 || $face->{h} > 1) {
435 # bigface 738 # bigface
436 return (0, 0, $face->{w} - 1, $face->{h} - 1); 739 return (0, 0, $face->{w} - 1, $face->{h} - 1);
437 740
… …
505 808
506 my (%ignore); 809 my (%ignore);
507 my (@section_order, %section, @attr_order); 810 my (@section_order, %section, @attr_order);
508 811
509 while (my $type = shift @import) { 812 while (my $type = shift @import) {
813 push @import,
814 grep $_,
815 map $Crossfire::Data::TYPE{$_},
510 push @import, @{$type->{import} || []}; 816 @{$type->{import} || []};
511 817
512 $attr->{$_} ||= $type->{$_} 818 $attr->{$_} ||= $type->{$_}
513 for qw(name desc use); 819 for qw(name desc use);
514 820
515 for (@{$type->{ignore} || []}) { 821 for (@{$type->{ignore} || []}) {
… …
544 ]; 850 ];
545 851
546 $attr 852 $attr
547} 853}
548 854
549sub arch_edit_sections {
550# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
551# edit_type = 0;
552# else if (edit_type != 0) {
553# // all flags from 'check_type' must be unset in this arch because they get recalculated now
554# edit_type &= ~check_type;
555# }
556#
557# }
558# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
559# getAttributeValue("alive", defarch) == 1 &&
560# (getAttributeValue("monster", defarch) == 1 ||
561# getAttributeValue("generator", defarch) == 1)) {
562# // Monster: monsters/npcs/generators
563# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
564# }
565# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
566# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
567# // Walls
568# edit_type |= IGUIConstants.TILE_EDIT_WALL;
569# }
570# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
571# getAttributeValue("connected", defarch) != 0) {
572# // Connected Objects
573# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
574# }
575# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
576# arch_type == 66 || arch_type == 41 || arch_type == 95) {
577# // Exit: teleporter/exit/trapdoors
578# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
579# }
580# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
581# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
582# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
583# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
584# arch_type == 124 || arch_type == 130)) {
585# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
586# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
587# }
588# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
589# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
590# arch_type == 91 || arch_type == 21 || arch_type == 24) {
591# // Door: door/special door/gates + keys
592# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
593# }
594# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
595# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
596# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
597# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
598# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
599# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
600# arch_type == 122 || arch_type == 3)) {
601# // Equipment: weapons/armour/wands/rods
602# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
603# }
604#
605# return(edit_type);
606#
607#
608}
609
610sub cache_file($$&&) { 855sub cache_file($$&&) {
611 my ($src, $cache, $load, $create) = @_; 856 my ($src, $cache, $load, $create) = @_;
612 857
613 my ($size, $mtime) = (stat $src)[7,9] 858 my ($size, $mtime) = (stat $src)[7,9]
614 or Carp::croak "$src: $!"; 859 or Carp::croak "$src: $!";
… …
662 }, sub { 907 }, sub {
663 read_arch "$LIB/archetypes" 908 read_arch "$LIB/archetypes"
664 }; 909 };
665} 910}
666 911
912sub construct_tilecache_pb {
913 my ($idx, $cache) = @_;
914
915 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
916
917 while (my ($name, $tile) = each %$cache) {
918 my $tpb = delete $tile->{pb};
919 my $ofs = $tile->{idx};
920
921 for my $x (0 .. $tile->{w} - 1) {
922 for my $y (0 .. $tile->{h} - 1) {
923 my $idx = $ofs + $x + $y * $tile->{w};
924 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
925 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
926 }
927 }
928 }
929
930 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
931
932 $cache
933}
934
935sub use_tilecache {
936 my ($face) = @_;
937 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
938 or die "$VARDIR/tilecache.png: $!";
939 *FACE = $_[0];
940}
941
667=item load_tilecache 942=item load_tilecache
668 943
669(Re-)Load %TILE and %FACE. 944(Re-)Load %TILE and %FACE.
670 945
671=cut 946=cut
672 947
673sub load_tilecache() { 948sub load_tilecache() {
674 require Gtk2; 949 require Gtk2;
675 950
676 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 951 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
677 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
678 or die "$VARDIR/tilecache.png: $!";
679 *FACE = $_[0];
680 }, sub { 952 sub {
681 my $tile = read_pak "$LIB/crossfire.0";
682
683 my %cache; 953 my %cache;
954 my $facedata = Storable::retrieve "$LIB/facedata";
684 955
956 $facedata->{version} == 2
957 or die "$LIB/facedata: version mismatch, cannot proceed.";
958
959 my $faces = $facedata->{faceinfo};
685 my $idx = 0; 960 my $idx = 0;
686 961
687 for my $name (sort keys %$tile) { 962 for (sort keys %$faces) {
963 my ($face, $info) = ($_, $faces->{$_});
964
688 my $pb = new Gtk2::Gdk::PixbufLoader; 965 my $pb = new Gtk2::Gdk::PixbufLoader;
689 $pb->write ($tile->{$name}); 966 $pb->write ($info->{data32});
690 $pb->close; 967 $pb->close;
691 my $pb = $pb->get_pixbuf; 968 my $pb = $pb->get_pixbuf;
692 969
693 my $tile = $cache{$name} = { 970 my $tile = $cache{$face} = {
694 pb => $pb, 971 pb => $pb,
695 idx => $idx, 972 idx => $idx,
696 w => int $pb->get_width / TILESIZE, 973 w => int $pb->get_width / TILESIZE,
697 h => int $pb->get_height / TILESIZE, 974 h => int $pb->get_height / TILESIZE,
698 }; 975 };
699
700 976
701 $idx += $tile->{w} * $tile->{h}; 977 $idx += $tile->{w} * $tile->{h};
978 }
979
980 construct_tilecache_pb $idx, \%cache;
981
982 \%cache
702 } 983 };
703
704 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
705
706 while (my ($name, $tile) = each %cache) {
707 my $tpb = delete $tile->{pb};
708 my $ofs = $tile->{idx};
709
710 for my $x (0 .. $tile->{w} - 1) {
711 for my $y (0 .. $tile->{h} - 1) {
712 my $idx = $ofs + $x + $y * $tile->{w};
713 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
714 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
715 }
716 }
717 }
718
719 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
720
721 \%cache
722 };
723} 984}
724 985
725=head1 AUTHOR 986=head1 AUTHOR
726 987
727 Marc Lehmann <schmorp@schmorp.de> 988 Marc Lehmann <schmorp@schmorp.de>
… …
731 http://www.ta-sa.org/ 992 http://www.ta-sa.org/
732 993
733=cut 994=cut
734 995
7351 9961
997

Diff Legend

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