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.53 by root, Mon Jul 3 22:32:52 2006 UTC vs.
Revision 1.72 by root, Sun Aug 13 02:43:22 2006 UTC

1package CFClient::Protocol; 1package CFPlus::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFClient; 8use CFPlus;
9use CFClient::UI; 9use CFPlus::UI;
10use CFPlus::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 = map {
23 my ($pom) = @_;
24
25 my @cmd_help;
26
27 for my $head2 ($pom->head1->[-2]->head2) {
28 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
29 or next; 23 or die "unparseable command help: $_->{kw}[0]";
30 24
31 my $cmd = $1; 25 my $cmd = $1;
32 my @args = split /\|/, $2; 26 my @args = split /\|/, $2;
33 @args = (".*") unless @args; 27 @args = (".*") unless @args;
34 28
29 my (undef, @par) = CFPlus::Pod::section_of $_;
30 my $text = CFPlus::Pod::as_label @par;
31
35 $_ = $_ eq ".*" ? "" : " $_" 32 $_ = $_ eq ".*" ? "" : " $_"
36 for @args; 33 for @args;
37 34
38 my $text = CFClient::pod_to_pango $head2->content; 35 map ["$cmd$_", $text],
39
40 push @cmd_help, ["$cmd$_", $text]
41 for sort { (length $a) <=> (length $b) } 36 sort { (length $a) <=> (length $b) }
42 @args; 37 @args
43 } 38 } CFPlus::Pod::find command_help => "*";
44 39
45 \@cmd_help
46 };
47
48 $self->{map_widget}->add_command (@$_) 40 $self->{map_widget}->add_command (@$_)
49 for @$cmd_help; 41 for @cmd_help;
50 42
51 $self->{noface} = new_from_file CFClient::Texture 43 $self->{noface} = new_from_file CFPlus::Texture
52 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 44 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
53 45
54 $self->{open_container} = 0; 46 $self->{open_container} = 0;
55 47
56 # "global" 48 # "global"
57 $self->{tilecache} = CFClient::db_table "tilecache"; 49 $self->{tilecache} = CFPlus::db_table "tilecache";
58 $self->{facemap} = CFClient::db_table "facemap"; 50 $self->{facemap} = CFPlus::db_table "facemap";
59 51
60 # per server 52 # per server
61 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 53 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}";
62 54
63 $self 55 $self
64} 56}
65 57
66sub logprint { 58sub logprint {
67 my ($self, @a) = @_; 59 my ($self, @a) = @_;
60
61 $self->{log_fh} ||= do {
68 my $filename = "$Crossfire::VARDIR/log.$self->{host}"; 62 my $path = "$Crossfire::VARDIR/log.$self->{host}";
69 63
70 my $fh = $open_logs{$filename}; 64 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}: $!"; 65 or die "Couldn't open logfile $path: $!";
75 66
76 $open_logs{$filename} = $fh; 67 $fh->autoflush (1);
68
69 $fh;
77 } 70 };
78 71
79 my ($sec, $min, $hour, $mday, $mon, $year) = localtime (time); 72 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
80 73
81 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", 74 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
82 $year + 1900, $mon + 1, $mday, $hour, $min, $sec; 75 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
83 76
84 print $fh "$ts ", @a, "\n"; 77 print {$self->{log_fh}} "$ts ", @a, "\n";
85 $fh->flush;
86} 78}
87 79
88sub _stat_numdiff { 80sub _stat_numdiff {
89 my ($self, $old, $new) = @_; 81 my ($self, $name, $old, $new) = @_;
90 82
91 my $diff = $new - $old; 83 my $diff = $new - $old;
92 $diff > 0 ? "+$diff" : $diff 84
85 $diff = 0.01 * int $diff * 100;
86
87 0.1 >= abs $diff ? ()
88 : $diff < 0 ? "$name$diff" : "$name+$diff"
93} 89}
94 90
95sub _stat_skillmaskdiff { 91sub _stat_skillmaskdiff {
96 my ($self, $old, $new) = @_; 92 my ($self, $name, $old, $new) = @_;
97 93
98 my $diff = $old ^ $new; 94 my $diff = $old ^ $new
95 or return;
99 96
100 my @diff = map 97 my @diff = map
101 { 98 {
102 $diff & $_ 99 $diff & $_
103 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 100 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
… …
150); 147);
151 148
152sub stats_update { 149sub stats_update {
153 my ($self, $stats) = @_; 150 my ($self, $stats) = @_;
154 151
155 if (my $prev = $self->{prev_stats}) { 152 my $prev = $self->{prev_stats} || { };
156 if (my $diff = $stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) { 153
154 if (my @diffs =
155 (
156 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
157 map {
158 $stats->{$_} && $prev->{$_}
159 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
160 } sort { $a <=> $b } keys %{$self->{skill_info}}
161 )
162 ) {
163 my $msg = join " ", @diffs;
157 $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5); 164 $self->{statusbox}->add ($msg, group => "experience $msg", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
165 }
166
167 if (
168 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
169 ) {
170 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
171 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
172 }
173
174 $self->update_stats_window ($stats, $prev);
175
176 $self->{prev_stats} = { %$stats };
177}
178
179my %RES_TBL = (
180 phys => CS_STAT_RES_PHYS,
181 magic => CS_STAT_RES_MAG,
182 fire => CS_STAT_RES_FIRE,
183 elec => CS_STAT_RES_ELEC,
184 cold => CS_STAT_RES_COLD,
185 conf => CS_STAT_RES_CONF,
186 acid => CS_STAT_RES_ACID,
187 drain => CS_STAT_RES_DRAIN,
188 ghit => CS_STAT_RES_GHOSTHIT,
189 pois => CS_STAT_RES_POISON,
190 slow => CS_STAT_RES_SLOW,
191 para => CS_STAT_RES_PARA,
192 tund => CS_STAT_TURN_UNDEAD,
193 fear => CS_STAT_RES_FEAR,
194 depl => CS_STAT_RES_DEPLETE,
195 deat => CS_STAT_RES_DEATH,
196 holyw => CS_STAT_RES_HOLYWORD,
197 blind => CS_STAT_RES_BLIND,
198);
199
200sub update_stats_window {
201 my ($self, $stats, $prev) = @_;
202
203 # I love text protocols...
204
205 my $hp = $stats->{+CS_STAT_HP} * 1;
206 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
207 my $sp = $stats->{+CS_STAT_SP} * 1;
208 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
209 my $fo = $stats->{+CS_STAT_FOOD} * 1;
210 my $fo_m = 999;
211 my $gr = $stats->{+CS_STAT_GRACE} * 1;
212 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
213
214 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
215 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
216 $::GAUGES->{food} ->set_value ($fo, $fo_m);
217 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
218 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
219 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
220 my $rng = $stats->{+CS_STAT_RANGE};
221 $rng =~ s/^Range: //; # thank you so much dear server
222 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
223 my $title = $stats->{+CS_STAT_TITLE};
224 $title =~ s/^Player: //;
225 $::STATWIDS->{title} ->set_text ("Title: " . $title);
226
227 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
228 $::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
229 $::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
230 $::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
231 $::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
232 $::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
233 $::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
234 $::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
235 $::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
236 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
237 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
238 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
239 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
240
241 $self->update_weight;
242
243 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
244 for keys %RES_TBL;
245
246 my $sktbl = $::STATWIDS->{skill_tbl};
247 my @skills = keys %{ $self->{skill_info} };
248
249 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
250 $sktbl->clear;
251
252 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
253 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
254 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
255 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
256 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
257 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
258
259 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
260
261 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
262 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
263 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
264
265 my ($x, $y) = (0, 1);
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 my $spell_cb = sub {
275 my ($widget, $ev) = @_;
276
277 if ($ev->{button} == 1) {
278 $::CONN->user_send ("ready_skill $name");
279 } elsif ($ev->{button} == 2) {
280 $::CONN->user_send ("use_skill $name");
281 } elsif ($ev->{button} == 3) {
282 (new CFPlus::UI::Menu
283 items => [
284 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],
285 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],
286 ],
287 )->popup ($ev);
288 } else {
289 return 0;
290 }
291
292 1
293 };
294
295 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
296 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
297 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
298 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
299 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME);
300
301 $x++ and ($x, $y) = (0, $y + 1);
158 } 302 }
159
160 if (
161 my @diffs = map {
162 $stats->{$_->[0]} != $prev->{$_->[0]}
163 ? $_->[2] . $_->[1]->($self, $prev->{$_->[0]}, $stats->{$_->[0]}) : ();
164 }
165 @statchange
166 ) {
167 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
168 $self->{statusbox}->add ($msg, group => $msg, fg => [0.8, 1, 0.2, 1], timeout => 10);
169 }
170 } 303 }
171 304
172 $self->{prev_stats} = { %$stats }; 305 for (grep exists $stats->{$_}, @skills) {
173 306 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
174 ::update_stats_window ($stats); 307 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
308 }
175} 309}
176 310
177sub user_send { 311sub user_send {
178 my ($self, $command) = @_; 312 my ($self, $command) = @_;
179 313
… …
384 518
385 unless ($id) { 519 unless ($id) {
386 # create new id for face 520 # create new id for face
387 # I love transactions 521 # I love transactions
388 for (1..100) { 522 for (1..100) {
389 my $txn = $CFClient::DB_ENV->txn_begin; 523 my $txn = $CFPlus::DB_ENV->txn_begin;
390 my $status = $self->{facemap}->db_get (id => $id); 524 my $status = $self->{facemap}->db_get (id => $id);
391 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 525 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
392 $id = ($id || 64) + 1; 526 $id = ($id || 64) + 1;
393 if ($self->{facemap}->put (id => $id) == 0 527 if ($self->{facemap}->put (id => $id) == 0
394 && $self->{facemap}->put ($hash => $id) == 0) { 528 && $self->{facemap}->put ($hash => $id) == 0) {
… …
398 } 532 }
399 } 533 }
400 $txn->txn_abort; 534 $txn->txn_abort;
401 } 535 }
402 536
403 CFClient::fatal "maximum number of transaction retries reached - database problems?"; 537 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
404 } 538 }
405 539
406gotid: 540gotid:
407 $face->{id} = $id; 541 $face->{id} = $id;
408 $self->{map}->set_face ($facenum => $id); 542 $self->{map}->set_face ($facenum => $id);
… …
419 undef 553 undef
420 }; 554 };
421} 555}
422 556
423sub face_update { 557sub face_update {
424 my ($self, $facenum, $face) = @_; 558 my ($self, $facenum, $face, $changed) = @_;
425 559
426 $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes 560 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;
427 561
428 $self->set_texture ($face->{id} => delete $face->{image}); 562 $self->set_texture ($face->{id} => delete $face->{image});
429} 563}
430 564
431sub set_texture { 565sub set_texture {
432 my ($self, $id, $data) = @_; 566 my ($self, $id, $data) = @_;
433 567
434 $self->{texture}[$id] ||= do { 568 $self->{texture}[$id] ||= do {
435 my $tex = 569 my $tex =
436 new_from_image CFClient::Texture 570 new_from_image CFPlus::Texture
437 $data, minify => 1, mipmap => 1; 571 $data, minify => 1, mipmap => 1;
438 572
439 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 573 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
440 $self->{map_widget}->update; 574 $self->{map_widget}->update;
441 575
… …
472 [0.11, 0.56, 1.00], 606 [0.11, 0.56, 1.00],
473 [0.93, 0.46, 0.00], 607 [0.93, 0.46, 0.00],
474 [0.18, 0.54, 0.34], 608 [0.18, 0.54, 0.34],
475 [0.56, 0.73, 0.56], 609 [0.56, 0.73, 0.56],
476 [0.80, 0.80, 0.80], 610 [0.80, 0.80, 0.80],
477 [0.55, 0.41, 0.13], 611 [0.75, 0.61, 0.20],
478 [0.99, 0.77, 0.26], 612 [0.99, 0.77, 0.26],
479 [0.74, 0.65, 0.41], 613 [0.74, 0.65, 0.41],
480 ); 614 );
481 615
482 $self->logprint ("info: ", $text); 616 $self->logprint ("info: ", $text);
… …
484 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 618 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
485 619
486 # try to create single paragraphs of multiple lines sent by the server 620 # try to create single paragraphs of multiple lines sent by the server
487 $text =~ s/(?<=\S)\n(?=\w)/ /g; 621 $text =~ s/(?<=\S)\n(?=\w)/ /g;
488 622
489 $text = CFClient::UI::Label::escape $text; 623 $text = CFPlus::asxml $text;
490 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 624 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
491 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 625 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
492 626
493 $self->{logview}->add_paragraph ($color[$color], $_) 627 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
494 for map "$time $_", split /\n/, $text; 628 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
495 $self->{logview}->scroll_to_bottom; 629 $self->{logview}->scroll_to_bottom;
496 630
497 $self->{statusbox}->add ($text, 631 $self->{statusbox}->add ($text,
498 group => $text, 632 group => $text,
499 fg => $color[$color], 633 fg => $color[$color],
500 timeout => $color >= 2 ? 60 : 10, 634 timeout => $color >= 2 ? 180 : 10,
501 tooltip_font => $::FONT_FIXED, 635 tooltip_font => $::FONT_FIXED,
502 ); 636 );
503} 637}
504 638
505sub drawextinfo { 639sub drawextinfo {
… …
509} 643}
510 644
511sub spell_add { 645sub spell_add {
512 my ($self, $spell) = @_; 646 my ($self, $spell) = @_;
513 647
514 # try to create single paragraphs of multiple lines sent by the server 648 # try to create single paragraphs out of the multiple lines sent by the server
515 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 649 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
516 $spell->{message} =~ s/\n+$//; 650 $spell->{message} =~ s/\n+$//;
517 $spell->{message} ||= "Server did not provide a description for this spell."; 651 $spell->{message} ||= "Server did not provide a description for this spell.";
518 652
519 $::SPELL_PAGE->add_spell ($spell); 653 $::SPELL_PAGE->add_spell ($spell);
520 654
521 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 655 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
522 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 656 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
523} 657}
524 658
525sub spell_delete { 659sub spell_delete {
526 my ($self, $spell) = @_; 660 my ($self, $spell) = @_;
527 661
… …
529} 663}
530 664
531sub addme_success { 665sub addme_success {
532 my ($self) = @_; 666 my ($self) = @_;
533 667
534 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
535 my ($pom) = @_;
536
537 my %skill_help; 668 my %skill_help;
538 669
539 for my $head2 ($pom->head1->[3]->head2) { 670 for my $node (CFPlus::Pod::find skill_description => "*") {
540 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 671 my (undef, @par) = CFPlus::Pod::section_of $node;
541 } 672 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
542
543 \%skill_help
544 }; 673 };
545 674
546 for my $skill (values %{$self->{skill_info}}) { 675 for my $skill (values %{$self->{skill_info}}) {
547 $self->{map_widget}->add_command ("ready_skill $skill", 676 $self->{map_widget}->add_command ("ready_skill $skill",
548 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 677 (CFPlus::asxml "Ready the skill '$skill'\n\n")
549 . $skill_help->{$skill}); 678 . $skill_help{$skill});
550 $self->{map_widget}->add_command ("use_skill $skill", 679 $self->{map_widget}->add_command ("use_skill $skill",
551 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 680 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
552 . $skill_help->{$skill}); 681 . $skill_help{$skill});
553 } 682 }
554} 683}
555 684
556sub eof { 685sub eof {
557 my ($self) = @_; 686 my ($self) = @_;
… …
581 710
582 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 711 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
583 712
584 $self->send ("requestinfo image_sums $face $face"); 713 $self->send ("requestinfo image_sums $face $face");
585 714
586 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 715 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
587 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 716 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
588 } elsif (!exists $self->{num_faces}) { 717 } elsif (!exists $self->{num_faces}) {
589 $self->send ("requestinfo image_info"); 718 $self->send ("requestinfo image_info");
590 719
591 $self->{num_faces} = 0; 720 $self->{num_faces} = 0;
592 721
593 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 722 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
594 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 723 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
595 } 724 }
596} 725}
597 726
598sub update_floorbox { 727sub update_floorbox {
599 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 728 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
600 return unless $::CONN; 729 return unless $::CONN;
601 730
602 $::FLOORBOX->clear; 731 $::FLOORBOX->clear;
603 732
604 my $row; 733 my $row;
605 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) { 734 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
606 if ($row < 6) { 735 if ($row < 6) {
607 local $_->{face_widget}; # hack to force recreation of widget 736 local $_->{face_widget}; # hack to force recreation of widget
608 local $_->{desc_widget}; # hack to force recreation of widget 737 local $_->{desc_widget}; # hack to force recreation of widget
609 CFClient::Item::update_widgets $_; 738 CFPlus::Item::update_widgets $_;
610 739
611 $::FLOORBOX->add (0, $row, $_->{face_widget}); 740 $::FLOORBOX->add (0, $row, $_->{face_widget});
612 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 741 $::FLOORBOX->add (1, $row, $_->{desc_widget});
613 742
614 $row++; 743 $row++;
615 } else { 744 } else {
616 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 745 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
617 text => "More...", 746 text => "More...",
618 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 747 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
619 ); 748 );
620 last; 749 last;
621 } 750 }
622 } 751 }
752 if ($::CONN->{open_container}) {
753 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
754 text => "Close container",
755 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
756 );
757 }
623 }); 758 });
624 759
625 $::WANT_REFRESH++; 760 $::WANT_REFRESH++;
626} 761}
627 762
628sub set_opencont { 763sub set_opencont {
629 my ($conn, $tag, $name) = @_; 764 my ($conn, $tag, $name) = @_;
630 $conn->{open_container} = $tag; 765 $conn->{open_container} = $tag;
766 update_floorbox;
631 767
632 $::INV_RIGHT_HB->clear (); 768 $::INV_RIGHT_HB->clear ();
633 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 769 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
634 770
635 if ($tag != 0) { # Floor isn't closable, is it? 771 if ($tag != 0) { # Floor isn't closable, is it?
636 $::INV_RIGHT_HB->add (new CFClient::UI::Button 772 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
637 text => "Close container", 773 text => "Close container",
638 tooltip => "Close the currently open container (if one is open)", 774 tooltip => "Close the currently open container (if one is open)",
639 on_activate => sub { 775 on_activate => sub {
640 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 776 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
641 if $tag != 0; 777 if $tag != 0;
… …
649} 785}
650 786
651sub update_containers { 787sub update_containers {
652 my ($self) = @_; 788 my ($self) = @_;
653 789
654 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 790 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
655 for my $tag (keys %{ delete $self->{update_container} }) { 791 my $todo = delete $self->{update_container}
792 or return;
793
794 for my $tag (keys %$todo) {
795 update_floorbox if $tag == 0 or $tag == $self->{open_container};
656 if ($tag == 0) { 796 if ($tag == 0) {
657 update_floorbox;
658 $::INVR->set_items ($self->{container}{0}) 797 $::INVR->set_items ($self->{container}{0})
659 if $tag == $self->{open_container}; 798 if $tag == $self->{open_container};
660 } elsif ($tag == $self->{player}{tag}) { 799 } elsif ($tag == $self->{player}{tag}) {
661 $::INV->set_items ($self->{container}{$tag}) 800 $::INV->set_items ($self->{container}{$tag})
662 } else { 801 } else {
… …
693sub item_update { 832sub item_update {
694 my ($self, $item) = @_; 833 my ($self, $item) = @_;
695 834
696 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 835 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
697 836
698 CFClient::Item::update_widgets $item; 837 CFPlus::Item::update_widgets $item;
699 838
700 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 839 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
701 set_opencont ($::CONN, 0, "Floor"); 840 set_opencont ($::CONN, 0, "Floor");
702 841
703 } elsif ($item->{flags} & F_OPEN) { 842 } elsif ($item->{flags} & F_OPEN) {
704 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 843 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
705 844
706 } else { 845 } else {
707 $self->{update_container}{$item->{container}}++; 846 $self->{update_container}{$item->{container}}++;
708 $self->update_containers; 847 $self->update_containers;
709# if ($item->{container} == 0) {
710# update_floorbox;
711# update_container (0);
712# } elsif ($item->{container} == $self->{player}{tag}) {
713# $::INV->set_items ($self->{container}{$item->{container}})
714# }
715 } 848 }
716} 849}
717 850
718sub player_update { 851sub player_update {
719 my ($self, $player) = @_; 852 my ($self, $player) = @_;
853
854 $self->update_weight;
855}
856
857sub update_weight {
858 my ($self) = @_;
859
860 my $weight = .001 * $self->{player}{weight};
861 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
862
720 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 863 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
864 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
865 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
721} 866}
722 867
723sub update_server_info { 868sub update_server_info {
724 my ($self) = @_; 869 my ($self) = @_;
725 870
… …
737} 882}
738 883
739sub logged_in { 884sub logged_in {
740 my ($self) = @_; 885 my ($self) = @_;
741 886
742 $self->send_ext_req (cfplus_support => "1", sub { 887 $self->send_ext_req (cfplus_support => version => 1, sub {
743 $self->{cfplus_ext} = $_[0]; 888 $self->{cfplus_ext} = $_[0]{version};
744 $self->update_server_info; 889 $self->update_server_info;
890
891 0
745 }); 892 });
746 893
747 $self->update_server_info; 894 $self->update_server_info;
748 895
749 $self->send_command ("output-sync $::CFG->{output_sync}"); 896 $self->send_command ("output-sync $::CFG->{output_sync}");
… …
753 900
754sub lookat { 901sub lookat {
755 my ($self, $x, $y) = @_; 902 my ($self, $x, $y) = @_;
756 903
757 if ($self->{cfplus_ext}) { 904 if ($self->{cfplus_ext}) {
758 $self->send_ext_req (lookat => "$x $y", sub { 905 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
759 my %res = split /\x00/, $_[0]; 906 my ($msg) = @_;
760 907
761 if (exists $res{npc_dialog}) { 908 if (exists $msg->{npc_dialog}) {
762 # start npc chat dialog 909 # start npc chat dialog
763 $self->{npc_dialog} = new CFClient::NPCDialog:: 910 $self->{npc_dialog} = new CFPlus::NPCDialog::
764 dx => $x, 911 dx => $x,
765 dy => $y, 912 dy => $y,
766 title => "$res{npc_dialog} (NPC)", 913 title => "$msg->{npc_dialog} (NPC)",
767 conn => $self, 914 conn => $self,
768 ; 915 ;
769 } 916 }
770 }); 917 });
771 } 918 }
… …
780 if $self->{npc_dialog}; 927 if $self->{npc_dialog};
781 928
782 $self->SUPER::destroy; 929 $self->SUPER::destroy;
783} 930}
784 931
785package CFClient::NPCDialog; 932package CFPlus::NPCDialog;
786 933
787our @ISA = 'CFClient::UI::FancyFrame'; 934our @ISA = 'CFPlus::UI::FancyFrame';
788 935
789sub new { 936sub new {
790 my $class = shift; 937 my $class = shift;
791 938
792 my $self = $class->SUPER::new ( 939 my $self = $class->SUPER::new (
… …
795 name => "npc_dialog", 942 name => "npc_dialog",
796 force_w => $::WIDTH * 0.7, 943 force_w => $::WIDTH * 0.7,
797 force_h => $::HEIGHT * 0.7, 944 force_h => $::HEIGHT * 0.7,
798 title => "NPC Dialog", 945 title => "NPC Dialog",
799 kw => { hi => 0, yes => 0, no => 0 }, 946 kw => { hi => 0, yes => 0, no => 0 },
947 has_close_button => 1,
800 @_, 948 @_,
801 ); 949 );
802 950
803 Scalar::Util::weaken (my $this = $self); 951 Scalar::Util::weaken (my $this = $self);
804 952
953 $self->connect (delete => sub { $this->destroy; 1 });
954
805 # better use a pane... 955 # better use a pane...
806 $self->add (my $hbox = new CFClient::UI::HBox); 956 $self->add (my $hbox = new CFPlus::UI::HBox);
807 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 957 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
808 958
809 $hbox->add (my $vbox = new CFClient::UI::VBox); 959 $hbox->add (my $vbox = new CFPlus::UI::VBox);
810 960
811 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 961 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
812 $vbox->add ($self->{entry} = new CFClient::UI::Entry 962 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
813 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 963 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"
814 . "Sometimes you have to tell an NPC something you cannot find out during " 964 . "Sometimes you have to tell an NPC something you cannot find out during "
815 . "a normal conversation (such as a password). In those cases you have to use " 965 . "a normal conversation (such as a password). In those cases you have to use "
816 . "this text entry. You can also enter responses manually instead of using the response " 966 . "this text entry. You can also enter responses manually instead of using the response "
817 . "buttons below.", 967 . "buttons below.",
… …
825 975
826 0 976 0
827 }, 977 },
828 ); 978 );
829 979
830 $vbox->add ($self->{options} = new CFClient::UI::VBox); 980 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
831 981
832 $self->{bye_button} = new CFClient::UI::Button 982 $self->{bye_button} = new CFPlus::UI::Button
833 text => "Bye (close)", 983 text => "Bye (close)",
834 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 984 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
835 on_activate => sub { $this->destroy; 0 }, 985 on_activate => sub { $this->destroy; 1 },
836 ; 986 ;
837 987
838 $self->update_options; 988 $self->update_options;
839 989
840 $self->{token} = $self->{conn}->ext_token; 990 $self->{id} = $self->{conn}->send_ext_req (
841 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 991 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
842 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 992 sub { $this && $this->feed (@_) }
993 );
843 994
844 $self->{entry}->grab_focus; 995 $self->{entry}->grab_focus;
845 996
846 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 997 $self->{textview}->add_paragraph ({
998 fg => [1, 1, 0, 1],
999 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1000 });
847 1001
848 $self->show; 1002 $self->show;
849 $self 1003 $self
850}; 1004};
851 1005
… …
856 1010
857 $self->{options}->clear; 1011 $self->{options}->clear;
858 $self->{options}->add ($self->{bye_button}); 1012 $self->{options}->add ($self->{bye_button});
859 1013
860 for my $kw (sort keys %{ $self->{kw} }) { 1014 for my $kw (sort keys %{ $self->{kw} }) {
861 $self->{options}->add (new CFClient::UI::Button 1015 $self->{options}->add (new CFPlus::UI::Button
862 text => $kw, 1016 text => $kw,
863 on_activate => sub { 1017 on_activate => sub {
864 $self->send ($kw); 1018 $self->send ($kw);
865 0 1019 0
866 }, 1020 },
867 ); 1021 );
868 } 1022 }
869} 1023}
870 1024
871sub feed { 1025sub feed {
872 my ($self, $data) = @_; 1026 my ($self, $msg) = @_;
873 1027
874 Scalar::Util::weaken $self; 1028 Scalar::Util::weaken $self;
875 1029
876 my ($type, $msg) = split / /, $data, 2; 1030 if ($msg->{msgtype} eq "reply") {
1031 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1032 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
877 1033
878 if ($type eq "msg") { 1034 my $text = "\n" . CFPlus::asxml $msg->{msg};
879 my ($msg, @kw) = split /\x00/, $msg;
880 $self->{kw}{$_} = 1 for @kw;
881
882 $msg = "\n" . CFClient::UI::Label::escape $msg;
883 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1035 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
884 my @link; 1036 my @link;
885 $msg =~ s{ 1037 $text =~ s{
886 ($match) 1038 ($match)
887 }{ 1039 }{
888 my $kw = $1; 1040 my $kw = $1;
889 1041
890 push @link, new CFClient::UI::Label 1042 push @link, new CFPlus::UI::Label
891 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1043 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
892 can_hover => 1, 1044 can_hover => 1,
893 can_events => 1, 1045 can_events => 1,
894 padding_x => 0, 1046 padding_x => 0,
895 padding_y => 0, 1047 padding_y => 0,
… …
898 }; 1050 };
899 1051
900 chr 0xfffc 1052 chr 0xfffc
901 }giex; 1053 }giex;
902 1054
903 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1055 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
904 $self->{textview}->scroll_to_bottom; 1056 $self->{textview}->scroll_to_bottom;
905 $self->update_options; 1057 $self->update_options;
906 } else { 1058 } else {
907 $self->destroy; 1059 $self->destroy;
908 } 1060 }
… …
911} 1063}
912 1064
913sub send { 1065sub send {
914 my ($self, $msg) = @_; 1066 my ($self, $msg) = @_;
915 1067
916 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1068 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
917 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
918 $self->{textview}->scroll_to_bottom; 1069 $self->{textview}->scroll_to_bottom;
1070
1071 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
919} 1072}
920 1073
921sub destroy { 1074sub destroy {
922 my ($self) = @_; 1075 my ($self) = @_;
923 1076
924 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1077 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
925 1078
1079 if ($self->{conn}) {
1080 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
926 delete $self->{conn}{npc_dialog}; 1081 delete $self->{conn}{npc_dialog};
927 $self->{conn}->disconnect_ext ($self->{token}); 1082 $self->{conn}->disconnect_ext ($self->{id});
1083 }
928 1084
929 $self->SUPER::destroy; 1085 $self->SUPER::destroy;
930} 1086}
931 1087
9321; 10881

Diff Legend

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