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.55 by root, Thu Mar 23 07:06:17 2006 UTC vs.
Revision 1.111 by elmex, Thu Jun 7 14:45:22 2007 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.1'; 9our $VERSION = '0.99';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
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
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
42# same as in server save routine, to (hopefully) be compatible 50# same as in server save routine, to (hopefully) be compatible
43# to the other editors. 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
44our @FIELD_ORDER = (qw( 62our @FIELD_ORDER = (qw(
63 inherit
64
65 elevation
66
45 name name_pl custom_name title race 67 name name_pl custom_name attach title race
46 slaying skill msg lore other_arch face 68 slaying skill msg lore other_arch
47 #events
48 animation is_animated 69 face animation is_animated
70 magicmap smoothlevel smoothface
49 Str Dex Con Wis Pow Cha Int 71 str dex con wis pow cha int
50 hp maxhp sp maxsp grace maxgrace 72 hp maxhp sp maxsp grace maxgrace
51 exp perm_exp expmul 73 exp perm_exp expmul
52 food dam luck wc ac x y speed speed_left move_state attack_movement 74 food dam luck wc ac x y speed speed_left move_state attack_movement
53 nrof level direction type subtype 75 nrof level direction type subtype attacktype
54 76
55 resist_physical resist_magic resist_fire resist_electricity 77 resist_physical resist_magic resist_fire resist_electricity
56 resist_cold resist_confusion resist_acid resist_drain 78 resist_cold resist_confusion resist_acid resist_drain
57 resist_weaponmagic resist_ghosthit resist_poison resist_slow 79 resist_weaponmagic resist_ghosthit resist_poison resist_slow
58 resist_paralyze resist_turn_undead resist_fear resist_cancellation 80 resist_paralyze resist_turn_undead resist_fear resist_cancellation
… …
61 resist_life_stealing resist_disease 83 resist_life_stealing resist_disease
62 84
63 path_attuned path_repelled path_denied material materialname 85 path_attuned path_repelled path_denied material materialname
64 value carrying weight invisible state magic 86 value carrying weight invisible state magic
65 last_heal last_sp last_grace last_eat 87 last_heal last_sp last_grace last_eat
66 connected glow_radius randomitems npx_status npc_program 88 connected glow_radius randomitems tresure_env npx_status npc_program
67 run_away pick_up container will_apply smoothlevel 89 run_away pick_up container will_apply smoothlevel
68 current_weapon_script weapontype tooltype elevation client_type 90 current_weapon_script weapontype tooltype elevation client_type
69 item_power duration range 91 item_power duration range
70 range_modifier duration_modifier dam_modifier gen_sp_armour 92 range_modifier duration_modifier dam_modifier gen_sp_armour
71 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty 93 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
… …
82 known_magical known_cursed can_use_skill been_applied has_ready_scroll 104 known_magical known_cursed can_use_skill been_applied has_ready_scroll
83 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly 105 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
84 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark 106 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
85 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage 107 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
86 activate_on_push activate_on_release is_water use_content_on_gen is_buildable 108 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
109 precious
87 110
88 body_range body_arm body_torso body_head body_neck body_skill 111 body_range body_arm body_torso body_head body_neck body_skill
89 body_finger body_shoulder body_foot body_hand body_wrist body_waist 112 body_finger body_shoulder body_foot body_hand body_wrist body_waist
90)); 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);
91 129
92sub MOVE_WALK (){ 0x01 } 130sub MOVE_WALK (){ 0x01 }
93sub MOVE_FLY_LOW (){ 0x02 } 131sub MOVE_FLY_LOW (){ 0x02 }
94sub MOVE_FLY_HIGH (){ 0x04 } 132sub MOVE_FLY_HIGH (){ 0x04 }
95sub MOVE_FLYING (){ 0x06 } 133sub MOVE_FLYING (){ 0x06 }
96sub MOVE_SWIM (){ 0x08 } 134sub MOVE_SWIM (){ 0x08 }
97sub MOVE_BOAT (){ 0x10 } 135sub MOVE_BOAT (){ 0x10 }
98sub 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}
99 239
100sub load_ref($) { 240sub load_ref($) {
101 my ($path) = @_; 241 my ($path) = @_;
102 242
103 open my $fh, "<", $path 243 open my $fh, "<:raw:perlio", $path
104 or die "$path: $!"; 244 or die "$path: $!";
105 binmode $fh;
106 local $/; 245 local $/;
107 246
108 thaw <$fh> 247 thaw <$fh>
109} 248}
110 249
111sub save_ref($$) { 250sub save_ref($$) {
112 my ($ref, $path) = @_; 251 my ($ref, $path) = @_;
113 252
114 open my $fh, ">", "$path~" 253 open my $fh, ">:raw:perlio", "$path~"
115 or die "$path~: $!"; 254 or die "$path~: $!";
116 binmode $fh;
117 print $fh freeze $ref; 255 print $fh freeze $ref;
118 close $fh; 256 close $fh;
119 rename "$path~", $path 257 rename "$path~", $path
120 or die "$path: $!"; 258 or die "$path: $!";
121} 259}
122 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
123sub normalize_object($) { 330sub normalize_object($) {
124 my ($ob) = @_; 331 my ($ob) = @_;
125 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 # check whether attachment is the same as in the archetype
353 if (exists $ob->{attach}) {
354 my $arch = $ARCH{$ob->{_name}};
355 my $js = JSON::XS->new->utf8->canonical (1);
356
357 if (defined $arch->{attach}
358 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
359 delete $ob->{attach}
360 }
361 }
362
363 # color_fg is used as default for magicmap if magicmap does not exist
364 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
365
366 # nuke outdated or never supported fields
126 delete $ob->{$_} for qw( 367 delete @$ob{qw(
127 can_knockback can_parry can_impale can_cut can_dam_armour 368 can_knockback can_parry can_impale can_cut can_dam_armour
128 can_apply pass_thru can_pass_thru 369 can_apply pass_thru can_pass_thru color_bg color_fg
129 ); 370 )};
130 371
131 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 372 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
373 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
374 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
375
376 # convert movement strings to bitsets
377 for my $attr (keys %FIELD_MOVEMENT) {
132 next unless exists $ob->{$attr}; 378 next unless exists $ob->{$attr};
133 next if $ob->{$attr} =~ /^\d+$/;
134 379
135 my $flags = 0; 380 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr};
136
137 # assume list
138 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
139 $flags |= MOVE_WALK if $flag eq "walk";
140 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
141 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
142 $flags |= MOVE_FLYING if $flag eq "flying";
143 $flags |= MOVE_SWIM if $flag eq "swim";
144 $flags |= MOVE_BOAT if $flag eq "boat";
145 $flags |= MOVE_ALL if $flag eq "all";
146
147 $flags &= ~MOVE_WALK if $flag eq "-walk";
148 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
149 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
150 $flags &= ~MOVE_FLYING if $flag eq "-flying";
151 $flags &= ~MOVE_SWIM if $flag eq "-swim";
152 $flags &= ~MOVE_BOAT if $flag eq "-boat";
153 $flags &= ~MOVE_ALL if $flag eq "-all";
154 }
155
156 $ob->{$attr} = $flags;
157 } 381 }
158 382
383 # convert outdated movement flags to new movement sets
159 if (defined (my $v = delete $ob->{no_pass})) { 384 if (defined (my $v = delete $ob->{no_pass})) {
160 $ob->{move_block} = $v ? MOVE_ALL : 0; 385 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
161 } 386 }
162 if (defined (my $v = delete $ob->{slow_move})) { 387 if (defined (my $v = delete $ob->{slow_move})) {
163 $ob->{move_slow} |= MOVE_WALK; 388 $ob->{move_slow} += "walk";
164 $ob->{move_slow_penalty} = $v; 389 $ob->{move_slow_penalty} = $v;
165 } 390 }
166 if (defined (my $v = delete $ob->{walk_on})) { 391 if (defined (my $v = delete $ob->{walk_on})) {
167 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 392 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
168 : $ob->{move_on} & ~MOVE_WALK;
169 } 393 }
170 if (defined (my $v = delete $ob->{walk_off})) { 394 if (defined (my $v = delete $ob->{walk_off})) {
171 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 395 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
172 : $ob->{move_off} & ~MOVE_WALK;
173 } 396 }
174 if (defined (my $v = delete $ob->{fly_on})) { 397 if (defined (my $v = delete $ob->{fly_on})) {
175 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 398 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
176 : $ob->{move_on} & ~MOVE_FLY_LOW;
177 } 399 }
178 if (defined (my $v = delete $ob->{fly_off})) { 400 if (defined (my $v = delete $ob->{fly_off})) {
179 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 401 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
180 : $ob->{move_off} & ~MOVE_FLY_LOW;
181 } 402 }
182 if (defined (my $v = delete $ob->{flying})) { 403 if (defined (my $v = delete $ob->{flying})) {
183 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 404 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
184 : $ob->{move_type} & ~MOVE_FLY_LOW;
185 } 405 }
406
407 # convert idiotic event_xxx things into objects
408 while (my ($event, $subtype) = each %EVENT_TYPE) {
409 if (exists $ob->{"event_${event}_plugin"}) {
410 push @{$ob->{inventory}}, {
411 _name => "event_$event",
412 title => delete $ob->{"event_${event}_plugin"},
413 slaying => delete $ob->{"event_${event}"},
414 name => delete $ob->{"event_${event}_options"},
415 };
416 }
417 }
418
419 # some archetypes had "+3" instead of the canonical "3", so fix
420 $ob->{dam} *= 1 if exists $ob->{dam};
186 421
187 $ob 422 $ob
188} 423}
189 424
425# arch as in "arch xxx", ie.. objects
190sub normalize_arch($) { 426sub normalize_arch($) {
191 my ($ob) = @_; 427 my ($ob) = @_;
192 428
193 normalize_object $ob; 429 normalize_object $ob;
194 430
… …
221 delete $ob->{$k}; 457 delete $ob->{$k};
222 } 458 }
223 } 459 }
224 } 460 }
225 461
462 # a speciality for the editor
463 if (exists $ob->{attack_movement}) {
464 my $am = delete $ob->{attack_movement};
465 $ob->{attack_movement_bits_0_3} = $am & 15;
466 $ob->{attack_movement_bits_4_7} = $am & 240;
467 }
468
469 $ob
470}
471
472sub attr_thaw($) {
473 my ($ob) = @_;
474
475 $ob->{attach} = from_json $ob->{attach}
476 if exists $ob->{attach};
477
478 $ob
479}
480
481sub attr_freeze($) {
482 my ($ob) = @_;
483
484 $ob->{attach} = Crossfire::to_json $ob->{attach}
485 if exists $ob->{attach};
486
226 $ob 487 $ob
227} 488}
228 489
229sub read_pak($) { 490sub read_pak($) {
230 my ($path) = @_; 491 my ($path) = @_;
231 492
232 my %pak; 493 my %pak;
233 494
234 open my $fh, "<", $path 495 open my $fh, "<:raw:perlio", $path
235 or Carp::croak "$_[0]: $!"; 496 or Carp::croak "$_[0]: $!";
236 binmode $fh; 497 binmode $fh;
237 while (<$fh>) { 498 while (<$fh>) {
238 my ($type, $id, $len, $path) = split; 499 my ($type, $id, $len, $path) = split;
239 $path =~ s/.*\///; 500 $path =~ s/.*\///;
… …
241 } 502 }
242 503
243 \%pak 504 \%pak
244} 505}
245 506
246sub read_arch($) { 507sub read_arch($;$) {
247 my ($path) = @_; 508 my ($path, $toplevel) = @_;
248 509
249 my %arc; 510 my %arc;
250 my ($more, $prev); 511 my ($more, $prev);
512 my $comment;
251 513
252 open my $fh, "<", $path 514 open my $fh, "<:raw:perlio:utf8", $path
253 or Carp::croak "$path: $!"; 515 or Carp::croak "$path: $!";
254 516
255 binmode $fh; 517# binmode $fh;
256 518
257 my $parse_block; $parse_block = sub { 519 my $parse_block; $parse_block = sub {
258 my %arc = @_; 520 my %arc = @_;
259 521
260 while (<$fh>) { 522 while (<$fh>) {
261 s/\s+$//; 523 s/\s+$//;
262 if (/^end$/i) { 524 if (/^end$/i) {
263 last; 525 last;
526
264 } elsif (/^arch (\S+)$/i) { 527 } elsif (/^arch (\S+)$/i) {
265 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 528 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
529
266 } elsif (/^lore$/i) { 530 } elsif (/^lore$/i) {
267 while (<$fh>) { 531 while (<$fh>) {
268 last if /^endlore\s*$/i; 532 last if /^endlore\s*$/i;
269 $arc{lore} .= $_; 533 $arc{lore} .= $_;
270 } 534 }
271 } elsif (/^msg$/i) { 535 } elsif (/^msg$/i) {
272 while (<$fh>) { 536 while (<$fh>) {
273 last if /^endmsg\s*$/i; 537 last if /^endmsg\s*$/i;
274 $arc{msg} .= $_; 538 $arc{msg} .= $_;
275 } 539 }
540 } elsif (/^anim$/i) {
541 while (<$fh>) {
542 last if /^mina\s*$/i;
543 chomp;
544 push @{ $arc{anim} }, $_;
545 }
276 } elsif (/^(\S+)\s*(.*)$/) { 546 } elsif (/^(\S+)\s*(.*)$/) {
277 $arc{lc $1} = $2; 547 $arc{lc $1} = $2;
278 } elsif (/^\s*($|#)/) { 548 } elsif (/^\s*#/) {
549 $arc{_comment} .= "$_\n";
550
551 } elsif (/^\s*$/) {
279 # 552 #
280 } else { 553 } else {
281 warn "$path: unparsable line '$_' in arch $arc{_name}"; 554 warn "$path: unparsable line '$_' in arch $arc{_name}";
282 } 555 }
283 } 556 }
… …
289 s/\s+$//; 562 s/\s+$//;
290 if (/^more$/i) { 563 if (/^more$/i) {
291 $more = $prev; 564 $more = $prev;
292 } elsif (/^object (\S+)$/i) { 565 } elsif (/^object (\S+)$/i) {
293 my $name = $1; 566 my $name = $1;
294 my $arc = normalize_object $parse_block->(_name => $name); 567 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
568 undef $comment;
569 delete $arc{_comment} unless length $arc{_comment};
570 $arc->{_atype} = 'object';
295 571
296 if ($more) { 572 if ($more) {
297 $more->{more} = $arc; 573 $more->{more} = $arc;
298 } else { 574 } else {
299 $arc{$name} = $arc; 575 $arc{$name} = $arc;
300 } 576 }
301 $prev = $arc; 577 $prev = $arc;
302 $more = undef; 578 $more = undef;
303 } elsif (/^arch (\S+)$/i) { 579 } elsif (/^arch (\S+)$/i) {
304 my $name = $1; 580 my $name = $1;
305 my $arc = normalize_object $parse_block->(_name => $name); 581 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
582 undef $comment;
583 delete $arc{_comment} unless length $arc{_comment};
584 $arc->{_atype} = 'arch';
306 585
307 if ($more) { 586 if ($more) {
308 $more->{more} = $arc; 587 $more->{more} = $arc;
309 } else { 588 } else {
310 push @{ $arc{arch} }, $arc; 589 push @{ $arc{arch} }, $arc;
311 } 590 }
312 $prev = $arc; 591 $prev = $arc;
313 $more = undef; 592 $more = undef;
593 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
594 if ($1 eq "lev_array") {
595 while (<$fh>) {
596 last if /^endplst\s*$/;
597 push @{$toplevel->{lev_array}}, $_+0;
598 }
599 } else {
600 $toplevel->{$1} = $2;
601 }
602 } elsif (/^\s*#/) {
603 $comment .= "$_\n";
314 } elsif (/^\s*($|#)/) { 604 } elsif (/^\s*($|#)/) {
315 # 605 #
316 } else { 606 } else {
317 warn "$path: unparseable top-level line '$_'"; 607 die "$path: unparseable top-level line '$_'";
318 } 608 }
319 } 609 }
320 610
321 undef $parse_block; # work around bug in perl not freeing $fh etc. 611 undef $parse_block; # work around bug in perl not freeing $fh etc.
322 612
323 \%arc 613 \%arc
614}
615
616sub archlist_to_string {
617 my ($arch) = @_;
618
619 my $str;
620
621 my $append; $append = sub {
622 my %a = %{$_[0]};
623
624 Crossfire::attr_freeze \%a;
625 Crossfire::normalize_arch \%a;
626
627 # undo the bit-split we did before
628 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
629 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
630 | (delete $a{attack_movement_bits_4_7});
631 }
632
633 if (my $comment = delete $a{_comment}) {
634 if ($comment =~ /[^\n\s#]/) {
635 $str .= $comment;
636 }
637 }
638
639 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
640
641 my $inv = delete $a{inventory};
642 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
643 my $anim = delete $a{anim};
644
645 if ($a{_atype} eq 'object') {
646 $str .= join "\n", "anim", @$anim, "mina\n"
647 if $anim;
648 }
649
650 my @kv;
651
652 for ($a{_name} eq "map"
653 ? @Crossfire::FIELD_ORDER_MAP
654 : @Crossfire::FIELD_ORDER) {
655 push @kv, [$_, delete $a{$_}]
656 if exists $a{$_};
657 }
658
659 for (sort keys %a) {
660 next if /^_/; # ignore our _-keys
661 push @kv, [$_, delete $a{$_}];
662 }
663
664 for (@kv) {
665 my ($k, $v) = @$_;
666
667 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
668 $v =~ s/\n$//;
669 $str .= "$k\n$v\n$end\n";
670 } else {
671 $str .= "$k $v\n";
672 }
673 }
674
675 if ($inv) {
676 $append->($_) for @$inv;
677 }
678
679 $str .= "end\n";
680
681 if ($a{_atype} eq 'object') {
682 if ($more) {
683 $str .= "more\n";
684 $append->($more) if $more;
685 } else {
686 $str .= "\n";
687 }
688 }
689 };
690
691 for (@$arch) {
692 $append->($_);
693 }
694
695 $str
324} 696}
325 697
326# put all archs into a hash with editor_face as it's key 698# put all archs into a hash with editor_face as it's key
327# NOTE: the arrays in the hash values are references to 699# NOTE: the arrays in the hash values are references to
328# the archs from $ARCH 700# the archs from $ARCH
329sub editor_archs { 701sub editor_archs {
330 my %paths; 702 my %paths;
331 703
332 for (keys %ARCH) { 704 for (keys %ARCH) {
333 my $arch = $ARCH{$_}; 705 my $arch = $ARCH{$_};
334 push @{$paths{$arch->{editor_folder}}}, \$arch; 706 push @{$paths{$arch->{editor_folder}}}, $arch;
335 } 707 }
336 708
337 \%paths 709 \%paths
338} 710}
339 711
… …
349 my ($a) = @_; 721 my ($a) = @_;
350 722
351 my $o = $ARCH{$a->{_name}} 723 my $o = $ARCH{$a->{_name}}
352 or return; 724 or return;
353 725
354 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 726 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
727 unless ($face) {
728 $face = $FACE{"blank.x11"}
355 or (warn "no face data found for arch '$a->{_name}'"), return; 729 or (warn "no face data found for arch '$a->{_name}'"), return;
730 }
356 731
357 if ($face->{w} > 1 || $face->{h} > 1) { 732 if ($face->{w} > 1 || $face->{h} > 1) {
358 # bigface 733 # bigface
359 return (0, 0, $face->{w} - 1, $face->{h} - 1); 734 return (0, 0, $face->{w} - 1, $face->{h} - 1);
360 735
… …
404 my $type = $obj->{type} || $arch->{type}; 779 my $type = $obj->{type} || $arch->{type};
405 780
406 if ($type > 0) { 781 if ($type > 0) {
407 $root = $Crossfire::Data::ATTR{$type}; 782 $root = $Crossfire::Data::ATTR{$type};
408 } else { 783 } else {
784 my %a = (%$arch, %$obj);
785
786 if ($a{is_floor} && !$a{alive}) {
787 $root = $Crossfire::Data::TYPE{Floor};
788 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
789 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
790 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
791 $root = $Crossfire::Data::TYPE{Wall};
792 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
793 $root = $Crossfire::Data::TYPE{"Weak Wall"};
794 } else {
409 $root = $Crossfire::Data::TYPE{Misc}; 795 $root = $Crossfire::Data::TYPE{Misc};
410
411 type:
412 for (@Crossfire::Data::ATTR0) {
413 my $req = $_->{required}
414 or die "internal error: ATTR0 without 'required'";
415
416 keys %$req;
417 while (my ($k, $v) = each %$req) {
418 next type
419 unless $obj->{$k} == $v || $arch->{$k} == $v;
420 }
421
422 $root = $_;
423 } 796 }
424 } 797 }
425 798
426 my @import = ($root); 799 my @import = ($root);
427 800
… …
469 ]; 842 ];
470 843
471 $attr 844 $attr
472} 845}
473 846
474sub arch_edit_sections {
475# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
476# edit_type = 0;
477# else if (edit_type != 0) {
478# // all flags from 'check_type' must be unset in this arch because they get recalculated now
479# edit_type &= ~check_type;
480# }
481#
482# }
483# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
484# getAttributeValue("alive", defarch) == 1 &&
485# (getAttributeValue("monster", defarch) == 1 ||
486# getAttributeValue("generator", defarch) == 1)) {
487# // Monster: monsters/npcs/generators
488# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
489# }
490# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
491# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
492# // Walls
493# edit_type |= IGUIConstants.TILE_EDIT_WALL;
494# }
495# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
496# getAttributeValue("connected", defarch) != 0) {
497# // Connected Objects
498# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
499# }
500# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
501# arch_type == 66 || arch_type == 41 || arch_type == 95) {
502# // Exit: teleporter/exit/trapdoors
503# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
504# }
505# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
506# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
507# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
508# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
509# arch_type == 124 || arch_type == 130)) {
510# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
511# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
512# }
513# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
514# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
515# arch_type == 91 || arch_type == 21 || arch_type == 24) {
516# // Door: door/special door/gates + keys
517# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
518# }
519# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
520# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
521# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
522# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
523# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
524# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
525# arch_type == 122 || arch_type == 3)) {
526# // Equipment: weapons/armour/wands/rods
527# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
528# }
529#
530# return(edit_type);
531#
532#
533}
534
535sub cache_file($$&&) { 847sub cache_file($$&&) {
536 my ($src, $cache, $load, $create) = @_; 848 my ($src, $cache, $load, $create) = @_;
537 849
538 my ($size, $mtime) = (stat $src)[7,9] 850 my ($size, $mtime) = (stat $src)[7,9]
539 or Carp::croak "$src: $!"; 851 or Carp::croak "$src: $!";
… …
587 }, sub { 899 }, sub {
588 read_arch "$LIB/archetypes" 900 read_arch "$LIB/archetypes"
589 }; 901 };
590} 902}
591 903
904sub construct_tilecache_pb {
905 my ($idx, $cache) = @_;
906
907 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
908
909 while (my ($name, $tile) = each %$cache) {
910 my $tpb = delete $tile->{pb};
911 my $ofs = $tile->{idx};
912
913 for my $x (0 .. $tile->{w} - 1) {
914 for my $y (0 .. $tile->{h} - 1) {
915 my $idx = $ofs + $x + $y * $tile->{w};
916 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
917 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
918 }
919 }
920 }
921
922 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
923
924 $cache
925}
926
927sub use_tilecache {
928 my ($face) = @_;
929 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
930 or die "$VARDIR/tilecache.png: $!";
931 *FACE = $_[0];
932}
933
592=item load_tilecache 934=item load_tilecache
593 935
594(Re-)Load %TILE and %FACE. 936(Re-)Load %TILE and %FACE.
595 937
596=cut 938=cut
597 939
598sub load_tilecache() { 940sub load_tilecache() {
599 require Gtk2; 941 require Gtk2;
600 942
601 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 943 if (-e "$LIB/facedata") { # Crossfire TRT faces
602 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 944 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
603 or die "$VARDIR/tilecache.png: $!"; 945 sub {
604 *FACE = $_[0];
605 }, sub {
606 require File::Temp;
607
608 my $tile = read_pak "$LIB/crossfire.0";
609
610 my %cache; 946 my %cache;
947 my $facedata = Storable::retrieve "$LIB/facedata";
611 948
949 $facedata->{version} == 2
950 or die "$LIB/facedata: version mismatch, cannot proceed.";
951
952 my $faces = $facedata->{faceinfo};
612 my $idx = 0; 953 my $idx = 0;
613 954
614 for my $name (sort keys %$tile) { 955 for (sort keys %$faces) {
615 my ($fh, $filename) = File::Temp::tempfile (); 956 my ($face, $info) = ($_, $faces->{$_});
616 print $fh $tile->{$name};
617 close $fh;
618 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename;
619 unlink $filename;
620 957
958 my $pb = new Gtk2::Gdk::PixbufLoader;
959 $pb->write ($info->{data32});
960 $pb->close;
961 my $pb = $pb->get_pixbuf;
962
621 my $tile = $cache{$name} = { 963 my $tile = $cache{$face} = {
622 pb => $pb, 964 pb => $pb,
623 idx => $idx, 965 idx => $idx,
624 w => int $pb->get_width / TILESIZE, 966 w => int $pb->get_width / TILESIZE,
625 h => int $pb->get_height / TILESIZE, 967 h => int $pb->get_height / TILESIZE,
968 };
969
970 $idx += $tile->{w} * $tile->{h};
971 }
972
973 construct_tilecache_pb $idx, \%cache;
974
975 \%cache
626 }; 976 };
977
978 } elsif (-e "$LIB/crossfire.0") { # Crossfire1 version
979 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
980 sub {
981 my $tile = read_pak "$LIB/crossfire.0";
982
983 my %cache;
984
985 my $idx = 0;
986
987 for my $name (sort keys %$tile) {
988 my $pb = new Gtk2::Gdk::PixbufLoader;
989 $pb->write ($tile->{$name});
990 $pb->close;
991 my $pb = $pb->get_pixbuf;
992
993 my $tile = $cache{$name} = {
994 pb => $pb,
995 idx => $idx,
996 w => int $pb->get_width / TILESIZE,
997 h => int $pb->get_height / TILESIZE,
627 998 };
628 999
629 $idx += $tile->{w} * $tile->{h}; 1000 $idx += $tile->{w} * $tile->{h};
630 }
631
632 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
633
634 while (my ($name, $tile) = each %cache) {
635 my $tpb = delete $tile->{pb};
636 my $ofs = $tile->{idx};
637
638 for my $x (0 .. $tile->{w} - 1) {
639 for my $y (0 .. $tile->{h} - 1) {
640 my $idx = $ofs + $x + $y * $tile->{w};
641 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
642 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
643 } 1001 }
1002
1003 construct_tilecache_pb $idx, \%cache;
1004
1005 \%cache
644 } 1006 };
645 }
646 1007
647 $pb->save ("$VARDIR/tilecache.png", "png");
648
649 \%cache
650 }; 1008 }
651} 1009}
652 1010
653=head1 AUTHOR 1011=head1 AUTHOR
654 1012
655 Marc Lehmann <schmorp@schmorp.de> 1013 Marc Lehmann <schmorp@schmorp.de>

Diff Legend

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