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.63 by root, Fri Mar 31 21:06:47 2006 UTC vs.
Revision 1.147 by root, Wed Nov 7 12:04:36 2018 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 = '2.01';
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
62 region music
50 shopitems shopgreed shopmin shopmax shoprace 63 shopitems shopgreed shopmin shopmax shoprace
51 darkness width height enter_x enter_y msg maplore 64 darkness width height enter_x enter_y msg maplore
52 unique template 65 unique template
53 outdoor temp pressure humid windspeed winddir sky nosmooth 66 outdoor temp pressure humid windspeed winddir sky nosmooth
54 tile_path_1 tile_path_2 tile_path_3 tile_path_4 67 tile_path_1 tile_path_2 tile_path_3 tile_path_4
55)); 68));
56 69
57our @FIELD_ORDER = (qw( 70our @FIELD_ORDER = (qw(
71 inherit
72
58 elevation 73 elevation
59 74
60 name name_pl custom_name title race 75 name name_pl custom_name attach title race
61 slaying skill msg lore other_arch face 76 slaying skill msg lore other_arch
62 #todo-events 77 sound sound_destroy face animation is_animated
63 animation is_animated 78 magicmap glyph smoothlevel smoothface
64 str dex con wis pow cha int 79 str dex con wis pow cha int
65 hp maxhp sp maxsp grace maxgrace 80 hp maxhp sp maxsp grace maxgrace
66 exp perm_exp expmul 81 exp perm_exp expmul
67 food dam luck wc ac x y speed speed_left move_state attack_movement 82 food dam luck wc ac x y speed speed_left move_state attack_movement
68 nrof level direction type subtype attacktype 83 nrof level direction type subtype attacktype
… …
76 resist_life_stealing resist_disease 91 resist_life_stealing resist_disease
77 92
78 path_attuned path_repelled path_denied material materialname 93 path_attuned path_repelled path_denied material materialname
79 value carrying weight invisible state magic 94 value carrying weight invisible state magic
80 last_heal last_sp last_grace last_eat 95 last_heal last_sp last_grace last_eat
81 connected glow_radius randomitems npx_status npc_program 96 connected glow_radius randomitems tresure_env npx_status npc_program
82 run_away pick_up container will_apply smoothlevel 97 run_away pick_up container will_apply smoothlevel
83 current_weapon_script weapontype tooltype elevation client_type 98 current_weapon_script weapontype tooltype elevation client_type
84 item_power duration range 99 item_power duration range
85 range_modifier duration_modifier dam_modifier gen_sp_armour 100 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 101 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 112 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 113 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 114 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 115 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 116 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
117 precious
102 118
103 body_range body_arm body_torso body_head body_neck body_skill 119 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 120 body_finger body_shoulder body_foot body_hand body_wrist body_waist
105)); 121));
106 122
… …
117 trigger => 10, 133 trigger => 10,
118 close => 11, 134 close => 11,
119 timer => 12, 135 timer => 12,
120); 136);
121 137
138# 1 up 2 right 4 down 8 left
139our %WALLDIR = (
140 0 => 0,
141 1_2 => 1,
142 1_4 => 2,
143 2_2_1 => 3,
144 1_1 => 4,
145 2_1_1 => 5,
146 2_2_2 => 6,
147 3_2 => 7,
148 1_3 => 8,
149 2_2_4 => 9,
150 2_1_2 => 10,
151 3_1 => 11,
152 2_2_3 => 12,
153 3_4 => 13,
154 3_3 => 14,
155 4 => 15,
156);
157
122sub MOVE_WALK (){ 0x01 } 158sub MOVE_WALK (){ 0x01 }
123sub MOVE_FLY_LOW (){ 0x02 } 159sub MOVE_FLY_LOW (){ 0x02 }
124sub MOVE_FLY_HIGH (){ 0x04 } 160sub MOVE_FLY_HIGH (){ 0x04 }
125sub MOVE_FLYING (){ 0x06 } 161sub MOVE_FLYING (){ 0x06 }
126sub MOVE_SWIM (){ 0x08 } 162sub MOVE_SWIM (){ 0x08 }
127sub MOVE_BOAT (){ 0x10 } 163sub MOVE_BOAT (){ 0x10 }
164sub MOVE_SHIP (){ 0x20 }
128sub MOVE_KNOWN (){ 0x1f } # all of above 165sub MOVE_KNOWN (){ 0x3f } # all of above
129sub MOVE_ALLBIT (){ 0x10000 }
130sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 166sub MOVE_ALL (){ 0x10000 } # very special value
167
168our %MOVE_TYPE = (
169 walk => MOVE_WALK,
170 fly_low => MOVE_FLY_LOW,
171 fly_high => MOVE_FLY_HIGH,
172 flying => MOVE_FLYING,
173 swim => MOVE_SWIM,
174 boat => MOVE_BOAT,
175 ship => MOVE_SHIP,
176 all => MOVE_ALL,
177);
178
179our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
180
181{
182 package Deliantra::MoveType;
183
184 use overload
185 '=' => sub { bless [@{$_[0]}], ref $_[0] },
186 '""' => \&as_string,
187 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
188 '<=' => sub {
189 ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
190 ? $_[0][1] & $MOVE_TYPE{$_[1]}
191 : undef
192 },
193 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
194 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
195 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
196 'x=' => sub { # toggle between off, + and -
197 my $cur = $_[0] >= $_[1];
198 if (!defined $cur) {
199 if ($_[0] >= "all") {
200 $_[0] -= $_[1];
201 } else {
202 $_[0] += $_[1];
203 }
204 } elsif ($cur) {
205 $_[0] -= $_[1];
206 } else {
207 $_[0] /= $_[1];
208 }
209
210 $_[0]
211 },
212 'eq' => sub { "$_[0]" eq "$_[1]" },
213 'ne' => sub { "$_[0]" ne "$_[1]" },
214 ;
215
216 sub TO_JSON {
217 $_[0][0]
218 }
219}
220
221sub Deliantra::MoveType::new {
222 my ($class, $string) = @_;
223
224 my $mask;
225 my $value;
226
227 if ($string =~ /^\s*\d+\s*$/) {
228 $mask = MOVE_ALL;
229 $value = $string+0;
230 } else {
231 for (split /\s+/, lc $string) {
232 if (s/^-//) {
233 $mask |= $MOVE_TYPE{$_};
234 $value &= ~$MOVE_TYPE{$_};
235 } else {
236 $mask |= $MOVE_TYPE{$_};
237 $value |= $MOVE_TYPE{$_};
238 }
239 }
240 }
241
242 (bless [$mask, $value], $class)->normalise
243}
244
245sub Deliantra::MoveType::normalise {
246 my ($self) = @_;
247
248 if ($self->[0] & MOVE_ALL) {
249 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
250 $self->[0] &= $mask;
251 $self->[1] &= $mask;
252 }
253
254 $self->[1] &= $self->[0];
255
256 $self
257}
258
259sub Deliantra::MoveType::as_string {
260 my ($self) = @_;
261
262 my @res;
263
264 my ($mask, $value) = @$self;
265
266 for (@Deliantra::MOVE_TYPE) {
267 my $bit = $Deliantra::MOVE_TYPE{$_};
268 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
269 $mask &= ~$bit;
270 push @res, $value & $bit ? $_ : "-$_";
271 }
272 }
273
274 join " ", @res
275}
131 276
132sub load_ref($) { 277sub load_ref($) {
133 my ($path) = @_; 278 my ($path) = @_;
134 279
135 open my $fh, "<:raw:perlio", $path 280 open my $fh, "<:raw:perlio", $path
… …
148 close $fh; 293 close $fh;
149 rename "$path~", $path 294 rename "$path~", $path
150 or die "$path: $!"; 295 or die "$path: $!";
151} 296}
152 297
298my %attack_mask = (
299 physical => 0x00000001,
300 magic => 0x00000002,
301 fire => 0x00000004,
302 electricity => 0x00000008,
303 cold => 0x00000010,
304 confusion => 0x00000020,
305 acid => 0x00000040,
306 drain => 0x00000080,
307 weaponmagic => 0x00000100,
308 ghosthit => 0x00000200,
309 poison => 0x00000400,
310 slow => 0x00000800,
311 paralyze => 0x00001000,
312 turn_undead => 0x00002000,
313 fear => 0x00004000,
314 cancellation => 0x00008000,
315 deplete => 0x00010000,
316 death => 0x00020000,
317 chaos => 0x00040000,
318 counterspell => 0x00080000,
319 godpower => 0x00100000,
320 holyword => 0x00200000,
321 blind => 0x00400000,
322 internal => 0x00800000,
323 life_stealing => 0x01000000,
324 disease => 0x02000000,
325);
326
327sub _add_resist($$$) {
328 my ($ob, $mask, $value) = @_;
329
330 while (my ($k, $v) = each %attack_mask) {
331 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
332 }
333}
334
335my %MATERIAL = reverse
336 paper => 1,
337 iron => 2,
338 glass => 4,
339 leather => 8,
340 wood => 16,
341 organic => 32,
342 stone => 64,
343 cloth => 128,
344 adamant => 256,
345 liquid => 512,
346 tin => 1024,
347 bone => 2048,
348 ice => 4096,
349
350 # guesses
351 runestone => 12,
352 bronze => 18,
353 "ancient wood" => 20,
354 glass => 36,
355 marble => 66,
356 ice => 68,
357 stone => 70,
358 stone => 80,
359 cloth => 136,
360 ironwood => 144,
361 adamantium => 258,
362 glacium => 260,
363 blood => 544,
364;
365
153# object as in "Object xxx", i.e. archetypes 366# object as in "Object xxx", i.e. archetypes
154sub normalize_object($) { 367sub normalize_object($) {
155 my ($ob) = @_; 368 my ($ob) = @_;
156 369
370 delete $ob->{editable}; # deprecated
371
372 # convert material bitset to materialname, if possible
373 if (exists $ob->{material}) {
374 if (!$ob->{material}) {
375 delete $ob->{material};
376 } elsif (exists $ob->{materialname}) {
377 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
378 delete $ob->{material};
379 } else {
380 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
381 delete $ob->{material}; # assume materilname is more specific and nuke material
382 }
383 } elsif (my $name = $MATERIAL{$ob->{material}}) {
384 delete $ob->{material};
385 $ob->{materialname} = $name;
386 } else {
387 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
388 }
389 }
390
391 # check whether attachment is the same as in the archetype
392 if (exists $ob->{attach}) {
393 my $arch = $ARCH{$ob->{_name}};
394 my $js = JSON::XS->new->utf8->canonical (1);
395
396 if (defined $arch->{attach}
397 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
398 delete $ob->{attach}
399 }
400 }
401
402 # color_fg is used as default for magicmap if magicmap does not exist
403 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
404
157 # nuke outdated or never supported fields 405 # nuke outdated or never supported fields
158 delete $ob->{$_} for qw( 406 delete @$ob{qw(
159 can_knockback can_parry can_impale can_cut can_dam_armour 407 can_knockback can_parry can_impale can_cut can_dam_armour
160 can_apply pass_thru can_pass_thru 408 can_apply pass_thru can_pass_thru color_bg color_fg
161 ); 409 )};
410
411 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
412 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
413 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
162 414
163 # convert movement strings to bitsets 415 # convert movement strings to bitsets
164 for my $attr (keys %FIELD_MOVEMENT) { 416 for my $attr (keys %FIELD_MOVEMENT) {
165 next unless exists $ob->{$attr}; 417 next unless exists $ob->{$attr};
166 418
167 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 419 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
168
169 next if $ob->{$attr} =~ /^\d+$/;
170
171 my $flags = 0;
172
173 # assume list
174 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
175 $flags |= MOVE_WALK if $flag eq "walk";
176 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
177 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
178 $flags |= MOVE_FLYING if $flag eq "flying";
179 $flags |= MOVE_SWIM if $flag eq "swim";
180 $flags |= MOVE_BOAT if $flag eq "boat";
181 $flags |= MOVE_ALL if $flag eq "all";
182
183 $flags &= ~MOVE_WALK if $flag eq "-walk";
184 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
185 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
186 $flags &= ~MOVE_FLYING if $flag eq "-flying";
187 $flags &= ~MOVE_SWIM if $flag eq "-swim";
188 $flags &= ~MOVE_BOAT if $flag eq "-boat";
189 $flags &= ~MOVE_ALL if $flag eq "-all";
190 }
191
192 $ob->{$attr} = $flags;
193 } 420 }
194 421
195 # convert outdated movement flags to new movement sets 422 # convert outdated movement flags to new movement sets
196 if (defined (my $v = delete $ob->{no_pass})) { 423 if (defined (my $v = delete $ob->{no_pass})) {
197 $ob->{move_block} = $v ? MOVE_ALL : 0; 424 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
198 } 425 }
199 if (defined (my $v = delete $ob->{slow_move})) { 426 if (defined (my $v = delete $ob->{slow_move})) {
200 $ob->{move_slow} |= MOVE_WALK; 427 $ob->{move_slow} += "walk";
201 $ob->{move_slow_penalty} = $v; 428 $ob->{move_slow_penalty} = $v;
202 } 429 }
203 if (defined (my $v = delete $ob->{walk_on})) { 430 if (defined (my $v = delete $ob->{walk_on})) {
204 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 431 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
205 : $ob->{move_on} & ~MOVE_WALK;
206 } 432 }
207 if (defined (my $v = delete $ob->{walk_off})) { 433 if (defined (my $v = delete $ob->{walk_off})) {
208 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 434 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
209 : $ob->{move_off} & ~MOVE_WALK;
210 } 435 }
211 if (defined (my $v = delete $ob->{fly_on})) { 436 if (defined (my $v = delete $ob->{fly_on})) {
212 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 437 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
213 : $ob->{move_on} & ~MOVE_FLY_LOW;
214 } 438 }
215 if (defined (my $v = delete $ob->{fly_off})) { 439 if (defined (my $v = delete $ob->{fly_off})) {
216 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 440 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
217 : $ob->{move_off} & ~MOVE_FLY_LOW;
218 } 441 }
219 if (defined (my $v = delete $ob->{flying})) { 442 if (defined (my $v = delete $ob->{flying})) {
220 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 443 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
221 : $ob->{move_type} & ~MOVE_FLY_LOW;
222 } 444 }
223 445
224 # convert idiotic event_xxx things into objects 446 # convert idiotic event_xxx things into objects
225 while (my ($event, $subtype) = each %EVENT_TYPE) { 447 while (my ($event, $subtype) = each %EVENT_TYPE) {
226 if (exists $ob->{"event_${event}_plugin"}) { 448 if (exists $ob->{"event_${event}_plugin"}) {
… …
231 name => delete $ob->{"event_${event}_options"}, 453 name => delete $ob->{"event_${event}_options"},
232 }; 454 };
233 } 455 }
234 } 456 }
235 457
458 # some archetypes had "+3" instead of the canonical "3", so fix
459 $ob->{dam} *= 1 if exists $ob->{dam};
460
236 $ob 461 $ob
237} 462}
238 463
239# arch as in "arch xxx", ie.. objects 464# arch as in "arch xxx", ie.. objects
240sub normalize_arch($) { 465sub normalize_arch($) {
241 my ($ob) = @_; 466 my ($ob) = @_;
242 467
243 normalize_object $ob; 468 normalize_object $ob;
469
470 return if $ob->{_atype} eq "object";
244 471
245 my $arch = $ARCH{$ob->{_name}} 472 my $arch = $ARCH{$ob->{_name}}
246 or (warn "$ob->{_name}: no such archetype", return $ob); 473 or (warn "$ob->{_name}: no such archetype", return $ob);
247 474
248 if ($arch->{type} == 22) { # map 475 if ($arch->{type} == 22) { # map
… …
281 } 508 }
282 509
283 $ob 510 $ob
284} 511}
285 512
513sub attr_thaw($) {
514 my ($ob) = @_;
515
516 $ob->{attach} = decode_json $ob->{attach}
517 if exists $ob->{attach};
518
519 $ob
520}
521
522sub attr_freeze($) {
523 my ($ob) = @_;
524
525 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
526 if exists $ob->{attach};
527
528 $ob
529}
530
286sub read_pak($) { 531sub read_pak($) {
287 my ($path) = @_; 532 my ($path) = @_;
288 533
289 my %pak; 534 my %pak;
290 535
… …
298 } 543 }
299 544
300 \%pak 545 \%pak
301} 546}
302 547
303sub read_arch($) { 548sub read_arch($;$) {
304 my ($path) = @_; 549 my ($path, $toplevel) = @_;
305 550
306 my %arc; 551 my %arc;
307 my ($more, $prev); 552 my ($more, $prev);
553 my $comment;
308 554
309 open my $fh, "<:raw:perlio:utf8", $path 555 open my $fh, "<:utf8", $path
310 or Carp::croak "$path: $!"; 556 or Carp::croak "$path: $!";
311 557
312 binmode $fh; 558# binmode $fh;
313 559
314 my $parse_block; $parse_block = sub { 560 my $parse_block; $parse_block = sub {
315 my %arc = @_; 561 my %arc = @_;
316 562
317 while (<$fh>) { 563 while (<$fh>) {
318 s/\s+$//; 564 s/\s+$//;
319 if (/^end$/i) { 565 if (/^end$/i) {
320 last; 566 last;
567
321 } elsif (/^arch (\S+)$/i) { 568 } elsif (/^arch (\S+)$/i) {
322 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 569 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
570
323 } elsif (/^lore$/i) { 571 } elsif (/^lore$/i) {
324 while (<$fh>) { 572 while (<$fh>) {
325 last if /^endlore\s*$/i; 573 last if /^endlore\s*$/i;
326 $arc{lore} .= $_; 574 $arc{lore} .= $_;
327 } 575 }
328 } elsif (/^msg$/i) { 576 } elsif (/^msg$/i) {
329 while (<$fh>) { 577 while (<$fh>) {
330 last if /^endmsg\s*$/i; 578 last if /^endmsg\s*$/i;
331 $arc{msg} .= $_; 579 $arc{msg} .= $_;
332 } 580 }
581 } elsif (/^anim$/i) {
582 while (<$fh>) {
583 last if /^mina\s*$/i;
584 chomp;
585 push @{ $arc{anim} }, $_;
586 }
333 } elsif (/^(\S+)\s*(.*)$/) { 587 } elsif (/^(\S+)\s*(.*)$/) {
334 $arc{lc $1} = $2; 588 $arc{lc $1} = $2;
335 } elsif (/^\s*($|#)/) { 589 } elsif (/^\s*#/) {
590 $arc{_comment} .= "$_\n";
591
592 } elsif (/^\s*$/) {
336 # 593 #
337 } else { 594 } else {
338 warn "$path: unparsable line '$_' in arch $arc{_name}"; 595 warn "$path: unparsable line '$_' in arch $arc{_name}";
339 } 596 }
340 } 597 }
… …
346 s/\s+$//; 603 s/\s+$//;
347 if (/^more$/i) { 604 if (/^more$/i) {
348 $more = $prev; 605 $more = $prev;
349 } elsif (/^object (\S+)$/i) { 606 } elsif (/^object (\S+)$/i) {
350 my $name = $1; 607 my $name = $1;
351 my $arc = normalize_object $parse_block->(_name => $name); 608 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
609 undef $comment;
610 delete $arc{_comment} unless length $arc{_comment};
611 $arc->{_atype} = 'object';
352 612
353 if ($more) { 613 if ($more) {
354 $more->{more} = $arc; 614 $more->{more} = $arc;
355 } else { 615 } else {
356 $arc{$name} = $arc; 616 $arc{$name} = $arc;
357 } 617 }
358 $prev = $arc; 618 $prev = $arc;
359 $more = undef; 619 $more = undef;
360 } elsif (/^arch (\S+)$/i) { 620 } elsif (/^arch (\S+)$/i) {
361 my $name = $1; 621 my $name = $1;
362 my $arc = normalize_arch $parse_block->(_name => $name); 622 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
623 undef $comment;
624 delete $arc{_comment} unless length $arc{_comment};
625 $arc->{_atype} = 'arch';
363 626
364 if ($more) { 627 if ($more) {
365 $more->{more} = $arc; 628 $more->{more} = $arc;
366 } else { 629 } else {
367 push @{ $arc{arch} }, $arc; 630 push @{ $arc{arch} }, $arc;
368 } 631 }
369 $prev = $arc; 632 $prev = $arc;
370 $more = undef; 633 $more = undef;
634 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
635 if ($1 eq "lev_array") {
636 while (<$fh>) {
637 last if /^endplst\s*$/;
638 push @{$toplevel->{lev_array}}, $_+0;
639 }
640 } else {
641 $toplevel->{$1} = $2;
642 }
643 } elsif (/^\s*#/) {
644 $comment .= "$_\n";
371 } elsif (/^\s*($|#)/) { 645 } elsif (/^\s*($|#)/) {
372 # 646 #
373 } else { 647 } else {
374 warn "$path: unparseable top-level line '$_'"; 648 die "$path: unparseable top-level line '$_'";
375 } 649 }
376 } 650 }
377 651
378 undef $parse_block; # work around bug in perl not freeing $fh etc. 652 undef $parse_block; # work around bug in perl not freeing $fh etc.
379 653
380 \%arc 654 \%arc
655}
656
657sub archlist_to_string {
658 my ($arch) = @_;
659
660 my $str;
661
662 my $append; $append = sub {
663 my %a = %{$_[0]};
664
665 Deliantra::attr_freeze \%a;
666 Deliantra::normalize_arch \%a;
667
668 # undo the bit-split we did before
669 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
670 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
671 | (delete $a{attack_movement_bits_4_7});
672 }
673
674 if (my $comment = delete $a{_comment}) {
675 if ($comment =~ /[^\n\s#]/) {
676 $str .= $comment;
677 }
678 }
679
680 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
681
682 my $inv = delete $a{inventory};
683 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
684 my $anim = delete $a{anim};
685
686 if ($a{_atype} eq 'object') {
687 $str .= join "\n", "anim", @$anim, "mina\n"
688 if $anim;
689 }
690
691 my @kv;
692
693 for ($a{_name} eq "map"
694 ? @Deliantra::FIELD_ORDER_MAP
695 : @Deliantra::FIELD_ORDER) {
696 push @kv, [$_, delete $a{$_}]
697 if exists $a{$_};
698 }
699
700 for (sort keys %a) {
701 next if /^_/; # ignore our _-keys
702 push @kv, [$_, delete $a{$_}];
703 }
704
705 for (@kv) {
706 my ($k, $v) = @$_;
707
708 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
709 $v =~ s/\n$//;
710 $str .= "$k\n$v\n$end\n";
711 } else {
712 $str .= "$k $v\n";
713 }
714 }
715
716 if ($inv) {
717 $append->($_) for @$inv;
718 }
719
720 $str .= "end\n";
721
722 if ($a{_atype} eq 'object') {
723 if ($more) {
724 $str .= "more\n";
725 $append->($more) if $more;
726 } else {
727 $str .= "\n";
728 }
729 }
730 };
731
732 for (@$arch) {
733 $append->($_);
734 }
735
736 $str
381} 737}
382 738
383# put all archs into a hash with editor_face as it's key 739# put all archs into a hash with editor_face as it's key
384# NOTE: the arrays in the hash values are references to 740# NOTE: the arrays in the hash values are references to
385# the archs from $ARCH 741# the archs from $ARCH
… …
406 my ($a) = @_; 762 my ($a) = @_;
407 763
408 my $o = $ARCH{$a->{_name}} 764 my $o = $ARCH{$a->{_name}}
409 or return; 765 or return;
410 766
411 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 767 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
768 unless ($face) {
769 $face = $FACE{"blank.x11"}
412 or (warn "no face data found for arch '$a->{_name}'"), return; 770 or (warn "no face data found for arch '$a->{_name}'"), return;
771 }
413 772
414 if ($face->{w} > 1 || $face->{h} > 1) { 773 if ($face->{w} > 1 || $face->{h} > 1) {
415 # bigface 774 # bigface
416 return (0, 0, $face->{w} - 1, $face->{h} - 1); 775 return (0, 0, $face->{w} - 1, $face->{h} - 1);
417 776
… …
450=cut 809=cut
451 810
452sub arch_attr($) { 811sub arch_attr($) {
453 my ($obj) = @_; 812 my ($obj) = @_;
454 813
455 require Crossfire::Data; 814 require Deliantra::Data;
456 815
457 my $root; 816 my $root;
458 my $attr = { }; 817 my $attr = { };
459 818
460 my $arch = $ARCH{ $obj->{_name} }; 819 my $arch = $ARCH{ $obj->{_name} };
461 my $type = $obj->{type} || $arch->{type}; 820 my $type = $obj->{type} || $arch->{type};
462 821
463 if ($type > 0) { 822 if ($type > 0) {
464 $root = $Crossfire::Data::ATTR{$type}; 823 $root = $Deliantra::Data::ATTR{$type};
465 } else { 824 } else {
466 my %a = (%$arch, %$obj); 825 my %a = (%$arch, %$obj);
467 826
468 if ($a{is_floor} && !$a{alive}) { 827 if ($a{is_floor} && !$a{alive}) {
469 $root = $Crossfire::Data::TYPE{Floor}; 828 $root = $Deliantra::Data::TYPE{Floor};
470 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 829 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
471 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 830 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
472 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 831 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
473 $root = $Crossfire::Data::TYPE{Wall}; 832 $root = $Deliantra::Data::TYPE{Wall};
474 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 833 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
475 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 834 $root = $Deliantra::Data::TYPE{"Weak Wall"};
476 } else { 835 } else {
477 $root = $Crossfire::Data::TYPE{Misc}; 836 $root = $Deliantra::Data::TYPE{Misc};
478 } 837 }
479 } 838 }
480 839
840 my (%ignore);
481 my @import = ($root); 841 my @import = ($root);
842
843 my @new_import;
844 while (my $type = shift @import) {
845 # first import everything we will need:
846 push @import,
847 grep $_,
848 map $Deliantra::Data::TYPE{$_},
849 @{$type->{import} || []};
850
851 # and compute the ignored attributes
852 for (@{$type->{ignore} || []}) {
853 $ignore{$_}++ for ref $_ ? @$_ : $_;
854 }
855
856 push @new_import, $type;
482 857 }
858 (@import) = @new_import;
859
860 # then add defaults to the back of the list, so they are added
861 # as last resort.
483 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 862 push @import, \%Deliantra::Data::DEFAULT_ATTR
484 unless $type == 116; 863 unless $type == 116;
485 864
486 my (%ignore);
487 my (@section_order, %section, @attr_order); 865 my (@section_order, %section, @attr_order);
488 866
867 # @import = root, imported, default
489 while (my $type = shift @import) { 868 while (my $type = pop @import) {
490 push @import, @{$type->{import} || []};
491
492 $attr->{$_} ||= $type->{$_} 869 $attr->{$_} ||= $type->{$_}
493 for qw(name desc use); 870 for qw(name desc use);
494
495 for (@{$type->{ignore} || []}) {
496 $ignore{$_}++ for ref $_ ? @$_ : $_;
497 }
498 871
499 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 872 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
500 my ($name, $attr) = @$_; 873 my ($name, $attr) = @$_;
501 push @section_order, $name; 874 push @section_order, $name;
502 for (@$attr) { 875 for (@$attr) {
503 my ($k, $v) = @$_; 876 my ($k, $v) = @$_;
504 push @attr_order, $k; 877 push @attr_order, $k;
505 $section{$name}{$k} ||= $v; 878 $section{$name}{$k} = $v; # overwrite, so that the root decides
506 }
507 } 879 }
880 }
881 }
882
883 # remove ignores for "root" type
884 for (
885 map @{$_->[1]}, # section attributes
886 [general => ($root->{attr} || [])],
887 @{$root->{section} || []}
888 ) {
889 my ($k, $v) = @$_;
890 # skip fixed attributes, if they are ignored thats fine
891 next if $v->{type} eq 'fixed';
892
893 delete $ignore{$k}; # if the attributes are defined explicitly they
894 # should NOT be ignored. ignore should mainly
895 # hit imported/inherited attributes.
508 } 896 }
509 897
510 $attr->{section} = [ 898 $attr->{section} = [
511 map !exists $section{$_} ? () : do { 899 map !exists $section{$_} ? () : do {
512 my $attr = delete $section{$_}; 900 my $attr = delete $section{$_};
… …
516 map exists $attr->{$_} && !$ignore{$_} 904 map exists $attr->{$_} && !$ignore{$_}
517 ? [$_ => delete $attr->{$_}] : (), 905 ? [$_ => delete $attr->{$_}] : (),
518 @attr_order 906 @attr_order
519 ] 907 ]
520 }, 908 },
521
522 exists $section{$_} ? [$_ => delete $section{$_}] : (), 909 exists $section{$_} ? [$_ => delete $section{$_}] : (),
523 @section_order 910 @section_order
524 ]; 911 ];
525 912
526 $attr 913 $attr
527}
528
529sub arch_edit_sections {
530# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
531# edit_type = 0;
532# else if (edit_type != 0) {
533# // all flags from 'check_type' must be unset in this arch because they get recalculated now
534# edit_type &= ~check_type;
535# }
536#
537# }
538# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
539# getAttributeValue("alive", defarch) == 1 &&
540# (getAttributeValue("monster", defarch) == 1 ||
541# getAttributeValue("generator", defarch) == 1)) {
542# // Monster: monsters/npcs/generators
543# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
544# }
545# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
546# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
547# // Walls
548# edit_type |= IGUIConstants.TILE_EDIT_WALL;
549# }
550# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
551# getAttributeValue("connected", defarch) != 0) {
552# // Connected Objects
553# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
554# }
555# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
556# arch_type == 66 || arch_type == 41 || arch_type == 95) {
557# // Exit: teleporter/exit/trapdoors
558# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
559# }
560# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
561# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
562# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
563# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
564# arch_type == 124 || arch_type == 130)) {
565# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
566# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
567# }
568# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
569# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
570# arch_type == 91 || arch_type == 21 || arch_type == 24) {
571# // Door: door/special door/gates + keys
572# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
573# }
574# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
575# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
576# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
577# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
578# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
579# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
580# arch_type == 122 || arch_type == 3)) {
581# // Equipment: weapons/armour/wands/rods
582# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
583# }
584#
585# return(edit_type);
586#
587#
588} 914}
589 915
590sub cache_file($$&&) { 916sub cache_file($$&&) {
591 my ($src, $cache, $load, $create) = @_; 917 my ($src, $cache, $load, $create) = @_;
592 918
… …
642 }, sub { 968 }, sub {
643 read_arch "$LIB/archetypes" 969 read_arch "$LIB/archetypes"
644 }; 970 };
645} 971}
646 972
973sub construct_tilecache_pb {
974 my ($idx, $cache) = @_;
975
976 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
977
978 while (my ($name, $tile) = each %$cache) {
979 my $tpb = delete $tile->{pb};
980 my $ofs = $tile->{idx};
981
982 for my $x (0 .. $tile->{w} - 1) {
983 for my $y (0 .. $tile->{h} - 1) {
984 my $idx = $ofs + $x + $y * $tile->{w};
985 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
986 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
987 }
988 }
989 }
990
991 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
992
993 $cache
994}
995
996sub use_tilecache {
997 my ($face) = @_;
998 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
999 or die "$VARDIR/tilecache.png: $!";
1000 *FACE = $_[0];
1001}
1002
647=item load_tilecache 1003=item load_tilecache
648 1004
649(Re-)Load %TILE and %FACE. 1005(Re-)Load %TILE and %FACE.
650 1006
651=cut 1007=cut
652 1008
653sub load_tilecache() { 1009sub load_tilecache() {
654 require Gtk2; 1010 require Gtk2;
655 1011
656 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 1012 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
657 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
658 or die "$VARDIR/tilecache.png: $!";
659 *FACE = $_[0];
660 }, sub { 1013 sub {
661 my $tile = read_pak "$LIB/crossfire.0";
662
663 my %cache; 1014 my %cache;
1015 my $facedata = Storable::retrieve "$LIB/faceinfo";
664 1016
1017 open my $fh, "<", "$LIB/facedata"
1018 or die "$LIB/facedata: $!";
1019
1020 $facedata->{version} == 2
1021 or die "$LIB/facedata: version mismatch, cannot proceed.";
1022
1023 my $faces = $facedata->{faceinfo};
665 my $idx = 0; 1024 my $idx = 0;
666 1025
667 for my $name (sort keys %$tile) { 1026 for (sort keys %$faces) {
1027 my ($face, $info) = ($_, $faces->{$_});
1028
668 my $pb = new Gtk2::Gdk::PixbufLoader; 1029 my $pb = new Gtk2::Gdk::PixbufLoader;
669 $pb->write ($tile->{$name});
670 $pb->close;
671 my $pb = $pb->get_pixbuf;
672 1030
673 my $tile = $cache{$name} = { 1031 if (exists $info->{data32}) {
674 pb => $pb, 1032 $pb->write ($info->{data32});
675 idx => $idx, 1033 } else {
676 w => int $pb->get_width / TILESIZE, 1034 sysseek $fh, $info->{fofs32}, 0;
677 h => int $pb->get_height / TILESIZE, 1035 sysread $fh, my $buf, $info->{size32};
678 }; 1036 $pb->write ($buf);
679
680
681 $idx += $tile->{w} * $tile->{h};
682 }
683
684 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
685
686 while (my ($name, $tile) = each %cache) {
687 my $tpb = delete $tile->{pb};
688 my $ofs = $tile->{idx};
689
690 for my $x (0 .. $tile->{w} - 1) {
691 for my $y (0 .. $tile->{h} - 1) {
692 my $idx = $ofs + $x + $y * $tile->{w};
693 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
694 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
695 } 1037 }
1038 $pb->close;
1039 my $pb = $pb->get_pixbuf;
1040
1041 my $tile = $cache{$face} = {
1042 pb => $pb,
1043 idx => $idx,
1044 w => int $pb->get_width / TILESIZE,
1045 h => int $pb->get_height / TILESIZE,
696 } 1046 };
1047
1048 $idx += $tile->{w} * $tile->{h};
1049 }
1050
1051 construct_tilecache_pb $idx, \%cache;
1052
1053 \%cache
697 } 1054 };
698
699 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
700
701 \%cache
702 };
703} 1055}
1056
1057=back
704 1058
705=head1 AUTHOR 1059=head1 AUTHOR
706 1060
707 Marc Lehmann <schmorp@schmorp.de> 1061 Marc Lehmann <schmorp@schmorp.de>
708 http://home.schmorp.de/ 1062 http://home.schmorp.de/
… …
711 http://www.ta-sa.org/ 1065 http://www.ta-sa.org/
712 1066
713=cut 1067=cut
714 1068
7151 10691
1070

Diff Legend

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