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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.10 by elmex, Mon May 29 20:22:33 2006 UTC vs. Revision 1.102 by root, Wed Apr 18 18:16:16 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.10 by elmex, Mon May 29 20:22:33 2006 UTC vs.
Revision 1.102 by root, Wed Apr 18 18:16:16 2007 UTC