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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.18 by root, Mon Jun 5 01:59:59 2006 UTC vs.
Revision 1.53 by root, Mon Jul 3 22:32:52 2006 UTC

…		…
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Crossfire::Protocol::Constants;	6	use Crossfire::Protocol::Constants;
7		7
		8	use CFClient;
8	use CFClient::UI;	9	use CFClient::UI;
9		10
10	use base 'Crossfire::Protocol::Base';	11	use base 'Crossfire::Protocol::Base';
		12
		13	our %open_logs;
11		14
12	sub new {	15	sub new {
13	my $class = shift;	16	my $class = shift;
14		17
15	my $self = $class->SUPER::new (@_);	18	my $self = $class->SUPER::new (@_);
16		19
17	$self->{map_widget}->clr_commands;	20	$self->{map_widget}->clr_commands;
18		21
19	my $parser = new Pod::POM;	22	my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub {
20	my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");	23	my ($pom) = @_;
21		24
		25	my @cmd_help;
		26
22	for my $head2 ($pod->head1->[-2]->head2) {	27	for my $head2 ($pom->head1->[-2]->head2) {
23	$head2->title =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x	28	$head2->title =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x
24	or next;	29	or next;
25		30
26	my $cmd = $1;	31	my $cmd = $1;
27	my @args = split /\\|/, $2;	32	my @args = split /\\|/, $2;
28	@args = (".*") unless @args;	33	@args = (".*") unless @args;
29		34
30	$_ = $_ eq ".*" ? "" : " $_"	35	$_ = $_ eq ".*" ? "" : " $_"
31	for @args;	36	for @args;
32		37
33	my $text = CFClient::pod_to_pango $head2->content;	38	my $text = CFClient::pod_to_pango $head2->content;
34		39
35	$self->{map_widget}->add_command ("$cmd$_", $text)	40	push @cmd_help, ["$cmd$_", $text]
36	for sort { (length $a) <=> (length $b) }	41	for sort { (length $a) <=> (length $b) }
37	@args;	42	@args;
		43	}
		44
		45	\@cmd_help
38	}	46	};
		47
		48	$self->{map_widget}->add_command (@$_)
		49	for @$cmd_help;
39		50
40	$self->{noface} = new_from_file CFClient::Texture	51	$self->{noface} = new_from_file CFClient::Texture
41	CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;	52	CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
42		53
43	$self->{open_container} = 0;	54	$self->{open_container} = 0;
…		…
50	$self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";	61	$self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";
51		62
52	$self	63	$self
53	}	64	}
54		65
		66	sub logprint {
		67	my ($self, @a) = @_;
		68	my $filename = "$Crossfire::VARDIR/log.$self->{host}";
		69
		70	my $fh = $open_logs{$filename};
		71	unless ($fh) {
		72	# FIXME: handle this more gracefully?
		73	open $fh, ">>", $filename
		74	or die "Couldn't open logfile: log.$self->{host}: $!";
		75
		76	$open_logs{$filename} = $fh;
		77	}
		78
		79	my ($sec, $min, $hour, $mday, $mon, $year) = localtime (time);
		80
		81	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
		82	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
		83
		84	print $fh "$ts ", @a, "\n";
		85	$fh->flush;
		86	}
		87
		88	sub _stat_numdiff {
		89	my ($self, $old, $new) = @_;
		90
		91	my $diff = $new - $old;
		92	$diff > 0 ? "+$diff" : $diff
		93	}
		94
		95	sub _stat_skillmaskdiff {
		96	my ($self, $old, $new) = @_;
		97
		98	my $diff = $old ^ $new;
		99
		100	my @diff = map
		101	{
		102	$diff & $_
		103	? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
		104	: ()
		105	}
		106	sort { $a <=> $b } keys %{$self->{spell_paths}};
		107
		108	join "", @diff
		109	}
		110
		111	# all stats that are chacked against changes
		112	my @statchange = (
		113	[&CS_STAT_STR => \&_stat_numdiff, "Str"],
		114	[&CS_STAT_INT => \&_stat_numdiff, "Int"],
		115	[&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
		116	[&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
		117	[&CS_STAT_CON => \&_stat_numdiff, "Con"],
		118	[&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
		119	[&CS_STAT_POW => \&_stat_numdiff, "Pow"],
		120	[&CS_STAT_WC => \&_stat_numdiff, "Wc"],
		121	[&CS_STAT_AC => \&_stat_numdiff, "Ac"],
		122	[&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
		123	[&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
		124	[&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
		125	[&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
		126	[&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
		127	[&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
		128	[&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
		129	[&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
		130	[&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
		131	[&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
		132	[&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
		133	[&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
		134	[&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
		135	[&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
		136	[&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
		137	[&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
		138	[&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
		139	[&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
		140	[&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
		141	[&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
		142	[&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
		143	[&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
		144	[&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
		145	[&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
		146	[&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
		147	[&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
		148	[&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
		149	[&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
		150	);
		151
55	sub stats_update {	152	sub stats_update {
56	my ($self, $stats) = @_;	153	my ($self, $stats) = @_;
57		154
58	if (my $exp = $stats->{+CS_STAT_EXP64}) {	155	if (my $prev = $self->{prev_stats}) {
59	my $diff = $exp - $self->{prev_exp};	156	if (my $diff = $stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) {
60	$self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)	157	$self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
61	if exists $self->{prev_exp} && $diff;	158	}
62	$self->{prev_exp} = $exp;	159
		160	if (
		161	my @diffs = map {
		162	$stats->{$_->[0]} != $prev->{$_->[0]}
		163	? $_->[2] . $_->[1]->($self, $prev->{$_->[0]}, $stats->{$_->[0]}) : ();
		164	}
		165	@statchange
		166	) {
		167	my $msg = "<b>stat change</b>: " . (join " ", @diffs);
		168	$self->{statusbox}->add ($msg, group => $msg, fg => [0.8, 1, 0.2, 1], timeout => 10);
		169	}
63	}	170	}
		171
		172	$self->{prev_stats} = { %$stats };
64		173
65	::update_stats_window ($stats);	174	::update_stats_window ($stats);
66	}	175	}
67		176
68	sub user_send {	177	sub user_send {
…		…
70		179
71	if ($self->{record}) {	180	if ($self->{record}) {
72	push @{$self->{record}}, $command;	181	push @{$self->{record}}, $command;
73	}	182	}
74		183
		184	$self->logprint ("send: ", $command);
75	$self->send_command ($command);	185	$self->send_command ($command);
76	::status $command;	186	::status ($command);
77	}	187	}
78		188
79	sub start_record {	189	sub start_record {
80	my ($self) = @_;	190	my ($self) = @_;
81		191
…		…
96	sub feed_map1a {	206	sub feed_map1a {
97	my ($self, $data) = @_;	207	my ($self, $data) = @_;
98		208
99	$self->{map}->map1a_update ($data);	209	$self->{map}->map1a_update ($data);
100	$self->{map_widget}->update;	210	$self->{map_widget}->update;
		211	}
		212
		213	sub magicmap {
		214	my ($self, $w, $h, $x, $y, $data) = @_;
		215
		216	$self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data);
101	}	217	}
102		218
103	sub flush_map {	219	sub flush_map {
104	my ($self) = @_;	220	my ($self) = @_;
105		221
…		…
118		234
119	$self->flush_map;	235	$self->flush_map;
120	delete $self->{neigh_map};	236	delete $self->{neigh_map};
121		237
122	$self->{map}->clear;	238	$self->{map}->clear;
		239	delete $self->{map_widget}{magicmap};
123	}	240	}
124		241
125		242
126	sub load_map($$$) {	243	sub load_map($$$) {
127	my ($self, $hash, $x, $y) = @_;	244	my ($self, $hash, $x, $y) = @_;
…		…
270	# I love transactions	387	# I love transactions
271	for (1..100) {	388	for (1..100) {
272	my $txn = $CFClient::DB_ENV->txn_begin;	389	my $txn = $CFClient::DB_ENV->txn_begin;
273	my $status = $self->{facemap}->db_get (id => $id);	390	my $status = $self->{facemap}->db_get (id => $id);
274	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {	391	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
275	$id = ($id \|\| 16) + 1;	392	$id = ($id \|\| 64) + 1;
276	if ($self->{facemap}->put (id => $id) == 0	393	if ($self->{facemap}->put (id => $id) == 0
277	&& $self->{facemap}->put ($hash => $id) == 0) {	394	&& $self->{facemap}->put ($hash => $id) == 0) {
278	$txn->txn_commit;	395	$txn->txn_commit;
279		396
280	goto gotid;	397	goto gotid;
…		…
338	my ($self, $flags, $prompt) = @_;	455	my ($self, $flags, $prompt) = @_;
339		456
340	$prompt = $LAST_QUERY unless length $prompt;	457	$prompt = $LAST_QUERY unless length $prompt;
341	$LAST_QUERY = $prompt;	458	$LAST_QUERY = $prompt;
342		459
343	my $dialog = new CFClient::UI::FancyFrame	460	$self->{query}-> ($self, $flags, $prompt);
344	x => "center",
345	y => "center",
346	title => "Query",
347	child => my $vbox = new CFClient::UI::VBox,
348	;
349
350	$vbox->add (new CFClient::UI::Label
351	max_w => $::WIDTH * 0.4,
352	ellipsise => 0,
353	text => $prompt);
354
355	if ($flags & CS_QUERY_YESNO) {
356	$vbox->add (my $hbox = new CFClient::UI::HBox);
357	$hbox->add (new CFClient::UI::Button
358	text => "No",
359	on_activate => sub {
360	$self->send ("reply n");
361	$dialog->destroy;
362	$self->{map_widget}->focus_in;
363	}
364	);
365	$hbox->add (new CFClient::UI::Button
366	text => "Yes",
367	on_activate => sub {
368	$self->send ("reply y");
369	$dialog->destroy;
370	},
371	);
372
373	$dialog->focus_in;
374
375	} elsif ($flags & CS_QUERY_SINGLECHAR) {
376	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
377	$vbox->add (my $entry = new CFClient::UI::Entry
378	on_changed => sub {
379	$self->send ("reply $_[1]");
380	$dialog->destroy;
381	},
382	);
383
384	$entry->focus_in;
385
386	} else {
387	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
388
389	$vbox->add (my $entry = new CFClient::UI::Entry
390	$flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
391	on_activate => sub {
392	$self->send ("reply $_[1]");
393	$dialog->destroy;
394	},
395	);
396
397	$entry->focus_in;
398	}
399
400	$dialog->show;
401	}	461	}
402		462
403	sub drawinfo {	463	sub drawinfo {
404	my ($self, $color, $text) = @_;	464	my ($self, $color, $text) = @_;
405		465
…		…
417	[0.55, 0.41, 0.13],	477	[0.55, 0.41, 0.13],
418	[0.99, 0.77, 0.26],	478	[0.99, 0.77, 0.26],
419	[0.74, 0.65, 0.41],	479	[0.74, 0.65, 0.41],
420	);	480	);
421		481
		482	$self->logprint ("info: ", $text);
		483
422	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	484	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
		485
		486	# try to create single paragraphs of multiple lines sent by the server
		487	$text =~ s/(?<=\S)\n(?=\w)/ /g;
423		488
424	$text = CFClient::UI::Label::escape $text;	489	$text = CFClient::UI::Label::escape $text;
425	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	490	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
426	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	491	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
427		492
428	$self->{logview}->add_paragraph ($color[$color],	493	$self->{logview}->add_paragraph ($color[$color], $_)
429	join "\n", map "$time $_", split /\n/, $text);	494	for map "$time $_", split /\n/, $text;
		495	$self->{logview}->scroll_to_bottom;
430		496
431	$self->{statusbox}->add ($text,	497	$self->{statusbox}->add ($text,
432	group => $text,	498	group => $text,
433	fg => $color[$color],	499	fg => $color[$color],
434	timeout => $color >= 2 ? 60 : 10,	500	timeout => $color >= 2 ? 60 : 10,
…		…
443	}	509	}
444		510
445	sub spell_add {	511	sub spell_add {
446	my ($self, $spell) = @_;	512	my ($self, $spell) = @_;
447		513
448	# TODO	514	# try to create single paragraphs of multiple lines sent by the server
449	# create a widget dynamically, using spell face (CF::Protocol downloads them)	515	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
		516	$spell->{message} =~ s/\n+$//;
		517	$spell->{message} \|\|= "Server did not provide a description for this spell.";
		518
450	$::SETUP_SPELLS->add_spell ($spell);	519	$::SPELL_PAGE->add_spell ($spell);
451		520
452	$self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});	521	$self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
453	$self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});	522	$self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
454	}	523	}
455		524
456	sub spell_delete {	525	sub spell_delete {
457	my ($self, $spell) = @_;	526	my ($self, $spell) = @_;
		527
458	$::SETUP_SPELLS->remove_spell ($spell);	528	$::SPELL_PAGE->remove_spell ($spell);
459	}	529	}
460		530
461	sub addme_success {	531	sub addme_success {
462	my ($self) = @_;	532	my ($self) = @_;
463		533
464	my $parser = new Pod::POM;	534	my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
465	my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");	535	my ($pom) = @_;
466		536
467	my %skill_tooltip;	537	my %skill_help;
468		538
469	for my $head2 ($pod->head1->[-2]->head2) {	539	for my $head2 ($pom->head1->[3]->head2) {
470	$skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;	540	$skill_help{$head2->title} = CFClient::pod_to_pango $head2->content;
		541	}
		542
		543	\%skill_help
471	}	544	};
472		545
473	for my $skill (values %{$self->{skill_info}}) {	546	for my $skill (values %{$self->{skill_info}}) {
474	$self->{map_widget}->add_command ("ready_skill $skill",	547	$self->{map_widget}->add_command ("ready_skill $skill",
475	(CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")	548	(CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
476	. $skill_tooltip{$skill});	549	. $skill_help->{$skill});
477	$self->{map_widget}->add_command ("use_skill $skill",	550	$self->{map_widget}->add_command ("use_skill $skill",
478	(CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")	551	(CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
479	. $skill_tooltip{$skill});	552	. $skill_help->{$skill});
480	}	553	}
481	}	554	}
482		555
483	sub eof {	556	sub eof {
484	my ($self) = @_;	557	my ($self) = @_;
…		…
509	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();	582	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
510		583
511	$self->send ("requestinfo image_sums $face $face");	584	$self->send ("requestinfo image_sums $face $face");
512		585
513	$self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",	586	$self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
514	group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);	587	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
515	} elsif (!exists $self->{num_faces}) {	588	} elsif (!exists $self->{num_faces}) {
516	$self->send ("requestinfo image_info");	589	$self->send ("requestinfo image_info");
517		590
518	$self->{num_faces} = 0;	591	$self->{num_faces} = 0;
519		592
520	$self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",	593	$self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
521	group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);	594	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
522	}	595	}
523	}	596	}
524		597
525	sub update_floorbox {	598	sub update_floorbox {
526	$CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {	599	$CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {
527	return unless $::CONN;	600	return unless $::CONN;
528		601
529	$::FLOORBOX->clear;	602	$::FLOORBOX->clear;
530		603
531	my $row;	604	my $row;
532	for (@{ $::CONN->{container}{0} }) {	605	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {
533	if ($row < 7) {	606	if ($row < 6) {
534	local $_->{face_widget}; # hack to force recreation of widget	607	local $_->{face_widget}; # hack to force recreation of widget
535	local $_->{desc_widget}; # hack to force recreation of widget	608	local $_->{desc_widget}; # hack to force recreation of widget
536	CFClient::Item::update_widgets $_;	609	CFClient::Item::update_widgets $_;
537		610
538	$::FLOORBOX->add (0, $row, $_->{face_widget});	611	$::FLOORBOX->add (0, $row, $_->{face_widget});
539	$::FLOORBOX->add (1, $row, $_->{desc_widget});	612	$::FLOORBOX->add (1, $row, $_->{desc_widget});
540		613
541	$row++;	614	$row++;
542	} else {	615	} else {
543	$::FLOORBOX->add (1, $row, new CFClient::UI::Label text => "More...");	616	$::FLOORBOX->add (1, $row, new CFClient::UI::Button
		617	text => "More...",
		618	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
		619	);
544	last;	620	last;
545	}	621	}
546	}	622	}
547	});	623	});
548		624
…		…
562	tooltip => "Close the currently open container (if one is open)",	638	tooltip => "Close the currently open container (if one is open)",
563	on_activate => sub {	639	on_activate => sub {
564	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	640	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
565	if $tag != 0;	641	if $tag != 0;
566	#if $CONN->{open_container} != 0;	642	#if $CONN->{open_container} != 0;
		643	0
567	},	644	},
568	);	645	);
569	}	646	}
570		647
571	$::INVR->set_items ($conn->{container}{$tag});	648	$::INVR->set_items ($conn->{container}{$tag});
572	}	649	}
573		650
574	sub update_container {	651	sub update_containers {
575	my ($tag) = @_;	652	my ($self) = @_;
576		653
577	$::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}})	654	$CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
		655	for my $tag (keys %{ delete $self->{update_container} }) {
		656	if ($tag == 0) {
		657	update_floorbox;
		658	$::INVR->set_items ($self->{container}{0})
578	if $tag == $::CONN->{open_container};	659	if $tag == $self->{open_container};
		660	} elsif ($tag == $self->{player}{tag}) {
		661	$::INV->set_items ($self->{container}{$tag})
		662	} else {
		663	$::INVR->set_items ($self->{container}{$tag})
		664	if $tag == $self->{open_container};
		665	}
		666	}
		667	});
579	}	668	}
580		669
581	sub container_add {	670	sub container_add {
582	my ($self, $tag, $items) = @_;	671	my ($self, $tag, $items) = @_;
583		672
584	#d# print "container_add: container $tag ($self->{player}{tag})\n";	673	$self->{update_container}{$tag}++;
585		674	$self->update_containers;
586	if ($tag == 0) {
587	update_floorbox;
588	update_container (0);
589	} elsif ($tag == $self->{player}{tag}) {
590	$::INV->set_items ($self->{container}{$self->{player}{tag}})
591	} else {
592	update_container ($tag);
593	}
594
595	# $self-<{player}{tag} => player inv
596	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
597	}	675	}
598		676
599	sub container_clear {	677	sub container_clear {
600	my ($self, $tag) = @_;	678	my ($self, $tag) = @_;
601		679
602	#d# print "container_clear: container $tag ($self->{player}{tag})\n";	680	$self->{update_container}{$tag}++;
603		681	$self->update_containers;
604	if ($tag == 0) {
605	update_floorbox;
606	update_container (0);
607	} elsif ($tag == $self->{player}{tag}) {
608	$::INV->set_items ($self->{container}{$tag})
609	} else {
610	update_container ($tag);
611	}
612
613	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
614	}	682	}
615		683
616	sub item_delete {	684	sub item_delete {
617	my ($self, @items) = @_;	685	my ($self, @items) = @_;
618		686
		687	$self->{update_container}{$_->{container}}++
619	for (@items) {	688	for @items;
620	#d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
621
622	if ($_->{container} == 0) {
623	update_floorbox;
624	update_container ($_->{tag});
625	} elsif ($_->{container} == $self->{player}{tag}) {
626	$::INV->set_items ($self->{container}{$self->{player}{tag}})
627	} else {
628	update_container ($_->{container});
629	}
630	}	689
		690	$self->update_containers;
631	}	691	}
632		692
633	sub item_update {	693	sub item_update {
634	my ($self, $item) = @_;	694	my ($self, $item) = @_;
635		695
636	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";	696	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
637		697
638	if ($item->{tag} == $self->{player}{tag}) {
639	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
640	return;
641	}
642
643	CFClient::Item::update_widgets $item;	698	CFClient::Item::update_widgets $item;
644		699
645	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	700	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
646	set_opencont ($::CONN, 0, "Floor");	701	set_opencont ($::CONN, 0, "Floor");
647		702
648	} elsif ($item->{flags} & F_OPEN) {	703	} elsif ($item->{flags} & F_OPEN) {
649	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);	704	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
		705
650	} else {	706	} else {
		707	$self->{update_container}{$item->{container}}++;
		708	$self->update_containers;
651	if ($item->{container} == 0) {	709	# if ($item->{container} == 0) {
652	update_floorbox;	710	# update_floorbox;
653	update_container (0);	711	# update_container (0);
654	} elsif ($item->{container} == $self->{player}{tag}) {	712	# } elsif ($item->{container} == $self->{player}{tag}) {
655	$::INV->set_items ($self->{container}{$item->{container}})	713	# $::INV->set_items ($self->{container}{$item->{container}})
656	}	714	# }
657	}	715	}
658	}	716	}
659		717
660	sub player_update {	718	sub player_update {
661	my ($self, $player) = @_;	719	my ($self, $player) = @_;
662	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);	720	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
		721	}
663		722
664	# do it here because it is ignored earlier, and there is no "login" event	723	sub update_server_info {
		724	my ($self) = @_;
		725
		726	my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
		727
		728	$::SERVER_INFO->set_markup (
		729	"server <tt>$self->{host}:$self->{port}</tt>\n"
		730	. "protocol version <tt>$self->{version}</tt>\n"
		731	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
		732	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		733	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
		734	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
		735	. "map size $self->{mapw}×$self->{maph}\n"
		736	);
		737	}
		738
		739	sub logged_in {
		740	my ($self) = @_;
		741
		742	$self->send_ext_req (cfplus_support => "1", sub {
		743	$self->{cfplus_ext} = $_[0];
		744	$self->update_server_info;
		745	});
		746
		747	$self->update_server_info;
		748
665	$self->send_command ("output-sync $::CFG->{output_sync}");	749	$self->send_command ("output-sync $::CFG->{output_sync}");
666	$self->send_command ("output-count $::CFG->{output_count}");	750	$self->send_command ("output-count $::CFG->{output_count}");
		751	$self->send_command ("pickup $::CFG->{pickup}");
		752	}
		753
		754	sub lookat {
		755	my ($self, $x, $y) = @_;
		756
		757	if ($self->{cfplus_ext}) {
		758	$self->send_ext_req (lookat => "$x $y", sub {
		759	my %res = split /\x00/, $_[0];
		760
		761	if (exists $res{npc_dialog}) {
		762	# start npc chat dialog
		763	$self->{npc_dialog} = new CFClient::NPCDialog::
		764	dx => $x,
		765	dy => $y,
		766	title => "$res{npc_dialog} (NPC)",
		767	conn => $self,
		768	;
		769	}
		770	});
		771	}
		772
		773	$self->send ("lookat $x $y");
		774	}
		775
		776	sub destroy {
		777	my ($self) = @_;
		778
		779	$self->{npc_dialog}->destroy
		780	if $self->{npc_dialog};
		781
		782	$self->SUPER::destroy;
		783	}
		784
		785	package CFClient::NPCDialog;
		786
		787	our @ISA = 'CFClient::UI::FancyFrame';
		788
		789	sub new {
		790	my $class = shift;
		791
		792	my $self = $class->SUPER::new (
		793	x => 'center',
		794	y => 'center',
		795	name => "npc_dialog",
		796	force_w => $::WIDTH * 0.7,
		797	force_h => $::HEIGHT * 0.7,
		798	title => "NPC Dialog",
		799	kw => { hi => 0, yes => 0, no => 0 },
		800	@_,
		801	);
		802
		803	Scalar::Util::weaken (my $this = $self);
		804
		805	# better use a pane...
		806	$self->add (my $hbox = new CFClient::UI::HBox);
		807	$hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);
		808
		809	$hbox->add (my $vbox = new CFClient::UI::VBox);
		810
		811	$vbox->add (new CFClient::UI::Label text => "Message Entry:");
		812	$vbox->add ($self->{entry} = new CFClient::UI::Entry
		813	tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"
		814	. "Sometimes you have to tell an NPC something you cannot find out during "
		815	. "a normal conversation (such as a password). In those cases you have to use "
		816	. "this text entry. You can also enter responses manually instead of using the response "
		817	. "buttons below.",
		818	on_activate => sub {
		819	my ($entry, $text) = @_;
		820
		821	return unless $text =~ /\S/;
		822
		823	$entry->set_text ("");
		824	$this->send ($text);
		825
		826	0
		827	},
		828	);
		829
		830	$vbox->add ($self->{options} = new CFClient::UI::VBox);
		831
		832	$self->{bye_button} = new CFClient::UI::Button
		833	text => "Bye (close)",
		834	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
		835	on_activate => sub { $this->destroy; 0 },
		836	;
		837
		838	$self->update_options;
		839
		840	$self->{token} = $self->{conn}->ext_token;
		841	$self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
		842	$self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
		843
		844	$self->{entry}->grab_focus;
		845
		846	$self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
		847
		848	$self->show;
		849	$self
		850	};
		851
		852	sub update_options {
		853	my ($self) = @_;
		854
		855	Scalar::Util::weaken $self;
		856
		857	$self->{options}->clear;
		858	$self->{options}->add ($self->{bye_button});
		859
		860	for my $kw (sort keys %{ $self->{kw} }) {
		861	$self->{options}->add (new CFClient::UI::Button
		862	text => $kw,
		863	on_activate => sub {
		864	$self->send ($kw);
		865	0
		866	},
		867	);
		868	}
		869	}
		870
		871	sub feed {
		872	my ($self, $data) = @_;
		873
		874	Scalar::Util::weaken $self;
		875
		876	my ($type, $msg) = split / /, $data, 2;
		877
		878	if ($type eq "msg") {
		879	my ($msg, @kw) = split /\x00/, $msg;
		880	$self->{kw}{$_} = 1 for @kw;
		881
		882	$msg = "\n" . CFClient::UI::Label::escape $msg;
		883	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		884	my @link;
		885	$msg =~ s{
		886	($match)
		887	}{
		888	my $kw = $1;
		889
		890	push @link, new CFClient::UI::Label
		891	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		892	can_hover => 1,
		893	can_events => 1,
		894	padding_x => 0,
		895	padding_y => 0,
		896	on_button_up => sub {
		897	$self->send ($kw);
		898	};
		899
		900	chr 0xfffc
		901	}giex;
		902
		903	$self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
		904	$self->{textview}->scroll_to_bottom;
		905	$self->update_options;
		906	} else {
		907	$self->destroy;
		908	}
		909
		910	1
		911	}
		912
		913	sub send {
		914	my ($self, $msg) = @_;
		915
		916	$self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
		917	$self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
		918	$self->{textview}->scroll_to_bottom;
		919	}
		920
		921	sub destroy {
		922	my ($self) = @_;
		923
		924	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
		925
		926	delete $self->{conn}{npc_dialog};
		927	$self->{conn}->disconnect_ext ($self->{token});
		928
		929	$self->SUPER::destroy;
667	}	930	}
668		931
669	1;	932	1;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.18 by root, Mon Jun 5 01:59:59 2006 UTC vs. Revision 1.53 by root, Mon Jul 3 22:32:52 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.18 by root, Mon Jun 5 01:59:59 2006 UTC vs.
Revision 1.53 by root, Mon Jul 3 22:32:52 2006 UTC