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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.7 by root, Sat May 27 20:46:54 2006 UTC vs. Revision 1.104 by root, Mon Apr 23 19:22:24 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.7 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.104 by root, Mon Apr 23 19:22:24 2007 UTC