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.56 by root, Thu Mar 23 07:33:16 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",
39 maplore => "endmaplore", 50 maplore => "endmaplore",
40); 51);
41 52
53# movement bit type, PITA
54our %FIELD_MOVEMENT = map +($_ => undef),
55 qw(move_type move_block move_allow move_on move_off move_slow);
56
42# same as in server save routine, to (hopefully) be compatible 57# same as in server save routine, to (hopefully) be compatible
43# to the other editors. 58# to the other editors.
44our @FIELD_ORDER_MAP = (qw( 59our @FIELD_ORDER_MAP = (qw(
60 file_format_version
45 name swap_time reset_timeout fixed_resettime difficulty region 61 name attach swap_time reset_timeout fixed_resettime difficulty region
46 shopitems shopgreed shopmin shopmax shoprace 62 shopitems shopgreed shopmin shopmax shoprace
47 darkness width height enter_x enter_y msg maplore 63 darkness width height enter_x enter_y msg maplore
48 unique template 64 unique template
49 outdoor temp pressure humid windspeed winddir sky nosmooth 65 outdoor temp pressure humid windspeed winddir sky nosmooth
50 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
51)); 67));
52 68
53our @FIELD_ORDER = (qw( 69our @FIELD_ORDER = (qw(
70 inherit
71
72 elevation
73
54 name name_pl custom_name title race 74 name name_pl custom_name attach title race
55 slaying skill msg lore other_arch face 75 slaying skill msg lore other_arch
56 #todo-events 76 sound sound_destroy face animation is_animated
57 animation is_animated 77 magicmap smoothlevel smoothface
58 Str Dex Con Wis Pow Cha Int 78 str dex con wis pow cha int
59 hp maxhp sp maxsp grace maxgrace 79 hp maxhp sp maxsp grace maxgrace
60 exp perm_exp expmul 80 exp perm_exp expmul
61 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
62 nrof level direction type subtype 82 nrof level direction type subtype attacktype
63 83
64 resist_physical resist_magic resist_fire resist_electricity 84 resist_physical resist_magic resist_fire resist_electricity
65 resist_cold resist_confusion resist_acid resist_drain 85 resist_cold resist_confusion resist_acid resist_drain
66 resist_weaponmagic resist_ghosthit resist_poison resist_slow 86 resist_weaponmagic resist_ghosthit resist_poison resist_slow
67 resist_paralyze resist_turn_undead resist_fear resist_cancellation 87 resist_paralyze resist_turn_undead resist_fear resist_cancellation
70 resist_life_stealing resist_disease 90 resist_life_stealing resist_disease
71 91
72 path_attuned path_repelled path_denied material materialname 92 path_attuned path_repelled path_denied material materialname
73 value carrying weight invisible state magic 93 value carrying weight invisible state magic
74 last_heal last_sp last_grace last_eat 94 last_heal last_sp last_grace last_eat
75 connected glow_radius randomitems npx_status npc_program 95 connected glow_radius randomitems tresure_env npx_status npc_program
76 run_away pick_up container will_apply smoothlevel 96 run_away pick_up container will_apply smoothlevel
77 current_weapon_script weapontype tooltype elevation client_type 97 current_weapon_script weapontype tooltype elevation client_type
78 item_power duration range 98 item_power duration range
79 range_modifier duration_modifier dam_modifier gen_sp_armour 99 range_modifier duration_modifier dam_modifier gen_sp_armour
80 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
91 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
92 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
93 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
94 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
95 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
96 117
97 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
98 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
99)); 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);
100 136
101sub MOVE_WALK (){ 0x01 } 137sub MOVE_WALK (){ 0x01 }
102sub MOVE_FLY_LOW (){ 0x02 } 138sub MOVE_FLY_LOW (){ 0x02 }
103sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
104sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
105sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
106sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
107sub MOVE_ALL (){ 0xff } 143sub MOVE_SHIP (){ 0x20 }
144sub MOVE_KNOWN (){ 0x3f } # all of above
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}
108 250
109sub load_ref($) { 251sub load_ref($) {
110 my ($path) = @_; 252 my ($path) = @_;
111 253
112 open my $fh, "<", $path 254 open my $fh, "<:raw:perlio", $path
113 or die "$path: $!"; 255 or die "$path: $!";
114 binmode $fh;
115 local $/; 256 local $/;
116 257
117 thaw <$fh> 258 thaw <$fh>
118} 259}
119 260
120sub save_ref($$) { 261sub save_ref($$) {
121 my ($ref, $path) = @_; 262 my ($ref, $path) = @_;
122 263
123 open my $fh, ">", "$path~" 264 open my $fh, ">:raw:perlio", "$path~"
124 or die "$path~: $!"; 265 or die "$path~: $!";
125 binmode $fh;
126 print $fh freeze $ref; 266 print $fh freeze $ref;
127 close $fh; 267 close $fh;
128 rename "$path~", $path 268 rename "$path~", $path
129 or die "$path: $!"; 269 or die "$path: $!";
130} 270}
131 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
132sub normalize_object($) { 341sub normalize_object($) {
133 my ($ob) = @_; 342 my ($ob) = @_;
134 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
135 delete $ob->{$_} for qw( 378 delete @$ob{qw(
136 can_knockback can_parry can_impale can_cut can_dam_armour 379 can_knockback can_parry can_impale can_cut can_dam_armour
137 can_apply pass_thru can_pass_thru 380 can_apply pass_thru can_pass_thru color_bg color_fg
138 ); 381 )};
139 382
140 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 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
388 for my $attr (keys %FIELD_MOVEMENT) {
141 next unless exists $ob->{$attr}; 389 next unless exists $ob->{$attr};
142 next if $ob->{$attr} =~ /^\d+$/;
143 390
144 my $flags = 0; 391 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
145
146 # assume list
147 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
148 $flags |= MOVE_WALK if $flag eq "walk";
149 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
150 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
151 $flags |= MOVE_FLYING if $flag eq "flying";
152 $flags |= MOVE_SWIM if $flag eq "swim";
153 $flags |= MOVE_BOAT if $flag eq "boat";
154 $flags |= MOVE_ALL if $flag eq "all";
155
156 $flags &= ~MOVE_WALK if $flag eq "-walk";
157 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
158 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
159 $flags &= ~MOVE_FLYING if $flag eq "-flying";
160 $flags &= ~MOVE_SWIM if $flag eq "-swim";
161 $flags &= ~MOVE_BOAT if $flag eq "-boat";
162 $flags &= ~MOVE_ALL if $flag eq "-all";
163 }
164
165 $ob->{$attr} = $flags;
166 } 392 }
167 393
394 # convert outdated movement flags to new movement sets
168 if (defined (my $v = delete $ob->{no_pass})) { 395 if (defined (my $v = delete $ob->{no_pass})) {
169 $ob->{move_block} = $v ? MOVE_ALL : 0; 396 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
170 } 397 }
171 if (defined (my $v = delete $ob->{slow_move})) { 398 if (defined (my $v = delete $ob->{slow_move})) {
172 $ob->{move_slow} |= MOVE_WALK; 399 $ob->{move_slow} += "walk";
173 $ob->{move_slow_penalty} = $v; 400 $ob->{move_slow_penalty} = $v;
174 } 401 }
175 if (defined (my $v = delete $ob->{walk_on})) { 402 if (defined (my $v = delete $ob->{walk_on})) {
176 $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" }
177 : $ob->{move_on} & ~MOVE_WALK;
178 } 404 }
179 if (defined (my $v = delete $ob->{walk_off})) { 405 if (defined (my $v = delete $ob->{walk_off})) {
180 $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" }
181 : $ob->{move_off} & ~MOVE_WALK;
182 } 407 }
183 if (defined (my $v = delete $ob->{fly_on})) { 408 if (defined (my $v = delete $ob->{fly_on})) {
184 $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" }
185 : $ob->{move_on} & ~MOVE_FLY_LOW;
186 } 410 }
187 if (defined (my $v = delete $ob->{fly_off})) { 411 if (defined (my $v = delete $ob->{fly_off})) {
188 $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" }
189 : $ob->{move_off} & ~MOVE_FLY_LOW;
190 } 413 }
191 if (defined (my $v = delete $ob->{flying})) { 414 if (defined (my $v = delete $ob->{flying})) {
192 $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" }
193 : $ob->{move_type} & ~MOVE_FLY_LOW;
194 } 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};
195 432
196 $ob 433 $ob
197} 434}
198 435
436# arch as in "arch xxx", ie.. objects
199sub normalize_arch($) { 437sub normalize_arch($) {
200 my ($ob) = @_; 438 my ($ob) = @_;
201 439
202 normalize_object $ob; 440 normalize_object $ob;
441
442 return if $ob->{_atype} eq "object";
203 443
204 my $arch = $ARCH{$ob->{_name}} 444 my $arch = $ARCH{$ob->{_name}}
205 or (warn "$ob->{_name}: no such archetype", return $ob); 445 or (warn "$ob->{_name}: no such archetype", return $ob);
206 446
207 if ($arch->{type} == 22) { # map 447 if ($arch->{type} == 22) { # map
230 delete $ob->{$k}; 470 delete $ob->{$k};
231 } 471 }
232 } 472 }
233 } 473 }
234 474
475 # a speciality for the editor
476 if (exists $ob->{attack_movement}) {
477 my $am = delete $ob->{attack_movement};
478 $ob->{attack_movement_bits_0_3} = $am & 15;
479 $ob->{attack_movement_bits_4_7} = $am & 240;
480 }
481
482 $ob
483}
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
235 $ob 500 $ob
236} 501}
237 502
238sub read_pak($) { 503sub read_pak($) {
239 my ($path) = @_; 504 my ($path) = @_;
240 505
241 my %pak; 506 my %pak;
242 507
243 open my $fh, "<", $path 508 open my $fh, "<:raw:perlio", $path
244 or Carp::croak "$_[0]: $!"; 509 or Carp::croak "$_[0]: $!";
245 binmode $fh; 510 binmode $fh;
246 while (<$fh>) { 511 while (<$fh>) {
247 my ($type, $id, $len, $path) = split; 512 my ($type, $id, $len, $path) = split;
248 $path =~ s/.*\///; 513 $path =~ s/.*\///;
250 } 515 }
251 516
252 \%pak 517 \%pak
253} 518}
254 519
255sub read_arch($) { 520sub read_arch($;$) {
256 my ($path) = @_; 521 my ($path, $toplevel) = @_;
257 522
258 my %arc; 523 my %arc;
259 my ($more, $prev); 524 my ($more, $prev);
525 my $comment;
260 526
261 open my $fh, "<", $path 527 open my $fh, "<:utf8", $path
262 or Carp::croak "$path: $!"; 528 or Carp::croak "$path: $!";
263 529
264 binmode $fh; 530# binmode $fh;
265 531
266 my $parse_block; $parse_block = sub { 532 my $parse_block; $parse_block = sub {
267 my %arc = @_; 533 my %arc = @_;
268 534
269 while (<$fh>) { 535 while (<$fh>) {
270 s/\s+$//; 536 s/\s+$//;
271 if (/^end$/i) { 537 if (/^end$/i) {
272 last; 538 last;
539
273 } elsif (/^arch (\S+)$/i) { 540 } elsif (/^arch (\S+)$/i) {
274 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 541 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
542
275 } elsif (/^lore$/i) { 543 } elsif (/^lore$/i) {
276 while (<$fh>) { 544 while (<$fh>) {
277 last if /^endlore\s*$/i; 545 last if /^endlore\s*$/i;
278 $arc{lore} .= $_; 546 $arc{lore} .= $_;
279 } 547 }
280 } elsif (/^msg$/i) { 548 } elsif (/^msg$/i) {
281 while (<$fh>) { 549 while (<$fh>) {
282 last if /^endmsg\s*$/i; 550 last if /^endmsg\s*$/i;
283 $arc{msg} .= $_; 551 $arc{msg} .= $_;
284 } 552 }
553 } elsif (/^anim$/i) {
554 while (<$fh>) {
555 last if /^mina\s*$/i;
556 chomp;
557 push @{ $arc{anim} }, $_;
558 }
285 } elsif (/^(\S+)\s*(.*)$/) { 559 } elsif (/^(\S+)\s*(.*)$/) {
286 $arc{lc $1} = $2; 560 $arc{lc $1} = $2;
287 } elsif (/^\s*($|#)/) { 561 } elsif (/^\s*#/) {
562 $arc{_comment} .= "$_\n";
563
564 } elsif (/^\s*$/) {
288 # 565 #
289 } else { 566 } else {
290 warn "$path: unparsable line '$_' in arch $arc{_name}"; 567 warn "$path: unparsable line '$_' in arch $arc{_name}";
291 } 568 }
292 } 569 }
298 s/\s+$//; 575 s/\s+$//;
299 if (/^more$/i) { 576 if (/^more$/i) {
300 $more = $prev; 577 $more = $prev;
301 } elsif (/^object (\S+)$/i) { 578 } elsif (/^object (\S+)$/i) {
302 my $name = $1; 579 my $name = $1;
303 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';
304 584
305 if ($more) { 585 if ($more) {
306 $more->{more} = $arc; 586 $more->{more} = $arc;
307 } else { 587 } else {
308 $arc{$name} = $arc; 588 $arc{$name} = $arc;
309 } 589 }
310 $prev = $arc; 590 $prev = $arc;
311 $more = undef; 591 $more = undef;
312 } elsif (/^arch (\S+)$/i) { 592 } elsif (/^arch (\S+)$/i) {
313 my $name = $1; 593 my $name = $1;
314 my $arc = normalize_object $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';
315 598
316 if ($more) { 599 if ($more) {
317 $more->{more} = $arc; 600 $more->{more} = $arc;
318 } else { 601 } else {
319 push @{ $arc{arch} }, $arc; 602 push @{ $arc{arch} }, $arc;
320 } 603 }
321 $prev = $arc; 604 $prev = $arc;
322 $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";
323 } elsif (/^\s*($|#)/) { 617 } elsif (/^\s*($|#)/) {
324 # 618 #
325 } else { 619 } else {
326 warn "$path: unparseable top-level line '$_'"; 620 die "$path: unparseable top-level line '$_'";
327 } 621 }
328 } 622 }
329 623
330 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.
331 625
332 \%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
333} 709}
334 710
335# 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
336# NOTE: the arrays in the hash values are references to 712# NOTE: the arrays in the hash values are references to
337# the archs from $ARCH 713# the archs from $ARCH
338sub editor_archs { 714sub editor_archs {
339 my %paths; 715 my %paths;
340 716
341 for (keys %ARCH) { 717 for (keys %ARCH) {
342 my $arch = $ARCH{$_}; 718 my $arch = $ARCH{$_};
343 push @{$paths{$arch->{editor_folder}}}, \$arch; 719 push @{$paths{$arch->{editor_folder}}}, $arch;
344 } 720 }
345 721
346 \%paths 722 \%paths
347} 723}
348 724
358 my ($a) = @_; 734 my ($a) = @_;
359 735
360 my $o = $ARCH{$a->{_name}} 736 my $o = $ARCH{$a->{_name}}
361 or return; 737 or return;
362 738
363 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"}
364 or (warn "no face data found for arch '$a->{_name}'"), return; 742 or (warn "no face data found for arch '$a->{_name}'"), return;
743 }
365 744
366 if ($face->{w} > 1 || $face->{h} > 1) { 745 if ($face->{w} > 1 || $face->{h} > 1) {
367 # bigface 746 # bigface
368 return (0, 0, $face->{w} - 1, $face->{h} - 1); 747 return (0, 0, $face->{w} - 1, $face->{h} - 1);
369 748
402=cut 781=cut
403 782
404sub arch_attr($) { 783sub arch_attr($) {
405 my ($obj) = @_; 784 my ($obj) = @_;
406 785
407 require Crossfire::Data; 786 require Deliantra::Data;
408 787
409 my $root; 788 my $root;
410 my $attr = { }; 789 my $attr = { };
411 790
412 my $arch = $ARCH{ $obj->{_name} }; 791 my $arch = $ARCH{ $obj->{_name} };
413 my $type = $obj->{type} || $arch->{type}; 792 my $type = $obj->{type} || $arch->{type};
414 793
415 if ($type > 0) { 794 if ($type > 0) {
416 $root = $Crossfire::Data::ATTR{$type}; 795 $root = $Deliantra::Data::ATTR{$type};
417 } else { 796 } else {
797 my %a = (%$arch, %$obj);
798
799 if ($a{is_floor} && !$a{alive}) {
800 $root = $Deliantra::Data::TYPE{Floor};
801 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
802 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
803 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
804 $root = $Deliantra::Data::TYPE{Wall};
805 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
806 $root = $Deliantra::Data::TYPE{"Weak Wall"};
807 } else {
418 $root = $Crossfire::Data::TYPE{Misc}; 808 $root = $Deliantra::Data::TYPE{Misc};
419
420 type:
421 for (@Crossfire::Data::ATTR0) {
422 my $req = $_->{required}
423 or die "internal error: ATTR0 without 'required'";
424
425 keys %$req;
426 while (my ($k, $v) = each %$req) {
427 next type
428 unless $obj->{$k} == $v || $arch->{$k} == $v;
429 }
430
431 $root = $_;
432 } 809 }
433 } 810 }
434 811
435 my @import = ($root); 812 my @import = ($root);
436 813
437 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 814 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
438 unless $type == 116; 815 unless $type == 116;
439 816
440 my (%ignore); 817 my (%ignore);
441 my (@section_order, %section, @attr_order); 818 my (@section_order, %section, @attr_order);
442 819
443 while (my $type = shift @import) { 820 while (my $type = shift @import) {
821 push @import,
822 grep $_,
823 map $Deliantra::Data::TYPE{$_},
444 push @import, @{$type->{import} || []}; 824 @{$type->{import} || []};
445 825
446 $attr->{$_} ||= $type->{$_} 826 $attr->{$_} ||= $type->{$_}
447 for qw(name desc use); 827 for qw(name desc use);
448 828
449 for (@{$type->{ignore} || []}) { 829 for (@{$type->{ignore} || []}) {
478 ]; 858 ];
479 859
480 $attr 860 $attr
481} 861}
482 862
483sub arch_edit_sections {
484# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
485# edit_type = 0;
486# else if (edit_type != 0) {
487# // all flags from 'check_type' must be unset in this arch because they get recalculated now
488# edit_type &= ~check_type;
489# }
490#
491# }
492# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
493# getAttributeValue("alive", defarch) == 1 &&
494# (getAttributeValue("monster", defarch) == 1 ||
495# getAttributeValue("generator", defarch) == 1)) {
496# // Monster: monsters/npcs/generators
497# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
498# }
499# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
500# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
501# // Walls
502# edit_type |= IGUIConstants.TILE_EDIT_WALL;
503# }
504# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
505# getAttributeValue("connected", defarch) != 0) {
506# // Connected Objects
507# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
508# }
509# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
510# arch_type == 66 || arch_type == 41 || arch_type == 95) {
511# // Exit: teleporter/exit/trapdoors
512# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
513# }
514# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
515# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
516# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
517# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
518# arch_type == 124 || arch_type == 130)) {
519# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
520# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
521# }
522# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
523# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
524# arch_type == 91 || arch_type == 21 || arch_type == 24) {
525# // Door: door/special door/gates + keys
526# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
527# }
528# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
529# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
530# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
531# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
532# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
533# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
534# arch_type == 122 || arch_type == 3)) {
535# // Equipment: weapons/armour/wands/rods
536# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
537# }
538#
539# return(edit_type);
540#
541#
542}
543
544sub cache_file($$&&) { 863sub cache_file($$&&) {
545 my ($src, $cache, $load, $create) = @_; 864 my ($src, $cache, $load, $create) = @_;
546 865
547 my ($size, $mtime) = (stat $src)[7,9] 866 my ($size, $mtime) = (stat $src)[7,9]
548 or Carp::croak "$src: $!"; 867 or Carp::croak "$src: $!";
596 }, sub { 915 }, sub {
597 read_arch "$LIB/archetypes" 916 read_arch "$LIB/archetypes"
598 }; 917 };
599} 918}
600 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
601=item load_tilecache 950=item load_tilecache
602 951
603(Re-)Load %TILE and %FACE. 952(Re-)Load %TILE and %FACE.
604 953
605=cut 954=cut
606 955
607sub load_tilecache() { 956sub load_tilecache() {
608 require Gtk2; 957 require Gtk2;
609 958
610 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 959 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
611 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
612 or die "$VARDIR/tilecache.png: $!";
613 *FACE = $_[0];
614 }, sub { 960 sub {
615 require File::Temp;
616
617 my $tile = read_pak "$LIB/crossfire.0";
618
619 my %cache; 961 my %cache;
962 my $facedata = Storable::retrieve "$LIB/facedata";
620 963
964 $facedata->{version} == 2
965 or die "$LIB/facedata: version mismatch, cannot proceed.";
966
967 my $faces = $facedata->{faceinfo};
621 my $idx = 0; 968 my $idx = 0;
622 969
623 for my $name (sort keys %$tile) { 970 for (sort keys %$faces) {
624 my ($fh, $filename) = File::Temp::tempfile (); 971 my ($face, $info) = ($_, $faces->{$_});
625 print $fh $tile->{$name}; 972
626 close $fh;
627 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 973 my $pb = new Gtk2::Gdk::PixbufLoader;
628 unlink $filename; 974 $pb->write ($info->{data32});
975 $pb->close;
976 my $pb = $pb->get_pixbuf;
629 977
630 my $tile = $cache{$name} = { 978 my $tile = $cache{$face} = {
631 pb => $pb, 979 pb => $pb,
632 idx => $idx, 980 idx => $idx,
633 w => int $pb->get_width / TILESIZE, 981 w => int $pb->get_width / TILESIZE,
634 h => int $pb->get_height / TILESIZE, 982 h => int $pb->get_height / TILESIZE,
635 }; 983 };
636
637 984
638 $idx += $tile->{w} * $tile->{h}; 985 $idx += $tile->{w} * $tile->{h};
986 }
987
988 construct_tilecache_pb $idx, \%cache;
989
990 \%cache
639 } 991 };
640
641 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
642
643 while (my ($name, $tile) = each %cache) {
644 my $tpb = delete $tile->{pb};
645 my $ofs = $tile->{idx};
646
647 for my $x (0 .. $tile->{w} - 1) {
648 for my $y (0 .. $tile->{h} - 1) {
649 my $idx = $ofs + $x + $y * $tile->{w};
650 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
651 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
652 }
653 }
654 }
655
656 $pb->save ("$VARDIR/tilecache.png", "png");
657
658 \%cache
659 };
660} 992}
993
994=back
661 995
662=head1 AUTHOR 996=head1 AUTHOR
663 997
664 Marc Lehmann <schmorp@schmorp.de> 998 Marc Lehmann <schmorp@schmorp.de>
665 http://home.schmorp.de/ 999 http://home.schmorp.de/
668 http://www.ta-sa.org/ 1002 http://www.ta-sa.org/
669 1003
670=cut 1004=cut
671 1005
6721 10061
1007

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines