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.41 by root, Fri Jun 23 22:35:16 2006 UTC vs.
Revision 1.79 by root, Fri Aug 18 01:01:01 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 (@_, setup_req => { extmap => 1 });
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 } sort { $a->{par} <=> $b->{par} }
39 CFPlus::Pod::find command => "*";
44 40
45 \@cmd_help
46 };
47
48 $self->{map_widget}->add_command (@$_) 41 $self->{map_widget}->add_command (@$_)
49 for @$cmd_help; 42 for @cmd_help;
50 43
51 $self->{noface} = new_from_file CFClient::Texture 44 $self->{noface} = new_from_file CFPlus::Texture
52 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 45 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
53 46
54 $self->{open_container} = 0; 47 $self->{open_container} = 0;
55 48
56 # "global" 49 # "global"
57 $self->{tilecache} = CFClient::db_table "tilecache"; 50 $self->{tilecache} = CFPlus::db_table "tilecache"
51 or die "tilecache: unable to open database table";
58 $self->{facemap} = CFClient::db_table "facemap"; 52 $self->{facemap} = CFPlus::db_table "facemap"
53 or die "facemap: unable to open database table";
59 54
60 # per server 55 # per server
61 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 56 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
57 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
62 58
63 $self 59 $self
64} 60}
65 61
66sub logprint { 62sub logprint {
67 my ($self, @a) = @_; 63 my ($self, @a) = @_;
64
65 $self->{log_fh} ||= do {
68 my $filename = "$Crossfire::VARDIR/log.$self->{host}"; 66 my $path = "$Crossfire::VARDIR/log.$self->{host}";
69 67
70 my $fh = $open_logs{$filename}; 68 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}: $!"; 69 or die "Couldn't open logfile $path: $!";
75 70
76 $open_logs{$filename} = $fh; 71 $fh->autoflush (1);
72
73 $fh;
77 } 74 };
78 75
79 my ($sec, $min, $hour, $mday, $mon, $year) = localtime (time); 76 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
80 77
81 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", 78 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
82 $year + 1900, $mon + 1, $mday, $hour, $min, $sec; 79 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
83 80
84 print $fh "$ts ", @a, "\n"; 81 print {$self->{log_fh}} "$ts ", @a, "\n";
85 $fh->flush;
86} 82}
83
84sub _stat_numdiff {
85 my ($self, $name, $old, $new) = @_;
86
87 my $diff = $new - $old;
88
89 $diff = 0.01 * int $diff * 100;
90
91 0.1 >= abs $diff ? ()
92 : $diff < 0 ? "$name$diff" : "$name+$diff"
93}
94
95sub _stat_skillmaskdiff {
96 my ($self, $name, $old, $new) = @_;
97
98 my $diff = $old ^ $new
99 or return;
100
101 my @diff = map
102 {
103 $diff & $_
104 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
105 : ()
106 }
107 sort { $a <=> $b } keys %{$self->{spell_paths}};
108
109 join "", @diff
110}
111
112# all stats that are chacked against changes
113my @statchange = (
114 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
115 [&CS_STAT_INT => \&_stat_numdiff, "Int"],
116 [&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
117 [&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
118 [&CS_STAT_CON => \&_stat_numdiff, "Con"],
119 [&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
120 [&CS_STAT_POW => \&_stat_numdiff, "Pow"],
121 [&CS_STAT_WC => \&_stat_numdiff, "Wc"],
122 [&CS_STAT_AC => \&_stat_numdiff, "Ac"],
123 [&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
124 [&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
125 [&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
126 [&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
127 [&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
128 [&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
129 [&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
130 [&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
131 [&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
132 [&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
133 [&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
134 [&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
135 [&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
136 [&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
137 [&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
138 [&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
139 [&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
140 [&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
141 [&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
142 [&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
143 [&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
144 [&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
145 [&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
146 [&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
147 [&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
148 [&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
149 [&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
150 [&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
151);
87 152
88sub stats_update { 153sub stats_update {
89 my ($self, $stats) = @_; 154 my ($self, $stats) = @_;
90 155
91 if (my $exp = $stats->{+CS_STAT_EXP64}) { 156 my $prev = $self->{prev_stats} || { };
92 my $diff = $exp - $self->{prev_exp}; 157
158 if (my @diffs =
159 (
160 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
161 map {
162 $stats->{$_} && $prev->{$_}
163 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
164 } sort { $a <=> $b } keys %{$self->{skill_info}}
165 )
166 ) {
167 my $msg = join " ", @diffs;
93 $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5) 168 $self->{statusbox}->add ($msg, group => "experience $msg", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
94 if exists $self->{prev_exp} && $diff;
95 $self->{prev_exp} = $exp;
96 } 169 }
97 170
171 if (
172 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
173 ) {
174 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
175 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
176 }
177
98 ::update_stats_window ($stats); 178 $self->update_stats_window ($stats, $prev);
179
180 $self->{prev_stats} = { %$stats };
181}
182
183my %RES_TBL = (
184 phys => CS_STAT_RES_PHYS,
185 magic => CS_STAT_RES_MAG,
186 fire => CS_STAT_RES_FIRE,
187 elec => CS_STAT_RES_ELEC,
188 cold => CS_STAT_RES_COLD,
189 conf => CS_STAT_RES_CONF,
190 acid => CS_STAT_RES_ACID,
191 drain => CS_STAT_RES_DRAIN,
192 ghit => CS_STAT_RES_GHOSTHIT,
193 pois => CS_STAT_RES_POISON,
194 slow => CS_STAT_RES_SLOW,
195 para => CS_STAT_RES_PARA,
196 tund => CS_STAT_TURN_UNDEAD,
197 fear => CS_STAT_RES_FEAR,
198 depl => CS_STAT_RES_DEPLETE,
199 deat => CS_STAT_RES_DEATH,
200 holyw => CS_STAT_RES_HOLYWORD,
201 blind => CS_STAT_RES_BLIND,
202);
203
204sub update_stats_window {
205 my ($self, $stats, $prev) = @_;
206
207 # I love text protocols...
208
209 my $hp = $stats->{+CS_STAT_HP} * 1;
210 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
211 my $sp = $stats->{+CS_STAT_SP} * 1;
212 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
213 my $fo = $stats->{+CS_STAT_FOOD} * 1;
214 my $fo_m = 999;
215 my $gr = $stats->{+CS_STAT_GRACE} * 1;
216 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
217
218 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
219 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
220 $::GAUGES->{food} ->set_value ($fo, $fo_m);
221 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
222 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
223 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
224 my $rng = $stats->{+CS_STAT_RANGE};
225 $rng =~ s/^Range: //; # thank you so much dear server
226 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
227 my $title = $stats->{+CS_STAT_TITLE};
228 $title =~ s/^Player: //;
229 $::STATWIDS->{title} ->set_text ("Title: " . $title);
230
231 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
232 $::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
233 $::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
234 $::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
235 $::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
236 $::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
237 $::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
238 $::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
239 $::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
240 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
241 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
242 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
243 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
244
245 $self->update_weight;
246
247 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
248 for keys %RES_TBL;
249
250 my $sktbl = $::STATWIDS->{skill_tbl};
251 my @skills = keys %{ $self->{skill_info} };
252
253 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
254 $sktbl->clear;
255
256 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
257 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
258 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
259 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
260 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
261 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
262
263 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
264
265 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
266 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
267
268 my ($x, $y) = (0, 1);
269 for (
270 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
271 map [$_, $self->{skill_info}{$_}],
272 grep exists $stats->{$_},
273 @skills
274 ) {
275 my ($idx, $name) = @$_;
276
277 my $spell_cb = sub {
278 my ($widget, $ev) = @_;
279
280 if ($ev->{button} == 1) {
281 $::CONN->user_send ("ready_skill $name");
282 } elsif ($ev->{button} == 2) {
283 $::CONN->user_send ("use_skill $name");
284 } elsif ($ev->{button} == 3) {
285 (new CFPlus::UI::Menu
286 items => [
287 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],
288 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],
289 ],
290 )->popup ($ev);
291 } else {
292 return 0;
293 }
294
295 1
296 };
297
298 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
299 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
300 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
301 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
302 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
303 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
304
305 $x++ and ($x, $y) = (0, $y + 1);
306 }
307 }
308
309 for (grep exists $stats->{$_}, @skills) {
310 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
311 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
312 }
99} 313}
100 314
101sub user_send { 315sub user_send {
102 my ($self, $command) = @_; 316 my ($self, $command) = @_;
103 317
… …
105 push @{$self->{record}}, $command; 319 push @{$self->{record}}, $command;
106 } 320 }
107 321
108 $self->logprint ("send: ", $command); 322 $self->logprint ("send: ", $command);
109 $self->send_command ($command); 323 $self->send_command ($command);
110 ::status $command; 324 ::status ($command);
111} 325}
112 326
113sub start_record { 327sub start_record {
114 my ($self) = @_; 328 my ($self) = @_;
115 329
… …
128} 342}
129 343
130sub feed_map1a { 344sub feed_map1a {
131 my ($self, $data) = @_; 345 my ($self, $data) = @_;
132 346
133 $self->{map}->map1a_update ($data); 347 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
134 $self->{map_widget}->update; 348 $self->{map_widget}->update;
135} 349}
136 350
137sub magicmap { 351sub magicmap {
138 my ($self, $w, $h, $x, $y, $data) = @_; 352 my ($self, $w, $h, $x, $y, $data) = @_;
… …
308 522
309 unless ($id) { 523 unless ($id) {
310 # create new id for face 524 # create new id for face
311 # I love transactions 525 # I love transactions
312 for (1..100) { 526 for (1..100) {
313 my $txn = $CFClient::DB_ENV->txn_begin; 527 my $txn = $CFPlus::DB_ENV->txn_begin;
314 my $status = $self->{facemap}->db_get (id => $id); 528 my $status = $self->{facemap}->db_get (id => $id);
315 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 529 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
316 $id = ($id || 64) + 1; 530 $id = ($id || 64) + 1;
317 if ($self->{facemap}->put (id => $id) == 0 531 if ($self->{facemap}->put (id => $id) == 0
318 && $self->{facemap}->put ($hash => $id) == 0) { 532 && $self->{facemap}->put ($hash => $id) == 0) {
… …
322 } 536 }
323 } 537 }
324 $txn->txn_abort; 538 $txn->txn_abort;
325 } 539 }
326 540
327 CFClient::fatal "maximum number of transaction retries reached - database problems?"; 541 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
328 } 542 }
329 543
330gotid: 544gotid:
331 $face->{id} = $id; 545 $face->{id} = $id;
332 $self->{map}->set_face ($facenum => $id); 546 $self->{map}->set_face ($facenum => $id);
… …
343 undef 557 undef
344 }; 558 };
345} 559}
346 560
347sub face_update { 561sub face_update {
348 my ($self, $facenum, $face) = @_; 562 my ($self, $facenum, $face, $changed) = @_;
349 563
350 $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes 564 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;
351 565
352 $self->set_texture ($face->{id} => delete $face->{image}); 566 $self->set_texture ($face->{id} => delete $face->{image});
353} 567}
354 568
355sub set_texture { 569sub set_texture {
356 my ($self, $id, $data) = @_; 570 my ($self, $id, $data) = @_;
357 571
358 $self->{texture}[$id] ||= do { 572 $self->{texture}[$id] ||= do {
359 my $tex = 573 my $tex =
360 new_from_image CFClient::Texture 574 new_from_image CFPlus::Texture
361 $data, minify => 1, mipmap => 1; 575 $data, minify => 1, mipmap => 1;
362 576
363 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 577 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
364 $self->{map_widget}->update; 578 $self->{map_widget}->update;
365 579
… …
396 [0.11, 0.56, 1.00], 610 [0.11, 0.56, 1.00],
397 [0.93, 0.46, 0.00], 611 [0.93, 0.46, 0.00],
398 [0.18, 0.54, 0.34], 612 [0.18, 0.54, 0.34],
399 [0.56, 0.73, 0.56], 613 [0.56, 0.73, 0.56],
400 [0.80, 0.80, 0.80], 614 [0.80, 0.80, 0.80],
401 [0.55, 0.41, 0.13], 615 [0.75, 0.61, 0.20],
402 [0.99, 0.77, 0.26], 616 [0.99, 0.77, 0.26],
403 [0.74, 0.65, 0.41], 617 [0.74, 0.65, 0.41],
404 ); 618 );
405 619
406 $self->logprint ("info: ", $text); 620 $self->logprint ("info: ", $text);
… …
408 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 622 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
409 623
410 # try to create single paragraphs of multiple lines sent by the server 624 # try to create single paragraphs of multiple lines sent by the server
411 $text =~ s/(?<=\S)\n(?=\w)/ /g; 625 $text =~ s/(?<=\S)\n(?=\w)/ /g;
412 626
413 $text = CFClient::UI::Label::escape $text; 627 $text = CFPlus::asxml $text;
414 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 628 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
415 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 629 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
416 630
417 $self->{logview}->add_paragraph ($color[$color], $_) 631 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
418 for map "$time $_", split /\n/, $text; 632 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
419 $self->{logview}->scroll_to_bottom; 633 $self->{logview}->scroll_to_bottom;
420 634
421 $self->{statusbox}->add ($text, 635 $self->{statusbox}->add ($text,
422 group => $text, 636 group => $text,
423 fg => $color[$color], 637 fg => $color[$color],
424 timeout => $color >= 2 ? 60 : 10, 638 timeout => $color >= 2 ? 180 : 10,
425 tooltip_font => $::FONT_FIXED, 639 tooltip_font => $::FONT_FIXED,
426 ); 640 );
427} 641}
428 642
429sub drawextinfo { 643sub drawextinfo {
… …
433} 647}
434 648
435sub spell_add { 649sub spell_add {
436 my ($self, $spell) = @_; 650 my ($self, $spell) = @_;
437 651
438 # try to create single paragraphs of multiple lines sent by the server 652 # try to create single paragraphs out of the multiple lines sent by the server
439 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 653 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
440 $spell->{message} =~ s/\n+$//; 654 $spell->{message} =~ s/\n+$//;
441 $spell->{message} ||= "Server did not provide a description for this spell."; 655 $spell->{message} ||= "Server did not provide a description for this spell.";
442 656
443 $::SETUP_SPELLS->add_spell ($spell); 657 $::SPELL_PAGE->add_spell ($spell);
444 658
445 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 659 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
446 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 660 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
447} 661}
448 662
449sub spell_delete { 663sub spell_delete {
450 my ($self, $spell) = @_; 664 my ($self, $spell) = @_;
665
451 $::SETUP_SPELLS->remove_spell ($spell); 666 $::SPELL_PAGE->remove_spell ($spell);
452} 667}
453 668
454sub addme_success { 669sub addme_success {
455 my ($self) = @_; 670 my ($self) = @_;
456 671
457 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
458 my ($pom) = @_;
459
460 my %skill_help; 672 my %skill_help;
461 673
462 for my $head2 ($pom->head1->[3]->head2) { 674 for my $node (CFPlus::Pod::find skill_description => "*") {
463 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 675 my (undef, @par) = CFPlus::Pod::section_of $node;
464 } 676 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
465
466 \%skill_help
467 }; 677 };
468 678
469 for my $skill (values %{$self->{skill_info}}) { 679 for my $skill (values %{$self->{skill_info}}) {
470 $self->{map_widget}->add_command ("ready_skill $skill", 680 $self->{map_widget}->add_command ("ready_skill $skill",
471 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 681 (CFPlus::asxml "Ready the skill '$skill'\n\n")
472 . $skill_help->{$skill}); 682 . $skill_help{$skill});
473 $self->{map_widget}->add_command ("use_skill $skill", 683 $self->{map_widget}->add_command ("use_skill $skill",
474 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 684 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
475 . $skill_help->{$skill}); 685 . $skill_help{$skill});
476 } 686 }
477} 687}
478 688
479sub eof { 689sub eof {
480 my ($self) = @_; 690 my ($self) = @_;
… …
504 714
505 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 715 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
506 716
507 $self->send ("requestinfo image_sums $face $face"); 717 $self->send ("requestinfo image_sums $face $face");
508 718
509 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 719 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
510 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 720 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
511 } elsif (!exists $self->{num_faces}) { 721 } elsif (!exists $self->{num_faces}) {
512 $self->send ("requestinfo image_info"); 722 $self->send ("requestinfo image_info");
513 723
514 $self->{num_faces} = 0; 724 $self->{num_faces} = 0;
515 725
516 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 726 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
517 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 727 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
518 } 728 }
519} 729}
520 730
521sub update_floorbox { 731sub update_floorbox {
522 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 732 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
523 return unless $::CONN; 733 return unless $::CONN;
524 734
525 $::FLOORBOX->clear; 735 $::FLOORBOX->clear;
526 736
527 my $row; 737 my $row;
528 for (@{ $::CONN->{container}{0} }) { 738 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
529 if ($row < 6) { 739 if ($row < 6) {
530 local $_->{face_widget}; # hack to force recreation of widget 740 local $_->{face_widget}; # hack to force recreation of widget
531 local $_->{desc_widget}; # hack to force recreation of widget 741 local $_->{desc_widget}; # hack to force recreation of widget
532 CFClient::Item::update_widgets $_; 742 CFPlus::Item::update_widgets $_;
533 743
534 $::FLOORBOX->add (0, $row, $_->{face_widget}); 744 $::FLOORBOX->add (0, $row, $_->{face_widget});
535 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 745 $::FLOORBOX->add (1, $row, $_->{desc_widget});
536 746
537 $row++; 747 $row++;
538 } else { 748 } else {
539 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 749 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
540 text => "More...", 750 text => "More...",
541 on_activate => sub { $::INV_WINDOW->toggle_visibility; 0 }, 751 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
542 ); 752 );
543 last; 753 last;
544 } 754 }
545 } 755 }
756 if ($::CONN->{open_container}) {
757 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
758 text => "Close container",
759 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
760 );
761 }
546 }); 762 });
547 763
548 $::WANT_REFRESH++; 764 $::WANT_REFRESH++;
549} 765}
550 766
551sub set_opencont { 767sub set_opencont {
552 my ($conn, $tag, $name) = @_; 768 my ($conn, $tag, $name) = @_;
553 $conn->{open_container} = $tag; 769 $conn->{open_container} = $tag;
770 update_floorbox;
554 771
555 $::INV_RIGHT_HB->clear (); 772 $::INV_RIGHT_HB->clear ();
556 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 773 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
557 774
558 if ($tag != 0) { # Floor isn't closable, is it? 775 if ($tag != 0) { # Floor isn't closable, is it?
559 $::INV_RIGHT_HB->add (new CFClient::UI::Button 776 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
560 text => "Close container", 777 text => "Close container",
561 tooltip => "Close the currently open container (if one is open)", 778 tooltip => "Close the currently open container (if one is open)",
562 on_activate => sub { 779 on_activate => sub {
563 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 780 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
564 if $tag != 0; 781 if $tag != 0;
… …
569 } 786 }
570 787
571 $::INVR->set_items ($conn->{container}{$tag}); 788 $::INVR->set_items ($conn->{container}{$tag});
572} 789}
573 790
574sub update_container { 791sub update_containers {
575 my ($tag) = @_; 792 my ($self) = @_;
576 793
577 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 794 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
795 my $todo = delete $self->{update_container}
796 or return;
797
798 for my $tag (keys %$todo) {
799 update_floorbox if $tag == 0 or $tag == $self->{open_container};
800 if ($tag == 0) {
801 $::INVR->set_items ($self->{container}{0})
578 if $tag == $::CONN->{open_container}; 802 if $tag == $self->{open_container};
803 } elsif ($tag == $self->{player}{tag}) {
804 $::INV->set_items ($self->{container}{$tag})
805 } else {
806 $::INVR->set_items ($self->{container}{$tag})
807 if $tag == $self->{open_container};
808 }
809 }
810 });
579} 811}
580 812
581sub container_add { 813sub container_add {
582 my ($self, $tag, $items) = @_; 814 my ($self, $tag, $items) = @_;
583 815
584 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 816 $self->{update_container}{$tag}++;
585 817 $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} 818}
598 819
599sub container_clear { 820sub container_clear {
600 my ($self, $tag) = @_; 821 my ($self, $tag) = @_;
601 822
602 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 823 $self->{update_container}{$tag}++;
603 824 $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} 825}
615 826
616sub item_delete { 827sub item_delete {
617 my ($self, @items) = @_; 828 my ($self, @items) = @_;
618 829
830 $self->{update_container}{$_->{container}}++
619 for (@items) { 831 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 } 832
833 $self->update_containers;
631} 834}
632 835
633sub item_update { 836sub item_update {
634 my ($self, $item) = @_; 837 my ($self, $item) = @_;
635 838
636 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 839 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
637 840
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; 841 CFPlus::Item::update_widgets $item;
644 842
645 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 843 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
646 set_opencont ($::CONN, 0, "Floor"); 844 set_opencont ($::CONN, 0, "Floor");
647 845
648 } elsif ($item->{flags} & F_OPEN) { 846 } elsif ($item->{flags} & F_OPEN) {
649 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 847 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
848
650 } else { 849 } else {
651 if ($item->{container} == 0) { 850 $self->{update_container}{$item->{container}}++;
652 update_floorbox;
653 update_container (0); 851 $self->update_containers;
654 } elsif ($item->{container} == $self->{player}{tag}) {
655 $::INV->set_items ($self->{container}{$item->{container}})
656 }
657 } 852 }
658} 853}
659 854
660sub player_update { 855sub player_update {
661 my ($self, $player) = @_; 856 my ($self, $player) = @_;
662 857
858 $self->update_weight;
859}
860
861sub update_weight {
862 my ($self) = @_;
863
864 my $weight = .001 * $self->{player}{weight};
865 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
866
663 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 867 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
868 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
869 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
664} 870}
665 871
666sub update_server_info { 872sub update_server_info {
667 my ($self) = @_; 873 my ($self) = @_;
668 874
… …
680} 886}
681 887
682sub logged_in { 888sub logged_in {
683 my ($self) = @_; 889 my ($self) = @_;
684 890
685 $self->send_ext_req (cfplus_support => "1", sub { 891 $self->send_ext_req (cfplus_support => version => 1, sub {
686 $self->{cfplus_ext} = $_[0]; 892 $self->{cfplus_ext} = $_[0]{version};
687 $self->update_server_info; 893 $self->update_server_info;
894
895 0
688 }); 896 });
689 897
690 $self->update_server_info; 898 $self->update_server_info;
691 899
692 $self->send_command ("output-sync $::CFG->{output_sync}"); 900 $self->send_command ("output-sync $::CFG->{output_sync}");
… …
696 904
697sub lookat { 905sub lookat {
698 my ($self, $x, $y) = @_; 906 my ($self, $x, $y) = @_;
699 907
700 if ($self->{cfplus_ext}) { 908 if ($self->{cfplus_ext}) {
701 $self->send_ext_req (lookat => "$x $y", sub { 909 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
702 my %res = split /\x00/, $_[0]; 910 my ($msg) = @_;
703 911
704 if (exists $res{npc_dialog}) { 912 if (exists $msg->{npc_dialog}) {
705 # start npc chat dialog 913 # start npc chat dialog
706 $self->{npc_dialog} = new CFClient::NPCDialog:: 914 $self->{npc_dialog} = new CFPlus::NPCDialog::
707 dx => $x, 915 dx => $x,
708 dy => $y, 916 dy => $y,
709 title => "$res{npc_dialog} (NPC)", 917 title => "$msg->{npc_dialog} (NPC)",
710 conn => $self, 918 conn => $self,
711 ; 919 ;
712 } 920 }
713 }); 921 });
714 } 922 }
… …
717} 925}
718 926
719sub destroy { 927sub destroy {
720 my ($self) = @_; 928 my ($self) = @_;
721 929
722 $self->{npc_dialog}->destroy 930 (delete $self->{npc_dialog})->destroy
723 if $self->{npc_dialog}; 931 if $self->{npc_dialog};
724 932
725 $self->SUPER::destroy; 933 $self->SUPER::destroy;
726} 934}
727 935
728package CFClient::NPCDialog; 936package CFPlus::NPCDialog;
729 937
730our @ISA = 'CFClient::UI::FancyFrame'; 938our @ISA = 'CFPlus::UI::Toplevel';
731 939
732sub new { 940sub new {
733 my $class = shift; 941 my $class = shift;
734 942
735 my $self = $class->SUPER::new ( 943 my $self = $class->SUPER::new (
… …
738 name => "npc_dialog", 946 name => "npc_dialog",
739 force_w => $::WIDTH * 0.7, 947 force_w => $::WIDTH * 0.7,
740 force_h => $::HEIGHT * 0.7, 948 force_h => $::HEIGHT * 0.7,
741 title => "NPC Dialog", 949 title => "NPC Dialog",
742 kw => { hi => 0, yes => 0, no => 0 }, 950 kw => { hi => 0, yes => 0, no => 0 },
951 has_close_button => 1,
743 @_, 952 @_,
744 ); 953 );
745 954
746 Scalar::Util::weaken (my $this = $self); 955 Scalar::Util::weaken (my $this = $self);
747 956
957 $self->connect (delete => sub { $this->destroy; 1 });
958
748 # better use a pane... 959 # better use a pane...
749 $self->add (my $hbox = new CFClient::UI::HBox); 960 $self->add (my $hbox = new CFPlus::UI::HBox);
750 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 961 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
751 962
752 $hbox->add (my $vbox = new CFClient::UI::VBox); 963 $hbox->add (my $vbox = new CFPlus::UI::VBox);
753 964
754 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 965 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
755 $vbox->add ($self->{entry} = new CFClient::UI::Entry 966 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
756 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 967 tooltip => "#npc_message_entry",
757 . "Sometimes you have to tell an NPC something you cannot find out during "
758 . "a normal conversation (such as a password). In those cases you have to use "
759 . "this text entry. You can also enter responses manually instead of using the response "
760 . "buttons below.",
761 on_activate => sub { 968 on_activate => sub {
762 my ($entry, $text) = @_; 969 my ($entry, $text) = @_;
763 970
764 return unless $text =~ /\S/; 971 return unless $text =~ /\S/;
765 972
… …
768 975
769 0 976 0
770 }, 977 },
771 ); 978 );
772 979
773 $vbox->add ($self->{options} = new CFClient::UI::VBox); 980 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
774 981
775 $self->{bye_button} = new CFClient::UI::Button 982 $self->{bye_button} = new CFPlus::UI::Button
776 text => "Bye (close)", 983 text => "Bye (close)",
777 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.",
778 on_activate => sub { $this->destroy; 0 }, 985 on_activate => sub { $this->destroy; 1 },
779 ; 986 ;
780 987
781 $self->update_options; 988 $self->update_options;
782 989
783 $self->{token} = $self->{conn}->ext_token; 990 $self->{id} = $self->{conn}->send_ext_req (
784 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 991 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
785 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 992 sub { $this && $this->feed (@_) }
993 );
786 994
787 $self->{entry}->grab_focus; 995 $self->{entry}->grab_focus;
788 996
789 $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 });
790 1001
791 $self->show; 1002 $self->show;
792 $self 1003 $self
793}; 1004};
794 1005
… …
799 1010
800 $self->{options}->clear; 1011 $self->{options}->clear;
801 $self->{options}->add ($self->{bye_button}); 1012 $self->{options}->add ($self->{bye_button});
802 1013
803 for my $kw (sort keys %{ $self->{kw} }) { 1014 for my $kw (sort keys %{ $self->{kw} }) {
804 $self->{options}->add (new CFClient::UI::Button 1015 $self->{options}->add (new CFPlus::UI::Button
805 text => $kw, 1016 text => $kw,
806 on_activate => sub { 1017 on_activate => sub {
807 $self->send ($kw); 1018 $self->send ($kw);
808 0 1019 0
809 }, 1020 },
810 ); 1021 );
811 } 1022 }
812} 1023}
813 1024
814sub feed { 1025sub feed {
815 my ($self, $data) = @_; 1026 my ($self, $msg) = @_;
816 1027
817 my ($type, $msg) = split / /, $data, 2; 1028 Scalar::Util::weaken $self;
818 1029
819 if ($type eq "msg") { 1030 if ($msg->{msgtype} eq "reply") {
820 my ($msg, @kw) = split /\x00/, $msg; 1031 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
821 $self->{kw}{$_} = 1 for @kw; 1032 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
822 1033
823 $msg = "\n" . CFClient::UI::Label::escape $msg; 1034 my $text = "\n" . CFPlus::asxml $msg->{msg};
824 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} };
825 my @link; 1036 my @link;
826 $msg =~ s{ 1037 $text =~ s{
827 ($match) 1038 ($match)
828 }{ 1039 }{
1040 my $kw = $1;
1041
829 push @link, new CFClient::UI::Label 1042 push @link, new CFPlus::UI::Label
830 markup => "<span foreground='#c0c0ff' underline='single'>$1</span>", 1043 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
831 can_hover => 1, 1044 can_hover => 1,
832 can_events => 1; 1045 can_events => 1,
1046 padding_x => 0,
1047 padding_y => 0,
1048 on_button_up => sub {
1049 $self->send ($kw);
1050 };
833 1051
834 chr 0xfffc 1052 "\x{fffc}"
835 }giex; 1053 }giex;
836 1054
837 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1055 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1056 $self->{textview}->scroll_to_bottom;
838 $self->update_options; 1057 $self->update_options;
839 } else { 1058 } else {
840 $self->destroy; 1059 $self->destroy;
841 } 1060 }
842 1061
… …
844} 1063}
845 1064
846sub send { 1065sub send {
847 my ($self, $msg) = @_; 1066 my ($self, $msg) = @_;
848 1067
849 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1068 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
850 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 1069 $self->{textview}->scroll_to_bottom;
1070
1071 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
851} 1072}
852 1073
853sub destroy { 1074sub destroy {
854 my ($self) = @_; 1075 my ($self) = @_;
855 1076
856 #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
857 1078
1079 if ($self->{conn}) {
1080 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
858 delete $self->{conn}{npc_dialog}; 1081 delete $self->{conn}{npc_dialog};
859 $self->{conn}->disconnect_ext ($self->{token}); 1082 $self->{conn}->disconnect_ext ($self->{id});
1083 }
860 1084
861 $self->SUPER::destroy; 1085 $self->SUPER::destroy;
862} 1086}
863 1087
8641; 10881

Diff Legend

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