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.138 by elmex, Wed Dec 16 17:00:09 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
… …
193 305
194sub _add_resist($$$) { 306sub _add_resist($$$) {
195 my ($ob, $mask, $value) = @_; 307 my ($ob, $mask, $value) = @_;
196 308
197 while (my ($k, $v) = each %attack_mask) { 309 while (my ($k, $v) = each %attack_mask) {
198 $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}
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;
201 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"}) {
… …
289 name => delete $ob->{"event_${event}_options"}, 432 name => delete $ob->{"event_${event}_options"},
290 }; 433 };
291 } 434 }
292 } 435 }
293 436
437 # some archetypes had "+3" instead of the canonical "3", so fix
438 $ob->{dam} *= 1 if exists $ob->{dam};
439
294 $ob 440 $ob
295} 441}
296 442
297# arch as in "arch xxx", ie.. objects 443# arch as in "arch xxx", ie.. objects
298sub normalize_arch($) { 444sub normalize_arch($) {
299 my ($ob) = @_; 445 my ($ob) = @_;
300 446
301 normalize_object $ob; 447 normalize_object $ob;
448
449 return if $ob->{_atype} eq "object";
302 450
303 my $arch = $ARCH{$ob->{_name}} 451 my $arch = $ARCH{$ob->{_name}}
304 or (warn "$ob->{_name}: no such archetype", return $ob); 452 or (warn "$ob->{_name}: no such archetype", return $ob);
305 453
306 if ($arch->{type} == 22) { # map 454 if ($arch->{type} == 22) { # map
… …
342} 490}
343 491
344sub attr_thaw($) { 492sub attr_thaw($) {
345 my ($ob) = @_; 493 my ($ob) = @_;
346 494
347 $ob->{attach} = from_json $ob->{attach} 495 $ob->{attach} = decode_json $ob->{attach}
348 if exists $ob->{attach}; 496 if exists $ob->{attach};
349 497
350 $ob 498 $ob
351} 499}
352 500
353sub attr_freeze($) { 501sub attr_freeze($) {
354 my ($ob) = @_; 502 my ($ob) = @_;
355 503
356 $ob->{attach} = Crossfire::to_json $ob->{attach} 504 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
357 if exists $ob->{attach}; 505 if exists $ob->{attach};
358 506
359 $ob 507 $ob
360} 508}
361 509
… …
379sub read_arch($;$) { 527sub read_arch($;$) {
380 my ($path, $toplevel) = @_; 528 my ($path, $toplevel) = @_;
381 529
382 my %arc; 530 my %arc;
383 my ($more, $prev); 531 my ($more, $prev);
532 my $comment;
384 533
385 open my $fh, "<:raw:perlio:utf8", $path 534 open my $fh, "<:utf8", $path
386 or Carp::croak "$path: $!"; 535 or Carp::croak "$path: $!";
387 536
388# binmode $fh; 537# binmode $fh;
389 538
390 my $parse_block; $parse_block = sub { 539 my $parse_block; $parse_block = sub {
… …
392 541
393 while (<$fh>) { 542 while (<$fh>) {
394 s/\s+$//; 543 s/\s+$//;
395 if (/^end$/i) { 544 if (/^end$/i) {
396 last; 545 last;
546
397 } elsif (/^arch (\S+)$/i) { 547 } elsif (/^arch (\S+)$/i) {
398 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 548 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
549
399 } elsif (/^lore$/i) { 550 } elsif (/^lore$/i) {
400 while (<$fh>) { 551 while (<$fh>) {
401 last if /^endlore\s*$/i; 552 last if /^endlore\s*$/i;
402 $arc{lore} .= $_; 553 $arc{lore} .= $_;
403 } 554 }
… …
412 chomp; 563 chomp;
413 push @{ $arc{anim} }, $_; 564 push @{ $arc{anim} }, $_;
414 } 565 }
415 } elsif (/^(\S+)\s*(.*)$/) { 566 } elsif (/^(\S+)\s*(.*)$/) {
416 $arc{lc $1} = $2; 567 $arc{lc $1} = $2;
417 } elsif (/^\s*($|#)/) { 568 } elsif (/^\s*#/) {
569 $arc{_comment} .= "$_\n";
570
571 } elsif (/^\s*$/) {
418 # 572 #
419 } else { 573 } else {
420 warn "$path: unparsable line '$_' in arch $arc{_name}"; 574 warn "$path: unparsable line '$_' in arch $arc{_name}";
421 } 575 }
422 } 576 }
… …
428 s/\s+$//; 582 s/\s+$//;
429 if (/^more$/i) { 583 if (/^more$/i) {
430 $more = $prev; 584 $more = $prev;
431 } elsif (/^object (\S+)$/i) { 585 } elsif (/^object (\S+)$/i) {
432 my $name = $1; 586 my $name = $1;
433 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};
434 $arc->{_atype} = 'object'; 590 $arc->{_atype} = 'object';
435 591
436 if ($more) { 592 if ($more) {
437 $more->{more} = $arc; 593 $more->{more} = $arc;
438 } else { 594 } else {
… …
440 } 596 }
441 $prev = $arc; 597 $prev = $arc;
442 $more = undef; 598 $more = undef;
443 } elsif (/^arch (\S+)$/i) { 599 } elsif (/^arch (\S+)$/i) {
444 my $name = $1; 600 my $name = $1;
445 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};
446 $arc->{_atype} = 'arch'; 604 $arc->{_atype} = 'arch';
447 605
448 if ($more) { 606 if ($more) {
449 $more->{more} = $arc; 607 $more->{more} = $arc;
450 } else { 608 } else {
… …
459 push @{$toplevel->{lev_array}}, $_+0; 617 push @{$toplevel->{lev_array}}, $_+0;
460 } 618 }
461 } else { 619 } else {
462 $toplevel->{$1} = $2; 620 $toplevel->{$1} = $2;
463 } 621 }
622 } elsif (/^\s*#/) {
623 $comment .= "$_\n";
464 } elsif (/^\s*($|#)/) { 624 } elsif (/^\s*($|#)/) {
465 # 625 #
466 } else { 626 } else {
467 die "$path: unparseable top-level line '$_'"; 627 die "$path: unparseable top-level line '$_'";
468 } 628 }
… …
479 my $str; 639 my $str;
480 640
481 my $append; $append = sub { 641 my $append; $append = sub {
482 my %a = %{$_[0]}; 642 my %a = %{$_[0]};
483 643
484 Crossfire::attr_freeze \%a; 644 Deliantra::attr_freeze \%a;
485 Crossfire::normalize_arch \%a; 645 Deliantra::normalize_arch \%a;
486 646
487 # undo the bit-split we did before 647 # undo the bit-split we did before
488 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}) {
489 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 649 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
490 | (delete $a{attack_movement_bits_4_7}); 650 | (delete $a{attack_movement_bits_4_7});
491 } 651 }
492 652
653 if (my $comment = delete $a{_comment}) {
654 if ($comment =~ /[^\n\s#]/) {
655 $str .= $comment;
656 }
657 }
658
493 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 659 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
494 660
495 my $inv = delete $a{inventory}; 661 my $inv = delete $a{inventory};
496 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
497 my $anim = delete $a{anim}; 663 my $anim = delete $a{anim};
498 664
665 if ($a{_atype} eq 'object') {
666 $str .= join "\n", "anim", @$anim, "mina\n"
667 if $anim;
668 }
669
499 my @kv; 670 my @kv;
500 671
501 for ($a{_name} eq "map" 672 for ($a{_name} eq "map"
502 ? @Crossfire::FIELD_ORDER_MAP 673 ? @Deliantra::FIELD_ORDER_MAP
503 : @Crossfire::FIELD_ORDER) { 674 : @Deliantra::FIELD_ORDER) {
504 push @kv, [$_, delete $a{$_}] 675 push @kv, [$_, delete $a{$_}]
505 if exists $a{$_}; 676 if exists $a{$_};
506 } 677 }
507 678
508 for (sort keys %a) { 679 for (sort keys %a) {
… …
511 } 682 }
512 683
513 for (@kv) { 684 for (@kv) {
514 my ($k, $v) = @$_; 685 my ($k, $v) = @$_;
515 686
516 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 687 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
517 $v =~ s/\n$//; 688 $v =~ s/\n$//;
518 $str .= "$k\n$v\n$end\n"; 689 $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 { 690 } else {
546 $str .= "$k $v\n"; 691 $str .= "$k $v\n";
547 } 692 }
548 } 693 }
549 694
550 if ($inv) { 695 if ($inv) {
551 $append->($_) for @$inv; 696 $append->($_) for @$inv;
552 } 697 }
553 698
699 $str .= "end\n";
700
554 if ($a{_atype} eq 'object') { 701 if ($a{_atype} eq 'object') {
555 $str .= join "\n", "anim", @$anim, "mina\n" 702 if ($more) {
556 if $anim;
557 }
558
559 $str .= "end\n";
560
561 if (($a{_atype} eq 'object') && $more) {
562 $str .= "\nmore\n"; 703 $str .= "more\n";
563 $append->($more) if $more; 704 $append->($more) if $more;
705 } else {
706 $str .= "\n";
707 }
564 } 708 }
565 }; 709 };
566 710
567 for (@$arch) { 711 for (@$arch) {
568 $append->($_); 712 $append->($_);
… …
597 my ($a) = @_; 741 my ($a) = @_;
598 742
599 my $o = $ARCH{$a->{_name}} 743 my $o = $ARCH{$a->{_name}}
600 or return; 744 or return;
601 745
602 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"}
603 or (warn "no face data found for arch '$a->{_name}'"), return; 749 or (warn "no face data found for arch '$a->{_name}'"), return;
750 }
604 751
605 if ($face->{w} > 1 || $face->{h} > 1) { 752 if ($face->{w} > 1 || $face->{h} > 1) {
606 # bigface 753 # bigface
607 return (0, 0, $face->{w} - 1, $face->{h} - 1); 754 return (0, 0, $face->{w} - 1, $face->{h} - 1);
608 755
… …
641=cut 788=cut
642 789
643sub arch_attr($) { 790sub arch_attr($) {
644 my ($obj) = @_; 791 my ($obj) = @_;
645 792
646 require Crossfire::Data; 793 require Deliantra::Data;
647 794
648 my $root; 795 my $root;
649 my $attr = { }; 796 my $attr = { };
650 797
651 my $arch = $ARCH{ $obj->{_name} }; 798 my $arch = $ARCH{ $obj->{_name} };
652 my $type = $obj->{type} || $arch->{type}; 799 my $type = $obj->{type} || $arch->{type};
653 800
654 if ($type > 0) { 801 if ($type > 0) {
655 $root = $Crossfire::Data::ATTR{$type}; 802 $root = $Deliantra::Data::ATTR{$type};
656 } else { 803 } else {
657 my %a = (%$arch, %$obj); 804 my %a = (%$arch, %$obj);
658 805
659 if ($a{is_floor} && !$a{alive}) { 806 if ($a{is_floor} && !$a{alive}) {
660 $root = $Crossfire::Data::TYPE{Floor}; 807 $root = $Deliantra::Data::TYPE{Floor};
661 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 808 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
662 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 809 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
663 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 810 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
664 $root = $Crossfire::Data::TYPE{Wall}; 811 $root = $Deliantra::Data::TYPE{Wall};
665 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 812 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
666 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 813 $root = $Deliantra::Data::TYPE{"Weak Wall"};
667 } else { 814 } else {
668 $root = $Crossfire::Data::TYPE{Misc}; 815 $root = $Deliantra::Data::TYPE{Misc};
669 } 816 }
670 } 817 }
671 818
672 my @import = ($root); 819 my @import = ($root);
673 820
674 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 821 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
675 unless $type == 116; 822 unless $type == 116;
676 823
677 my (%ignore); 824 my (%ignore);
678 my (@section_order, %section, @attr_order); 825 my (@section_order, %section, @attr_order);
679 826
680 while (my $type = shift @import) { 827 while (my $type = shift @import) {
828 push @import,
829 grep $_,
830 map $Deliantra::Data::TYPE{$_},
681 push @import, @{$type->{import} || []}; 831 @{$type->{import} || []};
682 832
683 $attr->{$_} ||= $type->{$_} 833 $attr->{$_} ||= $type->{$_}
684 for qw(name desc use); 834 for qw(name desc use);
685 835
686 for (@{$type->{ignore} || []}) { 836 for (@{$type->{ignore} || []}) {
… …
696 $section{$name}{$k} ||= $v; 846 $section{$name}{$k} ||= $v;
697 } 847 }
698 } 848 }
699 } 849 }
700 850
851 # remove ignores for "root" type
852 for (map @{$_->[1]}, # section attributes
853 [general => ($root->{attr} || [])],
854 @{$root->{section} || []})
855 {
856 my ($k, $v) = @$_;
857 # skip fixed attributes, if they are ignored thats fine
858 next if $v->{type} eq 'fixed';
859
860 delete $ignore{$k}; # if the attributes are defined explicitly they
861 # should NOT be ignored. ignore should mainly
862 # hit imported/inherited attributes.
863 }
864
701 $attr->{section} = [ 865 $attr->{section} = [
702 map !exists $section{$_} ? () : do { 866 map !exists $section{$_} ? () : do {
703 my $attr = delete $section{$_}; 867 my $attr = delete $section{$_};
704 868
705 [ 869 [
… …
707 map exists $attr->{$_} && !$ignore{$_} 871 map exists $attr->{$_} && !$ignore{$_}
708 ? [$_ => delete $attr->{$_}] : (), 872 ? [$_ => delete $attr->{$_}] : (),
709 @attr_order 873 @attr_order
710 ] 874 ]
711 }, 875 },
712
713 exists $section{$_} ? [$_ => delete $section{$_}] : (), 876 exists $section{$_} ? [$_ => delete $section{$_}] : (),
714 @section_order 877 @section_order
715 ]; 878 ];
716 879
717 $attr 880 $attr
718}
719
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} 881}
780 882
781sub cache_file($$&&) { 883sub cache_file($$&&) {
782 my ($src, $cache, $load, $create) = @_; 884 my ($src, $cache, $load, $create) = @_;
783 885
… …
833 }, sub { 935 }, sub {
834 read_arch "$LIB/archetypes" 936 read_arch "$LIB/archetypes"
835 }; 937 };
836} 938}
837 939
940sub construct_tilecache_pb {
941 my ($idx, $cache) = @_;
942
943 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
944
945 while (my ($name, $tile) = each %$cache) {
946 my $tpb = delete $tile->{pb};
947 my $ofs = $tile->{idx};
948
949 for my $x (0 .. $tile->{w} - 1) {
950 for my $y (0 .. $tile->{h} - 1) {
951 my $idx = $ofs + $x + $y * $tile->{w};
952 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
953 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
954 }
955 }
956 }
957
958 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
959
960 $cache
961}
962
963sub use_tilecache {
964 my ($face) = @_;
965 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
966 or die "$VARDIR/tilecache.png: $!";
967 *FACE = $_[0];
968}
969
838=item load_tilecache 970=item load_tilecache
839 971
840(Re-)Load %TILE and %FACE. 972(Re-)Load %TILE and %FACE.
841 973
842=cut 974=cut
843 975
844sub load_tilecache() { 976sub load_tilecache() {
845 require Gtk2; 977 require Gtk2;
846 978
847 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 979 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 { 980 sub {
852 my $tile = read_pak "$LIB/crossfire.0";
853
854 my %cache; 981 my %cache;
982 my $facedata = Storable::retrieve "$LIB/facedata";
855 983
984 $facedata->{version} == 2
985 or die "$LIB/facedata: version mismatch, cannot proceed.";
986
987 my $faces = $facedata->{faceinfo};
856 my $idx = 0; 988 my $idx = 0;
857 989
858 for my $name (sort keys %$tile) { 990 for (sort keys %$faces) {
991 my ($face, $info) = ($_, $faces->{$_});
992
859 my $pb = new Gtk2::Gdk::PixbufLoader; 993 my $pb = new Gtk2::Gdk::PixbufLoader;
860 $pb->write ($tile->{$name}); 994 $pb->write ($info->{data32});
861 $pb->close; 995 $pb->close;
862 my $pb = $pb->get_pixbuf; 996 my $pb = $pb->get_pixbuf;
863 997
864 my $tile = $cache{$name} = { 998 my $tile = $cache{$face} = {
865 pb => $pb, 999 pb => $pb,
866 idx => $idx, 1000 idx => $idx,
867 w => int $pb->get_width / TILESIZE, 1001 w => int $pb->get_width / TILESIZE,
868 h => int $pb->get_height / TILESIZE, 1002 h => int $pb->get_height / TILESIZE,
869 }; 1003 };
870
871 1004
872 $idx += $tile->{w} * $tile->{h}; 1005 $idx += $tile->{w} * $tile->{h};
1006 }
1007
1008 construct_tilecache_pb $idx, \%cache;
1009
1010 \%cache
873 } 1011 };
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} 1012}
1013
1014=back
895 1015
896=head1 AUTHOR 1016=head1 AUTHOR
897 1017
898 Marc Lehmann <schmorp@schmorp.de> 1018 Marc Lehmann <schmorp@schmorp.de>
899 http://home.schmorp.de/ 1019 http://home.schmorp.de/
… …
902 http://www.ta-sa.org/ 1022 http://www.ta-sa.org/
903 1023
904=cut 1024=cut
905 1025
9061 10261
1027

Diff Legend

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