ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.107 by root, Mon Jul 24 08:23:27 2006 UTC vs.
Revision 1.122 by root, Sun Oct 1 14:48:50 2006 UTC

1=head1 NAME 1=head1 NAME
2 2
3CFClient - undocumented utility garbage for our crossfire client 3CFPlus - undocumented utility garbage for our crossfire client
4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use CFClient; 7 use CFPlus;
8 8
9=head1 DESCRIPTION 9=head1 DESCRIPTION
10 10
11=over 4 11=over 4
12 12
13=cut 13=cut
14 14
15package CFClient; 15package CFPlus;
16
17use Carp ();
16 18
17BEGIN { 19BEGIN {
18 $VERSION = '0.1'; 20 $VERSION = '0.52';
19 21
20 use XSLoader; 22 use XSLoader;
21 XSLoader::load "CFClient", $VERSION; 23 XSLoader::load "CFPlus", $VERSION;
24}
25
26BEGIN {
27 $SIG{__DIE__} = sub {
28 return if CFPlus::in_destruct;
29 #CFPlus::fatal $_[0];#d#
30 CFPlus::error Carp::longmess $_[0];#d#
31 die;#d#
32 };
22} 33}
23 34
24use utf8; 35use utf8;
25 36
26use Carp ();
27use AnyEvent (); 37use AnyEvent ();
28use BerkeleyDB; 38use BerkeleyDB;
29use Pod::POM (); 39use Pod::POM ();
30use Scalar::Util (); 40use Scalar::Util ();
31use YAML ();
32use Storable (); # finally 41use Storable (); # finally
33 42
34our %STAT_TOOLTIP = (
35 Str => "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack",
36 Dex => "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed",
37 Con => "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have",
38 Int => "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have",
39 Wis => "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have",
40 Pow => "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up",
41 Cha => "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops.",
42
43 Wc => "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72.",
44 Ac => "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases.",
45 Dam => "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack.",
46 Arm => "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance.",
47 Spd => "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed.",
48 WSp => "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed.",
49);
50
51=item guard { BLOCK } 43=item guard { BLOCK }
52 44
53Returns an object that executes the given block as soon as it is destroyed. 45Returns an object that executes the given block as soon as it is destroyed.
54 46
55=cut 47=cut
56 48
57sub guard(&) { 49sub guard(&) {
58 bless \(my $cb = $_[0]), "CFClient::Guard" 50 bless \(my $cb = $_[0]), "CFPlus::Guard"
59} 51}
60 52
61sub CFClient::Guard::DESTROY { 53sub CFPlus::Guard::DESTROY {
62 ${$_[0]}->() 54 ${$_[0]}->()
63} 55}
64 56
65sub asxml($) { 57sub asxml($) {
66 local $_ = $_[0]; 58 local $_ = $_[0];
… …
70 s/</&lt;/g; 62 s/</&lt;/g;
71 63
72 $_ 64 $_
73} 65}
74 66
75package CFClient::Database; 67package CFPlus::Database;
76 68
77our @ISA = BerkeleyDB::Btree::; 69our @ISA = BerkeleyDB::Btree::;
78 70
79sub get($$) { 71sub get($$) {
80 my $data; 72 my $data;
… …
87my %DB_SYNC; 79my %DB_SYNC;
88 80
89sub put($$$) { 81sub put($$$) {
90 my ($db, $key, $data) = @_; 82 my ($db, $key, $data) = @_;
91 83
84 my $hkey = $db + 0;
85 Scalar::Util::weaken $db;
92 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); 86 $DB_SYNC{$hkey} ||= AnyEvent->timer (after => 5, cb => sub {
87 delete $DB_SYNC{$hkey};
88 $db->db_sync if $db;
89 });
93 90
94 $db->db_put ($key => $data) 91 $db->db_put ($key => $data)
95} 92}
96 93
97package CFClient; 94package CFPlus;
98 95
99sub find_rcfile($) { 96sub find_rcfile($) {
100 my $path; 97 my $path;
101 98
102 for (grep !ref, @INC) { 99 for (grep !ref, @INC) {
103 $path = "$_/CFClient/resources/$_[0]"; 100 $path = "$_/CFPlus/resources/$_[0]";
104 return $path if -r $path; 101 return $path if -r $path;
105 } 102 }
106 103
107 die "FATAL: can't find required file $_[0]\n"; 104 die "FATAL: can't find required file $_[0]\n";
108} 105}
109 106
110sub parse_yaml { 107BEGIN {
111 my $text = shift; 108 use Crossfire::Protocol::Base ();
112 109 *to_json = \&Crossfire::Protocol::Base::to_json;
113 utf8::decode $text; 110 *from_json = \&Crossfire::Protocol::Base::from_json;
114
115 YAML::Load $text
116} 111}
117 112
118sub read_cfg { 113sub read_cfg {
119 my ($file) = @_; 114 my ($file) = @_;
120 115
… …
122 or return; 117 or return;
123 118
124 local $/; 119 local $/;
125 my $CFG = <$fh>; 120 my $CFG = <$fh>;
126 121
122 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
123 require YAML;
124 utf8::decode $CFG;
125 $::CFG = YAML::Load ($CFG);
127 if ($CFG =~ /^---/) { 126 } elsif ($CFG =~ /^\{/) {
128 $::CFG = parse_yaml $CFG; 127 $::CFG = from_json $CFG;
129 } else { 128 } else {
130 $::CFG = eval $CFG; 129 $::CFG = eval $CFG; ## todo comaptibility cruft
131 } 130 }
132} 131}
133 132
134sub write_cfg { 133sub write_cfg {
135 my ($file) = @_; 134 my ($file) = @_;
136 135
137 $::CFG->{VERSION} = $::VERSION; 136 $::CFG->{VERSION} = $::VERSION;
138 137
139 open my $fh, ">:utf8", $file 138 open my $fh, ">:utf8", $file
140 or return; 139 or return;
141 print $fh YAML::Dump $::CFG; 140 print $fh to_json $::CFG;
141}
142
143sub http_proxy {
144 my @proxy = win32_proxy_info;
145
146 if (@proxy) {
147 "http://" . (@proxy < 2 ? "" : @proxy < 3 ? "$proxy[1]\@" : "$proxy[1]:$proxy[2]\@") . $proxy[0]
148 } elsif (exists $ENV{http_proxy}) {
149 $ENV{http_proxy}
150 } else {
151 ()
152 }
153}
154
155sub set_proxy {
156 my $proxy = http_proxy
157 or return;
158
159 $ENV{http_proxy} = $proxy;
142} 160}
143 161
144our $DB_ENV; 162our $DB_ENV;
163our $DB_STATE;
164
165sub db_table($) {
166 my ($table) = @_;
167
168 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
169
170 new CFPlus::Database
171 -Env => $DB_ENV,
172 -Filename => $table,
173# -Filename => "database",
174# -Subname => $table,
175 -Property => DB_CHKSUM,
176 -Flags => DB_CREATE | DB_UPGRADE,
177 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
178}
145 179
146{ 180{
147 use strict; 181 use strict;
148 182
149 mkdir "$Crossfire::VARDIR/cfplus", 0777; 183 mkdir "$Crossfire::VARDIR/cfplus", 0777;
… …
158# -ErrPrefix => "DATABASE", 192# -ErrPrefix => "DATABASE",
159 -Verbose => 1, 193 -Verbose => 1,
160 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover, 194 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
161 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE, 195 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
162 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error"; 196 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
163}
164 197
165sub db_table($) { 198 $DB_STATE = db_table "state";
166 my ($table) = @_;
167
168 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
169
170 new CFClient::Database
171 -Env => $DB_ENV,
172 -Filename => $table,
173# -Filename => "database",
174# -Subname => $table,
175 -Property => DB_CHKSUM,
176 -Flags => DB_CREATE | DB_UPGRADE,
177 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
178} 199}
179 200
180package CFClient::Layout; 201package CFPlus::Layout;
181 202
182$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub { 203$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
183 reset_glyph_cache; 204 reset_glyph_cache;
184}; 205};
185 206
186package CFClient::Item; 207package CFPlus::Item;
187 208
188use strict; 209use strict;
189use Crossfire::Protocol::Constants; 210use Crossfire::Protocol::Constants;
190 211
191my $last_enter_count = 1; 212my $last_enter_count = 1;
… …
225} 246}
226 247
227sub do_n_dialog { 248sub do_n_dialog {
228 my ($cb) = @_; 249 my ($cb) = @_;
229 250
230 my $w = new CFClient::UI::FancyFrame 251 my $w = new CFPlus::UI::Toplevel
231 on_delete => sub { $_[0]->destroy; 1 }, 252 on_delete => sub { $_[0]->destroy; 1 },
232 has_close_button => 1, 253 has_close_button => 1,
233 ; 254 ;
234 255
235 $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center"); 256 $w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center");
236 $vb->add (new CFClient::UI::Label text => "Enter item count:"); 257 $vb->add (new CFPlus::UI::Label text => "Enter item count:");
237 $vb->add (my $entry = new CFClient::UI::Entry 258 $vb->add (my $entry = new CFPlus::UI::Entry
238 text => $last_enter_count, 259 text => $last_enter_count,
239 on_activate => sub { 260 on_activate => sub {
240 my ($entry) = @_; 261 my ($entry) = @_;
241 $last_enter_count = $entry->get_text; 262 $last_enter_count = $entry->get_text;
242 $cb->($last_enter_count); 263 $cb->($last_enter_count);
… …
264 285
265 if ($self->{container} == $::CONN->{player}{tag}) { 286 if ($self->{container} == $::CONN->{player}{tag}) {
266 $targ = $::CONN->{open_container}; 287 $targ = $::CONN->{open_container};
267 } 288 }
268 289
269 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { 290 if (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 1) {
270 $::CONN->send ("move $targ $self->{tag} 0") 291 $::CONN->send ("move $targ $self->{tag} 0")
271 if $targ || !($self->{flags} & F_LOCKED); 292 if $targ || !($self->{flags} & F_LOCKED);
272 } elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) { 293 } elsif (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 2) {
273 $self->{flags} & F_LOCKED 294 $self->{flags} & F_LOCKED
274 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) 295 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
275 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) 296 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
276 } elsif ($ev->{button} == 1) { 297 } elsif ($ev->{button} == 1) {
277 $::CONN->send ("examine $self->{tag}"); 298 $::CONN->send ("examine $self->{tag}");
… …
288 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }], 309 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
289 ["ignite/thaw", # first try of an easier use of flint&steel 310 ["ignite/thaw", # first try of an easier use of flint&steel
290 sub { 311 sub {
291 $::CONN->send ("mark ". pack "N", $self->{tag}); 312 $::CONN->send ("mark ". pack "N", $self->{tag});
292 $::CONN->send ("command apply flint and steel"); 313 $::CONN->send ("command apply flint and steel");
314 }
315 ],
316 ["inscribe", # first try of an easier use of flint&steel
317 sub {
318 &::open_string_query ("Text to inscribe", sub {
319 my ($entry, $txt) = @_;
320 $::CONN->send ("mark ". pack "N", $self->{tag});
321 $::CONN->send ("command use_skill inscription $txt");
322 });
323 }
324 ],
325 ["rename", # first try of an easier use of flint&steel
326 sub {
327 &::open_string_query ("Rename item to:", sub {
328 my ($entry, $txt) = @_;
329 $::CONN->send ("mark ". pack "N", $self->{tag});
330 $::CONN->send ("command rename to <$txt>");
331 }, $self->{name},
332 "If you input no name or erase the current custom name, the custom name will be unset");
293 } 333 }
294 ], 334 ],
295 ["apply", sub { $::CONN->send ("apply $self->{tag}") }], 335 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
296 ( 336 (
297 $self->{flags} & F_LOCKED 337 $self->{flags} & F_LOCKED
… …
308 ] 348 ]
309 ) 349 )
310 ), 350 ),
311 ); 351 );
312 352
313 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 353 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
314 } 354 }
315 355
316 1 356 1
317 }; 357 };
318 358
… …
326 366
327 my $bg = $self->{flags} & F_CURSED ? [1 , 0 , 0, 0.5] 367 my $bg = $self->{flags} & F_CURSED ? [1 , 0 , 0, 0.5]
328 : $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5] 368 : $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5]
329 : undef; 369 : undef;
330 370
331 $self->{face_widget} ||= new CFClient::UI::Face 371 $self->{face_widget} ||= new CFPlus::UI::Face
332 can_events => 1, 372 can_events => 1,
333 can_hover => 1, 373 can_hover => 1,
334 anim => $self->{anim}, 374 anim => $self->{anim},
335 animspeed => $self->{animspeed}, # TODO# must be set at creation time 375 animspeed => $self->{animspeed}, # TODO# must be set at creation time
336 on_button_down => $button_cb, 376 on_button_down => $button_cb,
… …
344 . "Item uses face #$self->{face}. " 384 . "Item uses face #$self->{face}. "
345 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ") 385 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
346 . "\n\n$tooltip_std" 386 . "\n\n$tooltip_std"
347 ); 387 );
348 388
349 $self->{desc_widget} ||= new CFClient::UI::Label 389 $self->{desc_widget} ||= new CFPlus::UI::Label
350 can_events => 1, 390 can_events => 1,
351 can_hover => 1, 391 can_hover => 1,
352 ellipsise => 2, 392 ellipsise => 2,
353 align => -1, 393 align => -1,
354 on_button_down => $button_cb, 394 on_button_down => $button_cb,
355 ; 395 ;
356 my $desc = CFClient::Item::desc_string $self; 396 my $desc = CFPlus::Item::desc_string $self;
357 $self->{desc_widget}{bg} = $bg; 397 $self->{desc_widget}{bg} = $bg;
358 $self->{desc_widget}->set_text ($desc); 398 $self->{desc_widget}->set_text ($desc);
359 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std"); 399 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
360 400
361 $self->{weight_widget} ||= new CFClient::UI::Label 401 $self->{weight_widget} ||= new CFPlus::UI::Label
362 can_events => 1, 402 can_events => 1,
363 can_hover => 1, 403 can_hover => 1,
364 ellipsise => 0, 404 ellipsise => 0,
365 align => 0, 405 align => 0,
366 on_button_down => $button_cb, 406 on_button_down => $button_cb,
367 ; 407 ;
368 $self->{weight_widget}{bg} = $bg; 408 $self->{weight_widget}{bg} = $bg;
369 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self); 409 $self->{weight_widget}->set_text (CFPlus::Item::weight_string $self);
370 $self->{weight_widget}->set_tooltip ( 410 $self->{weight_widget}->set_tooltip (
371 "<b>Weight</b>.\n" 411 "<b>Weight</b>.\n"
372 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ") 412 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
373 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ") 413 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
374 . "\n\n$tooltip_std" 414 . "\n\n$tooltip_std"

Diff Legend

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