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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.76 by root, Mon May 29 21:20:15 2006 UTC vs.
Revision 1.105 by root, Sun Jul 23 16:11:12 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	sub asxml($) {
		65	local $_ = $_[0];
		66
		67	s/&/&/g;
		68	s/>/>/g;
		69	s/</</g;
		70
		71	$_
		72	}
		73
		74	package CFClient::Database;
		75
		76	our @ISA = BerkeleyDB::Btree::;
		77
		78	sub get($$) {
		79	my $data;
		80
		81	$_[0]->db_get ($_[1], $data) == 0
		82	? $data
		83	: ()
		84	}
		85
		86	my %DB_SYNC;
		87
		88	sub put($$$) {
		89	my ($db, $key, $data) = @_;
		90
		91	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
		92
		93	$db->db_put ($key => $data)
		94	}
		95
		96	package CFClient;
29		97
30	sub find_rcfile($) {	98	sub find_rcfile($) {
31	my $path;	99	my $path;
32		100
33	for (grep !ref, @INC) {	101	for (grep !ref, @INC) {
…		…
68	}	136	}
69		137
70	close CFG;	138	close CFG;
71	}	139	}
72		140
73	mkdir "$Crossfire::VARDIR/cfplus", 0777;	141	our $DB_ENV;
74		142
75	{	143	{
76	use strict;	144	use strict;
77		145
		146	mkdir "$Crossfire::VARDIR/cfplus", 0777;
		147	my $recover = $BerkeleyDB::db_version >= 4.4
		148	? eval "DB_REGISTER \| DB_RECOVER"
		149	: 0;
		150
78	our $DB_ENV = new BerkeleyDB::Env	151	$DB_ENV = new BerkeleyDB::Env
79	-Home => "$Crossfire::VARDIR/cfplus",	152	-Home => "$Crossfire::VARDIR/cfplus",
80	-Cachesize => 1_000_000,	153	-Cachesize => 1_000_000,
81	-ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",	154	-ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
82	# -ErrPrefix => "DATABASE",	155	# -ErrPrefix => "DATABASE",
83	-Verbose => 1,	156	-Verbose => 1,
84	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN,	157	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN \| $recover,
85	-SetFlags => DB_AUTO_COMMIT \| DB_LOG_AUTOREMOVE \| DB_TXN_WRITE_NOSYNC,	158	-SetFlags => DB_AUTO_COMMIT \| DB_LOG_AUTOREMOVE,
86	or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";	159	or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
87	}	160	}
88		161
89	sub db_table($) {	162	sub db_table($) {
90	my ($table) = @_;	163	my ($table) = @_;
…		…
99	-Property => DB_CHKSUM,	172	-Property => DB_CHKSUM,
100	-Flags => DB_CREATE \| DB_UPGRADE,	173	-Flags => DB_CREATE \| DB_UPGRADE,
101	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"	174	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
102	}	175	}
103		176
104	sub pod_to_pango($) {	177	package CFClient::Layout;
105	my ($pom) = @_;
106		178
107	$pom->present ("CFClient::PodToPango")	179	$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub {
108	}	180	reset_glyph_cache;
109
110	sub pod_to_pango_list($) {
111	my ($pom) = @_;
112
113	[
114	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],
115	split /\n/, $pom->present ("CFClient::PodToPango")
116	]
117	}
118
119	package CFClient::PodToPango;
120
121	use base Pod::POM::View::Text;
122
123	our $indent = 0;
124
125	*view_seq_code =
126	*view_seq_bold = sub { "<b>$_[1]</b>" };
127	*view_seq_italic = sub { "<i>$_[1]</i>" };
128	*view_seq_space =
129	*view_seq_link =
130	*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
131
132	sub view_seq_text {
133	my $text = $_[1];
134	$text =~ s/\s+/ /g;
135	CFClient::UI::Label::escape ($text)
136	}
137
138	sub view_item {
139	("\t" x ($indent / 4))
140	. $_[1]->title->present ($_[0])
141	. "\n"
142	. $_[1]->content->present ($_[0])
143	}
144
145	sub view_verbatim {
146	(join "",
147	map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
148	split /\n/, CFClient::UI::Label::escape ($_[1]))
149	. "\n"
150	}
151
152	sub view_textblock {
153	("\t" x ($indent / 2)) . "$_[1]\n\n"
154	}
155
156	sub view_head1 {
157	"\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
158	. $_[1]->content->present ($_[0])
159	};	181	};
160
161	sub view_head2 {
162	"\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
163	. $_[1]->content->present ($_[0])
164	};
165
166	sub view_head3 {
167	"\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
168	. $_[1]->content->present ($_[0])
169	};
170
171	sub view_over {
172	local $indent = $indent + $_[1]->indent;
173	$_[1]->content->present ($_[0])
174	}
175
176	package CFClient::Database;
177
178	our @ISA = BerkeleyDB::Btree::;
179
180	sub get($$) {
181	my $data;
182
183	$_[0]->db_get ($_[1], $data) == 0
184	? $data
185	: ()
186	}
187
188	my %DB_SYNC;
189
190	sub put($$$) {
191	my ($db, $key, $data) = @_;
192
193	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
194
195	$db->db_put ($key => $data)
196	}
197		182
198	package CFClient::Item;	183	package CFClient::Item;
199		184
200	use strict;	185	use strict;
201	use Crossfire::Protocol::Constants;	186	use Crossfire::Protocol::Constants;
		187
		188	my $last_enter_count = 1;
202		189
203	sub desc_string {	190	sub desc_string {
204	my ($self) = @_;	191	my ($self) = @_;
205		192
206	my $desc =	193	my $desc =
…		…
232	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};	219	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};
233		220
234	$weight < 0 ? "?" : $weight * 0.001	221	$weight < 0 ? "?" : $weight * 0.001
235	}	222	}
236		223
		224	sub do_n_dialog {
		225	my ($cb) = @_;
		226
		227	my $w = new CFClient::UI::FancyFrame
		228	on_delete => sub { $_[0]->destroy; 1 },
		229	has_close_button => 1,
		230	;
		231
		232	$w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
		233	$vb->add (new CFClient::UI::Label text => "Enter item count:");
		234	$vb->add (my $entry = new CFClient::UI::Entry
		235	text => $last_enter_count,
		236	on_activate => sub {
		237	my ($entry) = @_;
		238	$last_enter_count = $entry->get_text;
		239	$cb->($last_enter_count);
		240	$w->hide;
		241	$w->destroy;
		242
		243	0
		244	},
		245	on_escape => sub { $w->destroy; 1 },
		246	);
		247	$entry->grab_focus;
		248	$w->show;
		249	}
		250
237	sub update_widgets {	251	sub update_widgets {
238	my ($self) = @_;	252	my ($self) = @_;
239		253
		254	# necessary to avoid cyclic references
		255	Scalar::Util::weaken $self;
		256
240	my $button_cb = sub {	257	my $button_cb = sub {
241	my (undef, $ev, $x, $y) = @_;	258	my (undef, $ev, $x, $y) = @_;
242		259
		260	my $targ = $::CONN->{player}{tag};
		261
		262	if ($self->{container} == $::CONN->{player}{tag}) {
		263	$targ = $::CONN->{open_container};
		264	}
		265
243	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {	266	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
244	my $targ = $::CONN->{player}{tag};
245
246	if ($self->{container} == $::CONN->{player}{tag}) {
247	$targ = $::CONN->{open_container};
248	}
249
250	$::CONN->send ("move $targ $self->{tag} 0");	267	$::CONN->send ("move $targ $self->{tag} 0")
		268	if $targ \|\| !($self->{flags} & F_LOCKED);
		269	} elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) {
		270	$self->{flags} & F_LOCKED
		271	? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
		272	: $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
251	} elsif ($ev->{button} == 1) {	273	} elsif ($ev->{button} == 1) {
252	$::CONN->send ("examine $self->{tag}");	274	$::CONN->send ("examine $self->{tag}");
253	} elsif ($ev->{button} == 2) {	275	} elsif ($ev->{button} == 2) {
254	$::CONN->send ("apply $self->{tag}");	276	$::CONN->send ("apply $self->{tag}");
255	} elsif ($ev->{button} == 3) {	277	} elsif ($ev->{button} == 3) {
		278	my $move_prefix = $::CONN->{open_container} ? 'put' : 'drop';
		279	if ($self->{container} == $::CONN->{open_container}) {
		280	$move_prefix = "take";
		281	}
		282
256	my @menu_items = (	283	my @menu_items = (
257	["examine", sub { $::CONN->send ("examine $self->{tag}") }],	284	["examine", sub { $::CONN->send ("examine $self->{tag}") }],
258	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],	285	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
		286	["ignite/thaw", # first try of an easier use of flint&steel
		287	sub {
		288	$::CONN->send ("mark ". pack "N", $self->{tag});
		289	$::CONN->send ("command apply flint and steel");
		290	}
		291	],
259	["apply", sub { $::CONN->send ("apply $self->{tag}") }],	292	["apply", sub { $::CONN->send ("apply $self->{tag}") }],
260	(	293	(
261	$self->{flags} & F_LOCKED	294	$self->{flags} & F_LOCKED
262	? (	295	? (
263	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],	296	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
264	)	297	)
265	: (	298	: (
266	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],	299	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
267	["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],	300	["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }],
		301	["$move_prefix <n>",
		302	sub {
		303	do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
		304	}
		305	]
268	)	306	)
269	),	307	),
270	);	308	);
271		309
272	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	310	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
…		…
277		315
278	my $tooltip_std = "<small>"	316	my $tooltip_std = "<small>"
279	. "Left click - examine item\n"	317	. "Left click - examine item\n"
280	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"	318	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
281	. "Middle click - apply\n"	319	. "Middle click - apply\n"
		320	. "Shift-Middle click - lock/unlock\n"
282	. "Right click - further options"	321	. "Right click - further options"
283	. "</small>\n";	322	. "</small>\n";
284		323
285	$self->{face_widget} \|\|= new CFClient::UI::Face	324	$self->{face_widget} \|\|= new CFClient::UI::Face
286	can_events => 1,	325	can_events => 1,
…		…
325	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")	364	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
326	. "\n\n$tooltip_std"	365	. "\n\n$tooltip_std"
327	);	366	);
328	}	367	}
329		368
330	package CFClient::Recorder;
331
332	our $RECORD_WINDOW;
333
334	my $CMDBOX;
335	my $CURRENT_CMDS;
336	my $REC_BTN;
337
338	my @ALLOWED_MODIFIER_KEYS = (
339	(CFClient::SDLK_LSHIFT) => "LSHIFT",
340	(CFClient::SDLK_LCTRL ) => "LCTRL",
341	(CFClient::SDLK_LALT ) => "LALT",
342	(CFClient::SDLK_LMETA ) => "LMETA",
343
344	(CFClient::SDLK_RSHIFT) => "RSHIFT",
345	(CFClient::SDLK_RCTRL ) => "RCTRL",
346	(CFClient::SDLK_RALT ) => "RALT",
347	(CFClient::SDLK_RMETA ) => "RMETA",
348	);
349
350	my %ALLOWED_MODIFIERS = (
351	(CFClient::KMOD_LSHIFT) => "LSHIFT",
352	(CFClient::KMOD_LCTRL ) => "LCTRL",
353	(CFClient::KMOD_LALT ) => "LALT",
354	(CFClient::KMOD_LMETA ) => "LMETA",
355
356	(CFClient::KMOD_RSHIFT) => "RSHIFT",
357	(CFClient::KMOD_RCTRL ) => "RCTRL",
358	(CFClient::KMOD_RALT ) => "RALT",
359	(CFClient::KMOD_RMETA ) => "RMETA",
360	);
361
362	my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
363	my @DIRECT_BIND_KEYS = (
364	CFClient::SDLK_F1,
365	CFClient::SDLK_F2,
366	CFClient::SDLK_F3,
367	CFClient::SDLK_F4,
368	CFClient::SDLK_F5,
369	CFClient::SDLK_F6,
370	CFClient::SDLK_F7,
371	CFClient::SDLK_F8,
372	CFClient::SDLK_F9,
373	CFClient::SDLK_F10,
374	CFClient::SDLK_F11,
375	CFClient::SDLK_F12,
376	CFClient::SDLK_F13,
377	CFClient::SDLK_F14,
378	CFClient::SDLK_F15,
379	);
380
381	# this binding dialog asks for a key-combo to be pressed
382	# and if successful it binds the modifier+symbol to the
383	# supplied actions in $cmd.
384	# (Bindings are stored in $::CFG->{bindings}->{$mod}->{$sym})
385	sub open_binding_dialog {
386	my ($cmd) = @_;
387
388	my $w = new CFClient::UI::FancyFrame
389	title => "Bind Action";
390
391	$w->add (my $vb = new CFClient::UI::VBox);
392	$vb->add (new CFClient::UI::Label
393	text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
394	."You can only bind 0-9 and F1-F15 without modifiers."
395	);
396	$vb->add (my $entry = new CFClient::UI::Entry
397	text => "",
398	on_key_down => sub {
399	my ($entry, $ev) = @_;
400
401	my $mod = $ev->{mod};
402	my $sym = $ev->{sym};
403
404	# XXX: This seems a little bit hackisch to me, but i have to ignore them
405	if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
406	return;
407	}
408
409	if ($mod == CFClient::KMOD_NONE
410	and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
411	and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
412	{
413	$::STATUSBOX->add (
414	"Can't bind key ".CFClient::SDL_GetKeyName ($sym)
415	." directly without modifier! It would damage the completer handling."
416	);
417	return;
418	}
419
420	$entry->focus_out;
421
422	$::CFG->{bindings}->{$mod}->{$sym} = $cmd;
423	$::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget 'Save Config'!");
424
425	$w->destroy
426	});
427
428	$entry->focus_in;
429	$w->center;
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 { $_ & $mod }
439	keys %ALLOWED_MODIFIERS;
440	$mods .= "+" if $mods ne '';
441
442	return $mods . CFClient::SDL_GetKeyName ($sym);
443	}
444
445	sub clear_command_list {
446	$CMDBOX->clear () if $CMDBOX;
447	}
448
449	sub set_command_list {
450	my ($list) = @_;
451
452	return unless $CMDBOX;
453
454	$CMDBOX->clear ();
455	$CURRENT_CMDS = $list;
456
457	my $idx = 0;
458
459	for (@$list) {
460	$CMDBOX->add (my $hb = new CFClient::UI::HBox);
461
462	my $i = $idx;
463	$hb->add (new CFClient::UI::Button
464	text => "delete",
465	tooltip => "Deletes the action from the record",
466	on_activate => sub {
467	$CMDBOX->remove ($hb);
468	$list->[$i] = undef;
469	});
470
471	$hb->add (new CFClient::UI::Label text => $_);
472
473	$idx++
474	}
475	}
476
477	# if $show is 1 the recorder will be shown
478	sub start {
479	my ($show) = @_;
480
481	$RECORD_WINDOW->show if $show;
482
483	$REC_BTN->set_text ("stop recording");
484	$REC_BTN->{recording} = 1;
485	clear_command_list;
486	$::CONN->start_record;
487	}
488
489	# if $autobind is 1 the recorder will be automatically
490	# jump into the binding query and hide the recorder window
491	sub stop {
492	my ($autobind) = @_;
493
494	$REC_BTN->set_text ("start recording");
495	$REC_BTN->{recording} = 0;
496
497	my $rec = $::CONN->stop_record;
498	return unless ref $rec eq 'ARRAY';
499	set_command_list ($rec);
500
501	if ($autobind) {
502	open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
503	$RECORD_WINDOW->hide;
504	}
505	}
506
507	sub make_window {
508	$RECORD_WINDOW = new CFClient::UI::FancyFrame
509	req_y => 1,
510	req_x => -1,
511	title => "Action Recorder";
512
513	$RECORD_WINDOW->add (my $vb = new CFClient::UI::VBox);
514	$vb->add ($REC_BTN = new CFClient::UI::Button
515	text => "start recording",
516	tooltip => "Start/Stops recording of actions."
517	."(CTRL+Insert Starts the recorder, Insert Stops recorder and binds automatically)"
518	."All subsequent actions after the recording started will be captured."
519	."The actions are displayed after the record was stopped."
520	."To bind the action you have to click on the 'Bind' button",
521	on_activate => sub {
522	my ($btn) = @_;
523
524	unless ($btn->{recording}) {
525	start;
526	} else {
527	stop;
528	}
529	});
530	$vb->add ($CMDBOX = new CFClient::UI::VBox);
531	$vb->add (new CFClient::UI::Button
532	text => "bind",
533	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
534	on_activate => sub {
535	open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
536	});
537
538	$RECORD_WINDOW
539	}
540
541	1;	369	1;
542		370
543	=back	371	=back
544		372
545	=head1 AUTHOR	373	=head1 AUTHOR

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.76 by root, Mon May 29 21:20:15 2006 UTC vs. Revision 1.105 by root, Sun Jul 23 16:11:12 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.76 by root, Mon May 29 21:20:15 2006 UTC vs.
Revision 1.105 by root, Sun Jul 23 16:11:12 2006 UTC