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.54 by root, Thu Mar 23 06:45:23 2006 UTC vs.
Revision 1.128 by root, Sun Sep 28 05:58:01 2008 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire - Crossfire maphandling 3Deliantra - Deliantra suppport module to read/write archetypes, maps etc.
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Deliantra;
8 8
9our $VERSION = '0.1'; 9our $VERSION = '1.222';
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(decode_json encode_json);
28
24our $LIB = $ENV{CROSSFIRE_LIBDIR}; 29our $LIB = $ENV{DELIANTRA_LIBDIR};
25 30
26our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; 31our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
32 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
33 : File::Spec->tmpdir . "/deliantra";
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",
39 maplore => "endmaplore", 48 maplore => "endmaplore",
40); 49);
41 50
51# movement bit type, PITA
52our %FIELD_MOVEMENT = map +($_ => undef),
53 qw(move_type move_block move_allow move_on move_off move_slow);
54
42# same as in server save routine, to (hopefully) be compatible 55# same as in server save routine, to (hopefully) be compatible
43# to the other editors. 56# to the other editors.
57our @FIELD_ORDER_MAP = (qw(
58 file_format_version
59 name attach swap_time reset_timeout fixed_resettime difficulty region
60 shopitems shopgreed shopmin shopmax shoprace
61 darkness width height enter_x enter_y msg maplore
62 unique template
63 outdoor temp pressure humid windspeed winddir sky nosmooth
64 tile_path_1 tile_path_2 tile_path_3 tile_path_4
65));
66
44our @FIELD_ORDER = (qw( 67our @FIELD_ORDER = (qw(
68 inherit
69
70 elevation
71
45 name name_pl custom_name title race 72 name name_pl custom_name attach title race
46 slaying skill msg lore other_arch face 73 slaying skill msg lore other_arch
47 #events 74 sound sound_destroy face animation is_animated
48 animation is_animated 75 magicmap smoothlevel smoothface
49 Str Dex Con Wis Pow Cha Int 76 str dex con wis pow cha int
50 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
51 exp perm_exp expmul 78 exp perm_exp expmul
52 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
53 nrof level direction type subtype 80 nrof level direction type subtype attacktype
54 81
55 resist_physical resist_magic resist_fire resist_electricity 82 resist_physical resist_magic resist_fire resist_electricity
56 resist_cold resist_confusion resist_acid resist_drain 83 resist_cold resist_confusion resist_acid resist_drain
57 resist_weaponmagic resist_ghosthit resist_poison resist_slow 84 resist_weaponmagic resist_ghosthit resist_poison resist_slow
58 resist_paralyze resist_turn_undead resist_fear resist_cancellation 85 resist_paralyze resist_turn_undead resist_fear resist_cancellation
… …
61 resist_life_stealing resist_disease 88 resist_life_stealing resist_disease
62 89
63 path_attuned path_repelled path_denied material materialname 90 path_attuned path_repelled path_denied material materialname
64 value carrying weight invisible state magic 91 value carrying weight invisible state magic
65 last_heal last_sp last_grace last_eat 92 last_heal last_sp last_grace last_eat
66 connected glow_radius randomitems npx_status npc_program 93 connected glow_radius randomitems tresure_env npx_status npc_program
67 run_away pick_up container will_apply smoothlevel 94 run_away pick_up container will_apply smoothlevel
68 current_weapon_script weapontype tooltype elevation client_type 95 current_weapon_script weapontype tooltype elevation client_type
69 item_power duration range 96 item_power duration range
70 range_modifier duration_modifier dam_modifier gen_sp_armour 97 range_modifier duration_modifier dam_modifier gen_sp_armour
71 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
… …
82 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
83 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
84 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
85 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
86 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
87 115
88 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
89 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
90)); 118));
119
120our %EVENT_TYPE = (
121 apply => 1,
122 attack => 2,
123 death => 3,
124 drop => 4,
125 pickup => 5,
126 say => 6,
127 stop => 7,
128 time => 8,
129 throw => 9,
130 trigger => 10,
131 close => 11,
132 timer => 12,
133);
91 134
92sub MOVE_WALK (){ 0x01 } 135sub MOVE_WALK (){ 0x01 }
93sub MOVE_FLY_LOW (){ 0x02 } 136sub MOVE_FLY_LOW (){ 0x02 }
94sub MOVE_FLY_HIGH (){ 0x04 } 137sub MOVE_FLY_HIGH (){ 0x04 }
95sub MOVE_FLYING (){ 0x06 } 138sub MOVE_FLYING (){ 0x06 }
96sub MOVE_SWIM (){ 0x08 } 139sub MOVE_SWIM (){ 0x08 }
97sub MOVE_BOAT (){ 0x10 } 140sub MOVE_BOAT (){ 0x10 }
98sub MOVE_ALL (){ 0xff } 141sub MOVE_SHIP (){ 0x20 }
142sub MOVE_KNOWN (){ 0x3f } # all of above
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 Deliantra::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 Deliantra::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 Deliantra::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 Deliantra::MoveType::as_string {
228 my ($self) = @_;
229
230 my @res;
231
232 my ($mask, $value) = @$self;
233
234 for (@Deliantra::MOVE_TYPE) {
235 my $bit = $Deliantra::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}
99 244
100sub load_ref($) { 245sub load_ref($) {
101 my ($path) = @_; 246 my ($path) = @_;
102 247
103 open my $fh, "<", $path 248 open my $fh, "<:raw:perlio", $path
104 or die "$path: $!"; 249 or die "$path: $!";
105 binmode $fh;
106 local $/; 250 local $/;
107 251
108 thaw <$fh> 252 thaw <$fh>
109} 253}
110 254
111sub save_ref($$) { 255sub save_ref($$) {
112 my ($ref, $path) = @_; 256 my ($ref, $path) = @_;
113 257
114 open my $fh, ">", "$path~" 258 open my $fh, ">:raw:perlio", "$path~"
115 or die "$path~: $!"; 259 or die "$path~: $!";
116 binmode $fh;
117 print $fh freeze $ref; 260 print $fh freeze $ref;
118 close $fh; 261 close $fh;
119 rename "$path~", $path 262 rename "$path~", $path
120 or die "$path: $!"; 263 or die "$path: $!";
121} 264}
122 265
266my %attack_mask = (
267 physical => 0x00000001,
268 magic => 0x00000002,
269 fire => 0x00000004,
270 electricity => 0x00000008,
271 cold => 0x00000010,
272 confusion => 0x00000020,
273 acid => 0x00000040,
274 drain => 0x00000080,
275 weaponmagic => 0x00000100,
276 ghosthit => 0x00000200,
277 poison => 0x00000400,
278 slow => 0x00000800,
279 paralyze => 0x00001000,
280 turn_undead => 0x00002000,
281 fear => 0x00004000,
282 cancellation => 0x00008000,
283 deplete => 0x00010000,
284 death => 0x00020000,
285 chaos => 0x00040000,
286 counterspell => 0x00080000,
287 godpower => 0x00100000,
288 holyword => 0x00200000,
289 blind => 0x00400000,
290 internal => 0x00800000,
291 life_stealing => 0x01000000,
292 disease => 0x02000000,
293);
294
295sub _add_resist($$$) {
296 my ($ob, $mask, $value) = @_;
297
298 while (my ($k, $v) = each %attack_mask) {
299 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
300 }
301}
302
303my %MATERIAL = reverse
304 paper => 1,
305 iron => 2,
306 glass => 4,
307 leather => 8,
308 wood => 16,
309 organic => 32,
310 stone => 64,
311 cloth => 128,
312 adamant => 256,
313 liquid => 512,
314 tin => 1024,
315 bone => 2048,
316 ice => 4096,
317
318 # guesses
319 runestone => 12,
320 bronze => 18,
321 "ancient wood" => 20,
322 glass => 36,
323 marble => 66,
324 ice => 68,
325 stone => 70,
326 stone => 80,
327 cloth => 136,
328 ironwood => 144,
329 adamantium => 258,
330 glacium => 260,
331 blood => 544,
332;
333
334# object as in "Object xxx", i.e. archetypes
123sub normalize_object($) { 335sub normalize_object($) {
124 my ($ob) = @_; 336 my ($ob) = @_;
125 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
371 # nuke outdated or never supported fields
126 delete $ob->{$_} for qw( 372 delete @$ob{qw(
127 can_knockback can_parry can_impale can_cut can_dam_armour 373 can_knockback can_parry can_impale can_cut can_dam_armour
128 can_apply pass_thru can_pass_thru 374 can_apply pass_thru can_pass_thru color_bg color_fg
129 ); 375 )};
130 376
131 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 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; }
380
381 # convert movement strings to bitsets
382 for my $attr (keys %FIELD_MOVEMENT) {
132 next unless exists $ob->{$attr}; 383 next unless exists $ob->{$attr};
133 next if $ob->{$attr} =~ /^\d+$/;
134 384
135 my $flags = 0; 385 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
136
137 # assume list
138 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
139 $flags |= MOVE_WALK if $flag eq "walk";
140 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
141 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
142 $flags |= MOVE_FLYING if $flag eq "flying";
143 $flags |= MOVE_SWIM if $flag eq "swim";
144 $flags |= MOVE_BOAT if $flag eq "boat";
145 $flags |= MOVE_ALL if $flag eq "all";
146
147 $flags &= ~MOVE_WALK if $flag eq "-walk";
148 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
149 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
150 $flags &= ~MOVE_FLYING if $flag eq "-flying";
151 $flags &= ~MOVE_SWIM if $flag eq "-swim";
152 $flags &= ~MOVE_BOAT if $flag eq "-boat";
153 $flags &= ~MOVE_ALL if $flag eq "-all";
154 }
155
156 $ob->{$attr} = $flags;
157 } 386 }
158 387
388 # convert outdated movement flags to new movement sets
159 if (defined (my $v = delete $ob->{no_pass})) { 389 if (defined (my $v = delete $ob->{no_pass})) {
160 $ob->{move_block} = $v ? MOVE_ALL : 0; 390 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
161 } 391 }
162 if (defined (my $v = delete $ob->{slow_move})) { 392 if (defined (my $v = delete $ob->{slow_move})) {
163 $ob->{move_slow} |= MOVE_WALK; 393 $ob->{move_slow} += "walk";
164 $ob->{move_slow_penalty} = $v; 394 $ob->{move_slow_penalty} = $v;
165 } 395 }
166 if (defined (my $v = delete $ob->{walk_on})) { 396 if (defined (my $v = delete $ob->{walk_on})) {
167 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 397 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
168 : $ob->{move_on} & ~MOVE_WALK;
169 } 398 }
170 if (defined (my $v = delete $ob->{walk_off})) { 399 if (defined (my $v = delete $ob->{walk_off})) {
171 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 400 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
172 : $ob->{move_off} & ~MOVE_WALK;
173 } 401 }
174 if (defined (my $v = delete $ob->{fly_on})) { 402 if (defined (my $v = delete $ob->{fly_on})) {
175 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 403 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
176 : $ob->{move_on} & ~MOVE_FLY_LOW;
177 } 404 }
178 if (defined (my $v = delete $ob->{fly_off})) { 405 if (defined (my $v = delete $ob->{fly_off})) {
179 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 406 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
180 : $ob->{move_off} & ~MOVE_FLY_LOW;
181 } 407 }
182 if (defined (my $v = delete $ob->{flying})) { 408 if (defined (my $v = delete $ob->{flying})) {
183 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 409 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
184 : $ob->{move_type} & ~MOVE_FLY_LOW;
185 } 410 }
411
412 # convert idiotic event_xxx things into objects
413 while (my ($event, $subtype) = each %EVENT_TYPE) {
414 if (exists $ob->{"event_${event}_plugin"}) {
415 push @{$ob->{inventory}}, {
416 _name => "event_$event",
417 title => delete $ob->{"event_${event}_plugin"},
418 slaying => delete $ob->{"event_${event}"},
419 name => delete $ob->{"event_${event}_options"},
420 };
421 }
422 }
423
424 # some archetypes had "+3" instead of the canonical "3", so fix
425 $ob->{dam} *= 1 if exists $ob->{dam};
186 426
187 $ob 427 $ob
188} 428}
189 429
430# arch as in "arch xxx", ie.. objects
190sub normalize_arch($) { 431sub normalize_arch($) {
191 my ($ob) = @_; 432 my ($ob) = @_;
192 433
193 normalize_object $ob; 434 normalize_object $ob;
435
436 return if $ob->{_atype} eq "object";
194 437
195 my $arch = $ARCH{$ob->{_name}} 438 my $arch = $ARCH{$ob->{_name}}
196 or (warn "$ob->{_name}: no such archetype", return $ob); 439 or (warn "$ob->{_name}: no such archetype", return $ob);
197 440
198 if ($arch->{type} == 22) { # map 441 if ($arch->{type} == 22) { # map
… …
221 delete $ob->{$k}; 464 delete $ob->{$k};
222 } 465 }
223 } 466 }
224 } 467 }
225 468
469 # a speciality for the editor
470 if (exists $ob->{attack_movement}) {
471 my $am = delete $ob->{attack_movement};
472 $ob->{attack_movement_bits_0_3} = $am & 15;
473 $ob->{attack_movement_bits_4_7} = $am & 240;
474 }
475
476 $ob
477}
478
479sub attr_thaw($) {
480 my ($ob) = @_;
481
482 $ob->{attach} = decode_json $ob->{attach}
483 if exists $ob->{attach};
484
485 $ob
486}
487
488sub attr_freeze($) {
489 my ($ob) = @_;
490
491 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
492 if exists $ob->{attach};
493
226 $ob 494 $ob
227} 495}
228 496
229sub read_pak($) { 497sub read_pak($) {
230 my ($path) = @_; 498 my ($path) = @_;
231 499
232 my %pak; 500 my %pak;
233 501
234 open my $fh, "<", $path 502 open my $fh, "<:raw:perlio", $path
235 or Carp::croak "$_[0]: $!"; 503 or Carp::croak "$_[0]: $!";
236 binmode $fh; 504 binmode $fh;
237 while (<$fh>) { 505 while (<$fh>) {
238 my ($type, $id, $len, $path) = split; 506 my ($type, $id, $len, $path) = split;
239 $path =~ s/.*\///; 507 $path =~ s/.*\///;
… …
241 } 509 }
242 510
243 \%pak 511 \%pak
244} 512}
245 513
246sub read_arch($) { 514sub read_arch($;$) {
247 my ($path) = @_; 515 my ($path, $toplevel) = @_;
248 516
249 my %arc; 517 my %arc;
250 my ($more, $prev); 518 my ($more, $prev);
519 my $comment;
251 520
252 open my $fh, "<", $path 521 open my $fh, "<:utf8", $path
253 or Carp::croak "$path: $!"; 522 or Carp::croak "$path: $!";
254 523
255 binmode $fh; 524# binmode $fh;
256 525
257 my $parse_block; $parse_block = sub { 526 my $parse_block; $parse_block = sub {
258 my %arc = @_; 527 my %arc = @_;
259 528
260 while (<$fh>) { 529 while (<$fh>) {
261 s/\s+$//; 530 s/\s+$//;
262 if (/^end$/i) { 531 if (/^end$/i) {
263 last; 532 last;
533
264 } elsif (/^arch (\S+)$/) { 534 } elsif (/^arch (\S+)$/i) {
265 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 535 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
536
266 } elsif (/^lore$/) { 537 } elsif (/^lore$/i) {
267 while (<$fh>) { 538 while (<$fh>) {
268 last if /^endlore\s*$/i; 539 last if /^endlore\s*$/i;
269 $arc{lore} .= $_; 540 $arc{lore} .= $_;
270 } 541 }
271 } elsif (/^msg$/) { 542 } elsif (/^msg$/i) {
272 while (<$fh>) { 543 while (<$fh>) {
273 last if /^endmsg\s*$/i; 544 last if /^endmsg\s*$/i;
274 $arc{msg} .= $_; 545 $arc{msg} .= $_;
275 } 546 }
547 } elsif (/^anim$/i) {
548 while (<$fh>) {
549 last if /^mina\s*$/i;
550 chomp;
551 push @{ $arc{anim} }, $_;
552 }
276 } elsif (/^(\S+)\s*(.*)$/) { 553 } elsif (/^(\S+)\s*(.*)$/) {
277 $arc{lc $1} = $2; 554 $arc{lc $1} = $2;
278 } elsif (/^\s*($|#)/) { 555 } elsif (/^\s*#/) {
556 $arc{_comment} .= "$_\n";
557
558 } elsif (/^\s*$/) {
279 # 559 #
280 } else { 560 } else {
281 warn "$path: unparsable line '$_' in arch $arc{_name}"; 561 warn "$path: unparsable line '$_' in arch $arc{_name}";
282 } 562 }
283 } 563 }
… …
289 s/\s+$//; 569 s/\s+$//;
290 if (/^more$/i) { 570 if (/^more$/i) {
291 $more = $prev; 571 $more = $prev;
292 } elsif (/^object (\S+)$/i) { 572 } elsif (/^object (\S+)$/i) {
293 my $name = $1; 573 my $name = $1;
294 my $arc = normalize_object $parse_block->(_name => $name); 574 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
575 undef $comment;
576 delete $arc{_comment} unless length $arc{_comment};
577 $arc->{_atype} = 'object';
295 578
296 if ($more) { 579 if ($more) {
297 $more->{more} = $arc; 580 $more->{more} = $arc;
298 } else { 581 } else {
299 $arc{$name} = $arc; 582 $arc{$name} = $arc;
300 } 583 }
301 $prev = $arc; 584 $prev = $arc;
302 $more = undef; 585 $more = undef;
303 } elsif (/^arch (\S+)$/i) { 586 } elsif (/^arch (\S+)$/i) {
304 push @{ $arc{arch} }, normalize_arch $parse_block->(_name => $1); 587 my $name = $1;
588 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
589 undef $comment;
590 delete $arc{_comment} unless length $arc{_comment};
591 $arc->{_atype} = 'arch';
592
593 if ($more) {
594 $more->{more} = $arc;
595 } else {
596 push @{ $arc{arch} }, $arc;
597 }
598 $prev = $arc;
599 $more = undef;
600 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
601 if ($1 eq "lev_array") {
602 while (<$fh>) {
603 last if /^endplst\s*$/;
604 push @{$toplevel->{lev_array}}, $_+0;
605 }
606 } else {
607 $toplevel->{$1} = $2;
608 }
609 } elsif (/^\s*#/) {
610 $comment .= "$_\n";
305 } elsif (/^\s*($|#)/) { 611 } elsif (/^\s*($|#)/) {
306 # 612 #
307 } else { 613 } else {
308 warn "$path: unparseable top-level line '$_'"; 614 die "$path: unparseable top-level line '$_'";
309 } 615 }
310 } 616 }
311 617
312 undef $parse_block; # work around bug in perl not freeing $fh etc. 618 undef $parse_block; # work around bug in perl not freeing $fh etc.
313 619
314 \%arc 620 \%arc
621}
622
623sub archlist_to_string {
624 my ($arch) = @_;
625
626 my $str;
627
628 my $append; $append = sub {
629 my %a = %{$_[0]};
630
631 Deliantra::attr_freeze \%a;
632 Deliantra::normalize_arch \%a;
633
634 # undo the bit-split we did before
635 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
636 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
637 | (delete $a{attack_movement_bits_4_7});
638 }
639
640 if (my $comment = delete $a{_comment}) {
641 if ($comment =~ /[^\n\s#]/) {
642 $str .= $comment;
643 }
644 }
645
646 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
647
648 my $inv = delete $a{inventory};
649 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
650 my $anim = delete $a{anim};
651
652 if ($a{_atype} eq 'object') {
653 $str .= join "\n", "anim", @$anim, "mina\n"
654 if $anim;
655 }
656
657 my @kv;
658
659 for ($a{_name} eq "map"
660 ? @Deliantra::FIELD_ORDER_MAP
661 : @Deliantra::FIELD_ORDER) {
662 push @kv, [$_, delete $a{$_}]
663 if exists $a{$_};
664 }
665
666 for (sort keys %a) {
667 next if /^_/; # ignore our _-keys
668 push @kv, [$_, delete $a{$_}];
669 }
670
671 for (@kv) {
672 my ($k, $v) = @$_;
673
674 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
675 $v =~ s/\n$//;
676 $str .= "$k\n$v\n$end\n";
677 } else {
678 $str .= "$k $v\n";
679 }
680 }
681
682 if ($inv) {
683 $append->($_) for @$inv;
684 }
685
686 $str .= "end\n";
687
688 if ($a{_atype} eq 'object') {
689 if ($more) {
690 $str .= "more\n";
691 $append->($more) if $more;
692 } else {
693 $str .= "\n";
694 }
695 }
696 };
697
698 for (@$arch) {
699 $append->($_);
700 }
701
702 $str
315} 703}
316 704
317# put all archs into a hash with editor_face as it's key 705# put all archs into a hash with editor_face as it's key
318# NOTE: the arrays in the hash values are references to 706# NOTE: the arrays in the hash values are references to
319# the archs from $ARCH 707# the archs from $ARCH
320sub editor_archs { 708sub editor_archs {
321 my %paths; 709 my %paths;
322 710
323 for (keys %ARCH) { 711 for (keys %ARCH) {
324 my $arch = $ARCH{$_}; 712 my $arch = $ARCH{$_};
325 push @{$paths{$arch->{editor_folder}}}, \$arch; 713 push @{$paths{$arch->{editor_folder}}}, $arch;
326 } 714 }
327 715
328 \%paths 716 \%paths
329} 717}
330 718
… …
340 my ($a) = @_; 728 my ($a) = @_;
341 729
342 my $o = $ARCH{$a->{_name}} 730 my $o = $ARCH{$a->{_name}}
343 or return; 731 or return;
344 732
345 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 733 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
734 unless ($face) {
735 $face = $FACE{"blank.x11"}
346 or (warn "no face data found for arch '$a->{_name}'"), return; 736 or (warn "no face data found for arch '$a->{_name}'"), return;
737 }
347 738
348 if ($face->{w} > 1 || $face->{h} > 1) { 739 if ($face->{w} > 1 || $face->{h} > 1) {
349 # bigface 740 # bigface
350 return (0, 0, $face->{w} - 1, $face->{h} - 1); 741 return (0, 0, $face->{w} - 1, $face->{h} - 1);
351 742
… …
384=cut 775=cut
385 776
386sub arch_attr($) { 777sub arch_attr($) {
387 my ($obj) = @_; 778 my ($obj) = @_;
388 779
389 require Crossfire::Data; 780 require Deliantra::Data;
390 781
391 my $root; 782 my $root;
392 my $attr = { }; 783 my $attr = { };
393 784
394 my $arch = $ARCH{ $obj->{_name} }; 785 my $arch = $ARCH{ $obj->{_name} };
395 my $type = $obj->{type} || $arch->{type}; 786 my $type = $obj->{type} || $arch->{type};
396 787
397 if ($type > 0) { 788 if ($type > 0) {
398 $root = $Crossfire::Data::ATTR{$type}; 789 $root = $Deliantra::Data::ATTR{$type};
399 } else { 790 } else {
791 my %a = (%$arch, %$obj);
792
793 if ($a{is_floor} && !$a{alive}) {
794 $root = $Deliantra::Data::TYPE{Floor};
795 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
796 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
797 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
798 $root = $Deliantra::Data::TYPE{Wall};
799 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
800 $root = $Deliantra::Data::TYPE{"Weak Wall"};
801 } else {
400 $root = $Crossfire::Data::TYPE{Misc}; 802 $root = $Deliantra::Data::TYPE{Misc};
401
402 type:
403 for (@Crossfire::Data::ATTR0) {
404 my $req = $_->{required}
405 or die "internal error: ATTR0 without 'required'";
406
407 keys %$req;
408 while (my ($k, $v) = each %$req) {
409 next type
410 unless $obj->{$k} == $v || $arch->{$k} == $v;
411 }
412
413 $root = $_;
414 } 803 }
415 } 804 }
416 805
417 my @import = ($root); 806 my @import = ($root);
418 807
419 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 808 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
420 unless $type == 116; 809 unless $type == 116;
421 810
422 my (%ignore); 811 my (%ignore);
423 my (@section_order, %section, @attr_order); 812 my (@section_order, %section, @attr_order);
424 813
425 while (my $type = shift @import) { 814 while (my $type = shift @import) {
815 push @import,
816 grep $_,
817 map $Deliantra::Data::TYPE{$_},
426 push @import, @{$type->{import} || []}; 818 @{$type->{import} || []};
427 819
428 $attr->{$_} ||= $type->{$_} 820 $attr->{$_} ||= $type->{$_}
429 for qw(name desc use); 821 for qw(name desc use);
430 822
431 for (@{$type->{ignore} || []}) { 823 for (@{$type->{ignore} || []}) {
… …
460 ]; 852 ];
461 853
462 $attr 854 $attr
463} 855}
464 856
465sub arch_edit_sections {
466# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
467# edit_type = 0;
468# else if (edit_type != 0) {
469# // all flags from 'check_type' must be unset in this arch because they get recalculated now
470# edit_type &= ~check_type;
471# }
472#
473# }
474# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
475# getAttributeValue("alive", defarch) == 1 &&
476# (getAttributeValue("monster", defarch) == 1 ||
477# getAttributeValue("generator", defarch) == 1)) {
478# // Monster: monsters/npcs/generators
479# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
480# }
481# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
482# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
483# // Walls
484# edit_type |= IGUIConstants.TILE_EDIT_WALL;
485# }
486# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
487# getAttributeValue("connected", defarch) != 0) {
488# // Connected Objects
489# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
490# }
491# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
492# arch_type == 66 || arch_type == 41 || arch_type == 95) {
493# // Exit: teleporter/exit/trapdoors
494# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
495# }
496# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
497# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
498# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
499# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
500# arch_type == 124 || arch_type == 130)) {
501# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
502# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
503# }
504# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
505# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
506# arch_type == 91 || arch_type == 21 || arch_type == 24) {
507# // Door: door/special door/gates + keys
508# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
509# }
510# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
511# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
512# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
513# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
514# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
515# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
516# arch_type == 122 || arch_type == 3)) {
517# // Equipment: weapons/armour/wands/rods
518# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
519# }
520#
521# return(edit_type);
522#
523#
524}
525
526sub cache_file($$&&) { 857sub cache_file($$&&) {
527 my ($src, $cache, $load, $create) = @_; 858 my ($src, $cache, $load, $create) = @_;
528 859
529 my ($size, $mtime) = (stat $src)[7,9] 860 my ($size, $mtime) = (stat $src)[7,9]
530 or Carp::croak "$src: $!"; 861 or Carp::croak "$src: $!";
… …
578 }, sub { 909 }, sub {
579 read_arch "$LIB/archetypes" 910 read_arch "$LIB/archetypes"
580 }; 911 };
581} 912}
582 913
914sub construct_tilecache_pb {
915 my ($idx, $cache) = @_;
916
917 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
918
919 while (my ($name, $tile) = each %$cache) {
920 my $tpb = delete $tile->{pb};
921 my $ofs = $tile->{idx};
922
923 for my $x (0 .. $tile->{w} - 1) {
924 for my $y (0 .. $tile->{h} - 1) {
925 my $idx = $ofs + $x + $y * $tile->{w};
926 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
927 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
928 }
929 }
930 }
931
932 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
933
934 $cache
935}
936
937sub use_tilecache {
938 my ($face) = @_;
939 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
940 or die "$VARDIR/tilecache.png: $!";
941 *FACE = $_[0];
942}
943
583=item load_tilecache 944=item load_tilecache
584 945
585(Re-)Load %TILE and %FACE. 946(Re-)Load %TILE and %FACE.
586 947
587=cut 948=cut
588 949
589sub load_tilecache() { 950sub load_tilecache() {
590 require Gtk2; 951 require Gtk2;
591 952
592 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 953 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
593 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
594 or die "$VARDIR/tilecache.png: $!";
595 *FACE = $_[0];
596 }, sub { 954 sub {
597 require File::Temp;
598
599 my $tile = read_pak "$LIB/crossfire.0";
600
601 my %cache; 955 my %cache;
956 my $facedata = Storable::retrieve "$LIB/facedata";
602 957
958 $facedata->{version} == 2
959 or die "$LIB/facedata: version mismatch, cannot proceed.";
960
961 my $faces = $facedata->{faceinfo};
603 my $idx = 0; 962 my $idx = 0;
604 963
605 for my $name (sort keys %$tile) { 964 for (sort keys %$faces) {
606 my ($fh, $filename) = File::Temp::tempfile (); 965 my ($face, $info) = ($_, $faces->{$_});
607 print $fh $tile->{$name}; 966
608 close $fh;
609 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 967 my $pb = new Gtk2::Gdk::PixbufLoader;
610 unlink $filename; 968 $pb->write ($info->{data32});
969 $pb->close;
970 my $pb = $pb->get_pixbuf;
611 971
612 my $tile = $cache{$name} = { 972 my $tile = $cache{$face} = {
613 pb => $pb, 973 pb => $pb,
614 idx => $idx, 974 idx => $idx,
615 w => int $pb->get_width / TILESIZE, 975 w => int $pb->get_width / TILESIZE,
616 h => int $pb->get_height / TILESIZE, 976 h => int $pb->get_height / TILESIZE,
617 }; 977 };
618
619 978
620 $idx += $tile->{w} * $tile->{h}; 979 $idx += $tile->{w} * $tile->{h};
980 }
981
982 construct_tilecache_pb $idx, \%cache;
983
984 \%cache
621 } 985 };
622
623 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
624
625 while (my ($name, $tile) = each %cache) {
626 my $tpb = delete $tile->{pb};
627 my $ofs = $tile->{idx};
628
629 for my $x (0 .. $tile->{w} - 1) {
630 for my $y (0 .. $tile->{h} - 1) {
631 my $idx = $ofs + $x + $y * $tile->{w};
632 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
633 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
634 }
635 }
636 }
637
638 $pb->save ("$VARDIR/tilecache.png", "png");
639
640 \%cache
641 };
642} 986}
643 987
644=head1 AUTHOR 988=head1 AUTHOR
645 989
646 Marc Lehmann <schmorp@schmorp.de> 990 Marc Lehmann <schmorp@schmorp.de>
… …
650 http://www.ta-sa.org/ 994 http://www.ta-sa.org/
651 995
652=cut 996=cut
653 997
6541 9981
999

Diff Legend

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