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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.21 by root, Mon Jun 5 21:10:04 2006 UTC vs.
Revision 1.57 by root, Tue Jul 11 15:30:23 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.21 by root, Mon Jun 5 21:10:04 2006 UTC vs. Revision 1.57 by root, Tue Jul 11 15:30:23 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.21 by root, Mon Jun 5 21:10:04 2006 UTC vs.
Revision 1.57 by root, Tue Jul 11 15:30:23 2006 UTC