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

Diff Legend

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