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.111 by elmex, Thu Jun 7 14:45:22 2007 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.1'; 9our $VERSION = '0.99';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
19 19
20our @EXPORT = qw( 20our @EXPORT = qw(
21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents 21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents
22); 22);
23 23
24use JSON::XS qw(from_json to_json);
25
24our $LIB = $ENV{CROSSFIRE_LIBDIR}; 26our $LIB = $ENV{CROSSFIRE_LIBDIR};
25 27
26our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; 28our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire"
29 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
30 : File::Spec->tmpdir . "/crossfire";
27 31
28mkdir $VARDIR, 0777; 32mkdir $VARDIR, 0777;
29 33
30sub TILESIZE (){ 32 } 34sub TILESIZE (){ 32 }
31 35
… …
37 msg => "endmsg", 41 msg => "endmsg",
38 lore => "endlore", 42 lore => "endlore",
39 maplore => "endmaplore", 43 maplore => "endmaplore",
40); 44);
41 45
46# movement bit type, PITA
47our %FIELD_MOVEMENT = map +($_ => undef),
48 qw(move_type move_block move_allow move_on move_off move_slow);
49
42# same as in server save routine, to (hopefully) be compatible 50# same as in server save routine, to (hopefully) be compatible
43# to the other editors. 51# to the other editors.
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 (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
135 delete $ob->{$_} for qw( 367 delete @$ob{qw(
136 can_knockback can_parry can_impale can_cut can_dam_armour 368 can_knockback can_parry can_impale can_cut can_dam_armour
137 can_apply pass_thru can_pass_thru 369 can_apply pass_thru can_pass_thru color_bg color_fg
138 ); 370 )};
139 371
140 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) {
141 next unless exists $ob->{$attr}; 378 next unless exists $ob->{$attr};
142 next if $ob->{$attr} =~ /^\d+$/;
143 379
144 my $flags = 0; 380 $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 } 381 }
167 382
383 # convert outdated movement flags to new movement sets
168 if (defined (my $v = delete $ob->{no_pass})) { 384 if (defined (my $v = delete $ob->{no_pass})) {
169 $ob->{move_block} = $v ? MOVE_ALL : 0; 385 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
170 } 386 }
171 if (defined (my $v = delete $ob->{slow_move})) { 387 if (defined (my $v = delete $ob->{slow_move})) {
172 $ob->{move_slow} |= MOVE_WALK; 388 $ob->{move_slow} += "walk";
173 $ob->{move_slow_penalty} = $v; 389 $ob->{move_slow_penalty} = $v;
174 } 390 }
175 if (defined (my $v = delete $ob->{walk_on})) { 391 if (defined (my $v = delete $ob->{walk_on})) {
176 $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" }
177 : $ob->{move_on} & ~MOVE_WALK;
178 } 393 }
179 if (defined (my $v = delete $ob->{walk_off})) { 394 if (defined (my $v = delete $ob->{walk_off})) {
180 $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" }
181 : $ob->{move_off} & ~MOVE_WALK;
182 } 396 }
183 if (defined (my $v = delete $ob->{fly_on})) { 397 if (defined (my $v = delete $ob->{fly_on})) {
184 $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" }
185 : $ob->{move_on} & ~MOVE_FLY_LOW;
186 } 399 }
187 if (defined (my $v = delete $ob->{fly_off})) { 400 if (defined (my $v = delete $ob->{fly_off})) {
188 $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" }
189 : $ob->{move_off} & ~MOVE_FLY_LOW;
190 } 402 }
191 if (defined (my $v = delete $ob->{flying})) { 403 if (defined (my $v = delete $ob->{flying})) {
192 $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" }
193 : $ob->{move_type} & ~MOVE_FLY_LOW;
194 } 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};
195 421
196 $ob 422 $ob
197} 423}
198 424
425# arch as in "arch xxx", ie.. objects
199sub normalize_arch($) { 426sub normalize_arch($) {
200 my ($ob) = @_; 427 my ($ob) = @_;
201 428
202 normalize_object $ob; 429 normalize_object $ob;
203 430
… …
230 delete $ob->{$k}; 457 delete $ob->{$k};
231 } 458 }
232 } 459 }
233 } 460 }
234 461
462 # a speciality for the editor
463 if (exists $ob->{attack_movement}) {
464 my $am = delete $ob->{attack_movement};
465 $ob->{attack_movement_bits_0_3} = $am & 15;
466 $ob->{attack_movement_bits_4_7} = $am & 240;
467 }
468
469 $ob
470}
471
472sub attr_thaw($) {
473 my ($ob) = @_;
474
475 $ob->{attach} = from_json $ob->{attach}
476 if exists $ob->{attach};
477
478 $ob
479}
480
481sub attr_freeze($) {
482 my ($ob) = @_;
483
484 $ob->{attach} = Crossfire::to_json $ob->{attach}
485 if exists $ob->{attach};
486
235 $ob 487 $ob
236} 488}
237 489
238sub read_pak($) { 490sub read_pak($) {
239 my ($path) = @_; 491 my ($path) = @_;
240 492
241 my %pak; 493 my %pak;
242 494
243 open my $fh, "<", $path 495 open my $fh, "<:raw:perlio", $path
244 or Carp::croak "$_[0]: $!"; 496 or Carp::croak "$_[0]: $!";
245 binmode $fh; 497 binmode $fh;
246 while (<$fh>) { 498 while (<$fh>) {
247 my ($type, $id, $len, $path) = split; 499 my ($type, $id, $len, $path) = split;
248 $path =~ s/.*\///; 500 $path =~ s/.*\///;
… …
250 } 502 }
251 503
252 \%pak 504 \%pak
253} 505}
254 506
255sub read_arch($) { 507sub read_arch($;$) {
256 my ($path) = @_; 508 my ($path, $toplevel) = @_;
257 509
258 my %arc; 510 my %arc;
259 my ($more, $prev); 511 my ($more, $prev);
512 my $comment;
260 513
261 open my $fh, "<", $path 514 open my $fh, "<:raw:perlio:utf8", $path
262 or Carp::croak "$path: $!"; 515 or Carp::croak "$path: $!";
263 516
264 binmode $fh; 517# binmode $fh;
265 518
266 my $parse_block; $parse_block = sub { 519 my $parse_block; $parse_block = sub {
267 my %arc = @_; 520 my %arc = @_;
268 521
269 while (<$fh>) { 522 while (<$fh>) {
270 s/\s+$//; 523 s/\s+$//;
271 if (/^end$/i) { 524 if (/^end$/i) {
272 last; 525 last;
526
273 } elsif (/^arch (\S+)$/i) { 527 } elsif (/^arch (\S+)$/i) {
274 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 528 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
529
275 } elsif (/^lore$/i) { 530 } elsif (/^lore$/i) {
276 while (<$fh>) { 531 while (<$fh>) {
277 last if /^endlore\s*$/i; 532 last if /^endlore\s*$/i;
278 $arc{lore} .= $_; 533 $arc{lore} .= $_;
279 } 534 }
280 } elsif (/^msg$/i) { 535 } elsif (/^msg$/i) {
281 while (<$fh>) { 536 while (<$fh>) {
282 last if /^endmsg\s*$/i; 537 last if /^endmsg\s*$/i;
283 $arc{msg} .= $_; 538 $arc{msg} .= $_;
284 } 539 }
540 } elsif (/^anim$/i) {
541 while (<$fh>) {
542 last if /^mina\s*$/i;
543 chomp;
544 push @{ $arc{anim} }, $_;
545 }
285 } elsif (/^(\S+)\s*(.*)$/) { 546 } elsif (/^(\S+)\s*(.*)$/) {
286 $arc{lc $1} = $2; 547 $arc{lc $1} = $2;
287 } elsif (/^\s*($|#)/) { 548 } elsif (/^\s*#/) {
549 $arc{_comment} .= "$_\n";
550
551 } elsif (/^\s*$/) {
288 # 552 #
289 } else { 553 } else {
290 warn "$path: unparsable line '$_' in arch $arc{_name}"; 554 warn "$path: unparsable line '$_' in arch $arc{_name}";
291 } 555 }
292 } 556 }
… …
298 s/\s+$//; 562 s/\s+$//;
299 if (/^more$/i) { 563 if (/^more$/i) {
300 $more = $prev; 564 $more = $prev;
301 } elsif (/^object (\S+)$/i) { 565 } elsif (/^object (\S+)$/i) {
302 my $name = $1; 566 my $name = $1;
303 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';
304 571
305 if ($more) { 572 if ($more) {
306 $more->{more} = $arc; 573 $more->{more} = $arc;
307 } else { 574 } else {
308 $arc{$name} = $arc; 575 $arc{$name} = $arc;
309 } 576 }
310 $prev = $arc; 577 $prev = $arc;
311 $more = undef; 578 $more = undef;
312 } elsif (/^arch (\S+)$/i) { 579 } elsif (/^arch (\S+)$/i) {
313 my $name = $1; 580 my $name = $1;
314 my $arc = normalize_object $parse_block->(_name => $name); 581 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
582 undef $comment;
583 delete $arc{_comment} unless length $arc{_comment};
584 $arc->{_atype} = 'arch';
315 585
316 if ($more) { 586 if ($more) {
317 $more->{more} = $arc; 587 $more->{more} = $arc;
318 } else { 588 } else {
319 push @{ $arc{arch} }, $arc; 589 push @{ $arc{arch} }, $arc;
320 } 590 }
321 $prev = $arc; 591 $prev = $arc;
322 $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";
323 } elsif (/^\s*($|#)/) { 604 } elsif (/^\s*($|#)/) {
324 # 605 #
325 } else { 606 } else {
326 warn "$path: unparseable top-level line '$_'"; 607 die "$path: unparseable top-level line '$_'";
327 } 608 }
328 } 609 }
329 610
330 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.
331 612
332 \%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
333} 696}
334 697
335# 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
336# NOTE: the arrays in the hash values are references to 699# NOTE: the arrays in the hash values are references to
337# the archs from $ARCH 700# the archs from $ARCH
338sub editor_archs { 701sub editor_archs {
339 my %paths; 702 my %paths;
340 703
341 for (keys %ARCH) { 704 for (keys %ARCH) {
342 my $arch = $ARCH{$_}; 705 my $arch = $ARCH{$_};
343 push @{$paths{$arch->{editor_folder}}}, \$arch; 706 push @{$paths{$arch->{editor_folder}}}, $arch;
344 } 707 }
345 708
346 \%paths 709 \%paths
347} 710}
348 711
… …
358 my ($a) = @_; 721 my ($a) = @_;
359 722
360 my $o = $ARCH{$a->{_name}} 723 my $o = $ARCH{$a->{_name}}
361 or return; 724 or return;
362 725
363 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"}
364 or (warn "no face data found for arch '$a->{_name}'"), return; 729 or (warn "no face data found for arch '$a->{_name}'"), return;
730 }
365 731
366 if ($face->{w} > 1 || $face->{h} > 1) { 732 if ($face->{w} > 1 || $face->{h} > 1) {
367 # bigface 733 # bigface
368 return (0, 0, $face->{w} - 1, $face->{h} - 1); 734 return (0, 0, $face->{w} - 1, $face->{h} - 1);
369 735
… …
413 my $type = $obj->{type} || $arch->{type}; 779 my $type = $obj->{type} || $arch->{type};
414 780
415 if ($type > 0) { 781 if ($type > 0) {
416 $root = $Crossfire::Data::ATTR{$type}; 782 $root = $Crossfire::Data::ATTR{$type};
417 } 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 {
418 $root = $Crossfire::Data::TYPE{Misc}; 795 $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 } 796 }
433 } 797 }
434 798
435 my @import = ($root); 799 my @import = ($root);
436 800
… …
478 ]; 842 ];
479 843
480 $attr 844 $attr
481} 845}
482 846
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($$&&) { 847sub cache_file($$&&) {
545 my ($src, $cache, $load, $create) = @_; 848 my ($src, $cache, $load, $create) = @_;
546 849
547 my ($size, $mtime) = (stat $src)[7,9] 850 my ($size, $mtime) = (stat $src)[7,9]
548 or Carp::croak "$src: $!"; 851 or Carp::croak "$src: $!";
… …
596 }, sub { 899 }, sub {
597 read_arch "$LIB/archetypes" 900 read_arch "$LIB/archetypes"
598 }; 901 };
599} 902}
600 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
601=item load_tilecache 934=item load_tilecache
602 935
603(Re-)Load %TILE and %FACE. 936(Re-)Load %TILE and %FACE.
604 937
605=cut 938=cut
606 939
607sub load_tilecache() { 940sub load_tilecache() {
608 require Gtk2; 941 require Gtk2;
609 942
610 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 943 if (-e "$LIB/facedata") { # Crossfire TRT faces
611 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 944 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
612 or die "$VARDIR/tilecache.png: $!"; 945 sub {
613 *FACE = $_[0];
614 }, sub {
615 require File::Temp;
616
617 my $tile = read_pak "$LIB/crossfire.0";
618
619 my %cache; 946 my %cache;
947 my $facedata = Storable::retrieve "$LIB/facedata";
620 948
949 $facedata->{version} == 2
950 or die "$LIB/facedata: version mismatch, cannot proceed.";
951
952 my $faces = $facedata->{faceinfo};
621 my $idx = 0; 953 my $idx = 0;
622 954
623 for my $name (sort keys %$tile) { 955 for (sort keys %$faces) {
624 my ($fh, $filename) = File::Temp::tempfile (); 956 my ($face, $info) = ($_, $faces->{$_});
625 print $fh $tile->{$name};
626 close $fh;
627 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename;
628 unlink $filename;
629 957
958 my $pb = new Gtk2::Gdk::PixbufLoader;
959 $pb->write ($info->{data32});
960 $pb->close;
961 my $pb = $pb->get_pixbuf;
962
630 my $tile = $cache{$name} = { 963 my $tile = $cache{$face} = {
631 pb => $pb, 964 pb => $pb,
632 idx => $idx, 965 idx => $idx,
633 w => int $pb->get_width / TILESIZE, 966 w => int $pb->get_width / TILESIZE,
634 h => int $pb->get_height / TILESIZE, 967 h => int $pb->get_height / TILESIZE,
968 };
969
970 $idx += $tile->{w} * $tile->{h};
971 }
972
973 construct_tilecache_pb $idx, \%cache;
974
975 \%cache
635 }; 976 };
977
978 } elsif (-e "$LIB/crossfire.0") { # Crossfire1 version
979 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
980 sub {
981 my $tile = read_pak "$LIB/crossfire.0";
982
983 my %cache;
984
985 my $idx = 0;
986
987 for my $name (sort keys %$tile) {
988 my $pb = new Gtk2::Gdk::PixbufLoader;
989 $pb->write ($tile->{$name});
990 $pb->close;
991 my $pb = $pb->get_pixbuf;
992
993 my $tile = $cache{$name} = {
994 pb => $pb,
995 idx => $idx,
996 w => int $pb->get_width / TILESIZE,
997 h => int $pb->get_height / TILESIZE,
636 998 };
637 999
638 $idx += $tile->{w} * $tile->{h}; 1000 $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 } 1001 }
1002
1003 construct_tilecache_pb $idx, \%cache;
1004
1005 \%cache
653 } 1006 };
654 }
655 1007
656 $pb->save ("$VARDIR/tilecache.png", "png");
657
658 \%cache
659 }; 1008 }
660} 1009}
661 1010
662=head1 AUTHOR 1011=head1 AUTHOR
663 1012
664 Marc Lehmann <schmorp@schmorp.de> 1013 Marc Lehmann <schmorp@schmorp.de>

Diff Legend

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