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.105 by root, Tue Apr 17 18:50:41 2007 UTC vs.
Revision 1.113 by root, Tue Jul 3 00:16:49 2007 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.98'; 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::XS qw(from_json to_json); 27use JSON::XS qw(from_json to_json);
25 28
26our $LIB = $ENV{CROSSFIRE_LIBDIR}; 29our $LIB = $ENV{CROSSFIRE_LIBDIR};
… …
29 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 32 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
30 : File::Spec->tmpdir . "/crossfire"; 33 : File::Spec->tmpdir . "/crossfire";
31 34
32mkdir $VARDIR, 0777; 35mkdir $VARDIR, 0777;
33 36
34sub TILESIZE (){ 32 } 37sub TILESIZE (){ 32 }
38sub CACHESTRIDE (){ 64 }
35 39
36our %ARCH; 40our %ARCH;
41our %FACE; # face32
37our %FACE; 42our %FACEDATA;
38our $TILE; 43our $TILE;
39 44
40our %FIELD_MULTILINE = ( 45our %FIELD_MULTILINE = (
41 msg => "endmsg", 46 msg => "endmsg",
42 lore => "endlore", 47 lore => "endlore",
… …
83 resist_life_stealing resist_disease 88 resist_life_stealing resist_disease
84 89
85 path_attuned path_repelled path_denied material materialname 90 path_attuned path_repelled path_denied material materialname
86 value carrying weight invisible state magic 91 value carrying weight invisible state magic
87 last_heal last_sp last_grace last_eat 92 last_heal last_sp last_grace last_eat
88 connected glow_radius randomitems npx_status npc_program 93 connected glow_radius randomitems tresure_env npx_status npc_program
89 run_away pick_up container will_apply smoothlevel 94 run_away pick_up container will_apply smoothlevel
90 current_weapon_script weapontype tooltype elevation client_type 95 current_weapon_script weapontype tooltype elevation client_type
91 item_power duration range 96 item_power duration range
92 range_modifier duration_modifier dam_modifier gen_sp_armour 97 range_modifier duration_modifier dam_modifier gen_sp_armour
93 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
… …
104 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
105 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
106 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
107 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
108 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
109 115
110 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
111 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
112)); 118));
113 119
… …
130sub MOVE_FLY_LOW (){ 0x02 } 136sub MOVE_FLY_LOW (){ 0x02 }
131sub MOVE_FLY_HIGH (){ 0x04 } 137sub MOVE_FLY_HIGH (){ 0x04 }
132sub MOVE_FLYING (){ 0x06 } 138sub MOVE_FLYING (){ 0x06 }
133sub MOVE_SWIM (){ 0x08 } 139sub MOVE_SWIM (){ 0x08 }
134sub MOVE_BOAT (){ 0x10 } 140sub MOVE_BOAT (){ 0x10 }
141sub MOVE_SHIP (){ 0x20 }
135sub MOVE_KNOWN (){ 0x1f } # all of above 142sub MOVE_KNOWN (){ 0x3f } # all of above
136sub MOVE_ALL (){ 0x10000 } # very special value 143sub MOVE_ALL (){ 0x10000 } # very special value
137 144
138our %MOVE_TYPE = ( 145our %MOVE_TYPE = (
139 walk => MOVE_WALK, 146 walk => MOVE_WALK,
140 fly_low => MOVE_FLY_LOW, 147 fly_low => MOVE_FLY_LOW,
141 fly_high => MOVE_FLY_HIGH, 148 fly_high => MOVE_FLY_HIGH,
142 flying => MOVE_FLYING, 149 flying => MOVE_FLYING,
143 swim => MOVE_SWIM, 150 swim => MOVE_SWIM,
144 boat => MOVE_BOAT, 151 boat => MOVE_BOAT,
152 ship => MOVE_SHIP,
145 all => MOVE_ALL, 153 all => MOVE_ALL,
146); 154);
147 155
148our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat); 156our @MOVE_TYPE = keys %MOVE_TYPE;
149 157
150{ 158{
151 package Crossfire::MoveType; 159 package Crossfire::MoveType;
152 160
153 use overload 161 use overload
… …
344 } else { 352 } else {
345 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 353 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
346 } 354 }
347 } 355 }
348 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
349 # color_fg is used as default for magicmap if magicmap does not exist 368 # 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}; 369 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
351 370
352 # nuke outdated or never supported fields 371 # nuke outdated or never supported fields
353 delete @$ob{qw( 372 delete @$ob{qw(
… …
789 808
790 my (%ignore); 809 my (%ignore);
791 my (@section_order, %section, @attr_order); 810 my (@section_order, %section, @attr_order);
792 811
793 while (my $type = shift @import) { 812 while (my $type = shift @import) {
813 push @import,
814 grep $_,
815 map $Crossfire::Data::TYPE{$_},
794 push @import, @{$type->{import} || []}; 816 @{$type->{import} || []};
795 817
796 $attr->{$_} ||= $type->{$_} 818 $attr->{$_} ||= $type->{$_}
797 for qw(name desc use); 819 for qw(name desc use);
798 820
799 for (@{$type->{ignore} || []}) { 821 for (@{$type->{ignore} || []}) {
… …
888} 910}
889 911
890sub construct_tilecache_pb { 912sub construct_tilecache_pb {
891 my ($idx, $cache) = @_; 913 my ($idx, $cache) = @_;
892 914
893 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64; 915 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
894 916
895 while (my ($name, $tile) = each %$cache) { 917 while (my ($name, $tile) = each %$cache) {
896 my $tpb = delete $tile->{pb}; 918 my $tpb = delete $tile->{pb};
897 my $ofs = $tile->{idx}; 919 my $ofs = $tile->{idx};
898 920
899 for my $x (0 .. $tile->{w} - 1) { 921 for my $x (0 .. $tile->{w} - 1) {
900 for my $y (0 .. $tile->{h} - 1) { 922 for my $y (0 .. $tile->{h} - 1) {
901 my $idx = $ofs + $x + $y * $tile->{w}; 923 my $idx = $ofs + $x + $y * $tile->{w};
902 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, 924 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
903 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 925 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
904 } 926 }
905 } 927 }
906 } 928 }
907 929
908 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 930 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
… …
924=cut 946=cut
925 947
926sub load_tilecache() { 948sub load_tilecache() {
927 require Gtk2; 949 require Gtk2;
928 950
951 if (-e "$LIB/facedata") { # Crossfire TRT faces
952 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
953 sub {
954 my %cache;
955 my $facedata = Storable::retrieve "$LIB/facedata";
956
957 $facedata->{version} == 2
958 or die "$LIB/facedata: version mismatch, cannot proceed.";
959
960 my $faces = $facedata->{faceinfo};
961 my $idx = 0;
962
963 for (sort keys %$faces) {
964 my ($face, $info) = ($_, $faces->{$_});
965
966 my $pb = new Gtk2::Gdk::PixbufLoader;
967 $pb->write ($info->{data32});
968 $pb->close;
969 my $pb = $pb->get_pixbuf;
970
971 my $tile = $cache{$face} = {
972 pb => $pb,
973 idx => $idx,
974 w => int $pb->get_width / TILESIZE,
975 h => int $pb->get_height / TILESIZE,
976 };
977
978 $idx += $tile->{w} * $tile->{h};
979 }
980
981 construct_tilecache_pb $idx, \%cache;
982
983 \%cache
984 };
985
986 *FACEDATA = Storable::retrieve "$LIB/facedata";
987
929 if (-e "$LIB/crossfire.0") { # Crossfire1 version 988 } elsif (-e "$LIB/crossfire.0") { # Crossfire1 version
930 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache, 989 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
931 sub { 990 sub {
932 my $tile = read_pak "$LIB/crossfire.0"; 991 my $tile = read_pak "$LIB/crossfire.0";
933 992
934 my %cache; 993 my %cache;
… …
954 construct_tilecache_pb $idx, \%cache; 1013 construct_tilecache_pb $idx, \%cache;
955 1014
956 \%cache 1015 \%cache
957 }; 1016 };
958 1017
959 } else { # Crossfire+ version 1018 *FACEDATA = { };
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,
984 };
985
986 $idx += $tile->{w} * $tile->{h};
987 }
988
989 construct_tilecache_pb $idx, \%cache;
990
991 \%cache
992 };
993 } 1019 }
994} 1020}
995 1021
996=head1 AUTHOR 1022=head1 AUTHOR
997 1023
… …
1002 http://www.ta-sa.org/ 1028 http://www.ta-sa.org/
1003 1029
1004=cut 1030=cut
1005 1031
10061 10321
1033

Diff Legend

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