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.62 by root, Tue Mar 28 14:44:52 2006 UTC

… …
36our %FIELD_MULTILINE = ( 36our %FIELD_MULTILINE = (
37 msg => "endmsg", 37 msg => "endmsg",
38 lore => "endlore", 38 lore => "endlore",
39 maplore => "endmaplore", 39 maplore => "endmaplore",
40); 40);
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);
41 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.
44our @FIELD_ORDER_MAP = (qw( 48our @FIELD_ORDER_MAP = (qw(
45 name swap_time reset_timeout fixed_resettime difficulty region 49 name swap_time reset_timeout fixed_resettime difficulty region
… …
55 59
56 name name_pl custom_name title race 60 name name_pl custom_name title race
57 slaying skill msg lore other_arch face 61 slaying skill msg lore other_arch face
58 #todo-events 62 #todo-events
59 animation is_animated 63 animation is_animated
60 Str Dex Con Wis Pow Cha Int 64 str dex con wis pow cha int
61 hp maxhp sp maxsp grace maxgrace 65 hp maxhp sp maxsp grace maxgrace
62 exp perm_exp expmul 66 exp perm_exp expmul
63 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
64 nrof level direction type subtype 68 nrof level direction type subtype attacktype
65 69
66 resist_physical resist_magic resist_fire resist_electricity 70 resist_physical resist_magic resist_fire resist_electricity
67 resist_cold resist_confusion resist_acid resist_drain 71 resist_cold resist_confusion resist_acid resist_drain
68 resist_weaponmagic resist_ghosthit resist_poison resist_slow 72 resist_weaponmagic resist_ghosthit resist_poison resist_slow
69 resist_paralyze resist_turn_undead resist_fear resist_cancellation 73 resist_paralyze resist_turn_undead resist_fear resist_cancellation
… …
98 102
99 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
100 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
101)); 105));
102 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
103sub MOVE_WALK (){ 0x01 } 122sub MOVE_WALK (){ 0x01 }
104sub MOVE_FLY_LOW (){ 0x02 } 123sub MOVE_FLY_LOW (){ 0x02 }
105sub MOVE_FLY_HIGH (){ 0x04 } 124sub MOVE_FLY_HIGH (){ 0x04 }
106sub MOVE_FLYING (){ 0x06 } 125sub MOVE_FLYING (){ 0x06 }
107sub MOVE_SWIM (){ 0x08 } 126sub MOVE_SWIM (){ 0x08 }
108sub MOVE_BOAT (){ 0x10 } 127sub MOVE_BOAT (){ 0x10 }
128sub MOVE_KNOWN (){ 0x1f } # all of above
109sub MOVE_ALL (){ 0xff } 129sub MOVE_ALLBIT (){ 0x10000 }
130sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
110 131
111sub load_ref($) { 132sub load_ref($) {
112 my ($path) = @_; 133 my ($path) = @_;
113 134
114 open my $fh, "<", $path 135 open my $fh, "<", $path
… …
129 close $fh; 150 close $fh;
130 rename "$path~", $path 151 rename "$path~", $path
131 or die "$path: $!"; 152 or die "$path: $!";
132} 153}
133 154
155# object as in "Object xxx", i.e. archetypes
134sub normalize_object($) { 156sub normalize_object($) {
135 my ($ob) = @_; 157 my ($ob) = @_;
136 158
159 # nuke outdated or never supported fields
137 delete $ob->{$_} for qw( 160 delete $ob->{$_} for qw(
138 can_knockback can_parry can_impale can_cut can_dam_armour 161 can_knockback can_parry can_impale can_cut can_dam_armour
139 can_apply pass_thru can_pass_thru 162 can_apply pass_thru can_pass_thru
140 ); 163 );
141 164
142 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 165 # convert movement strings to bitsets
166 for my $attr (keys %FIELD_MOVEMENT) {
143 next unless exists $ob->{$attr}; 167 next unless exists $ob->{$attr};
168
169 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
170
144 next if $ob->{$attr} =~ /^\d+$/; 171 next if $ob->{$attr} =~ /^\d+$/;
145 172
146 my $flags = 0; 173 my $flags = 0;
147 174
148 # assume list 175 # assume list
… …
165 } 192 }
166 193
167 $ob->{$attr} = $flags; 194 $ob->{$attr} = $flags;
168 } 195 }
169 196
197 # convert outdated movement flags to new movement sets
170 if (defined (my $v = delete $ob->{no_pass})) { 198 if (defined (my $v = delete $ob->{no_pass})) {
171 $ob->{move_block} = $v ? MOVE_ALL : 0; 199 $ob->{move_block} = $v ? MOVE_ALL : 0;
172 } 200 }
173 if (defined (my $v = delete $ob->{slow_move})) { 201 if (defined (my $v = delete $ob->{slow_move})) {
174 $ob->{move_slow} |= MOVE_WALK; 202 $ob->{move_slow} |= MOVE_WALK;
… …
193 if (defined (my $v = delete $ob->{flying})) { 221 if (defined (my $v = delete $ob->{flying})) {
194 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 222 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
195 : $ob->{move_type} & ~MOVE_FLY_LOW; 223 : $ob->{move_type} & ~MOVE_FLY_LOW;
196 } 224 }
197 225
226 # convert idiotic event_xxx things into objects
227 while (my ($event, $subtype) = each %EVENT_TYPE) {
228 if (exists $ob->{"event_${event}_plugin"}) {
229 push @{$ob->{inventory}}, {
230 _name => "event_$event",
231 title => delete $ob->{"event_${event}_plugin"},
232 slaying => delete $ob->{"event_${event}"},
233 name => delete $ob->{"event_${event}_options"},
234 };
235 }
236 }
237
198 $ob 238 $ob
199} 239}
200 240
241# arch as in "arch xxx", ie.. objects
201sub normalize_arch($) { 242sub normalize_arch($) {
202 my ($ob) = @_; 243 my ($ob) = @_;
203 244
204 normalize_object $ob; 245 normalize_object $ob;
205 246
… …
347sub editor_archs { 388sub editor_archs {
348 my %paths; 389 my %paths;
349 390
350 for (keys %ARCH) { 391 for (keys %ARCH) {
351 my $arch = $ARCH{$_}; 392 my $arch = $ARCH{$_};
352 push @{$paths{$arch->{editor_folder}}}, \$arch; 393 push @{$paths{$arch->{editor_folder}}}, $arch;
353 } 394 }
354 395
355 \%paths 396 \%paths
356} 397}
357 398
… …
422 my $type = $obj->{type} || $arch->{type}; 463 my $type = $obj->{type} || $arch->{type};
423 464
424 if ($type > 0) { 465 if ($type > 0) {
425 $root = $Crossfire::Data::ATTR{$type}; 466 $root = $Crossfire::Data::ATTR{$type};
426 } else { 467 } else {
468 my %a = (%$arch, %$obj);
469
470 if ($a{is_floor} && !$a{alive}) {
471 $root = $Crossfire::Data::TYPE{Floor};
472 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
473 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
474 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
475 $root = $Crossfire::Data::TYPE{Wall};
476 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
477 $root = $Crossfire::Data::TYPE{"Weak Wall"};
478 } else {
427 $root = $Crossfire::Data::TYPE{Misc}; 479 $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 } 480 }
442 } 481 }
443 482
444 my @import = ($root); 483 my @import = ($root);
445 484
… …
619 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 658 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
620 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 659 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
621 or die "$VARDIR/tilecache.png: $!"; 660 or die "$VARDIR/tilecache.png: $!";
622 *FACE = $_[0]; 661 *FACE = $_[0];
623 }, sub { 662 }, sub {
624 require File::Temp;
625
626 my $tile = read_pak "$LIB/crossfire.0"; 663 my $tile = read_pak "$LIB/crossfire.0";
627 664
628 my %cache; 665 my %cache;
629 666
630 my $idx = 0; 667 my $idx = 0;
631 668
632 for my $name (sort keys %$tile) { 669 for my $name (sort keys %$tile) {
633 my ($fh, $filename) = File::Temp::tempfile (); 670 my $pb = new Gtk2::Gdk::PixbufLoader;
634 print $fh $tile->{$name}; 671 $pb->write ($tile->{$name});
635 close $fh; 672 $pb->close;
636 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 673 my $pb = $pb->get_pixbuf;
637 unlink $filename;
638 674
639 my $tile = $cache{$name} = { 675 my $tile = $cache{$name} = {
640 pb => $pb, 676 pb => $pb,
641 idx => $idx, 677 idx => $idx,
642 w => int $pb->get_width / TILESIZE, 678 w => int $pb->get_width / TILESIZE,
… …
660 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 696 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
661 } 697 }
662 } 698 }
663 } 699 }
664 700
665 $pb->save ("$VARDIR/tilecache.png", "png"); 701 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
666 702
667 \%cache 703 \%cache
668 }; 704 };
669} 705}
670 706

Diff Legend

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