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.71 by elmex, Thu Aug 31 21:09:32 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.9'; 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" : 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
… …
160 close $fh; 272 close $fh;
161 rename "$path~", $path 273 rename "$path~", $path
162 or die "$path: $!"; 274 or die "$path: $!";
163} 275}
164 276
277my %attack_mask = (
278 physical => 0x00000001,
279 magic => 0x00000002,
280 fire => 0x00000004,
281 electricity => 0x00000008,
282 cold => 0x00000010,
283 confusion => 0x00000020,
284 acid => 0x00000040,
285 drain => 0x00000080,
286 weaponmagic => 0x00000100,
287 ghosthit => 0x00000200,
288 poison => 0x00000400,
289 slow => 0x00000800,
290 paralyze => 0x00001000,
291 turn_undead => 0x00002000,
292 fear => 0x00004000,
293 cancellation => 0x00008000,
294 deplete => 0x00010000,
295 death => 0x00020000,
296 chaos => 0x00040000,
297 counterspell => 0x00080000,
298 godpower => 0x00100000,
299 holyword => 0x00200000,
300 blind => 0x00400000,
301 internal => 0x00800000,
302 life_stealing => 0x01000000,
303 disease => 0x02000000,
304);
305
306sub _add_resist($$$) {
307 my ($ob, $mask, $value) = @_;
308
309 while (my ($k, $v) = each %attack_mask) {
310 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
311 }
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;
344
165# object as in "Object xxx", i.e. archetypes 345# object as in "Object xxx", i.e. archetypes
166sub normalize_object($) { 346sub normalize_object($) {
167 my ($ob) = @_; 347 my ($ob) = @_;
168 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
169 # nuke outdated or never supported fields 384 # nuke outdated or never supported fields
170 delete $ob->{$_} for qw( 385 delete @$ob{qw(
171 can_knockback can_parry can_impale can_cut can_dam_armour 386 can_knockback can_parry can_impale can_cut can_dam_armour
172 can_apply pass_thru can_pass_thru 387 can_apply pass_thru can_pass_thru color_bg color_fg
173 ); 388 )};
389
390 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
391 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
392 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
174 393
175 # convert movement strings to bitsets 394 # convert movement strings to bitsets
176 for my $attr (keys %FIELD_MOVEMENT) { 395 for my $attr (keys %FIELD_MOVEMENT) {
177 next unless exists $ob->{$attr}; 396 next unless exists $ob->{$attr};
178 397
179 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 398 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
180
181 next if $ob->{$attr} =~ /^\d+$/;
182
183 my $flags = 0;
184
185 # assume list
186 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
187 $flags |= MOVE_WALK if $flag eq "walk";
188 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
189 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
190 $flags |= MOVE_FLYING if $flag eq "flying";
191 $flags |= MOVE_SWIM if $flag eq "swim";
192 $flags |= MOVE_BOAT if $flag eq "boat";
193 $flags |= MOVE_ALL if $flag eq "all";
194
195 $flags &= ~MOVE_WALK if $flag eq "-walk";
196 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
197 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
198 $flags &= ~MOVE_FLYING if $flag eq "-flying";
199 $flags &= ~MOVE_SWIM if $flag eq "-swim";
200 $flags &= ~MOVE_BOAT if $flag eq "-boat";
201 $flags &= ~MOVE_ALL if $flag eq "-all";
202 }
203
204 $ob->{$attr} = $flags;
205 } 399 }
206 400
207 # convert outdated movement flags to new movement sets 401 # convert outdated movement flags to new movement sets
208 if (defined (my $v = delete $ob->{no_pass})) { 402 if (defined (my $v = delete $ob->{no_pass})) {
209 $ob->{move_block} = $v ? MOVE_ALL : 0; 403 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
210 } 404 }
211 if (defined (my $v = delete $ob->{slow_move})) { 405 if (defined (my $v = delete $ob->{slow_move})) {
212 $ob->{move_slow} |= MOVE_WALK; 406 $ob->{move_slow} += "walk";
213 $ob->{move_slow_penalty} = $v; 407 $ob->{move_slow_penalty} = $v;
214 } 408 }
215 if (defined (my $v = delete $ob->{walk_on})) { 409 if (defined (my $v = delete $ob->{walk_on})) {
216 $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" }
217 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
218 : $ob->{move_on} & ~MOVE_WALK;
219 } 411 }
220 if (defined (my $v = delete $ob->{walk_off})) { 412 if (defined (my $v = delete $ob->{walk_off})) {
221 $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" }
222 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
223 : $ob->{move_off} & ~MOVE_WALK;
224 } 414 }
225 if (defined (my $v = delete $ob->{fly_on})) { 415 if (defined (my $v = delete $ob->{fly_on})) {
226 $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" }
227 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
228 : $ob->{move_on} & ~MOVE_FLY_LOW;
229 } 417 }
230 if (defined (my $v = delete $ob->{fly_off})) { 418 if (defined (my $v = delete $ob->{fly_off})) {
231 $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" }
232 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
233 : $ob->{move_off} & ~MOVE_FLY_LOW;
234 } 420 }
235 if (defined (my $v = delete $ob->{flying})) { 421 if (defined (my $v = delete $ob->{flying})) {
236 $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" }
237 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
238 : $ob->{move_type} & ~MOVE_FLY_LOW;
239 } 423 }
240 424
241 # convert idiotic event_xxx things into objects 425 # convert idiotic event_xxx things into objects
242 while (my ($event, $subtype) = each %EVENT_TYPE) { 426 while (my ($event, $subtype) = each %EVENT_TYPE) {
243 if (exists $ob->{"event_${event}_plugin"}) { 427 if (exists $ob->{"event_${event}_plugin"}) {
… …
248 name => delete $ob->{"event_${event}_options"}, 432 name => delete $ob->{"event_${event}_options"},
249 }; 433 };
250 } 434 }
251 } 435 }
252 436
437 # some archetypes had "+3" instead of the canonical "3", so fix
438 $ob->{dam} *= 1 if exists $ob->{dam};
439
253 $ob 440 $ob
254} 441}
255 442
256# arch as in "arch xxx", ie.. objects 443# arch as in "arch xxx", ie.. objects
257sub normalize_arch($) { 444sub normalize_arch($) {
258 my ($ob) = @_; 445 my ($ob) = @_;
259 446
260 normalize_object $ob; 447 normalize_object $ob;
448
449 return if $ob->{_atype} eq "object";
261 450
262 my $arch = $ARCH{$ob->{_name}} 451 my $arch = $ARCH{$ob->{_name}}
263 or (warn "$ob->{_name}: no such archetype", return $ob); 452 or (warn "$ob->{_name}: no such archetype", return $ob);
264 453
265 if ($arch->{type} == 22) { # map 454 if ($arch->{type} == 22) { # map
… …
301} 490}
302 491
303sub attr_thaw($) { 492sub attr_thaw($) {
304 my ($ob) = @_; 493 my ($ob) = @_;
305 494
306 $ob->{attach} = from_json $ob->{attach} 495 $ob->{attach} = decode_json $ob->{attach}
307 if exists $ob->{attach}; 496 if exists $ob->{attach};
308 497
309 $ob 498 $ob
310} 499}
311 500
312sub attr_freeze($) { 501sub attr_freeze($) {
313 my ($ob) = @_; 502 my ($ob) = @_;
314 503
315 $ob->{attach} = Crossfire::to_json $ob->{attach} 504 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
316 if exists $ob->{attach}; 505 if exists $ob->{attach};
317 506
318 $ob 507 $ob
319} 508}
320 509
… …
338sub read_arch($;$) { 527sub read_arch($;$) {
339 my ($path, $toplevel) = @_; 528 my ($path, $toplevel) = @_;
340 529
341 my %arc; 530 my %arc;
342 my ($more, $prev); 531 my ($more, $prev);
532 my $comment;
343 533
344 open my $fh, "<:raw:perlio:utf8", $path 534 open my $fh, "<:utf8", $path
345 or Carp::croak "$path: $!"; 535 or Carp::croak "$path: $!";
346 536
347# binmode $fh; 537# binmode $fh;
348 538
349 my $parse_block; $parse_block = sub { 539 my $parse_block; $parse_block = sub {
… …
351 541
352 while (<$fh>) { 542 while (<$fh>) {
353 s/\s+$//; 543 s/\s+$//;
354 if (/^end$/i) { 544 if (/^end$/i) {
355 last; 545 last;
546
356 } elsif (/^arch (\S+)$/i) { 547 } elsif (/^arch (\S+)$/i) {
357 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 548 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
549
358 } elsif (/^lore$/i) { 550 } elsif (/^lore$/i) {
359 while (<$fh>) { 551 while (<$fh>) {
360 last if /^endlore\s*$/i; 552 last if /^endlore\s*$/i;
361 $arc{lore} .= $_; 553 $arc{lore} .= $_;
362 } 554 }
… …
371 chomp; 563 chomp;
372 push @{ $arc{anim} }, $_; 564 push @{ $arc{anim} }, $_;
373 } 565 }
374 } elsif (/^(\S+)\s*(.*)$/) { 566 } elsif (/^(\S+)\s*(.*)$/) {
375 $arc{lc $1} = $2; 567 $arc{lc $1} = $2;
376 } elsif (/^\s*($|#)/) { 568 } elsif (/^\s*#/) {
569 $arc{_comment} .= "$_\n";
570
571 } elsif (/^\s*$/) {
377 # 572 #
378 } else { 573 } else {
379 warn "$path: unparsable line '$_' in arch $arc{_name}"; 574 warn "$path: unparsable line '$_' in arch $arc{_name}";
380 } 575 }
381 } 576 }
… …
387 s/\s+$//; 582 s/\s+$//;
388 if (/^more$/i) { 583 if (/^more$/i) {
389 $more = $prev; 584 $more = $prev;
390 } elsif (/^object (\S+)$/i) { 585 } elsif (/^object (\S+)$/i) {
391 my $name = $1; 586 my $name = $1;
392 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};
393 $arc->{_atype} = 'object'; 590 $arc->{_atype} = 'object';
394 591
395 if ($more) { 592 if ($more) {
396 $more->{more} = $arc; 593 $more->{more} = $arc;
397 } else { 594 } else {
… …
399 } 596 }
400 $prev = $arc; 597 $prev = $arc;
401 $more = undef; 598 $more = undef;
402 } elsif (/^arch (\S+)$/i) { 599 } elsif (/^arch (\S+)$/i) {
403 my $name = $1; 600 my $name = $1;
404 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};
405 $arc->{_atype} = 'arch'; 604 $arc->{_atype} = 'arch';
406 605
407 if ($more) { 606 if ($more) {
408 $more->{more} = $arc; 607 $more->{more} = $arc;
409 } else { 608 } else {
… …
418 push @{$toplevel->{lev_array}}, $_+0; 617 push @{$toplevel->{lev_array}}, $_+0;
419 } 618 }
420 } else { 619 } else {
421 $toplevel->{$1} = $2; 620 $toplevel->{$1} = $2;
422 } 621 }
622 } elsif (/^\s*#/) {
623 $comment .= "$_\n";
423 } elsif (/^\s*($|#)/) { 624 } elsif (/^\s*($|#)/) {
424 # 625 #
425 } else { 626 } else {
426 die "$path: unparseable top-level line '$_'"; 627 die "$path: unparseable top-level line '$_'";
427 } 628 }
… …
438 my $str; 639 my $str;
439 640
440 my $append; $append = sub { 641 my $append; $append = sub {
441 my %a = %{$_[0]}; 642 my %a = %{$_[0]};
442 643
443 Crossfire::attr_freeze \%a; 644 Deliantra::attr_freeze \%a;
444 Crossfire::normalize_arch \%a; 645 Deliantra::normalize_arch \%a;
445 646
446 # undo the bit-split we did before 647 # undo the bit-split we did before
447 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}) {
448 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 649 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
449 | (delete $a{attack_movement_bits_4_7}); 650 | (delete $a{attack_movement_bits_4_7});
450 } 651 }
451 652
653 if (my $comment = delete $a{_comment}) {
654 if ($comment =~ /[^\n\s#]/) {
655 $str .= $comment;
656 }
657 }
658
452 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 659 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
453 660
454 my $inv = delete $a{inventory}; 661 my $inv = delete $a{inventory};
455 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
456 my $anim = delete $a{anim}; 663 my $anim = delete $a{anim};
457 664
665 if ($a{_atype} eq 'object') {
666 $str .= join "\n", "anim", @$anim, "mina\n"
667 if $anim;
668 }
669
458 my @kv; 670 my @kv;
459 671
460 for ($a{_name} eq "map" 672 for ($a{_name} eq "map"
461 ? @Crossfire::FIELD_ORDER_MAP 673 ? @Deliantra::FIELD_ORDER_MAP
462 : @Crossfire::FIELD_ORDER) { 674 : @Deliantra::FIELD_ORDER) {
463 push @kv, [$_, delete $a{$_}] 675 push @kv, [$_, delete $a{$_}]
464 if exists $a{$_}; 676 if exists $a{$_};
465 } 677 }
466 678
467 for (sort keys %a) { 679 for (sort keys %a) {
… …
470 } 682 }
471 683
472 for (@kv) { 684 for (@kv) {
473 my ($k, $v) = @$_; 685 my ($k, $v) = @$_;
474 686
475 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 687 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
476 $v =~ s/\n$//; 688 $v =~ s/\n$//;
477 $str .= "$k\n$v\n$end\n"; 689 $str .= "$k\n$v\n$end\n";
478 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
479 if ($v & ~Crossfire::MOVE_ALL or !$v) {
480 $str .= "$k $v\n";
481
482 } elsif ($v & Crossfire::MOVE_ALLBIT) {
483 $str .= "$k all";
484
485 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
486 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
487 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
488 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
489 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
490
491 $str .= "\n";
492
493 } else {
494 $str .= $k;
495
496 $str .= " walk" if $v & Crossfire::MOVE_WALK;
497 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
498 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
499 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
500 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
501
502 $str .= "\n";
503 }
504 } else { 690 } else {
505 $str .= "$k $v\n"; 691 $str .= "$k $v\n";
506 } 692 }
507 } 693 }
508 694
509 if ($inv) { 695 if ($inv) {
510 $append->($_) for @$inv; 696 $append->($_) for @$inv;
511 } 697 }
512 698
699 $str .= "end\n";
700
513 if ($a{_atype} eq 'object') { 701 if ($a{_atype} eq 'object') {
514 $str .= join "\n", "anim", @$anim, "mina\n" 702 if ($more) {
515 if $anim;
516 }
517
518 $str .= "end\n";
519
520 if (($a{_atype} eq 'object') && $more) {
521 $str .= "\nmore\n"; 703 $str .= "more\n";
522 $append->($more) if $more; 704 $append->($more) if $more;
705 } else {
706 $str .= "\n";
707 }
523 } 708 }
524 }; 709 };
525 710
526 for (@$arch) { 711 for (@$arch) {
527 $append->($_); 712 $append->($_);
… …
556 my ($a) = @_; 741 my ($a) = @_;
557 742
558 my $o = $ARCH{$a->{_name}} 743 my $o = $ARCH{$a->{_name}}
559 or return; 744 or return;
560 745
561 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"}
562 or (warn "no face data found for arch '$a->{_name}'"), return; 749 or (warn "no face data found for arch '$a->{_name}'"), return;
750 }
563 751
564 if ($face->{w} > 1 || $face->{h} > 1) { 752 if ($face->{w} > 1 || $face->{h} > 1) {
565 # bigface 753 # bigface
566 return (0, 0, $face->{w} - 1, $face->{h} - 1); 754 return (0, 0, $face->{w} - 1, $face->{h} - 1);
567 755
… …
600=cut 788=cut
601 789
602sub arch_attr($) { 790sub arch_attr($) {
603 my ($obj) = @_; 791 my ($obj) = @_;
604 792
605 require Crossfire::Data; 793 require Deliantra::Data;
606 794
607 my $root; 795 my $root;
608 my $attr = { }; 796 my $attr = { };
609 797
610 my $arch = $ARCH{ $obj->{_name} }; 798 my $arch = $ARCH{ $obj->{_name} };
611 my $type = $obj->{type} || $arch->{type}; 799 my $type = $obj->{type} || $arch->{type};
612 800
613 if ($type > 0) { 801 if ($type > 0) {
614 $root = $Crossfire::Data::ATTR{$type}; 802 $root = $Deliantra::Data::ATTR{$type};
615 } else { 803 } else {
616 my %a = (%$arch, %$obj); 804 my %a = (%$arch, %$obj);
617 805
618 if ($a{is_floor} && !$a{alive}) { 806 if ($a{is_floor} && !$a{alive}) {
619 $root = $Crossfire::Data::TYPE{Floor}; 807 $root = $Deliantra::Data::TYPE{Floor};
620 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 808 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
621 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 809 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
622 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 810 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
623 $root = $Crossfire::Data::TYPE{Wall}; 811 $root = $Deliantra::Data::TYPE{Wall};
624 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 812 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
625 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 813 $root = $Deliantra::Data::TYPE{"Weak Wall"};
626 } else { 814 } else {
627 $root = $Crossfire::Data::TYPE{Misc}; 815 $root = $Deliantra::Data::TYPE{Misc};
628 } 816 }
629 } 817 }
630 818
819 my (%ignore);
631 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;
632 836 }
837 (@import) = @new_import;
838
839 # then add defaults to the back of the list, so they are added
840 # as last resort.
633 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 841 push @import, \%Deliantra::Data::DEFAULT_ATTR
634 unless $type == 116; 842 unless $type == 116;
635 843
636 my (%ignore);
637 my (@section_order, %section, @attr_order); 844 my (@section_order, %section, @attr_order);
638 845
846 # @import = root, imported, default
639 while (my $type = shift @import) { 847 while (my $type = pop @import) {
640 push @import, @{$type->{import} || []};
641
642 $attr->{$_} ||= $type->{$_} 848 $attr->{$_} ||= $type->{$_}
643 for qw(name desc use); 849 for qw(name desc use);
644
645 for (@{$type->{ignore} || []}) {
646 $ignore{$_}++ for ref $_ ? @$_ : $_;
647 }
648 850
649 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 851 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
650 my ($name, $attr) = @$_; 852 my ($name, $attr) = @$_;
651 push @section_order, $name; 853 push @section_order, $name;
652 for (@$attr) { 854 for (@$attr) {
653 my ($k, $v) = @$_; 855 my ($k, $v) = @$_;
654 push @attr_order, $k; 856 push @attr_order, $k;
655 $section{$name}{$k} ||= $v; 857 $section{$name}{$k} = $v; # overwrite, so that the root decides
656 }
657 } 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.
658 } 875 }
659 876
660 $attr->{section} = [ 877 $attr->{section} = [
661 map !exists $section{$_} ? () : do { 878 map !exists $section{$_} ? () : do {
662 my $attr = delete $section{$_}; 879 my $attr = delete $section{$_};
… …
666 map exists $attr->{$_} && !$ignore{$_} 883 map exists $attr->{$_} && !$ignore{$_}
667 ? [$_ => delete $attr->{$_}] : (), 884 ? [$_ => delete $attr->{$_}] : (),
668 @attr_order 885 @attr_order
669 ] 886 ]
670 }, 887 },
671
672 exists $section{$_} ? [$_ => delete $section{$_}] : (), 888 exists $section{$_} ? [$_ => delete $section{$_}] : (),
673 @section_order 889 @section_order
674 ]; 890 ];
675 891
676 $attr 892 $attr
677}
678
679sub arch_edit_sections {
680# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
681# edit_type = 0;
682# else if (edit_type != 0) {
683# // all flags from 'check_type' must be unset in this arch because they get recalculated now
684# edit_type &= ~check_type;
685# }
686#
687# }
688# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
689# getAttributeValue("alive", defarch) == 1 &&
690# (getAttributeValue("monster", defarch) == 1 ||
691# getAttributeValue("generator", defarch) == 1)) {
692# // Monster: monsters/npcs/generators
693# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
694# }
695# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
696# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
697# // Walls
698# edit_type |= IGUIConstants.TILE_EDIT_WALL;
699# }
700# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
701# getAttributeValue("connected", defarch) != 0) {
702# // Connected Objects
703# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
704# }
705# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
706# arch_type == 66 || arch_type == 41 || arch_type == 95) {
707# // Exit: teleporter/exit/trapdoors
708# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
709# }
710# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
711# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
712# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
713# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
714# arch_type == 124 || arch_type == 130)) {
715# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
716# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
717# }
718# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
719# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
720# arch_type == 91 || arch_type == 21 || arch_type == 24) {
721# // Door: door/special door/gates + keys
722# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
723# }
724# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
725# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
726# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
727# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
728# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
729# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
730# arch_type == 122 || arch_type == 3)) {
731# // Equipment: weapons/armour/wands/rods
732# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
733# }
734#
735# return(edit_type);
736#
737#
738} 893}
739 894
740sub cache_file($$&&) { 895sub cache_file($$&&) {
741 my ($src, $cache, $load, $create) = @_; 896 my ($src, $cache, $load, $create) = @_;
742 897
… …
792 }, sub { 947 }, sub {
793 read_arch "$LIB/archetypes" 948 read_arch "$LIB/archetypes"
794 }; 949 };
795} 950}
796 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
797=item load_tilecache 982=item load_tilecache
798 983
799(Re-)Load %TILE and %FACE. 984(Re-)Load %TILE and %FACE.
800 985
801=cut 986=cut
802 987
803sub load_tilecache() { 988sub load_tilecache() {
804 require Gtk2; 989 require Gtk2;
805 990
806 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 991 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
807 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
808 or die "$VARDIR/tilecache.png: $!";
809 *FACE = $_[0];
810 }, sub { 992 sub {
811 my $tile = read_pak "$LIB/crossfire.0";
812
813 my %cache; 993 my %cache;
994 my $facedata = Storable::retrieve "$LIB/facedata";
814 995
996 $facedata->{version} == 2
997 or die "$LIB/facedata: version mismatch, cannot proceed.";
998
999 my $faces = $facedata->{faceinfo};
815 my $idx = 0; 1000 my $idx = 0;
816 1001
817 for my $name (sort keys %$tile) { 1002 for (sort keys %$faces) {
1003 my ($face, $info) = ($_, $faces->{$_});
1004
818 my $pb = new Gtk2::Gdk::PixbufLoader; 1005 my $pb = new Gtk2::Gdk::PixbufLoader;
819 $pb->write ($tile->{$name}); 1006 $pb->write ($info->{data32});
820 $pb->close; 1007 $pb->close;
821 my $pb = $pb->get_pixbuf; 1008 my $pb = $pb->get_pixbuf;
822 1009
823 my $tile = $cache{$name} = { 1010 my $tile = $cache{$face} = {
824 pb => $pb, 1011 pb => $pb,
825 idx => $idx, 1012 idx => $idx,
826 w => int $pb->get_width / TILESIZE, 1013 w => int $pb->get_width / TILESIZE,
827 h => int $pb->get_height / TILESIZE, 1014 h => int $pb->get_height / TILESIZE,
828 }; 1015 };
829
830 1016
831 $idx += $tile->{w} * $tile->{h}; 1017 $idx += $tile->{w} * $tile->{h};
1018 }
1019
1020 construct_tilecache_pb $idx, \%cache;
1021
1022 \%cache
832 } 1023 };
833
834 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
835
836 while (my ($name, $tile) = each %cache) {
837 my $tpb = delete $tile->{pb};
838 my $ofs = $tile->{idx};
839
840 for my $x (0 .. $tile->{w} - 1) {
841 for my $y (0 .. $tile->{h} - 1) {
842 my $idx = $ofs + $x + $y * $tile->{w};
843 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
844 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
845 }
846 }
847 }
848
849 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
850
851 \%cache
852 };
853} 1024}
1025
1026=back
854 1027
855=head1 AUTHOR 1028=head1 AUTHOR
856 1029
857 Marc Lehmann <schmorp@schmorp.de> 1030 Marc Lehmann <schmorp@schmorp.de>
858 http://home.schmorp.de/ 1031 http://home.schmorp.de/
… …
861 http://www.ta-sa.org/ 1034 http://www.ta-sa.org/
862 1035
863=cut 1036=cut
864 1037
8651 10381
1039

Diff Legend

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