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.73 by root, Tue Sep 12 02:18:06 2006 UTC vs.
Revision 1.137 by root, Tue Dec 15 01:44:06 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.9'; 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
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 region
62 shopitems shopgreed shopmin shopmax shoprace 62 shopitems shopgreed shopmin shopmax shoprace
63 darkness width height enter_x enter_y msg maplore 63 darkness width height enter_x enter_y msg maplore
64 unique template 64 unique template
65 outdoor temp pressure humid windspeed winddir sky nosmooth 65 outdoor temp pressure humid windspeed winddir sky nosmooth
66 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
67)); 67));
68 68
69our @FIELD_ORDER = (qw( 69our @FIELD_ORDER = (qw(
70 inherit
71
70 elevation 72 elevation
71 73
72 name name_pl custom_name attach title race 74 name name_pl custom_name attach title race
73 slaying skill msg lore other_arch face 75 slaying skill msg lore other_arch
74 #todo-events 76 sound sound_destroy face animation is_animated
75 animation is_animated 77 magicmap smoothlevel smoothface
76 str dex con wis pow cha int 78 str dex con wis pow cha int
77 hp maxhp sp maxsp grace maxgrace 79 hp maxhp sp maxsp grace maxgrace
78 exp perm_exp expmul 80 exp perm_exp expmul
79 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
80 nrof level direction type subtype attacktype 82 nrof level direction type subtype attacktype
… …
88 resist_life_stealing resist_disease 90 resist_life_stealing resist_disease
89 91
90 path_attuned path_repelled path_denied material materialname 92 path_attuned path_repelled path_denied material materialname
91 value carrying weight invisible state magic 93 value carrying weight invisible state magic
92 last_heal last_sp last_grace last_eat 94 last_heal last_sp last_grace last_eat
93 connected glow_radius randomitems npx_status npc_program 95 connected glow_radius randomitems tresure_env npx_status npc_program
94 run_away pick_up container will_apply smoothlevel 96 run_away pick_up container will_apply smoothlevel
95 current_weapon_script weapontype tooltype elevation client_type 97 current_weapon_script weapontype tooltype elevation client_type
96 item_power duration range 98 item_power duration range
97 range_modifier duration_modifier dam_modifier gen_sp_armour 99 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 100 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 111 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 112 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 113 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 114 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 115 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
116 precious
114 117
115 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
116 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
117)); 120));
118 121
… …
135sub MOVE_FLY_LOW (){ 0x02 } 138sub MOVE_FLY_LOW (){ 0x02 }
136sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
137sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
138sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
139sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
143sub MOVE_SHIP (){ 0x20 }
140sub MOVE_KNOWN (){ 0x1f } # all of above 144sub MOVE_KNOWN (){ 0x3f } # all of above
141sub MOVE_ALLBIT (){ 0x10000 }
142sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 145sub MOVE_ALL (){ 0x10000 } # very special value
146
147our %MOVE_TYPE = (
148 walk => MOVE_WALK,
149 fly_low => MOVE_FLY_LOW,
150 fly_high => MOVE_FLY_HIGH,
151 flying => MOVE_FLYING,
152 swim => MOVE_SWIM,
153 boat => MOVE_BOAT,
154 ship => MOVE_SHIP,
155 all => MOVE_ALL,
156);
157
158our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
159
160{
161 package Deliantra::MoveType;
162
163 use overload
164 '=' => sub { bless [@{$_[0]}], ref $_[0] },
165 '""' => \&as_string,
166 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
167 '<=' => sub {
168 ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
169 ? $_[0][1] & $MOVE_TYPE{$_[1]}
170 : undef
171 },
172 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
173 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
174 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
175 'x=' => sub { # toggle between off, + and -
176 my $cur = $_[0] >= $_[1];
177 if (!defined $cur) {
178 if ($_[0] >= "all") {
179 $_[0] -= $_[1];
180 } else {
181 $_[0] += $_[1];
182 }
183 } elsif ($cur) {
184 $_[0] -= $_[1];
185 } else {
186 $_[0] /= $_[1];
187 }
188
189 $_[0]
190 },
191 'eq' => sub { "$_[0]" eq "$_[1]" },
192 'ne' => sub { "$_[0]" ne "$_[1]" },
193 ;
194
195 sub TO_JSON {
196 $_[0][0]
197 }
198}
199
200sub Deliantra::MoveType::new {
201 my ($class, $string) = @_;
202
203 my $mask;
204 my $value;
205
206 if ($string =~ /^\s*\d+\s*$/) {
207 $mask = MOVE_ALL;
208 $value = $string+0;
209 } else {
210 for (split /\s+/, lc $string) {
211 if (s/^-//) {
212 $mask |= $MOVE_TYPE{$_};
213 $value &= ~$MOVE_TYPE{$_};
214 } else {
215 $mask |= $MOVE_TYPE{$_};
216 $value |= $MOVE_TYPE{$_};
217 }
218 }
219 }
220
221 (bless [$mask, $value], $class)->normalise
222}
223
224sub Deliantra::MoveType::normalise {
225 my ($self) = @_;
226
227 if ($self->[0] & MOVE_ALL) {
228 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
229 $self->[0] &= $mask;
230 $self->[1] &= $mask;
231 }
232
233 $self->[1] &= $self->[0];
234
235 $self
236}
237
238sub Deliantra::MoveType::as_string {
239 my ($self) = @_;
240
241 my @res;
242
243 my ($mask, $value) = @$self;
244
245 for (@Deliantra::MOVE_TYPE) {
246 my $bit = $Deliantra::MOVE_TYPE{$_};
247 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
248 $mask &= ~$bit;
249 push @res, $value & $bit ? $_ : "-$_";
250 }
251 }
252
253 join " ", @res
254}
143 255
144sub load_ref($) { 256sub load_ref($) {
145 my ($path) = @_; 257 my ($path) = @_;
146 258
147 open my $fh, "<:raw:perlio", $path 259 open my $fh, "<:raw:perlio", $path
… …
197 while (my ($k, $v) = each %attack_mask) { 309 while (my ($k, $v) = each %attack_mask) {
198 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v; 310 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
199 } 311 }
200} 312}
201 313
314my %MATERIAL = reverse
315 paper => 1,
316 iron => 2,
317 glass => 4,
318 leather => 8,
319 wood => 16,
320 organic => 32,
321 stone => 64,
322 cloth => 128,
323 adamant => 256,
324 liquid => 512,
325 tin => 1024,
326 bone => 2048,
327 ice => 4096,
328
329 # guesses
330 runestone => 12,
331 bronze => 18,
332 "ancient wood" => 20,
333 glass => 36,
334 marble => 66,
335 ice => 68,
336 stone => 70,
337 stone => 80,
338 cloth => 136,
339 ironwood => 144,
340 adamantium => 258,
341 glacium => 260,
342 blood => 544,
343;
344
202# object as in "Object xxx", i.e. archetypes 345# object as in "Object xxx", i.e. archetypes
203sub normalize_object($) { 346sub normalize_object($) {
204 my ($ob) = @_; 347 my ($ob) = @_;
205 348
349 delete $ob->{editable}; # deprecated
350
351 # convert material bitset to materialname, if possible
352 if (exists $ob->{material}) {
353 if (!$ob->{material}) {
354 delete $ob->{material};
355 } elsif (exists $ob->{materialname}) {
356 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
357 delete $ob->{material};
358 } else {
359 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
360 delete $ob->{material}; # assume materilname is more specific and nuke material
361 }
362 } elsif (my $name = $MATERIAL{$ob->{material}}) {
363 delete $ob->{material};
364 $ob->{materialname} = $name;
365 } else {
366 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
367 }
368 }
369
370 # check whether attachment is the same as in the archetype
371 if (exists $ob->{attach}) {
372 my $arch = $ARCH{$ob->{_name}};
373 my $js = JSON::XS->new->utf8->canonical (1);
374
375 if (defined $arch->{attach}
376 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
377 delete $ob->{attach}
378 }
379 }
380
381 # color_fg is used as default for magicmap if magicmap does not exist
382 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
383
206 # nuke outdated or never supported fields 384 # nuke outdated or never supported fields
207 delete @$ob{qw( 385 delete @$ob{qw(
208 can_knockback can_parry can_impale can_cut can_dam_armour 386 can_knockback can_parry can_impale can_cut can_dam_armour
209 can_apply pass_thru can_pass_thru 387 can_apply pass_thru can_pass_thru color_bg color_fg
210 )}; 388 )};
211 389
212 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 390 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
213 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 391 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
214 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 392 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
215 393
216 # convert movement strings to bitsets 394 # convert movement strings to bitsets
217 for my $attr (keys %FIELD_MOVEMENT) { 395 for my $attr (keys %FIELD_MOVEMENT) {
218 next unless exists $ob->{$attr}; 396 next unless exists $ob->{$attr};
219 397
220 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 398 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
221
222 next if $ob->{$attr} =~ /^\d+$/;
223
224 my $flags = 0;
225
226 # assume list
227 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
228 $flags |= MOVE_WALK if $flag eq "walk";
229 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
230 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
231 $flags |= MOVE_FLYING if $flag eq "flying";
232 $flags |= MOVE_SWIM if $flag eq "swim";
233 $flags |= MOVE_BOAT if $flag eq "boat";
234 $flags |= MOVE_ALL if $flag eq "all";
235
236 $flags &= ~MOVE_WALK if $flag eq "-walk";
237 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
238 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
239 $flags &= ~MOVE_FLYING if $flag eq "-flying";
240 $flags &= ~MOVE_SWIM if $flag eq "-swim";
241 $flags &= ~MOVE_BOAT if $flag eq "-boat";
242 $flags &= ~MOVE_ALL if $flag eq "-all";
243 }
244
245 $ob->{$attr} = $flags;
246 } 399 }
247 400
248 # convert outdated movement flags to new movement sets 401 # convert outdated movement flags to new movement sets
249 if (defined (my $v = delete $ob->{no_pass})) { 402 if (defined (my $v = delete $ob->{no_pass})) {
250 $ob->{move_block} = $v ? MOVE_ALL : 0; 403 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
251 } 404 }
252 if (defined (my $v = delete $ob->{slow_move})) { 405 if (defined (my $v = delete $ob->{slow_move})) {
253 $ob->{move_slow} |= MOVE_WALK; 406 $ob->{move_slow} += "walk";
254 $ob->{move_slow_penalty} = $v; 407 $ob->{move_slow_penalty} = $v;
255 } 408 }
256 if (defined (my $v = delete $ob->{walk_on})) { 409 if (defined (my $v = delete $ob->{walk_on})) {
257 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 410 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
258 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
259 : $ob->{move_on} & ~MOVE_WALK;
260 } 411 }
261 if (defined (my $v = delete $ob->{walk_off})) { 412 if (defined (my $v = delete $ob->{walk_off})) {
262 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 413 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
263 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
264 : $ob->{move_off} & ~MOVE_WALK;
265 } 414 }
266 if (defined (my $v = delete $ob->{fly_on})) { 415 if (defined (my $v = delete $ob->{fly_on})) {
267 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 416 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
268 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
269 : $ob->{move_on} & ~MOVE_FLY_LOW;
270 } 417 }
271 if (defined (my $v = delete $ob->{fly_off})) { 418 if (defined (my $v = delete $ob->{fly_off})) {
272 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 419 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
273 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
274 : $ob->{move_off} & ~MOVE_FLY_LOW;
275 } 420 }
276 if (defined (my $v = delete $ob->{flying})) { 421 if (defined (my $v = delete $ob->{flying})) {
277 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 422 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
278 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
279 : $ob->{move_type} & ~MOVE_FLY_LOW;
280 } 423 }
281 424
282 # convert idiotic event_xxx things into objects 425 # convert idiotic event_xxx things into objects
283 while (my ($event, $subtype) = each %EVENT_TYPE) { 426 while (my ($event, $subtype) = each %EVENT_TYPE) {
284 if (exists $ob->{"event_${event}_plugin"}) { 427 if (exists $ob->{"event_${event}_plugin"}) {
… …
300# arch as in "arch xxx", ie.. objects 443# arch as in "arch xxx", ie.. objects
301sub normalize_arch($) { 444sub normalize_arch($) {
302 my ($ob) = @_; 445 my ($ob) = @_;
303 446
304 normalize_object $ob; 447 normalize_object $ob;
448
449 return if $ob->{_atype} eq "object";
305 450
306 my $arch = $ARCH{$ob->{_name}} 451 my $arch = $ARCH{$ob->{_name}}
307 or (warn "$ob->{_name}: no such archetype", return $ob); 452 or (warn "$ob->{_name}: no such archetype", return $ob);
308 453
309 if ($arch->{type} == 22) { # map 454 if ($arch->{type} == 22) { # map
… …
345} 490}
346 491
347sub attr_thaw($) { 492sub attr_thaw($) {
348 my ($ob) = @_; 493 my ($ob) = @_;
349 494
350 $ob->{attach} = from_json $ob->{attach} 495 $ob->{attach} = decode_json $ob->{attach}
351 if exists $ob->{attach}; 496 if exists $ob->{attach};
352 497
353 $ob 498 $ob
354} 499}
355 500
356sub attr_freeze($) { 501sub attr_freeze($) {
357 my ($ob) = @_; 502 my ($ob) = @_;
358 503
359 $ob->{attach} = Crossfire::to_json $ob->{attach} 504 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
360 if exists $ob->{attach}; 505 if exists $ob->{attach};
361 506
362 $ob 507 $ob
363} 508}
364 509
… …
382sub read_arch($;$) { 527sub read_arch($;$) {
383 my ($path, $toplevel) = @_; 528 my ($path, $toplevel) = @_;
384 529
385 my %arc; 530 my %arc;
386 my ($more, $prev); 531 my ($more, $prev);
532 my $comment;
387 533
388 open my $fh, "<:raw:perlio:utf8", $path 534 open my $fh, "<:utf8", $path
389 or Carp::croak "$path: $!"; 535 or Carp::croak "$path: $!";
390 536
391# binmode $fh; 537# binmode $fh;
392 538
393 my $parse_block; $parse_block = sub { 539 my $parse_block; $parse_block = sub {
… …
395 541
396 while (<$fh>) { 542 while (<$fh>) {
397 s/\s+$//; 543 s/\s+$//;
398 if (/^end$/i) { 544 if (/^end$/i) {
399 last; 545 last;
546
400 } elsif (/^arch (\S+)$/i) { 547 } elsif (/^arch (\S+)$/i) {
401 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 548 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
549
402 } elsif (/^lore$/i) { 550 } elsif (/^lore$/i) {
403 while (<$fh>) { 551 while (<$fh>) {
404 last if /^endlore\s*$/i; 552 last if /^endlore\s*$/i;
405 $arc{lore} .= $_; 553 $arc{lore} .= $_;
406 } 554 }
… …
415 chomp; 563 chomp;
416 push @{ $arc{anim} }, $_; 564 push @{ $arc{anim} }, $_;
417 } 565 }
418 } elsif (/^(\S+)\s*(.*)$/) { 566 } elsif (/^(\S+)\s*(.*)$/) {
419 $arc{lc $1} = $2; 567 $arc{lc $1} = $2;
420 } elsif (/^\s*($|#)/) { 568 } elsif (/^\s*#/) {
569 $arc{_comment} .= "$_\n";
570
571 } elsif (/^\s*$/) {
421 # 572 #
422 } else { 573 } else {
423 warn "$path: unparsable line '$_' in arch $arc{_name}"; 574 warn "$path: unparsable line '$_' in arch $arc{_name}";
424 } 575 }
425 } 576 }
… …
431 s/\s+$//; 582 s/\s+$//;
432 if (/^more$/i) { 583 if (/^more$/i) {
433 $more = $prev; 584 $more = $prev;
434 } elsif (/^object (\S+)$/i) { 585 } elsif (/^object (\S+)$/i) {
435 my $name = $1; 586 my $name = $1;
436 my $arc = attr_thaw normalize_object $parse_block->(_name => $name); 587 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
588 undef $comment;
589 delete $arc{_comment} unless length $arc{_comment};
437 $arc->{_atype} = 'object'; 590 $arc->{_atype} = 'object';
438 591
439 if ($more) { 592 if ($more) {
440 $more->{more} = $arc; 593 $more->{more} = $arc;
441 } else { 594 } else {
… …
443 } 596 }
444 $prev = $arc; 597 $prev = $arc;
445 $more = undef; 598 $more = undef;
446 } elsif (/^arch (\S+)$/i) { 599 } elsif (/^arch (\S+)$/i) {
447 my $name = $1; 600 my $name = $1;
448 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 601 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
602 undef $comment;
603 delete $arc{_comment} unless length $arc{_comment};
449 $arc->{_atype} = 'arch'; 604 $arc->{_atype} = 'arch';
450 605
451 if ($more) { 606 if ($more) {
452 $more->{more} = $arc; 607 $more->{more} = $arc;
453 } else { 608 } else {
… …
462 push @{$toplevel->{lev_array}}, $_+0; 617 push @{$toplevel->{lev_array}}, $_+0;
463 } 618 }
464 } else { 619 } else {
465 $toplevel->{$1} = $2; 620 $toplevel->{$1} = $2;
466 } 621 }
622 } elsif (/^\s*#/) {
623 $comment .= "$_\n";
467 } elsif (/^\s*($|#)/) { 624 } elsif (/^\s*($|#)/) {
468 # 625 #
469 } else { 626 } else {
470 die "$path: unparseable top-level line '$_'"; 627 die "$path: unparseable top-level line '$_'";
471 } 628 }
… …
482 my $str; 639 my $str;
483 640
484 my $append; $append = sub { 641 my $append; $append = sub {
485 my %a = %{$_[0]}; 642 my %a = %{$_[0]};
486 643
487 Crossfire::attr_freeze \%a; 644 Deliantra::attr_freeze \%a;
488 Crossfire::normalize_arch \%a; 645 Deliantra::normalize_arch \%a;
489 646
490 # undo the bit-split we did before 647 # undo the bit-split we did before
491 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 648 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
492 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 649 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
493 | (delete $a{attack_movement_bits_4_7}); 650 | (delete $a{attack_movement_bits_4_7});
494 } 651 }
495 652
653 if (my $comment = delete $a{_comment}) {
654 if ($comment =~ /[^\n\s#]/) {
655 $str .= $comment;
656 }
657 }
658
496 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 659 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
497 660
498 my $inv = delete $a{inventory}; 661 my $inv = delete $a{inventory};
499 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 662 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
500 my $anim = delete $a{anim}; 663 my $anim = delete $a{anim};
501 664
665 if ($a{_atype} eq 'object') {
666 $str .= join "\n", "anim", @$anim, "mina\n"
667 if $anim;
668 }
669
502 my @kv; 670 my @kv;
503 671
504 for ($a{_name} eq "map" 672 for ($a{_name} eq "map"
505 ? @Crossfire::FIELD_ORDER_MAP 673 ? @Deliantra::FIELD_ORDER_MAP
506 : @Crossfire::FIELD_ORDER) { 674 : @Deliantra::FIELD_ORDER) {
507 push @kv, [$_, delete $a{$_}] 675 push @kv, [$_, delete $a{$_}]
508 if exists $a{$_}; 676 if exists $a{$_};
509 } 677 }
510 678
511 for (sort keys %a) { 679 for (sort keys %a) {
… …
514 } 682 }
515 683
516 for (@kv) { 684 for (@kv) {
517 my ($k, $v) = @$_; 685 my ($k, $v) = @$_;
518 686
519 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 687 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
520 $v =~ s/\n$//; 688 $v =~ s/\n$//;
521 $str .= "$k\n$v\n$end\n"; 689 $str .= "$k\n$v\n$end\n";
522 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
523 if ($v & ~Crossfire::MOVE_ALL or !$v) {
524 $str .= "$k $v\n";
525
526 } elsif ($v & Crossfire::MOVE_ALLBIT) {
527 $str .= "$k all";
528
529 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
530 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
531 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
532 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
533 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
534
535 $str .= "\n";
536
537 } else {
538 $str .= $k;
539
540 $str .= " walk" if $v & Crossfire::MOVE_WALK;
541 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
542 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
543 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
544 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
545
546 $str .= "\n";
547 }
548 } else { 690 } else {
549 $str .= "$k $v\n"; 691 $str .= "$k $v\n";
550 } 692 }
551 } 693 }
552 694
553 if ($inv) { 695 if ($inv) {
554 $append->($_) for @$inv; 696 $append->($_) for @$inv;
555 } 697 }
556 698
699 $str .= "end\n";
700
557 if ($a{_atype} eq 'object') { 701 if ($a{_atype} eq 'object') {
558 $str .= join "\n", "anim", @$anim, "mina\n" 702 if ($more) {
559 if $anim;
560 }
561
562 $str .= "end\n";
563
564 if (($a{_atype} eq 'object') && $more) {
565 $str .= "\nmore\n"; 703 $str .= "more\n";
566 $append->($more) if $more; 704 $append->($more) if $more;
705 } else {
706 $str .= "\n";
707 }
567 } 708 }
568 }; 709 };
569 710
570 for (@$arch) { 711 for (@$arch) {
571 $append->($_); 712 $append->($_);
… …
600 my ($a) = @_; 741 my ($a) = @_;
601 742
602 my $o = $ARCH{$a->{_name}} 743 my $o = $ARCH{$a->{_name}}
603 or return; 744 or return;
604 745
605 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 746 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
747 unless ($face) {
748 $face = $FACE{"blank.x11"}
606 or (warn "no face data found for arch '$a->{_name}'"), return; 749 or (warn "no face data found for arch '$a->{_name}'"), return;
750 }
607 751
608 if ($face->{w} > 1 || $face->{h} > 1) { 752 if ($face->{w} > 1 || $face->{h} > 1) {
609 # bigface 753 # bigface
610 return (0, 0, $face->{w} - 1, $face->{h} - 1); 754 return (0, 0, $face->{w} - 1, $face->{h} - 1);
611 755
… …
644=cut 788=cut
645 789
646sub arch_attr($) { 790sub arch_attr($) {
647 my ($obj) = @_; 791 my ($obj) = @_;
648 792
649 require Crossfire::Data; 793 require Deliantra::Data;
650 794
651 my $root; 795 my $root;
652 my $attr = { }; 796 my $attr = { };
653 797
654 my $arch = $ARCH{ $obj->{_name} }; 798 my $arch = $ARCH{ $obj->{_name} };
655 my $type = $obj->{type} || $arch->{type}; 799 my $type = $obj->{type} || $arch->{type};
656 800
657 if ($type > 0) { 801 if ($type > 0) {
658 $root = $Crossfire::Data::ATTR{$type}; 802 $root = $Deliantra::Data::ATTR{$type};
659 } else { 803 } else {
660 my %a = (%$arch, %$obj); 804 my %a = (%$arch, %$obj);
661 805
662 if ($a{is_floor} && !$a{alive}) { 806 if ($a{is_floor} && !$a{alive}) {
663 $root = $Crossfire::Data::TYPE{Floor}; 807 $root = $Deliantra::Data::TYPE{Floor};
664 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 808 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
665 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 809 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
666 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 810 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
667 $root = $Crossfire::Data::TYPE{Wall}; 811 $root = $Deliantra::Data::TYPE{Wall};
668 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 812 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
669 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 813 $root = $Deliantra::Data::TYPE{"Weak Wall"};
670 } else { 814 } else {
671 $root = $Crossfire::Data::TYPE{Misc}; 815 $root = $Deliantra::Data::TYPE{Misc};
672 } 816 }
673 } 817 }
674 818
675 my @import = ($root); 819 my @import = ($root);
676 820
677 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 821 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
678 unless $type == 116; 822 unless $type == 116;
679 823
680 my (%ignore); 824 my (%ignore);
681 my (@section_order, %section, @attr_order); 825 my (@section_order, %section, @attr_order);
682 826
683 while (my $type = shift @import) { 827 while (my $type = shift @import) {
828 push @import,
829 grep $_,
830 map $Deliantra::Data::TYPE{$_},
684 push @import, @{$type->{import} || []}; 831 @{$type->{import} || []};
685 832
686 $attr->{$_} ||= $type->{$_} 833 $attr->{$_} ||= $type->{$_}
687 for qw(name desc use); 834 for qw(name desc use);
688 835
689 for (@{$type->{ignore} || []}) { 836 for (@{$type->{ignore} || []}) {
… …
718 ]; 865 ];
719 866
720 $attr 867 $attr
721} 868}
722 869
723sub arch_edit_sections {
724# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
725# edit_type = 0;
726# else if (edit_type != 0) {
727# // all flags from 'check_type' must be unset in this arch because they get recalculated now
728# edit_type &= ~check_type;
729# }
730#
731# }
732# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
733# getAttributeValue("alive", defarch) == 1 &&
734# (getAttributeValue("monster", defarch) == 1 ||
735# getAttributeValue("generator", defarch) == 1)) {
736# // Monster: monsters/npcs/generators
737# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
738# }
739# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
740# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
741# // Walls
742# edit_type |= IGUIConstants.TILE_EDIT_WALL;
743# }
744# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
745# getAttributeValue("connected", defarch) != 0) {
746# // Connected Objects
747# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
748# }
749# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
750# arch_type == 66 || arch_type == 41 || arch_type == 95) {
751# // Exit: teleporter/exit/trapdoors
752# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
753# }
754# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
755# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
756# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
757# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
758# arch_type == 124 || arch_type == 130)) {
759# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
760# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
761# }
762# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
763# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
764# arch_type == 91 || arch_type == 21 || arch_type == 24) {
765# // Door: door/special door/gates + keys
766# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
767# }
768# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
769# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
770# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
771# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
772# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
773# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
774# arch_type == 122 || arch_type == 3)) {
775# // Equipment: weapons/armour/wands/rods
776# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
777# }
778#
779# return(edit_type);
780#
781#
782}
783
784sub cache_file($$&&) { 870sub cache_file($$&&) {
785 my ($src, $cache, $load, $create) = @_; 871 my ($src, $cache, $load, $create) = @_;
786 872
787 my ($size, $mtime) = (stat $src)[7,9] 873 my ($size, $mtime) = (stat $src)[7,9]
788 or Carp::croak "$src: $!"; 874 or Carp::croak "$src: $!";
… …
836 }, sub { 922 }, sub {
837 read_arch "$LIB/archetypes" 923 read_arch "$LIB/archetypes"
838 }; 924 };
839} 925}
840 926
927sub construct_tilecache_pb {
928 my ($idx, $cache) = @_;
929
930 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
931
932 while (my ($name, $tile) = each %$cache) {
933 my $tpb = delete $tile->{pb};
934 my $ofs = $tile->{idx};
935
936 for my $x (0 .. $tile->{w} - 1) {
937 for my $y (0 .. $tile->{h} - 1) {
938 my $idx = $ofs + $x + $y * $tile->{w};
939 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
940 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
941 }
942 }
943 }
944
945 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
946
947 $cache
948}
949
950sub use_tilecache {
951 my ($face) = @_;
952 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
953 or die "$VARDIR/tilecache.png: $!";
954 *FACE = $_[0];
955}
956
841=item load_tilecache 957=item load_tilecache
842 958
843(Re-)Load %TILE and %FACE. 959(Re-)Load %TILE and %FACE.
844 960
845=cut 961=cut
846 962
847sub load_tilecache() { 963sub load_tilecache() {
848 require Gtk2; 964 require Gtk2;
849 965
850 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 966 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
851 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
852 or die "$VARDIR/tilecache.png: $!";
853 *FACE = $_[0];
854 }, sub { 967 sub {
855 my $tile = read_pak "$LIB/crossfire.0";
856
857 my %cache; 968 my %cache;
969 my $facedata = Storable::retrieve "$LIB/facedata";
858 970
971 $facedata->{version} == 2
972 or die "$LIB/facedata: version mismatch, cannot proceed.";
973
974 my $faces = $facedata->{faceinfo};
859 my $idx = 0; 975 my $idx = 0;
860 976
861 for my $name (sort keys %$tile) { 977 for (sort keys %$faces) {
978 my ($face, $info) = ($_, $faces->{$_});
979
862 my $pb = new Gtk2::Gdk::PixbufLoader; 980 my $pb = new Gtk2::Gdk::PixbufLoader;
863 $pb->write ($tile->{$name}); 981 $pb->write ($info->{data32});
864 $pb->close; 982 $pb->close;
865 my $pb = $pb->get_pixbuf; 983 my $pb = $pb->get_pixbuf;
866 984
867 my $tile = $cache{$name} = { 985 my $tile = $cache{$face} = {
868 pb => $pb, 986 pb => $pb,
869 idx => $idx, 987 idx => $idx,
870 w => int $pb->get_width / TILESIZE, 988 w => int $pb->get_width / TILESIZE,
871 h => int $pb->get_height / TILESIZE, 989 h => int $pb->get_height / TILESIZE,
872 }; 990 };
873
874 991
875 $idx += $tile->{w} * $tile->{h}; 992 $idx += $tile->{w} * $tile->{h};
993 }
994
995 construct_tilecache_pb $idx, \%cache;
996
997 \%cache
876 } 998 };
877
878 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
879
880 while (my ($name, $tile) = each %cache) {
881 my $tpb = delete $tile->{pb};
882 my $ofs = $tile->{idx};
883
884 for my $x (0 .. $tile->{w} - 1) {
885 for my $y (0 .. $tile->{h} - 1) {
886 my $idx = $ofs + $x + $y * $tile->{w};
887 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
888 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
889 }
890 }
891 }
892
893 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
894
895 \%cache
896 };
897} 999}
1000
1001=back
898 1002
899=head1 AUTHOR 1003=head1 AUTHOR
900 1004
901 Marc Lehmann <schmorp@schmorp.de> 1005 Marc Lehmann <schmorp@schmorp.de>
902 http://home.schmorp.de/ 1006 http://home.schmorp.de/
… …
905 http://www.ta-sa.org/ 1009 http://www.ta-sa.org/
906 1010
907=cut 1011=cut
908 1012
9091 10131
1014

Diff Legend

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