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.93 by root, Sat Mar 3 19:38:06 2007 UTC vs.
Revision 1.108 by elmex, Wed May 23 20:21:28 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_ALL (){ 0x10000 } # very special value 138sub MOVE_ALL (){ 0x10000 } # very special value
145 139
146our %MOVE_TYPE = ( 140our %MOVE_TYPE = (
147 walk => MOVE_WALK, 141 walk => MOVE_WALK,
148 fly_low => MOVE_FLY_LOW, 142 fly_low => MOVE_FLY_LOW,
149 fly_high => MOVE_FLY_HIGH, 143 fly_high => MOVE_FLY_HIGH,
150 flying => MOVE_FLYING, 144 flying => MOVE_FLYING,
151 swim => MOVE_SWIM, 145 swim => MOVE_SWIM,
152 boat => MOVE_BOAT, 146 boat => MOVE_BOAT,
147 ship => MOVE_SHIP,
153 all => MOVE_ALL, 148 all => MOVE_ALL,
154); 149);
155 150
156our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat); 151our @MOVE_TYPE = keys %MOVE_TYPE;
157 152
158{ 153{
159 package Crossfire::MoveType; 154 package Crossfire::MoveType;
160 155
161 use overload 156 use overload
… …
166 '-=' => 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 },
167 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 162 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
168 'x=' => sub { 163 'x=' => sub {
169 my $cur = $_[0] >= $_[1]; 164 my $cur = $_[0] >= $_[1];
170 if (!defined $cur) { 165 if (!defined $cur) {
166 if ($_[0] >= "all") {
167 $_[0] -= $_[1];
168 } else {
171 $_[0] += $_[1]; 169 $_[0] += $_[1];
170 }
172 } elsif ($cur) { 171 } elsif ($cur) {
173 $_[0] -= $_[1]; 172 $_[0] -= $_[1];
174 } else { 173 } else {
175 $_[0] /= $_[1]; 174 $_[0] /= $_[1];
176 } 175 }
… …
348 } else { 347 } else {
349 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 348 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
350 } 349 }
351 } 350 }
352 351
352 # check whether attachment is the same as in the archetype
353 if (exists $ob->{attach}) {
354 my $arch = $ARCH{$ob->{_name}};
355 my $js = JSON::XS->new->utf8->canonical (1);
356
357 if ($js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
358 delete $ob->{attach}
359 }
360 }
361
362 # color_fg is used as default for magicmap if magicmap does not exist
363 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
364
353 # nuke outdated or never supported fields 365 # nuke outdated or never supported fields
354 delete @$ob{qw( 366 delete @$ob{qw(
355 can_knockback can_parry can_impale can_cut can_dam_armour 367 can_knockback can_parry can_impale can_cut can_dam_armour
356 can_apply pass_thru can_pass_thru 368 can_apply pass_thru can_pass_thru color_bg color_fg
357 )}; 369 )};
358 370
359 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 371 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
360 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 372 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
361 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 373 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
… …
886 }, sub { 898 }, sub {
887 read_arch "$LIB/archetypes" 899 read_arch "$LIB/archetypes"
888 }; 900 };
889} 901}
890 902
903sub construct_tilecache_pb {
904 my ($idx, $cache) = @_;
905
906 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
907
908 while (my ($name, $tile) = each %$cache) {
909 my $tpb = delete $tile->{pb};
910 my $ofs = $tile->{idx};
911
912 for my $x (0 .. $tile->{w} - 1) {
913 for my $y (0 .. $tile->{h} - 1) {
914 my $idx = $ofs + $x + $y * $tile->{w};
915 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
916 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
917 }
918 }
919 }
920
921 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
922
923 $cache
924}
925
926sub use_tilecache {
927 my ($face) = @_;
928 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
929 or die "$VARDIR/tilecache.png: $!";
930 *FACE = $_[0];
931}
932
891=item load_tilecache 933=item load_tilecache
892 934
893(Re-)Load %TILE and %FACE. 935(Re-)Load %TILE and %FACE.
894 936
895=cut 937=cut
896 938
897sub load_tilecache() { 939sub load_tilecache() {
898 require Gtk2; 940 require Gtk2;
899 941
942 if (-e "$LIB/crossfire.0") { # Crossfire1 version
900 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 943 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
901 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 944 sub {
902 or die "$VARDIR/tilecache.png: $!";
903 *FACE = $_[0];
904 }, sub {
905 my $tile = read_pak "$LIB/crossfire.0"; 945 my $tile = read_pak "$LIB/crossfire.0";
906 946
907 my %cache; 947 my %cache;
908 948
909 my $idx = 0; 949 my $idx = 0;
910 950
911 for my $name (sort keys %$tile) { 951 for my $name (sort keys %$tile) {
912 my $pb = new Gtk2::Gdk::PixbufLoader; 952 my $pb = new Gtk2::Gdk::PixbufLoader;
913 $pb->write ($tile->{$name}); 953 $pb->write ($tile->{$name});
914 $pb->close; 954 $pb->close;
915 my $pb = $pb->get_pixbuf; 955 my $pb = $pb->get_pixbuf;
916 956
917 my $tile = $cache{$name} = { 957 my $tile = $cache{$name} = {
918 pb => $pb, 958 pb => $pb,
919 idx => $idx, 959 idx => $idx,
920 w => int $pb->get_width / TILESIZE, 960 w => int $pb->get_width / TILESIZE,
921 h => int $pb->get_height / TILESIZE, 961 h => int $pb->get_height / TILESIZE,
962 };
963
964 $idx += $tile->{w} * $tile->{h};
965 }
966
967 construct_tilecache_pb $idx, \%cache;
968
969 \%cache
922 }; 970 };
971
972 } else { # Crossfire+ version
973 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
974 sub {
975 my %cache;
976 my $facedata = Storable::retrieve "$LIB/facedata";
977
978 $facedata->{version} == 2
979 or die "$LIB/facedata: version mismatch, cannot proceed.";
980
981 my $faces = $facedata->{faceinfo};
982 my $idx = 0;
983
984 for (sort keys %$faces) {
985 my ($face, $info) = ($_, $faces->{$_});
986
987 my $pb = new Gtk2::Gdk::PixbufLoader;
988 $pb->write ($info->{data32});
989 $pb->close;
990 my $pb = $pb->get_pixbuf;
991
992 my $tile = $cache{$face} = {
993 pb => $pb,
994 idx => $idx,
995 w => int $pb->get_width / TILESIZE,
996 h => int $pb->get_height / TILESIZE,
923 997 };
924 998
925 $idx += $tile->{w} * $tile->{h}; 999 $idx += $tile->{w} * $tile->{h};
926 }
927
928 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
929
930 while (my ($name, $tile) = each %cache) {
931 my $tpb = delete $tile->{pb};
932 my $ofs = $tile->{idx};
933
934 for my $x (0 .. $tile->{w} - 1) {
935 for my $y (0 .. $tile->{h} - 1) {
936 my $idx = $ofs + $x + $y * $tile->{w};
937 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
938 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
939 } 1000 }
1001
1002 construct_tilecache_pb $idx, \%cache;
1003
1004 \%cache
940 } 1005 };
941 }
942
943 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
944
945 \%cache
946 }; 1006 }
947} 1007}
948 1008
949=head1 AUTHOR 1009=head1 AUTHOR
950 1010
951 Marc Lehmann <schmorp@schmorp.de> 1011 Marc Lehmann <schmorp@schmorp.de>

Diff Legend

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