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.70 by root, Sun Aug 27 16:33:19 2006 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.1'; 9our $VERSION = '0.9';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
18use Storable qw(freeze thaw); 18use Storable qw(freeze thaw);
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
24use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working
25
26sub from_json($) {
27 $JSON::Syck::ImplicitUnicode = 1;
28 JSON::Syck::Load $_[0]
29}
30
31sub to_json($) {
32 $JSON::Syck::ImplicitUnicode = 0;
33 JSON::Syck::Dump $_[0]
34}
23 35
24our $LIB = $ENV{CROSSFIRE_LIBDIR}; 36our $LIB = $ENV{CROSSFIRE_LIBDIR};
25 37
26our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; 38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire";
27 39
… …
37 msg => "endmsg", 49 msg => "endmsg",
38 lore => "endlore", 50 lore => "endlore",
39 maplore => "endmaplore", 51 maplore => "endmaplore",
40); 52);
41 53
54# movement bit type, PITA
55our %FIELD_MOVEMENT = map +($_ => undef),
56 qw(move_type move_block move_allow move_on move_off move_slow);
57
42# same as in server save routine, to (hopefully) be compatible 58# same as in server save routine, to (hopefully) be compatible
43# to the other editors. 59# to the other editors.
44our @FIELD_ORDER_MAP = (qw( 60our @FIELD_ORDER_MAP = (qw(
45 name swap_time reset_timeout fixed_resettime difficulty region 61 name attach swap_time reset_timeout fixed_resettime difficulty region
46 shopitems shopgreed shopmin shopmax shoprace 62 shopitems shopgreed shopmin shopmax shoprace
47 darkness width height enter_x enter_y msg maplore 63 darkness width height enter_x enter_y msg maplore
48 unique template 64 unique template
49 outdoor temp pressure humid windspeed winddir sky nosmooth 65 outdoor temp pressure humid windspeed winddir sky nosmooth
50 tile_path_1 tile_path_2 tile_path_3 tile_path_4 66 tile_path_1 tile_path_2 tile_path_3 tile_path_4
51)); 67));
52 68
53our @FIELD_ORDER = (qw( 69our @FIELD_ORDER = (qw(
70 elevation
71
54 name name_pl custom_name title race 72 name name_pl custom_name attach title race
55 slaying skill msg lore other_arch face 73 slaying skill msg lore other_arch face
56 #todo-events 74 #todo-events
57 animation is_animated 75 animation is_animated
58 Str Dex Con Wis Pow Cha Int 76 str dex con wis pow cha int
59 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
60 exp perm_exp expmul 78 exp perm_exp expmul
61 food dam luck wc ac x y speed speed_left move_state attack_movement 79 food dam luck wc ac x y speed speed_left move_state attack_movement
62 nrof level direction type subtype 80 nrof level direction type subtype attacktype
63 81
64 resist_physical resist_magic resist_fire resist_electricity 82 resist_physical resist_magic resist_fire resist_electricity
65 resist_cold resist_confusion resist_acid resist_drain 83 resist_cold resist_confusion resist_acid resist_drain
66 resist_weaponmagic resist_ghosthit resist_poison resist_slow 84 resist_weaponmagic resist_ghosthit resist_poison resist_slow
67 resist_paralyze resist_turn_undead resist_fear resist_cancellation 85 resist_paralyze resist_turn_undead resist_fear resist_cancellation
… …
96 114
97 body_range body_arm body_torso body_head body_neck body_skill 115 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 116 body_finger body_shoulder body_foot body_hand body_wrist body_waist
99)); 117));
100 118
119our %EVENT_TYPE = (
120 apply => 1,
121 attack => 2,
122 death => 3,
123 drop => 4,
124 pickup => 5,
125 say => 6,
126 stop => 7,
127 time => 8,
128 throw => 9,
129 trigger => 10,
130 close => 11,
131 timer => 12,
132);
133
101sub MOVE_WALK (){ 0x01 } 134sub MOVE_WALK (){ 0x01 }
102sub MOVE_FLY_LOW (){ 0x02 } 135sub MOVE_FLY_LOW (){ 0x02 }
103sub MOVE_FLY_HIGH (){ 0x04 } 136sub MOVE_FLY_HIGH (){ 0x04 }
104sub MOVE_FLYING (){ 0x06 } 137sub MOVE_FLYING (){ 0x06 }
105sub MOVE_SWIM (){ 0x08 } 138sub MOVE_SWIM (){ 0x08 }
106sub MOVE_BOAT (){ 0x10 } 139sub MOVE_BOAT (){ 0x10 }
140sub MOVE_KNOWN (){ 0x1f } # all of above
107sub MOVE_ALL (){ 0xff } 141sub MOVE_ALLBIT (){ 0x10000 }
142sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
108 143
109sub load_ref($) { 144sub load_ref($) {
110 my ($path) = @_; 145 my ($path) = @_;
111 146
112 open my $fh, "<", $path 147 open my $fh, "<:raw:perlio", $path
113 or die "$path: $!"; 148 or die "$path: $!";
114 binmode $fh;
115 local $/; 149 local $/;
116 150
117 thaw <$fh> 151 thaw <$fh>
118} 152}
119 153
120sub save_ref($$) { 154sub save_ref($$) {
121 my ($ref, $path) = @_; 155 my ($ref, $path) = @_;
122 156
123 open my $fh, ">", "$path~" 157 open my $fh, ">:raw:perlio", "$path~"
124 or die "$path~: $!"; 158 or die "$path~: $!";
125 binmode $fh;
126 print $fh freeze $ref; 159 print $fh freeze $ref;
127 close $fh; 160 close $fh;
128 rename "$path~", $path 161 rename "$path~", $path
129 or die "$path: $!"; 162 or die "$path: $!";
130} 163}
131 164
165# object as in "Object xxx", i.e. archetypes
132sub normalize_object($) { 166sub normalize_object($) {
133 my ($ob) = @_; 167 my ($ob) = @_;
134 168
169 # nuke outdated or never supported fields
135 delete $ob->{$_} for qw( 170 delete $ob->{$_} for qw(
136 can_knockback can_parry can_impale can_cut can_dam_armour 171 can_knockback can_parry can_impale can_cut can_dam_armour
137 can_apply pass_thru can_pass_thru 172 can_apply pass_thru can_pass_thru
138 ); 173 );
139 174
140 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 175 # convert movement strings to bitsets
176 for my $attr (keys %FIELD_MOVEMENT) {
141 next unless exists $ob->{$attr}; 177 next unless exists $ob->{$attr};
178
179 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
180
142 next if $ob->{$attr} =~ /^\d+$/; 181 next if $ob->{$attr} =~ /^\d+$/;
143 182
144 my $flags = 0; 183 my $flags = 0;
145 184
146 # assume list 185 # assume list
… …
163 } 202 }
164 203
165 $ob->{$attr} = $flags; 204 $ob->{$attr} = $flags;
166 } 205 }
167 206
207 # convert outdated movement flags to new movement sets
168 if (defined (my $v = delete $ob->{no_pass})) { 208 if (defined (my $v = delete $ob->{no_pass})) {
169 $ob->{move_block} = $v ? MOVE_ALL : 0; 209 $ob->{move_block} = $v ? MOVE_ALL : 0;
170 } 210 }
171 if (defined (my $v = delete $ob->{slow_move})) { 211 if (defined (my $v = delete $ob->{slow_move})) {
172 $ob->{move_slow} |= MOVE_WALK; 212 $ob->{move_slow} |= MOVE_WALK;
173 $ob->{move_slow_penalty} = $v; 213 $ob->{move_slow_penalty} = $v;
174 } 214 }
175 if (defined (my $v = delete $ob->{walk_on})) { 215 if (defined (my $v = delete $ob->{walk_on})) {
216 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
176 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 217 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
177 : $ob->{move_on} & ~MOVE_WALK; 218 : $ob->{move_on} & ~MOVE_WALK;
178 } 219 }
179 if (defined (my $v = delete $ob->{walk_off})) { 220 if (defined (my $v = delete $ob->{walk_off})) {
221 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
180 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 222 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
181 : $ob->{move_off} & ~MOVE_WALK; 223 : $ob->{move_off} & ~MOVE_WALK;
182 } 224 }
183 if (defined (my $v = delete $ob->{fly_on})) { 225 if (defined (my $v = delete $ob->{fly_on})) {
226 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
184 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 227 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
185 : $ob->{move_on} & ~MOVE_FLY_LOW; 228 : $ob->{move_on} & ~MOVE_FLY_LOW;
186 } 229 }
187 if (defined (my $v = delete $ob->{fly_off})) { 230 if (defined (my $v = delete $ob->{fly_off})) {
231 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
188 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 232 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
189 : $ob->{move_off} & ~MOVE_FLY_LOW; 233 : $ob->{move_off} & ~MOVE_FLY_LOW;
190 } 234 }
191 if (defined (my $v = delete $ob->{flying})) { 235 if (defined (my $v = delete $ob->{flying})) {
236 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type};
192 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 237 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
193 : $ob->{move_type} & ~MOVE_FLY_LOW; 238 : $ob->{move_type} & ~MOVE_FLY_LOW;
194 } 239 }
195 240
241 # convert idiotic event_xxx things into objects
242 while (my ($event, $subtype) = each %EVENT_TYPE) {
243 if (exists $ob->{"event_${event}_plugin"}) {
244 push @{$ob->{inventory}}, {
245 _name => "event_$event",
246 title => delete $ob->{"event_${event}_plugin"},
247 slaying => delete $ob->{"event_${event}"},
248 name => delete $ob->{"event_${event}_options"},
249 };
250 }
251 }
252
196 $ob 253 $ob
197} 254}
198 255
256# arch as in "arch xxx", ie.. objects
199sub normalize_arch($) { 257sub normalize_arch($) {
200 my ($ob) = @_; 258 my ($ob) = @_;
201 259
202 normalize_object $ob; 260 normalize_object $ob;
203 261
… …
230 delete $ob->{$k}; 288 delete $ob->{$k};
231 } 289 }
232 } 290 }
233 } 291 }
234 292
293 # a speciality for the editor
294 if (exists $ob->{attack_movement}) {
295 my $am = delete $ob->{attack_movement};
296 $ob->{attack_movement_bits_0_3} = $am & 15;
297 $ob->{attack_movement_bits_4_7} = $am & 240;
298 }
299
300 $ob
301}
302
303sub attr_thaw($) {
304 my ($ob) = @_;
305
306 $ob->{attach} = from_json $ob->{attach}
307 if exists $ob->{attach};
308
309 $ob
310}
311
312sub attr_freeze($) {
313 my ($ob) = @_;
314
315 $ob->{attach} = Crossfire::to_json $ob->{attach}
316 if exists $ob->{attach};
317
235 $ob 318 $ob
236} 319}
237 320
238sub read_pak($) { 321sub read_pak($) {
239 my ($path) = @_; 322 my ($path) = @_;
240 323
241 my %pak; 324 my %pak;
242 325
243 open my $fh, "<", $path 326 open my $fh, "<:raw:perlio", $path
244 or Carp::croak "$_[0]: $!"; 327 or Carp::croak "$_[0]: $!";
245 binmode $fh; 328 binmode $fh;
246 while (<$fh>) { 329 while (<$fh>) {
247 my ($type, $id, $len, $path) = split; 330 my ($type, $id, $len, $path) = split;
248 $path =~ s/.*\///; 331 $path =~ s/.*\///;
… …
250 } 333 }
251 334
252 \%pak 335 \%pak
253} 336}
254 337
255sub read_arch($) { 338sub read_arch($;$) {
256 my ($path) = @_; 339 my ($path, $toplevel) = @_;
257 340
258 my %arc; 341 my %arc;
259 my ($more, $prev); 342 my ($more, $prev);
260 343
261 open my $fh, "<", $path 344 open my $fh, "<:raw:perlio:utf8", $path
262 or Carp::croak "$path: $!"; 345 or Carp::croak "$path: $!";
263 346
264 binmode $fh; 347# binmode $fh;
265 348
266 my $parse_block; $parse_block = sub { 349 my $parse_block; $parse_block = sub {
267 my %arc = @_; 350 my %arc = @_;
268 351
269 while (<$fh>) { 352 while (<$fh>) {
270 s/\s+$//; 353 s/\s+$//;
271 if (/^end$/i) { 354 if (/^end$/i) {
272 last; 355 last;
273 } elsif (/^arch (\S+)$/i) { 356 } elsif (/^arch (\S+)$/i) {
274 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 357 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
275 } elsif (/^lore$/i) { 358 } elsif (/^lore$/i) {
276 while (<$fh>) { 359 while (<$fh>) {
277 last if /^endlore\s*$/i; 360 last if /^endlore\s*$/i;
278 $arc{lore} .= $_; 361 $arc{lore} .= $_;
279 } 362 }
280 } elsif (/^msg$/i) { 363 } elsif (/^msg$/i) {
281 while (<$fh>) { 364 while (<$fh>) {
282 last if /^endmsg\s*$/i; 365 last if /^endmsg\s*$/i;
283 $arc{msg} .= $_; 366 $arc{msg} .= $_;
284 } 367 }
368 } elsif (/^anim$/i) {
369 while (<$fh>) {
370 last if /^mina\s*$/i;
371 chomp;
372 push @{ $arc{anim} }, $_;
373 }
285 } elsif (/^(\S+)\s*(.*)$/) { 374 } elsif (/^(\S+)\s*(.*)$/) {
286 $arc{lc $1} = $2; 375 $arc{lc $1} = $2;
287 } elsif (/^\s*($|#)/) { 376 } elsif (/^\s*($|#)/) {
288 # 377 #
289 } else { 378 } else {
… …
298 s/\s+$//; 387 s/\s+$//;
299 if (/^more$/i) { 388 if (/^more$/i) {
300 $more = $prev; 389 $more = $prev;
301 } elsif (/^object (\S+)$/i) { 390 } elsif (/^object (\S+)$/i) {
302 my $name = $1; 391 my $name = $1;
303 my $arc = normalize_object $parse_block->(_name => $name); 392 my $arc = attr_thaw normalize_object $parse_block->(_name => $name);
304 393
305 if ($more) { 394 if ($more) {
306 $more->{more} = $arc; 395 $more->{more} = $arc;
307 } else { 396 } else {
308 $arc{$name} = $arc; 397 $arc{$name} = $arc;
309 } 398 }
310 $prev = $arc; 399 $prev = $arc;
311 $more = undef; 400 $more = undef;
312 } elsif (/^arch (\S+)$/i) { 401 } elsif (/^arch (\S+)$/i) {
313 my $name = $1; 402 my $name = $1;
314 my $arc = normalize_object $parse_block->(_name => $name); 403 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name);
315 404
316 if ($more) { 405 if ($more) {
317 $more->{more} = $arc; 406 $more->{more} = $arc;
318 } else { 407 } else {
319 push @{ $arc{arch} }, $arc; 408 push @{ $arc{arch} }, $arc;
320 } 409 }
321 $prev = $arc; 410 $prev = $arc;
322 $more = undef; 411 $more = undef;
412 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
413 if ($1 eq "lev_array") {
414 while (<$fh>) {
415 last if /^endplst\s*$/;
416 push @{$toplevel->{lev_array}}, $_+0;
417 }
418 } else {
419 $toplevel->{$1} = $2;
420 }
323 } elsif (/^\s*($|#)/) { 421 } elsif (/^\s*($|#)/) {
324 # 422 #
325 } else { 423 } else {
326 warn "$path: unparseable top-level line '$_'"; 424 die "$path: unparseable top-level line '$_'";
327 } 425 }
328 } 426 }
329 427
330 undef $parse_block; # work around bug in perl not freeing $fh etc. 428 undef $parse_block; # work around bug in perl not freeing $fh etc.
331 429
… …
338sub editor_archs { 436sub editor_archs {
339 my %paths; 437 my %paths;
340 438
341 for (keys %ARCH) { 439 for (keys %ARCH) {
342 my $arch = $ARCH{$_}; 440 my $arch = $ARCH{$_};
343 push @{$paths{$arch->{editor_folder}}}, \$arch; 441 push @{$paths{$arch->{editor_folder}}}, $arch;
344 } 442 }
345 443
346 \%paths 444 \%paths
347} 445}
348 446
… …
413 my $type = $obj->{type} || $arch->{type}; 511 my $type = $obj->{type} || $arch->{type};
414 512
415 if ($type > 0) { 513 if ($type > 0) {
416 $root = $Crossfire::Data::ATTR{$type}; 514 $root = $Crossfire::Data::ATTR{$type};
417 } else { 515 } else {
516 my %a = (%$arch, %$obj);
517
518 if ($a{is_floor} && !$a{alive}) {
519 $root = $Crossfire::Data::TYPE{Floor};
520 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
521 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
522 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
523 $root = $Crossfire::Data::TYPE{Wall};
524 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
525 $root = $Crossfire::Data::TYPE{"Weak Wall"};
526 } else {
418 $root = $Crossfire::Data::TYPE{Misc}; 527 $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 } 528 }
433 } 529 }
434 530
435 my @import = ($root); 531 my @import = ($root);
436 532
… …
610 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 706 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
611 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 707 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
612 or die "$VARDIR/tilecache.png: $!"; 708 or die "$VARDIR/tilecache.png: $!";
613 *FACE = $_[0]; 709 *FACE = $_[0];
614 }, sub { 710 }, sub {
615 require File::Temp;
616
617 my $tile = read_pak "$LIB/crossfire.0"; 711 my $tile = read_pak "$LIB/crossfire.0";
618 712
619 my %cache; 713 my %cache;
620 714
621 my $idx = 0; 715 my $idx = 0;
622 716
623 for my $name (sort keys %$tile) { 717 for my $name (sort keys %$tile) {
624 my ($fh, $filename) = File::Temp::tempfile (); 718 my $pb = new Gtk2::Gdk::PixbufLoader;
625 print $fh $tile->{$name}; 719 $pb->write ($tile->{$name});
626 close $fh; 720 $pb->close;
627 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 721 my $pb = $pb->get_pixbuf;
628 unlink $filename;
629 722
630 my $tile = $cache{$name} = { 723 my $tile = $cache{$name} = {
631 pb => $pb, 724 pb => $pb,
632 idx => $idx, 725 idx => $idx,
633 w => int $pb->get_width / TILESIZE, 726 w => int $pb->get_width / TILESIZE,
… …
651 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 744 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
652 } 745 }
653 } 746 }
654 } 747 }
655 748
656 $pb->save ("$VARDIR/tilecache.png", "png"); 749 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
657 750
658 \%cache 751 \%cache
659 }; 752 };
660} 753}
661 754

Diff Legend

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