[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC.pm

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.82 by root, Wed May 31 07:13:50 2006 UTC vs.
Revision 1.104 by root, Sun Jul 23 11:09:57 2006 UTC

…		…
24	use utf8;	24	use utf8;
25		25
26	use Carp ();	26	use Carp ();
27	use AnyEvent ();	27	use AnyEvent ();
28	use BerkeleyDB;	28	use BerkeleyDB;
		29	use Pod::POM ();
		30	use Scalar::Util ();
		31	use Storable (); # finally
		32
		33	our %STAT_TOOLTIP = (
		34	Str => "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack",
		35	Dex => "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed",
		36	Con => "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have",
		37	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",
		38	Wis => "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have",
		39	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",
		40	Cha => "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops.",
		41
		42	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.",
		43	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.",
		44	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.",
		45	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.",
		46	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.",
		47	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.",
		48	);
		49
		50	=item guard { BLOCK }
		51
		52	Returns an object that executes the given block as soon as it is destroyed.
		53
		54	=cut
		55
		56	sub guard(&) {
		57	bless \(my $cb = $_[0]), "CFClient::Guard"
		58	}
		59
		60	sub CFClient::Guard::DESTROY {
		61	${$_[0]}->()
		62	}
		63
		64	package CFClient::PodToPango;
		65
		66	use base Pod::POM::View::Text;
		67
		68	our $VERSION = 1; # bump if resultant formatting changes
		69
		70	our $indent = 0;
		71
		72	*view_seq_code =
		73	*view_seq_bold = sub { "<b>$_[1]</b>" };
		74	*view_seq_italic = sub { "<i>$_[1]</i>" };
		75	*view_seq_space =
		76	*view_seq_link =
		77	*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
		78
		79	sub view_seq_text {
		80	my $text = $_[1];
		81	$text =~ s/\s+/ /g;
		82	CFClient::UI::Label::escape ($text)
		83	}
		84
		85	sub view_item {
		86	("\t" x ($indent / 4))
		87	. $_[1]->title->present ($_[0])
		88	. "\n\n"
		89	. $_[1]->content->present ($_[0])
		90	}
		91
		92	sub view_verbatim {
		93	(join "",
		94	map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
		95	split /\n/, CFClient::UI::Label::escape ($_[1]))
		96	. "\n"
		97	}
		98
		99	sub view_textblock {
		100	("\t" x ($indent / 2)) . "$_[1]\n\n"
		101	}
		102
		103	sub view_head1 {
		104	"\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		105	. $_[1]->content->present ($_[0])
		106	};
		107
		108	sub view_head2 {
		109	"\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		110	. $_[1]->content->present ($_[0])
		111	};
		112
		113	sub view_head3 {
		114	"\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		115	. $_[1]->content->present ($_[0])
		116	};
		117
		118	sub view_over {
		119	local $indent = $indent + $_[1]->indent;
		120	$_[1]->content->present ($_[0])
		121	}
		122
		123	package CFClient::Database;
		124
		125	our @ISA = BerkeleyDB::Btree::;
		126
		127	sub get($$) {
		128	my $data;
		129
		130	$_[0]->db_get ($_[1], $data) == 0
		131	? $data
		132	: ()
		133	}
		134
		135	my %DB_SYNC;
		136
		137	sub put($$$) {
		138	my ($db, $key, $data) = @_;
		139
		140	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
		141
		142	$db->db_put ($key => $data)
		143	}
		144
		145	package CFClient;
29		146
30	sub find_rcfile($) {	147	sub find_rcfile($) {
31	my $path;	148	my $path;
32		149
33	for (grep !ref, @INC) {	150	for (grep !ref, @INC) {
…		…
68	}	185	}
69		186
70	close CFG;	187	close CFG;
71	}	188	}
72		189
73	mkdir "$Crossfire::VARDIR/cfplus", 0777;
74
75	our $DB_ENV;	190	our $DB_ENV;
76		191
77	{	192	{
78	use strict;	193	use strict;
79		194
		195	mkdir "$Crossfire::VARDIR/cfplus", 0777;
80	my $recover = $BerkeleyDB::db_version >= 4.4	196	my $recover = $BerkeleyDB::db_version >= 4.4
81	? eval "DB_REGISTER \| DB_RECOVER"	197	? eval "DB_REGISTER \| DB_RECOVER"
82	: 0;	198	: 0;
83	warn $recover;
84		199
85	$DB_ENV = new BerkeleyDB::Env	200	$DB_ENV = new BerkeleyDB::Env
86	-Home => "$Crossfire::VARDIR/cfplus",	201	-Home => "$Crossfire::VARDIR/cfplus",
87	-Cachesize => 1_000_000,	202	-Cachesize => 1_000_000,
88	-ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",	203	-ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
…		…
106	-Property => DB_CHKSUM,	221	-Property => DB_CHKSUM,
107	-Flags => DB_CREATE \| DB_UPGRADE,	222	-Flags => DB_CREATE \| DB_UPGRADE,
108	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"	223	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
109	}	224	}
110		225
		226	my $pod_cache = db_table "pod_cache";
		227
		228	sub load_pod($$$$) {
		229	my ($path, $filtertype, $filterversion, $filtercb) = @_;
		230
		231	stat $path
		232	or die "$path: $!";
		233
		234	my $phash = join ",", $filterversion, $CFClient::PodToPango::VERSION, (stat _)[7,9];
		235
		236	my ($chash, $pom) = eval { @{ Storable::thaw $pod_cache->get ("$path/$filtertype") } };
		237
		238	return $pom if $chash eq $phash;
		239
		240	my $pod = do {
		241	local $/;
		242	open my $pod, "<:utf8", $_[0]
		243	or die "$_[0]: $!";
		244	<$pod>
		245	};
		246
		247	#utf8::downgrade $pod;
		248
		249	$pom = $filtercb-> (Pod::POM->new->parse_text ($pod));
		250
		251	$pod_cache->put ("$path/$filtertype" => Storable::nfreeze [$phash, $pom]);
		252
		253	$pom
		254	}
		255
111	sub pod_to_pango($) {	256	sub pod_to_pango($) {
112	my ($pom) = @_;	257	my ($pom) = @_;
113		258
114	$pom->present ("CFClient::PodToPango")	259	$pom->present ("CFClient::PodToPango")
115	}	260	}
…		…
121	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],	266	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],
122	split /\n/, $pom->present ("CFClient::PodToPango")	267	split /\n/, $pom->present ("CFClient::PodToPango")
123	]	268	]
124	}	269	}
125		270
126	package CFClient::PodToPango;	271	package CFClient::Layout;
127		272
128	use base Pod::POM::View::Text;	273	$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub {
129		274	reset_glyph_cache;
130	our $indent = 0;
131
132	*view_seq_code =
133	*view_seq_bold = sub { "<b>$_[1]</b>" };
134	*view_seq_italic = sub { "<i>$_[1]</i>" };
135	*view_seq_space =
136	*view_seq_link =
137	*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
138
139	sub view_seq_text {
140	my $text = $_[1];
141	$text =~ s/\s+/ /g;
142	CFClient::UI::Label::escape ($text)
143	}
144
145	sub view_item {
146	("\t" x ($indent / 4))
147	. $_[1]->title->present ($_[0])
148	. "\n"
149	. $_[1]->content->present ($_[0])
150	}
151
152	sub view_verbatim {
153	(join "",
154	map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
155	split /\n/, CFClient::UI::Label::escape ($_[1]))
156	. "\n"
157	}
158
159	sub view_textblock {
160	("\t" x ($indent / 2)) . "$_[1]\n\n"
161	}
162
163	sub view_head1 {
164	"\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
165	. $_[1]->content->present ($_[0])
166	};	275	};
167
168	sub view_head2 {
169	"\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
170	. $_[1]->content->present ($_[0])
171	};
172
173	sub view_head3 {
174	"\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
175	. $_[1]->content->present ($_[0])
176	};
177
178	sub view_over {
179	local $indent = $indent + $_[1]->indent;
180	$_[1]->content->present ($_[0])
181	}
182
183	package CFClient::Database;
184
185	our @ISA = BerkeleyDB::Btree::;
186
187	sub get($$) {
188	my $data;
189
190	$_[0]->db_get ($_[1], $data) == 0
191	? $data
192	: ()
193	}
194
195	my %DB_SYNC;
196
197	sub put($$$) {
198	my ($db, $key, $data) = @_;
199
200	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
201
202	$db->db_put ($key => $data)
203	}
204		276
205	package CFClient::Item;	277	package CFClient::Item;
206		278
207	use strict;	279	use strict;
208	use Crossfire::Protocol::Constants;	280	use Crossfire::Protocol::Constants;
		281
		282	my $last_enter_count = 1;
209		283
210	sub desc_string {	284	sub desc_string {
211	my ($self) = @_;	285	my ($self) = @_;
212		286
213	my $desc =	287	my $desc =
…		…
239	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};	313	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};
240		314
241	$weight < 0 ? "?" : $weight * 0.001	315	$weight < 0 ? "?" : $weight * 0.001
242	}	316	}
243		317
		318	sub do_n_dialog {
		319	my ($cb) = @_;
		320
		321	my $w = new CFClient::UI::FancyFrame
		322	on_delete => sub { $_[0]->destroy; 1 },
		323	has_close_button => 1,
		324	;
		325
		326	$w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
		327	$vb->add (new CFClient::UI::Label text => "Enter item count:");
		328	$vb->add (my $entry = new CFClient::UI::Entry
		329	text => $last_enter_count,
		330	on_activate => sub {
		331	my ($entry) = @_;
		332	$last_enter_count = $entry->get_text;
		333	$cb->($last_enter_count);
		334	$w->hide;
		335	$w->destroy;
		336
		337	0
		338	},
		339	on_escape => sub { $w->destroy; 1 },
		340	);
		341	$entry->grab_focus;
		342	$w->show;
		343	}
		344
244	sub update_widgets {	345	sub update_widgets {
245	my ($self) = @_;	346	my ($self) = @_;
246		347
		348	# necessary to avoid cyclic references
		349	Scalar::Util::weaken $self;
		350
247	my $button_cb = sub {	351	my $button_cb = sub {
248	my (undef, $ev, $x, $y) = @_;	352	my (undef, $ev, $x, $y) = @_;
249		353
		354	my $targ = $::CONN->{player}{tag};
		355
		356	if ($self->{container} == $::CONN->{player}{tag}) {
		357	$targ = $::CONN->{open_container};
		358	}
		359
250	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {	360	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
251	my $targ = $::CONN->{player}{tag};
252
253	if ($self->{container} == $::CONN->{player}{tag}) {
254	$targ = $::CONN->{open_container};
255	}
256
257	$::CONN->send ("move $targ $self->{tag} 0")	361	$::CONN->send ("move $targ $self->{tag} 0")
258	if $targ \|\| !($self->{flags} & F_LOCKED);	362	if $targ \|\| !($self->{flags} & F_LOCKED);
		363	} elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) {
		364	$self->{flags} & F_LOCKED
		365	? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
		366	: $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
259	} elsif ($ev->{button} == 1) {	367	} elsif ($ev->{button} == 1) {
260	$::CONN->send ("examine $self->{tag}");	368	$::CONN->send ("examine $self->{tag}");
261	} elsif ($ev->{button} == 2) {	369	} elsif ($ev->{button} == 2) {
262	$::CONN->send ("apply $self->{tag}");	370	$::CONN->send ("apply $self->{tag}");
263	} elsif ($ev->{button} == 3) {	371	} elsif ($ev->{button} == 3) {
		372	my $move_prefix = $::CONN->{open_container} ? 'put' : 'drop';
		373	if ($self->{container} == $::CONN->{open_container}) {
		374	$move_prefix = "take";
		375	}
		376
264	my @menu_items = (	377	my @menu_items = (
265	["examine", sub { $::CONN->send ("examine $self->{tag}") }],	378	["examine", sub { $::CONN->send ("examine $self->{tag}") }],
266	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],	379	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
		380	["ignite/thaw", # first try of an easier use of flint&steel
		381	sub {
		382	$::CONN->send ("mark ". pack "N", $self->{tag});
		383	$::CONN->send ("command apply flint and steel");
		384	}
		385	],
267	["apply", sub { $::CONN->send ("apply $self->{tag}") }],	386	["apply", sub { $::CONN->send ("apply $self->{tag}") }],
268	(	387	(
269	$self->{flags} & F_LOCKED	388	$self->{flags} & F_LOCKED
270	? (	389	? (
271	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],	390	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
272	)	391	)
273	: (	392	: (
274	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],	393	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
275	["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],	394	["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }],
		395	["$move_prefix <n>",
		396	sub {
		397	do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
		398	}
		399	]
276	)	400	)
277	),	401	),
278	);	402	);
279		403
280	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	404	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
…		…
285		409
286	my $tooltip_std = "<small>"	410	my $tooltip_std = "<small>"
287	. "Left click - examine item\n"	411	. "Left click - examine item\n"
288	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"	412	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
289	. "Middle click - apply\n"	413	. "Middle click - apply\n"
		414	. "Shift-Middle click - lock/unlock\n"
290	. "Right click - further options"	415	. "Right click - further options"
291	. "</small>\n";	416	. "</small>\n";
292		417
293	$self->{face_widget} \|\|= new CFClient::UI::Face	418	$self->{face_widget} \|\|= new CFClient::UI::Face
294	can_events => 1,	419	can_events => 1,
…		…
333	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")	458	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
334	. "\n\n$tooltip_std"	459	. "\n\n$tooltip_std"
335	);	460	);
336	}	461	}
337		462
338	package CFClient::Binder;
339
340	my @ALLOWED_MODIFIER_KEYS = (
341	(CFClient::SDLK_LSHIFT),
342	(CFClient::SDLK_LCTRL ),
343	(CFClient::SDLK_LALT ),
344	(CFClient::SDLK_LMETA ),
345
346	(CFClient::SDLK_RSHIFT),
347	(CFClient::SDLK_RCTRL ),
348	(CFClient::SDLK_RALT ),
349	(CFClient::SDLK_RMETA ),
350	);
351
352	my %ALLOWED_MODIFIERS = (
353	(CFClient::KMOD_LSHIFT) => "LSHIFT",
354	(CFClient::KMOD_LCTRL ) => "LCTRL",
355	(CFClient::KMOD_LALT ) => "LALT",
356	(CFClient::KMOD_LMETA ) => "LMETA",
357
358	(CFClient::KMOD_RSHIFT) => "RSHIFT",
359	(CFClient::KMOD_RCTRL ) => "RCTRL",
360	(CFClient::KMOD_RALT ) => "RALT",
361	(CFClient::KMOD_RMETA ) => "RMETA",
362	);
363
364	my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
365	my @DIRECT_BIND_KEYS = (
366	CFClient::SDLK_F1,
367	CFClient::SDLK_F2,
368	CFClient::SDLK_F3,
369	CFClient::SDLK_F4,
370	CFClient::SDLK_F5,
371	CFClient::SDLK_F6,
372	CFClient::SDLK_F7,
373	CFClient::SDLK_F8,
374	CFClient::SDLK_F9,
375	CFClient::SDLK_F10,
376	CFClient::SDLK_F11,
377	CFClient::SDLK_F12,
378	CFClient::SDLK_F13,
379	CFClient::SDLK_F14,
380	CFClient::SDLK_F15,
381	);
382
383	# this binding dialog asks for a key-combo to be pressed
384	# and if successful it calls the $cb with $mod and $sym as args.
385	sub open_binding_dialog {
386	my ($cb) = @_;
387
388	my $w = new CFClient::UI::FancyFrame
389	title => "Bind Action",
390	x => "center",
391	y => "center";
392
393	$w->add (my $vb = new CFClient::UI::VBox);
394	$vb->add (new CFClient::UI::Label
395	text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
396	."You can only bind 0-9 and F1-F15 without modifiers."
397	);
398	$vb->add (my $entry = new CFClient::UI::Entry
399	text => "",
400	on_key_down => sub {
401	my ($entry, $ev) = @_;
402
403	my $mod = $ev->{mod};
404	my $sym = $ev->{sym};
405
406	# XXX: This seems a little bit hackisch to me, but i have to ignore them
407	if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
408	return;
409	}
410
411	if ($mod == CFClient::KMOD_NONE
412	and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
413	and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
414	{
415	$::STATUSBOX->add (
416	"Can't bind key ".CFClient::SDL_GetKeyName ($sym)
417	." directly without modifier! It would damage the completer handling."
418	);
419	return;
420	}
421
422	$entry->focus_out;
423
424	$cb->($mod, $sym);
425
426	$w->destroy
427	});
428
429	$entry->focus_in;
430	$w->show;
431	}
432
433	sub keycombo_to_name {
434	my ($mod, $sym) = @_;
435
436	my $mods = join '+',
437	map { $ALLOWED_MODIFIERS{$_} }
438	grep { ($_ + 0) & ($mod + 0) }
439	keys %ALLOWED_MODIFIERS;
440	$mods .= "+" if $mods ne '';
441
442	return $mods . CFClient::SDL_GetKeyName ($sym);
443	}
444
445	1;	463	1;
446		464
447	=back	465	=back
448		466
449	=head1 AUTHOR	467	=head1 AUTHOR

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.82 by root, Wed May 31 07:13:50 2006 UTC vs. Revision 1.104 by root, Sun Jul 23 11:09:57 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.82 by root, Wed May 31 07:13:50 2006 UTC vs.
Revision 1.104 by root, Sun Jul 23 11:09:57 2006 UTC