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

Diff Legend

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