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

Diff Legend

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