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.56 by root, Thu Mar 23 07:33:16 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
… …
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
65 elevation
66
54 name name_pl custom_name title race 67 name name_pl custom_name attach title race
55 slaying skill msg lore other_arch face 68 slaying skill msg lore other_arch
56 #todo-events
57 animation is_animated 69 face animation is_animated
70 magicmap smoothlevel smoothface
58 Str Dex Con Wis Pow Cha Int 71 str dex con wis pow cha int
59 hp maxhp sp maxsp grace maxgrace 72 hp maxhp sp maxsp grace maxgrace
60 exp perm_exp expmul 73 exp perm_exp expmul
61 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
62 nrof level direction type subtype 75 nrof level direction type subtype attacktype
63 76
64 resist_physical resist_magic resist_fire resist_electricity 77 resist_physical resist_magic resist_fire resist_electricity
65 resist_cold resist_confusion resist_acid resist_drain 78 resist_cold resist_confusion resist_acid resist_drain
66 resist_weaponmagic resist_ghosthit resist_poison resist_slow 79 resist_weaponmagic resist_ghosthit resist_poison resist_slow
67 resist_paralyze resist_turn_undead resist_fear resist_cancellation 80 resist_paralyze resist_turn_undead resist_fear resist_cancellation
… …
70 resist_life_stealing resist_disease 83 resist_life_stealing resist_disease
71 84
72 path_attuned path_repelled path_denied material materialname 85 path_attuned path_repelled path_denied material materialname
73 value carrying weight invisible state magic 86 value carrying weight invisible state magic
74 last_heal last_sp last_grace last_eat 87 last_heal last_sp last_grace last_eat
75 connected glow_radius randomitems npx_status npc_program 88 connected glow_radius randomitems tresure_env npx_status npc_program
76 run_away pick_up container will_apply smoothlevel 89 run_away pick_up container will_apply smoothlevel
77 current_weapon_script weapontype tooltype elevation client_type 90 current_weapon_script weapontype tooltype elevation client_type
78 item_power duration range 91 item_power duration range
79 range_modifier duration_modifier dam_modifier gen_sp_armour 92 range_modifier duration_modifier dam_modifier gen_sp_armour
80 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
… …
91 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
92 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
93 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
94 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
95 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
96 110
97 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
98 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
99)); 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);
100 129
101sub MOVE_WALK (){ 0x01 } 130sub MOVE_WALK (){ 0x01 }
102sub MOVE_FLY_LOW (){ 0x02 } 131sub MOVE_FLY_LOW (){ 0x02 }
103sub MOVE_FLY_HIGH (){ 0x04 } 132sub MOVE_FLY_HIGH (){ 0x04 }
104sub MOVE_FLYING (){ 0x06 } 133sub MOVE_FLYING (){ 0x06 }
105sub MOVE_SWIM (){ 0x08 } 134sub MOVE_SWIM (){ 0x08 }
106sub MOVE_BOAT (){ 0x10 } 135sub MOVE_BOAT (){ 0x10 }
107sub 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}
108 239
109sub load_ref($) { 240sub load_ref($) {
110 my ($path) = @_; 241 my ($path) = @_;
111 242
112 open my $fh, "<", $path 243 open my $fh, "<:raw:perlio", $path
113 or die "$path: $!"; 244 or die "$path: $!";
114 binmode $fh;
115 local $/; 245 local $/;
116 246
117 thaw <$fh> 247 thaw <$fh>
118} 248}
119 249
120sub save_ref($$) { 250sub save_ref($$) {
121 my ($ref, $path) = @_; 251 my ($ref, $path) = @_;
122 252
123 open my $fh, ">", "$path~" 253 open my $fh, ">:raw:perlio", "$path~"
124 or die "$path~: $!"; 254 or die "$path~: $!";
125 binmode $fh;
126 print $fh freeze $ref; 255 print $fh freeze $ref;
127 close $fh; 256 close $fh;
128 rename "$path~", $path 257 rename "$path~", $path
129 or die "$path: $!"; 258 or die "$path: $!";
130} 259}
131 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
132sub normalize_object($) { 330sub normalize_object($) {
133 my ($ob) = @_; 331 my ($ob) = @_;
134 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
135 delete $ob->{$_} for qw( 366 delete @$ob{qw(
136 can_knockback can_parry can_impale can_cut can_dam_armour 367 can_knockback can_parry can_impale can_cut can_dam_armour
137 can_apply pass_thru can_pass_thru 368 can_apply pass_thru can_pass_thru color_bg color_fg
138 ); 369 )};
139 370
140 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 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
376 for my $attr (keys %FIELD_MOVEMENT) {
141 next unless exists $ob->{$attr}; 377 next unless exists $ob->{$attr};
142 next if $ob->{$attr} =~ /^\d+$/;
143 378
144 my $flags = 0; 379 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr};
145
146 # assume list
147 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
148 $flags |= MOVE_WALK if $flag eq "walk";
149 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
150 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
151 $flags |= MOVE_FLYING if $flag eq "flying";
152 $flags |= MOVE_SWIM if $flag eq "swim";
153 $flags |= MOVE_BOAT if $flag eq "boat";
154 $flags |= MOVE_ALL if $flag eq "all";
155
156 $flags &= ~MOVE_WALK if $flag eq "-walk";
157 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
158 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
159 $flags &= ~MOVE_FLYING if $flag eq "-flying";
160 $flags &= ~MOVE_SWIM if $flag eq "-swim";
161 $flags &= ~MOVE_BOAT if $flag eq "-boat";
162 $flags &= ~MOVE_ALL if $flag eq "-all";
163 }
164
165 $ob->{$attr} = $flags;
166 } 380 }
167 381
382 # convert outdated movement flags to new movement sets
168 if (defined (my $v = delete $ob->{no_pass})) { 383 if (defined (my $v = delete $ob->{no_pass})) {
169 $ob->{move_block} = $v ? MOVE_ALL : 0; 384 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
170 } 385 }
171 if (defined (my $v = delete $ob->{slow_move})) { 386 if (defined (my $v = delete $ob->{slow_move})) {
172 $ob->{move_slow} |= MOVE_WALK; 387 $ob->{move_slow} += "walk";
173 $ob->{move_slow_penalty} = $v; 388 $ob->{move_slow_penalty} = $v;
174 } 389 }
175 if (defined (my $v = delete $ob->{walk_on})) { 390 if (defined (my $v = delete $ob->{walk_on})) {
176 $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" }
177 : $ob->{move_on} & ~MOVE_WALK;
178 } 392 }
179 if (defined (my $v = delete $ob->{walk_off})) { 393 if (defined (my $v = delete $ob->{walk_off})) {
180 $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" }
181 : $ob->{move_off} & ~MOVE_WALK;
182 } 395 }
183 if (defined (my $v = delete $ob->{fly_on})) { 396 if (defined (my $v = delete $ob->{fly_on})) {
184 $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" }
185 : $ob->{move_on} & ~MOVE_FLY_LOW;
186 } 398 }
187 if (defined (my $v = delete $ob->{fly_off})) { 399 if (defined (my $v = delete $ob->{fly_off})) {
188 $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" }
189 : $ob->{move_off} & ~MOVE_FLY_LOW;
190 } 401 }
191 if (defined (my $v = delete $ob->{flying})) { 402 if (defined (my $v = delete $ob->{flying})) {
192 $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" }
193 : $ob->{move_type} & ~MOVE_FLY_LOW;
194 } 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};
195 420
196 $ob 421 $ob
197} 422}
198 423
424# arch as in "arch xxx", ie.. objects
199sub normalize_arch($) { 425sub normalize_arch($) {
200 my ($ob) = @_; 426 my ($ob) = @_;
201 427
202 normalize_object $ob; 428 normalize_object $ob;
203 429
… …
230 delete $ob->{$k}; 456 delete $ob->{$k};
231 } 457 }
232 } 458 }
233 } 459 }
234 460
461 # a speciality for the editor
462 if (exists $ob->{attack_movement}) {
463 my $am = delete $ob->{attack_movement};
464 $ob->{attack_movement_bits_0_3} = $am & 15;
465 $ob->{attack_movement_bits_4_7} = $am & 240;
466 }
467
468 $ob
469}
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
235 $ob 486 $ob
236} 487}
237 488
238sub read_pak($) { 489sub read_pak($) {
239 my ($path) = @_; 490 my ($path) = @_;
240 491
241 my %pak; 492 my %pak;
242 493
243 open my $fh, "<", $path 494 open my $fh, "<:raw:perlio", $path
244 or Carp::croak "$_[0]: $!"; 495 or Carp::croak "$_[0]: $!";
245 binmode $fh; 496 binmode $fh;
246 while (<$fh>) { 497 while (<$fh>) {
247 my ($type, $id, $len, $path) = split; 498 my ($type, $id, $len, $path) = split;
248 $path =~ s/.*\///; 499 $path =~ s/.*\///;
… …
250 } 501 }
251 502
252 \%pak 503 \%pak
253} 504}
254 505
255sub read_arch($) { 506sub read_arch($;$) {
256 my ($path) = @_; 507 my ($path, $toplevel) = @_;
257 508
258 my %arc; 509 my %arc;
259 my ($more, $prev); 510 my ($more, $prev);
511 my $comment;
260 512
261 open my $fh, "<", $path 513 open my $fh, "<:raw:perlio:utf8", $path
262 or Carp::croak "$path: $!"; 514 or Carp::croak "$path: $!";
263 515
264 binmode $fh; 516# binmode $fh;
265 517
266 my $parse_block; $parse_block = sub { 518 my $parse_block; $parse_block = sub {
267 my %arc = @_; 519 my %arc = @_;
268 520
269 while (<$fh>) { 521 while (<$fh>) {
270 s/\s+$//; 522 s/\s+$//;
271 if (/^end$/i) { 523 if (/^end$/i) {
272 last; 524 last;
525
273 } elsif (/^arch (\S+)$/i) { 526 } elsif (/^arch (\S+)$/i) {
274 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 527 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
528
275 } elsif (/^lore$/i) { 529 } elsif (/^lore$/i) {
276 while (<$fh>) { 530 while (<$fh>) {
277 last if /^endlore\s*$/i; 531 last if /^endlore\s*$/i;
278 $arc{lore} .= $_; 532 $arc{lore} .= $_;
279 } 533 }
280 } elsif (/^msg$/i) { 534 } elsif (/^msg$/i) {
281 while (<$fh>) { 535 while (<$fh>) {
282 last if /^endmsg\s*$/i; 536 last if /^endmsg\s*$/i;
283 $arc{msg} .= $_; 537 $arc{msg} .= $_;
284 } 538 }
539 } elsif (/^anim$/i) {
540 while (<$fh>) {
541 last if /^mina\s*$/i;
542 chomp;
543 push @{ $arc{anim} }, $_;
544 }
285 } elsif (/^(\S+)\s*(.*)$/) { 545 } elsif (/^(\S+)\s*(.*)$/) {
286 $arc{lc $1} = $2; 546 $arc{lc $1} = $2;
287 } elsif (/^\s*($|#)/) { 547 } elsif (/^\s*#/) {
548 $arc{_comment} .= "$_\n";
549
550 } elsif (/^\s*$/) {
288 # 551 #
289 } else { 552 } else {
290 warn "$path: unparsable line '$_' in arch $arc{_name}"; 553 warn "$path: unparsable line '$_' in arch $arc{_name}";
291 } 554 }
292 } 555 }
… …
298 s/\s+$//; 561 s/\s+$//;
299 if (/^more$/i) { 562 if (/^more$/i) {
300 $more = $prev; 563 $more = $prev;
301 } elsif (/^object (\S+)$/i) { 564 } elsif (/^object (\S+)$/i) {
302 my $name = $1; 565 my $name = $1;
303 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';
304 570
305 if ($more) { 571 if ($more) {
306 $more->{more} = $arc; 572 $more->{more} = $arc;
307 } else { 573 } else {
308 $arc{$name} = $arc; 574 $arc{$name} = $arc;
309 } 575 }
310 $prev = $arc; 576 $prev = $arc;
311 $more = undef; 577 $more = undef;
312 } elsif (/^arch (\S+)$/i) { 578 } elsif (/^arch (\S+)$/i) {
313 my $name = $1; 579 my $name = $1;
314 my $arc = normalize_object $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';
315 584
316 if ($more) { 585 if ($more) {
317 $more->{more} = $arc; 586 $more->{more} = $arc;
318 } else { 587 } else {
319 push @{ $arc{arch} }, $arc; 588 push @{ $arc{arch} }, $arc;
320 } 589 }
321 $prev = $arc; 590 $prev = $arc;
322 $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";
323 } elsif (/^\s*($|#)/) { 603 } elsif (/^\s*($|#)/) {
324 # 604 #
325 } else { 605 } else {
326 warn "$path: unparseable top-level line '$_'"; 606 die "$path: unparseable top-level line '$_'";
327 } 607 }
328 } 608 }
329 609
330 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.
331 611
332 \%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
333} 695}
334 696
335# 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
336# NOTE: the arrays in the hash values are references to 698# NOTE: the arrays in the hash values are references to
337# the archs from $ARCH 699# the archs from $ARCH
338sub editor_archs { 700sub editor_archs {
339 my %paths; 701 my %paths;
340 702
341 for (keys %ARCH) { 703 for (keys %ARCH) {
342 my $arch = $ARCH{$_}; 704 my $arch = $ARCH{$_};
343 push @{$paths{$arch->{editor_folder}}}, \$arch; 705 push @{$paths{$arch->{editor_folder}}}, $arch;
344 } 706 }
345 707
346 \%paths 708 \%paths
347} 709}
348 710
… …
358 my ($a) = @_; 720 my ($a) = @_;
359 721
360 my $o = $ARCH{$a->{_name}} 722 my $o = $ARCH{$a->{_name}}
361 or return; 723 or return;
362 724
363 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"}
364 or (warn "no face data found for arch '$a->{_name}'"), return; 728 or (warn "no face data found for arch '$a->{_name}'"), return;
729 }
365 730
366 if ($face->{w} > 1 || $face->{h} > 1) { 731 if ($face->{w} > 1 || $face->{h} > 1) {
367 # bigface 732 # bigface
368 return (0, 0, $face->{w} - 1, $face->{h} - 1); 733 return (0, 0, $face->{w} - 1, $face->{h} - 1);
369 734
… …
413 my $type = $obj->{type} || $arch->{type}; 778 my $type = $obj->{type} || $arch->{type};
414 779
415 if ($type > 0) { 780 if ($type > 0) {
416 $root = $Crossfire::Data::ATTR{$type}; 781 $root = $Crossfire::Data::ATTR{$type};
417 } 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 {
418 $root = $Crossfire::Data::TYPE{Misc}; 794 $root = $Crossfire::Data::TYPE{Misc};
419
420 type:
421 for (@Crossfire::Data::ATTR0) {
422 my $req = $_->{required}
423 or die "internal error: ATTR0 without 'required'";
424
425 keys %$req;
426 while (my ($k, $v) = each %$req) {
427 next type
428 unless $obj->{$k} == $v || $arch->{$k} == $v;
429 }
430
431 $root = $_;
432 } 795 }
433 } 796 }
434 797
435 my @import = ($root); 798 my @import = ($root);
436 799
… …
478 ]; 841 ];
479 842
480 $attr 843 $attr
481} 844}
482 845
483sub arch_edit_sections {
484# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
485# edit_type = 0;
486# else if (edit_type != 0) {
487# // all flags from 'check_type' must be unset in this arch because they get recalculated now
488# edit_type &= ~check_type;
489# }
490#
491# }
492# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
493# getAttributeValue("alive", defarch) == 1 &&
494# (getAttributeValue("monster", defarch) == 1 ||
495# getAttributeValue("generator", defarch) == 1)) {
496# // Monster: monsters/npcs/generators
497# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
498# }
499# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
500# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
501# // Walls
502# edit_type |= IGUIConstants.TILE_EDIT_WALL;
503# }
504# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
505# getAttributeValue("connected", defarch) != 0) {
506# // Connected Objects
507# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
508# }
509# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
510# arch_type == 66 || arch_type == 41 || arch_type == 95) {
511# // Exit: teleporter/exit/trapdoors
512# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
513# }
514# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
515# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
516# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
517# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
518# arch_type == 124 || arch_type == 130)) {
519# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
520# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
521# }
522# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
523# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
524# arch_type == 91 || arch_type == 21 || arch_type == 24) {
525# // Door: door/special door/gates + keys
526# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
527# }
528# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
529# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
530# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
531# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
532# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
533# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
534# arch_type == 122 || arch_type == 3)) {
535# // Equipment: weapons/armour/wands/rods
536# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
537# }
538#
539# return(edit_type);
540#
541#
542}
543
544sub cache_file($$&&) { 846sub cache_file($$&&) {
545 my ($src, $cache, $load, $create) = @_; 847 my ($src, $cache, $load, $create) = @_;
546 848
547 my ($size, $mtime) = (stat $src)[7,9] 849 my ($size, $mtime) = (stat $src)[7,9]
548 or Carp::croak "$src: $!"; 850 or Carp::croak "$src: $!";
… …
596 }, sub { 898 }, sub {
597 read_arch "$LIB/archetypes" 899 read_arch "$LIB/archetypes"
598 }; 900 };
599} 901}
600 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
601=item load_tilecache 933=item load_tilecache
602 934
603(Re-)Load %TILE and %FACE. 935(Re-)Load %TILE and %FACE.
604 936
605=cut 937=cut
606 938
607sub load_tilecache() { 939sub load_tilecache() {
608 require Gtk2; 940 require Gtk2;
609 941
942 if (-e "$LIB/crossfire.0") { # Crossfire1 version
610 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 943 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
611 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 944 sub {
612 or die "$VARDIR/tilecache.png: $!";
613 *FACE = $_[0];
614 }, sub {
615 require File::Temp;
616
617 my $tile = read_pak "$LIB/crossfire.0"; 945 my $tile = read_pak "$LIB/crossfire.0";
618 946
619 my %cache; 947 my %cache;
620 948
621 my $idx = 0; 949 my $idx = 0;
622 950
623 for my $name (sort keys %$tile) { 951 for my $name (sort keys %$tile) {
624 my ($fh, $filename) = File::Temp::tempfile (); 952 my $pb = new Gtk2::Gdk::PixbufLoader;
625 print $fh $tile->{$name}; 953 $pb->write ($tile->{$name});
626 close $fh; 954 $pb->close;
627 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 955 my $pb = $pb->get_pixbuf;
628 unlink $filename;
629 956
630 my $tile = $cache{$name} = { 957 my $tile = $cache{$name} = {
631 pb => $pb, 958 pb => $pb,
632 idx => $idx, 959 idx => $idx,
633 w => int $pb->get_width / TILESIZE, 960 w => int $pb->get_width / TILESIZE,
634 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
635 }; 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,
636 997 };
637 998
638 $idx += $tile->{w} * $tile->{h}; 999 $idx += $tile->{w} * $tile->{h};
639 }
640
641 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
642
643 while (my ($name, $tile) = each %cache) {
644 my $tpb = delete $tile->{pb};
645 my $ofs = $tile->{idx};
646
647 for my $x (0 .. $tile->{w} - 1) {
648 for my $y (0 .. $tile->{h} - 1) {
649 my $idx = $ofs + $x + $y * $tile->{w};
650 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
651 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
652 } 1000 }
1001
1002 construct_tilecache_pb $idx, \%cache;
1003
1004 \%cache
653 } 1005 };
654 }
655
656 $pb->save ("$VARDIR/tilecache.png", "png");
657
658 \%cache
659 }; 1006 }
660} 1007}
661 1008
662=head1 AUTHOR 1009=head1 AUTHOR
663 1010
664 Marc Lehmann <schmorp@schmorp.de> 1011 Marc Lehmann <schmorp@schmorp.de>

Diff Legend

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