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.133 by root, Wed Oct 28 08:51:27 2009 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire - Crossfire maphandling 3Deliantra - Deliantra suppport module to read/write archetypes, maps etc.
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Deliantra;
8 8
9our $VERSION = '0.9'; 9our $VERSION = '1.25';
10 10
11use strict; 11use common::sense;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
15use Carp (); 15use Carp ();
16use File::Spec; 16use File::Spec;
17use List::Util qw(min max); 17use List::Util qw(min max);
18use Storable qw(freeze thaw); 18use Storable qw(freeze thaw);
19 19
20our @EXPORT = qw( 20our @EXPORT = qw(
21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents 21 read_pak read_arch
22 *ARCH $TILE *FACE *FACEDATA
23 TILESIZE CACHESTRIDE
24 editor_archs arch_extents
22); 25);
23 26
24use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working 27use JSON::XS qw(decode_json encode_json);
25 28
26sub from_json($) {
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}; 29our $LIB = $ENV{DELIANTRA_LIBDIR};
37 30
38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; 31our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
32 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
33 : File::Spec->tmpdir . "/deliantra";
39 34
40mkdir $VARDIR, 0777; 35mkdir $VARDIR, 0777;
41 36
42sub TILESIZE (){ 32 } 37sub TILESIZE (){ 32 }
38sub CACHESTRIDE (){ 64 }
43 39
44our %ARCH; 40our %ARCH;
41our %FACE; # face32
45our %FACE; 42our %FACEDATA;
46our $TILE; 43our $TILE;
47 44
48our %FIELD_MULTILINE = ( 45our %FIELD_MULTILINE = (
49 msg => "endmsg", 46 msg => "endmsg",
50 lore => "endlore", 47 lore => "endlore",
… …
56 qw(move_type move_block move_allow move_on move_off move_slow); 53 qw(move_type move_block move_allow move_on move_off move_slow);
57 54
58# same as in server save routine, to (hopefully) be compatible 55# same as in server save routine, to (hopefully) be compatible
59# to the other editors. 56# to the other editors.
60our @FIELD_ORDER_MAP = (qw( 57our @FIELD_ORDER_MAP = (qw(
58 file_format_version
61 name attach swap_time reset_timeout fixed_resettime difficulty region 59 name attach swap_time reset_timeout fixed_resettime difficulty region
62 shopitems shopgreed shopmin shopmax shoprace 60 shopitems shopgreed shopmin shopmax shoprace
63 darkness width height enter_x enter_y msg maplore 61 darkness width height enter_x enter_y msg maplore
64 unique template 62 unique template
65 outdoor temp pressure humid windspeed winddir sky nosmooth 63 outdoor temp pressure humid windspeed winddir sky nosmooth
66 tile_path_1 tile_path_2 tile_path_3 tile_path_4 64 tile_path_1 tile_path_2 tile_path_3 tile_path_4
67)); 65));
68 66
69our @FIELD_ORDER = (qw( 67our @FIELD_ORDER = (qw(
68 inherit
69
70 elevation 70 elevation
71 71
72 name name_pl custom_name attach title race 72 name name_pl custom_name attach title race
73 slaying skill msg lore other_arch face 73 slaying skill msg lore other_arch
74 #todo-events 74 sound sound_destroy face animation is_animated
75 animation is_animated 75 magicmap smoothlevel smoothface
76 str dex con wis pow cha int 76 str dex con wis pow cha int
77 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
78 exp perm_exp expmul 78 exp perm_exp expmul
79 food dam luck wc ac x y speed speed_left move_state attack_movement 79 food dam luck wc ac x y speed speed_left move_state attack_movement
80 nrof level direction type subtype attacktype 80 nrof level direction type subtype attacktype
… …
88 resist_life_stealing resist_disease 88 resist_life_stealing resist_disease
89 89
90 path_attuned path_repelled path_denied material materialname 90 path_attuned path_repelled path_denied material materialname
91 value carrying weight invisible state magic 91 value carrying weight invisible state magic
92 last_heal last_sp last_grace last_eat 92 last_heal last_sp last_grace last_eat
93 connected glow_radius randomitems npx_status npc_program 93 connected glow_radius randomitems tresure_env npx_status npc_program
94 run_away pick_up container will_apply smoothlevel 94 run_away pick_up container will_apply smoothlevel
95 current_weapon_script weapontype tooltype elevation client_type 95 current_weapon_script weapontype tooltype elevation client_type
96 item_power duration range 96 item_power duration range
97 range_modifier duration_modifier dam_modifier gen_sp_armour 97 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 98 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 109 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 110 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 111 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 112 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 113 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
114 precious
114 115
115 body_range body_arm body_torso body_head body_neck body_skill 116 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 117 body_finger body_shoulder body_foot body_hand body_wrist body_waist
117)); 118));
118 119
… …
135sub MOVE_FLY_LOW (){ 0x02 } 136sub MOVE_FLY_LOW (){ 0x02 }
136sub MOVE_FLY_HIGH (){ 0x04 } 137sub MOVE_FLY_HIGH (){ 0x04 }
137sub MOVE_FLYING (){ 0x06 } 138sub MOVE_FLYING (){ 0x06 }
138sub MOVE_SWIM (){ 0x08 } 139sub MOVE_SWIM (){ 0x08 }
139sub MOVE_BOAT (){ 0x10 } 140sub MOVE_BOAT (){ 0x10 }
141sub MOVE_SHIP (){ 0x20 }
140sub MOVE_KNOWN (){ 0x1f } # all of above 142sub MOVE_KNOWN (){ 0x3f } # all of above
141sub MOVE_ALLBIT (){ 0x10000 }
142sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 143sub MOVE_ALL (){ 0x10000 } # very special value
144
145our %MOVE_TYPE = (
146 walk => MOVE_WALK,
147 fly_low => MOVE_FLY_LOW,
148 fly_high => MOVE_FLY_HIGH,
149 flying => MOVE_FLYING,
150 swim => MOVE_SWIM,
151 boat => MOVE_BOAT,
152 ship => MOVE_SHIP,
153 all => MOVE_ALL,
154);
155
156our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
157
158{
159 package Deliantra::MoveType;
160
161 use overload
162 '=' => sub { bless [@{$_[0]}], ref $_[0] },
163 '""' => \&as_string,
164 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
165 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
166 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
167 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
168 'x=' => sub {
169 my $cur = $_[0] >= $_[1];
170 if (!defined $cur) {
171 if ($_[0] >= "all") {
172 $_[0] -= $_[1];
173 } else {
174 $_[0] += $_[1];
175 }
176 } elsif ($cur) {
177 $_[0] -= $_[1];
178 } else {
179 $_[0] /= $_[1];
180 }
181
182 $_[0]
183 },
184 'eq' => sub { "$_[0]" eq "$_[1]" },
185 'ne' => sub { "$_[0]" ne "$_[1]" },
186 ;
187
188 sub TO_JSON {
189 $_[0][0]
190 }
191}
192
193sub Deliantra::MoveType::new {
194 my ($class, $string) = @_;
195
196 my $mask;
197 my $value;
198
199 if ($string =~ /^\s*\d+\s*$/) {
200 $mask = MOVE_ALL;
201 $value = $string+0;
202 } else {
203 for (split /\s+/, lc $string) {
204 if (s/^-//) {
205 $mask |= $MOVE_TYPE{$_};
206 $value &= ~$MOVE_TYPE{$_};
207 } else {
208 $mask |= $MOVE_TYPE{$_};
209 $value |= $MOVE_TYPE{$_};
210 }
211 }
212 }
213
214 (bless [$mask, $value], $class)->normalise
215}
216
217sub Deliantra::MoveType::normalise {
218 my ($self) = @_;
219
220 if ($self->[0] & MOVE_ALL) {
221 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
222 $self->[0] &= $mask;
223 $self->[1] &= $mask;
224 }
225
226 $self->[1] &= $self->[0];
227
228 $self
229}
230
231sub Deliantra::MoveType::as_string {
232 my ($self) = @_;
233
234 my @res;
235
236 my ($mask, $value) = @$self;
237
238 for (@Deliantra::MOVE_TYPE) {
239 my $bit = $Deliantra::MOVE_TYPE{$_};
240 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
241 $mask &= ~$bit;
242 push @res, $value & $bit ? $_ : "-$_";
243 }
244 }
245
246 join " ", @res
247}
143 248
144sub load_ref($) { 249sub load_ref($) {
145 my ($path) = @_; 250 my ($path) = @_;
146 251
147 open my $fh, "<:raw:perlio", $path 252 open my $fh, "<:raw:perlio", $path
… …
160 close $fh; 265 close $fh;
161 rename "$path~", $path 266 rename "$path~", $path
162 or die "$path: $!"; 267 or die "$path: $!";
163} 268}
164 269
270my %attack_mask = (
271 physical => 0x00000001,
272 magic => 0x00000002,
273 fire => 0x00000004,
274 electricity => 0x00000008,
275 cold => 0x00000010,
276 confusion => 0x00000020,
277 acid => 0x00000040,
278 drain => 0x00000080,
279 weaponmagic => 0x00000100,
280 ghosthit => 0x00000200,
281 poison => 0x00000400,
282 slow => 0x00000800,
283 paralyze => 0x00001000,
284 turn_undead => 0x00002000,
285 fear => 0x00004000,
286 cancellation => 0x00008000,
287 deplete => 0x00010000,
288 death => 0x00020000,
289 chaos => 0x00040000,
290 counterspell => 0x00080000,
291 godpower => 0x00100000,
292 holyword => 0x00200000,
293 blind => 0x00400000,
294 internal => 0x00800000,
295 life_stealing => 0x01000000,
296 disease => 0x02000000,
297);
298
299sub _add_resist($$$) {
300 my ($ob, $mask, $value) = @_;
301
302 while (my ($k, $v) = each %attack_mask) {
303 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
304 }
305}
306
307my %MATERIAL = reverse
308 paper => 1,
309 iron => 2,
310 glass => 4,
311 leather => 8,
312 wood => 16,
313 organic => 32,
314 stone => 64,
315 cloth => 128,
316 adamant => 256,
317 liquid => 512,
318 tin => 1024,
319 bone => 2048,
320 ice => 4096,
321
322 # guesses
323 runestone => 12,
324 bronze => 18,
325 "ancient wood" => 20,
326 glass => 36,
327 marble => 66,
328 ice => 68,
329 stone => 70,
330 stone => 80,
331 cloth => 136,
332 ironwood => 144,
333 adamantium => 258,
334 glacium => 260,
335 blood => 544,
336;
337
165# object as in "Object xxx", i.e. archetypes 338# object as in "Object xxx", i.e. archetypes
166sub normalize_object($) { 339sub normalize_object($) {
167 my ($ob) = @_; 340 my ($ob) = @_;
168 341
342 # convert material bitset to materialname, if possible
343 if (exists $ob->{material}) {
344 if (!$ob->{material}) {
345 delete $ob->{material};
346 } elsif (exists $ob->{materialname}) {
347 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
348 delete $ob->{material};
349 } else {
350 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
351 delete $ob->{material}; # assume materilname is more specific and nuke material
352 }
353 } elsif (my $name = $MATERIAL{$ob->{material}}) {
354 delete $ob->{material};
355 $ob->{materialname} = $name;
356 } else {
357 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
358 }
359 }
360
361 # check whether attachment is the same as in the archetype
362 if (exists $ob->{attach}) {
363 my $arch = $ARCH{$ob->{_name}};
364 my $js = JSON::XS->new->utf8->canonical (1);
365
366 if (defined $arch->{attach}
367 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
368 delete $ob->{attach}
369 }
370 }
371
372 # color_fg is used as default for magicmap if magicmap does not exist
373 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
374
169 # nuke outdated or never supported fields 375 # nuke outdated or never supported fields
170 delete $ob->{$_} for qw( 376 delete @$ob{qw(
171 can_knockback can_parry can_impale can_cut can_dam_armour 377 can_knockback can_parry can_impale can_cut can_dam_armour
172 can_apply pass_thru can_pass_thru 378 can_apply pass_thru can_pass_thru color_bg color_fg
173 ); 379 )};
380
381 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
382 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
383 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
174 384
175 # convert movement strings to bitsets 385 # convert movement strings to bitsets
176 for my $attr (keys %FIELD_MOVEMENT) { 386 for my $attr (keys %FIELD_MOVEMENT) {
177 next unless exists $ob->{$attr}; 387 next unless exists $ob->{$attr};
178 388
179 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 389 $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 } 390 }
206 391
207 # convert outdated movement flags to new movement sets 392 # convert outdated movement flags to new movement sets
208 if (defined (my $v = delete $ob->{no_pass})) { 393 if (defined (my $v = delete $ob->{no_pass})) {
209 $ob->{move_block} = $v ? MOVE_ALL : 0; 394 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
210 } 395 }
211 if (defined (my $v = delete $ob->{slow_move})) { 396 if (defined (my $v = delete $ob->{slow_move})) {
212 $ob->{move_slow} |= MOVE_WALK; 397 $ob->{move_slow} += "walk";
213 $ob->{move_slow_penalty} = $v; 398 $ob->{move_slow_penalty} = $v;
214 } 399 }
215 if (defined (my $v = delete $ob->{walk_on})) { 400 if (defined (my $v = delete $ob->{walk_on})) {
216 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 401 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
217 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
218 : $ob->{move_on} & ~MOVE_WALK;
219 } 402 }
220 if (defined (my $v = delete $ob->{walk_off})) { 403 if (defined (my $v = delete $ob->{walk_off})) {
221 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 404 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
222 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
223 : $ob->{move_off} & ~MOVE_WALK;
224 } 405 }
225 if (defined (my $v = delete $ob->{fly_on})) { 406 if (defined (my $v = delete $ob->{fly_on})) {
226 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 407 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
227 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
228 : $ob->{move_on} & ~MOVE_FLY_LOW;
229 } 408 }
230 if (defined (my $v = delete $ob->{fly_off})) { 409 if (defined (my $v = delete $ob->{fly_off})) {
231 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 410 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
232 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
233 : $ob->{move_off} & ~MOVE_FLY_LOW;
234 } 411 }
235 if (defined (my $v = delete $ob->{flying})) { 412 if (defined (my $v = delete $ob->{flying})) {
236 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 413 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
237 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
238 : $ob->{move_type} & ~MOVE_FLY_LOW;
239 } 414 }
240 415
241 # convert idiotic event_xxx things into objects 416 # convert idiotic event_xxx things into objects
242 while (my ($event, $subtype) = each %EVENT_TYPE) { 417 while (my ($event, $subtype) = each %EVENT_TYPE) {
243 if (exists $ob->{"event_${event}_plugin"}) { 418 if (exists $ob->{"event_${event}_plugin"}) {
… …
248 name => delete $ob->{"event_${event}_options"}, 423 name => delete $ob->{"event_${event}_options"},
249 }; 424 };
250 } 425 }
251 } 426 }
252 427
428 # some archetypes had "+3" instead of the canonical "3", so fix
429 $ob->{dam} *= 1 if exists $ob->{dam};
430
253 $ob 431 $ob
254} 432}
255 433
256# arch as in "arch xxx", ie.. objects 434# arch as in "arch xxx", ie.. objects
257sub normalize_arch($) { 435sub normalize_arch($) {
258 my ($ob) = @_; 436 my ($ob) = @_;
259 437
260 normalize_object $ob; 438 normalize_object $ob;
439
440 return if $ob->{_atype} eq "object";
261 441
262 my $arch = $ARCH{$ob->{_name}} 442 my $arch = $ARCH{$ob->{_name}}
263 or (warn "$ob->{_name}: no such archetype", return $ob); 443 or (warn "$ob->{_name}: no such archetype", return $ob);
264 444
265 if ($arch->{type} == 22) { # map 445 if ($arch->{type} == 22) { # map
… …
301} 481}
302 482
303sub attr_thaw($) { 483sub attr_thaw($) {
304 my ($ob) = @_; 484 my ($ob) = @_;
305 485
306 $ob->{attach} = from_json $ob->{attach} 486 $ob->{attach} = decode_json $ob->{attach}
307 if exists $ob->{attach}; 487 if exists $ob->{attach};
308 488
309 $ob 489 $ob
310} 490}
311 491
312sub attr_freeze($) { 492sub attr_freeze($) {
313 my ($ob) = @_; 493 my ($ob) = @_;
314 494
315 $ob->{attach} = Crossfire::to_json $ob->{attach} 495 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
316 if exists $ob->{attach}; 496 if exists $ob->{attach};
317 497
318 $ob 498 $ob
319} 499}
320 500
… …
338sub read_arch($;$) { 518sub read_arch($;$) {
339 my ($path, $toplevel) = @_; 519 my ($path, $toplevel) = @_;
340 520
341 my %arc; 521 my %arc;
342 my ($more, $prev); 522 my ($more, $prev);
523 my $comment;
343 524
344 open my $fh, "<:raw:perlio:utf8", $path 525 open my $fh, "<:utf8", $path
345 or Carp::croak "$path: $!"; 526 or Carp::croak "$path: $!";
346 527
347# binmode $fh; 528# binmode $fh;
348 529
349 my $parse_block; $parse_block = sub { 530 my $parse_block; $parse_block = sub {
… …
351 532
352 while (<$fh>) { 533 while (<$fh>) {
353 s/\s+$//; 534 s/\s+$//;
354 if (/^end$/i) { 535 if (/^end$/i) {
355 last; 536 last;
537
356 } elsif (/^arch (\S+)$/i) { 538 } elsif (/^arch (\S+)$/i) {
357 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 539 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
540
358 } elsif (/^lore$/i) { 541 } elsif (/^lore$/i) {
359 while (<$fh>) { 542 while (<$fh>) {
360 last if /^endlore\s*$/i; 543 last if /^endlore\s*$/i;
361 $arc{lore} .= $_; 544 $arc{lore} .= $_;
362 } 545 }
… …
371 chomp; 554 chomp;
372 push @{ $arc{anim} }, $_; 555 push @{ $arc{anim} }, $_;
373 } 556 }
374 } elsif (/^(\S+)\s*(.*)$/) { 557 } elsif (/^(\S+)\s*(.*)$/) {
375 $arc{lc $1} = $2; 558 $arc{lc $1} = $2;
376 } elsif (/^\s*($|#)/) { 559 } elsif (/^\s*#/) {
560 $arc{_comment} .= "$_\n";
561
562 } elsif (/^\s*$/) {
377 # 563 #
378 } else { 564 } else {
379 warn "$path: unparsable line '$_' in arch $arc{_name}"; 565 warn "$path: unparsable line '$_' in arch $arc{_name}";
380 } 566 }
381 } 567 }
… …
387 s/\s+$//; 573 s/\s+$//;
388 if (/^more$/i) { 574 if (/^more$/i) {
389 $more = $prev; 575 $more = $prev;
390 } elsif (/^object (\S+)$/i) { 576 } elsif (/^object (\S+)$/i) {
391 my $name = $1; 577 my $name = $1;
392 my $arc = attr_thaw normalize_object $parse_block->(_name => $name); 578 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
579 undef $comment;
580 delete $arc{_comment} unless length $arc{_comment};
393 $arc->{_atype} = 'object'; 581 $arc->{_atype} = 'object';
394 582
395 if ($more) { 583 if ($more) {
396 $more->{more} = $arc; 584 $more->{more} = $arc;
397 } else { 585 } else {
… …
399 } 587 }
400 $prev = $arc; 588 $prev = $arc;
401 $more = undef; 589 $more = undef;
402 } elsif (/^arch (\S+)$/i) { 590 } elsif (/^arch (\S+)$/i) {
403 my $name = $1; 591 my $name = $1;
404 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 592 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
593 undef $comment;
594 delete $arc{_comment} unless length $arc{_comment};
405 $arc->{_atype} = 'arch'; 595 $arc->{_atype} = 'arch';
406 596
407 if ($more) { 597 if ($more) {
408 $more->{more} = $arc; 598 $more->{more} = $arc;
409 } else { 599 } else {
… …
418 push @{$toplevel->{lev_array}}, $_+0; 608 push @{$toplevel->{lev_array}}, $_+0;
419 } 609 }
420 } else { 610 } else {
421 $toplevel->{$1} = $2; 611 $toplevel->{$1} = $2;
422 } 612 }
613 } elsif (/^\s*#/) {
614 $comment .= "$_\n";
423 } elsif (/^\s*($|#)/) { 615 } elsif (/^\s*($|#)/) {
424 # 616 #
425 } else { 617 } else {
426 die "$path: unparseable top-level line '$_'"; 618 die "$path: unparseable top-level line '$_'";
427 } 619 }
… …
438 my $str; 630 my $str;
439 631
440 my $append; $append = sub { 632 my $append; $append = sub {
441 my %a = %{$_[0]}; 633 my %a = %{$_[0]};
442 634
443 Crossfire::attr_freeze \%a; 635 Deliantra::attr_freeze \%a;
444 Crossfire::normalize_arch \%a; 636 Deliantra::normalize_arch \%a;
445 637
446 # undo the bit-split we did before 638 # undo the bit-split we did before
447 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 639 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}) 640 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
449 | (delete $a{attack_movement_bits_4_7}); 641 | (delete $a{attack_movement_bits_4_7});
450 } 642 }
451 643
644 if (my $comment = delete $a{_comment}) {
645 if ($comment =~ /[^\n\s#]/) {
646 $str .= $comment;
647 }
648 }
649
452 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 650 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
453 651
454 my $inv = delete $a{inventory}; 652 my $inv = delete $a{inventory};
455 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 653 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
456 my $anim = delete $a{anim}; 654 my $anim = delete $a{anim};
457 655
656 if ($a{_atype} eq 'object') {
657 $str .= join "\n", "anim", @$anim, "mina\n"
658 if $anim;
659 }
660
458 my @kv; 661 my @kv;
459 662
460 for ($a{_name} eq "map" 663 for ($a{_name} eq "map"
461 ? @Crossfire::FIELD_ORDER_MAP 664 ? @Deliantra::FIELD_ORDER_MAP
462 : @Crossfire::FIELD_ORDER) { 665 : @Deliantra::FIELD_ORDER) {
463 push @kv, [$_, delete $a{$_}] 666 push @kv, [$_, delete $a{$_}]
464 if exists $a{$_}; 667 if exists $a{$_};
465 } 668 }
466 669
467 for (sort keys %a) { 670 for (sort keys %a) {
… …
470 } 673 }
471 674
472 for (@kv) { 675 for (@kv) {
473 my ($k, $v) = @$_; 676 my ($k, $v) = @$_;
474 677
475 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 678 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
476 $v =~ s/\n$//; 679 $v =~ s/\n$//;
477 $str .= "$k\n$v\n$end\n"; 680 $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 { 681 } else {
505 $str .= "$k $v\n"; 682 $str .= "$k $v\n";
506 } 683 }
507 } 684 }
508 685
509 if ($inv) { 686 if ($inv) {
510 $append->($_) for @$inv; 687 $append->($_) for @$inv;
511 } 688 }
512 689
690 $str .= "end\n";
691
513 if ($a{_atype} eq 'object') { 692 if ($a{_atype} eq 'object') {
514 $str .= join "\n", "anim", @$anim, "mina\n" 693 if ($more) {
515 if $anim;
516 }
517
518 $str .= "end\n";
519
520 if (($a{_atype} eq 'object') && $more) {
521 $str .= "\nmore\n"; 694 $str .= "more\n";
522 $append->($more) if $more; 695 $append->($more) if $more;
696 } else {
697 $str .= "\n";
698 }
523 } 699 }
524 }; 700 };
525 701
526 for (@$arch) { 702 for (@$arch) {
527 $append->($_); 703 $append->($_);
… …
556 my ($a) = @_; 732 my ($a) = @_;
557 733
558 my $o = $ARCH{$a->{_name}} 734 my $o = $ARCH{$a->{_name}}
559 or return; 735 or return;
560 736
561 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 737 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
738 unless ($face) {
739 $face = $FACE{"blank.x11"}
562 or (warn "no face data found for arch '$a->{_name}'"), return; 740 or (warn "no face data found for arch '$a->{_name}'"), return;
741 }
563 742
564 if ($face->{w} > 1 || $face->{h} > 1) { 743 if ($face->{w} > 1 || $face->{h} > 1) {
565 # bigface 744 # bigface
566 return (0, 0, $face->{w} - 1, $face->{h} - 1); 745 return (0, 0, $face->{w} - 1, $face->{h} - 1);
567 746
… …
600=cut 779=cut
601 780
602sub arch_attr($) { 781sub arch_attr($) {
603 my ($obj) = @_; 782 my ($obj) = @_;
604 783
605 require Crossfire::Data; 784 require Deliantra::Data;
606 785
607 my $root; 786 my $root;
608 my $attr = { }; 787 my $attr = { };
609 788
610 my $arch = $ARCH{ $obj->{_name} }; 789 my $arch = $ARCH{ $obj->{_name} };
611 my $type = $obj->{type} || $arch->{type}; 790 my $type = $obj->{type} || $arch->{type};
612 791
613 if ($type > 0) { 792 if ($type > 0) {
614 $root = $Crossfire::Data::ATTR{$type}; 793 $root = $Deliantra::Data::ATTR{$type};
615 } else { 794 } else {
616 my %a = (%$arch, %$obj); 795 my %a = (%$arch, %$obj);
617 796
618 if ($a{is_floor} && !$a{alive}) { 797 if ($a{is_floor} && !$a{alive}) {
619 $root = $Crossfire::Data::TYPE{Floor}; 798 $root = $Deliantra::Data::TYPE{Floor};
620 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 799 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
621 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 800 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
622 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 801 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
623 $root = $Crossfire::Data::TYPE{Wall}; 802 $root = $Deliantra::Data::TYPE{Wall};
624 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 803 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
625 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 804 $root = $Deliantra::Data::TYPE{"Weak Wall"};
626 } else { 805 } else {
627 $root = $Crossfire::Data::TYPE{Misc}; 806 $root = $Deliantra::Data::TYPE{Misc};
628 } 807 }
629 } 808 }
630 809
631 my @import = ($root); 810 my @import = ($root);
632 811
633 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 812 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
634 unless $type == 116; 813 unless $type == 116;
635 814
636 my (%ignore); 815 my (%ignore);
637 my (@section_order, %section, @attr_order); 816 my (@section_order, %section, @attr_order);
638 817
639 while (my $type = shift @import) { 818 while (my $type = shift @import) {
819 push @import,
820 grep $_,
821 map $Deliantra::Data::TYPE{$_},
640 push @import, @{$type->{import} || []}; 822 @{$type->{import} || []};
641 823
642 $attr->{$_} ||= $type->{$_} 824 $attr->{$_} ||= $type->{$_}
643 for qw(name desc use); 825 for qw(name desc use);
644 826
645 for (@{$type->{ignore} || []}) { 827 for (@{$type->{ignore} || []}) {
… …
674 ]; 856 ];
675 857
676 $attr 858 $attr
677} 859}
678 860
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}
739
740sub cache_file($$&&) { 861sub cache_file($$&&) {
741 my ($src, $cache, $load, $create) = @_; 862 my ($src, $cache, $load, $create) = @_;
742 863
743 my ($size, $mtime) = (stat $src)[7,9] 864 my ($size, $mtime) = (stat $src)[7,9]
744 or Carp::croak "$src: $!"; 865 or Carp::croak "$src: $!";
… …
792 }, sub { 913 }, sub {
793 read_arch "$LIB/archetypes" 914 read_arch "$LIB/archetypes"
794 }; 915 };
795} 916}
796 917
918sub construct_tilecache_pb {
919 my ($idx, $cache) = @_;
920
921 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
922
923 while (my ($name, $tile) = each %$cache) {
924 my $tpb = delete $tile->{pb};
925 my $ofs = $tile->{idx};
926
927 for my $x (0 .. $tile->{w} - 1) {
928 for my $y (0 .. $tile->{h} - 1) {
929 my $idx = $ofs + $x + $y * $tile->{w};
930 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
931 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
932 }
933 }
934 }
935
936 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
937
938 $cache
939}
940
941sub use_tilecache {
942 my ($face) = @_;
943 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
944 or die "$VARDIR/tilecache.png: $!";
945 *FACE = $_[0];
946}
947
797=item load_tilecache 948=item load_tilecache
798 949
799(Re-)Load %TILE and %FACE. 950(Re-)Load %TILE and %FACE.
800 951
801=cut 952=cut
802 953
803sub load_tilecache() { 954sub load_tilecache() {
804 require Gtk2; 955 require Gtk2;
805 956
806 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 957 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 { 958 sub {
811 my $tile = read_pak "$LIB/crossfire.0";
812
813 my %cache; 959 my %cache;
960 my $facedata = Storable::retrieve "$LIB/facedata";
814 961
962 $facedata->{version} == 2
963 or die "$LIB/facedata: version mismatch, cannot proceed.";
964
965 my $faces = $facedata->{faceinfo};
815 my $idx = 0; 966 my $idx = 0;
816 967
817 for my $name (sort keys %$tile) { 968 for (sort keys %$faces) {
969 my ($face, $info) = ($_, $faces->{$_});
970
818 my $pb = new Gtk2::Gdk::PixbufLoader; 971 my $pb = new Gtk2::Gdk::PixbufLoader;
819 $pb->write ($tile->{$name}); 972 $pb->write ($info->{data32});
820 $pb->close; 973 $pb->close;
821 my $pb = $pb->get_pixbuf; 974 my $pb = $pb->get_pixbuf;
822 975
823 my $tile = $cache{$name} = { 976 my $tile = $cache{$face} = {
824 pb => $pb, 977 pb => $pb,
825 idx => $idx, 978 idx => $idx,
826 w => int $pb->get_width / TILESIZE, 979 w => int $pb->get_width / TILESIZE,
827 h => int $pb->get_height / TILESIZE, 980 h => int $pb->get_height / TILESIZE,
828 }; 981 };
829
830 982
831 $idx += $tile->{w} * $tile->{h}; 983 $idx += $tile->{w} * $tile->{h};
984 }
985
986 construct_tilecache_pb $idx, \%cache;
987
988 \%cache
832 } 989 };
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} 990}
854 991
855=head1 AUTHOR 992=head1 AUTHOR
856 993
857 Marc Lehmann <schmorp@schmorp.de> 994 Marc Lehmann <schmorp@schmorp.de>
… …
861 http://www.ta-sa.org/ 998 http://www.ta-sa.org/
862 999
863=cut 1000=cut
864 1001
8651 10021
1003

Diff Legend

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