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

Diff Legend

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