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.54 by root, Thu Mar 23 06:45:23 2006 UTC vs.
Revision 1.65 by root, Wed May 3 19:34:31 2006 UTC

… …
37 msg => "endmsg", 37 msg => "endmsg",
38 lore => "endlore", 38 lore => "endlore",
39 maplore => "endmaplore", 39 maplore => "endmaplore",
40); 40);
41 41
42# movement bit type, PITA
43our %FIELD_MOVEMENT = map +($_ => undef),
44 qw(move_type move_block move_allow move_on move_off move_slow);
45
42# same as in server save routine, to (hopefully) be compatible 46# same as in server save routine, to (hopefully) be compatible
43# to the other editors. 47# to the other editors.
48our @FIELD_ORDER_MAP = (qw(
49 name swap_time reset_timeout fixed_resettime difficulty region
50 shopitems shopgreed shopmin shopmax shoprace
51 darkness width height enter_x enter_y msg maplore
52 unique template
53 outdoor temp pressure humid windspeed winddir sky nosmooth
54 tile_path_1 tile_path_2 tile_path_3 tile_path_4
55));
56
44our @FIELD_ORDER = (qw( 57our @FIELD_ORDER = (qw(
58 elevation
59
45 name name_pl custom_name title race 60 name name_pl custom_name title race
46 slaying skill msg lore other_arch face 61 slaying skill msg lore other_arch face
47 #events 62 #todo-events
48 animation is_animated 63 animation is_animated
49 Str Dex Con Wis Pow Cha Int 64 str dex con wis pow cha int
50 hp maxhp sp maxsp grace maxgrace 65 hp maxhp sp maxsp grace maxgrace
51 exp perm_exp expmul 66 exp perm_exp expmul
52 food dam luck wc ac x y speed speed_left move_state attack_movement 67 food dam luck wc ac x y speed speed_left move_state attack_movement
53 nrof level direction type subtype 68 nrof level direction type subtype attacktype
54 69
55 resist_physical resist_magic resist_fire resist_electricity 70 resist_physical resist_magic resist_fire resist_electricity
56 resist_cold resist_confusion resist_acid resist_drain 71 resist_cold resist_confusion resist_acid resist_drain
57 resist_weaponmagic resist_ghosthit resist_poison resist_slow 72 resist_weaponmagic resist_ghosthit resist_poison resist_slow
58 resist_paralyze resist_turn_undead resist_fear resist_cancellation 73 resist_paralyze resist_turn_undead resist_fear resist_cancellation
… …
87 102
88 body_range body_arm body_torso body_head body_neck body_skill 103 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 104 body_finger body_shoulder body_foot body_hand body_wrist body_waist
90)); 105));
91 106
107our %EVENT_TYPE = (
108 apply => 1,
109 attack => 2,
110 death => 3,
111 drop => 4,
112 pickup => 5,
113 say => 6,
114 stop => 7,
115 time => 8,
116 throw => 9,
117 trigger => 10,
118 close => 11,
119 timer => 12,
120);
121
92sub MOVE_WALK (){ 0x01 } 122sub MOVE_WALK (){ 0x01 }
93sub MOVE_FLY_LOW (){ 0x02 } 123sub MOVE_FLY_LOW (){ 0x02 }
94sub MOVE_FLY_HIGH (){ 0x04 } 124sub MOVE_FLY_HIGH (){ 0x04 }
95sub MOVE_FLYING (){ 0x06 } 125sub MOVE_FLYING (){ 0x06 }
96sub MOVE_SWIM (){ 0x08 } 126sub MOVE_SWIM (){ 0x08 }
97sub MOVE_BOAT (){ 0x10 } 127sub MOVE_BOAT (){ 0x10 }
128sub MOVE_KNOWN (){ 0x1f } # all of above
98sub MOVE_ALL (){ 0xff } 129sub MOVE_ALLBIT (){ 0x10000 }
130sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
99 131
100sub load_ref($) { 132sub load_ref($) {
101 my ($path) = @_; 133 my ($path) = @_;
102 134
103 open my $fh, "<", $path 135 open my $fh, "<:raw:perlio", $path
104 or die "$path: $!"; 136 or die "$path: $!";
105 binmode $fh;
106 local $/; 137 local $/;
107 138
108 thaw <$fh> 139 thaw <$fh>
109} 140}
110 141
111sub save_ref($$) { 142sub save_ref($$) {
112 my ($ref, $path) = @_; 143 my ($ref, $path) = @_;
113 144
114 open my $fh, ">", "$path~" 145 open my $fh, ">:raw:perlio", "$path~"
115 or die "$path~: $!"; 146 or die "$path~: $!";
116 binmode $fh;
117 print $fh freeze $ref; 147 print $fh freeze $ref;
118 close $fh; 148 close $fh;
119 rename "$path~", $path 149 rename "$path~", $path
120 or die "$path: $!"; 150 or die "$path: $!";
121} 151}
122 152
153# object as in "Object xxx", i.e. archetypes
123sub normalize_object($) { 154sub normalize_object($) {
124 my ($ob) = @_; 155 my ($ob) = @_;
125 156
157 # nuke outdated or never supported fields
126 delete $ob->{$_} for qw( 158 delete $ob->{$_} for qw(
127 can_knockback can_parry can_impale can_cut can_dam_armour 159 can_knockback can_parry can_impale can_cut can_dam_armour
128 can_apply pass_thru can_pass_thru 160 can_apply pass_thru can_pass_thru
129 ); 161 );
130 162
131 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 163 # convert movement strings to bitsets
164 for my $attr (keys %FIELD_MOVEMENT) {
132 next unless exists $ob->{$attr}; 165 next unless exists $ob->{$attr};
166
167 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
168
133 next if $ob->{$attr} =~ /^\d+$/; 169 next if $ob->{$attr} =~ /^\d+$/;
134 170
135 my $flags = 0; 171 my $flags = 0;
136 172
137 # assume list 173 # assume list
… …
154 } 190 }
155 191
156 $ob->{$attr} = $flags; 192 $ob->{$attr} = $flags;
157 } 193 }
158 194
195 # convert outdated movement flags to new movement sets
159 if (defined (my $v = delete $ob->{no_pass})) { 196 if (defined (my $v = delete $ob->{no_pass})) {
160 $ob->{move_block} = $v ? MOVE_ALL : 0; 197 $ob->{move_block} = $v ? MOVE_ALL : 0;
161 } 198 }
162 if (defined (my $v = delete $ob->{slow_move})) { 199 if (defined (my $v = delete $ob->{slow_move})) {
163 $ob->{move_slow} |= MOVE_WALK; 200 $ob->{move_slow} |= MOVE_WALK;
… …
182 if (defined (my $v = delete $ob->{flying})) { 219 if (defined (my $v = delete $ob->{flying})) {
183 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 220 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
184 : $ob->{move_type} & ~MOVE_FLY_LOW; 221 : $ob->{move_type} & ~MOVE_FLY_LOW;
185 } 222 }
186 223
224 # convert idiotic event_xxx things into objects
225 while (my ($event, $subtype) = each %EVENT_TYPE) {
226 if (exists $ob->{"event_${event}_plugin"}) {
227 push @{$ob->{inventory}}, {
228 _name => "event_$event",
229 title => delete $ob->{"event_${event}_plugin"},
230 slaying => delete $ob->{"event_${event}"},
231 name => delete $ob->{"event_${event}_options"},
232 };
233 }
234 }
235
187 $ob 236 $ob
188} 237}
189 238
239# arch as in "arch xxx", ie.. objects
190sub normalize_arch($) { 240sub normalize_arch($) {
191 my ($ob) = @_; 241 my ($ob) = @_;
192 242
193 normalize_object $ob; 243 normalize_object $ob;
194 244
… …
221 delete $ob->{$k}; 271 delete $ob->{$k};
222 } 272 }
223 } 273 }
224 } 274 }
225 275
276 # a speciality for the editor
277 if (exists $ob->{attack_movement}) {
278 my $am = delete $ob->{attack_movement};
279 $ob->{attack_movement_bits_0_3} = $am & 15;
280 $ob->{attack_movement_bits_4_7} = $am & 240;
281 }
282
226 $ob 283 $ob
227} 284}
228 285
229sub read_pak($) { 286sub read_pak($) {
230 my ($path) = @_; 287 my ($path) = @_;
231 288
232 my %pak; 289 my %pak;
233 290
234 open my $fh, "<", $path 291 open my $fh, "<:raw:perlio", $path
235 or Carp::croak "$_[0]: $!"; 292 or Carp::croak "$_[0]: $!";
236 binmode $fh; 293 binmode $fh;
237 while (<$fh>) { 294 while (<$fh>) {
238 my ($type, $id, $len, $path) = split; 295 my ($type, $id, $len, $path) = split;
239 $path =~ s/.*\///; 296 $path =~ s/.*\///;
… …
241 } 298 }
242 299
243 \%pak 300 \%pak
244} 301}
245 302
246sub read_arch($) { 303sub read_arch($;$) {
247 my ($path) = @_; 304 my ($path, $toplevel) = @_;
248 305
249 my %arc; 306 my %arc;
250 my ($more, $prev); 307 my ($more, $prev);
251 308
252 open my $fh, "<", $path 309 open my $fh, "<:raw:perlio:utf8", $path
253 or Carp::croak "$path: $!"; 310 or Carp::croak "$path: $!";
254 311
255 binmode $fh; 312 binmode $fh;
256 313
257 my $parse_block; $parse_block = sub { 314 my $parse_block; $parse_block = sub {
… …
259 316
260 while (<$fh>) { 317 while (<$fh>) {
261 s/\s+$//; 318 s/\s+$//;
262 if (/^end$/i) { 319 if (/^end$/i) {
263 last; 320 last;
264 } elsif (/^arch (\S+)$/) { 321 } elsif (/^arch (\S+)$/i) {
265 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 322 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1);
266 } elsif (/^lore$/) { 323 } elsif (/^lore$/i) {
267 while (<$fh>) { 324 while (<$fh>) {
268 last if /^endlore\s*$/i; 325 last if /^endlore\s*$/i;
269 $arc{lore} .= $_; 326 $arc{lore} .= $_;
270 } 327 }
271 } elsif (/^msg$/) { 328 } elsif (/^msg$/i) {
272 while (<$fh>) { 329 while (<$fh>) {
273 last if /^endmsg\s*$/i; 330 last if /^endmsg\s*$/i;
274 $arc{msg} .= $_; 331 $arc{msg} .= $_;
332 }
333 } elsif (/^anim$/i) {
334 while (<$fh>) {
335 last if /^mina\s*$/i;
336 chomp;
337 push @{ $arc{anim} }, $_;
275 } 338 }
276 } elsif (/^(\S+)\s*(.*)$/) { 339 } elsif (/^(\S+)\s*(.*)$/) {
277 $arc{lc $1} = $2; 340 $arc{lc $1} = $2;
278 } elsif (/^\s*($|#)/) { 341 } elsif (/^\s*($|#)/) {
279 # 342 #
… …
299 $arc{$name} = $arc; 362 $arc{$name} = $arc;
300 } 363 }
301 $prev = $arc; 364 $prev = $arc;
302 $more = undef; 365 $more = undef;
303 } elsif (/^arch (\S+)$/i) { 366 } elsif (/^arch (\S+)$/i) {
367 my $name = $1;
304 push @{ $arc{arch} }, normalize_arch $parse_block->(_name => $1); 368 my $arc = normalize_arch $parse_block->(_name => $name);
369
370 if ($more) {
371 $more->{more} = $arc;
372 } else {
373 push @{ $arc{arch} }, $arc;
374 }
375 $prev = $arc;
376 $more = undef;
377 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
378 if ($1 eq "lev_array") {
379 while (<$fh>) {
380 last if /^endplst\s*$/;
381 push @{$toplevel->{lev_array}}, $_+0;
382 }
383 } else {
384 $toplevel->{$1} = $2;
385 }
305 } elsif (/^\s*($|#)/) { 386 } elsif (/^\s*($|#)/) {
306 # 387 #
307 } else { 388 } else {
308 warn "$path: unparseable top-level line '$_'"; 389 die "$path: unparseable top-level line '$_'";
309 } 390 }
310 } 391 }
311 392
312 undef $parse_block; # work around bug in perl not freeing $fh etc. 393 undef $parse_block; # work around bug in perl not freeing $fh etc.
313 394
… …
320sub editor_archs { 401sub editor_archs {
321 my %paths; 402 my %paths;
322 403
323 for (keys %ARCH) { 404 for (keys %ARCH) {
324 my $arch = $ARCH{$_}; 405 my $arch = $ARCH{$_};
325 push @{$paths{$arch->{editor_folder}}}, \$arch; 406 push @{$paths{$arch->{editor_folder}}}, $arch;
326 } 407 }
327 408
328 \%paths 409 \%paths
329} 410}
330 411
… …
395 my $type = $obj->{type} || $arch->{type}; 476 my $type = $obj->{type} || $arch->{type};
396 477
397 if ($type > 0) { 478 if ($type > 0) {
398 $root = $Crossfire::Data::ATTR{$type}; 479 $root = $Crossfire::Data::ATTR{$type};
399 } else { 480 } else {
481 my %a = (%$arch, %$obj);
482
483 if ($a{is_floor} && !$a{alive}) {
484 $root = $Crossfire::Data::TYPE{Floor};
485 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
486 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
487 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
488 $root = $Crossfire::Data::TYPE{Wall};
489 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
490 $root = $Crossfire::Data::TYPE{"Weak Wall"};
491 } else {
400 $root = $Crossfire::Data::TYPE{Misc}; 492 $root = $Crossfire::Data::TYPE{Misc};
401
402 type:
403 for (@Crossfire::Data::ATTR0) {
404 my $req = $_->{required}
405 or die "internal error: ATTR0 without 'required'";
406
407 keys %$req;
408 while (my ($k, $v) = each %$req) {
409 next type
410 unless $obj->{$k} == $v || $arch->{$k} == $v;
411 }
412
413 $root = $_;
414 } 493 }
415 } 494 }
416 495
417 my @import = ($root); 496 my @import = ($root);
418 497
… …
592 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 671 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
593 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 672 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
594 or die "$VARDIR/tilecache.png: $!"; 673 or die "$VARDIR/tilecache.png: $!";
595 *FACE = $_[0]; 674 *FACE = $_[0];
596 }, sub { 675 }, sub {
597 require File::Temp;
598
599 my $tile = read_pak "$LIB/crossfire.0"; 676 my $tile = read_pak "$LIB/crossfire.0";
600 677
601 my %cache; 678 my %cache;
602 679
603 my $idx = 0; 680 my $idx = 0;
604 681
605 for my $name (sort keys %$tile) { 682 for my $name (sort keys %$tile) {
606 my ($fh, $filename) = File::Temp::tempfile (); 683 my $pb = new Gtk2::Gdk::PixbufLoader;
607 print $fh $tile->{$name}; 684 $pb->write ($tile->{$name});
608 close $fh; 685 $pb->close;
609 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 686 my $pb = $pb->get_pixbuf;
610 unlink $filename;
611 687
612 my $tile = $cache{$name} = { 688 my $tile = $cache{$name} = {
613 pb => $pb, 689 pb => $pb,
614 idx => $idx, 690 idx => $idx,
615 w => int $pb->get_width / TILESIZE, 691 w => int $pb->get_width / TILESIZE,
… …
633 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 709 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
634 } 710 }
635 } 711 }
636 } 712 }
637 713
638 $pb->save ("$VARDIR/tilecache.png", "png"); 714 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
639 715
640 \%cache 716 \%cache
641 }; 717 };
642} 718}
643 719

Diff Legend

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