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.91 by root, Sat Mar 3 19:06:03 2007 UTC vs.
Revision 1.112 by root, Thu Jun 21 00:07:54 2007 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.96'; 9our $VERSION = '1.0';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
16use File::Spec; 16use File::Spec;
17use List::Util qw(min max); 17use List::Util qw(min max);
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
22 *ARCH $TILE *FACE *FACEDATA
23 TILESIZE CACHESTRIDE
24 editor_archs arch_extents
22); 25);
23 26
24use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working 27use 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 28
36our $LIB = $ENV{CROSSFIRE_LIBDIR}; 29our $LIB = $ENV{CROSSFIRE_LIBDIR};
37 30
38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" 31our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 32 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
40 : File::Spec->tmpdir . "/crossfire"; 33 : File::Spec->tmpdir . "/crossfire";
41 34
42mkdir $VARDIR, 0777; 35mkdir $VARDIR, 0777;
43 36
44sub TILESIZE (){ 32 } 37sub TILESIZE (){ 32 }
38sub CACHESTRIDE (){ 64 }
45 39
46our %ARCH; 40our %ARCH;
41our %FACE; # face32
47our %FACE; 42our %FACEDATA;
48our $TILE; 43our $TILE;
49 44
50our %FIELD_MULTILINE = ( 45our %FIELD_MULTILINE = (
51 msg => "endmsg", 46 msg => "endmsg",
52 lore => "endlore", 47 lore => "endlore",
… …
68 outdoor temp pressure humid windspeed winddir sky nosmooth 63 outdoor temp pressure humid windspeed winddir sky nosmooth
69 tile_path_1 tile_path_2 tile_path_3 tile_path_4 64 tile_path_1 tile_path_2 tile_path_3 tile_path_4
70)); 65));
71 66
72our @FIELD_ORDER = (qw( 67our @FIELD_ORDER = (qw(
68 inherit
69
73 elevation 70 elevation
74 71
75 name name_pl custom_name attach title race 72 name name_pl custom_name attach title race
76 slaying skill msg lore other_arch face 73 slaying skill msg lore other_arch
77 #todo-events
78 animation is_animated 74 face animation is_animated
75 magicmap smoothlevel smoothface
79 str dex con wis pow cha int 76 str dex con wis pow cha int
80 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
81 exp perm_exp expmul 78 exp perm_exp expmul
82 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
83 nrof level direction type subtype attacktype 80 nrof level direction type subtype attacktype
… …
91 resist_life_stealing resist_disease 88 resist_life_stealing resist_disease
92 89
93 path_attuned path_repelled path_denied material materialname 90 path_attuned path_repelled path_denied material materialname
94 value carrying weight invisible state magic 91 value carrying weight invisible state magic
95 last_heal last_sp last_grace last_eat 92 last_heal last_sp last_grace last_eat
96 connected glow_radius randomitems npx_status npc_program 93 connected glow_radius randomitems tresure_env npx_status npc_program
97 run_away pick_up container will_apply smoothlevel 94 run_away pick_up container will_apply smoothlevel
98 current_weapon_script weapontype tooltype elevation client_type 95 current_weapon_script weapontype tooltype elevation client_type
99 item_power duration range 96 item_power duration range
100 range_modifier duration_modifier dam_modifier gen_sp_armour 97 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 98 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 109 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 110 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 111 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 112 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 113 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
114 precious
117 115
118 body_range body_arm body_torso body_head body_neck body_skill 116 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 117 body_finger body_shoulder body_foot body_hand body_wrist body_waist
120)); 118));
121 119
… …
138sub MOVE_FLY_LOW (){ 0x02 } 136sub MOVE_FLY_LOW (){ 0x02 }
139sub MOVE_FLY_HIGH (){ 0x04 } 137sub MOVE_FLY_HIGH (){ 0x04 }
140sub MOVE_FLYING (){ 0x06 } 138sub MOVE_FLYING (){ 0x06 }
141sub MOVE_SWIM (){ 0x08 } 139sub MOVE_SWIM (){ 0x08 }
142sub MOVE_BOAT (){ 0x10 } 140sub MOVE_BOAT (){ 0x10 }
141sub MOVE_SHIP (){ 0x20 }
143sub MOVE_KNOWN (){ 0x1f } # all of above 142sub MOVE_KNOWN (){ 0x3f } # all of above
144sub MOVE_ALL (){ 0x10000 } # very special value 143sub MOVE_ALL (){ 0x10000 } # very special value
145 144
146our %MOVE_TYPE = ( 145our %MOVE_TYPE = (
147 walk => MOVE_WALK, 146 walk => MOVE_WALK,
148 fly_low => MOVE_FLY_LOW, 147 fly_low => MOVE_FLY_LOW,
149 fly_high => MOVE_FLY_HIGH, 148 fly_high => MOVE_FLY_HIGH,
150 flying => MOVE_FLYING, 149 flying => MOVE_FLYING,
151 swim => MOVE_SWIM, 150 swim => MOVE_SWIM,
152 boat => MOVE_BOAT, 151 boat => MOVE_BOAT,
152 ship => MOVE_SHIP,
153 all => MOVE_ALL, 153 all => MOVE_ALL,
154); 154);
155 155
156our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat); 156our @MOVE_TYPE = keys %MOVE_TYPE;
157 157
158{ 158{
159 package Crossfire::MoveType; 159 package Crossfire::MoveType;
160 160
161 use overload 161 use overload
162 '=' => sub { bless [@{$_[0]}], ref $_[0] },
162 '""' => \&as_string, 163 '""' => \&as_string,
163 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef }, 164 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
164 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise }, 165 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
165 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 166 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
166 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 167 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
167 'x=' => sub { 168 'x=' => sub {
168 my $cur = $_[0] >= $_[1]; 169 my $cur = $_[0] >= $_[1];
169 if (!defined $cur) { 170 if (!defined $cur) {
171 if ($_[0] >= "all") {
172 $_[0] -= $_[1];
173 } else {
170 $_[0] += $_[1]; 174 $_[0] += $_[1];
175 }
171 } elsif ($cur) { 176 } elsif ($cur) {
172 $_[0] -= $_[1]; 177 $_[0] -= $_[1];
173 } else { 178 } else {
174 $_[0] /= $_[1]; 179 $_[0] /= $_[1];
175 } 180 }
… …
185 my ($class, $string) = @_; 190 my ($class, $string) = @_;
186 191
187 my $mask; 192 my $mask;
188 my $value; 193 my $value;
189 194
195 if ($string =~ /^\s*\d+\s*$/) {
196 $mask = MOVE_ALL;
197 $value = $string+0;
198 } else {
190 for (split /\s+/, lc $string) { 199 for (split /\s+/, lc $string) {
191 if (s/^-//) { 200 if (s/^-//) {
192 $mask |= $MOVE_TYPE{$_}; 201 $mask |= $MOVE_TYPE{$_};
193 $value &= ~$MOVE_TYPE{$_}; 202 $value &= ~$MOVE_TYPE{$_};
194 } else { 203 } else {
195 $mask |= $MOVE_TYPE{$_}; 204 $mask |= $MOVE_TYPE{$_};
196 $value |= $MOVE_TYPE{$_}; 205 $value |= $MOVE_TYPE{$_};
206 }
197 } 207 }
198 } 208 }
199 209
200 (bless [$mask, $value], $class)->normalise 210 (bless [$mask, $value], $class)->normalise
201} 211}
… …
342 } else { 352 } else {
343 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 353 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
344 } 354 }
345 } 355 }
346 356
357 # check whether attachment is the same as in the archetype
358 if (exists $ob->{attach}) {
359 my $arch = $ARCH{$ob->{_name}};
360 my $js = JSON::XS->new->utf8->canonical (1);
361
362 if (defined $arch->{attach}
363 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
364 delete $ob->{attach}
365 }
366 }
367
368 # color_fg is used as default for magicmap if magicmap does not exist
369 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
370
347 # nuke outdated or never supported fields 371 # nuke outdated or never supported fields
348 delete @$ob{qw( 372 delete @$ob{qw(
349 can_knockback can_parry can_impale can_cut can_dam_armour 373 can_knockback can_parry can_impale can_cut can_dam_armour
350 can_apply pass_thru can_pass_thru 374 can_apply pass_thru can_pass_thru color_bg color_fg
351 )}; 375 )};
352 376
353 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 377 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
354 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 378 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
355 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 379 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
… …
880 }, sub { 904 }, sub {
881 read_arch "$LIB/archetypes" 905 read_arch "$LIB/archetypes"
882 }; 906 };
883} 907}
884 908
909sub construct_tilecache_pb {
910 my ($idx, $cache) = @_;
911
912 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
913
914 while (my ($name, $tile) = each %$cache) {
915 my $tpb = delete $tile->{pb};
916 my $ofs = $tile->{idx};
917
918 for my $x (0 .. $tile->{w} - 1) {
919 for my $y (0 .. $tile->{h} - 1) {
920 my $idx = $ofs + $x + $y * $tile->{w};
921 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
922 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
923 }
924 }
925 }
926
927 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
928
929 $cache
930}
931
932sub use_tilecache {
933 my ($face) = @_;
934 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
935 or die "$VARDIR/tilecache.png: $!";
936 *FACE = $_[0];
937}
938
885=item load_tilecache 939=item load_tilecache
886 940
887(Re-)Load %TILE and %FACE. 941(Re-)Load %TILE and %FACE.
888 942
889=cut 943=cut
890 944
891sub load_tilecache() { 945sub load_tilecache() {
892 require Gtk2; 946 require Gtk2;
893 947
894 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 948 if (-e "$LIB/facedata") { # Crossfire TRT faces
895 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 949 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
896 or die "$VARDIR/tilecache.png: $!"; 950 sub {
897 *FACE = $_[0];
898 }, sub {
899 my $tile = read_pak "$LIB/crossfire.0";
900
901 my %cache; 951 my %cache;
952 my $facedata = Storable::retrieve "$LIB/facedata";
902 953
954 $facedata->{version} == 2
955 or die "$LIB/facedata: version mismatch, cannot proceed.";
956
957 my $faces = $facedata->{faceinfo};
903 my $idx = 0; 958 my $idx = 0;
904 959
905 for my $name (sort keys %$tile) { 960 for (sort keys %$faces) {
961 my ($face, $info) = ($_, $faces->{$_});
962
906 my $pb = new Gtk2::Gdk::PixbufLoader; 963 my $pb = new Gtk2::Gdk::PixbufLoader;
907 $pb->write ($tile->{$name}); 964 $pb->write ($info->{data32});
908 $pb->close; 965 $pb->close;
909 my $pb = $pb->get_pixbuf; 966 my $pb = $pb->get_pixbuf;
910 967
911 my $tile = $cache{$name} = { 968 my $tile = $cache{$face} = {
912 pb => $pb, 969 pb => $pb,
913 idx => $idx, 970 idx => $idx,
914 w => int $pb->get_width / TILESIZE, 971 w => int $pb->get_width / TILESIZE,
915 h => int $pb->get_height / TILESIZE, 972 h => int $pb->get_height / TILESIZE,
973 };
974
975 $idx += $tile->{w} * $tile->{h};
976 }
977
978 construct_tilecache_pb $idx, \%cache;
979
980 \%cache
916 }; 981 };
982
983 *FACEDATA = Storable::retrieve "$LIB/facedata";
984
985 } elsif (-e "$LIB/crossfire.0") { # Crossfire1 version
986 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
987 sub {
988 my $tile = read_pak "$LIB/crossfire.0";
989
990 my %cache;
991
992 my $idx = 0;
993
994 for my $name (sort keys %$tile) {
995 my $pb = new Gtk2::Gdk::PixbufLoader;
996 $pb->write ($tile->{$name});
997 $pb->close;
998 my $pb = $pb->get_pixbuf;
999
1000 my $tile = $cache{$name} = {
1001 pb => $pb,
1002 idx => $idx,
1003 w => int $pb->get_width / TILESIZE,
1004 h => int $pb->get_height / TILESIZE,
917 1005 };
918 1006
919 $idx += $tile->{w} * $tile->{h}; 1007 $idx += $tile->{w} * $tile->{h};
920 }
921
922 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
923
924 while (my ($name, $tile) = each %cache) {
925 my $tpb = delete $tile->{pb};
926 my $ofs = $tile->{idx};
927
928 for my $x (0 .. $tile->{w} - 1) {
929 for my $y (0 .. $tile->{h} - 1) {
930 my $idx = $ofs + $x + $y * $tile->{w};
931 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
932 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
933 } 1008 }
1009
1010 construct_tilecache_pb $idx, \%cache;
1011
1012 \%cache
934 } 1013 };
935 }
936 1014
937 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 1015 *FACEDATA = { };
938
939 \%cache
940 }; 1016 }
941} 1017}
942 1018
943=head1 AUTHOR 1019=head1 AUTHOR
944 1020
945 Marc Lehmann <schmorp@schmorp.de> 1021 Marc Lehmann <schmorp@schmorp.de>
… …
949 http://www.ta-sa.org/ 1025 http://www.ta-sa.org/
950 1026
951=cut 1027=cut
952 1028
9531 10291
1030

Diff Legend

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