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

Diff Legend

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