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

Diff Legend

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