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

Diff Legend

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