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.70 by root, Sun Aug 27 16:33:19 2006 UTC vs.
Revision 1.121 by root, Mon Apr 14 00:35:17 2008 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.14';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
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($) { 29our $LIB = $ENV{DELIANTRA_LIBDIR} || $ENV{CROSSFIRE_LIBDIR};
27 $JSON::Syck::ImplicitUnicode = 1;
28 JSON::Syck::Load $_[0]
29}
30 30
31sub to_json($) { 31our $OLDDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire"
32 $JSON::Syck::ImplicitUnicode = 0; 32 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
33 JSON::Syck::Dump $_[0] 33 : File::Spec->tmpdir . "/crossfire";
34}
35 34
36our $LIB = $ENV{CROSSFIRE_LIBDIR}; 35our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
37 36 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; 37 : File::Spec->tmpdir . "/deliantra";
39 38
40mkdir $VARDIR, 0777; 39mkdir $VARDIR, 0777;
41 40
42sub TILESIZE (){ 32 } 41sub TILESIZE (){ 32 }
42sub CACHESTRIDE (){ 64 }
43 43
44our %ARCH; 44our %ARCH;
45our %FACE; # face32
45our %FACE; 46our %FACEDATA;
46our $TILE; 47our $TILE;
47 48
48our %FIELD_MULTILINE = ( 49our %FIELD_MULTILINE = (
49 msg => "endmsg", 50 msg => "endmsg",
50 lore => "endlore", 51 lore => "endlore",
… …
56 qw(move_type move_block move_allow move_on move_off move_slow); 57 qw(move_type move_block move_allow move_on move_off move_slow);
57 58
58# same as in server save routine, to (hopefully) be compatible 59# same as in server save routine, to (hopefully) be compatible
59# to the other editors. 60# to the other editors.
60our @FIELD_ORDER_MAP = (qw( 61our @FIELD_ORDER_MAP = (qw(
62 file_format_version
61 name attach swap_time reset_timeout fixed_resettime difficulty region 63 name attach swap_time reset_timeout fixed_resettime difficulty region
62 shopitems shopgreed shopmin shopmax shoprace 64 shopitems shopgreed shopmin shopmax shoprace
63 darkness width height enter_x enter_y msg maplore 65 darkness width height enter_x enter_y msg maplore
64 unique template 66 unique template
65 outdoor temp pressure humid windspeed winddir sky nosmooth 67 outdoor temp pressure humid windspeed winddir sky nosmooth
66 tile_path_1 tile_path_2 tile_path_3 tile_path_4 68 tile_path_1 tile_path_2 tile_path_3 tile_path_4
67)); 69));
68 70
69our @FIELD_ORDER = (qw( 71our @FIELD_ORDER = (qw(
72 inherit
73
70 elevation 74 elevation
71 75
72 name name_pl custom_name attach title race 76 name name_pl custom_name attach title race
73 slaying skill msg lore other_arch face 77 slaying skill msg lore other_arch
74 #todo-events
75 animation is_animated 78 face animation is_animated
79 magicmap smoothlevel smoothface
76 str dex con wis pow cha int 80 str dex con wis pow cha int
77 hp maxhp sp maxsp grace maxgrace 81 hp maxhp sp maxsp grace maxgrace
78 exp perm_exp expmul 82 exp perm_exp expmul
79 food dam luck wc ac x y speed speed_left move_state attack_movement 83 food dam luck wc ac x y speed speed_left move_state attack_movement
80 nrof level direction type subtype attacktype 84 nrof level direction type subtype attacktype
… …
88 resist_life_stealing resist_disease 92 resist_life_stealing resist_disease
89 93
90 path_attuned path_repelled path_denied material materialname 94 path_attuned path_repelled path_denied material materialname
91 value carrying weight invisible state magic 95 value carrying weight invisible state magic
92 last_heal last_sp last_grace last_eat 96 last_heal last_sp last_grace last_eat
93 connected glow_radius randomitems npx_status npc_program 97 connected glow_radius randomitems tresure_env npx_status npc_program
94 run_away pick_up container will_apply smoothlevel 98 run_away pick_up container will_apply smoothlevel
95 current_weapon_script weapontype tooltype elevation client_type 99 current_weapon_script weapontype tooltype elevation client_type
96 item_power duration range 100 item_power duration range
97 range_modifier duration_modifier dam_modifier gen_sp_armour 101 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 102 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 113 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 114 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 115 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 116 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 117 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
118 precious
114 119
115 body_range body_arm body_torso body_head body_neck body_skill 120 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 121 body_finger body_shoulder body_foot body_hand body_wrist body_waist
117)); 122));
118 123
… …
135sub MOVE_FLY_LOW (){ 0x02 } 140sub MOVE_FLY_LOW (){ 0x02 }
136sub MOVE_FLY_HIGH (){ 0x04 } 141sub MOVE_FLY_HIGH (){ 0x04 }
137sub MOVE_FLYING (){ 0x06 } 142sub MOVE_FLYING (){ 0x06 }
138sub MOVE_SWIM (){ 0x08 } 143sub MOVE_SWIM (){ 0x08 }
139sub MOVE_BOAT (){ 0x10 } 144sub MOVE_BOAT (){ 0x10 }
145sub MOVE_SHIP (){ 0x20 }
140sub MOVE_KNOWN (){ 0x1f } # all of above 146sub MOVE_KNOWN (){ 0x3f } # all of above
141sub MOVE_ALLBIT (){ 0x10000 }
142sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 147sub MOVE_ALL (){ 0x10000 } # very special value
148
149our %MOVE_TYPE = (
150 walk => MOVE_WALK,
151 fly_low => MOVE_FLY_LOW,
152 fly_high => MOVE_FLY_HIGH,
153 flying => MOVE_FLYING,
154 swim => MOVE_SWIM,
155 boat => MOVE_BOAT,
156 ship => MOVE_SHIP,
157 all => MOVE_ALL,
158);
159
160our @MOVE_TYPE = keys %MOVE_TYPE;
161
162{
163 package Deliantra::MoveType;
164
165 use overload
166 '=' => sub { bless [@{$_[0]}], ref $_[0] },
167 '""' => \&as_string,
168 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
169 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
170 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
171 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
172 'x=' => sub {
173 my $cur = $_[0] >= $_[1];
174 if (!defined $cur) {
175 if ($_[0] >= "all") {
176 $_[0] -= $_[1];
177 } else {
178 $_[0] += $_[1];
179 }
180 } elsif ($cur) {
181 $_[0] -= $_[1];
182 } else {
183 $_[0] /= $_[1];
184 }
185
186 $_[0]
187 },
188 'eq' => sub { "$_[0]" eq "$_[1]" },
189 'ne' => sub { "$_[0]" ne "$_[1]" },
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" : "";
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"}) {
… …
247 slaying => delete $ob->{"event_${event}"}, 422 slaying => delete $ob->{"event_${event}"},
248 name => delete $ob->{"event_${event}_options"}, 423 name => delete $ob->{"event_${event}_options"},
249 }; 424 };
250 } 425 }
251 } 426 }
427
428 # some archetypes had "+3" instead of the canonical "3", so fix
429 $ob->{dam} *= 1 if exists $ob->{dam};
252 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
… …
301} 479}
302 480
303sub attr_thaw($) { 481sub attr_thaw($) {
304 my ($ob) = @_; 482 my ($ob) = @_;
305 483
306 $ob->{attach} = from_json $ob->{attach} 484 $ob->{attach} = decode_json $ob->{attach}
307 if exists $ob->{attach}; 485 if exists $ob->{attach};
308 486
309 $ob 487 $ob
310} 488}
311 489
312sub attr_freeze($) { 490sub attr_freeze($) {
313 my ($ob) = @_; 491 my ($ob) = @_;
314 492
315 $ob->{attach} = Crossfire::to_json $ob->{attach} 493 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
316 if exists $ob->{attach}; 494 if exists $ob->{attach};
317 495
318 $ob 496 $ob
319} 497}
320 498
… …
338sub read_arch($;$) { 516sub read_arch($;$) {
339 my ($path, $toplevel) = @_; 517 my ($path, $toplevel) = @_;
340 518
341 my %arc; 519 my %arc;
342 my ($more, $prev); 520 my ($more, $prev);
521 my $comment;
343 522
344 open my $fh, "<:raw:perlio:utf8", $path 523 open my $fh, "<:raw:perlio:utf8", $path
345 or Carp::croak "$path: $!"; 524 or Carp::croak "$path: $!";
346 525
347# binmode $fh; 526# binmode $fh;
… …
351 530
352 while (<$fh>) { 531 while (<$fh>) {
353 s/\s+$//; 532 s/\s+$//;
354 if (/^end$/i) { 533 if (/^end$/i) {
355 last; 534 last;
535
356 } elsif (/^arch (\S+)$/i) { 536 } elsif (/^arch (\S+)$/i) {
357 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 537 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
538
358 } elsif (/^lore$/i) { 539 } elsif (/^lore$/i) {
359 while (<$fh>) { 540 while (<$fh>) {
360 last if /^endlore\s*$/i; 541 last if /^endlore\s*$/i;
361 $arc{lore} .= $_; 542 $arc{lore} .= $_;
362 } 543 }
… …
371 chomp; 552 chomp;
372 push @{ $arc{anim} }, $_; 553 push @{ $arc{anim} }, $_;
373 } 554 }
374 } elsif (/^(\S+)\s*(.*)$/) { 555 } elsif (/^(\S+)\s*(.*)$/) {
375 $arc{lc $1} = $2; 556 $arc{lc $1} = $2;
376 } elsif (/^\s*($|#)/) { 557 } elsif (/^\s*#/) {
558 $arc{_comment} .= "$_\n";
559
560 } elsif (/^\s*$/) {
377 # 561 #
378 } else { 562 } else {
379 warn "$path: unparsable line '$_' in arch $arc{_name}"; 563 warn "$path: unparsable line '$_' in arch $arc{_name}";
380 } 564 }
381 } 565 }
… …
387 s/\s+$//; 571 s/\s+$//;
388 if (/^more$/i) { 572 if (/^more$/i) {
389 $more = $prev; 573 $more = $prev;
390 } elsif (/^object (\S+)$/i) { 574 } elsif (/^object (\S+)$/i) {
391 my $name = $1; 575 my $name = $1;
392 my $arc = attr_thaw normalize_object $parse_block->(_name => $name); 576 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
577 undef $comment;
578 delete $arc{_comment} unless length $arc{_comment};
579 $arc->{_atype} = 'object';
393 580
394 if ($more) { 581 if ($more) {
395 $more->{more} = $arc; 582 $more->{more} = $arc;
396 } else { 583 } else {
397 $arc{$name} = $arc; 584 $arc{$name} = $arc;
398 } 585 }
399 $prev = $arc; 586 $prev = $arc;
400 $more = undef; 587 $more = undef;
401 } elsif (/^arch (\S+)$/i) { 588 } elsif (/^arch (\S+)$/i) {
402 my $name = $1; 589 my $name = $1;
403 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 590 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
591 undef $comment;
592 delete $arc{_comment} unless length $arc{_comment};
593 $arc->{_atype} = 'arch';
404 594
405 if ($more) { 595 if ($more) {
406 $more->{more} = $arc; 596 $more->{more} = $arc;
407 } else { 597 } else {
408 push @{ $arc{arch} }, $arc; 598 push @{ $arc{arch} }, $arc;
… …
416 push @{$toplevel->{lev_array}}, $_+0; 606 push @{$toplevel->{lev_array}}, $_+0;
417 } 607 }
418 } else { 608 } else {
419 $toplevel->{$1} = $2; 609 $toplevel->{$1} = $2;
420 } 610 }
611 } elsif (/^\s*#/) {
612 $comment .= "$_\n";
421 } elsif (/^\s*($|#)/) { 613 } elsif (/^\s*($|#)/) {
422 # 614 #
423 } else { 615 } else {
424 die "$path: unparseable top-level line '$_'"; 616 die "$path: unparseable top-level line '$_'";
425 } 617 }
426 } 618 }
427 619
428 undef $parse_block; # work around bug in perl not freeing $fh etc. 620 undef $parse_block; # work around bug in perl not freeing $fh etc.
429 621
430 \%arc 622 \%arc
623}
624
625sub archlist_to_string {
626 my ($arch) = @_;
627
628 my $str;
629
630 my $append; $append = sub {
631 my %a = %{$_[0]};
632
633 Deliantra::attr_freeze \%a;
634 Deliantra::normalize_arch \%a;
635
636 # undo the bit-split we did before
637 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
638 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
639 | (delete $a{attack_movement_bits_4_7});
640 }
641
642 if (my $comment = delete $a{_comment}) {
643 if ($comment =~ /[^\n\s#]/) {
644 $str .= $comment;
645 }
646 }
647
648 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
649
650 my $inv = delete $a{inventory};
651 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
652 my $anim = delete $a{anim};
653
654 if ($a{_atype} eq 'object') {
655 $str .= join "\n", "anim", @$anim, "mina\n"
656 if $anim;
657 }
658
659 my @kv;
660
661 for ($a{_name} eq "map"
662 ? @Deliantra::FIELD_ORDER_MAP
663 : @Deliantra::FIELD_ORDER) {
664 push @kv, [$_, delete $a{$_}]
665 if exists $a{$_};
666 }
667
668 for (sort keys %a) {
669 next if /^_/; # ignore our _-keys
670 push @kv, [$_, delete $a{$_}];
671 }
672
673 for (@kv) {
674 my ($k, $v) = @$_;
675
676 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
677 $v =~ s/\n$//;
678 $str .= "$k\n$v\n$end\n";
679 } else {
680 $str .= "$k $v\n";
681 }
682 }
683
684 if ($inv) {
685 $append->($_) for @$inv;
686 }
687
688 $str .= "end\n";
689
690 if ($a{_atype} eq 'object') {
691 if ($more) {
692 $str .= "more\n";
693 $append->($more) if $more;
694 } else {
695 $str .= "\n";
696 }
697 }
698 };
699
700 for (@$arch) {
701 $append->($_);
702 }
703
704 $str
431} 705}
432 706
433# put all archs into a hash with editor_face as it's key 707# put all archs into a hash with editor_face as it's key
434# NOTE: the arrays in the hash values are references to 708# NOTE: the arrays in the hash values are references to
435# the archs from $ARCH 709# the archs from $ARCH
… …
456 my ($a) = @_; 730 my ($a) = @_;
457 731
458 my $o = $ARCH{$a->{_name}} 732 my $o = $ARCH{$a->{_name}}
459 or return; 733 or return;
460 734
461 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 735 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
736 unless ($face) {
737 $face = $FACE{"blank.x11"}
462 or (warn "no face data found for arch '$a->{_name}'"), return; 738 or (warn "no face data found for arch '$a->{_name}'"), return;
739 }
463 740
464 if ($face->{w} > 1 || $face->{h} > 1) { 741 if ($face->{w} > 1 || $face->{h} > 1) {
465 # bigface 742 # bigface
466 return (0, 0, $face->{w} - 1, $face->{h} - 1); 743 return (0, 0, $face->{w} - 1, $face->{h} - 1);
467 744
… …
500=cut 777=cut
501 778
502sub arch_attr($) { 779sub arch_attr($) {
503 my ($obj) = @_; 780 my ($obj) = @_;
504 781
505 require Crossfire::Data; 782 require Deliantra::Data;
506 783
507 my $root; 784 my $root;
508 my $attr = { }; 785 my $attr = { };
509 786
510 my $arch = $ARCH{ $obj->{_name} }; 787 my $arch = $ARCH{ $obj->{_name} };
511 my $type = $obj->{type} || $arch->{type}; 788 my $type = $obj->{type} || $arch->{type};
512 789
513 if ($type > 0) { 790 if ($type > 0) {
514 $root = $Crossfire::Data::ATTR{$type}; 791 $root = $Deliantra::Data::ATTR{$type};
515 } else { 792 } else {
516 my %a = (%$arch, %$obj); 793 my %a = (%$arch, %$obj);
517 794
518 if ($a{is_floor} && !$a{alive}) { 795 if ($a{is_floor} && !$a{alive}) {
519 $root = $Crossfire::Data::TYPE{Floor}; 796 $root = $Deliantra::Data::TYPE{Floor};
520 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 797 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
521 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 798 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
522 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 799 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
523 $root = $Crossfire::Data::TYPE{Wall}; 800 $root = $Deliantra::Data::TYPE{Wall};
524 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 801 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
525 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 802 $root = $Deliantra::Data::TYPE{"Weak Wall"};
526 } else { 803 } else {
527 $root = $Crossfire::Data::TYPE{Misc}; 804 $root = $Deliantra::Data::TYPE{Misc};
528 } 805 }
529 } 806 }
530 807
531 my @import = ($root); 808 my @import = ($root);
532 809
533 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 810 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
534 unless $type == 116; 811 unless $type == 116;
535 812
536 my (%ignore); 813 my (%ignore);
537 my (@section_order, %section, @attr_order); 814 my (@section_order, %section, @attr_order);
538 815
539 while (my $type = shift @import) { 816 while (my $type = shift @import) {
817 push @import,
818 grep $_,
819 map $Deliantra::Data::TYPE{$_},
540 push @import, @{$type->{import} || []}; 820 @{$type->{import} || []};
541 821
542 $attr->{$_} ||= $type->{$_} 822 $attr->{$_} ||= $type->{$_}
543 for qw(name desc use); 823 for qw(name desc use);
544 824
545 for (@{$type->{ignore} || []}) { 825 for (@{$type->{ignore} || []}) {
… …
574 ]; 854 ];
575 855
576 $attr 856 $attr
577} 857}
578 858
579sub arch_edit_sections {
580# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
581# edit_type = 0;
582# else if (edit_type != 0) {
583# // all flags from 'check_type' must be unset in this arch because they get recalculated now
584# edit_type &= ~check_type;
585# }
586#
587# }
588# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
589# getAttributeValue("alive", defarch) == 1 &&
590# (getAttributeValue("monster", defarch) == 1 ||
591# getAttributeValue("generator", defarch) == 1)) {
592# // Monster: monsters/npcs/generators
593# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
594# }
595# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
596# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
597# // Walls
598# edit_type |= IGUIConstants.TILE_EDIT_WALL;
599# }
600# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
601# getAttributeValue("connected", defarch) != 0) {
602# // Connected Objects
603# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
604# }
605# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
606# arch_type == 66 || arch_type == 41 || arch_type == 95) {
607# // Exit: teleporter/exit/trapdoors
608# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
609# }
610# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
611# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
612# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
613# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
614# arch_type == 124 || arch_type == 130)) {
615# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
616# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
617# }
618# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
619# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
620# arch_type == 91 || arch_type == 21 || arch_type == 24) {
621# // Door: door/special door/gates + keys
622# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
623# }
624# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
625# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
626# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
627# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
628# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
629# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
630# arch_type == 122 || arch_type == 3)) {
631# // Equipment: weapons/armour/wands/rods
632# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
633# }
634#
635# return(edit_type);
636#
637#
638}
639
640sub cache_file($$&&) { 859sub cache_file($$&&) {
641 my ($src, $cache, $load, $create) = @_; 860 my ($src, $cache, $load, $create) = @_;
642 861
643 my ($size, $mtime) = (stat $src)[7,9] 862 my ($size, $mtime) = (stat $src)[7,9]
644 or Carp::croak "$src: $!"; 863 or Carp::croak "$src: $!";
… …
692 }, sub { 911 }, sub {
693 read_arch "$LIB/archetypes" 912 read_arch "$LIB/archetypes"
694 }; 913 };
695} 914}
696 915
916sub construct_tilecache_pb {
917 my ($idx, $cache) = @_;
918
919 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
920
921 while (my ($name, $tile) = each %$cache) {
922 my $tpb = delete $tile->{pb};
923 my $ofs = $tile->{idx};
924
925 for my $x (0 .. $tile->{w} - 1) {
926 for my $y (0 .. $tile->{h} - 1) {
927 my $idx = $ofs + $x + $y * $tile->{w};
928 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
929 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
930 }
931 }
932 }
933
934 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
935
936 $cache
937}
938
939sub use_tilecache {
940 my ($face) = @_;
941 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
942 or die "$VARDIR/tilecache.png: $!";
943 *FACE = $_[0];
944}
945
697=item load_tilecache 946=item load_tilecache
698 947
699(Re-)Load %TILE and %FACE. 948(Re-)Load %TILE and %FACE.
700 949
701=cut 950=cut
702 951
703sub load_tilecache() { 952sub load_tilecache() {
704 require Gtk2; 953 require Gtk2;
705 954
706 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 955 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
707 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
708 or die "$VARDIR/tilecache.png: $!";
709 *FACE = $_[0];
710 }, sub { 956 sub {
711 my $tile = read_pak "$LIB/crossfire.0";
712
713 my %cache; 957 my %cache;
958 my $facedata = Storable::retrieve "$LIB/facedata";
714 959
960 $facedata->{version} == 2
961 or die "$LIB/facedata: version mismatch, cannot proceed.";
962
963 my $faces = $facedata->{faceinfo};
715 my $idx = 0; 964 my $idx = 0;
716 965
717 for my $name (sort keys %$tile) { 966 for (sort keys %$faces) {
967 my ($face, $info) = ($_, $faces->{$_});
968
718 my $pb = new Gtk2::Gdk::PixbufLoader; 969 my $pb = new Gtk2::Gdk::PixbufLoader;
719 $pb->write ($tile->{$name}); 970 $pb->write ($info->{data32});
720 $pb->close; 971 $pb->close;
721 my $pb = $pb->get_pixbuf; 972 my $pb = $pb->get_pixbuf;
722 973
723 my $tile = $cache{$name} = { 974 my $tile = $cache{$face} = {
724 pb => $pb, 975 pb => $pb,
725 idx => $idx, 976 idx => $idx,
726 w => int $pb->get_width / TILESIZE, 977 w => int $pb->get_width / TILESIZE,
727 h => int $pb->get_height / TILESIZE, 978 h => int $pb->get_height / TILESIZE,
728 }; 979 };
729
730 980
731 $idx += $tile->{w} * $tile->{h}; 981 $idx += $tile->{w} * $tile->{h};
982 }
983
984 construct_tilecache_pb $idx, \%cache;
985
986 \%cache
732 } 987 };
733
734 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
735
736 while (my ($name, $tile) = each %cache) {
737 my $tpb = delete $tile->{pb};
738 my $ofs = $tile->{idx};
739
740 for my $x (0 .. $tile->{w} - 1) {
741 for my $y (0 .. $tile->{h} - 1) {
742 my $idx = $ofs + $x + $y * $tile->{w};
743 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
744 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
745 }
746 }
747 }
748
749 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
750
751 \%cache
752 };
753} 988}
754 989
755=head1 AUTHOR 990=head1 AUTHOR
756 991
757 Marc Lehmann <schmorp@schmorp.de> 992 Marc Lehmann <schmorp@schmorp.de>
… …
761 http://www.ta-sa.org/ 996 http://www.ta-sa.org/
762 997
763=cut 998=cut
764 999
7651 10001
1001

Diff Legend

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