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.57 by root, Thu Mar 23 08:55:54 2006 UTC vs.
Revision 1.109 by elmex, Sun May 27 08:08:59 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
… …
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.
44our @FIELD_ORDER_MAP = (qw( 52our @FIELD_ORDER_MAP = (qw(
53 file_format_version
45 name swap_time reset_timeout fixed_resettime difficulty region 54 name attach swap_time reset_timeout fixed_resettime difficulty region
46 shopitems shopgreed shopmin shopmax shoprace 55 shopitems shopgreed shopmin shopmax shoprace
47 darkness width height enter_x enter_y msg maplore 56 darkness width height enter_x enter_y msg maplore
48 unique template 57 unique template
49 outdoor temp pressure humid windspeed winddir sky nosmooth 58 outdoor temp pressure humid windspeed winddir sky nosmooth
50 tile_path_1 tile_path_2 tile_path_3 tile_path_4 59 tile_path_1 tile_path_2 tile_path_3 tile_path_4
51)); 60));
52 61
53our @FIELD_ORDER = (qw( 62our @FIELD_ORDER = (qw(
63 inherit
64
54 elevation 65 elevation
55 66
56 name name_pl custom_name title race 67 name name_pl custom_name attach title race
57 slaying skill msg lore other_arch face 68 slaying skill msg lore other_arch
58 #todo-events
59 animation is_animated 69 face animation is_animated
70 magicmap smoothlevel smoothface
60 Str Dex Con Wis Pow Cha Int 71 str dex con wis pow cha int
61 hp maxhp sp maxsp grace maxgrace 72 hp maxhp sp maxsp grace maxgrace
62 exp perm_exp expmul 73 exp perm_exp expmul
63 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
64 nrof level direction type subtype 75 nrof level direction type subtype attacktype
65 76
66 resist_physical resist_magic resist_fire resist_electricity 77 resist_physical resist_magic resist_fire resist_electricity
67 resist_cold resist_confusion resist_acid resist_drain 78 resist_cold resist_confusion resist_acid resist_drain
68 resist_weaponmagic resist_ghosthit resist_poison resist_slow 79 resist_weaponmagic resist_ghosthit resist_poison resist_slow
69 resist_paralyze resist_turn_undead resist_fear resist_cancellation 80 resist_paralyze resist_turn_undead resist_fear resist_cancellation
… …
72 resist_life_stealing resist_disease 83 resist_life_stealing resist_disease
73 84
74 path_attuned path_repelled path_denied material materialname 85 path_attuned path_repelled path_denied material materialname
75 value carrying weight invisible state magic 86 value carrying weight invisible state magic
76 last_heal last_sp last_grace last_eat 87 last_heal last_sp last_grace last_eat
77 connected glow_radius randomitems npx_status npc_program 88 connected glow_radius randomitems tresure_env npx_status npc_program
78 run_away pick_up container will_apply smoothlevel 89 run_away pick_up container will_apply smoothlevel
79 current_weapon_script weapontype tooltype elevation client_type 90 current_weapon_script weapontype tooltype elevation client_type
80 item_power duration range 91 item_power duration range
81 range_modifier duration_modifier dam_modifier gen_sp_armour 92 range_modifier duration_modifier dam_modifier gen_sp_armour
82 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
… …
93 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
94 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
95 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
96 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
97 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
98 110
99 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
100 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
101)); 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);
102 129
103sub MOVE_WALK (){ 0x01 } 130sub MOVE_WALK (){ 0x01 }
104sub MOVE_FLY_LOW (){ 0x02 } 131sub MOVE_FLY_LOW (){ 0x02 }
105sub MOVE_FLY_HIGH (){ 0x04 } 132sub MOVE_FLY_HIGH (){ 0x04 }
106sub MOVE_FLYING (){ 0x06 } 133sub MOVE_FLYING (){ 0x06 }
107sub MOVE_SWIM (){ 0x08 } 134sub MOVE_SWIM (){ 0x08 }
108sub MOVE_BOAT (){ 0x10 } 135sub MOVE_BOAT (){ 0x10 }
109sub 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}
110 239
111sub load_ref($) { 240sub load_ref($) {
112 my ($path) = @_; 241 my ($path) = @_;
113 242
114 open my $fh, "<", $path 243 open my $fh, "<:raw:perlio", $path
115 or die "$path: $!"; 244 or die "$path: $!";
116 binmode $fh;
117 local $/; 245 local $/;
118 246
119 thaw <$fh> 247 thaw <$fh>
120} 248}
121 249
122sub save_ref($$) { 250sub save_ref($$) {
123 my ($ref, $path) = @_; 251 my ($ref, $path) = @_;
124 252
125 open my $fh, ">", "$path~" 253 open my $fh, ">:raw:perlio", "$path~"
126 or die "$path~: $!"; 254 or die "$path~: $!";
127 binmode $fh;
128 print $fh freeze $ref; 255 print $fh freeze $ref;
129 close $fh; 256 close $fh;
130 rename "$path~", $path 257 rename "$path~", $path
131 or die "$path: $!"; 258 or die "$path: $!";
132} 259}
133 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
134sub normalize_object($) { 330sub normalize_object($) {
135 my ($ob) = @_; 331 my ($ob) = @_;
136 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
137 delete $ob->{$_} for qw( 367 delete @$ob{qw(
138 can_knockback can_parry can_impale can_cut can_dam_armour 368 can_knockback can_parry can_impale can_cut can_dam_armour
139 can_apply pass_thru can_pass_thru 369 can_apply pass_thru can_pass_thru color_bg color_fg
140 ); 370 )};
141 371
142 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) {
143 next unless exists $ob->{$attr}; 378 next unless exists $ob->{$attr};
144 next if $ob->{$attr} =~ /^\d+$/;
145 379
146 my $flags = 0; 380 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr};
147
148 # assume list
149 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
150 $flags |= MOVE_WALK if $flag eq "walk";
151 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
152 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
153 $flags |= MOVE_FLYING if $flag eq "flying";
154 $flags |= MOVE_SWIM if $flag eq "swim";
155 $flags |= MOVE_BOAT if $flag eq "boat";
156 $flags |= MOVE_ALL if $flag eq "all";
157
158 $flags &= ~MOVE_WALK if $flag eq "-walk";
159 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
160 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
161 $flags &= ~MOVE_FLYING if $flag eq "-flying";
162 $flags &= ~MOVE_SWIM if $flag eq "-swim";
163 $flags &= ~MOVE_BOAT if $flag eq "-boat";
164 $flags &= ~MOVE_ALL if $flag eq "-all";
165 }
166
167 $ob->{$attr} = $flags;
168 } 381 }
169 382
383 # convert outdated movement flags to new movement sets
170 if (defined (my $v = delete $ob->{no_pass})) { 384 if (defined (my $v = delete $ob->{no_pass})) {
171 $ob->{move_block} = $v ? MOVE_ALL : 0; 385 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
172 } 386 }
173 if (defined (my $v = delete $ob->{slow_move})) { 387 if (defined (my $v = delete $ob->{slow_move})) {
174 $ob->{move_slow} |= MOVE_WALK; 388 $ob->{move_slow} += "walk";
175 $ob->{move_slow_penalty} = $v; 389 $ob->{move_slow_penalty} = $v;
176 } 390 }
177 if (defined (my $v = delete $ob->{walk_on})) { 391 if (defined (my $v = delete $ob->{walk_on})) {
178 $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" }
179 : $ob->{move_on} & ~MOVE_WALK;
180 } 393 }
181 if (defined (my $v = delete $ob->{walk_off})) { 394 if (defined (my $v = delete $ob->{walk_off})) {
182 $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" }
183 : $ob->{move_off} & ~MOVE_WALK;
184 } 396 }
185 if (defined (my $v = delete $ob->{fly_on})) { 397 if (defined (my $v = delete $ob->{fly_on})) {
186 $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" }
187 : $ob->{move_on} & ~MOVE_FLY_LOW;
188 } 399 }
189 if (defined (my $v = delete $ob->{fly_off})) { 400 if (defined (my $v = delete $ob->{fly_off})) {
190 $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" }
191 : $ob->{move_off} & ~MOVE_FLY_LOW;
192 } 402 }
193 if (defined (my $v = delete $ob->{flying})) { 403 if (defined (my $v = delete $ob->{flying})) {
194 $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" }
195 : $ob->{move_type} & ~MOVE_FLY_LOW;
196 } 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};
197 421
198 $ob 422 $ob
199} 423}
200 424
425# arch as in "arch xxx", ie.. objects
201sub normalize_arch($) { 426sub normalize_arch($) {
202 my ($ob) = @_; 427 my ($ob) = @_;
203 428
204 normalize_object $ob; 429 normalize_object $ob;
205 430
… …
242 } 467 }
243 468
244 $ob 469 $ob
245} 470}
246 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
487 $ob
488}
489
247sub read_pak($) { 490sub read_pak($) {
248 my ($path) = @_; 491 my ($path) = @_;
249 492
250 my %pak; 493 my %pak;
251 494
252 open my $fh, "<", $path 495 open my $fh, "<:raw:perlio", $path
253 or Carp::croak "$_[0]: $!"; 496 or Carp::croak "$_[0]: $!";
254 binmode $fh; 497 binmode $fh;
255 while (<$fh>) { 498 while (<$fh>) {
256 my ($type, $id, $len, $path) = split; 499 my ($type, $id, $len, $path) = split;
257 $path =~ s/.*\///; 500 $path =~ s/.*\///;
… …
259 } 502 }
260 503
261 \%pak 504 \%pak
262} 505}
263 506
264sub read_arch($) { 507sub read_arch($;$) {
265 my ($path) = @_; 508 my ($path, $toplevel) = @_;
266 509
267 my %arc; 510 my %arc;
268 my ($more, $prev); 511 my ($more, $prev);
512 my $comment;
269 513
270 open my $fh, "<", $path 514 open my $fh, "<:raw:perlio:utf8", $path
271 or Carp::croak "$path: $!"; 515 or Carp::croak "$path: $!";
272 516
273 binmode $fh; 517# binmode $fh;
274 518
275 my $parse_block; $parse_block = sub { 519 my $parse_block; $parse_block = sub {
276 my %arc = @_; 520 my %arc = @_;
277 521
278 while (<$fh>) { 522 while (<$fh>) {
279 s/\s+$//; 523 s/\s+$//;
280 if (/^end$/i) { 524 if (/^end$/i) {
281 last; 525 last;
526
282 } elsif (/^arch (\S+)$/i) { 527 } elsif (/^arch (\S+)$/i) {
283 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 528 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
529
284 } elsif (/^lore$/i) { 530 } elsif (/^lore$/i) {
285 while (<$fh>) { 531 while (<$fh>) {
286 last if /^endlore\s*$/i; 532 last if /^endlore\s*$/i;
287 $arc{lore} .= $_; 533 $arc{lore} .= $_;
288 } 534 }
289 } elsif (/^msg$/i) { 535 } elsif (/^msg$/i) {
290 while (<$fh>) { 536 while (<$fh>) {
291 last if /^endmsg\s*$/i; 537 last if /^endmsg\s*$/i;
292 $arc{msg} .= $_; 538 $arc{msg} .= $_;
293 } 539 }
540 } elsif (/^anim$/i) {
541 while (<$fh>) {
542 last if /^mina\s*$/i;
543 chomp;
544 push @{ $arc{anim} }, $_;
545 }
294 } elsif (/^(\S+)\s*(.*)$/) { 546 } elsif (/^(\S+)\s*(.*)$/) {
295 $arc{lc $1} = $2; 547 $arc{lc $1} = $2;
296 } elsif (/^\s*($|#)/) { 548 } elsif (/^\s*#/) {
549 $arc{_comment} .= "$_\n";
550
551 } elsif (/^\s*$/) {
297 # 552 #
298 } else { 553 } else {
299 warn "$path: unparsable line '$_' in arch $arc{_name}"; 554 warn "$path: unparsable line '$_' in arch $arc{_name}";
300 } 555 }
301 } 556 }
… …
307 s/\s+$//; 562 s/\s+$//;
308 if (/^more$/i) { 563 if (/^more$/i) {
309 $more = $prev; 564 $more = $prev;
310 } elsif (/^object (\S+)$/i) { 565 } elsif (/^object (\S+)$/i) {
311 my $name = $1; 566 my $name = $1;
312 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';
313 571
314 if ($more) { 572 if ($more) {
315 $more->{more} = $arc; 573 $more->{more} = $arc;
316 } else { 574 } else {
317 $arc{$name} = $arc; 575 $arc{$name} = $arc;
318 } 576 }
319 $prev = $arc; 577 $prev = $arc;
320 $more = undef; 578 $more = undef;
321 } elsif (/^arch (\S+)$/i) { 579 } elsif (/^arch (\S+)$/i) {
322 my $name = $1; 580 my $name = $1;
323 my $arc = normalize_arch $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';
324 585
325 if ($more) { 586 if ($more) {
326 $more->{more} = $arc; 587 $more->{more} = $arc;
327 } else { 588 } else {
328 push @{ $arc{arch} }, $arc; 589 push @{ $arc{arch} }, $arc;
329 } 590 }
330 $prev = $arc; 591 $prev = $arc;
331 $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";
332 } elsif (/^\s*($|#)/) { 604 } elsif (/^\s*($|#)/) {
333 # 605 #
334 } else { 606 } else {
335 warn "$path: unparseable top-level line '$_'"; 607 die "$path: unparseable top-level line '$_'";
336 } 608 }
337 } 609 }
338 610
339 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.
340 612
341 \%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
342} 696}
343 697
344# 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
345# NOTE: the arrays in the hash values are references to 699# NOTE: the arrays in the hash values are references to
346# the archs from $ARCH 700# the archs from $ARCH
347sub editor_archs { 701sub editor_archs {
348 my %paths; 702 my %paths;
349 703
350 for (keys %ARCH) { 704 for (keys %ARCH) {
351 my $arch = $ARCH{$_}; 705 my $arch = $ARCH{$_};
352 push @{$paths{$arch->{editor_folder}}}, \$arch; 706 push @{$paths{$arch->{editor_folder}}}, $arch;
353 } 707 }
354 708
355 \%paths 709 \%paths
356} 710}
357 711
… …
367 my ($a) = @_; 721 my ($a) = @_;
368 722
369 my $o = $ARCH{$a->{_name}} 723 my $o = $ARCH{$a->{_name}}
370 or return; 724 or return;
371 725
372 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"}
373 or (warn "no face data found for arch '$a->{_name}'"), return; 729 or (warn "no face data found for arch '$a->{_name}'"), return;
730 }
374 731
375 if ($face->{w} > 1 || $face->{h} > 1) { 732 if ($face->{w} > 1 || $face->{h} > 1) {
376 # bigface 733 # bigface
377 return (0, 0, $face->{w} - 1, $face->{h} - 1); 734 return (0, 0, $face->{w} - 1, $face->{h} - 1);
378 735
… …
422 my $type = $obj->{type} || $arch->{type}; 779 my $type = $obj->{type} || $arch->{type};
423 780
424 if ($type > 0) { 781 if ($type > 0) {
425 $root = $Crossfire::Data::ATTR{$type}; 782 $root = $Crossfire::Data::ATTR{$type};
426 } 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 {
427 $root = $Crossfire::Data::TYPE{Misc}; 795 $root = $Crossfire::Data::TYPE{Misc};
428
429 type:
430 for (@Crossfire::Data::ATTR0) {
431 my $req = $_->{required}
432 or die "internal error: ATTR0 without 'required'";
433
434 keys %$req;
435 while (my ($k, $v) = each %$req) {
436 next type
437 unless $obj->{$k} == $v || $arch->{$k} == $v;
438 }
439
440 $root = $_;
441 } 796 }
442 } 797 }
443 798
444 my @import = ($root); 799 my @import = ($root);
445 800
… …
487 ]; 842 ];
488 843
489 $attr 844 $attr
490} 845}
491 846
492sub arch_edit_sections {
493# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
494# edit_type = 0;
495# else if (edit_type != 0) {
496# // all flags from 'check_type' must be unset in this arch because they get recalculated now
497# edit_type &= ~check_type;
498# }
499#
500# }
501# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
502# getAttributeValue("alive", defarch) == 1 &&
503# (getAttributeValue("monster", defarch) == 1 ||
504# getAttributeValue("generator", defarch) == 1)) {
505# // Monster: monsters/npcs/generators
506# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
507# }
508# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
509# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
510# // Walls
511# edit_type |= IGUIConstants.TILE_EDIT_WALL;
512# }
513# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
514# getAttributeValue("connected", defarch) != 0) {
515# // Connected Objects
516# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
517# }
518# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
519# arch_type == 66 || arch_type == 41 || arch_type == 95) {
520# // Exit: teleporter/exit/trapdoors
521# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
522# }
523# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
524# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
525# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
526# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
527# arch_type == 124 || arch_type == 130)) {
528# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
529# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
530# }
531# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
532# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
533# arch_type == 91 || arch_type == 21 || arch_type == 24) {
534# // Door: door/special door/gates + keys
535# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
536# }
537# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
538# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
539# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
540# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
541# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
542# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
543# arch_type == 122 || arch_type == 3)) {
544# // Equipment: weapons/armour/wands/rods
545# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
546# }
547#
548# return(edit_type);
549#
550#
551}
552
553sub cache_file($$&&) { 847sub cache_file($$&&) {
554 my ($src, $cache, $load, $create) = @_; 848 my ($src, $cache, $load, $create) = @_;
555 849
556 my ($size, $mtime) = (stat $src)[7,9] 850 my ($size, $mtime) = (stat $src)[7,9]
557 or Carp::croak "$src: $!"; 851 or Carp::croak "$src: $!";
… …
605 }, sub { 899 }, sub {
606 read_arch "$LIB/archetypes" 900 read_arch "$LIB/archetypes"
607 }; 901 };
608} 902}
609 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
610=item load_tilecache 934=item load_tilecache
611 935
612(Re-)Load %TILE and %FACE. 936(Re-)Load %TILE and %FACE.
613 937
614=cut 938=cut
615 939
616sub load_tilecache() { 940sub load_tilecache() {
617 require Gtk2; 941 require Gtk2;
618 942
943 if (-e "$LIB/crossfire.0") { # Crossfire1 version
619 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 944 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
620 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 945 sub {
621 or die "$VARDIR/tilecache.png: $!";
622 *FACE = $_[0];
623 }, sub {
624 require File::Temp;
625
626 my $tile = read_pak "$LIB/crossfire.0"; 946 my $tile = read_pak "$LIB/crossfire.0";
627 947
628 my %cache; 948 my %cache;
629 949
630 my $idx = 0; 950 my $idx = 0;
631 951
632 for my $name (sort keys %$tile) { 952 for my $name (sort keys %$tile) {
633 my ($fh, $filename) = File::Temp::tempfile (); 953 my $pb = new Gtk2::Gdk::PixbufLoader;
634 print $fh $tile->{$name}; 954 $pb->write ($tile->{$name});
635 close $fh; 955 $pb->close;
636 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 956 my $pb = $pb->get_pixbuf;
637 unlink $filename;
638 957
639 my $tile = $cache{$name} = { 958 my $tile = $cache{$name} = {
640 pb => $pb, 959 pb => $pb,
641 idx => $idx, 960 idx => $idx,
642 w => int $pb->get_width / TILESIZE, 961 w => int $pb->get_width / TILESIZE,
643 h => int $pb->get_height / TILESIZE, 962 h => int $pb->get_height / TILESIZE,
963 };
964
965 $idx += $tile->{w} * $tile->{h};
966 }
967
968 construct_tilecache_pb $idx, \%cache;
969
970 \%cache
644 }; 971 };
972
973 } else { # Crossfire+ version
974 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
975 sub {
976 my %cache;
977 my $facedata = Storable::retrieve "$LIB/facedata";
978
979 $facedata->{version} == 2
980 or die "$LIB/facedata: version mismatch, cannot proceed.";
981
982 my $faces = $facedata->{faceinfo};
983 my $idx = 0;
984
985 for (sort keys %$faces) {
986 my ($face, $info) = ($_, $faces->{$_});
987
988 my $pb = new Gtk2::Gdk::PixbufLoader;
989 $pb->write ($info->{data32});
990 $pb->close;
991 my $pb = $pb->get_pixbuf;
992
993 my $tile = $cache{$face} = {
994 pb => $pb,
995 idx => $idx,
996 w => int $pb->get_width / TILESIZE,
997 h => int $pb->get_height / TILESIZE,
645 998 };
646 999
647 $idx += $tile->{w} * $tile->{h}; 1000 $idx += $tile->{w} * $tile->{h};
648 }
649
650 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
651
652 while (my ($name, $tile) = each %cache) {
653 my $tpb = delete $tile->{pb};
654 my $ofs = $tile->{idx};
655
656 for my $x (0 .. $tile->{w} - 1) {
657 for my $y (0 .. $tile->{h} - 1) {
658 my $idx = $ofs + $x + $y * $tile->{w};
659 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
660 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
661 } 1001 }
1002
1003 construct_tilecache_pb $idx, \%cache;
1004
1005 \%cache
662 } 1006 };
663 }
664
665 $pb->save ("$VARDIR/tilecache.png", "png");
666
667 \%cache
668 }; 1007 }
669} 1008}
670 1009
671=head1 AUTHOR 1010=head1 AUTHOR
672 1011
673 Marc Lehmann <schmorp@schmorp.de> 1012 Marc Lehmann <schmorp@schmorp.de>

Diff Legend

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