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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.85 by root, Thu Jun 1 05:04:34 2006 UTC vs.
Revision 1.107 by root, Mon Jul 24 08:23:27 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 YAML ();
		32	use Storable (); # finally
		33
		34	our %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 }
		52
		53	Returns an object that executes the given block as soon as it is destroyed.
		54
		55	=cut
		56
		57	sub guard(&) {
		58	bless \(my $cb = $_[0]), "CFClient::Guard"
		59	}
		60
		61	sub CFClient::Guard::DESTROY {
		62	${$_[0]}->()
		63	}
		64
		65	sub asxml($) {
		66	local $_ = $_[0];
		67
		68	s/&/&/g;
		69	s/>/>/g;
		70	s/</</g;
		71
		72	$_
		73	}
		74
		75	package CFClient::Database;
		76
		77	our @ISA = BerkeleyDB::Btree::;
		78
		79	sub get($$) {
		80	my $data;
		81
		82	$_[0]->db_get ($_[1], $data) == 0
		83	? $data
		84	: ()
		85	}
		86
		87	my %DB_SYNC;
		88
		89	sub put($$$) {
		90	my ($db, $key, $data) = @_;
		91
		92	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
		93
		94	$db->db_put ($key => $data)
		95	}
		96
		97	package CFClient;
29		98
30	sub find_rcfile($) {	99	sub find_rcfile($) {
31	my $path;	100	my $path;
32		101
33	for (grep !ref, @INC) {	102	for (grep !ref, @INC) {
…		…
36	}	105	}
37		106
38	die "FATAL: can't find required file $_[0]\n";	107	die "FATAL: can't find required file $_[0]\n";
39	}	108	}
40		109
		110	sub parse_yaml {
		111	my $text = shift;
		112
		113	utf8::decode $text;
		114
		115	YAML::Load $text
		116	}
		117
41	sub read_cfg {	118	sub read_cfg {
42	my ($file) = @_;	119	my ($file) = @_;
43		120
44	open CFG, $file	121	open my $fh, $file
45	or return;	122	or return;
46		123
47	my $CFG;
48
49	local $/;	124	local $/;
50	$CFG = eval <CFG>;	125	my $CFG = <$fh>;
51		126
		127	if ($CFG =~ /^---/) {
		128	$::CFG = parse_yaml $CFG;
		129	} else {
52	$::CFG = $CFG;	130	$::CFG = eval $CFG;
53		131	}
54	close CFG;
55	}	132	}
56		133
57	sub write_cfg {	134	sub write_cfg {
58	my ($file) = @_;	135	my ($file) = @_;
59		136
60	open CFG, ">$file"	137	$::CFG->{VERSION} = $::VERSION;
		138
		139	open my $fh, ">:utf8", $file
61	or return;	140	or return;
62		141	print $fh YAML::Dump $::CFG;
63	{
64	require Data::Dumper;
65	local $Data::Dumper::Purity = 1;
66	$::CFG->{VERSION} = $::VERSION;
67	print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
68	}
69
70	close CFG;
71	}	142	}
72
73	mkdir "$Crossfire::VARDIR/cfplus", 0777;
74		143
75	our $DB_ENV;	144	our $DB_ENV;
76		145
77	{	146	{
78	use strict;	147	use strict;
79		148
		149	mkdir "$Crossfire::VARDIR/cfplus", 0777;
80	my $recover = $BerkeleyDB::db_version >= 4.4	150	my $recover = $BerkeleyDB::db_version >= 4.4
81	? eval "DB_REGISTER \| DB_RECOVER"	151	? eval "DB_REGISTER \| DB_RECOVER"
82	: 0;	152	: 0;
83		153
84	$DB_ENV = new BerkeleyDB::Env	154	$DB_ENV = new BerkeleyDB::Env
…		…
105	-Property => DB_CHKSUM,	175	-Property => DB_CHKSUM,
106	-Flags => DB_CREATE \| DB_UPGRADE,	176	-Flags => DB_CREATE \| DB_UPGRADE,
107	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"	177	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
108	}	178	}
109		179
110	sub pod_to_pango($) {	180	package CFClient::Layout;
111	my ($pom) = @_;
112		181
113	$pom->present ("CFClient::PodToPango")	182	$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub {
114	}	183	reset_glyph_cache;
115
116	sub pod_to_pango_list($) {
117	my ($pom) = @_;
118
119	[
120	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],
121	split /\n/, $pom->present ("CFClient::PodToPango")
122	]
123	}
124
125	package CFClient::PodToPango;
126
127	use base Pod::POM::View::Text;
128
129	our $indent = 0;
130
131	*view_seq_code =
132	*view_seq_bold = sub { "<b>$_[1]</b>" };
133	*view_seq_italic = sub { "<i>$_[1]</i>" };
134	*view_seq_space =
135	*view_seq_link =
136	*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
137
138	sub view_seq_text {
139	my $text = $_[1];
140	$text =~ s/\s+/ /g;
141	CFClient::UI::Label::escape ($text)
142	}
143
144	sub view_item {
145	("\t" x ($indent / 4))
146	. $_[1]->title->present ($_[0])
147	. "\n"
148	. $_[1]->content->present ($_[0])
149	}
150
151	sub view_verbatim {
152	(join "",
153	map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
154	split /\n/, CFClient::UI::Label::escape ($_[1]))
155	. "\n"
156	}
157
158	sub view_textblock {
159	("\t" x ($indent / 2)) . "$_[1]\n\n"
160	}
161
162	sub view_head1 {
163	"\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
164	. $_[1]->content->present ($_[0])
165	};	184	};
166
167	sub view_head2 {
168	"\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
169	. $_[1]->content->present ($_[0])
170	};
171
172	sub view_head3 {
173	"\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
174	. $_[1]->content->present ($_[0])
175	};
176
177	sub view_over {
178	local $indent = $indent + $_[1]->indent;
179	$_[1]->content->present ($_[0])
180	}
181
182	package CFClient::Database;
183
184	our @ISA = BerkeleyDB::Btree::;
185
186	sub get($$) {
187	my $data;
188
189	$_[0]->db_get ($_[1], $data) == 0
190	? $data
191	: ()
192	}
193
194	my %DB_SYNC;
195
196	sub put($$$) {
197	my ($db, $key, $data) = @_;
198
199	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
200
201	$db->db_put ($key => $data)
202	}
203		185
204	package CFClient::Item;	186	package CFClient::Item;
205		187
206	use strict;	188	use strict;
207	use Crossfire::Protocol::Constants;	189	use Crossfire::Protocol::Constants;
…		…
243	}	225	}
244		226
245	sub do_n_dialog {	227	sub do_n_dialog {
246	my ($cb) = @_;	228	my ($cb) = @_;
247		229
248	my $w = new CFClient::UI::FancyFrame;	230	my $w = new CFClient::UI::FancyFrame
		231	on_delete => sub { $_[0]->destroy; 1 },
		232	has_close_button => 1,
		233	;
		234
249	$w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");	235	$w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
250	$vb->add (new CFClient::UI::Label text => "Enter item count:");	236	$vb->add (new CFClient::UI::Label text => "Enter item count:");
251	$vb->add (my $entry = new CFClient::UI::Entry	237	$vb->add (my $entry = new CFClient::UI::Entry
252	text => $last_enter_count,	238	text => $last_enter_count,
253	on_activate => sub {	239	on_activate => sub {
254	my ($entry) = @_;	240	my ($entry) = @_;
255	$last_enter_count = $entry->get_text;	241	$last_enter_count = $entry->get_text;
256	$cb->($last_enter_count);	242	$cb->($last_enter_count);
257	$w->hide;	243	$w->hide;
258	$w = undef;	244	$w->destroy;
		245
		246	0
259	}	247	},
		248	on_escape => sub { $w->destroy; 1 },
260	);	249	);
261	$entry->focus_in;	250	$entry->grab_focus;
262	$w->show;	251	$w->show;
263
264	}	252	}
265		253
266	sub update_widgets {	254	sub update_widgets {
267	my ($self) = @_;	255	my ($self) = @_;
		256
		257	# necessary to avoid cyclic references
		258	Scalar::Util::weaken $self;
268		259
269	my $button_cb = sub {	260	my $button_cb = sub {
270	my (undef, $ev, $x, $y) = @_;	261	my (undef, $ev, $x, $y) = @_;
271		262
272	my $targ = $::CONN->{player}{tag};	263	my $targ = $::CONN->{player}{tag};
…		…
276	}	267	}
277		268
278	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {	269	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
279	$::CONN->send ("move $targ $self->{tag} 0")	270	$::CONN->send ("move $targ $self->{tag} 0")
280	if $targ \|\| !($self->{flags} & F_LOCKED);	271	if $targ \|\| !($self->{flags} & F_LOCKED);
		272	} elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) {
		273	$self->{flags} & F_LOCKED
		274	? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
		275	: $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
281	} elsif ($ev->{button} == 1) {	276	} elsif ($ev->{button} == 1) {
282	$::CONN->send ("examine $self->{tag}");	277	$::CONN->send ("examine $self->{tag}");
283	} elsif ($ev->{button} == 2) {	278	} elsif ($ev->{button} == 2) {
284	$::CONN->send ("apply $self->{tag}");	279	$::CONN->send ("apply $self->{tag}");
285	} elsif ($ev->{button} == 3) {	280	} elsif ($ev->{button} == 3) {
		281	my $move_prefix = $::CONN->{open_container} ? 'put' : 'drop';
		282	if ($self->{container} == $::CONN->{open_container}) {
		283	$move_prefix = "take";
		284	}
		285
286	my @menu_items = (	286	my @menu_items = (
287	["examine", sub { $::CONN->send ("examine $self->{tag}") }],	287	["examine", sub { $::CONN->send ("examine $self->{tag}") }],
288	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],	288	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
		289	["ignite/thaw", # first try of an easier use of flint&steel
		290	sub {
		291	$::CONN->send ("mark ". pack "N", $self->{tag});
		292	$::CONN->send ("command apply flint and steel");
		293	}
		294	],
289	["apply", sub { $::CONN->send ("apply $self->{tag}") }],	295	["apply", sub { $::CONN->send ("apply $self->{tag}") }],
290	(	296	(
291	$self->{flags} & F_LOCKED	297	$self->{flags} & F_LOCKED
292	? (	298	? (
293	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],	299	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
294	)	300	)
295	: (	301	: (
296	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],	302	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
297	["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],	303	["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }],
298	["move n",	304	["$move_prefix <n>",
299	sub {	305	sub {
300	do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })	306	do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
301	}	307	}
302	]	308	]
303	)	309	)
…		…
312		318
313	my $tooltip_std = "<small>"	319	my $tooltip_std = "<small>"
314	. "Left click - examine item\n"	320	. "Left click - examine item\n"
315	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"	321	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
316	. "Middle click - apply\n"	322	. "Middle click - apply\n"
		323	. "Shift-Middle click - lock/unlock\n"
317	. "Right click - further options"	324	. "Right click - further options"
318	. "</small>\n";	325	. "</small>\n";
		326
		327	my $bg = $self->{flags} & F_CURSED ? [1 , 0 , 0, 0.5]
		328	: $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5]
		329	: undef;
319		330
320	$self->{face_widget} \|\|= new CFClient::UI::Face	331	$self->{face_widget} \|\|= new CFClient::UI::Face
321	can_events => 1,	332	can_events => 1,
322	can_hover => 1,	333	can_hover => 1,
323	anim => $self->{anim},	334	anim => $self->{anim},
324	animspeed => $self->{animspeed}, # TODO# must be set at creation time	335	animspeed => $self->{animspeed}, # TODO# must be set at creation time
325	on_button_down => $button_cb,	336	on_button_down => $button_cb,
326	;	337	;
		338	$self->{face_widget}{bg} = $bg;
327	$self->{face_widget}{face} = $self->{face};	339	$self->{face_widget}{face} = $self->{face};
328	$self->{face_widget}{anim} = $self->{anim};	340	$self->{face_widget}{anim} = $self->{anim};
329	$self->{face_widget}{animspeed} = $self->{animspeed};	341	$self->{face_widget}{animspeed} = $self->{animspeed};
330	$self->{face_widget}->set_tooltip (	342	$self->{face_widget}->set_tooltip (
331	"<b>Face/Animation.</b>\n"	343	"<b>Face/Animation.</b>\n"
…		…
340	ellipsise => 2,	352	ellipsise => 2,
341	align => -1,	353	align => -1,
342	on_button_down => $button_cb,	354	on_button_down => $button_cb,
343	;	355	;
344	my $desc = CFClient::Item::desc_string $self;	356	my $desc = CFClient::Item::desc_string $self;
		357	$self->{desc_widget}{bg} = $bg;
345	$self->{desc_widget}->set_text ($desc);	358	$self->{desc_widget}->set_text ($desc);
346	$self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");	359	$self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
347		360
348	$self->{weight_widget} \|\|= new CFClient::UI::Label	361	$self->{weight_widget} \|\|= new CFClient::UI::Label
349	can_events => 1,	362	can_events => 1,
350	can_hover => 1,	363	can_hover => 1,
351	ellipsise => 0,	364	ellipsise => 0,
352	align => 0,	365	align => 0,
353	on_button_down => $button_cb,	366	on_button_down => $button_cb,
354	;	367	;
		368	$self->{weight_widget}{bg} = $bg;
355	$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);	369	$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
356
357	$self->{weight_widget}->set_tooltip (	370	$self->{weight_widget}->set_tooltip (
358	"<b>Weight</b>.\n"	371	"<b>Weight</b>.\n"
359	. ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")	372	. ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
360	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")	373	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
361	. "\n\n$tooltip_std"	374	. "\n\n$tooltip_std"
362	);	375	);
363	}	376	}
364		377
365	package CFClient::Binder;
366
367	my @ALLOWED_MODIFIER_KEYS = (
368	CFClient::SDLK_LSHIFT,
369	CFClient::SDLK_LCTRL ,
370	CFClient::SDLK_LALT ,
371	CFClient::SDLK_LMETA ,
372
373	CFClient::SDLK_RSHIFT,
374	CFClient::SDLK_RCTRL ,
375	CFClient::SDLK_RALT ,
376	CFClient::SDLK_RMETA ,
377	);
378
379	my %ALLOWED_MODIFIERS = (
380	CFClient::KMOD_LSHIFT => "LSHIFT",
381	CFClient::KMOD_LCTRL => "LCTRL",
382	CFClient::KMOD_LALT => "LALT",
383	CFClient::KMOD_LMETA => "LMETA",
384
385	CFClient::KMOD_RSHIFT => "RSHIFT",
386	CFClient::KMOD_RCTRL => "RCTRL",
387	CFClient::KMOD_RALT => "RALT",
388	CFClient::KMOD_RMETA => "RMETA",
389	);
390
391	my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
392	my @DIRECT_BIND_KEYS = (
393	CFClient::SDLK_F1,
394	CFClient::SDLK_F2,
395	CFClient::SDLK_F3,
396	CFClient::SDLK_F4,
397	CFClient::SDLK_F5,
398	CFClient::SDLK_F6,
399	CFClient::SDLK_F7,
400	CFClient::SDLK_F8,
401	CFClient::SDLK_F9,
402	CFClient::SDLK_F10,
403	CFClient::SDLK_F11,
404	CFClient::SDLK_F12,
405	CFClient::SDLK_F13,
406	CFClient::SDLK_F14,
407	CFClient::SDLK_F15,
408	);
409
410	# this binding dialog asks for a key-combo to be pressed
411	# and if successful it calls the $cb with $mod and $sym as args.
412	sub open_binding_dialog {
413	my ($cb) = @_;
414
415	my $w = new CFClient::UI::FancyFrame
416	title => "Bind Action",
417	x => "center",
418	y => "center";
419
420	$w->add (my $vb = new CFClient::UI::VBox);
421	$vb->add (new CFClient::UI::Label
422	text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
423	."You can only bind 0-9 and F1-F15 without modifiers."
424	);
425	$vb->add (my $entry = new CFClient::UI::Entry
426	text => "",
427	on_key_down => sub {
428	my ($entry, $ev) = @_;
429
430	my $mod = $ev->{mod};
431	my $sym = $ev->{sym};
432
433	# XXX: This seems a little bit hackisch to me, but i have to ignore them
434	if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
435	return;
436	}
437
438	if ($mod == CFClient::KMOD_NONE
439	and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
440	and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
441	{
442	$::STATUSBOX->add (
443	"Can't bind key ".CFClient::SDL_GetKeyName ($sym)
444	." directly without modifier! It would damage the completer handling."
445	);
446	return;
447	}
448
449	$entry->focus_out;
450
451	$cb->($mod, $sym);
452
453	$w->destroy
454	});
455
456	$entry->focus_in;
457	$w->show;
458	}
459
460	sub keycombo_to_name {
461	my ($mod, $sym) = @_;
462
463	my $mods = join '+',
464	map { $ALLOWED_MODIFIERS{$_} }
465	grep { ($_ + 0) & ($mod + 0) }
466	keys %ALLOWED_MODIFIERS;
467	$mods .= "+" if $mods ne '';
468
469	return $mods . CFClient::SDL_GetKeyName ($sym);
470	}
471
472	1;	378	1;
473		379
474	=back	380	=back
475		381
476	=head1 AUTHOR	382	=head1 AUTHOR

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.85 by root, Thu Jun 1 05:04:34 2006 UTC vs. Revision 1.107 by root, Mon Jul 24 08:23:27 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.85 by root, Thu Jun 1 05:04:34 2006 UTC vs.
Revision 1.107 by root, Mon Jul 24 08:23:27 2006 UTC