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.55 by root, Thu Mar 23 07:06:17 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.
60our @FIELD_ORDER_MAP = (qw(
61 name attach swap_time reset_timeout fixed_resettime difficulty region
62 shopitems shopgreed shopmin shopmax shoprace
63 darkness width height enter_x enter_y msg maplore
64 unique template
65 outdoor temp pressure humid windspeed winddir sky nosmooth
66 tile_path_1 tile_path_2 tile_path_3 tile_path_4
67));
68
44our @FIELD_ORDER = (qw( 69our @FIELD_ORDER = (qw(
70 elevation
71
45 name name_pl custom_name title race 72 name name_pl custom_name attach title race
46 slaying skill msg lore other_arch face 73 slaying skill msg lore other_arch face
47 #events 74 #todo-events
48 animation is_animated 75 animation is_animated
49 Str Dex Con Wis Pow Cha Int 76 str dex con wis pow cha int
50 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
51 exp perm_exp expmul 78 exp perm_exp expmul
52 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
53 nrof level direction type subtype 80 nrof level direction type subtype attacktype
54 81
55 resist_physical resist_magic resist_fire resist_electricity 82 resist_physical resist_magic resist_fire resist_electricity
56 resist_cold resist_confusion resist_acid resist_drain 83 resist_cold resist_confusion resist_acid resist_drain
57 resist_weaponmagic resist_ghosthit resist_poison resist_slow 84 resist_weaponmagic resist_ghosthit resist_poison resist_slow
58 resist_paralyze resist_turn_undead resist_fear resist_cancellation 85 resist_paralyze resist_turn_undead resist_fear resist_cancellation
… …
87 114
88 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
89 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
90)); 117));
91 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
92sub MOVE_WALK (){ 0x01 } 134sub MOVE_WALK (){ 0x01 }
93sub MOVE_FLY_LOW (){ 0x02 } 135sub MOVE_FLY_LOW (){ 0x02 }
94sub MOVE_FLY_HIGH (){ 0x04 } 136sub MOVE_FLY_HIGH (){ 0x04 }
95sub MOVE_FLYING (){ 0x06 } 137sub MOVE_FLYING (){ 0x06 }
96sub MOVE_SWIM (){ 0x08 } 138sub MOVE_SWIM (){ 0x08 }
97sub MOVE_BOAT (){ 0x10 } 139sub MOVE_BOAT (){ 0x10 }
140sub MOVE_KNOWN (){ 0x1f } # all of above
98sub MOVE_ALL (){ 0xff } 141sub MOVE_ALLBIT (){ 0x10000 }
142sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
99 143
100sub load_ref($) { 144sub load_ref($) {
101 my ($path) = @_; 145 my ($path) = @_;
102 146
103 open my $fh, "<", $path 147 open my $fh, "<:raw:perlio", $path
104 or die "$path: $!"; 148 or die "$path: $!";
105 binmode $fh;
106 local $/; 149 local $/;
107 150
108 thaw <$fh> 151 thaw <$fh>
109} 152}
110 153
111sub save_ref($$) { 154sub save_ref($$) {
112 my ($ref, $path) = @_; 155 my ($ref, $path) = @_;
113 156
114 open my $fh, ">", "$path~" 157 open my $fh, ">:raw:perlio", "$path~"
115 or die "$path~: $!"; 158 or die "$path~: $!";
116 binmode $fh;
117 print $fh freeze $ref; 159 print $fh freeze $ref;
118 close $fh; 160 close $fh;
119 rename "$path~", $path 161 rename "$path~", $path
120 or die "$path: $!"; 162 or die "$path: $!";
121} 163}
122 164
165# object as in "Object xxx", i.e. archetypes
123sub normalize_object($) { 166sub normalize_object($) {
124 my ($ob) = @_; 167 my ($ob) = @_;
125 168
169 # nuke outdated or never supported fields
126 delete $ob->{$_} for qw( 170 delete $ob->{$_} for qw(
127 can_knockback can_parry can_impale can_cut can_dam_armour 171 can_knockback can_parry can_impale can_cut can_dam_armour
128 can_apply pass_thru can_pass_thru 172 can_apply pass_thru can_pass_thru
129 ); 173 );
130 174
131 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) {
132 next unless exists $ob->{$attr}; 177 next unless exists $ob->{$attr};
178
179 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
180
133 next if $ob->{$attr} =~ /^\d+$/; 181 next if $ob->{$attr} =~ /^\d+$/;
134 182
135 my $flags = 0; 183 my $flags = 0;
136 184
137 # assume list 185 # assume list
… …
154 } 202 }
155 203
156 $ob->{$attr} = $flags; 204 $ob->{$attr} = $flags;
157 } 205 }
158 206
207 # convert outdated movement flags to new movement sets
159 if (defined (my $v = delete $ob->{no_pass})) { 208 if (defined (my $v = delete $ob->{no_pass})) {
160 $ob->{move_block} = $v ? MOVE_ALL : 0; 209 $ob->{move_block} = $v ? MOVE_ALL : 0;
161 } 210 }
162 if (defined (my $v = delete $ob->{slow_move})) { 211 if (defined (my $v = delete $ob->{slow_move})) {
163 $ob->{move_slow} |= MOVE_WALK; 212 $ob->{move_slow} |= MOVE_WALK;
164 $ob->{move_slow_penalty} = $v; 213 $ob->{move_slow_penalty} = $v;
165 } 214 }
166 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};
167 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 217 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
168 : $ob->{move_on} & ~MOVE_WALK; 218 : $ob->{move_on} & ~MOVE_WALK;
169 } 219 }
170 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};
171 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 222 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
172 : $ob->{move_off} & ~MOVE_WALK; 223 : $ob->{move_off} & ~MOVE_WALK;
173 } 224 }
174 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};
175 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 227 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
176 : $ob->{move_on} & ~MOVE_FLY_LOW; 228 : $ob->{move_on} & ~MOVE_FLY_LOW;
177 } 229 }
178 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};
179 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 232 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
180 : $ob->{move_off} & ~MOVE_FLY_LOW; 233 : $ob->{move_off} & ~MOVE_FLY_LOW;
181 } 234 }
182 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};
183 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 237 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
184 : $ob->{move_type} & ~MOVE_FLY_LOW; 238 : $ob->{move_type} & ~MOVE_FLY_LOW;
185 } 239 }
186 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
187 $ob 253 $ob
188} 254}
189 255
256# arch as in "arch xxx", ie.. objects
190sub normalize_arch($) { 257sub normalize_arch($) {
191 my ($ob) = @_; 258 my ($ob) = @_;
192 259
193 normalize_object $ob; 260 normalize_object $ob;
194 261
… …
221 delete $ob->{$k}; 288 delete $ob->{$k};
222 } 289 }
223 } 290 }
224 } 291 }
225 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
226 $ob 318 $ob
227} 319}
228 320
229sub read_pak($) { 321sub read_pak($) {
230 my ($path) = @_; 322 my ($path) = @_;
231 323
232 my %pak; 324 my %pak;
233 325
234 open my $fh, "<", $path 326 open my $fh, "<:raw:perlio", $path
235 or Carp::croak "$_[0]: $!"; 327 or Carp::croak "$_[0]: $!";
236 binmode $fh; 328 binmode $fh;
237 while (<$fh>) { 329 while (<$fh>) {
238 my ($type, $id, $len, $path) = split; 330 my ($type, $id, $len, $path) = split;
239 $path =~ s/.*\///; 331 $path =~ s/.*\///;
… …
241 } 333 }
242 334
243 \%pak 335 \%pak
244} 336}
245 337
246sub read_arch($) { 338sub read_arch($;$) {
247 my ($path) = @_; 339 my ($path, $toplevel) = @_;
248 340
249 my %arc; 341 my %arc;
250 my ($more, $prev); 342 my ($more, $prev);
251 343
252 open my $fh, "<", $path 344 open my $fh, "<:raw:perlio:utf8", $path
253 or Carp::croak "$path: $!"; 345 or Carp::croak "$path: $!";
254 346
255 binmode $fh; 347# binmode $fh;
256 348
257 my $parse_block; $parse_block = sub { 349 my $parse_block; $parse_block = sub {
258 my %arc = @_; 350 my %arc = @_;
259 351
260 while (<$fh>) { 352 while (<$fh>) {
261 s/\s+$//; 353 s/\s+$//;
262 if (/^end$/i) { 354 if (/^end$/i) {
263 last; 355 last;
264 } elsif (/^arch (\S+)$/i) { 356 } elsif (/^arch (\S+)$/i) {
265 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 357 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
266 } elsif (/^lore$/i) { 358 } elsif (/^lore$/i) {
267 while (<$fh>) { 359 while (<$fh>) {
268 last if /^endlore\s*$/i; 360 last if /^endlore\s*$/i;
269 $arc{lore} .= $_; 361 $arc{lore} .= $_;
270 } 362 }
271 } elsif (/^msg$/i) { 363 } elsif (/^msg$/i) {
272 while (<$fh>) { 364 while (<$fh>) {
273 last if /^endmsg\s*$/i; 365 last if /^endmsg\s*$/i;
274 $arc{msg} .= $_; 366 $arc{msg} .= $_;
275 } 367 }
368 } elsif (/^anim$/i) {
369 while (<$fh>) {
370 last if /^mina\s*$/i;
371 chomp;
372 push @{ $arc{anim} }, $_;
373 }
276 } elsif (/^(\S+)\s*(.*)$/) { 374 } elsif (/^(\S+)\s*(.*)$/) {
277 $arc{lc $1} = $2; 375 $arc{lc $1} = $2;
278 } elsif (/^\s*($|#)/) { 376 } elsif (/^\s*($|#)/) {
279 # 377 #
280 } else { 378 } else {
… …
289 s/\s+$//; 387 s/\s+$//;
290 if (/^more$/i) { 388 if (/^more$/i) {
291 $more = $prev; 389 $more = $prev;
292 } elsif (/^object (\S+)$/i) { 390 } elsif (/^object (\S+)$/i) {
293 my $name = $1; 391 my $name = $1;
294 my $arc = normalize_object $parse_block->(_name => $name); 392 my $arc = attr_thaw normalize_object $parse_block->(_name => $name);
295 393
296 if ($more) { 394 if ($more) {
297 $more->{more} = $arc; 395 $more->{more} = $arc;
298 } else { 396 } else {
299 $arc{$name} = $arc; 397 $arc{$name} = $arc;
300 } 398 }
301 $prev = $arc; 399 $prev = $arc;
302 $more = undef; 400 $more = undef;
303 } elsif (/^arch (\S+)$/i) { 401 } elsif (/^arch (\S+)$/i) {
304 my $name = $1; 402 my $name = $1;
305 my $arc = normalize_object $parse_block->(_name => $name); 403 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name);
306 404
307 if ($more) { 405 if ($more) {
308 $more->{more} = $arc; 406 $more->{more} = $arc;
309 } else { 407 } else {
310 push @{ $arc{arch} }, $arc; 408 push @{ $arc{arch} }, $arc;
311 } 409 }
312 $prev = $arc; 410 $prev = $arc;
313 $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 }
314 } elsif (/^\s*($|#)/) { 421 } elsif (/^\s*($|#)/) {
315 # 422 #
316 } else { 423 } else {
317 warn "$path: unparseable top-level line '$_'"; 424 die "$path: unparseable top-level line '$_'";
318 } 425 }
319 } 426 }
320 427
321 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.
322 429
… …
329sub editor_archs { 436sub editor_archs {
330 my %paths; 437 my %paths;
331 438
332 for (keys %ARCH) { 439 for (keys %ARCH) {
333 my $arch = $ARCH{$_}; 440 my $arch = $ARCH{$_};
334 push @{$paths{$arch->{editor_folder}}}, \$arch; 441 push @{$paths{$arch->{editor_folder}}}, $arch;
335 } 442 }
336 443
337 \%paths 444 \%paths
338} 445}
339 446
… …
404 my $type = $obj->{type} || $arch->{type}; 511 my $type = $obj->{type} || $arch->{type};
405 512
406 if ($type > 0) { 513 if ($type > 0) {
407 $root = $Crossfire::Data::ATTR{$type}; 514 $root = $Crossfire::Data::ATTR{$type};
408 } 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 {
409 $root = $Crossfire::Data::TYPE{Misc}; 527 $root = $Crossfire::Data::TYPE{Misc};
410
411 type:
412 for (@Crossfire::Data::ATTR0) {
413 my $req = $_->{required}
414 or die "internal error: ATTR0 without 'required'";
415
416 keys %$req;
417 while (my ($k, $v) = each %$req) {
418 next type
419 unless $obj->{$k} == $v || $arch->{$k} == $v;
420 }
421
422 $root = $_;
423 } 528 }
424 } 529 }
425 530
426 my @import = ($root); 531 my @import = ($root);
427 532
… …
601 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 706 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
602 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 707 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
603 or die "$VARDIR/tilecache.png: $!"; 708 or die "$VARDIR/tilecache.png: $!";
604 *FACE = $_[0]; 709 *FACE = $_[0];
605 }, sub { 710 }, sub {
606 require File::Temp;
607
608 my $tile = read_pak "$LIB/crossfire.0"; 711 my $tile = read_pak "$LIB/crossfire.0";
609 712
610 my %cache; 713 my %cache;
611 714
612 my $idx = 0; 715 my $idx = 0;
613 716
614 for my $name (sort keys %$tile) { 717 for my $name (sort keys %$tile) {
615 my ($fh, $filename) = File::Temp::tempfile (); 718 my $pb = new Gtk2::Gdk::PixbufLoader;
616 print $fh $tile->{$name}; 719 $pb->write ($tile->{$name});
617 close $fh; 720 $pb->close;
618 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 721 my $pb = $pb->get_pixbuf;
619 unlink $filename;
620 722
621 my $tile = $cache{$name} = { 723 my $tile = $cache{$name} = {
622 pb => $pb, 724 pb => $pb,
623 idx => $idx, 725 idx => $idx,
624 w => int $pb->get_width / TILESIZE, 726 w => int $pb->get_width / TILESIZE,
… …
642 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 744 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
643 } 745 }
644 } 746 }
645 } 747 }
646 748
647 $pb->save ("$VARDIR/tilecache.png", "png"); 749 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
648 750
649 \%cache 751 \%cache
650 }; 752 };
651} 753}
652 754

Diff Legend

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