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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.37 by root, Thu Jun 15 15:47:36 2006 UTC vs.
Revision 1.68 by elmex, Sun Jul 30 12:51:32 2006 UTC

…		…
5		5
6	use Crossfire::Protocol::Constants;	6	use Crossfire::Protocol::Constants;
7		7
8	use CFClient;	8	use CFClient;
9	use CFClient::UI;	9	use CFClient::UI;
		10	use CFClient::Pod;
10		11
11	use base 'Crossfire::Protocol::Base';	12	use base 'Crossfire::Protocol::Base';
12
13	our %open_logs;
14		13
15	sub new {	14	sub new {
16	my $class = shift;	15	my $class = shift;
17		16
18	my $self = $class->SUPER::new (@_);	17	my $self = $class->SUPER::new (@_);
19		18
20	$self->{map_widget}->clr_commands;	19	$self->{map_widget}->clr_commands;
21		20
22	my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub {	21	my $cmd_help = CFClient::Pod::load CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub {
23	my ($pom) = @_;	22	my ($pom) = @_;
24		23
25	my @cmd_help;	24	my @cmd_help;
26		25
27	for my $head2 ($pom->head1->[-2]->head2) {	26	for my $head2 ($pom->head1->[-2]->head2) {
…		…
33	@args = (".*") unless @args;	32	@args = (".*") unless @args;
34		33
35	$_ = $_ eq ".*" ? "" : " $_"	34	$_ = $_ eq ".*" ? "" : " $_"
36	for @args;	35	for @args;
37		36
38	my $text = CFClient::pod_to_pango $head2->content;	37	my $text = CFClient::Pod::as_markup $head2->content;
39		38
40	push @cmd_help, ["$cmd$_", $text]	39	push @cmd_help, ["$cmd$_", $text]
41	for sort { (length $a) <=> (length $b) }	40	for sort { (length $a) <=> (length $b) }
42	@args;	41	@args;
43	}	42	}
…		…
63	$self	62	$self
64	}	63	}
65		64
66	sub logprint {	65	sub logprint {
67	my ($self, @a) = @_;	66	my ($self, @a) = @_;
		67
		68	$self->{log_fh} \|\|= do {
68	my $filename = "$Crossfire::VARDIR/log.$self->{host}";	69	my $path = "$Crossfire::VARDIR/log.$self->{host}";
69		70
70	my $fh = $open_logs{$filename};	71	open my $fh, ">>:utf8", $path
71	unless ($fh) {
72	# FIXME: handle this more gracefully?
73	open $fh, ">>", $filename
74	or die "Couldn't open logfile: log.$self->{host}: $!";	72	or die "Couldn't open logfile $path: $!";
75		73
76	$open_logs{$filename} = $fh;	74	$fh->autoflush (1);
		75
		76	$fh;
77	}	77	};
78		78
79	my ($sec, $min, $hour, $mday, $mon, $year) = localtime (time);	79	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
80		80
81	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",	81	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
82	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;	82	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
83		83
84	print $fh "$ts ", @a, "\n";	84	print {$self->{log_fh}} "$ts ", @a, "\n";
85	$fh->flush;
86	}	85	}
87		86
		87	sub _stat_numdiff {
		88	my ($self, $name, $old, $new) = @_;
88		89
		90	my $diff = $new - $old;
		91
		92	$diff = 0.01 * int $diff * 100;
		93
		94	0.1 >= abs $diff ? ()
		95	: $diff < 0 ? "$name$diff" : "$name+$diff"
		96	}
		97
		98	sub _stat_skillmaskdiff {
		99	my ($self, $name, $old, $new) = @_;
		100
		101	my $diff = $old ^ $new
		102	or return;
		103
		104	my @diff = map
		105	{
		106	$diff & $_
		107	? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
		108	: ()
		109	}
		110	sort { $a <=> $b } keys %{$self->{spell_paths}};
		111
		112	join "", @diff
		113	}
		114
		115	# all stats that are chacked against changes
		116	my @statchange = (
		117	[&CS_STAT_STR => \&_stat_numdiff, "Str"],
		118	[&CS_STAT_INT => \&_stat_numdiff, "Int"],
		119	[&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
		120	[&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
		121	[&CS_STAT_CON => \&_stat_numdiff, "Con"],
		122	[&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
		123	[&CS_STAT_POW => \&_stat_numdiff, "Pow"],
		124	[&CS_STAT_WC => \&_stat_numdiff, "Wc"],
		125	[&CS_STAT_AC => \&_stat_numdiff, "Ac"],
		126	[&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
		127	[&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
		128	[&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
		129	[&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
		130	[&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
		131	[&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
		132	[&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
		133	[&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
		134	[&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
		135	[&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
		136	[&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
		137	[&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
		138	[&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
		139	[&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
		140	[&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
		141	[&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
		142	[&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
		143	[&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
		144	[&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
		145	[&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
		146	[&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
		147	[&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
		148	[&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
		149	[&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
		150	[&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
		151	[&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
		152	[&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
		153	[&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
		154	);
89		155
90	sub stats_update {	156	sub stats_update {
91	my ($self, $stats) = @_;	157	my ($self, $stats) = @_;
92		158
93	if (my $exp = $stats->{+CS_STAT_EXP64}) {	159	my $prev = $self->{prev_stats} \|\| { };
94	my $diff = $exp - $self->{prev_exp};	160
		161	if (my @diffs =
		162	(
		163	($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
		164	map {
		165	$stats->{$_} && $prev->{$_}
		166	&& $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
		167	} sort { $a <=> $b } keys %{$self->{skill_info}}
		168	)
		169	) {
		170	my $msg = join " ", @diffs;
95	$self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)	171	$self->{statusbox}->add ($msg, group => "experience $msg", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
96	if exists $self->{prev_exp} && $diff;
97	$self->{prev_exp} = $exp;
98	}	172	}
99		173
		174	if (
		175	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
		176	) {
		177	my $msg = "<b>stat change</b>: " . (join " ", @diffs);
		178	$self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
		179	}
		180
100	::update_stats_window ($stats);	181	$self->update_stats_window ($stats, $prev);
		182
		183	$self->{prev_stats} = { %$stats };
		184	}
		185
		186	my %RES_TBL = (
		187	phys => CS_STAT_RES_PHYS,
		188	magic => CS_STAT_RES_MAG,
		189	fire => CS_STAT_RES_FIRE,
		190	elec => CS_STAT_RES_ELEC,
		191	cold => CS_STAT_RES_COLD,
		192	conf => CS_STAT_RES_CONF,
		193	acid => CS_STAT_RES_ACID,
		194	drain => CS_STAT_RES_DRAIN,
		195	ghit => CS_STAT_RES_GHOSTHIT,
		196	pois => CS_STAT_RES_POISON,
		197	slow => CS_STAT_RES_SLOW,
		198	para => CS_STAT_RES_PARA,
		199	tund => CS_STAT_TURN_UNDEAD,
		200	fear => CS_STAT_RES_FEAR,
		201	depl => CS_STAT_RES_DEPLETE,
		202	deat => CS_STAT_RES_DEATH,
		203	holyw => CS_STAT_RES_HOLYWORD,
		204	blind => CS_STAT_RES_BLIND,
		205	);
		206
		207	sub update_stats_window {
		208	my ($self, $stats, $prev) = @_;
		209
		210	# I love text protocols...
		211
		212	my $hp = $stats->{+CS_STAT_HP} * 1;
		213	my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
		214	my $sp = $stats->{+CS_STAT_SP} * 1;
		215	my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
		216	my $fo = $stats->{+CS_STAT_FOOD} * 1;
		217	my $fo_m = 999;
		218	my $gr = $stats->{+CS_STAT_GRACE} * 1;
		219	my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
		220
		221	$::GAUGES->{hp} ->set_value ($hp, $hp_m);
		222	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
		223	$::GAUGES->{food} ->set_value ($fo, $fo_m);
		224	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
		225	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
		226	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
		227	my $rng = $stats->{+CS_STAT_RANGE};
		228	$rng =~ s/^Range: //; # thank you so much dear server
		229	$::GAUGES->{range} ->set_text ("Rng: " . $rng);
		230	my $title = $stats->{+CS_STAT_TITLE};
		231	$title =~ s/^Player: //;
		232	$::STATWIDS->{title} ->set_text ("Title: " . $title);
		233
		234	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
		235	$::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
		236	$::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
		237	$::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
		238	$::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
		239	$::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
		240	$::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
		241	$::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
		242	$::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
		243	$::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
		244	$::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
		245	$::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
		246	$::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
		247
		248	$self->update_weight;
		249
		250	$::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
		251	for keys %RES_TBL;
		252
		253	my $sktbl = $::STATWIDS->{skill_tbl};
		254	my @skills = keys %{ $self->{skill_info} };
		255
		256	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
		257	$sktbl->clear;
		258
		259	$sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1);
		260	$sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1);
		261	$sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1);
		262	$sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1);
		263	$sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1);
		264	$sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1);
		265
		266	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
		267
		268	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
		269	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
		270	my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
		271
		272	my ($x, $y) = (0, 1);
		273	for (
		274	sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
		275	map [$_, $self->{skill_info}{$_}],
		276	grep exists $stats->{$_},
		277	@skills
		278	) {
		279	my ($idx, $name) = @$_;
		280
		281	my $spell_cb = sub {
		282	my ($widget, $ev) = @_;
		283
		284	if ($ev->{button} == 1) {
		285	$::CONN->user_send ("ready_skill $name");
		286	} elsif ($ev->{button} == 2) {
		287	$::CONN->user_send ("use_skill $name");
		288	} elsif ($ev->{button} == 3) {
		289	(new CFClient::UI::Menu
		290	items => [
		291	["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],
		292	["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],
		293	],
		294	)->popup ($ev);
		295	} else {
		296	return 0;
		297	}
		298
		299	1
		300	};
		301
		302	$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label
		303	text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
		304	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label
		305	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
		306	$sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME);
		307
		308	$x++ and ($x, $y) = (0, $y + 1);
		309	}
		310	}
		311
		312	for (grep exists $stats->{$_}, @skills) {
		313	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
		314	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
		315	}
101	}	316	}
102		317
103	sub user_send {	318	sub user_send {
104	my ($self, $command) = @_;	319	my ($self, $command) = @_;
105		320
…		…
107	push @{$self->{record}}, $command;	322	push @{$self->{record}}, $command;
108	}	323	}
109		324
110	$self->logprint ("send: ", $command);	325	$self->logprint ("send: ", $command);
111	$self->send_command ($command);	326	$self->send_command ($command);
112	::status $command;	327	::status ($command);
113	}	328	}
114		329
115	sub start_record {	330	sub start_record {
116	my ($self) = @_;	331	my ($self) = @_;
117		332
…		…
345	undef	560	undef
346	};	561	};
347	}	562	}
348		563
349	sub face_update {	564	sub face_update {
350	my ($self, $facenum, $face) = @_;	565	my ($self, $facenum, $face, $changed) = @_;
351		566
352	$self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes	567	$self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;
353		568
354	$self->set_texture ($face->{id} => delete $face->{image});	569	$self->set_texture ($face->{id} => delete $face->{image});
355	}	570	}
356		571
357	sub set_texture {	572	sub set_texture {
…		…
398	[0.11, 0.56, 1.00],	613	[0.11, 0.56, 1.00],
399	[0.93, 0.46, 0.00],	614	[0.93, 0.46, 0.00],
400	[0.18, 0.54, 0.34],	615	[0.18, 0.54, 0.34],
401	[0.56, 0.73, 0.56],	616	[0.56, 0.73, 0.56],
402	[0.80, 0.80, 0.80],	617	[0.80, 0.80, 0.80],
403	[0.55, 0.41, 0.13],	618	[0.75, 0.61, 0.20],
404	[0.99, 0.77, 0.26],	619	[0.99, 0.77, 0.26],
405	[0.74, 0.65, 0.41],	620	[0.74, 0.65, 0.41],
406	);	621	);
407		622
408	$self->logprint ("info: ", $text);	623	$self->logprint ("info: ", $text);
…		…
410	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	625	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
411		626
412	# try to create single paragraphs of multiple lines sent by the server	627	# try to create single paragraphs of multiple lines sent by the server
413	$text =~ s/(?<=\S)\n(?=\w)/ /g;	628	$text =~ s/(?<=\S)\n(?=\w)/ /g;
414		629
415	$text = CFClient::UI::Label::escape $text;	630	$text = CFClient::asxml $text;
416	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	631	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
417	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	632	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
418		633
419	$self->{logview}->add_paragraph ($color[$color],	634	$self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
420	join "\n", map "$time $_", split /\n/, $text);	635	for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
		636	$self->{logview}->scroll_to_bottom;
421		637
422	$self->{statusbox}->add ($text,	638	$self->{statusbox}->add ($text,
423	group => $text,	639	group => $text,
424	fg => $color[$color],	640	fg => $color[$color],
425	timeout => $color >= 2 ? 60 : 10,	641	timeout => $color >= 2 ? 60 : 10,
…		…
434	}	650	}
435		651
436	sub spell_add {	652	sub spell_add {
437	my ($self, $spell) = @_;	653	my ($self, $spell) = @_;
438		654
439	# try to create single paragraphs of multiple lines sent by the server	655	# try to create single paragraphs out of the multiple lines sent by the server
440	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;	656	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
441	$spell->{message} =~ s/\n+$//;	657	$spell->{message} =~ s/\n+$//;
442	$spell->{message} \|\|= "Server did not provide a description for this spell.";	658	$spell->{message} \|\|= "Server did not provide a description for this spell.";
443		659
444	$::SETUP_SPELLS->add_spell ($spell);	660	$::SPELL_PAGE->add_spell ($spell);
445		661
446	$self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});	662	$self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::asxml $spell->{message});
447	$self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});	663	$self->{map_widget}->add_command ("cast $spell->{name}", CFClient::asxml $spell->{message});
448	}	664	}
449		665
450	sub spell_delete {	666	sub spell_delete {
451	my ($self, $spell) = @_;	667	my ($self, $spell) = @_;
		668
452	$::SETUP_SPELLS->remove_spell ($spell);	669	$::SPELL_PAGE->remove_spell ($spell);
453	}	670	}
454		671
455	sub addme_success {	672	sub addme_success {
456	my ($self) = @_;	673	my ($self) = @_;
457		674
458	my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {	675	my $skill_help = CFClient::Pod::load CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
459	my ($pom) = @_;	676	my ($pom) = @_;
460		677
461	my %skill_help;	678	my %skill_help;
462		679
463	for my $head2 ($pom->head1->[3]->head2) {	680	for my $head2 ($pom->head1->[3]->head2) {
464	$skill_help{$head2->title} = CFClient::pod_to_pango $head2->content;	681	$skill_help{$head2->title} = CFClient::Pod::as_markup $head2->content;
465	}	682	}
466		683
467	\%skill_help	684	\%skill_help
468	};	685	};
469		686
470	for my $skill (values %{$self->{skill_info}}) {	687	for my $skill (values %{$self->{skill_info}}) {
471	$self->{map_widget}->add_command ("ready_skill $skill",	688	$self->{map_widget}->add_command ("ready_skill $skill",
472	(CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")	689	(CFClient::asxml "Ready the skill '$skill'\n\n")
473	. $skill_help->{$skill});	690	. $skill_help->{$skill});
474	$self->{map_widget}->add_command ("use_skill $skill",	691	$self->{map_widget}->add_command ("use_skill $skill",
475	(CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")	692	(CFClient::asxml "Immediately use the skill '$skill'\n\n")
476	. $skill_help->{$skill});	693	. $skill_help->{$skill});
477	}	694	}
478	}	695	}
479		696
480	sub eof {	697	sub eof {
…		…
505		722
506	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();	723	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
507		724
508	$self->send ("requestinfo image_sums $face $face");	725	$self->send ("requestinfo image_sums $face $face");
509		726
510	$self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",	727	$self->{statusbox}->add (CFClient::asxml "prefetching $todo",
511	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);	728	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
512	} elsif (!exists $self->{num_faces}) {	729	} elsif (!exists $self->{num_faces}) {
513	$self->send ("requestinfo image_info");	730	$self->send ("requestinfo image_info");
514		731
515	$self->{num_faces} = 0;	732	$self->{num_faces} = 0;
516		733
517	$self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",	734	$self->{statusbox}->add (CFClient::asxml "starting to prefetch",
518	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);	735	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
519	}	736	}
520	}	737	}
521		738
522	sub update_floorbox {	739	sub update_floorbox {
523	$CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {	740	$CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {
524	return unless $::CONN;	741	return unless $::CONN;
525		742
526	$::FLOORBOX->clear;	743	$::FLOORBOX->clear;
527		744
528	my $row;	745	my $row;
529	for (@{ $::CONN->{container}{0} }) {	746	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
530	if ($row < 6) {	747	if ($row < 6) {
531	local $_->{face_widget}; # hack to force recreation of widget	748	local $_->{face_widget}; # hack to force recreation of widget
532	local $_->{desc_widget}; # hack to force recreation of widget	749	local $_->{desc_widget}; # hack to force recreation of widget
533	CFClient::Item::update_widgets $_;	750	CFClient::Item::update_widgets $_;
534		751
…		…
537		754
538	$row++;	755	$row++;
539	} else {	756	} else {
540	$::FLOORBOX->add (1, $row, new CFClient::UI::Button	757	$::FLOORBOX->add (1, $row, new CFClient::UI::Button
541	text => "More...",	758	text => "More...",
542	on_activate => sub { $::INV_WINDOW->toggle_visibility },	759	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
543	);	760	);
544	last;	761	last;
545	}	762	}
546	}	763	}
		764	if ($::CONN->{open_container}) {
		765	$::FLOORBOX->add (1, $row++, new CFClient::UI::Button
		766	text => "Close container",
		767	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
		768	);
		769	}
547	});	770	});
548		771
549	$::WANT_REFRESH++;	772	$::WANT_REFRESH++;
550	}	773	}
551		774
552	sub set_opencont {	775	sub set_opencont {
553	my ($conn, $tag, $name) = @_;	776	my ($conn, $tag, $name) = @_;
554	$conn->{open_container} = $tag;	777	$conn->{open_container} = $tag;
		778	update_floorbox;
555		779
556	$::INV_RIGHT_HB->clear ();	780	$::INV_RIGHT_HB->clear ();
557	$::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name);	781	$::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name);
558		782
559	if ($tag != 0) { # Floor isn't closable, is it?	783	if ($tag != 0) { # Floor isn't closable, is it?
…		…
562	tooltip => "Close the currently open container (if one is open)",	786	tooltip => "Close the currently open container (if one is open)",
563	on_activate => sub {	787	on_activate => sub {
564	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	788	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
565	if $tag != 0;	789	if $tag != 0;
566	#if $CONN->{open_container} != 0;	790	#if $CONN->{open_container} != 0;
		791	0
567	},	792	},
568	);	793	);
569	}	794	}
570		795
571	$::INVR->set_items ($conn->{container}{$tag});	796	$::INVR->set_items ($conn->{container}{$tag});
572	}	797	}
573		798
574	sub update_container {	799	sub update_containers {
575	my ($tag) = @_;	800	my ($self) = @_;
576		801
577	$::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}})	802	$CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
		803	my $todo = delete $self->{update_container}
		804	or return;
		805
		806	for my $tag (keys %$todo) {
		807	update_floorbox if $tag == 0 or $tag == $self->{open_container};
		808	if ($tag == 0) {
		809	$::INVR->set_items ($self->{container}{0})
578	if $tag == $::CONN->{open_container};	810	if $tag == $self->{open_container};
		811	} elsif ($tag == $self->{player}{tag}) {
		812	$::INV->set_items ($self->{container}{$tag})
		813	} else {
		814	$::INVR->set_items ($self->{container}{$tag})
		815	if $tag == $self->{open_container};
		816	}
		817	}
		818	});
579	}	819	}
580		820
581	sub container_add {	821	sub container_add {
582	my ($self, $tag, $items) = @_;	822	my ($self, $tag, $items) = @_;
583		823
584	#d# print "container_add: container $tag ($self->{player}{tag})\n";	824	$self->{update_container}{$tag}++;
585		825	$self->update_containers;
586	if ($tag == 0) {
587	update_floorbox;
588	update_container (0);
589	} elsif ($tag == $self->{player}{tag}) {
590	$::INV->set_items ($self->{container}{$self->{player}{tag}})
591	} else {
592	update_container ($tag);
593	}
594
595	# $self-<{player}{tag} => player inv
596	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
597	}	826	}
598		827
599	sub container_clear {	828	sub container_clear {
600	my ($self, $tag) = @_;	829	my ($self, $tag) = @_;
601		830
602	#d# print "container_clear: container $tag ($self->{player}{tag})\n";	831	$self->{update_container}{$tag}++;
603		832	$self->update_containers;
604	if ($tag == 0) {
605	update_floorbox;
606	update_container (0);
607	} elsif ($tag == $self->{player}{tag}) {
608	$::INV->set_items ($self->{container}{$tag})
609	} else {
610	update_container ($tag);
611	}
612
613	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
614	}	833	}
615		834
616	sub item_delete {	835	sub item_delete {
617	my ($self, @items) = @_;	836	my ($self, @items) = @_;
618		837
		838	$self->{update_container}{$_->{container}}++
619	for (@items) {	839	for @items;
620	#d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
621
622	if ($_->{container} == 0) {
623	update_floorbox;
624	update_container ($_->{tag});
625	} elsif ($_->{container} == $self->{player}{tag}) {
626	$::INV->set_items ($self->{container}{$self->{player}{tag}})
627	} else {
628	update_container ($_->{container});
629	}
630	}	840
		841	$self->update_containers;
631	}	842	}
632		843
633	sub item_update {	844	sub item_update {
634	my ($self, $item) = @_;	845	my ($self, $item) = @_;
635		846
636	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";	847	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
637		848
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;	849	CFClient::Item::update_widgets $item;
644		850
645	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	851	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
646	set_opencont ($::CONN, 0, "Floor");	852	set_opencont ($::CONN, 0, "Floor");
647		853
648	} elsif ($item->{flags} & F_OPEN) {	854	} elsif ($item->{flags} & F_OPEN) {
649	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);	855	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
		856
650	} else {	857	} else {
651	if ($item->{container} == 0) {	858	$self->{update_container}{$item->{container}}++;
652	update_floorbox;
653	update_container (0);	859	$self->update_containers;
654	} elsif ($item->{container} == $self->{player}{tag}) {
655	$::INV->set_items ($self->{container}{$item->{container}})
656	}
657	}	860	}
658	}	861	}
659		862
660	sub player_update {	863	sub player_update {
661	my ($self, $player) = @_;	864	my ($self, $player) = @_;
662		865
		866	$self->update_weight;
		867	}
		868
		869	sub update_weight {
		870	my ($self) = @_;
		871
		872	my $weight = .001 * $self->{player}{weight};
		873	my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
		874
663	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);	875	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
		876	$::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
		877	$::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
664	}	878	}
665		879
666	sub update_server_info {	880	sub update_server_info {
667	my ($self) = @_;	881	my ($self) = @_;
668		882
…		…
738	name => "npc_dialog",	952	name => "npc_dialog",
739	force_w => $::WIDTH * 0.7,	953	force_w => $::WIDTH * 0.7,
740	force_h => $::HEIGHT * 0.7,	954	force_h => $::HEIGHT * 0.7,
741	title => "NPC Dialog",	955	title => "NPC Dialog",
742	kw => { hi => 0, yes => 0, no => 0 },	956	kw => { hi => 0, yes => 0, no => 0 },
		957	has_close_button => 1,
743	@_,	958	@_,
744	);	959	);
745		960
746	Scalar::Util::weaken (my $this = $self);	961	Scalar::Util::weaken (my $this = $self);
		962
		963	$self->connect (delete => sub { $this->destroy; 1 });
747		964
748	# better use a pane...	965	# better use a pane...
749	$self->add (my $hbox = new CFClient::UI::HBox);	966	$self->add (my $hbox = new CFClient::UI::HBox);
750	$hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);	967	$hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);
751		968
…		…
763		980
764	return unless $text =~ /\S/;	981	return unless $text =~ /\S/;
765		982
766	$entry->set_text ("");	983	$entry->set_text ("");
767	$this->send ($text);	984	$this->send ($text);
		985
		986	0
768	},	987	},
769	);	988	);
770		989
771	$vbox->add ($self->{options} = new CFClient::UI::VBox);	990	$vbox->add ($self->{options} = new CFClient::UI::VBox);
772		991
773	$self->{close_button} = new CFClient::UI::Button	992	$self->{bye_button} = new CFClient::UI::Button
774	text => "Bye (close)",	993	text => "Bye (close)",
775	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",	994	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
776	on_activate => sub { $this->destroy },	995	on_activate => sub { $this->destroy; 1 },
777	;	996	;
778		997
779	$self->update_options;	998	$self->update_options;
780		999
781	$self->{token} = $self->{conn}->ext_token;	1000	$self->{token} = $self->{conn}->ext_token;
782	$self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });	1001	$self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
783	$self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");	1002	$self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
784		1003
785	$self->{entry}->focus_in;	1004	$self->{entry}->grab_focus;
786		1005
787	$self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");	1006	$self->{textview}->add_paragraph ({
		1007	fg => [1, 1, 0, 1],
		1008	markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
		1009	});
788		1010
789	$self->show;	1011	$self->show;
790	$self	1012	$self
791	};	1013	};
792		1014
…		…
794	my ($self) = @_;	1016	my ($self) = @_;
795		1017
796	Scalar::Util::weaken $self;	1018	Scalar::Util::weaken $self;
797		1019
798	$self->{options}->clear;	1020	$self->{options}->clear;
799	$self->{options}->add ($self->{close_button});	1021	$self->{options}->add ($self->{bye_button});
800		1022
801	for my $kw (sort keys %{ $self->{kw} }) {	1023	for my $kw (sort keys %{ $self->{kw} }) {
802	$self->{options}->add (new CFClient::UI::Button	1024	$self->{options}->add (new CFClient::UI::Button
803	text => $kw,	1025	text => $kw,
804	on_activate => sub {	1026	on_activate => sub {
805	$self->send ($kw);	1027	$self->send ($kw);
		1028	0
806	},	1029	},
807	);	1030	);
808	}	1031	}
809	}	1032	}
810		1033
811	sub feed {	1034	sub feed {
812	my ($self, $data) = @_;	1035	my ($self, $data) = @_;
813		1036
		1037	Scalar::Util::weaken $self;
		1038
814	my ($type, $msg) = split / /, $data, 2;	1039	my ($type, $msg) = split / /, $data, 2;
815		1040
816	if ($type eq "msg") {	1041	if ($type eq "msg") {
817	my ($msg, @kw) = split /\x00/, $msg;	1042	my ($msg, @kw) = split /\x00/, $msg;
		1043
		1044	utf8::decode $_ for ($msg, @kw);
		1045
818	$self->{kw}{$_} = 1 for @kw;	1046	$self->{kw}{$_} = 1 for @kw;
819		1047
820	$msg = CFClient::UI::Label::escape $msg;	1048	$msg = "\n" . CFClient::UI::asxml $msg;
821	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };	1049	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
822	$msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh.	1050	my @link;
		1051	$msg =~ s{
		1052	($match)
		1053	}{
		1054	my $kw = $1;
		1055
		1056	push @link, new CFClient::UI::Label
		1057	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1058	can_hover => 1,
		1059	can_events => 1,
		1060	padding_x => 0,
		1061	padding_y => 0,
		1062	on_button_up => sub {
		1063	$self->send ($kw);
		1064	};
		1065
		1066	chr 0xfffc
		1067	}giex;
823		1068
824	$self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg");	1069	$self->{textview}->add_paragraph ({ markup => $msg, widget => \@link });
		1070	$self->{textview}->scroll_to_bottom;
825	$self->update_options;	1071	$self->update_options;
826	} else {	1072	} else {
827	$self->destroy;	1073	$self->destroy;
828	}	1074	}
829		1075
…		…
831	}	1077	}
832		1078
833	sub send {	1079	sub send {
834	my ($self, $msg) = @_;	1080	my ($self, $msg) = @_;
835		1081
		1082	$self->{textview}->add_paragraph ({ markup => "\n" . CFClient::asxml $msg });
		1083	$self->{textview}->scroll_to_bottom;
		1084
		1085	utf8::encode $msg;
836	$self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");	1086	$self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
837	$self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
838	}	1087	}
839		1088
840	sub destroy {	1089	sub destroy {
841	my ($self) = @_;	1090	my ($self) = @_;
842		1091
843	#Carp::cluck "debug\n";#d# #todo# enable: destroyx gets called twice because scalar keys {} is 1	1092	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
844		1093
		1094	$self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token};
845	delete $self->{conn}{npc_dialog};	1095	delete $self->{conn}{npc_dialog};
846	$self->{conn}->disconnect_ext ($self->{token});	1096	$self->{conn}->disconnect_ext ($self->{token});
847		1097
848	$self->SUPER::destroy;	1098	$self->SUPER::destroy;
849	}	1099	}
850		1100
851	1;	1101	1

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.37 by root, Thu Jun 15 15:47:36 2006 UTC vs. Revision 1.68 by elmex, Sun Jul 30 12:51:32 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.37 by root, Thu Jun 15 15:47:36 2006 UTC vs.
Revision 1.68 by elmex, Sun Jul 30 12:51:32 2006 UTC