ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.53 by root, Mon Jul 3 22:32:52 2006 UTC vs.
Revision 1.95 by root, Wed Apr 4 02:43:30 2007 UTC

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

Diff Legend

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