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.36 by root, Thu Jun 15 15:33:58 2006 UTC vs.
Revision 1.72 by root, Sun Aug 13 02:43:22 2006 UTC

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

Diff Legend

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