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.78 by root, Sun Dec 3 01:02:05 2006 UTC vs.
Revision 1.140 by elmex, Fri Mar 19 23:11:43 2010 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.96'; 11our $VERSION = '1.29';
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" 33our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 34 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
40 : File::Spec->tmpdir . "/crossfire"; 35 : File::Spec->tmpdir . "/deliantra";
41 36
42mkdir $VARDIR, 0777; 37mkdir $VARDIR, 0777;
43 38
44sub TILESIZE (){ 32 } 39sub TILESIZE (){ 32 }
40sub CACHESTRIDE (){ 64 }
45 41
46our %ARCH; 42our %ARCH;
43our %FACE; # face32
47our %FACE; 44our %FACEDATA;
48our $TILE; 45our $TILE;
49 46
50our %FIELD_MULTILINE = ( 47our %FIELD_MULTILINE = (
51 msg => "endmsg", 48 msg => "endmsg",
52 lore => "endlore", 49 lore => "endlore",
… …
58 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);
59 56
60# same as in server save routine, to (hopefully) be compatible 57# same as in server save routine, to (hopefully) be compatible
61# to the other editors. 58# to the other editors.
62our @FIELD_ORDER_MAP = (qw( 59our @FIELD_ORDER_MAP = (qw(
60 file_format_version
63 name attach swap_time reset_timeout fixed_resettime difficulty region 61 name attach swap_time reset_timeout fixed_resettime difficulty region
64 shopitems shopgreed shopmin shopmax shoprace 62 shopitems shopgreed shopmin shopmax shoprace
65 darkness width height enter_x enter_y msg maplore 63 darkness width height enter_x enter_y msg maplore
66 unique template 64 unique template
67 outdoor temp pressure humid windspeed winddir sky nosmooth 65 outdoor temp pressure humid windspeed winddir sky nosmooth
68 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
69)); 67));
70 68
71our @FIELD_ORDER = (qw( 69our @FIELD_ORDER = (qw(
70 inherit
71
72 elevation 72 elevation
73 73
74 name name_pl custom_name attach title race 74 name name_pl custom_name attach title race
75 slaying skill msg lore other_arch face 75 slaying skill msg lore other_arch
76 #todo-events 76 sound sound_destroy face animation is_animated
77 animation is_animated 77 magicmap smoothlevel smoothface
78 str dex con wis pow cha int 78 str dex con wis pow cha int
79 hp maxhp sp maxsp grace maxgrace 79 hp maxhp sp maxsp grace maxgrace
80 exp perm_exp expmul 80 exp perm_exp expmul
81 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
82 nrof level direction type subtype attacktype 82 nrof level direction type subtype attacktype
… …
90 resist_life_stealing resist_disease 90 resist_life_stealing resist_disease
91 91
92 path_attuned path_repelled path_denied material materialname 92 path_attuned path_repelled path_denied material materialname
93 value carrying weight invisible state magic 93 value carrying weight invisible state magic
94 last_heal last_sp last_grace last_eat 94 last_heal last_sp last_grace last_eat
95 connected glow_radius randomitems npx_status npc_program 95 connected glow_radius randomitems tresure_env npx_status npc_program
96 run_away pick_up container will_apply smoothlevel 96 run_away pick_up container will_apply smoothlevel
97 current_weapon_script weapontype tooltype elevation client_type 97 current_weapon_script weapontype tooltype elevation client_type
98 item_power duration range 98 item_power duration range
99 range_modifier duration_modifier dam_modifier gen_sp_armour 99 range_modifier duration_modifier dam_modifier gen_sp_armour
100 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
… …
111 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
112 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
113 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
114 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
115 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
116 117
117 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
118 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
119)); 120));
120 121
… …
137sub MOVE_FLY_LOW (){ 0x02 } 138sub MOVE_FLY_LOW (){ 0x02 }
138sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
139sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
140sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
141sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
143sub MOVE_SHIP (){ 0x20 }
142sub MOVE_KNOWN (){ 0x1f } # all of above 144sub MOVE_KNOWN (){ 0x3f } # all of above
143sub MOVE_ALLBIT (){ 0x10000 }
144sub 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}
145 255
146sub load_ref($) { 256sub load_ref($) {
147 my ($path) = @_; 257 my ($path) = @_;
148 258
149 open my $fh, "<:raw:perlio", $path 259 open my $fh, "<:raw:perlio", $path
… …
199 while (my ($k, $v) = each %attack_mask) { 309 while (my ($k, $v) = each %attack_mask) {
200 $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;
201 } 311 }
202} 312}
203 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
204# object as in "Object xxx", i.e. archetypes 345# object as in "Object xxx", i.e. archetypes
205sub normalize_object($) { 346sub normalize_object($) {
206 my ($ob) = @_; 347 my ($ob) = @_;
207 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
208 # nuke outdated or never supported fields 384 # nuke outdated or never supported fields
209 delete @$ob{qw( 385 delete @$ob{qw(
210 can_knockback can_parry can_impale can_cut can_dam_armour 386 can_knockback can_parry can_impale can_cut can_dam_armour
211 can_apply pass_thru can_pass_thru 387 can_apply pass_thru can_pass_thru color_bg color_fg
212 )}; 388 )};
213 389
214 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 390 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
215 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 391 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
216 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 392 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
217 393
218 # convert movement strings to bitsets 394 # convert movement strings to bitsets
219 for my $attr (keys %FIELD_MOVEMENT) { 395 for my $attr (keys %FIELD_MOVEMENT) {
220 next unless exists $ob->{$attr}; 396 next unless exists $ob->{$attr};
221 397
222 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 398 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
223
224 next if $ob->{$attr} =~ /^\d+$/;
225
226 my $flags = 0;
227
228 # assume list
229 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
230 $flags |= MOVE_WALK if $flag eq "walk";
231 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
232 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
233 $flags |= MOVE_FLYING if $flag eq "flying";
234 $flags |= MOVE_SWIM if $flag eq "swim";
235 $flags |= MOVE_BOAT if $flag eq "boat";
236 $flags |= MOVE_ALL if $flag eq "all";
237
238 $flags &= ~MOVE_WALK if $flag eq "-walk";
239 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
240 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
241 $flags &= ~MOVE_FLYING if $flag eq "-flying";
242 $flags &= ~MOVE_SWIM if $flag eq "-swim";
243 $flags &= ~MOVE_BOAT if $flag eq "-boat";
244 $flags &= ~MOVE_ALL if $flag eq "-all";
245 }
246
247 $ob->{$attr} = $flags;
248 } 399 }
249 400
250 # convert outdated movement flags to new movement sets 401 # convert outdated movement flags to new movement sets
251 if (defined (my $v = delete $ob->{no_pass})) { 402 if (defined (my $v = delete $ob->{no_pass})) {
252 $ob->{move_block} = $v ? MOVE_ALL : 0; 403 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
253 } 404 }
254 if (defined (my $v = delete $ob->{slow_move})) { 405 if (defined (my $v = delete $ob->{slow_move})) {
255 $ob->{move_slow} |= MOVE_WALK; 406 $ob->{move_slow} += "walk";
256 $ob->{move_slow_penalty} = $v; 407 $ob->{move_slow_penalty} = $v;
257 } 408 }
258 if (defined (my $v = delete $ob->{walk_on})) { 409 if (defined (my $v = delete $ob->{walk_on})) {
259 $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" }
260 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
261 : $ob->{move_on} & ~MOVE_WALK;
262 } 411 }
263 if (defined (my $v = delete $ob->{walk_off})) { 412 if (defined (my $v = delete $ob->{walk_off})) {
264 $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" }
265 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
266 : $ob->{move_off} & ~MOVE_WALK;
267 } 414 }
268 if (defined (my $v = delete $ob->{fly_on})) { 415 if (defined (my $v = delete $ob->{fly_on})) {
269 $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" }
270 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
271 : $ob->{move_on} & ~MOVE_FLY_LOW;
272 } 417 }
273 if (defined (my $v = delete $ob->{fly_off})) { 418 if (defined (my $v = delete $ob->{fly_off})) {
274 $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" }
275 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
276 : $ob->{move_off} & ~MOVE_FLY_LOW;
277 } 420 }
278 if (defined (my $v = delete $ob->{flying})) { 421 if (defined (my $v = delete $ob->{flying})) {
279 $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" }
280 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
281 : $ob->{move_type} & ~MOVE_FLY_LOW;
282 } 423 }
283 424
284 # convert idiotic event_xxx things into objects 425 # convert idiotic event_xxx things into objects
285 while (my ($event, $subtype) = each %EVENT_TYPE) { 426 while (my ($event, $subtype) = each %EVENT_TYPE) {
286 if (exists $ob->{"event_${event}_plugin"}) { 427 if (exists $ob->{"event_${event}_plugin"}) {
… …
302# arch as in "arch xxx", ie.. objects 443# arch as in "arch xxx", ie.. objects
303sub normalize_arch($) { 444sub normalize_arch($) {
304 my ($ob) = @_; 445 my ($ob) = @_;
305 446
306 normalize_object $ob; 447 normalize_object $ob;
448
449 return if $ob->{_atype} eq "object";
307 450
308 my $arch = $ARCH{$ob->{_name}} 451 my $arch = $ARCH{$ob->{_name}}
309 or (warn "$ob->{_name}: no such archetype", return $ob); 452 or (warn "$ob->{_name}: no such archetype", return $ob);
310 453
311 if ($arch->{type} == 22) { # map 454 if ($arch->{type} == 22) { # map
… …
347} 490}
348 491
349sub attr_thaw($) { 492sub attr_thaw($) {
350 my ($ob) = @_; 493 my ($ob) = @_;
351 494
352 $ob->{attach} = from_json $ob->{attach} 495 $ob->{attach} = decode_json $ob->{attach}
353 if exists $ob->{attach}; 496 if exists $ob->{attach};
354 497
355 $ob 498 $ob
356} 499}
357 500
358sub attr_freeze($) { 501sub attr_freeze($) {
359 my ($ob) = @_; 502 my ($ob) = @_;
360 503
361 $ob->{attach} = Crossfire::to_json $ob->{attach} 504 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
362 if exists $ob->{attach}; 505 if exists $ob->{attach};
363 506
364 $ob 507 $ob
365} 508}
366 509
… …
384sub read_arch($;$) { 527sub read_arch($;$) {
385 my ($path, $toplevel) = @_; 528 my ($path, $toplevel) = @_;
386 529
387 my %arc; 530 my %arc;
388 my ($more, $prev); 531 my ($more, $prev);
532 my $comment;
389 533
390 open my $fh, "<:raw:perlio:utf8", $path 534 open my $fh, "<:utf8", $path
391 or Carp::croak "$path: $!"; 535 or Carp::croak "$path: $!";
392 536
393# binmode $fh; 537# binmode $fh;
394 538
395 my $parse_block; $parse_block = sub { 539 my $parse_block; $parse_block = sub {
… …
397 541
398 while (<$fh>) { 542 while (<$fh>) {
399 s/\s+$//; 543 s/\s+$//;
400 if (/^end$/i) { 544 if (/^end$/i) {
401 last; 545 last;
546
402 } elsif (/^arch (\S+)$/i) { 547 } elsif (/^arch (\S+)$/i) {
403 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 548 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
549
404 } elsif (/^lore$/i) { 550 } elsif (/^lore$/i) {
405 while (<$fh>) { 551 while (<$fh>) {
406 last if /^endlore\s*$/i; 552 last if /^endlore\s*$/i;
407 $arc{lore} .= $_; 553 $arc{lore} .= $_;
408 } 554 }
… …
417 chomp; 563 chomp;
418 push @{ $arc{anim} }, $_; 564 push @{ $arc{anim} }, $_;
419 } 565 }
420 } elsif (/^(\S+)\s*(.*)$/) { 566 } elsif (/^(\S+)\s*(.*)$/) {
421 $arc{lc $1} = $2; 567 $arc{lc $1} = $2;
422 } elsif (/^\s*($|#)/) { 568 } elsif (/^\s*#/) {
569 $arc{_comment} .= "$_\n";
570
571 } elsif (/^\s*$/) {
423 # 572 #
424 } else { 573 } else {
425 warn "$path: unparsable line '$_' in arch $arc{_name}"; 574 warn "$path: unparsable line '$_' in arch $arc{_name}";
426 } 575 }
427 } 576 }
… …
433 s/\s+$//; 582 s/\s+$//;
434 if (/^more$/i) { 583 if (/^more$/i) {
435 $more = $prev; 584 $more = $prev;
436 } elsif (/^object (\S+)$/i) { 585 } elsif (/^object (\S+)$/i) {
437 my $name = $1; 586 my $name = $1;
438 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};
439 $arc->{_atype} = 'object'; 590 $arc->{_atype} = 'object';
440 591
441 if ($more) { 592 if ($more) {
442 $more->{more} = $arc; 593 $more->{more} = $arc;
443 } else { 594 } else {
… …
445 } 596 }
446 $prev = $arc; 597 $prev = $arc;
447 $more = undef; 598 $more = undef;
448 } elsif (/^arch (\S+)$/i) { 599 } elsif (/^arch (\S+)$/i) {
449 my $name = $1; 600 my $name = $1;
450 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};
451 $arc->{_atype} = 'arch'; 604 $arc->{_atype} = 'arch';
452 605
453 if ($more) { 606 if ($more) {
454 $more->{more} = $arc; 607 $more->{more} = $arc;
455 } else { 608 } else {
… …
464 push @{$toplevel->{lev_array}}, $_+0; 617 push @{$toplevel->{lev_array}}, $_+0;
465 } 618 }
466 } else { 619 } else {
467 $toplevel->{$1} = $2; 620 $toplevel->{$1} = $2;
468 } 621 }
622 } elsif (/^\s*#/) {
623 $comment .= "$_\n";
469 } elsif (/^\s*($|#)/) { 624 } elsif (/^\s*($|#)/) {
470 # 625 #
471 } else { 626 } else {
472 die "$path: unparseable top-level line '$_'"; 627 die "$path: unparseable top-level line '$_'";
473 } 628 }
… …
484 my $str; 639 my $str;
485 640
486 my $append; $append = sub { 641 my $append; $append = sub {
487 my %a = %{$_[0]}; 642 my %a = %{$_[0]};
488 643
489 Crossfire::attr_freeze \%a; 644 Deliantra::attr_freeze \%a;
490 Crossfire::normalize_arch \%a; 645 Deliantra::normalize_arch \%a;
491 646
492 # undo the bit-split we did before 647 # undo the bit-split we did before
493 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}) {
494 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 649 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
495 | (delete $a{attack_movement_bits_4_7}); 650 | (delete $a{attack_movement_bits_4_7});
496 } 651 }
497 652
653 if (my $comment = delete $a{_comment}) {
654 if ($comment =~ /[^\n\s#]/) {
655 $str .= $comment;
656 }
657 }
658
498 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 659 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
499 660
500 my $inv = delete $a{inventory}; 661 my $inv = delete $a{inventory};
501 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
502 my $anim = delete $a{anim}; 663 my $anim = delete $a{anim};
503 664
665 if ($a{_atype} eq 'object') {
666 $str .= join "\n", "anim", @$anim, "mina\n"
667 if $anim;
668 }
669
504 my @kv; 670 my @kv;
505 671
506 for ($a{_name} eq "map" 672 for ($a{_name} eq "map"
507 ? @Crossfire::FIELD_ORDER_MAP 673 ? @Deliantra::FIELD_ORDER_MAP
508 : @Crossfire::FIELD_ORDER) { 674 : @Deliantra::FIELD_ORDER) {
509 push @kv, [$_, delete $a{$_}] 675 push @kv, [$_, delete $a{$_}]
510 if exists $a{$_}; 676 if exists $a{$_};
511 } 677 }
512 678
513 for (sort keys %a) { 679 for (sort keys %a) {
… …
516 } 682 }
517 683
518 for (@kv) { 684 for (@kv) {
519 my ($k, $v) = @$_; 685 my ($k, $v) = @$_;
520 686
521 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 687 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
522 $v =~ s/\n$//; 688 $v =~ s/\n$//;
523 $str .= "$k\n$v\n$end\n"; 689 $str .= "$k\n$v\n$end\n";
524 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
525 if ($v & ~Crossfire::MOVE_ALL or !$v) {
526 $str .= "$k $v\n";
527
528 } elsif ($v & Crossfire::MOVE_ALLBIT) {
529 $str .= "$k all";
530
531 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
532 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
533 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
534 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
535 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
536
537 $str .= "\n";
538
539 } else {
540 $str .= $k;
541
542 $str .= " walk" if $v & Crossfire::MOVE_WALK;
543 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
544 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
545 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
546 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
547
548 $str .= "\n";
549 }
550 } else { 690 } else {
551 $str .= "$k $v\n"; 691 $str .= "$k $v\n";
552 } 692 }
553 } 693 }
554 694
555 if ($inv) { 695 if ($inv) {
556 $append->($_) for @$inv; 696 $append->($_) for @$inv;
557 } 697 }
558 698
699 $str .= "end\n";
700
559 if ($a{_atype} eq 'object') { 701 if ($a{_atype} eq 'object') {
560 $str .= join "\n", "anim", @$anim, "mina\n" 702 if ($more) {
561 if $anim;
562 }
563
564 $str .= "end\n";
565
566 if (($a{_atype} eq 'object') && $more) {
567 $str .= "\nmore\n"; 703 $str .= "more\n";
568 $append->($more) if $more; 704 $append->($more) if $more;
705 } else {
706 $str .= "\n";
707 }
569 } 708 }
570 }; 709 };
571 710
572 for (@$arch) { 711 for (@$arch) {
573 $append->($_); 712 $append->($_);
… …
602 my ($a) = @_; 741 my ($a) = @_;
603 742
604 my $o = $ARCH{$a->{_name}} 743 my $o = $ARCH{$a->{_name}}
605 or return; 744 or return;
606 745
607 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"}
608 or (warn "no face data found for arch '$a->{_name}'"), return; 749 or (warn "no face data found for arch '$a->{_name}'"), return;
750 }
609 751
610 if ($face->{w} > 1 || $face->{h} > 1) { 752 if ($face->{w} > 1 || $face->{h} > 1) {
611 # bigface 753 # bigface
612 return (0, 0, $face->{w} - 1, $face->{h} - 1); 754 return (0, 0, $face->{w} - 1, $face->{h} - 1);
613 755
… …
646=cut 788=cut
647 789
648sub arch_attr($) { 790sub arch_attr($) {
649 my ($obj) = @_; 791 my ($obj) = @_;
650 792
651 require Crossfire::Data; 793 require Deliantra::Data;
652 794
653 my $root; 795 my $root;
654 my $attr = { }; 796 my $attr = { };
655 797
656 my $arch = $ARCH{ $obj->{_name} }; 798 my $arch = $ARCH{ $obj->{_name} };
657 my $type = $obj->{type} || $arch->{type}; 799 my $type = $obj->{type} || $arch->{type};
658 800
659 if ($type > 0) { 801 if ($type > 0) {
660 $root = $Crossfire::Data::ATTR{$type}; 802 $root = $Deliantra::Data::ATTR{$type};
661 } else { 803 } else {
662 my %a = (%$arch, %$obj); 804 my %a = (%$arch, %$obj);
663 805
664 if ($a{is_floor} && !$a{alive}) { 806 if ($a{is_floor} && !$a{alive}) {
665 $root = $Crossfire::Data::TYPE{Floor}; 807 $root = $Deliantra::Data::TYPE{Floor};
666 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 808 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
667 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 809 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
668 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 810 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
669 $root = $Crossfire::Data::TYPE{Wall}; 811 $root = $Deliantra::Data::TYPE{Wall};
670 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 812 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
671 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 813 $root = $Deliantra::Data::TYPE{"Weak Wall"};
672 } else { 814 } else {
673 $root = $Crossfire::Data::TYPE{Misc}; 815 $root = $Deliantra::Data::TYPE{Misc};
674 } 816 }
675 } 817 }
676 818
819 my (%ignore);
677 my @import = ($root); 820 my @import = ($root);
821
822 my @new_import;
823 while (my $type = shift @import) {
824 # first import everything we will need:
825 push @import,
826 grep $_,
827 map $Deliantra::Data::TYPE{$_},
828 @{$type->{import} || []};
829
830 # and compute the ignored attributes
831 for (@{$type->{ignore} || []}) {
832 $ignore{$_}++ for ref $_ ? @$_ : $_;
833 }
834
835 push @new_import, $type;
678 836 }
837 (@import) = @new_import;
838
839 # then add defaults to the back of the list, so they are added
840 # as last resort.
679 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 841 push @import, \%Deliantra::Data::DEFAULT_ATTR
680 unless $type == 116; 842 unless $type == 116;
681 843
682 my (%ignore);
683 my (@section_order, %section, @attr_order); 844 my (@section_order, %section, @attr_order);
684 845
846 # @import = root, imported, default
685 while (my $type = shift @import) { 847 while (my $type = pop @import) {
686 push @import, @{$type->{import} || []};
687
688 $attr->{$_} ||= $type->{$_} 848 $attr->{$_} ||= $type->{$_}
689 for qw(name desc use); 849 for qw(name desc use);
690
691 for (@{$type->{ignore} || []}) {
692 $ignore{$_}++ for ref $_ ? @$_ : $_;
693 }
694 850
695 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 851 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
696 my ($name, $attr) = @$_; 852 my ($name, $attr) = @$_;
697 push @section_order, $name; 853 push @section_order, $name;
698 for (@$attr) { 854 for (@$attr) {
699 my ($k, $v) = @$_; 855 my ($k, $v) = @$_;
700 push @attr_order, $k; 856 push @attr_order, $k;
701 $section{$name}{$k} ||= $v; 857 $section{$name}{$k} = $v; # overwrite, so that the root decides
702 }
703 } 858 }
859 }
860 }
861
862 # remove ignores for "root" type
863 for (
864 map @{$_->[1]}, # section attributes
865 [general => ($root->{attr} || [])],
866 @{$root->{section} || []}
867 ) {
868 my ($k, $v) = @$_;
869 # skip fixed attributes, if they are ignored thats fine
870 next if $v->{type} eq 'fixed';
871
872 delete $ignore{$k}; # if the attributes are defined explicitly they
873 # should NOT be ignored. ignore should mainly
874 # hit imported/inherited attributes.
704 } 875 }
705 876
706 $attr->{section} = [ 877 $attr->{section} = [
707 map !exists $section{$_} ? () : do { 878 map !exists $section{$_} ? () : do {
708 my $attr = delete $section{$_}; 879 my $attr = delete $section{$_};
… …
712 map exists $attr->{$_} && !$ignore{$_} 883 map exists $attr->{$_} && !$ignore{$_}
713 ? [$_ => delete $attr->{$_}] : (), 884 ? [$_ => delete $attr->{$_}] : (),
714 @attr_order 885 @attr_order
715 ] 886 ]
716 }, 887 },
717
718 exists $section{$_} ? [$_ => delete $section{$_}] : (), 888 exists $section{$_} ? [$_ => delete $section{$_}] : (),
719 @section_order 889 @section_order
720 ]; 890 ];
721 891
722 $attr 892 $attr
723}
724
725sub arch_edit_sections {
726# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
727# edit_type = 0;
728# else if (edit_type != 0) {
729# // all flags from 'check_type' must be unset in this arch because they get recalculated now
730# edit_type &= ~check_type;
731# }
732#
733# }
734# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
735# getAttributeValue("alive", defarch) == 1 &&
736# (getAttributeValue("monster", defarch) == 1 ||
737# getAttributeValue("generator", defarch) == 1)) {
738# // Monster: monsters/npcs/generators
739# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
740# }
741# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
742# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
743# // Walls
744# edit_type |= IGUIConstants.TILE_EDIT_WALL;
745# }
746# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
747# getAttributeValue("connected", defarch) != 0) {
748# // Connected Objects
749# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
750# }
751# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
752# arch_type == 66 || arch_type == 41 || arch_type == 95) {
753# // Exit: teleporter/exit/trapdoors
754# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
755# }
756# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
757# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
758# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
759# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
760# arch_type == 124 || arch_type == 130)) {
761# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
762# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
763# }
764# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
765# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
766# arch_type == 91 || arch_type == 21 || arch_type == 24) {
767# // Door: door/special door/gates + keys
768# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
769# }
770# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
771# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
772# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
773# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
774# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
775# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
776# arch_type == 122 || arch_type == 3)) {
777# // Equipment: weapons/armour/wands/rods
778# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
779# }
780#
781# return(edit_type);
782#
783#
784} 893}
785 894
786sub cache_file($$&&) { 895sub cache_file($$&&) {
787 my ($src, $cache, $load, $create) = @_; 896 my ($src, $cache, $load, $create) = @_;
788 897
… …
838 }, sub { 947 }, sub {
839 read_arch "$LIB/archetypes" 948 read_arch "$LIB/archetypes"
840 }; 949 };
841} 950}
842 951
952sub construct_tilecache_pb {
953 my ($idx, $cache) = @_;
954
955 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
956
957 while (my ($name, $tile) = each %$cache) {
958 my $tpb = delete $tile->{pb};
959 my $ofs = $tile->{idx};
960
961 for my $x (0 .. $tile->{w} - 1) {
962 for my $y (0 .. $tile->{h} - 1) {
963 my $idx = $ofs + $x + $y * $tile->{w};
964 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
965 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
966 }
967 }
968 }
969
970 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
971
972 $cache
973}
974
975sub use_tilecache {
976 my ($face) = @_;
977 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
978 or die "$VARDIR/tilecache.png: $!";
979 *FACE = $_[0];
980}
981
843=item load_tilecache 982=item load_tilecache
844 983
845(Re-)Load %TILE and %FACE. 984(Re-)Load %TILE and %FACE.
846 985
847=cut 986=cut
848 987
849sub load_tilecache() { 988sub load_tilecache() {
850 require Gtk2; 989 require Gtk2;
851 990
852 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 991 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
853 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
854 or die "$VARDIR/tilecache.png: $!";
855 *FACE = $_[0];
856 }, sub { 992 sub {
857 my $tile = read_pak "$LIB/crossfire.0";
858
859 my %cache; 993 my %cache;
994 my $facedata = Storable::retrieve "$LIB/facedata";
860 995
996 $facedata->{version} == 2
997 or die "$LIB/facedata: version mismatch, cannot proceed.";
998
999 my $faces = $facedata->{faceinfo};
861 my $idx = 0; 1000 my $idx = 0;
862 1001
863 for my $name (sort keys %$tile) { 1002 for (sort keys %$faces) {
1003 my ($face, $info) = ($_, $faces->{$_});
1004
864 my $pb = new Gtk2::Gdk::PixbufLoader; 1005 my $pb = new Gtk2::Gdk::PixbufLoader;
865 $pb->write ($tile->{$name}); 1006 $pb->write ($info->{data32});
866 $pb->close; 1007 $pb->close;
867 my $pb = $pb->get_pixbuf; 1008 my $pb = $pb->get_pixbuf;
868 1009
869 my $tile = $cache{$name} = { 1010 my $tile = $cache{$face} = {
870 pb => $pb, 1011 pb => $pb,
871 idx => $idx, 1012 idx => $idx,
872 w => int $pb->get_width / TILESIZE, 1013 w => int $pb->get_width / TILESIZE,
873 h => int $pb->get_height / TILESIZE, 1014 h => int $pb->get_height / TILESIZE,
874 }; 1015 };
875
876 1016
877 $idx += $tile->{w} * $tile->{h}; 1017 $idx += $tile->{w} * $tile->{h};
1018 }
1019
1020 construct_tilecache_pb $idx, \%cache;
1021
1022 \%cache
878 } 1023 };
879
880 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
881
882 while (my ($name, $tile) = each %cache) {
883 my $tpb = delete $tile->{pb};
884 my $ofs = $tile->{idx};
885
886 for my $x (0 .. $tile->{w} - 1) {
887 for my $y (0 .. $tile->{h} - 1) {
888 my $idx = $ofs + $x + $y * $tile->{w};
889 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
890 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
891 }
892 }
893 }
894
895 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
896
897 \%cache
898 };
899} 1024}
1025
1026=back
900 1027
901=head1 AUTHOR 1028=head1 AUTHOR
902 1029
903 Marc Lehmann <schmorp@schmorp.de> 1030 Marc Lehmann <schmorp@schmorp.de>
904 http://home.schmorp.de/ 1031 http://home.schmorp.de/
… …
907 http://www.ta-sa.org/ 1034 http://www.ta-sa.org/
908 1035
909=cut 1036=cut
910 1037
9111 10381
1039

Diff Legend

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