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

Diff Legend

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