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.50 by root, Mon Mar 20 01:12:23 2006 UTC vs.
Revision 1.107 by root, Wed May 9 11:44:40 2007 UTC

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

Diff Legend

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