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

Diff Legend

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