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.143 by root, Wed Oct 6 01:53:51 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.9'; 11our $VERSION = '1.30';
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
62 region music
62 shopitems shopgreed shopmin shopmax shoprace 63 shopitems shopgreed shopmin shopmax shoprace
63 darkness width height enter_x enter_y msg maplore 64 darkness width height enter_x enter_y msg maplore
64 unique template 65 unique template
65 outdoor temp pressure humid windspeed winddir sky nosmooth 66 outdoor temp pressure humid windspeed winddir sky nosmooth
66 tile_path_1 tile_path_2 tile_path_3 tile_path_4 67 tile_path_1 tile_path_2 tile_path_3 tile_path_4
67)); 68));
68 69
69our @FIELD_ORDER = (qw( 70our @FIELD_ORDER = (qw(
71 inherit
72
70 elevation 73 elevation
71 74
72 name name_pl custom_name attach title race 75 name name_pl custom_name attach title race
73 slaying skill msg lore other_arch face 76 slaying skill msg lore other_arch
74 #todo-events 77 sound sound_destroy face animation is_animated
75 animation is_animated 78 magicmap glyph smoothlevel smoothface
76 str dex con wis pow cha int 79 str dex con wis pow cha int
77 hp maxhp sp maxsp grace maxgrace 80 hp maxhp sp maxsp grace maxgrace
78 exp perm_exp expmul 81 exp perm_exp expmul
79 food dam luck wc ac x y speed speed_left move_state attack_movement 82 food dam luck wc ac x y speed speed_left move_state attack_movement
80 nrof level direction type subtype attacktype 83 nrof level direction type subtype attacktype
… …
88 resist_life_stealing resist_disease 91 resist_life_stealing resist_disease
89 92
90 path_attuned path_repelled path_denied material materialname 93 path_attuned path_repelled path_denied material materialname
91 value carrying weight invisible state magic 94 value carrying weight invisible state magic
92 last_heal last_sp last_grace last_eat 95 last_heal last_sp last_grace last_eat
93 connected glow_radius randomitems npx_status npc_program 96 connected glow_radius randomitems tresure_env npx_status npc_program
94 run_away pick_up container will_apply smoothlevel 97 run_away pick_up container will_apply smoothlevel
95 current_weapon_script weapontype tooltype elevation client_type 98 current_weapon_script weapontype tooltype elevation client_type
96 item_power duration range 99 item_power duration range
97 range_modifier duration_modifier dam_modifier gen_sp_armour 100 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 101 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 112 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 113 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 114 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 115 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 116 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
117 precious
114 118
115 body_range body_arm body_torso body_head body_neck body_skill 119 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 120 body_finger body_shoulder body_foot body_hand body_wrist body_waist
117)); 121));
118 122
… …
129 trigger => 10, 133 trigger => 10,
130 close => 11, 134 close => 11,
131 timer => 12, 135 timer => 12,
132); 136);
133 137
138# 1 up 2 right 4 down 8 left
139our %WALLDIR = (
140 0 => 0,
141 1_2 => 1,
142 1_4 => 2,
143 2_2_1 => 3,
144 1_1 => 4,
145 2_1_1 => 5,
146 2_2_2 => 6,
147 3_2 => 7,
148 1_3 => 8,
149 2_2_4 => 9,
150 2_1_2 => 10,
151 3_1 => 11,
152 2_2_3 => 12,
153 3_4 => 13,
154 3_3 => 14,
155 4 => 15,
156);
157
134sub MOVE_WALK (){ 0x01 } 158sub MOVE_WALK (){ 0x01 }
135sub MOVE_FLY_LOW (){ 0x02 } 159sub MOVE_FLY_LOW (){ 0x02 }
136sub MOVE_FLY_HIGH (){ 0x04 } 160sub MOVE_FLY_HIGH (){ 0x04 }
137sub MOVE_FLYING (){ 0x06 } 161sub MOVE_FLYING (){ 0x06 }
138sub MOVE_SWIM (){ 0x08 } 162sub MOVE_SWIM (){ 0x08 }
139sub MOVE_BOAT (){ 0x10 } 163sub MOVE_BOAT (){ 0x10 }
164sub MOVE_SHIP (){ 0x20 }
140sub MOVE_KNOWN (){ 0x1f } # all of above 165sub MOVE_KNOWN (){ 0x3f } # all of above
141sub MOVE_ALLBIT (){ 0x10000 }
142sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 166sub MOVE_ALL (){ 0x10000 } # very special value
167
168our %MOVE_TYPE = (
169 walk => MOVE_WALK,
170 fly_low => MOVE_FLY_LOW,
171 fly_high => MOVE_FLY_HIGH,
172 flying => MOVE_FLYING,
173 swim => MOVE_SWIM,
174 boat => MOVE_BOAT,
175 ship => MOVE_SHIP,
176 all => MOVE_ALL,
177);
178
179our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
180
181{
182 package Deliantra::MoveType;
183
184 use overload
185 '=' => sub { bless [@{$_[0]}], ref $_[0] },
186 '""' => \&as_string,
187 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
188 '<=' => sub {
189 ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
190 ? $_[0][1] & $MOVE_TYPE{$_[1]}
191 : undef
192 },
193 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
194 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
195 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
196 'x=' => sub { # toggle between off, + and -
197 my $cur = $_[0] >= $_[1];
198 if (!defined $cur) {
199 if ($_[0] >= "all") {
200 $_[0] -= $_[1];
201 } else {
202 $_[0] += $_[1];
203 }
204 } elsif ($cur) {
205 $_[0] -= $_[1];
206 } else {
207 $_[0] /= $_[1];
208 }
209
210 $_[0]
211 },
212 'eq' => sub { "$_[0]" eq "$_[1]" },
213 'ne' => sub { "$_[0]" ne "$_[1]" },
214 ;
215
216 sub TO_JSON {
217 $_[0][0]
218 }
219}
220
221sub Deliantra::MoveType::new {
222 my ($class, $string) = @_;
223
224 my $mask;
225 my $value;
226
227 if ($string =~ /^\s*\d+\s*$/) {
228 $mask = MOVE_ALL;
229 $value = $string+0;
230 } else {
231 for (split /\s+/, lc $string) {
232 if (s/^-//) {
233 $mask |= $MOVE_TYPE{$_};
234 $value &= ~$MOVE_TYPE{$_};
235 } else {
236 $mask |= $MOVE_TYPE{$_};
237 $value |= $MOVE_TYPE{$_};
238 }
239 }
240 }
241
242 (bless [$mask, $value], $class)->normalise
243}
244
245sub Deliantra::MoveType::normalise {
246 my ($self) = @_;
247
248 if ($self->[0] & MOVE_ALL) {
249 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
250 $self->[0] &= $mask;
251 $self->[1] &= $mask;
252 }
253
254 $self->[1] &= $self->[0];
255
256 $self
257}
258
259sub Deliantra::MoveType::as_string {
260 my ($self) = @_;
261
262 my @res;
263
264 my ($mask, $value) = @$self;
265
266 for (@Deliantra::MOVE_TYPE) {
267 my $bit = $Deliantra::MOVE_TYPE{$_};
268 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
269 $mask &= ~$bit;
270 push @res, $value & $bit ? $_ : "-$_";
271 }
272 }
273
274 join " ", @res
275}
143 276
144sub load_ref($) { 277sub load_ref($) {
145 my ($path) = @_; 278 my ($path) = @_;
146 279
147 open my $fh, "<:raw:perlio", $path 280 open my $fh, "<:raw:perlio", $path
… …
193 326
194sub _add_resist($$$) { 327sub _add_resist($$$) {
195 my ($ob, $mask, $value) = @_; 328 my ($ob, $mask, $value) = @_;
196 329
197 while (my ($k, $v) = each %attack_mask) { 330 while (my ($k, $v) = each %attack_mask) {
198 $ob->{"resist_$k"} += $value if $mask & $v; 331 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
199 } 332 }
200} 333}
334
335my %MATERIAL = reverse
336 paper => 1,
337 iron => 2,
338 glass => 4,
339 leather => 8,
340 wood => 16,
341 organic => 32,
342 stone => 64,
343 cloth => 128,
344 adamant => 256,
345 liquid => 512,
346 tin => 1024,
347 bone => 2048,
348 ice => 4096,
349
350 # guesses
351 runestone => 12,
352 bronze => 18,
353 "ancient wood" => 20,
354 glass => 36,
355 marble => 66,
356 ice => 68,
357 stone => 70,
358 stone => 80,
359 cloth => 136,
360 ironwood => 144,
361 adamantium => 258,
362 glacium => 260,
363 blood => 544,
364;
201 365
202# object as in "Object xxx", i.e. archetypes 366# object as in "Object xxx", i.e. archetypes
203sub normalize_object($) { 367sub normalize_object($) {
204 my ($ob) = @_; 368 my ($ob) = @_;
205 369
370 delete $ob->{editable}; # deprecated
371
372 # convert material bitset to materialname, if possible
373 if (exists $ob->{material}) {
374 if (!$ob->{material}) {
375 delete $ob->{material};
376 } elsif (exists $ob->{materialname}) {
377 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
378 delete $ob->{material};
379 } else {
380 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
381 delete $ob->{material}; # assume materilname is more specific and nuke material
382 }
383 } elsif (my $name = $MATERIAL{$ob->{material}}) {
384 delete $ob->{material};
385 $ob->{materialname} = $name;
386 } else {
387 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
388 }
389 }
390
391 # check whether attachment is the same as in the archetype
392 if (exists $ob->{attach}) {
393 my $arch = $ARCH{$ob->{_name}};
394 my $js = JSON::XS->new->utf8->canonical (1);
395
396 if (defined $arch->{attach}
397 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
398 delete $ob->{attach}
399 }
400 }
401
402 # color_fg is used as default for magicmap if magicmap does not exist
403 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
404
206 # nuke outdated or never supported fields 405 # nuke outdated or never supported fields
207 delete @$ob{qw( 406 delete @$ob{qw(
208 can_knockback can_parry can_impale can_cut can_dam_armour 407 can_knockback can_parry can_impale can_cut can_dam_armour
209 can_apply pass_thru can_pass_thru 408 can_apply pass_thru can_pass_thru color_bg color_fg
210 )}; 409 )};
211 410
212 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 411 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
213 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 412 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
214 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 413 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
215 414
216 # convert movement strings to bitsets 415 # convert movement strings to bitsets
217 for my $attr (keys %FIELD_MOVEMENT) { 416 for my $attr (keys %FIELD_MOVEMENT) {
218 next unless exists $ob->{$attr}; 417 next unless exists $ob->{$attr};
219 418
220 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 419 $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 } 420 }
247 421
248 # convert outdated movement flags to new movement sets 422 # convert outdated movement flags to new movement sets
249 if (defined (my $v = delete $ob->{no_pass})) { 423 if (defined (my $v = delete $ob->{no_pass})) {
250 $ob->{move_block} = $v ? MOVE_ALL : 0; 424 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
251 } 425 }
252 if (defined (my $v = delete $ob->{slow_move})) { 426 if (defined (my $v = delete $ob->{slow_move})) {
253 $ob->{move_slow} |= MOVE_WALK; 427 $ob->{move_slow} += "walk";
254 $ob->{move_slow_penalty} = $v; 428 $ob->{move_slow_penalty} = $v;
255 } 429 }
256 if (defined (my $v = delete $ob->{walk_on})) { 430 if (defined (my $v = delete $ob->{walk_on})) {
257 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 431 $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 } 432 }
261 if (defined (my $v = delete $ob->{walk_off})) { 433 if (defined (my $v = delete $ob->{walk_off})) {
262 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 434 $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 } 435 }
266 if (defined (my $v = delete $ob->{fly_on})) { 436 if (defined (my $v = delete $ob->{fly_on})) {
267 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 437 $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 } 438 }
271 if (defined (my $v = delete $ob->{fly_off})) { 439 if (defined (my $v = delete $ob->{fly_off})) {
272 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 440 $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 } 441 }
276 if (defined (my $v = delete $ob->{flying})) { 442 if (defined (my $v = delete $ob->{flying})) {
277 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 443 $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 } 444 }
281 445
282 # convert idiotic event_xxx things into objects 446 # convert idiotic event_xxx things into objects
283 while (my ($event, $subtype) = each %EVENT_TYPE) { 447 while (my ($event, $subtype) = each %EVENT_TYPE) {
284 if (exists $ob->{"event_${event}_plugin"}) { 448 if (exists $ob->{"event_${event}_plugin"}) {
… …
289 name => delete $ob->{"event_${event}_options"}, 453 name => delete $ob->{"event_${event}_options"},
290 }; 454 };
291 } 455 }
292 } 456 }
293 457
458 # some archetypes had "+3" instead of the canonical "3", so fix
459 $ob->{dam} *= 1 if exists $ob->{dam};
460
294 $ob 461 $ob
295} 462}
296 463
297# arch as in "arch xxx", ie.. objects 464# arch as in "arch xxx", ie.. objects
298sub normalize_arch($) { 465sub normalize_arch($) {
299 my ($ob) = @_; 466 my ($ob) = @_;
300 467
301 normalize_object $ob; 468 normalize_object $ob;
469
470 return if $ob->{_atype} eq "object";
302 471
303 my $arch = $ARCH{$ob->{_name}} 472 my $arch = $ARCH{$ob->{_name}}
304 or (warn "$ob->{_name}: no such archetype", return $ob); 473 or (warn "$ob->{_name}: no such archetype", return $ob);
305 474
306 if ($arch->{type} == 22) { # map 475 if ($arch->{type} == 22) { # map
… …
342} 511}
343 512
344sub attr_thaw($) { 513sub attr_thaw($) {
345 my ($ob) = @_; 514 my ($ob) = @_;
346 515
347 $ob->{attach} = from_json $ob->{attach} 516 $ob->{attach} = decode_json $ob->{attach}
348 if exists $ob->{attach}; 517 if exists $ob->{attach};
349 518
350 $ob 519 $ob
351} 520}
352 521
353sub attr_freeze($) { 522sub attr_freeze($) {
354 my ($ob) = @_; 523 my ($ob) = @_;
355 524
356 $ob->{attach} = Crossfire::to_json $ob->{attach} 525 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
357 if exists $ob->{attach}; 526 if exists $ob->{attach};
358 527
359 $ob 528 $ob
360} 529}
361 530
… …
379sub read_arch($;$) { 548sub read_arch($;$) {
380 my ($path, $toplevel) = @_; 549 my ($path, $toplevel) = @_;
381 550
382 my %arc; 551 my %arc;
383 my ($more, $prev); 552 my ($more, $prev);
553 my $comment;
384 554
385 open my $fh, "<:raw:perlio:utf8", $path 555 open my $fh, "<:utf8", $path
386 or Carp::croak "$path: $!"; 556 or Carp::croak "$path: $!";
387 557
388# binmode $fh; 558# binmode $fh;
389 559
390 my $parse_block; $parse_block = sub { 560 my $parse_block; $parse_block = sub {
… …
392 562
393 while (<$fh>) { 563 while (<$fh>) {
394 s/\s+$//; 564 s/\s+$//;
395 if (/^end$/i) { 565 if (/^end$/i) {
396 last; 566 last;
567
397 } elsif (/^arch (\S+)$/i) { 568 } elsif (/^arch (\S+)$/i) {
398 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 569 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
570
399 } elsif (/^lore$/i) { 571 } elsif (/^lore$/i) {
400 while (<$fh>) { 572 while (<$fh>) {
401 last if /^endlore\s*$/i; 573 last if /^endlore\s*$/i;
402 $arc{lore} .= $_; 574 $arc{lore} .= $_;
403 } 575 }
… …
412 chomp; 584 chomp;
413 push @{ $arc{anim} }, $_; 585 push @{ $arc{anim} }, $_;
414 } 586 }
415 } elsif (/^(\S+)\s*(.*)$/) { 587 } elsif (/^(\S+)\s*(.*)$/) {
416 $arc{lc $1} = $2; 588 $arc{lc $1} = $2;
417 } elsif (/^\s*($|#)/) { 589 } elsif (/^\s*#/) {
590 $arc{_comment} .= "$_\n";
591
592 } elsif (/^\s*$/) {
418 # 593 #
419 } else { 594 } else {
420 warn "$path: unparsable line '$_' in arch $arc{_name}"; 595 warn "$path: unparsable line '$_' in arch $arc{_name}";
421 } 596 }
422 } 597 }
… …
428 s/\s+$//; 603 s/\s+$//;
429 if (/^more$/i) { 604 if (/^more$/i) {
430 $more = $prev; 605 $more = $prev;
431 } elsif (/^object (\S+)$/i) { 606 } elsif (/^object (\S+)$/i) {
432 my $name = $1; 607 my $name = $1;
433 my $arc = attr_thaw normalize_object $parse_block->(_name => $name); 608 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
609 undef $comment;
610 delete $arc{_comment} unless length $arc{_comment};
434 $arc->{_atype} = 'object'; 611 $arc->{_atype} = 'object';
435 612
436 if ($more) { 613 if ($more) {
437 $more->{more} = $arc; 614 $more->{more} = $arc;
438 } else { 615 } else {
… …
440 } 617 }
441 $prev = $arc; 618 $prev = $arc;
442 $more = undef; 619 $more = undef;
443 } elsif (/^arch (\S+)$/i) { 620 } elsif (/^arch (\S+)$/i) {
444 my $name = $1; 621 my $name = $1;
445 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 622 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
623 undef $comment;
624 delete $arc{_comment} unless length $arc{_comment};
446 $arc->{_atype} = 'arch'; 625 $arc->{_atype} = 'arch';
447 626
448 if ($more) { 627 if ($more) {
449 $more->{more} = $arc; 628 $more->{more} = $arc;
450 } else { 629 } else {
… …
459 push @{$toplevel->{lev_array}}, $_+0; 638 push @{$toplevel->{lev_array}}, $_+0;
460 } 639 }
461 } else { 640 } else {
462 $toplevel->{$1} = $2; 641 $toplevel->{$1} = $2;
463 } 642 }
643 } elsif (/^\s*#/) {
644 $comment .= "$_\n";
464 } elsif (/^\s*($|#)/) { 645 } elsif (/^\s*($|#)/) {
465 # 646 #
466 } else { 647 } else {
467 die "$path: unparseable top-level line '$_'"; 648 die "$path: unparseable top-level line '$_'";
468 } 649 }
… …
479 my $str; 660 my $str;
480 661
481 my $append; $append = sub { 662 my $append; $append = sub {
482 my %a = %{$_[0]}; 663 my %a = %{$_[0]};
483 664
484 Crossfire::attr_freeze \%a; 665 Deliantra::attr_freeze \%a;
485 Crossfire::normalize_arch \%a; 666 Deliantra::normalize_arch \%a;
486 667
487 # undo the bit-split we did before 668 # undo the bit-split we did before
488 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 669 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}) 670 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
490 | (delete $a{attack_movement_bits_4_7}); 671 | (delete $a{attack_movement_bits_4_7});
491 } 672 }
492 673
674 if (my $comment = delete $a{_comment}) {
675 if ($comment =~ /[^\n\s#]/) {
676 $str .= $comment;
677 }
678 }
679
493 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 680 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
494 681
495 my $inv = delete $a{inventory}; 682 my $inv = delete $a{inventory};
496 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 683 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
497 my $anim = delete $a{anim}; 684 my $anim = delete $a{anim};
498 685
686 if ($a{_atype} eq 'object') {
687 $str .= join "\n", "anim", @$anim, "mina\n"
688 if $anim;
689 }
690
499 my @kv; 691 my @kv;
500 692
501 for ($a{_name} eq "map" 693 for ($a{_name} eq "map"
502 ? @Crossfire::FIELD_ORDER_MAP 694 ? @Deliantra::FIELD_ORDER_MAP
503 : @Crossfire::FIELD_ORDER) { 695 : @Deliantra::FIELD_ORDER) {
504 push @kv, [$_, delete $a{$_}] 696 push @kv, [$_, delete $a{$_}]
505 if exists $a{$_}; 697 if exists $a{$_};
506 } 698 }
507 699
508 for (sort keys %a) { 700 for (sort keys %a) {
… …
511 } 703 }
512 704
513 for (@kv) { 705 for (@kv) {
514 my ($k, $v) = @$_; 706 my ($k, $v) = @$_;
515 707
516 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 708 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
517 $v =~ s/\n$//; 709 $v =~ s/\n$//;
518 $str .= "$k\n$v\n$end\n"; 710 $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 { 711 } else {
546 $str .= "$k $v\n"; 712 $str .= "$k $v\n";
547 } 713 }
548 } 714 }
549 715
550 if ($inv) { 716 if ($inv) {
551 $append->($_) for @$inv; 717 $append->($_) for @$inv;
552 } 718 }
553 719
720 $str .= "end\n";
721
554 if ($a{_atype} eq 'object') { 722 if ($a{_atype} eq 'object') {
555 $str .= join "\n", "anim", @$anim, "mina\n" 723 if ($more) {
556 if $anim;
557 }
558
559 $str .= "end\n";
560
561 if (($a{_atype} eq 'object') && $more) {
562 $str .= "\nmore\n"; 724 $str .= "more\n";
563 $append->($more) if $more; 725 $append->($more) if $more;
726 } else {
727 $str .= "\n";
728 }
564 } 729 }
565 }; 730 };
566 731
567 for (@$arch) { 732 for (@$arch) {
568 $append->($_); 733 $append->($_);
… …
597 my ($a) = @_; 762 my ($a) = @_;
598 763
599 my $o = $ARCH{$a->{_name}} 764 my $o = $ARCH{$a->{_name}}
600 or return; 765 or return;
601 766
602 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 767 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
768 unless ($face) {
769 $face = $FACE{"blank.x11"}
603 or (warn "no face data found for arch '$a->{_name}'"), return; 770 or (warn "no face data found for arch '$a->{_name}'"), return;
771 }
604 772
605 if ($face->{w} > 1 || $face->{h} > 1) { 773 if ($face->{w} > 1 || $face->{h} > 1) {
606 # bigface 774 # bigface
607 return (0, 0, $face->{w} - 1, $face->{h} - 1); 775 return (0, 0, $face->{w} - 1, $face->{h} - 1);
608 776
… …
641=cut 809=cut
642 810
643sub arch_attr($) { 811sub arch_attr($) {
644 my ($obj) = @_; 812 my ($obj) = @_;
645 813
646 require Crossfire::Data; 814 require Deliantra::Data;
647 815
648 my $root; 816 my $root;
649 my $attr = { }; 817 my $attr = { };
650 818
651 my $arch = $ARCH{ $obj->{_name} }; 819 my $arch = $ARCH{ $obj->{_name} };
652 my $type = $obj->{type} || $arch->{type}; 820 my $type = $obj->{type} || $arch->{type};
653 821
654 if ($type > 0) { 822 if ($type > 0) {
655 $root = $Crossfire::Data::ATTR{$type}; 823 $root = $Deliantra::Data::ATTR{$type};
656 } else { 824 } else {
657 my %a = (%$arch, %$obj); 825 my %a = (%$arch, %$obj);
658 826
659 if ($a{is_floor} && !$a{alive}) { 827 if ($a{is_floor} && !$a{alive}) {
660 $root = $Crossfire::Data::TYPE{Floor}; 828 $root = $Deliantra::Data::TYPE{Floor};
661 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 829 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
662 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 830 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
663 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 831 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
664 $root = $Crossfire::Data::TYPE{Wall}; 832 $root = $Deliantra::Data::TYPE{Wall};
665 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 833 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
666 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 834 $root = $Deliantra::Data::TYPE{"Weak Wall"};
667 } else { 835 } else {
668 $root = $Crossfire::Data::TYPE{Misc}; 836 $root = $Deliantra::Data::TYPE{Misc};
669 } 837 }
670 } 838 }
671 839
840 my (%ignore);
672 my @import = ($root); 841 my @import = ($root);
842
843 my @new_import;
844 while (my $type = shift @import) {
845 # first import everything we will need:
846 push @import,
847 grep $_,
848 map $Deliantra::Data::TYPE{$_},
849 @{$type->{import} || []};
850
851 # and compute the ignored attributes
852 for (@{$type->{ignore} || []}) {
853 $ignore{$_}++ for ref $_ ? @$_ : $_;
854 }
855
856 push @new_import, $type;
673 857 }
858 (@import) = @new_import;
859
860 # then add defaults to the back of the list, so they are added
861 # as last resort.
674 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 862 push @import, \%Deliantra::Data::DEFAULT_ATTR
675 unless $type == 116; 863 unless $type == 116;
676 864
677 my (%ignore);
678 my (@section_order, %section, @attr_order); 865 my (@section_order, %section, @attr_order);
679 866
867 # @import = root, imported, default
680 while (my $type = shift @import) { 868 while (my $type = pop @import) {
681 push @import, @{$type->{import} || []};
682
683 $attr->{$_} ||= $type->{$_} 869 $attr->{$_} ||= $type->{$_}
684 for qw(name desc use); 870 for qw(name desc use);
685
686 for (@{$type->{ignore} || []}) {
687 $ignore{$_}++ for ref $_ ? @$_ : $_;
688 }
689 871
690 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 872 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
691 my ($name, $attr) = @$_; 873 my ($name, $attr) = @$_;
692 push @section_order, $name; 874 push @section_order, $name;
693 for (@$attr) { 875 for (@$attr) {
694 my ($k, $v) = @$_; 876 my ($k, $v) = @$_;
695 push @attr_order, $k; 877 push @attr_order, $k;
696 $section{$name}{$k} ||= $v; 878 $section{$name}{$k} = $v; # overwrite, so that the root decides
697 }
698 } 879 }
880 }
881 }
882
883 # remove ignores for "root" type
884 for (
885 map @{$_->[1]}, # section attributes
886 [general => ($root->{attr} || [])],
887 @{$root->{section} || []}
888 ) {
889 my ($k, $v) = @$_;
890 # skip fixed attributes, if they are ignored thats fine
891 next if $v->{type} eq 'fixed';
892
893 delete $ignore{$k}; # if the attributes are defined explicitly they
894 # should NOT be ignored. ignore should mainly
895 # hit imported/inherited attributes.
699 } 896 }
700 897
701 $attr->{section} = [ 898 $attr->{section} = [
702 map !exists $section{$_} ? () : do { 899 map !exists $section{$_} ? () : do {
703 my $attr = delete $section{$_}; 900 my $attr = delete $section{$_};
… …
707 map exists $attr->{$_} && !$ignore{$_} 904 map exists $attr->{$_} && !$ignore{$_}
708 ? [$_ => delete $attr->{$_}] : (), 905 ? [$_ => delete $attr->{$_}] : (),
709 @attr_order 906 @attr_order
710 ] 907 ]
711 }, 908 },
712
713 exists $section{$_} ? [$_ => delete $section{$_}] : (), 909 exists $section{$_} ? [$_ => delete $section{$_}] : (),
714 @section_order 910 @section_order
715 ]; 911 ];
716 912
717 $attr 913 $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} 914}
780 915
781sub cache_file($$&&) { 916sub cache_file($$&&) {
782 my ($src, $cache, $load, $create) = @_; 917 my ($src, $cache, $load, $create) = @_;
783 918
… …
833 }, sub { 968 }, sub {
834 read_arch "$LIB/archetypes" 969 read_arch "$LIB/archetypes"
835 }; 970 };
836} 971}
837 972
973sub construct_tilecache_pb {
974 my ($idx, $cache) = @_;
975
976 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
977
978 while (my ($name, $tile) = each %$cache) {
979 my $tpb = delete $tile->{pb};
980 my $ofs = $tile->{idx};
981
982 for my $x (0 .. $tile->{w} - 1) {
983 for my $y (0 .. $tile->{h} - 1) {
984 my $idx = $ofs + $x + $y * $tile->{w};
985 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
986 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
987 }
988 }
989 }
990
991 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
992
993 $cache
994}
995
996sub use_tilecache {
997 my ($face) = @_;
998 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
999 or die "$VARDIR/tilecache.png: $!";
1000 *FACE = $_[0];
1001}
1002
838=item load_tilecache 1003=item load_tilecache
839 1004
840(Re-)Load %TILE and %FACE. 1005(Re-)Load %TILE and %FACE.
841 1006
842=cut 1007=cut
843 1008
844sub load_tilecache() { 1009sub load_tilecache() {
845 require Gtk2; 1010 require Gtk2;
846 1011
847 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 1012 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 { 1013 sub {
852 my $tile = read_pak "$LIB/crossfire.0";
853
854 my %cache; 1014 my %cache;
1015 my $facedata = Storable::retrieve "$LIB/facedata";
855 1016
1017 $facedata->{version} == 2
1018 or die "$LIB/facedata: version mismatch, cannot proceed.";
1019
1020 my $faces = $facedata->{faceinfo};
856 my $idx = 0; 1021 my $idx = 0;
857 1022
858 for my $name (sort keys %$tile) { 1023 for (sort keys %$faces) {
1024 my ($face, $info) = ($_, $faces->{$_});
1025
859 my $pb = new Gtk2::Gdk::PixbufLoader; 1026 my $pb = new Gtk2::Gdk::PixbufLoader;
860 $pb->write ($tile->{$name}); 1027 $pb->write ($info->{data32});
861 $pb->close; 1028 $pb->close;
862 my $pb = $pb->get_pixbuf; 1029 my $pb = $pb->get_pixbuf;
863 1030
864 my $tile = $cache{$name} = { 1031 my $tile = $cache{$face} = {
865 pb => $pb, 1032 pb => $pb,
866 idx => $idx, 1033 idx => $idx,
867 w => int $pb->get_width / TILESIZE, 1034 w => int $pb->get_width / TILESIZE,
868 h => int $pb->get_height / TILESIZE, 1035 h => int $pb->get_height / TILESIZE,
869 }; 1036 };
870
871 1037
872 $idx += $tile->{w} * $tile->{h}; 1038 $idx += $tile->{w} * $tile->{h};
1039 }
1040
1041 construct_tilecache_pb $idx, \%cache;
1042
1043 \%cache
873 } 1044 };
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} 1045}
1046
1047=back
895 1048
896=head1 AUTHOR 1049=head1 AUTHOR
897 1050
898 Marc Lehmann <schmorp@schmorp.de> 1051 Marc Lehmann <schmorp@schmorp.de>
899 http://home.schmorp.de/ 1052 http://home.schmorp.de/
… …
902 http://www.ta-sa.org/ 1055 http://www.ta-sa.org/
903 1056
904=cut 1057=cut
905 1058
9061 10591
1060

Diff Legend

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