ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.35 by root, Thu Jun 15 13:40:02 2006 UTC vs.
Revision 1.66 by root, Sun Jul 23 16:48:48 2006 UTC

… …
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFClient; 8use CFClient;
9use CFClient::UI; 9use CFClient::UI;
10use CFClient::Pod;
10 11
11use base 'Crossfire::Protocol::Base'; 12use base 'Crossfire::Protocol::Base';
12
13our %open_logs;
14 13
15sub new { 14sub 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_xml $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
66sub logprint { 65sub 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
87sub _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
98sub _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
116my @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
90sub stats_update { 156sub 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
186my %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
207sub 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 ($x, $y) = (0, 1);
267 for (
268 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
269 map [$_, $self->{skill_info}{$_}],
270 grep exists $stats->{$_},
271 @skills
272 ) {
273 my ($idx, $name) = @$_;
274
275 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label
276 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]);
277 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label
278 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4);
279 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name);
280
281 $x++ and ($x, $y) = (0, $y + 1);
282 }
283 }
284
285 for (grep exists $stats->{$_}, @skills) {
286 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
287 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
288 }
101} 289}
102 290
103sub user_send { 291sub user_send {
104 my ($self, $command) = @_; 292 my ($self, $command) = @_;
105 293
… …
107 push @{$self->{record}}, $command; 295 push @{$self->{record}}, $command;
108 } 296 }
109 297
110 $self->logprint ("send: ", $command); 298 $self->logprint ("send: ", $command);
111 $self->send_command ($command); 299 $self->send_command ($command);
112 ::status $command; 300 ::status ($command);
113} 301}
114 302
115sub start_record { 303sub start_record {
116 my ($self) = @_; 304 my ($self) = @_;
117 305
… …
132sub feed_map1a { 320sub feed_map1a {
133 my ($self, $data) = @_; 321 my ($self, $data) = @_;
134 322
135 $self->{map}->map1a_update ($data); 323 $self->{map}->map1a_update ($data);
136 $self->{map_widget}->update; 324 $self->{map_widget}->update;
325}
326
327sub magicmap {
328 my ($self, $w, $h, $x, $y, $data) = @_;
329
330 $self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data);
137} 331}
138 332
139sub flush_map { 333sub flush_map {
140 my ($self) = @_; 334 my ($self) = @_;
141 335
… …
154 348
155 $self->flush_map; 349 $self->flush_map;
156 delete $self->{neigh_map}; 350 delete $self->{neigh_map};
157 351
158 $self->{map}->clear; 352 $self->{map}->clear;
353 delete $self->{map_widget}{magicmap};
159} 354}
160 355
161 356
162sub load_map($$$) { 357sub load_map($$$) {
163 my ($self, $hash, $x, $y) = @_; 358 my ($self, $hash, $x, $y) = @_;
… …
338 undef 533 undef
339 }; 534 };
340} 535}
341 536
342sub face_update { 537sub face_update {
343 my ($self, $facenum, $face) = @_; 538 my ($self, $facenum, $face, $changed) = @_;
344 539
345 $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes 540 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;
346 541
347 $self->set_texture ($face->{id} => delete $face->{image}); 542 $self->set_texture ($face->{id} => delete $face->{image});
348} 543}
349 544
350sub set_texture { 545sub set_texture {
… …
391 [0.11, 0.56, 1.00], 586 [0.11, 0.56, 1.00],
392 [0.93, 0.46, 0.00], 587 [0.93, 0.46, 0.00],
393 [0.18, 0.54, 0.34], 588 [0.18, 0.54, 0.34],
394 [0.56, 0.73, 0.56], 589 [0.56, 0.73, 0.56],
395 [0.80, 0.80, 0.80], 590 [0.80, 0.80, 0.80],
396 [0.55, 0.41, 0.13], 591 [0.75, 0.61, 0.20],
397 [0.99, 0.77, 0.26], 592 [0.99, 0.77, 0.26],
398 [0.74, 0.65, 0.41], 593 [0.74, 0.65, 0.41],
399 ); 594 );
400 595
401 $self->logprint ("info: ", $text); 596 $self->logprint ("info: ", $text);
… …
403 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 598 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
404 599
405 # try to create single paragraphs of multiple lines sent by the server 600 # try to create single paragraphs of multiple lines sent by the server
406 $text =~ s/(?<=\S)\n(?=\w)/ /g; 601 $text =~ s/(?<=\S)\n(?=\w)/ /g;
407 602
408 $text = CFClient::UI::Label::escape $text; 603 $text = CFClient::asxml $text;
409 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 604 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
410 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 605 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
411 606
412 $self->{logview}->add_paragraph ($color[$color], 607 $self->{logview}->add_paragraph ($color[$color], $_)
413 join "\n", map "$time $_", split /\n/, $text); 608 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
609 $self->{logview}->scroll_to_bottom;
414 610
415 $self->{statusbox}->add ($text, 611 $self->{statusbox}->add ($text,
416 group => $text, 612 group => $text,
417 fg => $color[$color], 613 fg => $color[$color],
418 timeout => $color >= 2 ? 60 : 10, 614 timeout => $color >= 2 ? 60 : 10,
… …
427} 623}
428 624
429sub spell_add { 625sub spell_add {
430 my ($self, $spell) = @_; 626 my ($self, $spell) = @_;
431 627
432 # try to create single paragraphs of multiple lines sent by the server 628 # try to create single paragraphs out of the multiple lines sent by the server
433 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 629 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
434 $spell->{message} =~ s/\n+$//; 630 $spell->{message} =~ s/\n+$//;
435 $spell->{message} ||= "Server did not provide a description for this spell."; 631 $spell->{message} ||= "Server did not provide a description for this spell.";
436 632
437 $::SETUP_SPELLS->add_spell ($spell); 633 $::SPELL_PAGE->add_spell ($spell);
438 634
439 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 635 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::asxml $spell->{message});
440 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 636 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::asxml $spell->{message});
441} 637}
442 638
443sub spell_delete { 639sub spell_delete {
444 my ($self, $spell) = @_; 640 my ($self, $spell) = @_;
641
445 $::SETUP_SPELLS->remove_spell ($spell); 642 $::SPELL_PAGE->remove_spell ($spell);
446} 643}
447 644
448sub addme_success { 645sub addme_success {
449 my ($self) = @_; 646 my ($self) = @_;
450 647
451 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub { 648 my $skill_help = CFClient::Pod::load CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
452 my ($pom) = @_; 649 my ($pom) = @_;
453 650
454 my %skill_help; 651 my %skill_help;
455 652
456 for my $head2 ($pom->head1->[3]->head2) { 653 for my $head2 ($pom->head1->[3]->head2) {
457 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 654 $skill_help{$head2->title} = CFClient::Pod::as_xml $head2->content;
458 } 655 }
459 656
460 \%skill_help 657 \%skill_help
461 }; 658 };
462 659
463 for my $skill (values %{$self->{skill_info}}) { 660 for my $skill (values %{$self->{skill_info}}) {
464 $self->{map_widget}->add_command ("ready_skill $skill", 661 $self->{map_widget}->add_command ("ready_skill $skill",
465 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 662 (CFClient::asxml "Ready the skill '$skill'\n\n")
466 . $skill_help->{$skill}); 663 . $skill_help->{$skill});
467 $self->{map_widget}->add_command ("use_skill $skill", 664 $self->{map_widget}->add_command ("use_skill $skill",
468 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 665 (CFClient::asxml "Immediately use the skill '$skill'\n\n")
469 . $skill_help->{$skill}); 666 . $skill_help->{$skill});
470 } 667 }
471} 668}
472 669
473sub eof { 670sub eof {
… …
498 695
499 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 696 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
500 697
501 $self->send ("requestinfo image_sums $face $face"); 698 $self->send ("requestinfo image_sums $face $face");
502 699
503 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 700 $self->{statusbox}->add (CFClient::asxml "prefetching $todo",
504 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 701 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
505 } elsif (!exists $self->{num_faces}) { 702 } elsif (!exists $self->{num_faces}) {
506 $self->send ("requestinfo image_info"); 703 $self->send ("requestinfo image_info");
507 704
508 $self->{num_faces} = 0; 705 $self->{num_faces} = 0;
509 706
510 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 707 $self->{statusbox}->add (CFClient::asxml "starting to prefetch",
511 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 708 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
512 } 709 }
513} 710}
514 711
515sub update_floorbox { 712sub update_floorbox {
516 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 713 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {
517 return unless $::CONN; 714 return unless $::CONN;
518 715
519 $::FLOORBOX->clear; 716 $::FLOORBOX->clear;
520 717
521 my $row; 718 my $row;
522 for (@{ $::CONN->{container}{0} }) { 719 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
523 if ($row < 6) { 720 if ($row < 6) {
524 local $_->{face_widget}; # hack to force recreation of widget 721 local $_->{face_widget}; # hack to force recreation of widget
525 local $_->{desc_widget}; # hack to force recreation of widget 722 local $_->{desc_widget}; # hack to force recreation of widget
526 CFClient::Item::update_widgets $_; 723 CFClient::Item::update_widgets $_;
527 724
… …
530 727
531 $row++; 728 $row++;
532 } else { 729 } else {
533 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 730 $::FLOORBOX->add (1, $row, new CFClient::UI::Button
534 text => "More...", 731 text => "More...",
535 on_activate => sub { $::INV_WINDOW->toggle_visibility }, 732 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
536 ); 733 );
537 last; 734 last;
538 } 735 }
539 } 736 }
737 if ($::CONN->{open_container}) {
738 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button
739 text => "Close container",
740 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
741 );
742 }
540 }); 743 });
541 744
542 $::WANT_REFRESH++; 745 $::WANT_REFRESH++;
543} 746}
544 747
545sub set_opencont { 748sub set_opencont {
546 my ($conn, $tag, $name) = @_; 749 my ($conn, $tag, $name) = @_;
547 $conn->{open_container} = $tag; 750 $conn->{open_container} = $tag;
751 update_floorbox;
548 752
549 $::INV_RIGHT_HB->clear (); 753 $::INV_RIGHT_HB->clear ();
550 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 754 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name);
551 755
552 if ($tag != 0) { # Floor isn't closable, is it? 756 if ($tag != 0) { # Floor isn't closable, is it?
… …
555 tooltip => "Close the currently open container (if one is open)", 759 tooltip => "Close the currently open container (if one is open)",
556 on_activate => sub { 760 on_activate => sub {
557 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 761 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
558 if $tag != 0; 762 if $tag != 0;
559 #if $CONN->{open_container} != 0; 763 #if $CONN->{open_container} != 0;
764 0
560 }, 765 },
561 ); 766 );
562 } 767 }
563 768
564 $::INVR->set_items ($conn->{container}{$tag}); 769 $::INVR->set_items ($conn->{container}{$tag});
565} 770}
566 771
567sub update_container { 772sub update_containers {
568 my ($tag) = @_; 773 my ($self) = @_;
569 774
570 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 775 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
776 my $todo = delete $self->{update_container}
777 or return;
778
779 for my $tag (keys %$todo) {
780 update_floorbox if $tag == 0 or $tag == $self->{open_container};
781 if ($tag == 0) {
782 $::INVR->set_items ($self->{container}{0})
571 if $tag == $::CONN->{open_container}; 783 if $tag == $self->{open_container};
784 } elsif ($tag == $self->{player}{tag}) {
785 $::INV->set_items ($self->{container}{$tag})
786 } else {
787 $::INVR->set_items ($self->{container}{$tag})
788 if $tag == $self->{open_container};
789 }
790 }
791 });
572} 792}
573 793
574sub container_add { 794sub container_add {
575 my ($self, $tag, $items) = @_; 795 my ($self, $tag, $items) = @_;
576 796
577 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 797 $self->{update_container}{$tag}++;
578 798 $self->update_containers;
579 if ($tag == 0) {
580 update_floorbox;
581 update_container (0);
582 } elsif ($tag == $self->{player}{tag}) {
583 $::INV->set_items ($self->{container}{$self->{player}{tag}})
584 } else {
585 update_container ($tag);
586 }
587
588 # $self-<{player}{tag} => player inv
589 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
590} 799}
591 800
592sub container_clear { 801sub container_clear {
593 my ($self, $tag) = @_; 802 my ($self, $tag) = @_;
594 803
595 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 804 $self->{update_container}{$tag}++;
596 805 $self->update_containers;
597 if ($tag == 0) {
598 update_floorbox;
599 update_container (0);
600 } elsif ($tag == $self->{player}{tag}) {
601 $::INV->set_items ($self->{container}{$tag})
602 } else {
603 update_container ($tag);
604 }
605
606# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
607} 806}
608 807
609sub item_delete { 808sub item_delete {
610 my ($self, @items) = @_; 809 my ($self, @items) = @_;
611 810
811 $self->{update_container}{$_->{container}}++
612 for (@items) { 812 for @items;
613 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
614
615 if ($_->{container} == 0) {
616 update_floorbox;
617 update_container ($_->{tag});
618 } elsif ($_->{container} == $self->{player}{tag}) {
619 $::INV->set_items ($self->{container}{$self->{player}{tag}})
620 } else {
621 update_container ($_->{container});
622 }
623 } 813
814 $self->update_containers;
624} 815}
625 816
626sub item_update { 817sub item_update {
627 my ($self, $item) = @_; 818 my ($self, $item) = @_;
628 819
629 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 820 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
630 821
631 if ($item->{tag} == $self->{player}{tag}) {
632 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
633 return;
634 }
635
636 CFClient::Item::update_widgets $item; 822 CFClient::Item::update_widgets $item;
637 823
638 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 824 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
639 set_opencont ($::CONN, 0, "Floor"); 825 set_opencont ($::CONN, 0, "Floor");
640 826
641 } elsif ($item->{flags} & F_OPEN) { 827 } elsif ($item->{flags} & F_OPEN) {
642 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 828 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
829
643 } else { 830 } else {
644 if ($item->{container} == 0) { 831 $self->{update_container}{$item->{container}}++;
645 update_floorbox;
646 update_container (0); 832 $self->update_containers;
647 } elsif ($item->{container} == $self->{player}{tag}) {
648 $::INV->set_items ($self->{container}{$item->{container}})
649 }
650 } 833 }
651} 834}
652 835
653sub player_update { 836sub player_update {
654 my ($self, $player) = @_; 837 my ($self, $player) = @_;
655 838
839 $self->update_weight;
840}
841
842sub update_weight {
843 my ($self) = @_;
844
845 my $weight = .001 * $self->{player}{weight};
846 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
847
656 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 848 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
849 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
850 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
657} 851}
658 852
659sub update_server_info { 853sub update_server_info {
660 my ($self) = @_; 854 my ($self) = @_;
661 855
… …
731 name => "npc_dialog", 925 name => "npc_dialog",
732 force_w => $::WIDTH * 0.7, 926 force_w => $::WIDTH * 0.7,
733 force_h => $::HEIGHT * 0.7, 927 force_h => $::HEIGHT * 0.7,
734 title => "NPC Dialog", 928 title => "NPC Dialog",
735 kw => { hi => 0, yes => 0, no => 0 }, 929 kw => { hi => 0, yes => 0, no => 0 },
930 has_close_button => 1,
736 @_, 931 @_,
737 ); 932 );
738 933
739 Scalar::Util::weaken (my $this = $self); 934 Scalar::Util::weaken (my $this = $self);
935
936 $self->connect (delete => sub { $this->destroy; 1 });
740 937
741 # better use a pane... 938 # better use a pane...
742 $self->add (my $hbox = new CFClient::UI::HBox); 939 $self->add (my $hbox = new CFClient::UI::HBox);
743 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 940 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);
744 941
… …
756 953
757 return unless $text =~ /\S/; 954 return unless $text =~ /\S/;
758 955
759 $entry->set_text (""); 956 $entry->set_text ("");
760 $this->send ($text); 957 $this->send ($text);
958
959 0
761 }, 960 },
762 ); 961 );
763 962
764 $vbox->add ($self->{options} = new CFClient::UI::VBox); 963 $vbox->add ($self->{options} = new CFClient::UI::VBox);
765 964
766 $self->{close_button} = new CFClient::UI::Button 965 $self->{bye_button} = new CFClient::UI::Button
767 text => "Bye (close)", 966 text => "Bye (close)",
768 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 967 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
769 on_activate => sub { $this->destroy }, 968 on_activate => sub { $this->destroy; 1 },
770 ; 969 ;
771 970
772 $self->update_options; 971 $self->update_options;
773 972
774 $self->{token} = $self->{conn}->ext_token; 973 $self->{token} = $self->{conn}->ext_token;
775 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 974 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
776 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 975 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
777 976
778 $self->{entry}->focus_in; 977 $self->{entry}->grab_focus;
779 978
780 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 979 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
781 980
782 $self->show; 981 $self->show;
783 $self 982 $self
… …
787 my ($self) = @_; 986 my ($self) = @_;
788 987
789 Scalar::Util::weaken $self; 988 Scalar::Util::weaken $self;
790 989
791 $self->{options}->clear; 990 $self->{options}->clear;
792 $self->{options}->add ($self->{close_button}); 991 $self->{options}->add ($self->{bye_button});
793 992
794 for my $kw (sort keys %{ $self->{kw} }) { 993 for my $kw (sort keys %{ $self->{kw} }) {
795 $self->{options}->add (new CFClient::UI::Button 994 $self->{options}->add (new CFClient::UI::Button
796 text => $kw, 995 text => $kw,
797 on_activate => sub { 996 on_activate => sub {
798 $self->send ($kw); 997 $self->send ($kw);
998 0
799 }, 999 },
800 ); 1000 );
801 } 1001 }
802} 1002}
803 1003
804sub feed { 1004sub feed {
805 my ($self, $data) = @_; 1005 my ($self, $data) = @_;
806 1006
1007 Scalar::Util::weaken $self;
1008
807 my ($type, $msg) = split / /, $data, 2; 1009 my ($type, $msg) = split / /, $data, 2;
808 1010
809 if ($type eq "msg") { 1011 if ($type eq "msg") {
810 my ($msg, @kw) = split /\x00/, $msg; 1012 my ($msg, @kw) = split /\x00/, $msg;
1013
1014 utf8::decode $_ for ($msg, @kw);
1015
811 $self->{kw}{$_} = 1 for @kw; 1016 $self->{kw}{$_} = 1 for @kw;
812 1017
813 $msg = CFClient::UI::Label::escape $msg; 1018 $msg = "\n" . CFClient::UI::asxml $msg;
814 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1019 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
815 $msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh. 1020 my @link;
1021 $msg =~ s{
1022 ($match)
1023 }{
1024 my $kw = $1;
1025
1026 push @link, new CFClient::UI::Label
1027 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1028 can_hover => 1,
1029 can_events => 1,
1030 padding_x => 0,
1031 padding_y => 0,
1032 on_button_up => sub {
1033 $self->send ($kw);
1034 };
1035
1036 chr 0xfffc
1037 }giex;
816 1038
817 $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg"); 1039 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
1040 $self->{textview}->scroll_to_bottom;
818 $self->update_options; 1041 $self->update_options;
819 } else { 1042 } else {
820 $self->destroy; 1043 $self->destroy;
821 } 1044 }
822 1045
… …
824} 1047}
825 1048
826sub send { 1049sub send {
827 my ($self, $msg) = @_; 1050 my ($self, $msg) = @_;
828 1051
1052 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::asxml $msg);
1053 $self->{textview}->scroll_to_bottom;
1054
1055 utf8::encode $msg;
829 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1056 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
830 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
831} 1057}
832 1058
833sub destroy { 1059sub destroy {
834 my ($self) = @_; 1060 my ($self) = @_;
835 1061
836 #Carp::cluck "debug\n";#d# #todo# enable: destroyx gets called twice because scalar keys {} is 1 1062 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
837 1063
1064 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token};
838 delete $self->{conn}{npc_dialog}; 1065 delete $self->{conn}{npc_dialog};
839 $self->{conn}->disconnect_ext ($self->{token}); 1066 $self->{conn}->disconnect_ext ($self->{token});
840 1067
841 $self->SUPER::destroy; 1068 $self->SUPER::destroy;
842} 1069}

Diff Legend

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