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.61 by root, Mon Mar 27 17:38:18 2006 UTC vs.
Revision 1.134 by root, Wed Oct 28 10:17:01 2009 UTC

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

Diff Legend

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