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.120 by root, Wed Dec 26 18:26:15 2007 UTC

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

Diff Legend

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