ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra/Deliantra.pm
(Generate patch)

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.57 by root, Thu Mar 23 08:55:54 2006 UTC vs.
Revision 1.107 by root, Wed May 9 11:44:40 2007 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.1'; 9our $VERSION = '0.98';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
19 19
20our @EXPORT = qw( 20our @EXPORT = qw(
21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents 21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents
22); 22);
23 23
24use JSON::XS qw(from_json to_json);
25
24our $LIB = $ENV{CROSSFIRE_LIBDIR}; 26our $LIB = $ENV{CROSSFIRE_LIBDIR};
25 27
26our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; 28our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire"
29 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
30 : File::Spec->tmpdir . "/crossfire";
27 31
28mkdir $VARDIR, 0777; 32mkdir $VARDIR, 0777;
29 33
30sub TILESIZE (){ 32 } 34sub TILESIZE (){ 32 }
31 35
… …
37 msg => "endmsg", 41 msg => "endmsg",
38 lore => "endlore", 42 lore => "endlore",
39 maplore => "endmaplore", 43 maplore => "endmaplore",
40); 44);
41 45
46# movement bit type, PITA
47our %FIELD_MOVEMENT = map +($_ => undef),
48 qw(move_type move_block move_allow move_on move_off move_slow);
49
42# same as in server save routine, to (hopefully) be compatible 50# same as in server save routine, to (hopefully) be compatible
43# to the other editors. 51# to the other editors.
44our @FIELD_ORDER_MAP = (qw( 52our @FIELD_ORDER_MAP = (qw(
53 file_format_version
45 name swap_time reset_timeout fixed_resettime difficulty region 54 name attach swap_time reset_timeout fixed_resettime difficulty region
46 shopitems shopgreed shopmin shopmax shoprace 55 shopitems shopgreed shopmin shopmax shoprace
47 darkness width height enter_x enter_y msg maplore 56 darkness width height enter_x enter_y msg maplore
48 unique template 57 unique template
49 outdoor temp pressure humid windspeed winddir sky nosmooth 58 outdoor temp pressure humid windspeed winddir sky nosmooth
50 tile_path_1 tile_path_2 tile_path_3 tile_path_4 59 tile_path_1 tile_path_2 tile_path_3 tile_path_4
51)); 60));
52 61
53our @FIELD_ORDER = (qw( 62our @FIELD_ORDER = (qw(
63 inherit
64
54 elevation 65 elevation
55 66
56 name name_pl custom_name title race 67 name name_pl custom_name attach title race
57 slaying skill msg lore other_arch face 68 slaying skill msg lore other_arch
58 #todo-events
59 animation is_animated 69 face animation is_animated
70 magicmap smoothlevel smoothface
60 Str Dex Con Wis Pow Cha Int 71 str dex con wis pow cha int
61 hp maxhp sp maxsp grace maxgrace 72 hp maxhp sp maxsp grace maxgrace
62 exp perm_exp expmul 73 exp perm_exp expmul
63 food dam luck wc ac x y speed speed_left move_state attack_movement 74 food dam luck wc ac x y speed speed_left move_state attack_movement
64 nrof level direction type subtype 75 nrof level direction type subtype attacktype
65 76
66 resist_physical resist_magic resist_fire resist_electricity 77 resist_physical resist_magic resist_fire resist_electricity
67 resist_cold resist_confusion resist_acid resist_drain 78 resist_cold resist_confusion resist_acid resist_drain
68 resist_weaponmagic resist_ghosthit resist_poison resist_slow 79 resist_weaponmagic resist_ghosthit resist_poison resist_slow
69 resist_paralyze resist_turn_undead resist_fear resist_cancellation 80 resist_paralyze resist_turn_undead resist_fear resist_cancellation
… …
72 resist_life_stealing resist_disease 83 resist_life_stealing resist_disease
73 84
74 path_attuned path_repelled path_denied material materialname 85 path_attuned path_repelled path_denied material materialname
75 value carrying weight invisible state magic 86 value carrying weight invisible state magic
76 last_heal last_sp last_grace last_eat 87 last_heal last_sp last_grace last_eat
77 connected glow_radius randomitems npx_status npc_program 88 connected glow_radius randomitems tresure_env npx_status npc_program
78 run_away pick_up container will_apply smoothlevel 89 run_away pick_up container will_apply smoothlevel
79 current_weapon_script weapontype tooltype elevation client_type 90 current_weapon_script weapontype tooltype elevation client_type
80 item_power duration range 91 item_power duration range
81 range_modifier duration_modifier dam_modifier gen_sp_armour 92 range_modifier duration_modifier dam_modifier gen_sp_armour
82 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty 93 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
… …
93 known_magical known_cursed can_use_skill been_applied has_ready_scroll 104 known_magical known_cursed can_use_skill been_applied has_ready_scroll
94 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly 105 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
95 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark 106 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
96 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage 107 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
97 activate_on_push activate_on_release is_water use_content_on_gen is_buildable 108 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
109 precious
98 110
99 body_range body_arm body_torso body_head body_neck body_skill 111 body_range body_arm body_torso body_head body_neck body_skill
100 body_finger body_shoulder body_foot body_hand body_wrist body_waist 112 body_finger body_shoulder body_foot body_hand body_wrist body_waist
101)); 113));
114
115our %EVENT_TYPE = (
116 apply => 1,
117 attack => 2,
118 death => 3,
119 drop => 4,
120 pickup => 5,
121 say => 6,
122 stop => 7,
123 time => 8,
124 throw => 9,
125 trigger => 10,
126 close => 11,
127 timer => 12,
128);
102 129
103sub MOVE_WALK (){ 0x01 } 130sub MOVE_WALK (){ 0x01 }
104sub MOVE_FLY_LOW (){ 0x02 } 131sub MOVE_FLY_LOW (){ 0x02 }
105sub MOVE_FLY_HIGH (){ 0x04 } 132sub MOVE_FLY_HIGH (){ 0x04 }
106sub MOVE_FLYING (){ 0x06 } 133sub MOVE_FLYING (){ 0x06 }
107sub MOVE_SWIM (){ 0x08 } 134sub MOVE_SWIM (){ 0x08 }
108sub MOVE_BOAT (){ 0x10 } 135sub MOVE_BOAT (){ 0x10 }
109sub MOVE_ALL (){ 0xff } 136sub MOVE_SHIP (){ 0x20 }
137sub MOVE_KNOWN (){ 0x3f } # all of above
138sub MOVE_ALL (){ 0x10000 } # very special value
139
140our %MOVE_TYPE = (
141 walk => MOVE_WALK,
142 fly_low => MOVE_FLY_LOW,
143 fly_high => MOVE_FLY_HIGH,
144 flying => MOVE_FLYING,
145 swim => MOVE_SWIM,
146 boat => MOVE_BOAT,
147 ship => MOVE_SHIP,
148 all => MOVE_ALL,
149);
150
151our @MOVE_TYPE = keys %MOVE_TYPE;
152
153{
154 package Crossfire::MoveType;
155
156 use overload
157 '=' => sub { bless [@{$_[0]}], ref $_[0] },
158 '""' => \&as_string,
159 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
160 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
161 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
162 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
163 'x=' => sub {
164 my $cur = $_[0] >= $_[1];
165 if (!defined $cur) {
166 if ($_[0] >= "all") {
167 $_[0] -= $_[1];
168 } else {
169 $_[0] += $_[1];
170 }
171 } elsif ($cur) {
172 $_[0] -= $_[1];
173 } else {
174 $_[0] /= $_[1];
175 }
176
177 $_[0]
178 },
179 'eq' => sub { "$_[0]" eq "$_[1]" },
180 'ne' => sub { "$_[0]" ne "$_[1]" },
181 ;
182}
183
184sub Crossfire::MoveType::new {
185 my ($class, $string) = @_;
186
187 my $mask;
188 my $value;
189
190 if ($string =~ /^\s*\d+\s*$/) {
191 $mask = MOVE_ALL;
192 $value = $string+0;
193 } else {
194 for (split /\s+/, lc $string) {
195 if (s/^-//) {
196 $mask |= $MOVE_TYPE{$_};
197 $value &= ~$MOVE_TYPE{$_};
198 } else {
199 $mask |= $MOVE_TYPE{$_};
200 $value |= $MOVE_TYPE{$_};
201 }
202 }
203 }
204
205 (bless [$mask, $value], $class)->normalise
206}
207
208sub Crossfire::MoveType::normalise {
209 my ($self) = @_;
210
211 if ($self->[0] & MOVE_ALL) {
212 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
213 $self->[0] &= $mask;
214 $self->[1] &= $mask;
215 }
216
217 $self->[1] &= $self->[0];
218
219 $self
220}
221
222sub Crossfire::MoveType::as_string {
223 my ($self) = @_;
224
225 my @res;
226
227 my ($mask, $value) = @$self;
228
229 for (@Crossfire::MOVE_TYPE) {
230 my $bit = $Crossfire::MOVE_TYPE{$_};
231 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
232 $mask &= ~$bit;
233 push @res, $value & $bit ? $_ : "-$_";
234 }
235 }
236
237 join " ", @res
238}
110 239
111sub load_ref($) { 240sub load_ref($) {
112 my ($path) = @_; 241 my ($path) = @_;
113 242
114 open my $fh, "<", $path 243 open my $fh, "<:raw:perlio", $path
115 or die "$path: $!"; 244 or die "$path: $!";
116 binmode $fh;
117 local $/; 245 local $/;
118 246
119 thaw <$fh> 247 thaw <$fh>
120} 248}
121 249
122sub save_ref($$) { 250sub save_ref($$) {
123 my ($ref, $path) = @_; 251 my ($ref, $path) = @_;
124 252
125 open my $fh, ">", "$path~" 253 open my $fh, ">:raw:perlio", "$path~"
126 or die "$path~: $!"; 254 or die "$path~: $!";
127 binmode $fh;
128 print $fh freeze $ref; 255 print $fh freeze $ref;
129 close $fh; 256 close $fh;
130 rename "$path~", $path 257 rename "$path~", $path
131 or die "$path: $!"; 258 or die "$path: $!";
132} 259}
133 260
261my %attack_mask = (
262 physical => 0x00000001,
263 magic => 0x00000002,
264 fire => 0x00000004,
265 electricity => 0x00000008,
266 cold => 0x00000010,
267 confusion => 0x00000020,
268 acid => 0x00000040,
269 drain => 0x00000080,
270 weaponmagic => 0x00000100,
271 ghosthit => 0x00000200,
272 poison => 0x00000400,
273 slow => 0x00000800,
274 paralyze => 0x00001000,
275 turn_undead => 0x00002000,
276 fear => 0x00004000,
277 cancellation => 0x00008000,
278 deplete => 0x00010000,
279 death => 0x00020000,
280 chaos => 0x00040000,
281 counterspell => 0x00080000,
282 godpower => 0x00100000,
283 holyword => 0x00200000,
284 blind => 0x00400000,
285 internal => 0x00800000,
286 life_stealing => 0x01000000,
287 disease => 0x02000000,
288);
289
290sub _add_resist($$$) {
291 my ($ob, $mask, $value) = @_;
292
293 while (my ($k, $v) = each %attack_mask) {
294 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
295 }
296}
297
298my %MATERIAL = reverse
299 paper => 1,
300 iron => 2,
301 glass => 4,
302 leather => 8,
303 wood => 16,
304 organic => 32,
305 stone => 64,
306 cloth => 128,
307 adamant => 256,
308 liquid => 512,
309 tin => 1024,
310 bone => 2048,
311 ice => 4096,
312
313 # guesses
314 runestone => 12,
315 bronze => 18,
316 "ancient wood" => 20,
317 glass => 36,
318 marble => 66,
319 ice => 68,
320 stone => 70,
321 stone => 80,
322 cloth => 136,
323 ironwood => 144,
324 adamantium => 258,
325 glacium => 260,
326 blood => 544,
327;
328
329# object as in "Object xxx", i.e. archetypes
134sub normalize_object($) { 330sub normalize_object($) {
135 my ($ob) = @_; 331 my ($ob) = @_;
136 332
333 # convert material bitset to materialname, if possible
334 if (exists $ob->{material}) {
335 if (!$ob->{material}) {
336 delete $ob->{material};
337 } elsif (exists $ob->{materialname}) {
338 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
339 delete $ob->{material};
340 } else {
341 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
342 delete $ob->{material}; # assume materilname is more specific and nuke material
343 }
344 } elsif (my $name = $MATERIAL{$ob->{material}}) {
345 delete $ob->{material};
346 $ob->{materialname} = $name;
347 } else {
348 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
349 }
350 }
351
352 # color_fg is used as default for magicmap if magicmap does not exist
353 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
354
355 # nuke outdated or never supported fields
137 delete $ob->{$_} for qw( 356 delete @$ob{qw(
138 can_knockback can_parry can_impale can_cut can_dam_armour 357 can_knockback can_parry can_impale can_cut can_dam_armour
139 can_apply pass_thru can_pass_thru 358 can_apply pass_thru can_pass_thru color_bg color_fg
140 ); 359 )};
141 360
142 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 361 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
362 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
363 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
364
365 # convert movement strings to bitsets
366 for my $attr (keys %FIELD_MOVEMENT) {
143 next unless exists $ob->{$attr}; 367 next unless exists $ob->{$attr};
144 next if $ob->{$attr} =~ /^\d+$/;
145 368
146 my $flags = 0; 369 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr};
147
148 # assume list
149 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
150 $flags |= MOVE_WALK if $flag eq "walk";
151 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
152 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
153 $flags |= MOVE_FLYING if $flag eq "flying";
154 $flags |= MOVE_SWIM if $flag eq "swim";
155 $flags |= MOVE_BOAT if $flag eq "boat";
156 $flags |= MOVE_ALL if $flag eq "all";
157
158 $flags &= ~MOVE_WALK if $flag eq "-walk";
159 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
160 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
161 $flags &= ~MOVE_FLYING if $flag eq "-flying";
162 $flags &= ~MOVE_SWIM if $flag eq "-swim";
163 $flags &= ~MOVE_BOAT if $flag eq "-boat";
164 $flags &= ~MOVE_ALL if $flag eq "-all";
165 }
166
167 $ob->{$attr} = $flags;
168 } 370 }
169 371
372 # convert outdated movement flags to new movement sets
170 if (defined (my $v = delete $ob->{no_pass})) { 373 if (defined (my $v = delete $ob->{no_pass})) {
171 $ob->{move_block} = $v ? MOVE_ALL : 0; 374 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
172 } 375 }
173 if (defined (my $v = delete $ob->{slow_move})) { 376 if (defined (my $v = delete $ob->{slow_move})) {
174 $ob->{move_slow} |= MOVE_WALK; 377 $ob->{move_slow} += "walk";
175 $ob->{move_slow_penalty} = $v; 378 $ob->{move_slow_penalty} = $v;
176 } 379 }
177 if (defined (my $v = delete $ob->{walk_on})) { 380 if (defined (my $v = delete $ob->{walk_on})) {
178 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 381 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
179 : $ob->{move_on} & ~MOVE_WALK;
180 } 382 }
181 if (defined (my $v = delete $ob->{walk_off})) { 383 if (defined (my $v = delete $ob->{walk_off})) {
182 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 384 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
183 : $ob->{move_off} & ~MOVE_WALK;
184 } 385 }
185 if (defined (my $v = delete $ob->{fly_on})) { 386 if (defined (my $v = delete $ob->{fly_on})) {
186 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 387 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
187 : $ob->{move_on} & ~MOVE_FLY_LOW;
188 } 388 }
189 if (defined (my $v = delete $ob->{fly_off})) { 389 if (defined (my $v = delete $ob->{fly_off})) {
190 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 390 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
191 : $ob->{move_off} & ~MOVE_FLY_LOW;
192 } 391 }
193 if (defined (my $v = delete $ob->{flying})) { 392 if (defined (my $v = delete $ob->{flying})) {
194 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 393 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
195 : $ob->{move_type} & ~MOVE_FLY_LOW;
196 } 394 }
395
396 # convert idiotic event_xxx things into objects
397 while (my ($event, $subtype) = each %EVENT_TYPE) {
398 if (exists $ob->{"event_${event}_plugin"}) {
399 push @{$ob->{inventory}}, {
400 _name => "event_$event",
401 title => delete $ob->{"event_${event}_plugin"},
402 slaying => delete $ob->{"event_${event}"},
403 name => delete $ob->{"event_${event}_options"},
404 };
405 }
406 }
407
408 # some archetypes had "+3" instead of the canonical "3", so fix
409 $ob->{dam} *= 1 if exists $ob->{dam};
197 410
198 $ob 411 $ob
199} 412}
200 413
414# arch as in "arch xxx", ie.. objects
201sub normalize_arch($) { 415sub normalize_arch($) {
202 my ($ob) = @_; 416 my ($ob) = @_;
203 417
204 normalize_object $ob; 418 normalize_object $ob;
205 419
… …
242 } 456 }
243 457
244 $ob 458 $ob
245} 459}
246 460
461sub attr_thaw($) {
462 my ($ob) = @_;
463
464 $ob->{attach} = from_json $ob->{attach}
465 if exists $ob->{attach};
466
467 $ob
468}
469
470sub attr_freeze($) {
471 my ($ob) = @_;
472
473 $ob->{attach} = Crossfire::to_json $ob->{attach}
474 if exists $ob->{attach};
475
476 $ob
477}
478
247sub read_pak($) { 479sub read_pak($) {
248 my ($path) = @_; 480 my ($path) = @_;
249 481
250 my %pak; 482 my %pak;
251 483
252 open my $fh, "<", $path 484 open my $fh, "<:raw:perlio", $path
253 or Carp::croak "$_[0]: $!"; 485 or Carp::croak "$_[0]: $!";
254 binmode $fh; 486 binmode $fh;
255 while (<$fh>) { 487 while (<$fh>) {
256 my ($type, $id, $len, $path) = split; 488 my ($type, $id, $len, $path) = split;
257 $path =~ s/.*\///; 489 $path =~ s/.*\///;
… …
259 } 491 }
260 492
261 \%pak 493 \%pak
262} 494}
263 495
264sub read_arch($) { 496sub read_arch($;$) {
265 my ($path) = @_; 497 my ($path, $toplevel) = @_;
266 498
267 my %arc; 499 my %arc;
268 my ($more, $prev); 500 my ($more, $prev);
501 my $comment;
269 502
270 open my $fh, "<", $path 503 open my $fh, "<:raw:perlio:utf8", $path
271 or Carp::croak "$path: $!"; 504 or Carp::croak "$path: $!";
272 505
273 binmode $fh; 506# binmode $fh;
274 507
275 my $parse_block; $parse_block = sub { 508 my $parse_block; $parse_block = sub {
276 my %arc = @_; 509 my %arc = @_;
277 510
278 while (<$fh>) { 511 while (<$fh>) {
279 s/\s+$//; 512 s/\s+$//;
280 if (/^end$/i) { 513 if (/^end$/i) {
281 last; 514 last;
515
282 } elsif (/^arch (\S+)$/i) { 516 } elsif (/^arch (\S+)$/i) {
283 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 517 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
518
284 } elsif (/^lore$/i) { 519 } elsif (/^lore$/i) {
285 while (<$fh>) { 520 while (<$fh>) {
286 last if /^endlore\s*$/i; 521 last if /^endlore\s*$/i;
287 $arc{lore} .= $_; 522 $arc{lore} .= $_;
288 } 523 }
289 } elsif (/^msg$/i) { 524 } elsif (/^msg$/i) {
290 while (<$fh>) { 525 while (<$fh>) {
291 last if /^endmsg\s*$/i; 526 last if /^endmsg\s*$/i;
292 $arc{msg} .= $_; 527 $arc{msg} .= $_;
293 } 528 }
529 } elsif (/^anim$/i) {
530 while (<$fh>) {
531 last if /^mina\s*$/i;
532 chomp;
533 push @{ $arc{anim} }, $_;
534 }
294 } elsif (/^(\S+)\s*(.*)$/) { 535 } elsif (/^(\S+)\s*(.*)$/) {
295 $arc{lc $1} = $2; 536 $arc{lc $1} = $2;
296 } elsif (/^\s*($|#)/) { 537 } elsif (/^\s*#/) {
538 $arc{_comment} .= "$_\n";
539
540 } elsif (/^\s*$/) {
297 # 541 #
298 } else { 542 } else {
299 warn "$path: unparsable line '$_' in arch $arc{_name}"; 543 warn "$path: unparsable line '$_' in arch $arc{_name}";
300 } 544 }
301 } 545 }
… …
307 s/\s+$//; 551 s/\s+$//;
308 if (/^more$/i) { 552 if (/^more$/i) {
309 $more = $prev; 553 $more = $prev;
310 } elsif (/^object (\S+)$/i) { 554 } elsif (/^object (\S+)$/i) {
311 my $name = $1; 555 my $name = $1;
312 my $arc = normalize_object $parse_block->(_name => $name); 556 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
557 undef $comment;
558 delete $arc{_comment} unless length $arc{_comment};
559 $arc->{_atype} = 'object';
313 560
314 if ($more) { 561 if ($more) {
315 $more->{more} = $arc; 562 $more->{more} = $arc;
316 } else { 563 } else {
317 $arc{$name} = $arc; 564 $arc{$name} = $arc;
318 } 565 }
319 $prev = $arc; 566 $prev = $arc;
320 $more = undef; 567 $more = undef;
321 } elsif (/^arch (\S+)$/i) { 568 } elsif (/^arch (\S+)$/i) {
322 my $name = $1; 569 my $name = $1;
323 my $arc = normalize_arch $parse_block->(_name => $name); 570 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
571 undef $comment;
572 delete $arc{_comment} unless length $arc{_comment};
573 $arc->{_atype} = 'arch';
324 574
325 if ($more) { 575 if ($more) {
326 $more->{more} = $arc; 576 $more->{more} = $arc;
327 } else { 577 } else {
328 push @{ $arc{arch} }, $arc; 578 push @{ $arc{arch} }, $arc;
329 } 579 }
330 $prev = $arc; 580 $prev = $arc;
331 $more = undef; 581 $more = undef;
582 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
583 if ($1 eq "lev_array") {
584 while (<$fh>) {
585 last if /^endplst\s*$/;
586 push @{$toplevel->{lev_array}}, $_+0;
587 }
588 } else {
589 $toplevel->{$1} = $2;
590 }
591 } elsif (/^\s*#/) {
592 $comment .= "$_\n";
332 } elsif (/^\s*($|#)/) { 593 } elsif (/^\s*($|#)/) {
333 # 594 #
334 } else { 595 } else {
335 warn "$path: unparseable top-level line '$_'"; 596 die "$path: unparseable top-level line '$_'";
336 } 597 }
337 } 598 }
338 599
339 undef $parse_block; # work around bug in perl not freeing $fh etc. 600 undef $parse_block; # work around bug in perl not freeing $fh etc.
340 601
341 \%arc 602 \%arc
603}
604
605sub archlist_to_string {
606 my ($arch) = @_;
607
608 my $str;
609
610 my $append; $append = sub {
611 my %a = %{$_[0]};
612
613 Crossfire::attr_freeze \%a;
614 Crossfire::normalize_arch \%a;
615
616 # undo the bit-split we did before
617 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
618 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
619 | (delete $a{attack_movement_bits_4_7});
620 }
621
622 if (my $comment = delete $a{_comment}) {
623 if ($comment =~ /[^\n\s#]/) {
624 $str .= $comment;
625 }
626 }
627
628 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
629
630 my $inv = delete $a{inventory};
631 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
632 my $anim = delete $a{anim};
633
634 if ($a{_atype} eq 'object') {
635 $str .= join "\n", "anim", @$anim, "mina\n"
636 if $anim;
637 }
638
639 my @kv;
640
641 for ($a{_name} eq "map"
642 ? @Crossfire::FIELD_ORDER_MAP
643 : @Crossfire::FIELD_ORDER) {
644 push @kv, [$_, delete $a{$_}]
645 if exists $a{$_};
646 }
647
648 for (sort keys %a) {
649 next if /^_/; # ignore our _-keys
650 push @kv, [$_, delete $a{$_}];
651 }
652
653 for (@kv) {
654 my ($k, $v) = @$_;
655
656 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
657 $v =~ s/\n$//;
658 $str .= "$k\n$v\n$end\n";
659 } else {
660 $str .= "$k $v\n";
661 }
662 }
663
664 if ($inv) {
665 $append->($_) for @$inv;
666 }
667
668 $str .= "end\n";
669
670 if ($a{_atype} eq 'object') {
671 if ($more) {
672 $str .= "more\n";
673 $append->($more) if $more;
674 } else {
675 $str .= "\n";
676 }
677 }
678 };
679
680 for (@$arch) {
681 $append->($_);
682 }
683
684 $str
342} 685}
343 686
344# put all archs into a hash with editor_face as it's key 687# put all archs into a hash with editor_face as it's key
345# NOTE: the arrays in the hash values are references to 688# NOTE: the arrays in the hash values are references to
346# the archs from $ARCH 689# the archs from $ARCH
347sub editor_archs { 690sub editor_archs {
348 my %paths; 691 my %paths;
349 692
350 for (keys %ARCH) { 693 for (keys %ARCH) {
351 my $arch = $ARCH{$_}; 694 my $arch = $ARCH{$_};
352 push @{$paths{$arch->{editor_folder}}}, \$arch; 695 push @{$paths{$arch->{editor_folder}}}, $arch;
353 } 696 }
354 697
355 \%paths 698 \%paths
356} 699}
357 700
… …
367 my ($a) = @_; 710 my ($a) = @_;
368 711
369 my $o = $ARCH{$a->{_name}} 712 my $o = $ARCH{$a->{_name}}
370 or return; 713 or return;
371 714
372 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 715 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
716 unless ($face) {
717 $face = $FACE{"blank.x11"}
373 or (warn "no face data found for arch '$a->{_name}'"), return; 718 or (warn "no face data found for arch '$a->{_name}'"), return;
719 }
374 720
375 if ($face->{w} > 1 || $face->{h} > 1) { 721 if ($face->{w} > 1 || $face->{h} > 1) {
376 # bigface 722 # bigface
377 return (0, 0, $face->{w} - 1, $face->{h} - 1); 723 return (0, 0, $face->{w} - 1, $face->{h} - 1);
378 724
… …
422 my $type = $obj->{type} || $arch->{type}; 768 my $type = $obj->{type} || $arch->{type};
423 769
424 if ($type > 0) { 770 if ($type > 0) {
425 $root = $Crossfire::Data::ATTR{$type}; 771 $root = $Crossfire::Data::ATTR{$type};
426 } else { 772 } else {
773 my %a = (%$arch, %$obj);
774
775 if ($a{is_floor} && !$a{alive}) {
776 $root = $Crossfire::Data::TYPE{Floor};
777 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
778 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
779 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
780 $root = $Crossfire::Data::TYPE{Wall};
781 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
782 $root = $Crossfire::Data::TYPE{"Weak Wall"};
783 } else {
427 $root = $Crossfire::Data::TYPE{Misc}; 784 $root = $Crossfire::Data::TYPE{Misc};
428
429 type:
430 for (@Crossfire::Data::ATTR0) {
431 my $req = $_->{required}
432 or die "internal error: ATTR0 without 'required'";
433
434 keys %$req;
435 while (my ($k, $v) = each %$req) {
436 next type
437 unless $obj->{$k} == $v || $arch->{$k} == $v;
438 }
439
440 $root = $_;
441 } 785 }
442 } 786 }
443 787
444 my @import = ($root); 788 my @import = ($root);
445 789
… …
487 ]; 831 ];
488 832
489 $attr 833 $attr
490} 834}
491 835
492sub arch_edit_sections {
493# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
494# edit_type = 0;
495# else if (edit_type != 0) {
496# // all flags from 'check_type' must be unset in this arch because they get recalculated now
497# edit_type &= ~check_type;
498# }
499#
500# }
501# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
502# getAttributeValue("alive", defarch) == 1 &&
503# (getAttributeValue("monster", defarch) == 1 ||
504# getAttributeValue("generator", defarch) == 1)) {
505# // Monster: monsters/npcs/generators
506# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
507# }
508# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
509# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
510# // Walls
511# edit_type |= IGUIConstants.TILE_EDIT_WALL;
512# }
513# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
514# getAttributeValue("connected", defarch) != 0) {
515# // Connected Objects
516# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
517# }
518# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
519# arch_type == 66 || arch_type == 41 || arch_type == 95) {
520# // Exit: teleporter/exit/trapdoors
521# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
522# }
523# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
524# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
525# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
526# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
527# arch_type == 124 || arch_type == 130)) {
528# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
529# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
530# }
531# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
532# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
533# arch_type == 91 || arch_type == 21 || arch_type == 24) {
534# // Door: door/special door/gates + keys
535# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
536# }
537# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
538# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
539# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
540# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
541# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
542# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
543# arch_type == 122 || arch_type == 3)) {
544# // Equipment: weapons/armour/wands/rods
545# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
546# }
547#
548# return(edit_type);
549#
550#
551}
552
553sub cache_file($$&&) { 836sub cache_file($$&&) {
554 my ($src, $cache, $load, $create) = @_; 837 my ($src, $cache, $load, $create) = @_;
555 838
556 my ($size, $mtime) = (stat $src)[7,9] 839 my ($size, $mtime) = (stat $src)[7,9]
557 or Carp::croak "$src: $!"; 840 or Carp::croak "$src: $!";
… …
605 }, sub { 888 }, sub {
606 read_arch "$LIB/archetypes" 889 read_arch "$LIB/archetypes"
607 }; 890 };
608} 891}
609 892
893sub construct_tilecache_pb {
894 my ($idx, $cache) = @_;
895
896 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
897
898 while (my ($name, $tile) = each %$cache) {
899 my $tpb = delete $tile->{pb};
900 my $ofs = $tile->{idx};
901
902 for my $x (0 .. $tile->{w} - 1) {
903 for my $y (0 .. $tile->{h} - 1) {
904 my $idx = $ofs + $x + $y * $tile->{w};
905 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
906 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
907 }
908 }
909 }
910
911 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
912
913 $cache
914}
915
916sub use_tilecache {
917 my ($face) = @_;
918 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
919 or die "$VARDIR/tilecache.png: $!";
920 *FACE = $_[0];
921}
922
610=item load_tilecache 923=item load_tilecache
611 924
612(Re-)Load %TILE and %FACE. 925(Re-)Load %TILE and %FACE.
613 926
614=cut 927=cut
615 928
616sub load_tilecache() { 929sub load_tilecache() {
617 require Gtk2; 930 require Gtk2;
618 931
932 if (-e "$LIB/crossfire.0") { # Crossfire1 version
619 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 933 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
620 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 934 sub {
621 or die "$VARDIR/tilecache.png: $!";
622 *FACE = $_[0];
623 }, sub {
624 require File::Temp;
625
626 my $tile = read_pak "$LIB/crossfire.0"; 935 my $tile = read_pak "$LIB/crossfire.0";
627 936
628 my %cache; 937 my %cache;
629 938
630 my $idx = 0; 939 my $idx = 0;
631 940
632 for my $name (sort keys %$tile) { 941 for my $name (sort keys %$tile) {
633 my ($fh, $filename) = File::Temp::tempfile (); 942 my $pb = new Gtk2::Gdk::PixbufLoader;
634 print $fh $tile->{$name}; 943 $pb->write ($tile->{$name});
635 close $fh; 944 $pb->close;
636 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 945 my $pb = $pb->get_pixbuf;
637 unlink $filename;
638 946
639 my $tile = $cache{$name} = { 947 my $tile = $cache{$name} = {
640 pb => $pb, 948 pb => $pb,
641 idx => $idx, 949 idx => $idx,
642 w => int $pb->get_width / TILESIZE, 950 w => int $pb->get_width / TILESIZE,
643 h => int $pb->get_height / TILESIZE, 951 h => int $pb->get_height / TILESIZE,
952 };
953
954 $idx += $tile->{w} * $tile->{h};
955 }
956
957 construct_tilecache_pb $idx, \%cache;
958
959 \%cache
644 }; 960 };
961
962 } else { # Crossfire+ version
963 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
964 sub {
965 my %cache;
966 my $facedata = Storable::retrieve "$LIB/facedata";
967
968 $facedata->{version} == 2
969 or die "$LIB/facedata: version mismatch, cannot proceed.";
970
971 my $faces = $facedata->{faceinfo};
972 my $idx = 0;
973
974 for (sort keys %$faces) {
975 my ($face, $info) = ($_, $faces->{$_});
976
977 my $pb = new Gtk2::Gdk::PixbufLoader;
978 $pb->write ($info->{data32});
979 $pb->close;
980 my $pb = $pb->get_pixbuf;
981
982 my $tile = $cache{$face} = {
983 pb => $pb,
984 idx => $idx,
985 w => int $pb->get_width / TILESIZE,
986 h => int $pb->get_height / TILESIZE,
645 987 };
646 988
647 $idx += $tile->{w} * $tile->{h}; 989 $idx += $tile->{w} * $tile->{h};
648 }
649
650 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
651
652 while (my ($name, $tile) = each %cache) {
653 my $tpb = delete $tile->{pb};
654 my $ofs = $tile->{idx};
655
656 for my $x (0 .. $tile->{w} - 1) {
657 for my $y (0 .. $tile->{h} - 1) {
658 my $idx = $ofs + $x + $y * $tile->{w};
659 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
660 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
661 } 990 }
991
992 construct_tilecache_pb $idx, \%cache;
993
994 \%cache
662 } 995 };
663 }
664
665 $pb->save ("$VARDIR/tilecache.png", "png");
666
667 \%cache
668 }; 996 }
669} 997}
670 998
671=head1 AUTHOR 999=head1 AUTHOR
672 1000
673 Marc Lehmann <schmorp@schmorp.de> 1001 Marc Lehmann <schmorp@schmorp.de>

Diff Legend

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