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.97 by root, Sun Mar 11 00:18:45 2007 UTC vs.
Revision 1.111 by elmex, Thu Jun 7 14:45:22 2007 UTC

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

Diff Legend

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