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

Diff Legend

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