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.51 by root, Mon Mar 20 01:15:10 2006 UTC vs.
Revision 1.93 by root, Sat Mar 3 19:38:06 2007 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.1'; 9our $VERSION = '0.96';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
15use Carp (); 15use Carp ();
16use File::Spec; 16use File::Spec;
17use List::Util qw(min max); 17use List::Util qw(min max);
18use Storable; 18use Storable qw(freeze thaw);
19 19
20our @EXPORT = qw( 20our @EXPORT = qw(
21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents 21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents
22); 22);
23 23
24use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working
25
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
24our $LIB = $ENV{CROSSFIRE_LIBDIR}; 36our $LIB = $ENV{CROSSFIRE_LIBDIR};
25 37
26our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; 38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
40 : File::Spec->tmpdir . "/crossfire";
27 41
28mkdir $VARDIR, 0777; 42mkdir $VARDIR, 0777;
29 43
30sub TILESIZE (){ 32 } 44sub TILESIZE (){ 32 }
31 45
… …
37 msg => "endmsg", 51 msg => "endmsg",
38 lore => "endlore", 52 lore => "endlore",
39 maplore => "endmaplore", 53 maplore => "endmaplore",
40); 54);
41 55
42# not used yet, maybe alphabetical is ok 56# movement bit type, PITA
57our %FIELD_MOVEMENT = map +($_ => undef),
58 qw(move_type move_block move_allow move_on move_off move_slow);
59
60# same as in server save routine, to (hopefully) be compatible
61# to the other editors.
62our @FIELD_ORDER_MAP = (qw(
63 file_format_version
64 name attach swap_time reset_timeout fixed_resettime difficulty region
65 shopitems shopgreed shopmin shopmax shoprace
66 darkness width height enter_x enter_y msg maplore
67 unique template
68 outdoor temp pressure humid windspeed winddir sky nosmooth
69 tile_path_1 tile_path_2 tile_path_3 tile_path_4
70));
71
43our @FIELD_ORDER = (qw(name name_pl)); 72our @FIELD_ORDER = (qw(
73 elevation
74
75 name name_pl custom_name attach title race
76 slaying skill msg lore other_arch face
77 #todo-events
78 animation is_animated
79 str dex con wis pow cha int
80 hp maxhp sp maxsp grace maxgrace
81 exp perm_exp expmul
82 food dam luck wc ac x y speed speed_left move_state attack_movement
83 nrof level direction type subtype attacktype
84
85 resist_physical resist_magic resist_fire resist_electricity
86 resist_cold resist_confusion resist_acid resist_drain
87 resist_weaponmagic resist_ghosthit resist_poison resist_slow
88 resist_paralyze resist_turn_undead resist_fear resist_cancellation
89 resist_deplete resist_death resist_chaos resist_counterspell
90 resist_godpower resist_holyword resist_blind resist_internal
91 resist_life_stealing resist_disease
92
93 path_attuned path_repelled path_denied material materialname
94 value carrying weight invisible state magic
95 last_heal last_sp last_grace last_eat
96 connected glow_radius randomitems npx_status npc_program
97 run_away pick_up container will_apply smoothlevel
98 current_weapon_script weapontype tooltype elevation client_type
99 item_power duration range
100 range_modifier duration_modifier dam_modifier gen_sp_armour
101 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
102
103 alive wiz was_wiz applied unpaid can_use_shield no_pick is_animated monster
104 friendly generator is_thrown auto_apply treasure player sold see_invisible
105 can_roll overlay_floor is_turnable is_used_up identified reflecting changing
106 splitting hitback startequip blocksview undead scared unaggressive
107 reflect_missile reflect_spell no_magic no_fix_player is_lightable tear_down
108 run_away pick_up unique no_drop can_cast_spell can_use_scroll can_use_range
109 can_use_bow can_use_armour can_use_weapon can_use_ring has_ready_range
110 has_ready_bow xrays is_floor lifesave no_strength sleep stand_still
111 random_move only_attack confused stealth cursed damned see_anywhere
112 known_magical known_cursed can_use_skill been_applied has_ready_scroll
113 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
114 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
115 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
116 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
117
118 body_range body_arm body_torso body_head body_neck body_skill
119 body_finger body_shoulder body_foot body_hand body_wrist body_waist
120));
121
122our %EVENT_TYPE = (
123 apply => 1,
124 attack => 2,
125 death => 3,
126 drop => 4,
127 pickup => 5,
128 say => 6,
129 stop => 7,
130 time => 8,
131 throw => 9,
132 trigger => 10,
133 close => 11,
134 timer => 12,
135);
44 136
45sub MOVE_WALK (){ 0x01 } 137sub MOVE_WALK (){ 0x01 }
46sub MOVE_FLY_LOW (){ 0x02 } 138sub MOVE_FLY_LOW (){ 0x02 }
47sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
48sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
49sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
50sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
51sub MOVE_ALL (){ 0xff } 143sub MOVE_KNOWN (){ 0x1f } # all of above
144sub MOVE_ALL (){ 0x10000 } # very special value
145
146our %MOVE_TYPE = (
147 walk => MOVE_WALK,
148 fly_low => MOVE_FLY_LOW,
149 fly_high => MOVE_FLY_HIGH,
150 flying => MOVE_FLYING,
151 swim => MOVE_SWIM,
152 boat => MOVE_BOAT,
153 all => MOVE_ALL,
154);
155
156our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat);
157
158{
159 package Crossfire::MoveType;
160
161 use overload
162 '=' => sub { bless [@{$_[0]}], ref $_[0] },
163 '""' => \&as_string,
164 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
165 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
166 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
167 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
168 'x=' => sub {
169 my $cur = $_[0] >= $_[1];
170 if (!defined $cur) {
171 $_[0] += $_[1];
172 } elsif ($cur) {
173 $_[0] -= $_[1];
174 } else {
175 $_[0] /= $_[1];
176 }
177
178 $_[0]
179 },
180 'eq' => sub { "$_[0]" eq "$_[1]" },
181 'ne' => sub { "$_[0]" ne "$_[1]" },
182 ;
183}
184
185sub Crossfire::MoveType::new {
186 my ($class, $string) = @_;
187
188 my $mask;
189 my $value;
190
191 if ($string =~ /^\s*\d+\s*$/) {
192 $mask = MOVE_ALL;
193 $value = $string+0;
194 } else {
195 for (split /\s+/, lc $string) {
196 if (s/^-//) {
197 $mask |= $MOVE_TYPE{$_};
198 $value &= ~$MOVE_TYPE{$_};
199 } else {
200 $mask |= $MOVE_TYPE{$_};
201 $value |= $MOVE_TYPE{$_};
202 }
203 }
204 }
205
206 (bless [$mask, $value], $class)->normalise
207}
208
209sub Crossfire::MoveType::normalise {
210 my ($self) = @_;
211
212 if ($self->[0] & MOVE_ALL) {
213 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
214 $self->[0] &= $mask;
215 $self->[1] &= $mask;
216 }
217
218 $self->[1] &= $self->[0];
219
220 $self
221}
222
223sub Crossfire::MoveType::as_string {
224 my ($self) = @_;
225
226 my @res;
227
228 my ($mask, $value) = @$self;
229
230 for (@Crossfire::MOVE_TYPE) {
231 my $bit = $Crossfire::MOVE_TYPE{$_};
232 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
233 $mask &= ~$bit;
234 push @res, $value & $bit ? $_ : "-$_";
235 }
236 }
237
238 join " ", @res
239}
52 240
53sub load_ref($) { 241sub load_ref($) {
54 my ($path) = @_; 242 my ($path) = @_;
55 243
56 open my $fh, "<", $path 244 open my $fh, "<:raw:perlio", $path
57 or die "$path: $!"; 245 or die "$path: $!";
58 binmode $fh;
59 local $/; 246 local $/;
60 247
61 Storable::thaw <$fh> 248 thaw <$fh>
62} 249}
63 250
64sub save_ref($$) { 251sub save_ref($$) {
65 my ($ref, $path) = @_; 252 my ($ref, $path) = @_;
66 253
67 open my $fh, ">", "$path~" 254 open my $fh, ">:raw:perlio", "$path~"
68 or die "$path~: $!"; 255 or die "$path~: $!";
69 binmode $fh;
70 print $fh Storable::freeze $ref; 256 print $fh freeze $ref;
71 close $fh; 257 close $fh;
72 rename "$path~", $path 258 rename "$path~", $path
73 or die "$path: $!"; 259 or die "$path: $!";
74} 260}
75 261
262my %attack_mask = (
263 physical => 0x00000001,
264 magic => 0x00000002,
265 fire => 0x00000004,
266 electricity => 0x00000008,
267 cold => 0x00000010,
268 confusion => 0x00000020,
269 acid => 0x00000040,
270 drain => 0x00000080,
271 weaponmagic => 0x00000100,
272 ghosthit => 0x00000200,
273 poison => 0x00000400,
274 slow => 0x00000800,
275 paralyze => 0x00001000,
276 turn_undead => 0x00002000,
277 fear => 0x00004000,
278 cancellation => 0x00008000,
279 deplete => 0x00010000,
280 death => 0x00020000,
281 chaos => 0x00040000,
282 counterspell => 0x00080000,
283 godpower => 0x00100000,
284 holyword => 0x00200000,
285 blind => 0x00400000,
286 internal => 0x00800000,
287 life_stealing => 0x01000000,
288 disease => 0x02000000,
289);
290
291sub _add_resist($$$) {
292 my ($ob, $mask, $value) = @_;
293
294 while (my ($k, $v) = each %attack_mask) {
295 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
296 }
297}
298
299my %MATERIAL = reverse
300 paper => 1,
301 iron => 2,
302 glass => 4,
303 leather => 8,
304 wood => 16,
305 organic => 32,
306 stone => 64,
307 cloth => 128,
308 adamant => 256,
309 liquid => 512,
310 tin => 1024,
311 bone => 2048,
312 ice => 4096,
313
314 # guesses
315 runestone => 12,
316 bronze => 18,
317 "ancient wood" => 20,
318 glass => 36,
319 marble => 66,
320 ice => 68,
321 stone => 70,
322 stone => 80,
323 cloth => 136,
324 ironwood => 144,
325 adamantium => 258,
326 glacium => 260,
327 blood => 544,
328;
329
330# object as in "Object xxx", i.e. archetypes
331sub normalize_object($) {
332 my ($ob) = @_;
333
334 # convert material bitset to materialname, if possible
335 if (exists $ob->{material}) {
336 if (!$ob->{material}) {
337 delete $ob->{material};
338 } elsif (exists $ob->{materialname}) {
339 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
340 delete $ob->{material};
341 } else {
342 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
343 delete $ob->{material}; # assume materilname is more specific and nuke material
344 }
345 } elsif (my $name = $MATERIAL{$ob->{material}}) {
346 delete $ob->{material};
347 $ob->{materialname} = $name;
348 } else {
349 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
350 }
351 }
352
353 # nuke outdated or never supported fields
354 delete @$ob{qw(
355 can_knockback can_parry can_impale can_cut can_dam_armour
356 can_apply pass_thru can_pass_thru
357 )};
358
359 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
360 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
361 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
362
363 # convert movement strings to bitsets
364 for my $attr (keys %FIELD_MOVEMENT) {
365 next unless exists $ob->{$attr};
366
367 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr};
368 }
369
370 # convert outdated movement flags to new movement sets
371 if (defined (my $v = delete $ob->{no_pass})) {
372 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
373 }
374 if (defined (my $v = delete $ob->{slow_move})) {
375 $ob->{move_slow} += "walk";
376 $ob->{move_slow_penalty} = $v;
377 }
378 if (defined (my $v = delete $ob->{walk_on})) {
379 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
380 }
381 if (defined (my $v = delete $ob->{walk_off})) {
382 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
383 }
384 if (defined (my $v = delete $ob->{fly_on})) {
385 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
386 }
387 if (defined (my $v = delete $ob->{fly_off})) {
388 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
389 }
390 if (defined (my $v = delete $ob->{flying})) {
391 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
392 }
393
394 # convert idiotic event_xxx things into objects
395 while (my ($event, $subtype) = each %EVENT_TYPE) {
396 if (exists $ob->{"event_${event}_plugin"}) {
397 push @{$ob->{inventory}}, {
398 _name => "event_$event",
399 title => delete $ob->{"event_${event}_plugin"},
400 slaying => delete $ob->{"event_${event}"},
401 name => delete $ob->{"event_${event}_options"},
402 };
403 }
404 }
405
406 # some archetypes had "+3" instead of the canonical "3", so fix
407 $ob->{dam} *= 1 if exists $ob->{dam};
408
409 $ob
410}
411
412# arch as in "arch xxx", ie.. objects
76sub normalize_arch($) { 413sub normalize_arch($) {
77 my ($ob) = @_; 414 my ($ob) = @_;
78 415
416 normalize_object $ob;
417
79 my $arch = $ARCH{$ob->{_name}} 418 my $arch = $ARCH{$ob->{_name}}
80 or (warn "$ob->{_name}: no such archetype", return $ob); 419 or (warn "$ob->{_name}: no such archetype", return $ob);
81
82 delete $ob->{$_} for qw(
83 can_knockback can_parry can_impale can_cut can_dam_armour
84 can_apply pass_thru can_pass_thru
85 );
86 420
87 if ($arch->{type} == 22) { # map 421 if ($arch->{type} == 22) { # map
88 my %normalize = ( 422 my %normalize = (
89 "enter_x" => "hp", 423 "enter_x" => "hp",
90 "enter_y" => "sp", 424 "enter_y" => "sp",
… …
100 while (my ($k2, $k1) = each %normalize) { 434 while (my ($k2, $k1) = each %normalize) {
101 if (defined (my $v = delete $ob->{$k1})) { 435 if (defined (my $v = delete $ob->{$k1})) {
102 $ob->{$k2} = $v; 436 $ob->{$k2} = $v;
103 } 437 }
104 } 438 }
105 } 439 } else {
106
107 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) {
108 next unless exists $ob->{$attr};
109 next if $ob->{$attr} =~ /^\d+$/;
110
111 my $flags = 0;
112
113 # assume list
114 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
115 $flags |= MOVE_WALK if $flag eq "walk";
116 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
117 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
118 $flags |= MOVE_FLYING if $flag eq "flying";
119 $flags |= MOVE_SWIM if $flag eq "swim";
120 $flags |= MOVE_BOAT if $flag eq "boat";
121 $flags |= MOVE_ALL if $flag eq "all";
122
123 $flags &= ~MOVE_WALK if $flag eq "-walk";
124 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
125 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
126 $flags &= ~MOVE_FLYING if $flag eq "-flying";
127 $flags &= ~MOVE_SWIM if $flag eq "-swim";
128 $flags &= ~MOVE_BOAT if $flag eq "-boat";
129 $flags &= ~MOVE_ALL if $flag eq "-all";
130 }
131
132 $ob->{$attr} = $flags;
133 }
134
135 if (defined (my $v = delete $ob->{no_pass})) {
136 $ob->{move_block} = $v ? MOVE_ALL : 0;
137 }
138 if (defined (my $v = delete $ob->{slow_move})) {
139 $ob->{move_slow} |= MOVE_WALK;
140 $ob->{move_slow_penalty} = $v;
141 }
142 if (defined (my $v = delete $ob->{walk_on})) {
143 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
144 : $ob->{move_on} & ~MOVE_WALK;
145 }
146 if (defined (my $v = delete $ob->{walk_off})) {
147 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
148 : $ob->{move_off} & ~MOVE_WALK;
149 }
150 if (defined (my $v = delete $ob->{fly_on})) {
151 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
152 : $ob->{move_on} & ~MOVE_FLY_LOW;
153 }
154 if (defined (my $v = delete $ob->{fly_off})) {
155 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
156 : $ob->{move_off} & ~MOVE_FLY_LOW;
157 }
158 if (defined (my $v = delete $ob->{flying})) {
159 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
160 : $ob->{move_type} & ~MOVE_FLY_LOW;
161 }
162
163 # if value matches archetype default, delete 440 # if value matches archetype default, delete
164 while (my ($k, $v) = each %$ob) { 441 while (my ($k, $v) = each %$ob) {
165 if (exists $arch->{$k} and $arch->{$k} eq $v) { 442 if (exists $arch->{$k} and $arch->{$k} eq $v) {
166 next if $k eq "_name"; 443 next if $k eq "_name";
167 delete $ob->{$k}; 444 delete $ob->{$k};
168 } 445 }
446 }
169 } 447 }
448
449 # a speciality for the editor
450 if (exists $ob->{attack_movement}) {
451 my $am = delete $ob->{attack_movement};
452 $ob->{attack_movement_bits_0_3} = $am & 15;
453 $ob->{attack_movement_bits_4_7} = $am & 240;
454 }
455
456 $ob
457}
458
459sub attr_thaw($) {
460 my ($ob) = @_;
461
462 $ob->{attach} = from_json $ob->{attach}
463 if exists $ob->{attach};
464
465 $ob
466}
467
468sub attr_freeze($) {
469 my ($ob) = @_;
470
471 $ob->{attach} = Crossfire::to_json $ob->{attach}
472 if exists $ob->{attach};
170 473
171 $ob 474 $ob
172} 475}
173 476
174sub read_pak($) { 477sub read_pak($) {
175 my ($path) = @_; 478 my ($path) = @_;
176 479
177 my %pak; 480 my %pak;
178 481
179 open my $fh, "<", $path 482 open my $fh, "<:raw:perlio", $path
180 or Carp::croak "$_[0]: $!"; 483 or Carp::croak "$_[0]: $!";
181 binmode $fh; 484 binmode $fh;
182 while (<$fh>) { 485 while (<$fh>) {
183 my ($type, $id, $len, $path) = split; 486 my ($type, $id, $len, $path) = split;
184 $path =~ s/.*\///; 487 $path =~ s/.*\///;
… …
186 } 489 }
187 490
188 \%pak 491 \%pak
189} 492}
190 493
191sub read_arch($) { 494sub read_arch($;$) {
192 my ($path) = @_; 495 my ($path, $toplevel) = @_;
193 496
194 my %arc; 497 my %arc;
195 my ($more, $prev); 498 my ($more, $prev);
499 my $comment;
196 500
197 open my $fh, "<", $path 501 open my $fh, "<:raw:perlio:utf8", $path
198 or Carp::croak "$path: $!"; 502 or Carp::croak "$path: $!";
199 503
200 binmode $fh; 504# binmode $fh;
201 505
202 my $parse_block; $parse_block = sub { 506 my $parse_block; $parse_block = sub {
203 my %arc = @_; 507 my %arc = @_;
204 508
205 while (<$fh>) { 509 while (<$fh>) {
206 s/\s+$//; 510 s/\s+$//;
207 if (/^end$/i) { 511 if (/^end$/i) {
208 last; 512 last;
513
209 } elsif (/^arch (\S+)$/) { 514 } elsif (/^arch (\S+)$/i) {
210 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 515 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
516
211 } elsif (/^lore$/) { 517 } elsif (/^lore$/i) {
212 while (<$fh>) { 518 while (<$fh>) {
213 last if /^endlore\s*$/i; 519 last if /^endlore\s*$/i;
214 $arc{lore} .= $_; 520 $arc{lore} .= $_;
215 } 521 }
216 } elsif (/^msg$/) { 522 } elsif (/^msg$/i) {
217 while (<$fh>) { 523 while (<$fh>) {
218 last if /^endmsg\s*$/i; 524 last if /^endmsg\s*$/i;
219 $arc{msg} .= $_; 525 $arc{msg} .= $_;
220 } 526 }
527 } elsif (/^anim$/i) {
528 while (<$fh>) {
529 last if /^mina\s*$/i;
530 chomp;
531 push @{ $arc{anim} }, $_;
532 }
221 } elsif (/^(\S+)\s*(.*)$/) { 533 } elsif (/^(\S+)\s*(.*)$/) {
222 $arc{lc $1} = $2; 534 $arc{lc $1} = $2;
223 } elsif (/^\s*($|#)/) { 535 } elsif (/^\s*#/) {
536 $arc{_comment} .= "$_\n";
537
538 } elsif (/^\s*$/) {
224 # 539 #
225 } else { 540 } else {
226 warn "$path: unparsable line '$_' in arch $arc{_name}"; 541 warn "$path: unparsable line '$_' in arch $arc{_name}";
227 } 542 }
228 } 543 }
… …
234 s/\s+$//; 549 s/\s+$//;
235 if (/^more$/i) { 550 if (/^more$/i) {
236 $more = $prev; 551 $more = $prev;
237 } elsif (/^object (\S+)$/i) { 552 } elsif (/^object (\S+)$/i) {
238 my $name = $1; 553 my $name = $1;
239 my $arc = $parse_block->(_name => $name); 554 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
555 undef $comment;
556 delete $arc{_comment} unless length $arc{_comment};
557 $arc->{_atype} = 'object';
240 558
241 if ($more) { 559 if ($more) {
242 $more->{more} = $arc; 560 $more->{more} = $arc;
243 } else { 561 } else {
244 $arc{$name} = $arc; 562 $arc{$name} = $arc;
245 } 563 }
246 $prev = $arc; 564 $prev = $arc;
247 $more = undef; 565 $more = undef;
248 } elsif (/^arch (\S+)$/i) { 566 } elsif (/^arch (\S+)$/i) {
249 push @{ $arc{arch} }, normalize_arch $parse_block->(_name => $1); 567 my $name = $1;
568 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
569 undef $comment;
570 delete $arc{_comment} unless length $arc{_comment};
571 $arc->{_atype} = 'arch';
572
573 if ($more) {
574 $more->{more} = $arc;
575 } else {
576 push @{ $arc{arch} }, $arc;
577 }
578 $prev = $arc;
579 $more = undef;
580 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
581 if ($1 eq "lev_array") {
582 while (<$fh>) {
583 last if /^endplst\s*$/;
584 push @{$toplevel->{lev_array}}, $_+0;
585 }
586 } else {
587 $toplevel->{$1} = $2;
588 }
589 } elsif (/^\s*#/) {
590 $comment .= "$_\n";
250 } elsif (/^\s*($|#)/) { 591 } elsif (/^\s*($|#)/) {
251 # 592 #
252 } else { 593 } else {
253 warn "$path: unparseable top-level line '$_'"; 594 die "$path: unparseable top-level line '$_'";
254 } 595 }
255 } 596 }
256 597
257 undef $parse_block; # work around bug in perl not freeing $fh etc. 598 undef $parse_block; # work around bug in perl not freeing $fh etc.
258 599
259 \%arc 600 \%arc
601}
602
603sub archlist_to_string {
604 my ($arch) = @_;
605
606 my $str;
607
608 my $append; $append = sub {
609 my %a = %{$_[0]};
610
611 Crossfire::attr_freeze \%a;
612 Crossfire::normalize_arch \%a;
613
614 # undo the bit-split we did before
615 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
616 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
617 | (delete $a{attack_movement_bits_4_7});
618 }
619
620 if (my $comment = delete $a{_comment}) {
621 if ($comment =~ /[^\n\s#]/) {
622 $str .= $comment;
623 }
624 }
625
626 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
627
628 my $inv = delete $a{inventory};
629 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
630 my $anim = delete $a{anim};
631
632 if ($a{_atype} eq 'object') {
633 $str .= join "\n", "anim", @$anim, "mina\n"
634 if $anim;
635 }
636
637 my @kv;
638
639 for ($a{_name} eq "map"
640 ? @Crossfire::FIELD_ORDER_MAP
641 : @Crossfire::FIELD_ORDER) {
642 push @kv, [$_, delete $a{$_}]
643 if exists $a{$_};
644 }
645
646 for (sort keys %a) {
647 next if /^_/; # ignore our _-keys
648 push @kv, [$_, delete $a{$_}];
649 }
650
651 for (@kv) {
652 my ($k, $v) = @$_;
653
654 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
655 $v =~ s/\n$//;
656 $str .= "$k\n$v\n$end\n";
657 } else {
658 $str .= "$k $v\n";
659 }
660 }
661
662 if ($inv) {
663 $append->($_) for @$inv;
664 }
665
666 $str .= "end\n";
667
668 if ($a{_atype} eq 'object') {
669 if ($more) {
670 $str .= "more\n";
671 $append->($more) if $more;
672 } else {
673 $str .= "\n";
674 }
675 }
676 };
677
678 for (@$arch) {
679 $append->($_);
680 }
681
682 $str
260} 683}
261 684
262# put all archs into a hash with editor_face as it's key 685# put all archs into a hash with editor_face as it's key
263# NOTE: the arrays in the hash values are references to 686# NOTE: the arrays in the hash values are references to
264# the archs from $ARCH 687# the archs from $ARCH
265sub editor_archs { 688sub editor_archs {
266 my %paths; 689 my %paths;
267 690
268 for (keys %ARCH) { 691 for (keys %ARCH) {
269 my $arch = $ARCH{$_}; 692 my $arch = $ARCH{$_};
270 push @{$paths{$arch->{editor_folder}}}, \$arch; 693 push @{$paths{$arch->{editor_folder}}}, $arch;
271 } 694 }
272 695
273 \%paths 696 \%paths
274} 697}
275 698
… …
285 my ($a) = @_; 708 my ($a) = @_;
286 709
287 my $o = $ARCH{$a->{_name}} 710 my $o = $ARCH{$a->{_name}}
288 or return; 711 or return;
289 712
290 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 713 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
714 unless ($face) {
715 $face = $FACE{"blank.x11"}
291 or (warn "no face data found for arch '$a->{_name}'"), return; 716 or (warn "no face data found for arch '$a->{_name}'"), return;
717 }
292 718
293 if ($face->{w} > 1 || $face->{h} > 1) { 719 if ($face->{w} > 1 || $face->{h} > 1) {
294 # bigface 720 # bigface
295 return (0, 0, $face->{w} - 1, $face->{h} - 1); 721 return (0, 0, $face->{w} - 1, $face->{h} - 1);
296 722
… …
340 my $type = $obj->{type} || $arch->{type}; 766 my $type = $obj->{type} || $arch->{type};
341 767
342 if ($type > 0) { 768 if ($type > 0) {
343 $root = $Crossfire::Data::ATTR{$type}; 769 $root = $Crossfire::Data::ATTR{$type};
344 } else { 770 } else {
771 my %a = (%$arch, %$obj);
772
773 if ($a{is_floor} && !$a{alive}) {
774 $root = $Crossfire::Data::TYPE{Floor};
775 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
776 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
777 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
778 $root = $Crossfire::Data::TYPE{Wall};
779 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
780 $root = $Crossfire::Data::TYPE{"Weak Wall"};
781 } else {
345 $root = $Crossfire::Data::TYPE{Misc}; 782 $root = $Crossfire::Data::TYPE{Misc};
346
347 type:
348 for (@Crossfire::Data::ATTR0) {
349 my $req = $_->{required}
350 or die "internal error: ATTR0 without 'required'";
351
352 keys %$req;
353 while (my ($k, $v) = each %$req) {
354 next type
355 unless $obj->{$k} == $v || $arch->{$k} == $v;
356 }
357
358 $root = $_;
359 } 783 }
360 } 784 }
361 785
362 my @import = ($root); 786 my @import = ($root);
363 787
… …
405 ]; 829 ];
406 830
407 $attr 831 $attr
408} 832}
409 833
410sub arch_edit_sections {
411# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
412# edit_type = 0;
413# else if (edit_type != 0) {
414# // all flags from 'check_type' must be unset in this arch because they get recalculated now
415# edit_type &= ~check_type;
416# }
417#
418# }
419# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
420# getAttributeValue("alive", defarch) == 1 &&
421# (getAttributeValue("monster", defarch) == 1 ||
422# getAttributeValue("generator", defarch) == 1)) {
423# // Monster: monsters/npcs/generators
424# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
425# }
426# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
427# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
428# // Walls
429# edit_type |= IGUIConstants.TILE_EDIT_WALL;
430# }
431# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
432# getAttributeValue("connected", defarch) != 0) {
433# // Connected Objects
434# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
435# }
436# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
437# arch_type == 66 || arch_type == 41 || arch_type == 95) {
438# // Exit: teleporter/exit/trapdoors
439# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
440# }
441# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
442# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
443# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
444# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
445# arch_type == 124 || arch_type == 130)) {
446# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
447# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
448# }
449# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
450# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
451# arch_type == 91 || arch_type == 21 || arch_type == 24) {
452# // Door: door/special door/gates + keys
453# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
454# }
455# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
456# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
457# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
458# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
459# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
460# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
461# arch_type == 122 || arch_type == 3)) {
462# // Equipment: weapons/armour/wands/rods
463# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
464# }
465#
466# return(edit_type);
467#
468#
469}
470
471sub cache_file($$&&) { 834sub cache_file($$&&) {
472 my ($src, $cache, $load, $create) = @_; 835 my ($src, $cache, $load, $create) = @_;
473 836
474 my ($size, $mtime) = (stat $src)[7,9] 837 my ($size, $mtime) = (stat $src)[7,9]
475 or Carp::croak "$src: $!"; 838 or Carp::croak "$src: $!";
… …
537 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 900 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
538 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 901 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
539 or die "$VARDIR/tilecache.png: $!"; 902 or die "$VARDIR/tilecache.png: $!";
540 *FACE = $_[0]; 903 *FACE = $_[0];
541 }, sub { 904 }, sub {
542 require File::Temp;
543
544 my $tile = read_pak "$LIB/crossfire.0"; 905 my $tile = read_pak "$LIB/crossfire.0";
545 906
546 my %cache; 907 my %cache;
547 908
548 my $idx = 0; 909 my $idx = 0;
549 910
550 for my $name (sort keys %$tile) { 911 for my $name (sort keys %$tile) {
551 my ($fh, $filename) = File::Temp::tempfile (); 912 my $pb = new Gtk2::Gdk::PixbufLoader;
552 print $fh $tile->{$name}; 913 $pb->write ($tile->{$name});
553 close $fh; 914 $pb->close;
554 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 915 my $pb = $pb->get_pixbuf;
555 unlink $filename;
556 916
557 my $tile = $cache{$name} = { 917 my $tile = $cache{$name} = {
558 pb => $pb, 918 pb => $pb,
559 idx => $idx, 919 idx => $idx,
560 w => int $pb->get_width / TILESIZE, 920 w => int $pb->get_width / TILESIZE,
… …
578 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 938 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
579 } 939 }
580 } 940 }
581 } 941 }
582 942
583 $pb->save ("$VARDIR/tilecache.png", "png"); 943 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
584 944
585 \%cache 945 \%cache
586 }; 946 };
587} 947}
588 948

Diff Legend

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