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.135 by root, Tue Nov 3 14:56:58 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 delete $ob->{editable}; # deprecated
345
346 # convert material bitset to materialname, if possible
347 if (exists $ob->{material}) {
348 if (!$ob->{material}) {
349 delete $ob->{material};
350 } elsif (exists $ob->{materialname}) {
351 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
352 delete $ob->{material};
353 } else {
354 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
355 delete $ob->{material}; # assume materilname is more specific and nuke material
356 }
357 } elsif (my $name = $MATERIAL{$ob->{material}}) {
358 delete $ob->{material};
359 $ob->{materialname} = $name;
360 } else {
361 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
362 }
363 }
364
365 # check whether attachment is the same as in the archetype
366 if (exists $ob->{attach}) {
367 my $arch = $ARCH{$ob->{_name}};
368 my $js = JSON::XS->new->utf8->canonical (1);
369
370 if (defined $arch->{attach}
371 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
372 delete $ob->{attach}
373 }
374 }
375
376 # color_fg is used as default for magicmap if magicmap does not exist
377 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
378
379 # nuke outdated or never supported fields
143 delete $ob->{$_} for qw( 380 delete @$ob{qw(
144 can_knockback can_parry can_impale can_cut can_dam_armour 381 can_knockback can_parry can_impale can_cut can_dam_armour
145 can_apply pass_thru can_pass_thru 382 can_apply pass_thru can_pass_thru color_bg color_fg
146 ); 383 )};
147 384
385 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
386 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
387 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
388
389 # convert movement strings to bitsets
148 for my $attr (keys %FIELD_MOVEMENT) { 390 for my $attr (keys %FIELD_MOVEMENT) {
149 next unless exists $ob->{$attr}; 391 next unless exists $ob->{$attr};
150 392
151 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 393 $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 } 394 }
178 395
396 # convert outdated movement flags to new movement sets
179 if (defined (my $v = delete $ob->{no_pass})) { 397 if (defined (my $v = delete $ob->{no_pass})) {
180 $ob->{move_block} = $v ? MOVE_ALL : 0; 398 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
181 } 399 }
182 if (defined (my $v = delete $ob->{slow_move})) { 400 if (defined (my $v = delete $ob->{slow_move})) {
183 $ob->{move_slow} |= MOVE_WALK; 401 $ob->{move_slow} += "walk";
184 $ob->{move_slow_penalty} = $v; 402 $ob->{move_slow_penalty} = $v;
185 } 403 }
186 if (defined (my $v = delete $ob->{walk_on})) { 404 if (defined (my $v = delete $ob->{walk_on})) {
187 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 405 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
188 : $ob->{move_on} & ~MOVE_WALK;
189 } 406 }
190 if (defined (my $v = delete $ob->{walk_off})) { 407 if (defined (my $v = delete $ob->{walk_off})) {
191 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 408 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
192 : $ob->{move_off} & ~MOVE_WALK;
193 } 409 }
194 if (defined (my $v = delete $ob->{fly_on})) { 410 if (defined (my $v = delete $ob->{fly_on})) {
195 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 411 $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 } 412 }
198 if (defined (my $v = delete $ob->{fly_off})) { 413 if (defined (my $v = delete $ob->{fly_off})) {
199 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 414 $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 } 415 }
202 if (defined (my $v = delete $ob->{flying})) { 416 if (defined (my $v = delete $ob->{flying})) {
203 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 417 $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 } 418 }
419
420 # convert idiotic event_xxx things into objects
421 while (my ($event, $subtype) = each %EVENT_TYPE) {
422 if (exists $ob->{"event_${event}_plugin"}) {
423 push @{$ob->{inventory}}, {
424 _name => "event_$event",
425 title => delete $ob->{"event_${event}_plugin"},
426 slaying => delete $ob->{"event_${event}"},
427 name => delete $ob->{"event_${event}_options"},
428 };
429 }
430 }
431
432 # some archetypes had "+3" instead of the canonical "3", so fix
433 $ob->{dam} *= 1 if exists $ob->{dam};
206 434
207 $ob 435 $ob
208} 436}
209 437
438# arch as in "arch xxx", ie.. objects
210sub normalize_arch($) { 439sub normalize_arch($) {
211 my ($ob) = @_; 440 my ($ob) = @_;
212 441
213 normalize_object $ob; 442 normalize_object $ob;
443
444 return if $ob->{_atype} eq "object";
214 445
215 my $arch = $ARCH{$ob->{_name}} 446 my $arch = $ARCH{$ob->{_name}}
216 or (warn "$ob->{_name}: no such archetype", return $ob); 447 or (warn "$ob->{_name}: no such archetype", return $ob);
217 448
218 if ($arch->{type} == 22) { # map 449 if ($arch->{type} == 22) { # map
… …
251 } 482 }
252 483
253 $ob 484 $ob
254} 485}
255 486
487sub attr_thaw($) {
488 my ($ob) = @_;
489
490 $ob->{attach} = decode_json $ob->{attach}
491 if exists $ob->{attach};
492
493 $ob
494}
495
496sub attr_freeze($) {
497 my ($ob) = @_;
498
499 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
500 if exists $ob->{attach};
501
502 $ob
503}
504
256sub read_pak($) { 505sub read_pak($) {
257 my ($path) = @_; 506 my ($path) = @_;
258 507
259 my %pak; 508 my %pak;
260 509
261 open my $fh, "<", $path 510 open my $fh, "<:raw:perlio", $path
262 or Carp::croak "$_[0]: $!"; 511 or Carp::croak "$_[0]: $!";
263 binmode $fh; 512 binmode $fh;
264 while (<$fh>) { 513 while (<$fh>) {
265 my ($type, $id, $len, $path) = split; 514 my ($type, $id, $len, $path) = split;
266 $path =~ s/.*\///; 515 $path =~ s/.*\///;
… …
268 } 517 }
269 518
270 \%pak 519 \%pak
271} 520}
272 521
273sub read_arch($) { 522sub read_arch($;$) {
274 my ($path) = @_; 523 my ($path, $toplevel) = @_;
275 524
276 my %arc; 525 my %arc;
277 my ($more, $prev); 526 my ($more, $prev);
527 my $comment;
278 528
279 open my $fh, "<", $path 529 open my $fh, "<:utf8", $path
280 or Carp::croak "$path: $!"; 530 or Carp::croak "$path: $!";
281 531
282 binmode $fh; 532# binmode $fh;
283 533
284 my $parse_block; $parse_block = sub { 534 my $parse_block; $parse_block = sub {
285 my %arc = @_; 535 my %arc = @_;
286 536
287 while (<$fh>) { 537 while (<$fh>) {
288 s/\s+$//; 538 s/\s+$//;
289 if (/^end$/i) { 539 if (/^end$/i) {
290 last; 540 last;
541
291 } elsif (/^arch (\S+)$/i) { 542 } elsif (/^arch (\S+)$/i) {
292 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 543 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
544
293 } elsif (/^lore$/i) { 545 } elsif (/^lore$/i) {
294 while (<$fh>) { 546 while (<$fh>) {
295 last if /^endlore\s*$/i; 547 last if /^endlore\s*$/i;
296 $arc{lore} .= $_; 548 $arc{lore} .= $_;
297 } 549 }
298 } elsif (/^msg$/i) { 550 } elsif (/^msg$/i) {
299 while (<$fh>) { 551 while (<$fh>) {
300 last if /^endmsg\s*$/i; 552 last if /^endmsg\s*$/i;
301 $arc{msg} .= $_; 553 $arc{msg} .= $_;
302 } 554 }
555 } elsif (/^anim$/i) {
556 while (<$fh>) {
557 last if /^mina\s*$/i;
558 chomp;
559 push @{ $arc{anim} }, $_;
560 }
303 } elsif (/^(\S+)\s*(.*)$/) { 561 } elsif (/^(\S+)\s*(.*)$/) {
304 $arc{lc $1} = $2; 562 $arc{lc $1} = $2;
305 } elsif (/^\s*($|#)/) { 563 } elsif (/^\s*#/) {
564 $arc{_comment} .= "$_\n";
565
566 } elsif (/^\s*$/) {
306 # 567 #
307 } else { 568 } else {
308 warn "$path: unparsable line '$_' in arch $arc{_name}"; 569 warn "$path: unparsable line '$_' in arch $arc{_name}";
309 } 570 }
310 } 571 }
… …
316 s/\s+$//; 577 s/\s+$//;
317 if (/^more$/i) { 578 if (/^more$/i) {
318 $more = $prev; 579 $more = $prev;
319 } elsif (/^object (\S+)$/i) { 580 } elsif (/^object (\S+)$/i) {
320 my $name = $1; 581 my $name = $1;
321 my $arc = normalize_object $parse_block->(_name => $name); 582 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
583 undef $comment;
584 delete $arc{_comment} unless length $arc{_comment};
585 $arc->{_atype} = 'object';
322 586
323 if ($more) { 587 if ($more) {
324 $more->{more} = $arc; 588 $more->{more} = $arc;
325 } else { 589 } else {
326 $arc{$name} = $arc; 590 $arc{$name} = $arc;
327 } 591 }
328 $prev = $arc; 592 $prev = $arc;
329 $more = undef; 593 $more = undef;
330 } elsif (/^arch (\S+)$/i) { 594 } elsif (/^arch (\S+)$/i) {
331 my $name = $1; 595 my $name = $1;
332 my $arc = normalize_arch $parse_block->(_name => $name); 596 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
597 undef $comment;
598 delete $arc{_comment} unless length $arc{_comment};
599 $arc->{_atype} = 'arch';
333 600
334 if ($more) { 601 if ($more) {
335 $more->{more} = $arc; 602 $more->{more} = $arc;
336 } else { 603 } else {
337 push @{ $arc{arch} }, $arc; 604 push @{ $arc{arch} }, $arc;
338 } 605 }
339 $prev = $arc; 606 $prev = $arc;
340 $more = undef; 607 $more = undef;
608 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
609 if ($1 eq "lev_array") {
610 while (<$fh>) {
611 last if /^endplst\s*$/;
612 push @{$toplevel->{lev_array}}, $_+0;
613 }
614 } else {
615 $toplevel->{$1} = $2;
616 }
617 } elsif (/^\s*#/) {
618 $comment .= "$_\n";
341 } elsif (/^\s*($|#)/) { 619 } elsif (/^\s*($|#)/) {
342 # 620 #
343 } else { 621 } else {
344 warn "$path: unparseable top-level line '$_'"; 622 die "$path: unparseable top-level line '$_'";
345 } 623 }
346 } 624 }
347 625
348 undef $parse_block; # work around bug in perl not freeing $fh etc. 626 undef $parse_block; # work around bug in perl not freeing $fh etc.
349 627
350 \%arc 628 \%arc
629}
630
631sub archlist_to_string {
632 my ($arch) = @_;
633
634 my $str;
635
636 my $append; $append = sub {
637 my %a = %{$_[0]};
638
639 Deliantra::attr_freeze \%a;
640 Deliantra::normalize_arch \%a;
641
642 # undo the bit-split we did before
643 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
644 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
645 | (delete $a{attack_movement_bits_4_7});
646 }
647
648 if (my $comment = delete $a{_comment}) {
649 if ($comment =~ /[^\n\s#]/) {
650 $str .= $comment;
651 }
652 }
653
654 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
655
656 my $inv = delete $a{inventory};
657 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
658 my $anim = delete $a{anim};
659
660 if ($a{_atype} eq 'object') {
661 $str .= join "\n", "anim", @$anim, "mina\n"
662 if $anim;
663 }
664
665 my @kv;
666
667 for ($a{_name} eq "map"
668 ? @Deliantra::FIELD_ORDER_MAP
669 : @Deliantra::FIELD_ORDER) {
670 push @kv, [$_, delete $a{$_}]
671 if exists $a{$_};
672 }
673
674 for (sort keys %a) {
675 next if /^_/; # ignore our _-keys
676 push @kv, [$_, delete $a{$_}];
677 }
678
679 for (@kv) {
680 my ($k, $v) = @$_;
681
682 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
683 $v =~ s/\n$//;
684 $str .= "$k\n$v\n$end\n";
685 } else {
686 $str .= "$k $v\n";
687 }
688 }
689
690 if ($inv) {
691 $append->($_) for @$inv;
692 }
693
694 $str .= "end\n";
695
696 if ($a{_atype} eq 'object') {
697 if ($more) {
698 $str .= "more\n";
699 $append->($more) if $more;
700 } else {
701 $str .= "\n";
702 }
703 }
704 };
705
706 for (@$arch) {
707 $append->($_);
708 }
709
710 $str
351} 711}
352 712
353# put all archs into a hash with editor_face as it's key 713# put all archs into a hash with editor_face as it's key
354# NOTE: the arrays in the hash values are references to 714# NOTE: the arrays in the hash values are references to
355# the archs from $ARCH 715# the archs from $ARCH
356sub editor_archs { 716sub editor_archs {
357 my %paths; 717 my %paths;
358 718
359 for (keys %ARCH) { 719 for (keys %ARCH) {
360 my $arch = $ARCH{$_}; 720 my $arch = $ARCH{$_};
361 push @{$paths{$arch->{editor_folder}}}, \$arch; 721 push @{$paths{$arch->{editor_folder}}}, $arch;
362 } 722 }
363 723
364 \%paths 724 \%paths
365} 725}
366 726
… …
376 my ($a) = @_; 736 my ($a) = @_;
377 737
378 my $o = $ARCH{$a->{_name}} 738 my $o = $ARCH{$a->{_name}}
379 or return; 739 or return;
380 740
381 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 741 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
742 unless ($face) {
743 $face = $FACE{"blank.x11"}
382 or (warn "no face data found for arch '$a->{_name}'"), return; 744 or (warn "no face data found for arch '$a->{_name}'"), return;
745 }
383 746
384 if ($face->{w} > 1 || $face->{h} > 1) { 747 if ($face->{w} > 1 || $face->{h} > 1) {
385 # bigface 748 # bigface
386 return (0, 0, $face->{w} - 1, $face->{h} - 1); 749 return (0, 0, $face->{w} - 1, $face->{h} - 1);
387 750
… …
420=cut 783=cut
421 784
422sub arch_attr($) { 785sub arch_attr($) {
423 my ($obj) = @_; 786 my ($obj) = @_;
424 787
425 require Crossfire::Data; 788 require Deliantra::Data;
426 789
427 my $root; 790 my $root;
428 my $attr = { }; 791 my $attr = { };
429 792
430 my $arch = $ARCH{ $obj->{_name} }; 793 my $arch = $ARCH{ $obj->{_name} };
431 my $type = $obj->{type} || $arch->{type}; 794 my $type = $obj->{type} || $arch->{type};
432 795
433 if ($type > 0) { 796 if ($type > 0) {
434 $root = $Crossfire::Data::ATTR{$type}; 797 $root = $Deliantra::Data::ATTR{$type};
435 } else { 798 } else {
436 my %a = (%$arch, %$obj); 799 my %a = (%$arch, %$obj);
437 800
438 if ($a{is_floor} && !$a{alive}) { 801 if ($a{is_floor} && !$a{alive}) {
439 $root = $Crossfire::Data::TYPE{Floor}; 802 $root = $Deliantra::Data::TYPE{Floor};
440 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 803 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
441 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 804 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
442 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 805 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
443 $root = $Crossfire::Data::TYPE{Wall}; 806 $root = $Deliantra::Data::TYPE{Wall};
444 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 807 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
445 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 808 $root = $Deliantra::Data::TYPE{"Weak Wall"};
446 } else { 809 } else {
447 $root = $Crossfire::Data::TYPE{Misc}; 810 $root = $Deliantra::Data::TYPE{Misc};
448 } 811 }
449 } 812 }
450 813
451 my @import = ($root); 814 my @import = ($root);
452 815
453 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 816 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
454 unless $type == 116; 817 unless $type == 116;
455 818
456 my (%ignore); 819 my (%ignore);
457 my (@section_order, %section, @attr_order); 820 my (@section_order, %section, @attr_order);
458 821
459 while (my $type = shift @import) { 822 while (my $type = shift @import) {
823 push @import,
824 grep $_,
825 map $Deliantra::Data::TYPE{$_},
460 push @import, @{$type->{import} || []}; 826 @{$type->{import} || []};
461 827
462 $attr->{$_} ||= $type->{$_} 828 $attr->{$_} ||= $type->{$_}
463 for qw(name desc use); 829 for qw(name desc use);
464 830
465 for (@{$type->{ignore} || []}) { 831 for (@{$type->{ignore} || []}) {
… …
494 ]; 860 ];
495 861
496 $attr 862 $attr
497} 863}
498 864
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($$&&) { 865sub cache_file($$&&) {
561 my ($src, $cache, $load, $create) = @_; 866 my ($src, $cache, $load, $create) = @_;
562 867
563 my ($size, $mtime) = (stat $src)[7,9] 868 my ($size, $mtime) = (stat $src)[7,9]
564 or Carp::croak "$src: $!"; 869 or Carp::croak "$src: $!";
… …
612 }, sub { 917 }, sub {
613 read_arch "$LIB/archetypes" 918 read_arch "$LIB/archetypes"
614 }; 919 };
615} 920}
616 921
922sub construct_tilecache_pb {
923 my ($idx, $cache) = @_;
924
925 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
926
927 while (my ($name, $tile) = each %$cache) {
928 my $tpb = delete $tile->{pb};
929 my $ofs = $tile->{idx};
930
931 for my $x (0 .. $tile->{w} - 1) {
932 for my $y (0 .. $tile->{h} - 1) {
933 my $idx = $ofs + $x + $y * $tile->{w};
934 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
935 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
936 }
937 }
938 }
939
940 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
941
942 $cache
943}
944
945sub use_tilecache {
946 my ($face) = @_;
947 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
948 or die "$VARDIR/tilecache.png: $!";
949 *FACE = $_[0];
950}
951
617=item load_tilecache 952=item load_tilecache
618 953
619(Re-)Load %TILE and %FACE. 954(Re-)Load %TILE and %FACE.
620 955
621=cut 956=cut
622 957
623sub load_tilecache() { 958sub load_tilecache() {
624 require Gtk2; 959 require Gtk2;
625 960
626 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 961 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 { 962 sub {
631 my $tile = read_pak "$LIB/crossfire.0";
632
633 my %cache; 963 my %cache;
964 my $facedata = Storable::retrieve "$LIB/facedata";
634 965
966 $facedata->{version} == 2
967 or die "$LIB/facedata: version mismatch, cannot proceed.";
968
969 my $faces = $facedata->{faceinfo};
635 my $idx = 0; 970 my $idx = 0;
636 971
637 for my $name (sort keys %$tile) { 972 for (sort keys %$faces) {
973 my ($face, $info) = ($_, $faces->{$_});
974
638 my $pb = new Gtk2::Gdk::PixbufLoader; 975 my $pb = new Gtk2::Gdk::PixbufLoader;
639 $pb->write ($tile->{$name}); 976 $pb->write ($info->{data32});
640 $pb->close; 977 $pb->close;
641 my $pb = $pb->get_pixbuf; 978 my $pb = $pb->get_pixbuf;
642 979
643 my $tile = $cache{$name} = { 980 my $tile = $cache{$face} = {
644 pb => $pb, 981 pb => $pb,
645 idx => $idx, 982 idx => $idx,
646 w => int $pb->get_width / TILESIZE, 983 w => int $pb->get_width / TILESIZE,
647 h => int $pb->get_height / TILESIZE, 984 h => int $pb->get_height / TILESIZE,
648 }; 985 };
649
650 986
651 $idx += $tile->{w} * $tile->{h}; 987 $idx += $tile->{w} * $tile->{h};
988 }
989
990 construct_tilecache_pb $idx, \%cache;
991
992 \%cache
652 } 993 };
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} 994}
995
996=back
674 997
675=head1 AUTHOR 998=head1 AUTHOR
676 999
677 Marc Lehmann <schmorp@schmorp.de> 1000 Marc Lehmann <schmorp@schmorp.de>
678 http://home.schmorp.de/ 1001 http://home.schmorp.de/
… …
681 http://www.ta-sa.org/ 1004 http://www.ta-sa.org/
682 1005
683=cut 1006=cut
684 1007
6851 10081
1009

Diff Legend

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