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.17 by root, Sat Jun 3 02:39:27 2006 UTC vs.
Revision 1.66 by root, Sun Jul 23 16:48:48 2006 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFClient;
8use CFClient::UI; 9use CFClient::UI;
10use CFClient::Pod;
9 11
10use base 'Crossfire::Protocol::Base'; 12use base 'Crossfire::Protocol::Base';
11 13
12sub new { 14sub new {
13 my $class = shift; 15 my $class = shift;
14 16
15 my $self = $class->SUPER::new (@_); 17 my $self = $class->SUPER::new (@_);
16 18
17 $self->{map_widget}->clr_commands; 19 $self->{map_widget}->clr_commands;
18 20
19 my $parser = new Pod::POM; 21 my $cmd_help = CFClient::Pod::load CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub {
20 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod"); 22 my ($pom) = @_;
21 23
24 my @cmd_help;
25
22 for my $head2 ($pod->head1->[-2]->head2) { 26 for my $head2 ($pom->head1->[-2]->head2) {
23 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 27 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
24 or next; 28 or next;
25 29
26 my $cmd = $1; 30 my $cmd = $1;
27 my @args = split /\|/, $2; 31 my @args = split /\|/, $2;
28 @args = (".*") unless @args; 32 @args = (".*") unless @args;
29 33
30 $_ = $_ eq ".*" ? "" : " $_" 34 $_ = $_ eq ".*" ? "" : " $_"
31 for @args; 35 for @args;
32 36
33 my $text = CFClient::pod_to_pango $head2->content; 37 my $text = CFClient::Pod::as_xml $head2->content;
34 38
35 $self->{map_widget}->add_command ("$cmd$_", $text) 39 push @cmd_help, ["$cmd$_", $text]
36 for sort { (length $a) <=> (length $b) } 40 for sort { (length $a) <=> (length $b) }
37 @args; 41 @args;
42 }
43
44 \@cmd_help
38 } 45 };
46
47 $self->{map_widget}->add_command (@$_)
48 for @$cmd_help;
39 49
40 $self->{noface} = new_from_file CFClient::Texture 50 $self->{noface} = new_from_file CFClient::Texture
41 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 51 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
42 52
43 $self->{open_container} = 0; 53 $self->{open_container} = 0;
50 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 60 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";
51 61
52 $self 62 $self
53} 63}
54 64
65sub logprint {
66 my ($self, @a) = @_;
67
68 $self->{log_fh} ||= do {
69 my $path = "$Crossfire::VARDIR/log.$self->{host}";
70
71 open my $fh, ">>:utf8", $path
72 or die "Couldn't open logfile $path: $!";
73
74 $fh->autoflush (1);
75
76 $fh;
77 };
78
79 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
80
81 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
82 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
83
84 print {$self->{log_fh}} "$ts ", @a, "\n";
85}
86
87sub _stat_numdiff {
88 my ($self, $name, $old, $new) = @_;
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);
155
55sub stats_update { 156sub stats_update {
56 my ($self, $stats) = @_; 157 my ($self, $stats) = @_;
57 158
58 if (my $exp = $stats->{+CS_STAT_EXP64}) { 159 my $prev = $self->{prev_stats} || { };
59 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;
60 $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);
61 if exists $self->{prev_exp} && $diff;
62 $self->{prev_exp} = $exp;
63 } 172 }
64 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
65 ::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 }
66} 289}
67 290
68sub user_send { 291sub user_send {
69 my ($self, $command) = @_; 292 my ($self, $command) = @_;
70 293
71 if ($self->{record}) { 294 if ($self->{record}) {
72 push @{$self->{record}}, $command; 295 push @{$self->{record}}, $command;
73 } 296 }
74 297
298 $self->logprint ("send: ", $command);
75 $self->send_command ($command); 299 $self->send_command ($command);
76 ::status $command; 300 ::status ($command);
77} 301}
78 302
79sub start_record { 303sub start_record {
80 my ($self) = @_; 304 my ($self) = @_;
81 305
96sub feed_map1a { 320sub feed_map1a {
97 my ($self, $data) = @_; 321 my ($self, $data) = @_;
98 322
99 $self->{map}->map1a_update ($data); 323 $self->{map}->map1a_update ($data);
100 $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);
101} 331}
102 332
103sub flush_map { 333sub flush_map {
104 my ($self) = @_; 334 my ($self) = @_;
105 335
118 348
119 $self->flush_map; 349 $self->flush_map;
120 delete $self->{neigh_map}; 350 delete $self->{neigh_map};
121 351
122 $self->{map}->clear; 352 $self->{map}->clear;
353 delete $self->{map_widget}{magicmap};
123} 354}
124 355
125 356
126sub load_map($$$) { 357sub load_map($$$) {
127 my ($self, $hash, $x, $y) = @_; 358 my ($self, $hash, $x, $y) = @_;
270 # I love transactions 501 # I love transactions
271 for (1..100) { 502 for (1..100) {
272 my $txn = $CFClient::DB_ENV->txn_begin; 503 my $txn = $CFClient::DB_ENV->txn_begin;
273 my $status = $self->{facemap}->db_get (id => $id); 504 my $status = $self->{facemap}->db_get (id => $id);
274 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 505 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
275 $id = ($id || 16) + 1; 506 $id = ($id || 64) + 1;
276 if ($self->{facemap}->put (id => $id) == 0 507 if ($self->{facemap}->put (id => $id) == 0
277 && $self->{facemap}->put ($hash => $id) == 0) { 508 && $self->{facemap}->put ($hash => $id) == 0) {
278 $txn->txn_commit; 509 $txn->txn_commit;
279 510
280 goto gotid; 511 goto gotid;
302 undef 533 undef
303 }; 534 };
304} 535}
305 536
306sub face_update { 537sub face_update {
307 my ($self, $facenum, $face) = @_; 538 my ($self, $facenum, $face, $changed) = @_;
308 539
309 $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes 540 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;
310 541
311 $self->set_texture ($face->{id} => delete $face->{image}); 542 $self->set_texture ($face->{id} => delete $face->{image});
312} 543}
313 544
314sub set_texture { 545sub set_texture {
338 my ($self, $flags, $prompt) = @_; 569 my ($self, $flags, $prompt) = @_;
339 570
340 $prompt = $LAST_QUERY unless length $prompt; 571 $prompt = $LAST_QUERY unless length $prompt;
341 $LAST_QUERY = $prompt; 572 $LAST_QUERY = $prompt;
342 573
343 my $dialog = new CFClient::UI::FancyFrame 574 $self->{query}-> ($self, $flags, $prompt);
344 x => "center",
345 y => "center",
346 title => "Query",
347 child => my $vbox = new CFClient::UI::VBox,
348 ;
349
350 $vbox->add (new CFClient::UI::Label
351 max_w => $::WIDTH * 0.4,
352 ellipsise => 0,
353 text => $prompt);
354
355 if ($flags & CS_QUERY_YESNO) {
356 $vbox->add (my $hbox = new CFClient::UI::HBox);
357 $hbox->add (new CFClient::UI::Button
358 text => "No",
359 on_activate => sub {
360 $self->send ("reply n");
361 $dialog->destroy;
362 $self->{map_widget}->focus_in;
363 }
364 );
365 $hbox->add (new CFClient::UI::Button
366 text => "Yes",
367 on_activate => sub {
368 $self->send ("reply y");
369 $dialog->destroy;
370 },
371 );
372
373 $dialog->focus_in;
374
375 } elsif ($flags & CS_QUERY_SINGLECHAR) {
376 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
377 $vbox->add (my $entry = new CFClient::UI::Entry
378 on_changed => sub {
379 $self->send ("reply $_[1]");
380 $dialog->destroy;
381 },
382 );
383
384 $entry->focus_in;
385
386 } else {
387 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
388
389 $vbox->add (my $entry = new CFClient::UI::Entry
390 $flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
391 on_activate => sub {
392 $self->send ("reply $_[1]");
393 $dialog->destroy;
394 },
395 );
396
397 $entry->focus_in;
398 }
399
400 $dialog->show;
401} 575}
402 576
403sub drawinfo { 577sub drawinfo {
404 my ($self, $color, $text) = @_; 578 my ($self, $color, $text) = @_;
405 579
412 [0.11, 0.56, 1.00], 586 [0.11, 0.56, 1.00],
413 [0.93, 0.46, 0.00], 587 [0.93, 0.46, 0.00],
414 [0.18, 0.54, 0.34], 588 [0.18, 0.54, 0.34],
415 [0.56, 0.73, 0.56], 589 [0.56, 0.73, 0.56],
416 [0.80, 0.80, 0.80], 590 [0.80, 0.80, 0.80],
417 [0.55, 0.41, 0.13], 591 [0.75, 0.61, 0.20],
418 [0.99, 0.77, 0.26], 592 [0.99, 0.77, 0.26],
419 [0.74, 0.65, 0.41], 593 [0.74, 0.65, 0.41],
420 ); 594 );
421 595
596 $self->logprint ("info: ", $text);
597
422 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 598 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
423 599
600 # try to create single paragraphs of multiple lines sent by the server
601 $text =~ s/(?<=\S)\n(?=\w)/ /g;
602
424 $text = CFClient::UI::Label::escape $text; 603 $text = CFClient::asxml $text;
425 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 604 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
426 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 605 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
427 606
428 $self->{logview}->add_paragraph ($color[$color], 607 $self->{logview}->add_paragraph ($color[$color], $_)
429 join "\n", map "$time $_", split /\n/, $text); 608 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
609 $self->{logview}->scroll_to_bottom;
430 610
431 $self->{statusbox}->add ($text, 611 $self->{statusbox}->add ($text,
432 group => $text, 612 group => $text,
433 fg => $color[$color], 613 fg => $color[$color],
434 timeout => 10, 614 timeout => $color >= 2 ? 60 : 10,
435 tooltip_font => $::FONT_FIXED, 615 tooltip_font => $::FONT_FIXED,
436 ); 616 );
437} 617}
438 618
439sub drawextinfo { 619sub drawextinfo {
443} 623}
444 624
445sub spell_add { 625sub spell_add {
446 my ($self, $spell) = @_; 626 my ($self, $spell) = @_;
447 627
448 # TODO 628 # try to create single paragraphs out of the multiple lines sent by the server
449 # create a widget dynamically, using spell face (CF::Protocol downloads them) 629 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
630 $spell->{message} =~ s/\n+$//;
631 $spell->{message} ||= "Server did not provide a description for this spell.";
632
450 $::SETUP_SPELLS->add_spell ($spell); 633 $::SPELL_PAGE->add_spell ($spell);
451 634
452 $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});
453 $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});
454} 637}
455 638
456sub spell_delete { 639sub spell_delete {
457 my ($self, $spell) = @_; 640 my ($self, $spell) = @_;
641
458 $::SETUP_SPELLS->remove_spell ($spell); 642 $::SPELL_PAGE->remove_spell ($spell);
459} 643}
460 644
461sub addme_success { 645sub addme_success {
462 my ($self) = @_; 646 my ($self) = @_;
463 647
464 my $parser = new Pod::POM; 648 my $skill_help = CFClient::Pod::load CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
465 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod"); 649 my ($pom) = @_;
466 650
467 my %skill_tooltip; 651 my %skill_help;
468 652
469 for my $head2 ($pod->head1->[-2]->head2) { 653 for my $head2 ($pom->head1->[3]->head2) {
470 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content; 654 $skill_help{$head2->title} = CFClient::Pod::as_xml $head2->content;
655 }
656
657 \%skill_help
471 } 658 };
472 659
473 for my $skill (values %{$self->{skill_info}}) { 660 for my $skill (values %{$self->{skill_info}}) {
474 $self->{map_widget}->add_command ("ready_skill $skill", 661 $self->{map_widget}->add_command ("ready_skill $skill",
475 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 662 (CFClient::asxml "Ready the skill '$skill'\n\n")
476 . $skill_tooltip{$skill}); 663 . $skill_help->{$skill});
477 $self->{map_widget}->add_command ("use_skill $skill", 664 $self->{map_widget}->add_command ("use_skill $skill",
478 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 665 (CFClient::asxml "Immediately use the skill '$skill'\n\n")
479 . $skill_tooltip{$skill}); 666 . $skill_help->{$skill});
480 } 667 }
481} 668}
482 669
483sub eof { 670sub eof {
484 my ($self) = @_; 671 my ($self) = @_;
508 695
509 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 696 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
510 697
511 $self->send ("requestinfo image_sums $face $face"); 698 $self->send ("requestinfo image_sums $face $face");
512 699
513 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 700 $self->{statusbox}->add (CFClient::asxml "prefetching $todo",
514 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]); 701 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
515 } elsif (!exists $self->{num_faces}) { 702 } elsif (!exists $self->{num_faces}) {
516 $self->send ("requestinfo image_info"); 703 $self->send ("requestinfo image_info");
517 704
518 $self->{num_faces} = 0; 705 $self->{num_faces} = 0;
519 706
520 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 707 $self->{statusbox}->add (CFClient::asxml "starting to prefetch",
521 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]); 708 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
522 } 709 }
523} 710}
524 711
525sub update_floorbox { 712sub update_floorbox {
526 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 713 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {
527 return unless $::CONN; 714 return unless $::CONN;
528 715
529 $::FLOORBOX->clear; 716 $::FLOORBOX->clear;
530 717
531 my $row; 718 my $row;
532 for (@{ $::CONN->{container}{0} }) { 719 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
533 if ($row < 7) { 720 if ($row < 6) {
534 local $_->{face_widget}; # hack to force recreation of widget 721 local $_->{face_widget}; # hack to force recreation of widget
535 local $_->{desc_widget}; # hack to force recreation of widget 722 local $_->{desc_widget}; # hack to force recreation of widget
536 CFClient::Item::update_widgets $_; 723 CFClient::Item::update_widgets $_;
537 724
538 $::FLOORBOX->add (0, $row, $_->{face_widget}); 725 $::FLOORBOX->add (0, $row, $_->{face_widget});
539 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 726 $::FLOORBOX->add (1, $row, $_->{desc_widget});
540 727
541 $row++; 728 $row++;
542 } else { 729 } else {
543 $::FLOORBOX->add (1, $row, new CFClient::UI::Label text => "More..."); 730 $::FLOORBOX->add (1, $row, new CFClient::UI::Button
731 text => "More...",
732 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
733 );
544 last; 734 last;
545 } 735 }
546 } 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 }
547 }); 743 });
548 744
549 $::WANT_REFRESH++; 745 $::WANT_REFRESH++;
550} 746}
551 747
552sub set_opencont { 748sub set_opencont {
553 my ($conn, $tag, $name) = @_; 749 my ($conn, $tag, $name) = @_;
554 $conn->{open_container} = $tag; 750 $conn->{open_container} = $tag;
751 update_floorbox;
555 752
556 $::INV_RIGHT_HB->clear (); 753 $::INV_RIGHT_HB->clear ();
557 $::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);
558 755
559 if ($tag != 0) { # Floor isn't closable, is it? 756 if ($tag != 0) { # Floor isn't closable, is it?
562 tooltip => "Close the currently open container (if one is open)", 759 tooltip => "Close the currently open container (if one is open)",
563 on_activate => sub { 760 on_activate => sub {
564 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 761 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
565 if $tag != 0; 762 if $tag != 0;
566 #if $CONN->{open_container} != 0; 763 #if $CONN->{open_container} != 0;
764 0
567 }, 765 },
568 ); 766 );
569 } 767 }
570 768
571 $::INVR->set_items ($conn->{container}{$tag}); 769 $::INVR->set_items ($conn->{container}{$tag});
572} 770}
573 771
574sub update_container { 772sub update_containers {
575 my ($tag) = @_; 773 my ($self) = @_;
576 774
577 $::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})
578 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 });
579} 792}
580 793
581sub container_add { 794sub container_add {
582 my ($self, $tag, $items) = @_; 795 my ($self, $tag, $items) = @_;
583 796
584 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 797 $self->{update_container}{$tag}++;
585 798 $self->update_containers;
586 if ($tag == 0) {
587 update_floorbox;
588 update_container (0);
589 } elsif ($tag == $self->{player}{tag}) {
590 $::INV->set_items ($self->{container}{$self->{player}{tag}})
591 } else {
592 update_container ($tag);
593 }
594
595 # $self-<{player}{tag} => player inv
596 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
597} 799}
598 800
599sub container_clear { 801sub container_clear {
600 my ($self, $tag) = @_; 802 my ($self, $tag) = @_;
601 803
602 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 804 $self->{update_container}{$tag}++;
603 805 $self->update_containers;
604 if ($tag == 0) {
605 update_floorbox;
606 update_container (0);
607 } elsif ($tag == $self->{player}{tag}) {
608 $::INV->set_items ($self->{container}{$tag})
609 } else {
610 update_container ($tag);
611 }
612
613# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
614} 806}
615 807
616sub item_delete { 808sub item_delete {
617 my ($self, @items) = @_; 809 my ($self, @items) = @_;
618 810
811 $self->{update_container}{$_->{container}}++
619 for (@items) { 812 for @items;
620 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
621
622 if ($_->{container} == 0) {
623 update_floorbox;
624 update_container ($_->{tag});
625 } elsif ($_->{container} == $self->{player}{tag}) {
626 $::INV->set_items ($self->{container}{$self->{player}{tag}})
627 } else {
628 update_container ($_->{container});
629 }
630 } 813
814 $self->update_containers;
631} 815}
632 816
633sub item_update { 817sub item_update {
634 my ($self, $item) = @_; 818 my ($self, $item) = @_;
635 819
636 #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";
637 821
638 if ($item->{tag} == $self->{player}{tag}) {
639 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
640 return;
641 }
642
643 CFClient::Item::update_widgets $item; 822 CFClient::Item::update_widgets $item;
644 823
645 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 824 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
646 set_opencont ($::CONN, 0, "Floor"); 825 set_opencont ($::CONN, 0, "Floor");
647 826
648 } elsif ($item->{flags} & F_OPEN) { 827 } elsif ($item->{flags} & F_OPEN) {
649 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 828 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
829
650 } else { 830 } else {
651 if ($item->{container} == 0) { 831 $self->{update_container}{$item->{container}}++;
652 update_floorbox;
653 update_container (0); 832 $self->update_containers;
654 } elsif ($item->{container} == $self->{player}{tag}) {
655 $::INV->set_items ($self->{container}{$item->{container}})
656 }
657 } 833 }
658} 834}
659 835
660sub player_update { 836sub player_update {
661 my ($self, $player) = @_; 837 my ($self, $player) = @_;
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
662 $::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);
851}
663 852
664 # do it here because it is ignored earlier, and there is no "login" event 853sub update_server_info {
854 my ($self) = @_;
855
856 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
857
858 $::SERVER_INFO->set_markup (
859 "server <tt>$self->{host}:$self->{port}</tt>\n"
860 . "protocol version <tt>$self->{version}</tt>\n"
861 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
862 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
863 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
864 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
865 . "map size $self->{mapw}×$self->{maph}\n"
866 );
867}
868
869sub logged_in {
870 my ($self) = @_;
871
872 $self->send_ext_req (cfplus_support => "1", sub {
873 $self->{cfplus_ext} = $_[0];
874 $self->update_server_info;
875 });
876
877 $self->update_server_info;
878
665 $self->send_command ("output-sync $::CFG->{output_sync}"); 879 $self->send_command ("output-sync $::CFG->{output_sync}");
666 $self->send_command ("output-count $::CFG->{output_count}"); 880 $self->send_command ("output-count $::CFG->{output_count}");
881 $self->send_command ("pickup $::CFG->{pickup}");
882}
883
884sub lookat {
885 my ($self, $x, $y) = @_;
886
887 if ($self->{cfplus_ext}) {
888 $self->send_ext_req (lookat => "$x $y", sub {
889 my %res = split /\x00/, $_[0];
890
891 if (exists $res{npc_dialog}) {
892 # start npc chat dialog
893 $self->{npc_dialog} = new CFClient::NPCDialog::
894 dx => $x,
895 dy => $y,
896 title => "$res{npc_dialog} (NPC)",
897 conn => $self,
898 ;
899 }
900 });
901 }
902
903 $self->send ("lookat $x $y");
904}
905
906sub destroy {
907 my ($self) = @_;
908
909 $self->{npc_dialog}->destroy
910 if $self->{npc_dialog};
911
912 $self->SUPER::destroy;
913}
914
915package CFClient::NPCDialog;
916
917our @ISA = 'CFClient::UI::FancyFrame';
918
919sub new {
920 my $class = shift;
921
922 my $self = $class->SUPER::new (
923 x => 'center',
924 y => 'center',
925 name => "npc_dialog",
926 force_w => $::WIDTH * 0.7,
927 force_h => $::HEIGHT * 0.7,
928 title => "NPC Dialog",
929 kw => { hi => 0, yes => 0, no => 0 },
930 has_close_button => 1,
931 @_,
932 );
933
934 Scalar::Util::weaken (my $this = $self);
935
936 $self->connect (delete => sub { $this->destroy; 1 });
937
938 # better use a pane...
939 $self->add (my $hbox = new CFClient::UI::HBox);
940 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);
941
942 $hbox->add (my $vbox = new CFClient::UI::VBox);
943
944 $vbox->add (new CFClient::UI::Label text => "Message Entry:");
945 $vbox->add ($self->{entry} = new CFClient::UI::Entry
946 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"
947 . "Sometimes you have to tell an NPC something you cannot find out during "
948 . "a normal conversation (such as a password). In those cases you have to use "
949 . "this text entry. You can also enter responses manually instead of using the response "
950 . "buttons below.",
951 on_activate => sub {
952 my ($entry, $text) = @_;
953
954 return unless $text =~ /\S/;
955
956 $entry->set_text ("");
957 $this->send ($text);
958
959 0
960 },
961 );
962
963 $vbox->add ($self->{options} = new CFClient::UI::VBox);
964
965 $self->{bye_button} = new CFClient::UI::Button
966 text => "Bye (close)",
967 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
968 on_activate => sub { $this->destroy; 1 },
969 ;
970
971 $self->update_options;
972
973 $self->{token} = $self->{conn}->ext_token;
974 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
975 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
976
977 $self->{entry}->grab_focus;
978
979 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
980
981 $self->show;
982 $self
983};
984
985sub update_options {
986 my ($self) = @_;
987
988 Scalar::Util::weaken $self;
989
990 $self->{options}->clear;
991 $self->{options}->add ($self->{bye_button});
992
993 for my $kw (sort keys %{ $self->{kw} }) {
994 $self->{options}->add (new CFClient::UI::Button
995 text => $kw,
996 on_activate => sub {
997 $self->send ($kw);
998 0
999 },
1000 );
1001 }
1002}
1003
1004sub feed {
1005 my ($self, $data) = @_;
1006
1007 Scalar::Util::weaken $self;
1008
1009 my ($type, $msg) = split / /, $data, 2;
1010
1011 if ($type eq "msg") {
1012 my ($msg, @kw) = split /\x00/, $msg;
1013
1014 utf8::decode $_ for ($msg, @kw);
1015
1016 $self->{kw}{$_} = 1 for @kw;
1017
1018 $msg = "\n" . CFClient::UI::asxml $msg;
1019 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
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;
1038
1039 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
1040 $self->{textview}->scroll_to_bottom;
1041 $self->update_options;
1042 } else {
1043 $self->destroy;
1044 }
1045
1046 1
1047}
1048
1049sub send {
1050 my ($self, $msg) = @_;
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;
1056 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
1057}
1058
1059sub destroy {
1060 my ($self) = @_;
1061
1062 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1063
1064 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token};
1065 delete $self->{conn}{npc_dialog};
1066 $self->{conn}->disconnect_ext ($self->{token});
1067
1068 $self->SUPER::destroy;
667} 1069}
668 1070
6691; 10711;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines