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.59 by root, Sun Mar 26 11:52:31 2006 UTC vs.
Revision 1.137 by root, Tue Dec 15 01:44:06 2009 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire - Crossfire maphandling 3Deliantra - Deliantra suppport module to read/write archetypes, maps etc.
4
5=over 4
4 6
5=cut 7=cut
6 8
7package Crossfire; 9package Deliantra;
8 10
9our $VERSION = '0.1'; 11our $VERSION = '1.25';
10 12
11use strict; 13use common::sense;
12 14
13use base 'Exporter'; 15use base 'Exporter';
14 16
15use Carp (); 17use Carp ();
16use File::Spec; 18use File::Spec;
17use List::Util qw(min max); 19use List::Util qw(min max);
18use Storable qw(freeze thaw); 20use Storable qw(freeze thaw);
19 21
20our @EXPORT = qw( 22our @EXPORT = qw(
21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents 23 read_pak read_arch
24 *ARCH $TILE *FACE *FACEDATA
25 TILESIZE CACHESTRIDE
26 editor_archs arch_extents
22); 27);
23 28
29use JSON::XS qw(decode_json encode_json);
30
24our $LIB = $ENV{CROSSFIRE_LIBDIR}; 31our $LIB = $ENV{DELIANTRA_LIBDIR};
25 32
26our $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";
27 36
28mkdir $VARDIR, 0777; 37mkdir $VARDIR, 0777;
29 38
30sub TILESIZE (){ 32 } 39sub TILESIZE (){ 32 }
40sub CACHESTRIDE (){ 64 }
31 41
32our %ARCH; 42our %ARCH;
43our %FACE; # face32
33our %FACE; 44our %FACEDATA;
34our $TILE; 45our $TILE;
35 46
36our %FIELD_MULTILINE = ( 47our %FIELD_MULTILINE = (
37 msg => "endmsg", 48 msg => "endmsg",
38 lore => "endlore", 49 lore => "endlore",
… …
44 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);
45 56
46# same as in server save routine, to (hopefully) be compatible 57# same as in server save routine, to (hopefully) be compatible
47# to the other editors. 58# to the other editors.
48our @FIELD_ORDER_MAP = (qw( 59our @FIELD_ORDER_MAP = (qw(
60 file_format_version
49 name swap_time reset_timeout fixed_resettime difficulty region 61 name attach swap_time reset_timeout fixed_resettime difficulty region
50 shopitems shopgreed shopmin shopmax shoprace 62 shopitems shopgreed shopmin shopmax shoprace
51 darkness width height enter_x enter_y msg maplore 63 darkness width height enter_x enter_y msg maplore
52 unique template 64 unique template
53 outdoor temp pressure humid windspeed winddir sky nosmooth 65 outdoor temp pressure humid windspeed winddir sky nosmooth
54 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
55)); 67));
56 68
57our @FIELD_ORDER = (qw( 69our @FIELD_ORDER = (qw(
70 inherit
71
58 elevation 72 elevation
59 73
60 name name_pl custom_name title race 74 name name_pl custom_name attach title race
61 slaying skill msg lore other_arch face 75 slaying skill msg lore other_arch
62 #todo-events 76 sound sound_destroy face animation is_animated
63 animation is_animated 77 magicmap smoothlevel smoothface
64 str dex con wis pow cha int 78 str dex con wis pow cha int
65 hp maxhp sp maxsp grace maxgrace 79 hp maxhp sp maxsp grace maxgrace
66 exp perm_exp expmul 80 exp perm_exp expmul
67 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
68 nrof level direction type subtype attacktype 82 nrof level direction type subtype attacktype
… …
76 resist_life_stealing resist_disease 90 resist_life_stealing resist_disease
77 91
78 path_attuned path_repelled path_denied material materialname 92 path_attuned path_repelled path_denied material materialname
79 value carrying weight invisible state magic 93 value carrying weight invisible state magic
80 last_heal last_sp last_grace last_eat 94 last_heal last_sp last_grace last_eat
81 connected glow_radius randomitems npx_status npc_program 95 connected glow_radius randomitems tresure_env npx_status npc_program
82 run_away pick_up container will_apply smoothlevel 96 run_away pick_up container will_apply smoothlevel
83 current_weapon_script weapontype tooltype elevation client_type 97 current_weapon_script weapontype tooltype elevation client_type
84 item_power duration range 98 item_power duration range
85 range_modifier duration_modifier dam_modifier gen_sp_armour 99 range_modifier duration_modifier dam_modifier gen_sp_armour
86 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
… …
97 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
98 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
99 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
100 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
101 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
102 117
103 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
104 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
105)); 120));
121
122our %EVENT_TYPE = (
123 apply => 1,
124 attack => 2,
125 death => 3,
126 drop => 4,
127 pickup => 5,
128 say => 6,
129 stop => 7,
130 time => 8,
131 throw => 9,
132 trigger => 10,
133 close => 11,
134 timer => 12,
135);
106 136
107sub MOVE_WALK (){ 0x01 } 137sub MOVE_WALK (){ 0x01 }
108sub MOVE_FLY_LOW (){ 0x02 } 138sub MOVE_FLY_LOW (){ 0x02 }
109sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
110sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
111sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
112sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
143sub MOVE_SHIP (){ 0x20 }
113sub MOVE_KNOWN (){ 0x1f } # all of above 144sub MOVE_KNOWN (){ 0x3f } # all of above
114sub MOVE_ALLBIT (){ 0x10000 }
115sub 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}
116 255
117sub load_ref($) { 256sub load_ref($) {
118 my ($path) = @_; 257 my ($path) = @_;
119 258
120 open my $fh, "<", $path 259 open my $fh, "<:raw:perlio", $path
121 or die "$path: $!"; 260 or die "$path: $!";
122 binmode $fh;
123 local $/; 261 local $/;
124 262
125 thaw <$fh> 263 thaw <$fh>
126} 264}
127 265
128sub save_ref($$) { 266sub save_ref($$) {
129 my ($ref, $path) = @_; 267 my ($ref, $path) = @_;
130 268
131 open my $fh, ">", "$path~" 269 open my $fh, ">:raw:perlio", "$path~"
132 or die "$path~: $!"; 270 or die "$path~: $!";
133 binmode $fh;
134 print $fh freeze $ref; 271 print $fh freeze $ref;
135 close $fh; 272 close $fh;
136 rename "$path~", $path 273 rename "$path~", $path
137 or die "$path: $!"; 274 or die "$path: $!";
138} 275}
139 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
345# object as in "Object xxx", i.e. archetypes
140sub normalize_object($) { 346sub normalize_object($) {
141 my ($ob) = @_; 347 my ($ob) = @_;
142 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
384 # nuke outdated or never supported fields
143 delete $ob->{$_} for qw( 385 delete @$ob{qw(
144 can_knockback can_parry can_impale can_cut can_dam_armour 386 can_knockback can_parry can_impale can_cut can_dam_armour
145 can_apply pass_thru can_pass_thru 387 can_apply pass_thru can_pass_thru color_bg color_fg
146 ); 388 )};
147 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; }
393
394 # convert movement strings to bitsets
148 for my $attr (keys %FIELD_MOVEMENT) { 395 for my $attr (keys %FIELD_MOVEMENT) {
149 next unless exists $ob->{$attr}; 396 next unless exists $ob->{$attr};
150 397
151 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 398 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
152
153 next if $ob->{$attr} =~ /^\d+$/;
154
155 my $flags = 0;
156
157 # assume list
158 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
159 $flags |= MOVE_WALK if $flag eq "walk";
160 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
161 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
162 $flags |= MOVE_FLYING if $flag eq "flying";
163 $flags |= MOVE_SWIM if $flag eq "swim";
164 $flags |= MOVE_BOAT if $flag eq "boat";
165 $flags |= MOVE_ALL if $flag eq "all";
166
167 $flags &= ~MOVE_WALK if $flag eq "-walk";
168 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
169 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
170 $flags &= ~MOVE_FLYING if $flag eq "-flying";
171 $flags &= ~MOVE_SWIM if $flag eq "-swim";
172 $flags &= ~MOVE_BOAT if $flag eq "-boat";
173 $flags &= ~MOVE_ALL if $flag eq "-all";
174 }
175
176 $ob->{$attr} = $flags;
177 } 399 }
178 400
401 # convert outdated movement flags to new movement sets
179 if (defined (my $v = delete $ob->{no_pass})) { 402 if (defined (my $v = delete $ob->{no_pass})) {
180 $ob->{move_block} = $v ? MOVE_ALL : 0; 403 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
181 } 404 }
182 if (defined (my $v = delete $ob->{slow_move})) { 405 if (defined (my $v = delete $ob->{slow_move})) {
183 $ob->{move_slow} |= MOVE_WALK; 406 $ob->{move_slow} += "walk";
184 $ob->{move_slow_penalty} = $v; 407 $ob->{move_slow_penalty} = $v;
185 } 408 }
186 if (defined (my $v = delete $ob->{walk_on})) { 409 if (defined (my $v = delete $ob->{walk_on})) {
187 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 410 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
188 : $ob->{move_on} & ~MOVE_WALK;
189 } 411 }
190 if (defined (my $v = delete $ob->{walk_off})) { 412 if (defined (my $v = delete $ob->{walk_off})) {
191 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 413 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
192 : $ob->{move_off} & ~MOVE_WALK;
193 } 414 }
194 if (defined (my $v = delete $ob->{fly_on})) { 415 if (defined (my $v = delete $ob->{fly_on})) {
195 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 416 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
196 : $ob->{move_on} & ~MOVE_FLY_LOW;
197 } 417 }
198 if (defined (my $v = delete $ob->{fly_off})) { 418 if (defined (my $v = delete $ob->{fly_off})) {
199 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 419 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
200 : $ob->{move_off} & ~MOVE_FLY_LOW;
201 } 420 }
202 if (defined (my $v = delete $ob->{flying})) { 421 if (defined (my $v = delete $ob->{flying})) {
203 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 422 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
204 : $ob->{move_type} & ~MOVE_FLY_LOW;
205 } 423 }
424
425 # convert idiotic event_xxx things into objects
426 while (my ($event, $subtype) = each %EVENT_TYPE) {
427 if (exists $ob->{"event_${event}_plugin"}) {
428 push @{$ob->{inventory}}, {
429 _name => "event_$event",
430 title => delete $ob->{"event_${event}_plugin"},
431 slaying => delete $ob->{"event_${event}"},
432 name => delete $ob->{"event_${event}_options"},
433 };
434 }
435 }
436
437 # some archetypes had "+3" instead of the canonical "3", so fix
438 $ob->{dam} *= 1 if exists $ob->{dam};
206 439
207 $ob 440 $ob
208} 441}
209 442
443# arch as in "arch xxx", ie.. objects
210sub normalize_arch($) { 444sub normalize_arch($) {
211 my ($ob) = @_; 445 my ($ob) = @_;
212 446
213 normalize_object $ob; 447 normalize_object $ob;
448
449 return if $ob->{_atype} eq "object";
214 450
215 my $arch = $ARCH{$ob->{_name}} 451 my $arch = $ARCH{$ob->{_name}}
216 or (warn "$ob->{_name}: no such archetype", return $ob); 452 or (warn "$ob->{_name}: no such archetype", return $ob);
217 453
218 if ($arch->{type} == 22) { # map 454 if ($arch->{type} == 22) { # map
… …
251 } 487 }
252 488
253 $ob 489 $ob
254} 490}
255 491
492sub attr_thaw($) {
493 my ($ob) = @_;
494
495 $ob->{attach} = decode_json $ob->{attach}
496 if exists $ob->{attach};
497
498 $ob
499}
500
501sub attr_freeze($) {
502 my ($ob) = @_;
503
504 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
505 if exists $ob->{attach};
506
507 $ob
508}
509
256sub read_pak($) { 510sub read_pak($) {
257 my ($path) = @_; 511 my ($path) = @_;
258 512
259 my %pak; 513 my %pak;
260 514
261 open my $fh, "<", $path 515 open my $fh, "<:raw:perlio", $path
262 or Carp::croak "$_[0]: $!"; 516 or Carp::croak "$_[0]: $!";
263 binmode $fh; 517 binmode $fh;
264 while (<$fh>) { 518 while (<$fh>) {
265 my ($type, $id, $len, $path) = split; 519 my ($type, $id, $len, $path) = split;
266 $path =~ s/.*\///; 520 $path =~ s/.*\///;
… …
268 } 522 }
269 523
270 \%pak 524 \%pak
271} 525}
272 526
273sub read_arch($) { 527sub read_arch($;$) {
274 my ($path) = @_; 528 my ($path, $toplevel) = @_;
275 529
276 my %arc; 530 my %arc;
277 my ($more, $prev); 531 my ($more, $prev);
532 my $comment;
278 533
279 open my $fh, "<", $path 534 open my $fh, "<:utf8", $path
280 or Carp::croak "$path: $!"; 535 or Carp::croak "$path: $!";
281 536
282 binmode $fh; 537# binmode $fh;
283 538
284 my $parse_block; $parse_block = sub { 539 my $parse_block; $parse_block = sub {
285 my %arc = @_; 540 my %arc = @_;
286 541
287 while (<$fh>) { 542 while (<$fh>) {
288 s/\s+$//; 543 s/\s+$//;
289 if (/^end$/i) { 544 if (/^end$/i) {
290 last; 545 last;
546
291 } elsif (/^arch (\S+)$/i) { 547 } elsif (/^arch (\S+)$/i) {
292 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 548 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
549
293 } elsif (/^lore$/i) { 550 } elsif (/^lore$/i) {
294 while (<$fh>) { 551 while (<$fh>) {
295 last if /^endlore\s*$/i; 552 last if /^endlore\s*$/i;
296 $arc{lore} .= $_; 553 $arc{lore} .= $_;
297 } 554 }
298 } elsif (/^msg$/i) { 555 } elsif (/^msg$/i) {
299 while (<$fh>) { 556 while (<$fh>) {
300 last if /^endmsg\s*$/i; 557 last if /^endmsg\s*$/i;
301 $arc{msg} .= $_; 558 $arc{msg} .= $_;
302 } 559 }
560 } elsif (/^anim$/i) {
561 while (<$fh>) {
562 last if /^mina\s*$/i;
563 chomp;
564 push @{ $arc{anim} }, $_;
565 }
303 } elsif (/^(\S+)\s*(.*)$/) { 566 } elsif (/^(\S+)\s*(.*)$/) {
304 $arc{lc $1} = $2; 567 $arc{lc $1} = $2;
305 } elsif (/^\s*($|#)/) { 568 } elsif (/^\s*#/) {
569 $arc{_comment} .= "$_\n";
570
571 } elsif (/^\s*$/) {
306 # 572 #
307 } else { 573 } else {
308 warn "$path: unparsable line '$_' in arch $arc{_name}"; 574 warn "$path: unparsable line '$_' in arch $arc{_name}";
309 } 575 }
310 } 576 }
… …
316 s/\s+$//; 582 s/\s+$//;
317 if (/^more$/i) { 583 if (/^more$/i) {
318 $more = $prev; 584 $more = $prev;
319 } elsif (/^object (\S+)$/i) { 585 } elsif (/^object (\S+)$/i) {
320 my $name = $1; 586 my $name = $1;
321 my $arc = 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};
590 $arc->{_atype} = 'object';
322 591
323 if ($more) { 592 if ($more) {
324 $more->{more} = $arc; 593 $more->{more} = $arc;
325 } else { 594 } else {
326 $arc{$name} = $arc; 595 $arc{$name} = $arc;
327 } 596 }
328 $prev = $arc; 597 $prev = $arc;
329 $more = undef; 598 $more = undef;
330 } elsif (/^arch (\S+)$/i) { 599 } elsif (/^arch (\S+)$/i) {
331 my $name = $1; 600 my $name = $1;
332 my $arc = 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};
604 $arc->{_atype} = 'arch';
333 605
334 if ($more) { 606 if ($more) {
335 $more->{more} = $arc; 607 $more->{more} = $arc;
336 } else { 608 } else {
337 push @{ $arc{arch} }, $arc; 609 push @{ $arc{arch} }, $arc;
338 } 610 }
339 $prev = $arc; 611 $prev = $arc;
340 $more = undef; 612 $more = undef;
613 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
614 if ($1 eq "lev_array") {
615 while (<$fh>) {
616 last if /^endplst\s*$/;
617 push @{$toplevel->{lev_array}}, $_+0;
618 }
619 } else {
620 $toplevel->{$1} = $2;
621 }
622 } elsif (/^\s*#/) {
623 $comment .= "$_\n";
341 } elsif (/^\s*($|#)/) { 624 } elsif (/^\s*($|#)/) {
342 # 625 #
343 } else { 626 } else {
344 warn "$path: unparseable top-level line '$_'"; 627 die "$path: unparseable top-level line '$_'";
345 } 628 }
346 } 629 }
347 630
348 undef $parse_block; # work around bug in perl not freeing $fh etc. 631 undef $parse_block; # work around bug in perl not freeing $fh etc.
349 632
350 \%arc 633 \%arc
634}
635
636sub archlist_to_string {
637 my ($arch) = @_;
638
639 my $str;
640
641 my $append; $append = sub {
642 my %a = %{$_[0]};
643
644 Deliantra::attr_freeze \%a;
645 Deliantra::normalize_arch \%a;
646
647 # undo the bit-split we did before
648 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
649 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
650 | (delete $a{attack_movement_bits_4_7});
651 }
652
653 if (my $comment = delete $a{_comment}) {
654 if ($comment =~ /[^\n\s#]/) {
655 $str .= $comment;
656 }
657 }
658
659 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
660
661 my $inv = delete $a{inventory};
662 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
663 my $anim = delete $a{anim};
664
665 if ($a{_atype} eq 'object') {
666 $str .= join "\n", "anim", @$anim, "mina\n"
667 if $anim;
668 }
669
670 my @kv;
671
672 for ($a{_name} eq "map"
673 ? @Deliantra::FIELD_ORDER_MAP
674 : @Deliantra::FIELD_ORDER) {
675 push @kv, [$_, delete $a{$_}]
676 if exists $a{$_};
677 }
678
679 for (sort keys %a) {
680 next if /^_/; # ignore our _-keys
681 push @kv, [$_, delete $a{$_}];
682 }
683
684 for (@kv) {
685 my ($k, $v) = @$_;
686
687 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
688 $v =~ s/\n$//;
689 $str .= "$k\n$v\n$end\n";
690 } else {
691 $str .= "$k $v\n";
692 }
693 }
694
695 if ($inv) {
696 $append->($_) for @$inv;
697 }
698
699 $str .= "end\n";
700
701 if ($a{_atype} eq 'object') {
702 if ($more) {
703 $str .= "more\n";
704 $append->($more) if $more;
705 } else {
706 $str .= "\n";
707 }
708 }
709 };
710
711 for (@$arch) {
712 $append->($_);
713 }
714
715 $str
351} 716}
352 717
353# put all archs into a hash with editor_face as it's key 718# put all archs into a hash with editor_face as it's key
354# NOTE: the arrays in the hash values are references to 719# NOTE: the arrays in the hash values are references to
355# the archs from $ARCH 720# the archs from $ARCH
356sub editor_archs { 721sub editor_archs {
357 my %paths; 722 my %paths;
358 723
359 for (keys %ARCH) { 724 for (keys %ARCH) {
360 my $arch = $ARCH{$_}; 725 my $arch = $ARCH{$_};
361 push @{$paths{$arch->{editor_folder}}}, \$arch; 726 push @{$paths{$arch->{editor_folder}}}, $arch;
362 } 727 }
363 728
364 \%paths 729 \%paths
365} 730}
366 731
… …
376 my ($a) = @_; 741 my ($a) = @_;
377 742
378 my $o = $ARCH{$a->{_name}} 743 my $o = $ARCH{$a->{_name}}
379 or return; 744 or return;
380 745
381 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"}
382 or (warn "no face data found for arch '$a->{_name}'"), return; 749 or (warn "no face data found for arch '$a->{_name}'"), return;
750 }
383 751
384 if ($face->{w} > 1 || $face->{h} > 1) { 752 if ($face->{w} > 1 || $face->{h} > 1) {
385 # bigface 753 # bigface
386 return (0, 0, $face->{w} - 1, $face->{h} - 1); 754 return (0, 0, $face->{w} - 1, $face->{h} - 1);
387 755
… …
420=cut 788=cut
421 789
422sub arch_attr($) { 790sub arch_attr($) {
423 my ($obj) = @_; 791 my ($obj) = @_;
424 792
425 require Crossfire::Data; 793 require Deliantra::Data;
426 794
427 my $root; 795 my $root;
428 my $attr = { }; 796 my $attr = { };
429 797
430 my $arch = $ARCH{ $obj->{_name} }; 798 my $arch = $ARCH{ $obj->{_name} };
431 my $type = $obj->{type} || $arch->{type}; 799 my $type = $obj->{type} || $arch->{type};
432 800
433 if ($type > 0) { 801 if ($type > 0) {
434 $root = $Crossfire::Data::ATTR{$type}; 802 $root = $Deliantra::Data::ATTR{$type};
435 } else { 803 } else {
804 my %a = (%$arch, %$obj);
805
806 if ($a{is_floor} && !$a{alive}) {
807 $root = $Deliantra::Data::TYPE{Floor};
808 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
809 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
810 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
811 $root = $Deliantra::Data::TYPE{Wall};
812 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
813 $root = $Deliantra::Data::TYPE{"Weak Wall"};
814 } else {
436 $root = $Crossfire::Data::TYPE{Misc}; 815 $root = $Deliantra::Data::TYPE{Misc};
437
438 type:
439 for (@Crossfire::Data::ATTR0) {
440 my $req = $_->{required}
441 or die "internal error: ATTR0 without 'required'";
442
443 keys %$req;
444 while (my ($k, $v) = each %$req) {
445 next type
446 unless $obj->{$k} == $v || $arch->{$k} == $v;
447 }
448
449 $root = $_;
450 } 816 }
451 } 817 }
452 818
453 my @import = ($root); 819 my @import = ($root);
454 820
455 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 821 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
456 unless $type == 116; 822 unless $type == 116;
457 823
458 my (%ignore); 824 my (%ignore);
459 my (@section_order, %section, @attr_order); 825 my (@section_order, %section, @attr_order);
460 826
461 while (my $type = shift @import) { 827 while (my $type = shift @import) {
828 push @import,
829 grep $_,
830 map $Deliantra::Data::TYPE{$_},
462 push @import, @{$type->{import} || []}; 831 @{$type->{import} || []};
463 832
464 $attr->{$_} ||= $type->{$_} 833 $attr->{$_} ||= $type->{$_}
465 for qw(name desc use); 834 for qw(name desc use);
466 835
467 for (@{$type->{ignore} || []}) { 836 for (@{$type->{ignore} || []}) {
… …
496 ]; 865 ];
497 866
498 $attr 867 $attr
499} 868}
500 869
501sub arch_edit_sections {
502# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
503# edit_type = 0;
504# else if (edit_type != 0) {
505# // all flags from 'check_type' must be unset in this arch because they get recalculated now
506# edit_type &= ~check_type;
507# }
508#
509# }
510# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
511# getAttributeValue("alive", defarch) == 1 &&
512# (getAttributeValue("monster", defarch) == 1 ||
513# getAttributeValue("generator", defarch) == 1)) {
514# // Monster: monsters/npcs/generators
515# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
516# }
517# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
518# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
519# // Walls
520# edit_type |= IGUIConstants.TILE_EDIT_WALL;
521# }
522# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
523# getAttributeValue("connected", defarch) != 0) {
524# // Connected Objects
525# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
526# }
527# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
528# arch_type == 66 || arch_type == 41 || arch_type == 95) {
529# // Exit: teleporter/exit/trapdoors
530# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
531# }
532# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
533# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
534# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
535# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
536# arch_type == 124 || arch_type == 130)) {
537# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
538# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
539# }
540# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
541# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
542# arch_type == 91 || arch_type == 21 || arch_type == 24) {
543# // Door: door/special door/gates + keys
544# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
545# }
546# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
547# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
548# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
549# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
550# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
551# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
552# arch_type == 122 || arch_type == 3)) {
553# // Equipment: weapons/armour/wands/rods
554# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
555# }
556#
557# return(edit_type);
558#
559#
560}
561
562sub cache_file($$&&) { 870sub cache_file($$&&) {
563 my ($src, $cache, $load, $create) = @_; 871 my ($src, $cache, $load, $create) = @_;
564 872
565 my ($size, $mtime) = (stat $src)[7,9] 873 my ($size, $mtime) = (stat $src)[7,9]
566 or Carp::croak "$src: $!"; 874 or Carp::croak "$src: $!";
… …
614 }, sub { 922 }, sub {
615 read_arch "$LIB/archetypes" 923 read_arch "$LIB/archetypes"
616 }; 924 };
617} 925}
618 926
927sub construct_tilecache_pb {
928 my ($idx, $cache) = @_;
929
930 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
931
932 while (my ($name, $tile) = each %$cache) {
933 my $tpb = delete $tile->{pb};
934 my $ofs = $tile->{idx};
935
936 for my $x (0 .. $tile->{w} - 1) {
937 for my $y (0 .. $tile->{h} - 1) {
938 my $idx = $ofs + $x + $y * $tile->{w};
939 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
940 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
941 }
942 }
943 }
944
945 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
946
947 $cache
948}
949
950sub use_tilecache {
951 my ($face) = @_;
952 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
953 or die "$VARDIR/tilecache.png: $!";
954 *FACE = $_[0];
955}
956
619=item load_tilecache 957=item load_tilecache
620 958
621(Re-)Load %TILE and %FACE. 959(Re-)Load %TILE and %FACE.
622 960
623=cut 961=cut
624 962
625sub load_tilecache() { 963sub load_tilecache() {
626 require Gtk2; 964 require Gtk2;
627 965
628 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 966 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
629 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
630 or die "$VARDIR/tilecache.png: $!";
631 *FACE = $_[0];
632 }, sub { 967 sub {
633 require File::Temp;
634
635 my $tile = read_pak "$LIB/crossfire.0";
636
637 my %cache; 968 my %cache;
969 my $facedata = Storable::retrieve "$LIB/facedata";
638 970
971 $facedata->{version} == 2
972 or die "$LIB/facedata: version mismatch, cannot proceed.";
973
974 my $faces = $facedata->{faceinfo};
639 my $idx = 0; 975 my $idx = 0;
640 976
641 for my $name (sort keys %$tile) { 977 for (sort keys %$faces) {
642 my ($fh, $filename) = File::Temp::tempfile (); 978 my ($face, $info) = ($_, $faces->{$_});
643 print $fh $tile->{$name}; 979
644 close $fh;
645 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 980 my $pb = new Gtk2::Gdk::PixbufLoader;
646 unlink $filename; 981 $pb->write ($info->{data32});
982 $pb->close;
983 my $pb = $pb->get_pixbuf;
647 984
648 my $tile = $cache{$name} = { 985 my $tile = $cache{$face} = {
649 pb => $pb, 986 pb => $pb,
650 idx => $idx, 987 idx => $idx,
651 w => int $pb->get_width / TILESIZE, 988 w => int $pb->get_width / TILESIZE,
652 h => int $pb->get_height / TILESIZE, 989 h => int $pb->get_height / TILESIZE,
653 }; 990 };
654
655 991
656 $idx += $tile->{w} * $tile->{h}; 992 $idx += $tile->{w} * $tile->{h};
993 }
994
995 construct_tilecache_pb $idx, \%cache;
996
997 \%cache
657 } 998 };
658
659 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
660
661 while (my ($name, $tile) = each %cache) {
662 my $tpb = delete $tile->{pb};
663 my $ofs = $tile->{idx};
664
665 for my $x (0 .. $tile->{w} - 1) {
666 for my $y (0 .. $tile->{h} - 1) {
667 my $idx = $ofs + $x + $y * $tile->{w};
668 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
669 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
670 }
671 }
672 }
673
674 $pb->save ("$VARDIR/tilecache.png", "png");
675
676 \%cache
677 };
678} 999}
1000
1001=back
679 1002
680=head1 AUTHOR 1003=head1 AUTHOR
681 1004
682 Marc Lehmann <schmorp@schmorp.de> 1005 Marc Lehmann <schmorp@schmorp.de>
683 http://home.schmorp.de/ 1006 http://home.schmorp.de/
… …
686 http://www.ta-sa.org/ 1009 http://www.ta-sa.org/
687 1010
688=cut 1011=cut
689 1012
6901 10131
1014

Diff Legend

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