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.89 by root, Tue Feb 27 23:29:59 2007 UTC vs.
Revision 1.105 by root, Tue Apr 17 18:50:41 2007 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.96'; 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::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working 24use JSON::XS qw(from_json to_json);
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}
35 25
36our $LIB = $ENV{CROSSFIRE_LIBDIR}; 26our $LIB = $ENV{CROSSFIRE_LIBDIR};
37 27
38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" 28our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 29 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
… …
68 outdoor temp pressure humid windspeed winddir sky nosmooth 58 outdoor temp pressure humid windspeed winddir sky nosmooth
69 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
70)); 60));
71 61
72our @FIELD_ORDER = (qw( 62our @FIELD_ORDER = (qw(
63 inherit
64
73 elevation 65 elevation
74 66
75 name name_pl custom_name attach title race 67 name name_pl custom_name attach title race
76 slaying skill msg lore other_arch face 68 slaying skill msg lore other_arch
77 #todo-events
78 animation is_animated 69 face animation is_animated
70 magicmap smoothlevel smoothface
79 str dex con wis pow cha int 71 str dex con wis pow cha int
80 hp maxhp sp maxsp grace maxgrace 72 hp maxhp sp maxsp grace maxgrace
81 exp perm_exp expmul 73 exp perm_exp expmul
82 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
83 nrof level direction type subtype attacktype 75 nrof level direction type subtype attacktype
… …
139sub MOVE_FLY_HIGH (){ 0x04 } 131sub MOVE_FLY_HIGH (){ 0x04 }
140sub MOVE_FLYING (){ 0x06 } 132sub MOVE_FLYING (){ 0x06 }
141sub MOVE_SWIM (){ 0x08 } 133sub MOVE_SWIM (){ 0x08 }
142sub MOVE_BOAT (){ 0x10 } 134sub MOVE_BOAT (){ 0x10 }
143sub MOVE_KNOWN (){ 0x1f } # all of above 135sub MOVE_KNOWN (){ 0x1f } # all of above
144sub MOVE_ALLBIT (){ 0x10000 }
145sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 136sub MOVE_ALL (){ 0x10000 } # very special value
137
138our %MOVE_TYPE = (
139 walk => MOVE_WALK,
140 fly_low => MOVE_FLY_LOW,
141 fly_high => MOVE_FLY_HIGH,
142 flying => MOVE_FLYING,
143 swim => MOVE_SWIM,
144 boat => MOVE_BOAT,
145 all => MOVE_ALL,
146);
147
148our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat);
149
150{
151 package Crossfire::MoveType;
152
153 use overload
154 '=' => sub { bless [@{$_[0]}], ref $_[0] },
155 '""' => \&as_string,
156 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
157 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
158 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
159 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
160 'x=' => sub {
161 my $cur = $_[0] >= $_[1];
162 if (!defined $cur) {
163 if ($_[0] >= "all") {
164 $_[0] -= $_[1];
165 } else {
166 $_[0] += $_[1];
167 }
168 } elsif ($cur) {
169 $_[0] -= $_[1];
170 } else {
171 $_[0] /= $_[1];
172 }
173
174 $_[0]
175 },
176 'eq' => sub { "$_[0]" eq "$_[1]" },
177 'ne' => sub { "$_[0]" ne "$_[1]" },
178 ;
179}
180
181sub Crossfire::MoveType::new {
182 my ($class, $string) = @_;
183
184 my $mask;
185 my $value;
186
187 if ($string =~ /^\s*\d+\s*$/) {
188 $mask = MOVE_ALL;
189 $value = $string+0;
190 } else {
191 for (split /\s+/, lc $string) {
192 if (s/^-//) {
193 $mask |= $MOVE_TYPE{$_};
194 $value &= ~$MOVE_TYPE{$_};
195 } else {
196 $mask |= $MOVE_TYPE{$_};
197 $value |= $MOVE_TYPE{$_};
198 }
199 }
200 }
201
202 (bless [$mask, $value], $class)->normalise
203}
204
205sub Crossfire::MoveType::normalise {
206 my ($self) = @_;
207
208 if ($self->[0] & MOVE_ALL) {
209 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
210 $self->[0] &= $mask;
211 $self->[1] &= $mask;
212 }
213
214 $self->[1] &= $self->[0];
215
216 $self
217}
218
219sub Crossfire::MoveType::as_string {
220 my ($self) = @_;
221
222 my @res;
223
224 my ($mask, $value) = @$self;
225
226 for (@Crossfire::MOVE_TYPE) {
227 my $bit = $Crossfire::MOVE_TYPE{$_};
228 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
229 $mask &= ~$bit;
230 push @res, $value & $bit ? $_ : "-$_";
231 }
232 }
233
234 join " ", @res
235}
146 236
147sub load_ref($) { 237sub load_ref($) {
148 my ($path) = @_; 238 my ($path) = @_;
149 239
150 open my $fh, "<:raw:perlio", $path 240 open my $fh, "<:raw:perlio", $path
… …
254 } else { 344 } else {
255 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 345 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
256 } 346 }
257 } 347 }
258 348
349 # color_fg is used as default for magicmap if magicmap does not exist
350 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
351
259 # nuke outdated or never supported fields 352 # nuke outdated or never supported fields
260 delete @$ob{qw( 353 delete @$ob{qw(
261 can_knockback can_parry can_impale can_cut can_dam_armour 354 can_knockback can_parry can_impale can_cut can_dam_armour
262 can_apply pass_thru can_pass_thru 355 can_apply pass_thru can_pass_thru color_bg color_fg
263 )}; 356 )};
264 357
265 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 358 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
266 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 359 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
267 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 360 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
268 361
269 # convert movement strings to bitsets 362 # convert movement strings to bitsets
270 for my $attr (keys %FIELD_MOVEMENT) { 363 for my $attr (keys %FIELD_MOVEMENT) {
271 next unless exists $ob->{$attr}; 364 next unless exists $ob->{$attr};
272 365
273 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 366 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr};
274
275 next if $ob->{$attr} =~ /^\d+$/;
276
277 my $flags = 0;
278
279 # assume list
280 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
281 $flags |= MOVE_WALK if $flag eq "walk";
282 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
283 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
284 $flags |= MOVE_FLYING if $flag eq "flying";
285 $flags |= MOVE_SWIM if $flag eq "swim";
286 $flags |= MOVE_BOAT if $flag eq "boat";
287 $flags |= MOVE_ALL if $flag eq "all";
288
289 $flags &= ~MOVE_WALK if $flag eq "-walk";
290 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
291 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
292 $flags &= ~MOVE_FLYING if $flag eq "-flying";
293 $flags &= ~MOVE_SWIM if $flag eq "-swim";
294 $flags &= ~MOVE_BOAT if $flag eq "-boat";
295 $flags &= ~MOVE_ALL if $flag eq "-all";
296 }
297
298 $ob->{$attr} = $flags;
299 } 367 }
300 368
301 # convert outdated movement flags to new movement sets 369 # convert outdated movement flags to new movement sets
302 if (defined (my $v = delete $ob->{no_pass})) { 370 if (defined (my $v = delete $ob->{no_pass})) {
303 $ob->{move_block} = $v ? MOVE_ALL : 0; 371 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
304 } 372 }
305 if (defined (my $v = delete $ob->{slow_move})) { 373 if (defined (my $v = delete $ob->{slow_move})) {
306 $ob->{move_slow} |= MOVE_WALK; 374 $ob->{move_slow} += "walk";
307 $ob->{move_slow_penalty} = $v; 375 $ob->{move_slow_penalty} = $v;
308 } 376 }
309 if (defined (my $v = delete $ob->{walk_on})) { 377 if (defined (my $v = delete $ob->{walk_on})) {
310 $ob->{move_on} = 0 unless exists $ob->{move_on}; 378 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
311 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
312 : $ob->{move_on} & ~MOVE_WALK;
313 } 379 }
314 if (defined (my $v = delete $ob->{walk_off})) { 380 if (defined (my $v = delete $ob->{walk_off})) {
315 $ob->{move_off} = 0 unless exists $ob->{move_off}; 381 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
316 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
317 : $ob->{move_off} & ~MOVE_WALK;
318 } 382 }
319 if (defined (my $v = delete $ob->{fly_on})) { 383 if (defined (my $v = delete $ob->{fly_on})) {
320 $ob->{move_on} = 0 unless exists $ob->{move_on}; 384 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
321 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
322 : $ob->{move_on} & ~MOVE_FLY_LOW;
323 } 385 }
324 if (defined (my $v = delete $ob->{fly_off})) { 386 if (defined (my $v = delete $ob->{fly_off})) {
325 $ob->{move_off} = 0 unless exists $ob->{move_off}; 387 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
326 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
327 : $ob->{move_off} & ~MOVE_FLY_LOW;
328 } 388 }
329 if (defined (my $v = delete $ob->{flying})) { 389 if (defined (my $v = delete $ob->{flying})) {
330 $ob->{move_type} = 0 unless exists $ob->{move_type}; 390 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
331 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
332 : $ob->{move_type} & ~MOVE_FLY_LOW;
333 } 391 }
334 392
335 # convert idiotic event_xxx things into objects 393 # convert idiotic event_xxx things into objects
336 while (my ($event, $subtype) = each %EVENT_TYPE) { 394 while (my ($event, $subtype) = each %EVENT_TYPE) {
337 if (exists $ob->{"event_${event}_plugin"}) { 395 if (exists $ob->{"event_${event}_plugin"}) {
… …
593 my ($k, $v) = @$_; 651 my ($k, $v) = @$_;
594 652
595 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 653 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
596 $v =~ s/\n$//; 654 $v =~ s/\n$//;
597 $str .= "$k\n$v\n$end\n"; 655 $str .= "$k\n$v\n$end\n";
598 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
599 if ($v & ~Crossfire::MOVE_ALL or !$v) {
600 $str .= "$k $v\n";
601
602 } elsif ($v & Crossfire::MOVE_ALLBIT) {
603 $str .= "$k all";
604
605 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
606 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
607 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
608 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
609 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
610
611 $str .= "\n";
612
613 } else {
614 $str .= $k;
615
616 $str .= " walk" if $v & Crossfire::MOVE_WALK;
617 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
618 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
619 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
620 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
621
622 $str .= "\n";
623 }
624 } else { 656 } else {
625 $str .= "$k $v\n"; 657 $str .= "$k $v\n";
626 } 658 }
627 } 659 }
628 660
… …
853 }, sub { 885 }, sub {
854 read_arch "$LIB/archetypes" 886 read_arch "$LIB/archetypes"
855 }; 887 };
856} 888}
857 889
890sub construct_tilecache_pb {
891 my ($idx, $cache) = @_;
892
893 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
894
895 while (my ($name, $tile) = each %$cache) {
896 my $tpb = delete $tile->{pb};
897 my $ofs = $tile->{idx};
898
899 for my $x (0 .. $tile->{w} - 1) {
900 for my $y (0 .. $tile->{h} - 1) {
901 my $idx = $ofs + $x + $y * $tile->{w};
902 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
903 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
904 }
905 }
906 }
907
908 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
909
910 $cache
911}
912
913sub use_tilecache {
914 my ($face) = @_;
915 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
916 or die "$VARDIR/tilecache.png: $!";
917 *FACE = $_[0];
918}
919
858=item load_tilecache 920=item load_tilecache
859 921
860(Re-)Load %TILE and %FACE. 922(Re-)Load %TILE and %FACE.
861 923
862=cut 924=cut
863 925
864sub load_tilecache() { 926sub load_tilecache() {
865 require Gtk2; 927 require Gtk2;
866 928
929 if (-e "$LIB/crossfire.0") { # Crossfire1 version
867 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 930 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
868 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 931 sub {
869 or die "$VARDIR/tilecache.png: $!";
870 *FACE = $_[0];
871 }, sub {
872 my $tile = read_pak "$LIB/crossfire.0"; 932 my $tile = read_pak "$LIB/crossfire.0";
873 933
874 my %cache; 934 my %cache;
875 935
876 my $idx = 0; 936 my $idx = 0;
877 937
878 for my $name (sort keys %$tile) { 938 for my $name (sort keys %$tile) {
879 my $pb = new Gtk2::Gdk::PixbufLoader; 939 my $pb = new Gtk2::Gdk::PixbufLoader;
880 $pb->write ($tile->{$name}); 940 $pb->write ($tile->{$name});
881 $pb->close; 941 $pb->close;
882 my $pb = $pb->get_pixbuf; 942 my $pb = $pb->get_pixbuf;
883 943
884 my $tile = $cache{$name} = { 944 my $tile = $cache{$name} = {
885 pb => $pb, 945 pb => $pb,
886 idx => $idx, 946 idx => $idx,
887 w => int $pb->get_width / TILESIZE, 947 w => int $pb->get_width / TILESIZE,
888 h => int $pb->get_height / TILESIZE, 948 h => int $pb->get_height / TILESIZE,
949 };
950
951 $idx += $tile->{w} * $tile->{h};
952 }
953
954 construct_tilecache_pb $idx, \%cache;
955
956 \%cache
889 }; 957 };
958
959 } else { # Crossfire+ version
960 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
961 sub {
962 my %cache;
963 my $facedata = Storable::retrieve "$LIB/facedata";
964
965 $facedata->{version} == 2
966 or die "$LIB/facedata: version mismatch, cannot proceed.";
967
968 my $faces = $facedata->{faceinfo};
969 my $idx = 0;
970
971 for (sort keys %$faces) {
972 my ($face, $info) = ($_, $faces->{$_});
973
974 my $pb = new Gtk2::Gdk::PixbufLoader;
975 $pb->write ($info->{data32});
976 $pb->close;
977 my $pb = $pb->get_pixbuf;
978
979 my $tile = $cache{$face} = {
980 pb => $pb,
981 idx => $idx,
982 w => int $pb->get_width / TILESIZE,
983 h => int $pb->get_height / TILESIZE,
890 984 };
891 985
892 $idx += $tile->{w} * $tile->{h}; 986 $idx += $tile->{w} * $tile->{h};
893 }
894
895 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
896
897 while (my ($name, $tile) = each %cache) {
898 my $tpb = delete $tile->{pb};
899 my $ofs = $tile->{idx};
900
901 for my $x (0 .. $tile->{w} - 1) {
902 for my $y (0 .. $tile->{h} - 1) {
903 my $idx = $ofs + $x + $y * $tile->{w};
904 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
905 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
906 } 987 }
988
989 construct_tilecache_pb $idx, \%cache;
990
991 \%cache
907 } 992 };
908 }
909
910 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
911
912 \%cache
913 }; 993 }
914} 994}
915 995
916=head1 AUTHOR 996=head1 AUTHOR
917 997
918 Marc Lehmann <schmorp@schmorp.de> 998 Marc Lehmann <schmorp@schmorp.de>

Diff Legend

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