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

Diff Legend

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