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.110 by root, Mon May 28 21:33:28 2007 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.96'; 9our $VERSION = '0.99';
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 (defined $arch->{attach}
358 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
359 delete $ob->{attach}
360 }
361 }
362
363 # color_fg is used as default for magicmap if magicmap does not exist
364 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
365
353 # nuke outdated or never supported fields 366 # nuke outdated or never supported fields
354 delete @$ob{qw( 367 delete @$ob{qw(
355 can_knockback can_parry can_impale can_cut can_dam_armour 368 can_knockback can_parry can_impale can_cut can_dam_armour
356 can_apply pass_thru can_pass_thru 369 can_apply pass_thru can_pass_thru color_bg color_fg
357 )}; 370 )};
358 371
359 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 372 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
360 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 373 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
361 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 374 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
… …
886 }, sub { 899 }, sub {
887 read_arch "$LIB/archetypes" 900 read_arch "$LIB/archetypes"
888 }; 901 };
889} 902}
890 903
904sub construct_tilecache_pb {
905 my ($idx, $cache) = @_;
906
907 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
908
909 while (my ($name, $tile) = each %$cache) {
910 my $tpb = delete $tile->{pb};
911 my $ofs = $tile->{idx};
912
913 for my $x (0 .. $tile->{w} - 1) {
914 for my $y (0 .. $tile->{h} - 1) {
915 my $idx = $ofs + $x + $y * $tile->{w};
916 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
917 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
918 }
919 }
920 }
921
922 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
923
924 $cache
925}
926
927sub use_tilecache {
928 my ($face) = @_;
929 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
930 or die "$VARDIR/tilecache.png: $!";
931 *FACE = $_[0];
932}
933
891=item load_tilecache 934=item load_tilecache
892 935
893(Re-)Load %TILE and %FACE. 936(Re-)Load %TILE and %FACE.
894 937
895=cut 938=cut
896 939
897sub load_tilecache() { 940sub load_tilecache() {
898 require Gtk2; 941 require Gtk2;
899 942
943 if (-e "$LIB/crossfire.0") { # Crossfire1 version
900 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 944 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
901 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 945 sub {
902 or die "$VARDIR/tilecache.png: $!";
903 *FACE = $_[0];
904 }, sub {
905 my $tile = read_pak "$LIB/crossfire.0"; 946 my $tile = read_pak "$LIB/crossfire.0";
906 947
907 my %cache; 948 my %cache;
908 949
909 my $idx = 0; 950 my $idx = 0;
910 951
911 for my $name (sort keys %$tile) { 952 for my $name (sort keys %$tile) {
912 my $pb = new Gtk2::Gdk::PixbufLoader; 953 my $pb = new Gtk2::Gdk::PixbufLoader;
913 $pb->write ($tile->{$name}); 954 $pb->write ($tile->{$name});
914 $pb->close; 955 $pb->close;
915 my $pb = $pb->get_pixbuf; 956 my $pb = $pb->get_pixbuf;
916 957
917 my $tile = $cache{$name} = { 958 my $tile = $cache{$name} = {
918 pb => $pb, 959 pb => $pb,
919 idx => $idx, 960 idx => $idx,
920 w => int $pb->get_width / TILESIZE, 961 w => int $pb->get_width / TILESIZE,
921 h => int $pb->get_height / TILESIZE, 962 h => int $pb->get_height / TILESIZE,
963 };
964
965 $idx += $tile->{w} * $tile->{h};
966 }
967
968 construct_tilecache_pb $idx, \%cache;
969
970 \%cache
922 }; 971 };
972
973 } else { # Crossfire+ version
974 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
975 sub {
976 my %cache;
977 my $facedata = Storable::retrieve "$LIB/facedata";
978
979 $facedata->{version} == 2
980 or die "$LIB/facedata: version mismatch, cannot proceed.";
981
982 my $faces = $facedata->{faceinfo};
983 my $idx = 0;
984
985 for (sort keys %$faces) {
986 my ($face, $info) = ($_, $faces->{$_});
987
988 my $pb = new Gtk2::Gdk::PixbufLoader;
989 $pb->write ($info->{data32});
990 $pb->close;
991 my $pb = $pb->get_pixbuf;
992
993 my $tile = $cache{$face} = {
994 pb => $pb,
995 idx => $idx,
996 w => int $pb->get_width / TILESIZE,
997 h => int $pb->get_height / TILESIZE,
923 998 };
924 999
925 $idx += $tile->{w} * $tile->{h}; 1000 $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 } 1001 }
1002
1003 construct_tilecache_pb $idx, \%cache;
1004
1005 \%cache
940 } 1006 };
941 }
942
943 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
944
945 \%cache
946 }; 1007 }
947} 1008}
948 1009
949=head1 AUTHOR 1010=head1 AUTHOR
950 1011
951 Marc Lehmann <schmorp@schmorp.de> 1012 Marc Lehmann <schmorp@schmorp.de>

Diff Legend

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