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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.32 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.95 by root, Wed Apr 4 02:43:30 2007 UTC

…		…
1	package CFClient::Protocol;	1	package CFPlus::Protocol;
2		2
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 CFPlus;
9	use CFClient::UI;	9	use CFPlus::UI;
		10	use CFPlus::Pod;
		11	use CFPlus::Macro;
		12	use CFPlus::Item;
		13
		14	use Crossfire::Protocol::Base 0.95;
10		15
11	use base 'Crossfire::Protocol::Base';	16	use base 'Crossfire::Protocol::Base';
12		17
13	sub new {	18	sub new {
14	my $class = shift;	19	my $class = shift;
15		20
16	my $self = $class->SUPER::new (@_);	21	my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
17		22
18	$self->{map_widget}->clr_commands;	23	$self->{map_widget}->clr_commands;
19		24
20	my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub {	25	my @cmd_help = map {
21	my ($pom) = @_;
22
23	my @cmd_help;
24
25	for my $head2 ($pom->head1->[-2]->head2) {
26	$head2->title =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x	26	$_->{kw}[0] =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x
27	or next;	27	or die "unparseable command help: $_->{kw}[0]";
28		28
29	my $cmd = $1;	29	my $cmd = $1;
30	my @args = split /\\|/, $2;	30	my @args = split /\\|/, $2;
31	@args = (".*") unless @args;	31	@args = (".*") unless @args;
32		32
		33	my (undef, @par) = CFPlus::Pod::section_of $_;
		34	my $text = CFPlus::Pod::as_label @par;
		35
33	$_ = $_ eq ".*" ? "" : " $_"	36	$_ = $_ eq ".*" ? "" : " $_"
34	for @args;	37	for @args;
35		38
36	my $text = CFClient::pod_to_pango $head2->content;	39	map ["$cmd$_", $text],
37
38	push @cmd_help, ["$cmd$_", $text]
39	for sort { (length $a) <=> (length $b) }	40	sort { (length $a) <=> (length $b) }
40	@args;	41	@args
		42	} sort { $a->{par} <=> $b->{par} }
		43	CFPlus::Pod::find command => "*";
		44
		45	$self->connect_ext (event_capabilities => sub {
		46	my ($cap) = @_;
		47
		48	if (my $ts = $cap->{tileset}) {
		49	if (my ($default) = grep $_->[2] & 1, @$ts) {
		50	$self->{tileset} = $default;
		51	$self->{tilesize} = $default->[3];
		52	$self->setup_req (tileset => $default->[0]);
		53
		54	my $w = int $self->{mapw} * 32 / $self->{tilesize};
		55	my $h = int $self->{maph} * 32 / $self->{tilesize};
		56
		57	$self->setup_req (mapsize => "${w}x${h}");
		58	}
41	}	59	}
		60	});
42		61
		62	$self->{map_widget}->add_command (@$_)
43	\@cmd_help	63	for @cmd_help;
		64
		65	$self->{noface} = new_from_file CFPlus::Texture
		66	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
		67
		68	{
		69	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture
		70	CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
		71	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		72	}
		73
		74	$self->{open_container} = 0;
		75
		76	# "global"
		77	$self->{tilecache} = CFPlus::db_table "tilecache"
		78	or die "tilecache: unable to open database table";
		79	$self->{facemap} = CFPlus::db_table "facemap"
		80	or die "facemap: unable to open database table";
		81
		82	# per server
		83	$self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
		84	or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
		85
		86	$self
		87	}
		88
		89	sub logprint {
		90	my ($self, @a) = @_;
		91
		92	$self->{log_fh} \|\|= do {
		93	my $path = "$Crossfire::VARDIR/log.$self->{host}";
		94
		95	open my $fh, ">>:utf8", $path
		96	or die "Couldn't open logfile $path: $!";
		97
		98	$fh->autoflush (1);
		99
		100	$fh;
44	};	101	};
45		102
46	$self->{map_widget}->add_command (@$_)	103	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
47	for @$cmd_help;
48		104
49	$self->{noface} = new_from_file CFClient::Texture	105	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
50	CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;	106	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
51		107
52	$self->{open_container} = 0;	108	print {$self->{log_fh}} "$ts ", @a, "\n";
53
54	# "global"
55	$self->{tilecache} = CFClient::db_table "tilecache";
56	$self->{facemap} = CFClient::db_table "facemap";
57
58	# per server
59	$self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";
60
61	$self
62	}	109	}
		110
		111	sub _stat_numdiff {
		112	my ($self, $name, $old, $new) = @_;
		113
		114	my $diff = $new - $old;
		115
		116	$diff = 0.01 * int $diff * 100;
		117
		118	0.1 >= abs $diff ? ()
		119	: $diff < 0 ? "$name$diff" : "$name+$diff"
		120	}
		121
		122	sub _stat_skillmaskdiff {
		123	my ($self, $name, $old, $new) = @_;
		124
		125	my $diff = $old ^ $new
		126	or return;
		127
		128	my @diff = map
		129	{
		130	$diff & $_
		131	? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
		132	: ()
		133	}
		134	sort { $a <=> $b } keys %{$self->{spell_paths}};
		135
		136	join "", @diff
		137	}
		138
		139	# all stats that are chacked against changes
		140	my @statchange = (
		141	[&CS_STAT_STR => \&_stat_numdiff, "Str"],
		142	[&CS_STAT_INT => \&_stat_numdiff, "Int"],
		143	[&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
		144	[&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
		145	[&CS_STAT_CON => \&_stat_numdiff, "Con"],
		146	[&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
		147	[&CS_STAT_POW => \&_stat_numdiff, "Pow"],
		148	[&CS_STAT_WC => \&_stat_numdiff, "Wc"],
		149	[&CS_STAT_AC => \&_stat_numdiff, "Ac"],
		150	[&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
		151	[&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
		152	[&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
		153	[&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
		154	[&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
		155	[&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
		156	[&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
		157	[&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
		158	[&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
		159	[&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
		160	[&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
		161	[&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
		162	[&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
		163	[&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
		164	[&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
		165	[&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
		166	[&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
		167	[&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
		168	[&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
		169	[&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
		170	[&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
		171	[&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
		172	[&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
		173	[&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
		174	[&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
		175	[&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
		176	[&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
		177	[&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
		178	);
63		179
64	sub stats_update {	180	sub stats_update {
65	my ($self, $stats) = @_;	181	my ($self, $stats) = @_;
66		182
67	if (my $exp = $stats->{+CS_STAT_EXP64}) {	183	my $prev = $self->{prev_stats} \|\| { };
68	my $diff = $exp - $self->{prev_exp};	184
		185	if (my @diffs =
		186	(
		187	($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
		188	map {
		189	$stats->{$_} && $prev->{$_}
		190	&& $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
		191	} sort { $a <=> $b } keys %{$self->{skill_info}}
		192	)
		193	) {
		194	my $msg = join " ", @diffs;
69	$self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)	195	$self->{statusbox}->add ($msg, group => "experience $msg", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
70	if exists $self->{prev_exp} && $diff;
71	$self->{prev_exp} = $exp;
72	}	196	}
73		197
		198	if (
		199	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
		200	) {
		201	my $msg = "<b>stat change</b>: " . (join " ", @diffs);
		202	$self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
		203	}
		204
74	::update_stats_window ($stats);	205	$self->update_stats_window ($stats, $prev);
		206
		207	$self->{prev_stats} = { %$stats };
		208	}
		209
		210	my %RES_TBL = (
		211	phys => CS_STAT_RES_PHYS,
		212	magic => CS_STAT_RES_MAG,
		213	fire => CS_STAT_RES_FIRE,
		214	elec => CS_STAT_RES_ELEC,
		215	cold => CS_STAT_RES_COLD,
		216	conf => CS_STAT_RES_CONF,
		217	acid => CS_STAT_RES_ACID,
		218	drain => CS_STAT_RES_DRAIN,
		219	ghit => CS_STAT_RES_GHOSTHIT,
		220	pois => CS_STAT_RES_POISON,
		221	slow => CS_STAT_RES_SLOW,
		222	para => CS_STAT_RES_PARA,
		223	tund => CS_STAT_TURN_UNDEAD,
		224	fear => CS_STAT_RES_FEAR,
		225	depl => CS_STAT_RES_DEPLETE,
		226	deat => CS_STAT_RES_DEATH,
		227	holyw => CS_STAT_RES_HOLYWORD,
		228	blind => CS_STAT_RES_BLIND,
		229	);
		230
		231	sub update_stats_window {
		232	my ($self, $stats, $prev) = @_;
		233
		234	# I love text protocols...
		235
		236	my $hp = $stats->{+CS_STAT_HP} * 1;
		237	my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
		238	my $sp = $stats->{+CS_STAT_SP} * 1;
		239	my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
		240	my $fo = $stats->{+CS_STAT_FOOD} * 1;
		241	my $fo_m = 999;
		242	my $gr = $stats->{+CS_STAT_GRACE} * 1;
		243	my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
		244
		245	$::GAUGES->{hp} ->set_value ($hp, $hp_m);
		246	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
		247	$::GAUGES->{food} ->set_value ($fo, $fo_m);
		248	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
		249	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
		250	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
		251	my $rng = $stats->{+CS_STAT_RANGE};
		252	$rng =~ s/^Range: //; # thank you so much dear server
		253	$::GAUGES->{range} ->set_text ("Rng: " . $rng);
		254	my $title = $stats->{+CS_STAT_TITLE};
		255	$title =~ s/^Player: //;
		256	$::STATWIDS->{title} ->set_text ("Title: " . $title);
		257
		258	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
		259	$::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
		260	$::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
		261	$::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
		262	$::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
		263	$::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
		264	$::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
		265	$::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
		266	$::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
		267	$::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
		268	$::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
		269	$::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
		270	$::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
		271
		272	$self->update_weight;
		273
		274	$::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
		275	for keys %RES_TBL;
		276
		277	my $sktbl = $::STATWIDS->{skill_tbl};
		278	my @skills = keys %{ $self->{skill_info} };
		279
		280	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
		281	$sktbl->clear;
		282
		283	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
		284	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
		285	$sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
		286	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
		287	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
		288	$sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
		289
		290	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
		291
		292	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
		293	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
		294
		295	my ($x, $y) = (0, 1);
		296	for (
		297	sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
		298	map [$_, $self->{skill_info}{$_}],
		299	grep exists $stats->{$_},
		300	@skills
		301	) {
		302	my ($idx, $name) = @$_;
		303
		304	my $spell_cb = sub {
		305	my ($widget, $ev) = @_;
		306
		307	if ($ev->{button} == 1) {
		308	$::CONN->user_send ("ready_skill $name");
		309	} elsif ($ev->{button} == 2) {
		310	$::CONN->user_send ("use_skill $name");
		311	} elsif ($ev->{button} == 3) {
		312	my $shortname = CFPlus::shorten $name, 14;
		313	(new CFPlus::UI::Menu
		314	items => [
		315	["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
		316	["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
		317	],
		318	)->popup ($ev);
		319	} else {
		320	return 0;
		321	}
		322
		323	1
		324	};
		325
		326	$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
		327	text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
		328	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
		329	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
		330	$sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
		331	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
		332
		333	$x++ and ($x, $y) = (0, $y + 1);
		334	}
		335	}
		336
		337	for (grep exists $stats->{$_}, @skills) {
		338	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
		339	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
		340	}
		341	}
		342
		343	sub macro_send {
		344	my ($self, $macro) = @_;
		345
		346	for my $cmd (@{ $macro->{action} }) {
		347	$self->send_command ($cmd);
		348	}
75	}	349	}
76		350
77	sub user_send {	351	sub user_send {
78	my ($self, $command) = @_;	352	my ($self, $command) = @_;
79		353
		354	$self->{record}->($command)
80	if ($self->{record}) {	355	if $self->{record};
81	push @{$self->{record}}, $command;
82	}
83		356
		357	$self->logprint ("send: ", $command);
84	$self->send_command ($command);	358	$self->send_command ($command);
85	::status $command;	359	::status ($command);
86	}	360	}
87		361
88	sub start_record {	362	sub record {
89	my ($self) = @_;	363	my ($self, $cb) = @_;
90		364
91	$self->{record} = [];	365	$self->{record} = $cb;
92	}
93
94	sub stop_record {
95	my ($self) = @_;
96	return delete $self->{record};
97	}	366	}
98		367
99	sub map_scroll {	368	sub map_scroll {
100	my ($self, $dx, $dy) = @_;	369	my ($self, $dx, $dy) = @_;
101		370
103	}	372	}
104		373
105	sub feed_map1a {	374	sub feed_map1a {
106	my ($self, $data) = @_;	375	my ($self, $data) = @_;
107		376
108	$self->{map}->map1a_update ($data);	377	$self->{map}->map1a_update ($data, $self->{setup}{extmap});
109	$self->{map_widget}->update;	378	$self->{map_widget}->update;
		379	}
		380
		381	sub magicmap {
		382	my ($self, $w, $h, $x, $y, $data) = @_;
		383
		384	$self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data);
110	}	385	}
111		386
112	sub flush_map {	387	sub flush_map {
113	my ($self) = @_;	388	my ($self) = @_;
114		389
…		…
127		402
128	$self->flush_map;	403	$self->flush_map;
129	delete $self->{neigh_map};	404	delete $self->{neigh_map};
130		405
131	$self->{map}->clear;	406	$self->{map}->clear;
		407	delete $self->{map_widget}{magicmap};
132	}	408	}
133		409
134		410
135	sub load_map($$$) {	411	sub load_map($$$) {
136	my ($self, $hash, $x, $y) = @_;	412	my ($self, $hash, $x, $y) = @_;
…		…
276		552
277	unless ($id) {	553	unless ($id) {
278	# create new id for face	554	# create new id for face
279	# I love transactions	555	# I love transactions
280	for (1..100) {	556	for (1..100) {
281	my $txn = $CFClient::DB_ENV->txn_begin;	557	my $txn = $CFPlus::DB_ENV->txn_begin;
282	my $status = $self->{facemap}->db_get (id => $id);	558	my $status = $self->{facemap}->db_get (id => $id);
283	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {	559	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
284	$id = ($id \|\| 16) + 1;	560	$id = ($id \|\| 64) + 1;
285	if ($self->{facemap}->put (id => $id) == 0	561	if ($self->{facemap}->put (id => $id) == 0
286	&& $self->{facemap}->put ($hash => $id) == 0) {	562	&& $self->{facemap}->put ($hash => $id) == 0) {
287	$txn->txn_commit;	563	$txn->txn_commit;
288		564
289	goto gotid;	565	goto gotid;
290	}	566	}
291	}	567	}
292	$txn->txn_abort;	568	$txn->txn_abort;
293	}	569	}
294		570
295	CFClient::fatal "maximum number of transaction retries reached - database problems?";	571	CFPlus::fatal "maximum number of transaction retries reached - database problems?";
296	}	572	}
297		573
298	gotid:	574	gotid:
299	$face->{id} = $id;	575	$face->{id} = $id;
300	$self->{map}->set_face ($facenum => $id);	576	$self->{map}->set_face ($facenum => $id);
…		…
311	undef	587	undef
312	};	588	};
313	}	589	}
314		590
315	sub face_update {	591	sub face_update {
316	my ($self, $facenum, $face) = @_;	592	my ($self, $facenum, $face, $changed) = @_;
317		593
318	$self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes	594	$self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;
319		595
320	$self->set_texture ($face->{id} => delete $face->{image});	596	$self->set_texture ($face->{id} => delete $face->{image});
321	}	597	}
322		598
323	sub set_texture {	599	sub set_texture {
324	my ($self, $id, $data) = @_;	600	my ($self, $id, $data) = @_;
325		601
326	$self->{texture}[$id] \|\|= do {	602	$self->{texture}[$id] \|\|= do {
327	my $tex =	603	my $tex =
328	new_from_image CFClient::Texture	604	new_from_image CFPlus::Texture
329	$data, minify => 1, mipmap => 1;	605	$data, minify => 1, mipmap => 1;
330		606
331	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	607	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
332	$self->{map_widget}->update;	608	$self->{map_widget}->update;
333		609
…		…
364	[0.11, 0.56, 1.00],	640	[0.11, 0.56, 1.00],
365	[0.93, 0.46, 0.00],	641	[0.93, 0.46, 0.00],
366	[0.18, 0.54, 0.34],	642	[0.18, 0.54, 0.34],
367	[0.56, 0.73, 0.56],	643	[0.56, 0.73, 0.56],
368	[0.80, 0.80, 0.80],	644	[0.80, 0.80, 0.80],
369	[0.55, 0.41, 0.13],	645	[0.75, 0.61, 0.20],
370	[0.99, 0.77, 0.26],	646	[0.99, 0.77, 0.26],
371	[0.74, 0.65, 0.41],	647	[0.74, 0.65, 0.41],
372	);	648	);
373		649
374	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	650	my $fg = $color[$color % @color];
		651
		652	$self->logprint ("info: ", $text);
375		653
376	# try to create single paragraphs of multiple lines sent by the server	654	# try to create single paragraphs of multiple lines sent by the server
377	$text =~ s/(?<=\S)\n(?=\w)/ /g;	655	$text =~ s/(?<=\S)\n(?=\w)/ /g;
378		656
379	$text = CFClient::UI::Label::escape $text;	657	$text = CFPlus::asxml $text;
380	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	658	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
381	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	659	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
382		660
383	$self->{logview}->add_paragraph ($color[$color],	661	::message ({ fg => $fg, markup => $_ })
384	join "\n", map "$time $_", split /\n/, $text);	662	for split /\n/, $text;
385		663
386	$self->{statusbox}->add ($text,	664	$self->{statusbox}->add ($text,
387	group => $text,	665	group => $text,
388	fg => $color[$color],	666	fg => $fg,
389	timeout => $color >= 2 ? 60 : 10,	667	timeout => $color >= 2 ? 180 : 10,
390	tooltip_font => $::FONT_FIXED,	668	tooltip_font => $::FONT_FIXED,
391	);	669	);
392	}	670	}
393		671
394	sub drawextinfo {	672	sub drawextinfo {
…		…
398	}	676	}
399		677
400	sub spell_add {	678	sub spell_add {
401	my ($self, $spell) = @_;	679	my ($self, $spell) = @_;
402		680
403	# try to create single paragraphs of multiple lines sent by the server	681	# try to create single paragraphs out of the multiple lines sent by the server
404	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;	682	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
405	$spell->{message} =~ s/\n+$//;	683	$spell->{message} =~ s/\n+$//;
406	$spell->{message} \|\|= "Server did not provide a description for this spell.";	684	$spell->{message} \|\|= "Server did not provide a description for this spell.";
407		685
408	$::SETUP_SPELLS->add_spell ($spell);	686	$::SPELL_LIST->add_spell ($spell);
409		687
410	$self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});	688	$self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
411	$self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});	689	$self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
412	}	690	}
413		691
414	sub spell_delete {	692	sub spell_delete {
415	my ($self, $spell) = @_;	693	my ($self, $spell) = @_;
		694
416	$::SETUP_SPELLS->remove_spell ($spell);	695	$::SPELL_LIST->remove_spell ($spell);
		696	}
		697
		698	sub setup {
		699	my ($self, $setup) = @_;
		700
		701	$self->{map_widget}->set_tilesize ($self->{tilesize});
		702	$::MAP->resize ($self->{mapw}, $self->{maph});
417	}	703	}
418		704
419	sub addme_success {	705	sub addme_success {
420	my ($self) = @_;	706	my ($self) = @_;
421		707
422	my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
423	my ($pom) = @_;
424
425	my %skill_help;	708	my %skill_help;
426		709
427	for my $head2 ($pom->head1->[3]->head2) {	710	for my $node (CFPlus::Pod::find skill_description => "*") {
428	$skill_help{$head2->title} = CFClient::pod_to_pango $head2->content;	711	my (undef, @par) = CFPlus::Pod::section_of $node;
429	}	712	$skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
430
431	\%skill_help
432	};	713	};
433		714
434	for my $skill (values %{$self->{skill_info}}) {	715	for my $skill (values %{$self->{skill_info}}) {
435	$self->{map_widget}->add_command ("ready_skill $skill",	716	$self->{map_widget}->add_command ("ready_skill $skill",
436	(CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")	717	(CFPlus::asxml "Ready the skill '$skill'\n\n")
437	. $skill_help->{$skill});	718	. $skill_help{$skill});
438	$self->{map_widget}->add_command ("use_skill $skill",	719	$self->{map_widget}->add_command ("use_skill $skill",
439	(CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")	720	(CFPlus::asxml "Immediately use the skill '$skill'\n\n")
440	. $skill_help->{$skill});	721	. $skill_help{$skill});
441	}	722	}
442	}	723	}
443		724
444	sub eof {	725	sub eof {
445	my ($self) = @_;	726	my ($self) = @_;
…		…
469		750
470	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();	751	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
471		752
472	$self->send ("requestinfo image_sums $face $face");	753	$self->send ("requestinfo image_sums $face $face");
473		754
474	$self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",	755	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
475	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);	756	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
476	} elsif (!exists $self->{num_faces}) {	757	} elsif (!exists $self->{num_faces}) {
477	$self->send ("requestinfo image_info");	758	$self->send ("requestinfo image_info");
478		759
479	$self->{num_faces} = 0;	760	$self->{num_faces} = 0;
480		761
481	$self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",	762	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
482	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);	763	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
483	}	764	}
484	}	765	}
485		766
486	sub update_floorbox {	767	sub update_floorbox {
487	$CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {	768	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
488	return unless $::CONN;	769	return unless $::CONN;
489		770
490	$::FLOORBOX->clear;	771	$::FLOORBOX->clear;
491		772
492	my $row;	773	my $row;
493	for (@{ $::CONN->{container}{0} }) {	774	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
494	if ($row < 6) {	775	if ($row < 6) {
495	local $_->{face_widget}; # hack to force recreation of widget	776	local $_->{face_widget}; # hack to force recreation of widget
496	local $_->{desc_widget}; # hack to force recreation of widget	777	local $_->{desc_widget}; # hack to force recreation of widget
497	CFClient::Item::update_widgets $_;	778	CFPlus::Item::update_widgets $_;
498		779
499	$::FLOORBOX->add (0, $row, $_->{face_widget});	780	$::FLOORBOX->add (0, $row, $_->{face_widget});
500	$::FLOORBOX->add (1, $row, $_->{desc_widget});	781	$::FLOORBOX->add (1, $row, $_->{desc_widget});
501		782
502	$row++;	783	$row++;
503	} else {	784	} else {
504	$::FLOORBOX->add (1, $row, new CFClient::UI::Button	785	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button
505	text => "More...",	786	text => "More...",
506	on_activate => sub { $::INV_WINDOW->toggle_visibility },	787	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
507	);	788	);
508	last;	789	last;
509	}	790	}
510	}	791	}
		792	if ($::CONN->{open_container}) {
		793	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
		794	text => "Close container",
		795	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
		796	);
		797	}
511	});	798	});
512		799
513	$::WANT_REFRESH++;	800	$::WANT_REFRESH++;
514	}	801	}
515		802
516	sub set_opencont {	803	sub set_opencont {
517	my ($conn, $tag, $name) = @_;	804	my ($conn, $tag, $name) = @_;
518	$conn->{open_container} = $tag;	805	$conn->{open_container} = $tag;
		806	update_floorbox;
519		807
520	$::INV_RIGHT_HB->clear ();	808	$::INV_RIGHT_HB->clear ();
521	$::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name);	809	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
522		810
523	if ($tag != 0) { # Floor isn't closable, is it?	811	if ($tag != 0) { # Floor isn't closable, is it?
524	$::INV_RIGHT_HB->add (new CFClient::UI::Button	812	$::INV_RIGHT_HB->add (new CFPlus::UI::Button
525	text => "Close container",	813	text => "Close container",
526	tooltip => "Close the currently open container (if one is open)",	814	tooltip => "Close the currently open container (if one is open)",
527	on_activate => sub {	815	on_activate => sub {
528	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	816	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
529	if $tag != 0;	817	if $tag != 0;
530	#if $CONN->{open_container} != 0;	818	#if $CONN->{open_container} != 0;
		819	0
531	},	820	},
532	);	821	);
533	}	822	}
534		823
535	$::INVR->set_items ($conn->{container}{$tag});	824	$::INVR->set_items ($conn->{container}{$tag});
536	}	825	}
537		826
538	sub update_container {	827	sub update_containers {
539	my ($tag) = @_;	828	my ($self) = @_;
540		829
541	$::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}})	830	$CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
		831	my $todo = delete $self->{update_container}
		832	or return;
		833
		834	for my $tag (keys %$todo) {
		835	update_floorbox if $tag == 0 or $tag == $self->{open_container};
		836	if ($tag == 0) {
		837	$::INVR->set_items ($self->{container}{0})
542	if $tag == $::CONN->{open_container};	838	if $tag == $self->{open_container};
		839	} elsif ($tag == $self->{player}{tag}) {
		840	$::INV->set_items ($self->{container}{$tag})
		841	} else {
		842	$::INVR->set_items ($self->{container}{$tag})
		843	if $tag == $self->{open_container};
		844	}
		845	}
		846	});
543	}	847	}
544		848
545	sub container_add {	849	sub container_add {
546	my ($self, $tag, $items) = @_;	850	my ($self, $tag, $items) = @_;
547		851
548	#d# print "container_add: container $tag ($self->{player}{tag})\n";	852	$self->{update_container}{$tag}++;
549		853	$self->update_containers;
550	if ($tag == 0) {
551	update_floorbox;
552	update_container (0);
553	} elsif ($tag == $self->{player}{tag}) {
554	$::INV->set_items ($self->{container}{$self->{player}{tag}})
555	} else {
556	update_container ($tag);
557	}
558
559	# $self-<{player}{tag} => player inv
560	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
561	}	854	}
562		855
563	sub container_clear {	856	sub container_clear {
564	my ($self, $tag) = @_;	857	my ($self, $tag) = @_;
565		858
566	#d# print "container_clear: container $tag ($self->{player}{tag})\n";	859	$self->{update_container}{$tag}++;
567		860	$self->update_containers;
568	if ($tag == 0) {
569	update_floorbox;
570	update_container (0);
571	} elsif ($tag == $self->{player}{tag}) {
572	$::INV->set_items ($self->{container}{$tag})
573	} else {
574	update_container ($tag);
575	}
576
577	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
578	}	861	}
579		862
580	sub item_delete {	863	sub item_delete {
581	my ($self, @items) = @_;	864	my ($self, @items) = @_;
582		865
		866	$self->{update_container}{$_->{container}}++
583	for (@items) {	867	for @items;
584	#d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
585
586	if ($_->{container} == 0) {
587	update_floorbox;
588	update_container ($_->{tag});
589	} elsif ($_->{container} == $self->{player}{tag}) {
590	$::INV->set_items ($self->{container}{$self->{player}{tag}})
591	} else {
592	update_container ($_->{container});
593	}
594	}	868
		869	$self->update_containers;
595	}	870	}
596		871
597	sub item_update {	872	sub item_update {
598	my ($self, $item) = @_;	873	my ($self, $item) = @_;
599		874
600	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";	875	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
601		876
602	if ($item->{tag} == $self->{player}{tag}) {
603	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
604	return;
605	}
606
607	CFClient::Item::update_widgets $item;	877	CFPlus::Item::update_widgets $item;
608		878
609	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	879	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
610	set_opencont ($::CONN, 0, "Floor");	880	set_opencont ($::CONN, 0, "Floor");
611		881
612	} elsif ($item->{flags} & F_OPEN) {	882	} elsif ($item->{flags} & F_OPEN) {
613	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);	883	set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
		884
614	} else {	885	} else {
615	if ($item->{container} == 0) {	886	$self->{update_container}{$item->{container}}++;
616	update_floorbox;
617	update_container (0);	887	$self->update_containers;
618	} elsif ($item->{container} == $self->{player}{tag}) {
619	$::INV->set_items ($self->{container}{$item->{container}})
620	}
621	}	888	}
622	}	889	}
623		890
624	sub player_update {	891	sub player_update {
625	my ($self, $player) = @_;	892	my ($self, $player) = @_;
626		893
		894	$self->update_weight;
		895	}
		896
		897	sub update_weight {
		898	my ($self) = @_;
		899
		900	my $weight = .001 * $self->{player}{weight};
		901	my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
		902
627	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);	903	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
		904	$::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
		905	$::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
628	}	906	}
629		907
630	sub update_server_info {	908	sub update_server_info {
631	my ($self) = @_;	909	my ($self) = @_;
632		910
…		…
635	$::SERVER_INFO->set_markup (	913	$::SERVER_INFO->set_markup (
636	"server <tt>$self->{host}:$self->{port}</tt>\n"	914	"server <tt>$self->{host}:$self->{port}</tt>\n"
637	. "protocol version <tt>$self->{version}</tt>\n"	915	. "protocol version <tt>$self->{version}</tt>\n"
638	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"	916	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
639	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"	917	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		918	. "editing support $yesno[!!$self->{editor_support}]\n"
		919	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
640	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	920	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
641	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	921	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
642	. "map size $self->{mapw}×$self->{maph}\n"	922	. "map size $self->{mapw}×$self->{maph}\n"
643	);	923	);
		924
		925	::setup_build_button ($self->{editor_support}->{builder_ui});
644	}	926	}
645		927
646	sub logged_in {	928	sub logged_in {
647	my ($self) = @_;	929	my ($self) = @_;
648		930
649	$self->send_ext_req (cfplus_support => "1", sub {	931	$self->send_ext_req (cfplus_support => version => 1, sub {
650	$self->{cfplus_ext} = $_[0];	932	$self->{cfplus_ext} = $_[0]{version};
651	$self->update_server_info;	933	$self->update_server_info;
		934
		935	if ($self->{cfplus_ext} >= 2) {
		936	$self->send_ext_req ("editor_support", sub {
		937	$self->{editor_support} = $_[0];
		938	$self->update_server_info;
		939
		940	0
		941	});
		942	}
		943
		944	0
652	});	945	});
653		946
654	$self->update_server_info;	947	$self->update_server_info;
655		948
656	$self->send_command ("output-sync $::CFG->{output_sync}");	949	$self->send_command ("output-sync $::CFG->{output_sync}");
657	$self->send_command ("output-count $::CFG->{output_count}");	950	$self->send_command ("output-count $::CFG->{output_count}");
		951	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
658	$self->send_command ("pickup $::CFG->{pickup}");	952	$self->send_command ("pickup $::CFG->{pickup}");
		953	}
		954
		955	sub buildat {
		956	my ($self, $builditem, $x, $y) = @_;
		957
		958	if ($self->{cfplus_ext}) {
		959	$self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
		960	}
659	}	961	}
660		962
661	sub lookat {	963	sub lookat {
662	my ($self, $x, $y) = @_;	964	my ($self, $x, $y) = @_;
663		965
664	if ($self->{cfplus_ext}) {	966	if ($self->{cfplus_ext}) {
665	$self->send_ext_req (lookat => "$x $y", sub {	967	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {
666	my %res = split /\x00/, $_[0];	968	my ($msg) = @_;
667		969
668	if (exists $res{npc_dialog}) {	970	if (exists $msg->{npc_dialog}) {
669	# start npc chat dialog	971	# start npc chat dialog
670	$self->{npc_dialog} = new CFClient::NPCDialog::	972	$self->{npc_dialog} = new CFPlus::NPCDialog::
671	dx => $x,	973	dx => $x,
672	dy => $y,	974	dy => $y,
673	title => "$res{npc_dialog} (NPC)",	975	title => "$msg->{npc_dialog} (NPC)",
674	conn => $self,	976	conn => $self,
675	;	977	;
676	}	978	}
677	});	979	});
678	}	980	}
…		…
681	}	983	}
682		984
683	sub destroy {	985	sub destroy {
684	my ($self) = @_;	986	my ($self) = @_;
685		987
686	$self->{npc_dialog}->destroy	988	(delete $self->{npc_dialog})->destroy
687	if $self->{npc_dialog};	989	if $self->{npc_dialog};
688		990
689	$self->SUPER::destroy;	991	$self->SUPER::destroy;
690	}	992	}
691		993
692	package CFClient::NPCDialog;	994	package CFPlus::NPCDialog;
693		995
694	our @ISA = 'CFClient::UI::FancyFrame';	996	our @ISA = 'CFPlus::UI::Toplevel';
695		997
696	sub new {	998	sub new {
697	my $class = shift;	999	my $class = shift;
698		1000
699	my $self = $class->SUPER::new (	1001	my $self = $class->SUPER::new (
…		…
702	name => "npc_dialog",	1004	name => "npc_dialog",
703	force_w => $::WIDTH * 0.7,	1005	force_w => $::WIDTH * 0.7,
704	force_h => $::HEIGHT * 0.7,	1006	force_h => $::HEIGHT * 0.7,
705	title => "NPC Dialog",	1007	title => "NPC Dialog",
706	kw => { hi => 0, yes => 0, no => 0 },	1008	kw => { hi => 0, yes => 0, no => 0 },
		1009	has_close_button => 1,
707	@_,	1010	@_,
708	);	1011	);
709		1012
710	Scalar::Util::weaken (my $this = $self);	1013	CFPlus::weaken (my $this = $self);
		1014
		1015	$self->connect (delete => sub { $this->destroy; 1 });
711		1016
712	# better use a pane...	1017	# better use a pane...
713	$self->add (my $hbox = new CFClient::UI::HBox);	1018	$self->add (my $hbox = new CFPlus::UI::HBox);
714	$hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);	1019	$hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
715		1020
716	$hbox->add (my $vbox = new CFClient::UI::VBox);	1021	$hbox->add (my $vbox = new CFPlus::UI::VBox);
717		1022
718	$vbox->add (new CFClient::UI::Label text => "Message Entry:");	1023	$vbox->add (new CFPlus::UI::Label text => "Message Entry:");
719	$vbox->add ($self->{entry} = new CFClient::UI::Entry	1024	$vbox->add ($self->{entry} = new CFPlus::UI::Entry
720	tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"	1025	tooltip => "#npc_message_entry",
721	. "Sometimes you have to tell an NPC something you cannot find out during "
722	. "a normal conversation (such as a password). In those cases you have to use "
723	. "this text entry. You can also enter responses manually instead of using the response "
724	. "buttons below.",
725	on_activate => sub {	1026	on_activate => sub {
726	my ($entry, $text) = @_;	1027	my ($entry, $text) = @_;
727		1028
728	return unless $text =~ /\S/;	1029	return unless $text =~ /\S/;
729		1030
730	$entry->set_text ("");	1031	$entry->set_text ("");
731	$this->send ($text);	1032	$this->send ($text);
		1033
		1034	0
732	},	1035	},
733	);	1036	);
734		1037
735	$vbox->add ($self->{options} = new CFClient::UI::VBox);	1038	$vbox->add ($self->{options} = new CFPlus::UI::VBox);
736		1039
737	$self->{close_button} = new CFClient::UI::Button	1040	$self->{bye_button} = new CFPlus::UI::Button
738	text => "Bye (close)",	1041	text => "Bye (close)",
739	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",	1042	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
740	on_activate => sub { $this->destroy },	1043	on_activate => sub { $this->destroy; 1 },
741	;	1044	;
742		1045
743	$self->update_options;	1046	$self->update_options;
744		1047
745	$self->{token} = $self->{conn}->ext_token;	1048	$self->{id} = $self->{conn}->send_ext_req (
746	$self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });	1049	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
747	$self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");	1050	sub { $this && $this->feed (@_) }
		1051	);
748		1052
749	$self->{entry}->focus_in;	1053	$self->{entry}->grab_focus;
750		1054
751	$self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");	1055	$self->{textview}->add_paragraph ({
		1056	fg => [1, 1, 0, 1],
		1057	markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
		1058	});
752		1059
753	$self->show;	1060	$self->show;
754	$self	1061	$self
755	};	1062	};
756		1063
757	sub update_options {	1064	sub update_options {
758	my ($self) = @_;	1065	my ($self) = @_;
759		1066
760	Scalar::Util::weaken $self;	1067	CFPlus::weaken $self;
761		1068
762	$self->{options}->clear;	1069	$self->{options}->clear;
763	$self->{options}->add ($self->{close_button});	1070	$self->{options}->add ($self->{bye_button});
764		1071
765	for my $kw (sort keys %{ $self->{kw} }) {	1072	for my $kw (sort keys %{ $self->{kw} }) {
766	$self->{options}->add (new CFClient::UI::Button	1073	$self->{options}->add (new CFPlus::UI::Button
767	text => $kw,	1074	text => $kw,
768	on_activate => sub {	1075	on_activate => sub {
769	$self->send ($kw);	1076	$self->send ($kw);
		1077	0
770	},	1078	},
771	);	1079	);
772	}	1080	}
773	}	1081	}
774		1082
775	sub feed {	1083	sub feed {
776	my ($self, $data) = @_;	1084	my ($self, $msg) = @_;
777		1085
778	my ($type, $msg) = split / /, $data, 2;	1086	CFPlus::weaken $self;
779		1087
780	if ($type eq "msg") {	1088	if ($msg->{msgtype} eq "reply") {
781	my ($msg, @kw) = split /\x00/, $msg;	1089	$self->{kw}{$_} = 1 for @{$msg->{add_topics} \|\| []};
782	$self->{kw}{$_} = 1 for @kw;	1090	$self->{kw}{$_} = 0 for @{$msg->{del_topics} \|\| []};
783		1091
784	warn "<<<<@kw>>>>\n";#d#	1092	my $text = "\n" . CFPlus::asxml $msg->{msg};
785
786	$msg = CFClient::UI::Label::escape $msg;
787	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };	1093	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
788	$msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh.	1094	my @link;
		1095	$text =~ s{
		1096	($match)
		1097	}{
		1098	my $kw = $1;
		1099
		1100	push @link, new CFPlus::UI::Label
		1101	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1102	can_hover => 1,
		1103	can_events => 1,
		1104	padding_x => 0,
		1105	padding_y => 0,
		1106	on_button_up => sub {
		1107	$self->send ($kw);
		1108	};
		1109
		1110	"\x{fffc}"
		1111	}giex;
789		1112
790	$self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg");	1113	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
		1114	$self->{textview}->scroll_to_bottom;
791	$self->update_options;	1115	$self->update_options;
792	} else {	1116	} else {
793	$self->destroy;	1117	$self->destroy;
794	}	1118	}
795		1119
…		…
797	}	1121	}
798		1122
799	sub send {	1123	sub send {
800	my ($self, $msg) = @_;	1124	my ($self, $msg) = @_;
801		1125
802	$self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");	1126	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
803	$self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);	1127	$self->{textview}->scroll_to_bottom;
		1128
		1129	$self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
804	}	1130	}
805		1131
806	sub destroy {	1132	sub destroy {
807	my ($self) = @_;	1133	my ($self) = @_;
808		1134
809	#Carp::cluck "debug\n";#d# #todo# enable: destroyx gets called twice because scalar keys {} is 1	1135	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
810		1136
		1137	if ($self->{conn}) {
		1138	$self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
811	delete $self->{conn}{npc_dialog};	1139	delete $self->{conn}{npc_dialog};
812	$self->{conn}->disconnect_ext ($self->{token});	1140	$self->{conn}->disconnect_ext ($self->{id});
		1141	}
813		1142
814	$self->SUPER::destroy;	1143	$self->SUPER::destroy;
815	}	1144	}
816		1145
817	1;	1146	1
		1147

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.32 by root, Mon Jun 12 13:26:14 2006 UTC vs. Revision 1.95 by root, Wed Apr 4 02:43:30 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.32 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.95 by root, Wed Apr 4 02:43:30 2007 UTC