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.88 by root, Sun Feb 18 20:20:58 2007 UTC vs.
Revision 1.107 by root, Wed May 9 11:44:40 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
… …
91 resist_life_stealing resist_disease 83 resist_life_stealing resist_disease
92 84
93 path_attuned path_repelled path_denied material materialname 85 path_attuned path_repelled path_denied material materialname
94 value carrying weight invisible state magic 86 value carrying weight invisible state magic
95 last_heal last_sp last_grace last_eat 87 last_heal last_sp last_grace last_eat
96 connected glow_radius randomitems npx_status npc_program 88 connected glow_radius randomitems tresure_env npx_status npc_program
97 run_away pick_up container will_apply smoothlevel 89 run_away pick_up container will_apply smoothlevel
98 current_weapon_script weapontype tooltype elevation client_type 90 current_weapon_script weapontype tooltype elevation client_type
99 item_power duration range 91 item_power duration range
100 range_modifier duration_modifier dam_modifier gen_sp_armour 92 range_modifier duration_modifier dam_modifier gen_sp_armour
101 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty 93 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
… …
112 known_magical known_cursed can_use_skill been_applied has_ready_scroll 104 known_magical known_cursed can_use_skill been_applied has_ready_scroll
113 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly 105 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
114 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark 106 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
115 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage 107 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
116 activate_on_push activate_on_release is_water use_content_on_gen is_buildable 108 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
109 precious
117 110
118 body_range body_arm body_torso body_head body_neck body_skill 111 body_range body_arm body_torso body_head body_neck body_skill
119 body_finger body_shoulder body_foot body_hand body_wrist body_waist 112 body_finger body_shoulder body_foot body_hand body_wrist body_waist
120)); 113));
121 114
… …
138sub MOVE_FLY_LOW (){ 0x02 } 131sub MOVE_FLY_LOW (){ 0x02 }
139sub MOVE_FLY_HIGH (){ 0x04 } 132sub MOVE_FLY_HIGH (){ 0x04 }
140sub MOVE_FLYING (){ 0x06 } 133sub MOVE_FLYING (){ 0x06 }
141sub MOVE_SWIM (){ 0x08 } 134sub MOVE_SWIM (){ 0x08 }
142sub MOVE_BOAT (){ 0x10 } 135sub MOVE_BOAT (){ 0x10 }
136sub MOVE_SHIP (){ 0x20 }
143sub MOVE_KNOWN (){ 0x1f } # all of above 137sub MOVE_KNOWN (){ 0x3f } # all of above
144sub MOVE_ALLBIT (){ 0x10000 }
145sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 138sub MOVE_ALL (){ 0x10000 } # very special value
139
140our %MOVE_TYPE = (
141 walk => MOVE_WALK,
142 fly_low => MOVE_FLY_LOW,
143 fly_high => MOVE_FLY_HIGH,
144 flying => MOVE_FLYING,
145 swim => MOVE_SWIM,
146 boat => MOVE_BOAT,
147 ship => MOVE_SHIP,
148 all => MOVE_ALL,
149);
150
151our @MOVE_TYPE = keys %MOVE_TYPE;
152
153{
154 package Crossfire::MoveType;
155
156 use overload
157 '=' => sub { bless [@{$_[0]}], ref $_[0] },
158 '""' => \&as_string,
159 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
160 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
161 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
162 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
163 'x=' => sub {
164 my $cur = $_[0] >= $_[1];
165 if (!defined $cur) {
166 if ($_[0] >= "all") {
167 $_[0] -= $_[1];
168 } else {
169 $_[0] += $_[1];
170 }
171 } elsif ($cur) {
172 $_[0] -= $_[1];
173 } else {
174 $_[0] /= $_[1];
175 }
176
177 $_[0]
178 },
179 'eq' => sub { "$_[0]" eq "$_[1]" },
180 'ne' => sub { "$_[0]" ne "$_[1]" },
181 ;
182}
183
184sub Crossfire::MoveType::new {
185 my ($class, $string) = @_;
186
187 my $mask;
188 my $value;
189
190 if ($string =~ /^\s*\d+\s*$/) {
191 $mask = MOVE_ALL;
192 $value = $string+0;
193 } else {
194 for (split /\s+/, lc $string) {
195 if (s/^-//) {
196 $mask |= $MOVE_TYPE{$_};
197 $value &= ~$MOVE_TYPE{$_};
198 } else {
199 $mask |= $MOVE_TYPE{$_};
200 $value |= $MOVE_TYPE{$_};
201 }
202 }
203 }
204
205 (bless [$mask, $value], $class)->normalise
206}
207
208sub Crossfire::MoveType::normalise {
209 my ($self) = @_;
210
211 if ($self->[0] & MOVE_ALL) {
212 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
213 $self->[0] &= $mask;
214 $self->[1] &= $mask;
215 }
216
217 $self->[1] &= $self->[0];
218
219 $self
220}
221
222sub Crossfire::MoveType::as_string {
223 my ($self) = @_;
224
225 my @res;
226
227 my ($mask, $value) = @$self;
228
229 for (@Crossfire::MOVE_TYPE) {
230 my $bit = $Crossfire::MOVE_TYPE{$_};
231 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
232 $mask &= ~$bit;
233 push @res, $value & $bit ? $_ : "-$_";
234 }
235 }
236
237 join " ", @res
238}
146 239
147sub load_ref($) { 240sub load_ref($) {
148 my ($path) = @_; 241 my ($path) = @_;
149 242
150 open my $fh, "<:raw:perlio", $path 243 open my $fh, "<:raw:perlio", $path
… …
254 } else { 347 } else {
255 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 348 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
256 } 349 }
257 } 350 }
258 351
352 # color_fg is used as default for magicmap if magicmap does not exist
353 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
354
259 # nuke outdated or never supported fields 355 # nuke outdated or never supported fields
260 delete @$ob{qw( 356 delete @$ob{qw(
261 can_knockback can_parry can_impale can_cut can_dam_armour 357 can_knockback can_parry can_impale can_cut can_dam_armour
262 can_apply pass_thru can_pass_thru 358 can_apply pass_thru can_pass_thru color_bg color_fg
263 )}; 359 )};
264 360
265 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 361 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
266 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 362 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
267 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 363 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
268 364
269 # convert movement strings to bitsets 365 # convert movement strings to bitsets
270 for my $attr (keys %FIELD_MOVEMENT) { 366 for my $attr (keys %FIELD_MOVEMENT) {
271 next unless exists $ob->{$attr}; 367 next unless exists $ob->{$attr};
272 368
273 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 369 $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 } 370 }
300 371
301 # convert outdated movement flags to new movement sets 372 # convert outdated movement flags to new movement sets
302 if (defined (my $v = delete $ob->{no_pass})) { 373 if (defined (my $v = delete $ob->{no_pass})) {
303 $ob->{move_block} = $v ? MOVE_ALL : 0; 374 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
304 } 375 }
305 if (defined (my $v = delete $ob->{slow_move})) { 376 if (defined (my $v = delete $ob->{slow_move})) {
306 $ob->{move_slow} |= MOVE_WALK; 377 $ob->{move_slow} += "walk";
307 $ob->{move_slow_penalty} = $v; 378 $ob->{move_slow_penalty} = $v;
308 } 379 }
309 if (defined (my $v = delete $ob->{walk_on})) { 380 if (defined (my $v = delete $ob->{walk_on})) {
310 $ob->{move_on} = MOVE_NONE unless exists $ob->{move_on}; 381 $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 } 382 }
314 if (defined (my $v = delete $ob->{walk_off})) { 383 if (defined (my $v = delete $ob->{walk_off})) {
315 $ob->{move_off} = MOVE_NONE unless exists $ob->{move_off}; 384 $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 } 385 }
319 if (defined (my $v = delete $ob->{fly_on})) { 386 if (defined (my $v = delete $ob->{fly_on})) {
320 $ob->{move_on} = MOVE_NONE unless exists $ob->{move_on}; 387 $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 } 388 }
324 if (defined (my $v = delete $ob->{fly_off})) { 389 if (defined (my $v = delete $ob->{fly_off})) {
325 $ob->{move_off} = MOVE_NONE unless exists $ob->{move_off}; 390 $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 } 391 }
329 if (defined (my $v = delete $ob->{flying})) { 392 if (defined (my $v = delete $ob->{flying})) {
330 $ob->{move_type} = MOVE_NONE unless exists $ob->{move_type}; 393 $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 } 394 }
334 395
335 # convert idiotic event_xxx things into objects 396 # convert idiotic event_xxx things into objects
336 while (my ($event, $subtype) = each %EVENT_TYPE) { 397 while (my ($event, $subtype) = each %EVENT_TYPE) {
337 if (exists $ob->{"event_${event}_plugin"}) { 398 if (exists $ob->{"event_${event}_plugin"}) {
… …
593 my ($k, $v) = @$_; 654 my ($k, $v) = @$_;
594 655
595 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 656 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
596 $v =~ s/\n$//; 657 $v =~ s/\n$//;
597 $str .= "$k\n$v\n$end\n"; 658 $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 { 659 } else {
625 $str .= "$k $v\n"; 660 $str .= "$k $v\n";
626 } 661 }
627 } 662 }
628 663
… …
853 }, sub { 888 }, sub {
854 read_arch "$LIB/archetypes" 889 read_arch "$LIB/archetypes"
855 }; 890 };
856} 891}
857 892
893sub construct_tilecache_pb {
894 my ($idx, $cache) = @_;
895
896 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
897
898 while (my ($name, $tile) = each %$cache) {
899 my $tpb = delete $tile->{pb};
900 my $ofs = $tile->{idx};
901
902 for my $x (0 .. $tile->{w} - 1) {
903 for my $y (0 .. $tile->{h} - 1) {
904 my $idx = $ofs + $x + $y * $tile->{w};
905 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
906 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
907 }
908 }
909 }
910
911 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
912
913 $cache
914}
915
916sub use_tilecache {
917 my ($face) = @_;
918 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
919 or die "$VARDIR/tilecache.png: $!";
920 *FACE = $_[0];
921}
922
858=item load_tilecache 923=item load_tilecache
859 924
860(Re-)Load %TILE and %FACE. 925(Re-)Load %TILE and %FACE.
861 926
862=cut 927=cut
863 928
864sub load_tilecache() { 929sub load_tilecache() {
865 require Gtk2; 930 require Gtk2;
866 931
932 if (-e "$LIB/crossfire.0") { # Crossfire1 version
867 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 933 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
868 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 934 sub {
869 or die "$VARDIR/tilecache.png: $!";
870 *FACE = $_[0];
871 }, sub {
872 my $tile = read_pak "$LIB/crossfire.0"; 935 my $tile = read_pak "$LIB/crossfire.0";
873 936
874 my %cache; 937 my %cache;
875 938
876 my $idx = 0; 939 my $idx = 0;
877 940
878 for my $name (sort keys %$tile) { 941 for my $name (sort keys %$tile) {
879 my $pb = new Gtk2::Gdk::PixbufLoader; 942 my $pb = new Gtk2::Gdk::PixbufLoader;
880 $pb->write ($tile->{$name}); 943 $pb->write ($tile->{$name});
881 $pb->close; 944 $pb->close;
882 my $pb = $pb->get_pixbuf; 945 my $pb = $pb->get_pixbuf;
883 946
884 my $tile = $cache{$name} = { 947 my $tile = $cache{$name} = {
885 pb => $pb, 948 pb => $pb,
886 idx => $idx, 949 idx => $idx,
887 w => int $pb->get_width / TILESIZE, 950 w => int $pb->get_width / TILESIZE,
888 h => int $pb->get_height / TILESIZE, 951 h => int $pb->get_height / TILESIZE,
952 };
953
954 $idx += $tile->{w} * $tile->{h};
955 }
956
957 construct_tilecache_pb $idx, \%cache;
958
959 \%cache
889 }; 960 };
961
962 } else { # Crossfire+ version
963 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
964 sub {
965 my %cache;
966 my $facedata = Storable::retrieve "$LIB/facedata";
967
968 $facedata->{version} == 2
969 or die "$LIB/facedata: version mismatch, cannot proceed.";
970
971 my $faces = $facedata->{faceinfo};
972 my $idx = 0;
973
974 for (sort keys %$faces) {
975 my ($face, $info) = ($_, $faces->{$_});
976
977 my $pb = new Gtk2::Gdk::PixbufLoader;
978 $pb->write ($info->{data32});
979 $pb->close;
980 my $pb = $pb->get_pixbuf;
981
982 my $tile = $cache{$face} = {
983 pb => $pb,
984 idx => $idx,
985 w => int $pb->get_width / TILESIZE,
986 h => int $pb->get_height / TILESIZE,
890 987 };
891 988
892 $idx += $tile->{w} * $tile->{h}; 989 $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 } 990 }
991
992 construct_tilecache_pb $idx, \%cache;
993
994 \%cache
907 } 995 };
908 }
909
910 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
911
912 \%cache
913 }; 996 }
914} 997}
915 998
916=head1 AUTHOR 999=head1 AUTHOR
917 1000
918 Marc Lehmann <schmorp@schmorp.de> 1001 Marc Lehmann <schmorp@schmorp.de>

Diff Legend

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