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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.25 by root, Tue Jun 6 03:13:00 2006 UTC vs.
Revision 1.59 by root, Sun Jul 16 23:30:08 2006 UTC

…		…
59	$self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";	59	$self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";
60		60
61	$self	61	$self
62	}	62	}
63		63
		64	sub logprint {
		65	my ($self, @a) = @_;
		66
		67	$self->{log_fh} \|\|= do {
		68	my $path = "$Crossfire::VARDIR/log.$self->{host}";
		69
		70	open my $fh, ">>:utf8", $path
		71	or die "Couldn't open logfile $path: $!";
		72
		73	$fh->autoflush (1);
		74
		75	$fh;
		76	};
		77
		78	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
		79
		80	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
		81	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
		82
		83	print {$self->{log_fh}} "$ts ", @a, "\n";
		84	}
		85
		86	sub _stat_numdiff {
		87	my ($self, $name, $old, $new) = @_;
		88
		89	my $diff = $new - $old;
		90
		91	$diff = 0.01 * int $diff * 100;
		92
		93	0.1 >= abs $diff ? ()
		94	: $diff < 0 ? "$name$diff" : "$name+$diff"
		95	}
		96
		97	sub _stat_skillmaskdiff {
		98	my ($self, $name, $old, $new) = @_;
		99
		100	my $diff = $old ^ $new
		101	or return;
		102
		103	my @diff = map
		104	{
		105	$diff & $_
		106	? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
		107	: ()
		108	}
		109	sort { $a <=> $b } keys %{$self->{spell_paths}};
		110
		111	join "", @diff
		112	}
		113
		114	# all stats that are chacked against changes
		115	my @statchange = (
		116	[&CS_STAT_STR => \&_stat_numdiff, "Str"],
		117	[&CS_STAT_INT => \&_stat_numdiff, "Int"],
		118	[&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
		119	[&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
		120	[&CS_STAT_CON => \&_stat_numdiff, "Con"],
		121	[&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
		122	[&CS_STAT_POW => \&_stat_numdiff, "Pow"],
		123	[&CS_STAT_WC => \&_stat_numdiff, "Wc"],
		124	[&CS_STAT_AC => \&_stat_numdiff, "Ac"],
		125	[&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
		126	[&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
		127	[&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
		128	[&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
		129	[&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
		130	[&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
		131	[&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
		132	[&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
		133	[&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
		134	[&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
		135	[&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
		136	[&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
		137	[&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
		138	[&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
		139	[&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
		140	[&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
		141	[&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
		142	[&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
		143	[&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
		144	[&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
		145	[&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
		146	[&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
		147	[&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
		148	[&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
		149	[&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
		150	[&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
		151	[&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
		152	[&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
		153	);
		154
64	sub stats_update {	155	sub stats_update {
65	my ($self, $stats) = @_;	156	my ($self, $stats) = @_;
66		157
67	if (my $exp = $stats->{+CS_STAT_EXP64}) {	158	my $prev = $self->{prev_stats} \|\| { };
68	my $diff = $exp - $self->{prev_exp};	159
		160	if (my @diffs =
		161	(
		162	($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
		163	map {
		164	$stats->{$_} && $prev->{$_}
		165	&& $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
		166	} sort { $a <=> $b } keys %{$self->{skill_info}}
		167	)
		168	) {
		169	my $msg = join " ", @diffs;
69	$self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)	170	$self->{statusbox}->add ($msg, group => "experience $msg", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
70	if exists $self->{prev_exp} && $diff;
71	$self->{prev_exp} = $exp;
72	}	171	}
73		172
		173	if (
		174	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
		175	) {
		176	my $msg = "<b>stat change</b>: " . (join " ", @diffs);
		177	$self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
		178	}
		179
74	::update_stats_window ($stats);	180	$self->update_stats_window ($stats, $prev);
		181
		182	$self->{prev_stats} = { %$stats };
		183	}
		184
		185	my %RES_TBL = (
		186	phys => CS_STAT_RES_PHYS,
		187	magic => CS_STAT_RES_MAG,
		188	fire => CS_STAT_RES_FIRE,
		189	elec => CS_STAT_RES_ELEC,
		190	cold => CS_STAT_RES_COLD,
		191	conf => CS_STAT_RES_CONF,
		192	acid => CS_STAT_RES_ACID,
		193	drain => CS_STAT_RES_DRAIN,
		194	ghit => CS_STAT_RES_GHOSTHIT,
		195	pois => CS_STAT_RES_POISON,
		196	slow => CS_STAT_RES_SLOW,
		197	para => CS_STAT_RES_PARA,
		198	tund => CS_STAT_TURN_UNDEAD,
		199	fear => CS_STAT_RES_FEAR,
		200	depl => CS_STAT_RES_DEPLETE,
		201	deat => CS_STAT_RES_DEATH,
		202	holyw => CS_STAT_RES_HOLYWORD,
		203	blind => CS_STAT_RES_BLIND,
		204	);
		205
		206	sub update_stats_window {
		207	my ($self, $stats, $prev) = @_;
		208
		209	# I love text protocols...
		210
		211	my $hp = $stats->{+CS_STAT_HP} * 1;
		212	my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
		213	my $sp = $stats->{+CS_STAT_SP} * 1;
		214	my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
		215	my $fo = $stats->{+CS_STAT_FOOD} * 1;
		216	my $fo_m = 999;
		217	my $gr = $stats->{+CS_STAT_GRACE} * 1;
		218	my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
		219
		220	$::GAUGES->{hp} ->set_value ($hp, $hp_m);
		221	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
		222	$::GAUGES->{food} ->set_value ($fo, $fo_m);
		223	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
		224	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
		225	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
		226	my $rng = $stats->{+CS_STAT_RANGE};
		227	$rng =~ s/^Range: //; # thank you so much dear server
		228	$::GAUGES->{range} ->set_text ("Rng: " . $rng);
		229	my $title = $stats->{+CS_STAT_TITLE};
		230	$title =~ s/^Player: //;
		231	$::STATWIDS->{title} ->set_text ("Title: " . $title);
		232
		233	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
		234	$::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
		235	$::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
		236	$::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
		237	$::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
		238	$::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
		239	$::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
		240	$::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
		241	$::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
		242	$::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
		243	$::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
		244	$::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
		245	$::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
		246
		247	$::STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
		248
		249	$::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
		250	for keys %RES_TBL;
		251
		252	my $sktbl = $::STATWIDS->{skill_tbl};
		253	my @skills = keys %{ $self->{skill_info} };
		254
		255	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
		256	$sktbl->clear;
		257
		258	$sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1);
		259	$sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1);
		260	$sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1);
		261	$sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1);
		262	$sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1);
		263	$sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1);
		264
		265	my ($x, $y) = (0, 0);
		266	for (
		267	sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
		268	map [$_, $self->{skill_info}{$_}],
		269	grep exists $stats->{$_},
		270	@skills
		271	) {
		272	my ($idx, $name) = @$_;
		273
		274	$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label
		275	text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]);
		276	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label
		277	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4);
		278	$sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name);
		279
		280	$x++ and ($x, $y) = (0, $y + 1);
		281	}
		282	}
		283
		284	for (grep exists $stats->{$_}, @skills) {
		285	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
		286	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
		287	}
75	}	288	}
76		289
77	sub user_send {	290	sub user_send {
78	my ($self, $command) = @_;	291	my ($self, $command) = @_;
79		292
80	if ($self->{record}) {	293	if ($self->{record}) {
81	push @{$self->{record}}, $command;	294	push @{$self->{record}}, $command;
82	}	295	}
83		296
		297	$self->logprint ("send: ", $command);
84	$self->send_command ($command);	298	$self->send_command ($command);
85	::status $command;	299	::status ($command);
86	}	300	}
87		301
88	sub start_record {	302	sub start_record {
89	my ($self) = @_;	303	my ($self) = @_;
90		304
…		…
105	sub feed_map1a {	319	sub feed_map1a {
106	my ($self, $data) = @_;	320	my ($self, $data) = @_;
107		321
108	$self->{map}->map1a_update ($data);	322	$self->{map}->map1a_update ($data);
109	$self->{map_widget}->update;	323	$self->{map_widget}->update;
		324	}
		325
		326	sub magicmap {
		327	my ($self, $w, $h, $x, $y, $data) = @_;
		328
		329	$self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data);
110	}	330	}
111		331
112	sub flush_map {	332	sub flush_map {
113	my ($self) = @_;	333	my ($self) = @_;
114		334
…		…
127		347
128	$self->flush_map;	348	$self->flush_map;
129	delete $self->{neigh_map};	349	delete $self->{neigh_map};
130		350
131	$self->{map}->clear;	351	$self->{map}->clear;
		352	delete $self->{map_widget}{magicmap};
132	}	353	}
133		354
134		355
135	sub load_map($$$) {	356	sub load_map($$$) {
136	my ($self, $hash, $x, $y) = @_;	357	my ($self, $hash, $x, $y) = @_;
…		…
279	# I love transactions	500	# I love transactions
280	for (1..100) {	501	for (1..100) {
281	my $txn = $CFClient::DB_ENV->txn_begin;	502	my $txn = $CFClient::DB_ENV->txn_begin;
282	my $status = $self->{facemap}->db_get (id => $id);	503	my $status = $self->{facemap}->db_get (id => $id);
283	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {	504	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
284	$id = ($id \|\| 16) + 1;	505	$id = ($id \|\| 64) + 1;
285	if ($self->{facemap}->put (id => $id) == 0	506	if ($self->{facemap}->put (id => $id) == 0
286	&& $self->{facemap}->put ($hash => $id) == 0) {	507	&& $self->{facemap}->put ($hash => $id) == 0) {
287	$txn->txn_commit;	508	$txn->txn_commit;
288		509
289	goto gotid;	510	goto gotid;
…		…
311	undef	532	undef
312	};	533	};
313	}	534	}
314		535
315	sub face_update {	536	sub face_update {
316	my ($self, $facenum, $face) = @_;	537	my ($self, $facenum, $face, $changed) = @_;
317		538
318	$self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes	539	$self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;
319		540
320	$self->set_texture ($face->{id} => delete $face->{image});	541	$self->set_texture ($face->{id} => delete $face->{image});
321	}	542	}
322		543
323	sub set_texture {	544	sub set_texture {
…		…
369	[0.55, 0.41, 0.13],	590	[0.55, 0.41, 0.13],
370	[0.99, 0.77, 0.26],	591	[0.99, 0.77, 0.26],
371	[0.74, 0.65, 0.41],	592	[0.74, 0.65, 0.41],
372	);	593	);
373		594
		595	$self->logprint ("info: ", $text);
		596
374	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	597	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
375		598
376	# try to create single paragraphs of multiple lines sent by the server	599	# try to create single paragraphs of multiple lines sent by the server
377	$text =~ s/(?<=\S)\n(?=\w)/ /g;	600	$text =~ s/(?<=\S)\n(?=\w)/ /g;
378		601
379	$text = CFClient::UI::Label::escape $text;	602	$text = CFClient::UI::Label::escape $text;
380	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	603	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
381	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	604	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
382		605
383	$self->{logview}->add_paragraph ($color[$color],	606	$self->{logview}->add_paragraph ($color[$color], $_)
384	join "\n", map "$time $_", split /\n/, $text);	607	for map "$time $_", split /\n/, $text;
		608	$self->{logview}->scroll_to_bottom;
385		609
386	$self->{statusbox}->add ($text,	610	$self->{statusbox}->add ($text,
387	group => $text,	611	group => $text,
388	fg => $color[$color],	612	fg => $color[$color],
389	timeout => $color >= 2 ? 60 : 10,	613	timeout => $color >= 2 ? 60 : 10,
…		…
398	}	622	}
399		623
400	sub spell_add {	624	sub spell_add {
401	my ($self, $spell) = @_;	625	my ($self, $spell) = @_;
402		626
403	# TODO	627	# try to create single paragraphs of multiple lines sent by the server
404	# create a widget dynamically, using spell face (CF::Protocol downloads them)	628	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
		629	$spell->{message} =~ s/\n+$//;
		630	$spell->{message} \|\|= "Server did not provide a description for this spell.";
		631
405	$::SETUP_SPELLS->add_spell ($spell);	632	$::SPELL_PAGE->add_spell ($spell);
406		633
407	$self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});	634	$self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
408	$self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});	635	$self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
409	}	636	}
410		637
411	sub spell_delete {	638	sub spell_delete {
412	my ($self, $spell) = @_;	639	my ($self, $spell) = @_;
		640
413	$::SETUP_SPELLS->remove_spell ($spell);	641	$::SPELL_PAGE->remove_spell ($spell);
414	}	642	}
415		643
416	sub addme_success {	644	sub addme_success {
417	my ($self) = @_;	645	my ($self) = @_;
418		646
…		…
485	return unless $::CONN;	713	return unless $::CONN;
486		714
487	$::FLOORBOX->clear;	715	$::FLOORBOX->clear;
488		716
489	my $row;	717	my $row;
490	for (@{ $::CONN->{container}{0} }) {	718	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {
491	if ($row < 6) {	719	if ($row < 6) {
492	local $_->{face_widget}; # hack to force recreation of widget	720	local $_->{face_widget}; # hack to force recreation of widget
493	local $_->{desc_widget}; # hack to force recreation of widget	721	local $_->{desc_widget}; # hack to force recreation of widget
494	CFClient::Item::update_widgets $_;	722	CFClient::Item::update_widgets $_;
495		723
…		…
497	$::FLOORBOX->add (1, $row, $_->{desc_widget});	725	$::FLOORBOX->add (1, $row, $_->{desc_widget});
498		726
499	$row++;	727	$row++;
500	} else {	728	} else {
501	$::FLOORBOX->add (1, $row, new CFClient::UI::Button	729	$::FLOORBOX->add (1, $row, new CFClient::UI::Button
502	text => "More...",	730	text => "More...",
503	on_activate => sub { $::INV_WINDOW->toggle_visibility },	731	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
504	);	732	);
505	last;	733	last;
506	}	734	}
507	}	735	}
508	});	736	});
…		…
523	tooltip => "Close the currently open container (if one is open)",	751	tooltip => "Close the currently open container (if one is open)",
524	on_activate => sub {	752	on_activate => sub {
525	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	753	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
526	if $tag != 0;	754	if $tag != 0;
527	#if $CONN->{open_container} != 0;	755	#if $CONN->{open_container} != 0;
		756	0
528	},	757	},
529	);	758	);
530	}	759	}
531		760
532	$::INVR->set_items ($conn->{container}{$tag});	761	$::INVR->set_items ($conn->{container}{$tag});
533	}	762	}
534		763
535	sub update_container {	764	sub update_containers {
536	my ($tag) = @_;	765	my ($self) = @_;
537		766
538	$::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}})	767	$CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
		768	my $todo = delete $self->{update_container}
		769	or return;
		770
		771	for my $tag (keys %$todo) {
		772	if ($tag == 0) {
		773	update_floorbox;
		774	$::INVR->set_items ($self->{container}{0})
539	if $tag == $::CONN->{open_container};	775	if $tag == $self->{open_container};
		776	} elsif ($tag == $self->{player}{tag}) {
		777	$::INV->set_items ($self->{container}{$tag})
		778	} else {
		779	$::INVR->set_items ($self->{container}{$tag})
		780	if $tag == $self->{open_container};
		781	}
		782	}
		783	});
540	}	784	}
541		785
542	sub container_add {	786	sub container_add {
543	my ($self, $tag, $items) = @_;	787	my ($self, $tag, $items) = @_;
544		788
545	#d# print "container_add: container $tag ($self->{player}{tag})\n";	789	$self->{update_container}{$tag}++;
546		790	$self->update_containers;
547	if ($tag == 0) {
548	update_floorbox;
549	update_container (0);
550	} elsif ($tag == $self->{player}{tag}) {
551	$::INV->set_items ($self->{container}{$self->{player}{tag}})
552	} else {
553	update_container ($tag);
554	}
555
556	# $self-<{player}{tag} => player inv
557	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
558	}	791	}
559		792
560	sub container_clear {	793	sub container_clear {
561	my ($self, $tag) = @_;	794	my ($self, $tag) = @_;
562		795
563	#d# print "container_clear: container $tag ($self->{player}{tag})\n";	796	$self->{update_container}{$tag}++;
564		797	$self->update_containers;
565	if ($tag == 0) {
566	update_floorbox;
567	update_container (0);
568	} elsif ($tag == $self->{player}{tag}) {
569	$::INV->set_items ($self->{container}{$tag})
570	} else {
571	update_container ($tag);
572	}
573
574	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
575	}	798	}
576		799
577	sub item_delete {	800	sub item_delete {
578	my ($self, @items) = @_;	801	my ($self, @items) = @_;
579		802
		803	$self->{update_container}{$_->{container}}++
580	for (@items) {	804	for @items;
581	#d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
582
583	if ($_->{container} == 0) {
584	update_floorbox;
585	update_container ($_->{tag});
586	} elsif ($_->{container} == $self->{player}{tag}) {
587	$::INV->set_items ($self->{container}{$self->{player}{tag}})
588	} else {
589	update_container ($_->{container});
590	}
591	}	805
		806	$self->update_containers;
592	}	807	}
593		808
594	sub item_update {	809	sub item_update {
595	my ($self, $item) = @_;	810	my ($self, $item) = @_;
596		811
597	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";	812	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
598		813
599	if ($item->{tag} == $self->{player}{tag}) {
600	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
601	return;
602	}
603
604	CFClient::Item::update_widgets $item;	814	CFClient::Item::update_widgets $item;
605		815
606	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	816	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
607	set_opencont ($::CONN, 0, "Floor");	817	set_opencont ($::CONN, 0, "Floor");
608		818
609	} elsif ($item->{flags} & F_OPEN) {	819	} elsif ($item->{flags} & F_OPEN) {
610	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);	820	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
		821
611	} else {	822	} else {
612	if ($item->{container} == 0) {	823	$self->{update_container}{$item->{container}}++;
613	update_floorbox;
614	update_container (0);	824	$self->update_containers;
615	} elsif ($item->{container} == $self->{player}{tag}) {
616	$::INV->set_items ($self->{container}{$item->{container}})
617	}
618	}	825	}
619	}	826	}
620		827
621	sub player_update {	828	sub player_update {
622	my ($self, $player) = @_;	829	my ($self, $player) = @_;
623	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);	830	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
		831	}
624		832
625	# do it here because it is ignored earlier, and there is no "login" event	833	sub update_server_info {
		834	my ($self) = @_;
		835
		836	my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
		837
		838	$::SERVER_INFO->set_markup (
		839	"server <tt>$self->{host}:$self->{port}</tt>\n"
		840	. "protocol version <tt>$self->{version}</tt>\n"
		841	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
		842	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		843	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
		844	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
		845	. "map size $self->{mapw}×$self->{maph}\n"
		846	);
		847	}
		848
		849	sub logged_in {
		850	my ($self) = @_;
		851
		852	$self->send_ext_req (cfplus_support => "1", sub {
		853	$self->{cfplus_ext} = $_[0];
		854	$self->update_server_info;
		855	});
		856
		857	$self->update_server_info;
		858
626	$self->send_command ("output-sync $::CFG->{output_sync}");	859	$self->send_command ("output-sync $::CFG->{output_sync}");
627	$self->send_command ("output-count $::CFG->{output_count}");	860	$self->send_command ("output-count $::CFG->{output_count}");
		861	$self->send_command ("pickup $::CFG->{pickup}");
		862	}
		863
		864	sub lookat {
		865	my ($self, $x, $y) = @_;
		866
		867	if ($self->{cfplus_ext}) {
		868	$self->send_ext_req (lookat => "$x $y", sub {
		869	my %res = split /\x00/, $_[0];
		870
		871	if (exists $res{npc_dialog}) {
		872	# start npc chat dialog
		873	$self->{npc_dialog} = new CFClient::NPCDialog::
		874	dx => $x,
		875	dy => $y,
		876	title => "$res{npc_dialog} (NPC)",
		877	conn => $self,
		878	;
		879	}
		880	});
		881	}
		882
		883	$self->send ("lookat $x $y");
		884	}
		885
		886	sub destroy {
		887	my ($self) = @_;
		888
		889	$self->{npc_dialog}->destroy
		890	if $self->{npc_dialog};
		891
		892	$self->SUPER::destroy;
		893	}
		894
		895	package CFClient::NPCDialog;
		896
		897	our @ISA = 'CFClient::UI::FancyFrame';
		898
		899	sub new {
		900	my $class = shift;
		901
		902	my $self = $class->SUPER::new (
		903	x => 'center',
		904	y => 'center',
		905	name => "npc_dialog",
		906	force_w => $::WIDTH * 0.7,
		907	force_h => $::HEIGHT * 0.7,
		908	title => "NPC Dialog",
		909	kw => { hi => 0, yes => 0, no => 0 },
		910	@_,
		911	);
		912
		913	Scalar::Util::weaken (my $this = $self);
		914
		915	# better use a pane...
		916	$self->add (my $hbox = new CFClient::UI::HBox);
		917	$hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);
		918
		919	$hbox->add (my $vbox = new CFClient::UI::VBox);
		920
		921	$vbox->add (new CFClient::UI::Label text => "Message Entry:");
		922	$vbox->add ($self->{entry} = new CFClient::UI::Entry
		923	tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"
		924	. "Sometimes you have to tell an NPC something you cannot find out during "
		925	. "a normal conversation (such as a password). In those cases you have to use "
		926	. "this text entry. You can also enter responses manually instead of using the response "
		927	. "buttons below.",
		928	on_activate => sub {
		929	my ($entry, $text) = @_;
		930
		931	return unless $text =~ /\S/;
		932
		933	$entry->set_text ("");
		934	$this->send ($text);
		935
		936	0
		937	},
		938	);
		939
		940	$vbox->add ($self->{options} = new CFClient::UI::VBox);
		941
		942	$self->{bye_button} = new CFClient::UI::Button
		943	text => "Bye (close)",
		944	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
		945	on_activate => sub { $this->destroy; 0 },
		946	;
		947
		948	$self->update_options;
		949
		950	$self->{token} = $self->{conn}->ext_token;
		951	$self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
		952	$self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
		953
		954	$self->{entry}->grab_focus;
		955
		956	$self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
		957
		958	$self->show;
		959	$self
		960	};
		961
		962	sub update_options {
		963	my ($self) = @_;
		964
		965	Scalar::Util::weaken $self;
		966
		967	$self->{options}->clear;
		968	$self->{options}->add ($self->{bye_button});
		969
		970	for my $kw (sort keys %{ $self->{kw} }) {
		971	$self->{options}->add (new CFClient::UI::Button
		972	text => $kw,
		973	on_activate => sub {
		974	$self->send ($kw);
		975	0
		976	},
		977	);
		978	}
		979	}
		980
		981	sub feed {
		982	my ($self, $data) = @_;
		983
		984	Scalar::Util::weaken $self;
		985
		986	my ($type, $msg) = split / /, $data, 2;
		987
		988	if ($type eq "msg") {
		989	my ($msg, @kw) = split /\x00/, $msg;
		990	$self->{kw}{$_} = 1 for @kw;
		991
		992	$msg = "\n" . CFClient::UI::Label::escape $msg;
		993	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		994	my @link;
		995	$msg =~ s{
		996	($match)
		997	}{
		998	my $kw = $1;
		999
		1000	push @link, new CFClient::UI::Label
		1001	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1002	can_hover => 1,
		1003	can_events => 1,
		1004	padding_x => 0,
		1005	padding_y => 0,
		1006	on_button_up => sub {
		1007	$self->send ($kw);
		1008	};
		1009
		1010	chr 0xfffc
		1011	}giex;
		1012
		1013	$self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
		1014	$self->{textview}->scroll_to_bottom;
		1015	$self->update_options;
		1016	} else {
		1017	$self->destroy;
		1018	}
		1019
		1020	1
		1021	}
		1022
		1023	sub send {
		1024	my ($self, $msg) = @_;
		1025
		1026	$self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
		1027	$self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
		1028	$self->{textview}->scroll_to_bottom;
		1029	}
		1030
		1031	sub destroy {
		1032	my ($self) = @_;
		1033
		1034	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
		1035
		1036	$self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token};
		1037	delete $self->{conn}{npc_dialog};
		1038	$self->{conn}->disconnect_ext ($self->{token});
		1039
		1040	$self->SUPER::destroy;
628	}	1041	}
629		1042
630	1;	1043	1;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.25 by root, Tue Jun 6 03:13:00 2006 UTC vs. Revision 1.59 by root, Sun Jul 16 23:30:08 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.25 by root, Tue Jun 6 03:13:00 2006 UTC vs.
Revision 1.59 by root, Sun Jul 16 23:30:08 2006 UTC