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.57 by root, Thu Mar 23 08:55:54 2006 UTC vs.
Revision 1.134 by root, Wed Oct 28 10:17:01 2009 UTC

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

Diff Legend

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