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.187 by root, Sat Dec 29 13:44:30 2007 UTC

1package CFClient::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Deliantra::Protocol::Constants;
7 7
8use CFClient; 8use DC;
9use CFClient::UI; 9use DC::DB;
10use DC::UI;
11use DC::Pod;
12use DC::Macro;
13use DC::Item;
10 14
11use base 'Crossfire::Protocol::Base'; 15use base 'Deliantra::Protocol::Base';
12
13our %open_logs;
14 16
15sub new { 17sub new {
16 my $class = shift; 18 my ($class, %arg) = @_;
17 19
18 my $self = $class->SUPER::new (@_); 20 my $self = $class->SUPER::new (%arg,
21 setup_req => {
22 extmap => 1,
23 excmd => 1,
24 widget => 2,
25 %{$arg{setup_req} || {}},
26 },
27 );
19 28
20 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
21 30
22 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 31 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 32 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
29 or next; 33 or die "unparseable command help: $_->{kw}[0]";
30 34
31 my $cmd = $1; 35 my $cmd = $1;
32 my @args = split /\|/, $2; 36 my @args = split /\|/, $2;
33 @args = (".*") unless @args; 37 @args = (".*") unless @args;
34 38
39 my (undef, @par) = DC::Pod::section_of $_;
40 my $text = DC::Pod::as_label @par;
41
35 $_ = $_ eq ".*" ? "" : " $_" 42 $_ = $_ eq ".*" ? "" : " $_"
36 for @args; 43 for @args;
37 44
38 my $text = CFClient::pod_to_pango $head2->content; 45 map ["$cmd$_", $text],
39
40 push @cmd_help, ["$cmd$_", $text]
41 for sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
42 @args; 47 @args
48 } sort { $a->{par} <=> $b->{par} }
49 DC::Pod::find command => "*";
50
51 $self->{json_coder}
52 ->convert_blessed
53 ->filter_json_single_key_object ("\fw" => sub {
54 $self->{widget}{$_[0]}
43 } 55 })
56 ->filter_json_single_key_object ("\fc" => sub {
57 my ($id) = @_;
58 sub {
59 $self->send_exti_msg (w_e => $id, @_);
60 }
61 });
44 62
63 # destroy widgets on logout
64 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
65 for my $ws (values %{delete $self->{widgetset} || {}}) {
66 $_->destroy
67 for values %{delete $ws->{w} || {}};
68 }
69 });
70
71 $self->{map_widget}->add_command (@$_)
45 \@cmd_help 72 for @cmd_help;
73
74 {
75 $self->{dialogue} = my $tex = new_from_file DC::Texture
76 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
77 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
78 }
79
80 {
81 $self->{noface} = my $tex = new_from_file DC::Texture
82 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
83 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
84 }
85
86 $self->{open_container} = 0;
87
88 # per server
89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
90
91 $self
92}
93
94sub update_fx_want {
95 my ($self) = @_;
96
97 $self->send_exti_msg (fx_want => {
98 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
99 5 => !!$::CFG->{audio_enable}, # FT_SOUND
100 6 => 1, # FT_RSRC
101 });
102}
103
104sub ext_capabilities {
105 my ($self, %cap) = @_;
106
107 $self->update_fx_want;
108
109 $self->send_exti_req (resource => "exp_table", sub {
110 my ($exp_table) = @_;
111
112 $self->register_face_handler ($exp_table, sub {
113 my ($face) = @_;
114
115 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
116 $_->() for values %{ $self->{on_exp_update} || {} };
117 });
118
119 ()
120 });
121
122 if (my $ts = $cap{tileset}) {
123 if (my ($default) = grep $_->[2] & 1, @$ts) {
124 $self->{tileset} = $default;
125 $self->{tilesize} = $default->[3];
126 $self->setup_req (tileset => $default->[0]);
127
128 my $w = int $self->{mapw} * 32 / $self->{tilesize};
129 my $h = int $self->{maph} * 32 / $self->{tilesize};
130
131 $self->setup_req (mapsize => "${w}x${h}");
132 }
133 }
134}
135
136sub ext_ambient_music {
137 my ($self, $songs) = @_;
138 &::audio_music_set_ambient ($songs);
139}
140
141#############################################################################
142
143sub widget_associate {
144 my ($self, $ws, $id, $widget) = @_;
145
146 $widget ||= new DC::UI::Bin;
147
148 $widget->{s_id} = $id;
149 $self->{widget}{$id} = $widget;
150
151 if ($ws) {
152 $widget->{s_ws} = $ws;
153 $self->{widgetset}{$ws}{w}{$id} = $widget;
154 }
155
156 $widget->connect (on_destroy => sub {
157 my ($widget) = @_;
158
159 delete $self->{widget}{$widget->{s_id}};
160 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
161 if exists $widget->{s_ws};
162 });
163}
164
165# widgetset new
166sub ext_ws_n {
167 my ($self, $id) = @_;
168
169 $self->{widgetset}{$id} = {
170 w => {},
46 }; 171 };
47
48 $self->{map_widget}->add_command (@$_)
49 for @$cmd_help;
50
51 $self->{noface} = new_from_file CFClient::Texture
52 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
53
54 $self->{open_container} = 0;
55
56 # "global"
57 $self->{tilecache} = CFClient::db_table "tilecache";
58 $self->{facemap} = CFClient::db_table "facemap";
59
60 # per server
61 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";
62
63 $self
64} 172}
173
174# widgetset destroy
175sub ext_ws_d {
176 my ($self, $id) = @_;
177
178 my $ws = delete $self->{widgetset}{$id}
179 or return;
180
181 $_->destroy
182 for values %{$ws->{w}};
183}
184
185# widgetset create
186sub ext_ws_c {
187 my ($self, $ws, $id, $class, $args) = @_;
188
189 $self->widget_associate (
190 $ws, $id => scalar eval {
191 local $SIG{__DIE__};
192 "DC::UI::$class"->new (%$args)
193 }
194 );
195}
196
197# widgetset create template
198sub ext_ws_ct {
199 my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
200
201 $done_cb ||= sub { };
202
203 my $parse_list; $parse_list = sub {
204 my ($list) = @_;
205 my @w;
206
207 while (@$list) {
208 my ($class, $args) = splice @$list, 0, 2;
209 my $name = delete $args->{s_id};
210 my $cl = delete $args->{s_cl};
211 my $cfg = delete $cfg->{$name};
212 my $id = delete $cfg->{id};
213 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
214 or next;
215
216 $self->widget_associate ($ws, $id, $w)
217 if $id;
218
219 $w->add ($parse_list->($cl))
220 if $cl;
221
222 push @w, $w;
223 }
224
225 @w
226 };
227
228 # either array reference, or face #
229 if ($type eq "inline") {
230 $done_cb->();
231 $parse_list->($template);
232 } elsif ($type eq "face") {
233 my $handler; $handler = $self->register_face_handler ($template, sub {
234 my ($face) = @_;
235
236 undef $handler;
237 $done_cb->();
238 $parse_list->($self->{json_coder}->decode ($face->{data}));
239 });
240 } else {
241 $done_cb->(0);
242 }
243}
244
245# widgetset associate
246sub ext_ws_a {
247 my ($self, %ass) = @_;
248
249 # everything that has a name, wether conceivably useful or not
250 my %wkw = (
251 root => $DC::UI::ROOT,
252 tooltip => $DC::UI::TOOLTIP,
253
254 mapwidget => $::MAPWIDGET,
255 buttonbar => $::BUTTONBAR,
256 metaserver => $::METASERVER,
257 buttonbar => $::BUTTONBAR,
258 login_button => $::LOGIN_BUTTON,
259 quit_dialog => $::QUIT_DIALOG,
260 host_entry => $::HOST_ENTRY,
261 metaserver => $::METASERVER,
262 server_info => $::SERVER_INFO,
263
264 setup_dialog => $::SETUP_DIALOG,
265 setup_notebook => $::SETUP_NOTEBOOK,
266 setup_server => $::SETUP_SERVER,
267 setup_keyboard => $::SETUP_KEYBOARD,
268
269 pl_notebook => $::PL_NOTEBOOK,
270 pl_window => $::PL_WINDOW,
271 inventory_page => $::INVENTORY_PAGE,
272 stats_page => $::STATS_PAGE,
273 skill_page => $::SKILL_PAGE,
274 spell_page => $::SPELL_PAGE,
275 spell_list => $::SPELL_LIST,
276
277 floorbox => $::FLOORBOX,
278 help_window => $::HELP_WINDOW,
279 message_window => $::MESSAGE_WINDOW,
280 statusbox => $::SDTATUSBOX,
281
282 inv => $::INV,
283 invr => $::INVR,
284 invr_hb => $::INVR_HB,
285 );
286
287 while (my ($id, $name) = each %ass) {
288 $self->widget_associate (undef, $id => $wkw{$name});
289 }
290}
291
292# widget call
293sub ext_w_c {
294 my ($self, $id, $rcb, $method, @args) = @_;
295
296 my $w = $self->{widget}{$id}
297 or return;
298
299 if ($rcb) {
300 $rcb->($w->$method (@args));
301 } else {
302 $w->$method (@args);
303 }
304}
305
306# widget set
307sub ext_w_s {
308 my ($self, $id, $attr) = @_;
309
310 my $w = $self->{widget}{$id}
311 or return;
312
313 for (my $i = 0; $i < $#$attr; $i += 2) {
314 my ($member, $value) = @$attr[$i, $i+1];
315 if (defined $value) {
316 $w->{$member} = $value;
317 } else {
318 delete $w->{$member};
319 }
320 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
321 }
322}
323
324# widget get
325sub ext_w_g {
326 my ($self, $id, $rid, @attr) = @_;
327
328 my $w = $self->{widget}{$id}
329 or return;
330
331 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
332}
333
334# message window
335sub ext_channel_info {
336 my ($self, $info) = @_;
337 $self->{channels}->{$info->{id}} = $info;
338 $::MESSAGE_WINDOW->add_channel ($info);
339}
340
341#############################################################################
65 342
66sub logprint { 343sub logprint {
67 my ($self, @a) = @_; 344 my ($self, @a) = @_;
68 my $filename = "$Crossfire::VARDIR/log.$self->{host}";
69 345
70 my $fh = $open_logs{$filename}; 346 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
71 unless ($fh) {
72 # FIXME: handle this more gracefully?
73 open $fh, ">>", $filename
74 or die "Couldn't open logfile: log.$self->{host}: $!";
75
76 $open_logs{$filename} = $fh;
77 }
78
79 my ($sec, $min, $hour, $mday, $mon, $year) = localtime (time);
80
81 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
82 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
83
84 print $fh "$ts ", @a, "\n";
85 $fh->flush;
86} 347}
348
349sub _stat_numdiff {
350 my ($self, $name, $old, $new) = @_;
351
352 my $diff = $new - $old;
353
354 $diff = 0.01 * int $diff * 100;
355
356 0.1 >= abs $diff ? ()
357 : $diff < 0 ? "$name$diff" : "$name+$diff"
358}
359
360sub _stat_skillmaskdiff {
361 my ($self, $name, $old, $new) = @_;
362
363 my $diff = $old ^ $new
364 or return;
365
366 my @diff = map
367 {
368 $diff & $_
369 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
370 : ()
371 }
372 sort { $a <=> $b } keys %{$self->{spell_paths}};
373
374 join "", @diff
375}
376
377# all stats that are chacked against changes
378my @statchange = (
379 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
380 [&CS_STAT_INT => \&_stat_numdiff, "Int"],
381 [&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
382 [&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
383 [&CS_STAT_CON => \&_stat_numdiff, "Con"],
384 [&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
385 [&CS_STAT_POW => \&_stat_numdiff, "Pow"],
386 [&CS_STAT_WC => \&_stat_numdiff, "Wc"],
387 [&CS_STAT_AC => \&_stat_numdiff, "Ac"],
388 [&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
389 [&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
390 [&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
391 [&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
392 [&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
393 [&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
394 [&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
395 [&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
396 [&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
397 [&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
398 [&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
399 [&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
400 [&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
401 [&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
402 [&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
403 [&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
404 [&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
405 [&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
406 [&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
407 [&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
408 [&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
409 [&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
410 [&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
411 [&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
412 [&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
413 [&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
414 [&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
415 [&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
416);
87 417
88sub stats_update { 418sub stats_update {
89 my ($self, $stats) = @_; 419 my ($self, $stats) = @_;
90 420
91 if (my $exp = $stats->{+CS_STAT_EXP64}) { 421 my $prev = $self->{prev_stats} || { };
92 my $diff = $exp - $self->{prev_exp}; 422
423 if (my @diffs =
424 (
425 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
426 map {
427 $stats->{$_} && $prev->{$_}
428 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
429 } sort { $a <=> $b } keys %{$self->{skill_info}}
430 )
431 ) {
432 my $msg = join " ", @diffs;
93 $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5) 433 $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 } 434 }
97 435
436 if (
437 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
438 ) {
439 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
440 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
441 }
442
98 ::update_stats_window ($stats); 443 $self->update_stats_window ($stats, $prev);
444
445 $self->{prev_stats} = { %$stats };
446}
447
448my %RES_TBL = (
449 phys => CS_STAT_RES_PHYS,
450 magic => CS_STAT_RES_MAG,
451 fire => CS_STAT_RES_FIRE,
452 elec => CS_STAT_RES_ELEC,
453 cold => CS_STAT_RES_COLD,
454 conf => CS_STAT_RES_CONF,
455 acid => CS_STAT_RES_ACID,
456 drain => CS_STAT_RES_DRAIN,
457 ghit => CS_STAT_RES_GHOSTHIT,
458 pois => CS_STAT_RES_POISON,
459 slow => CS_STAT_RES_SLOW,
460 para => CS_STAT_RES_PARA,
461 tund => CS_STAT_TURN_UNDEAD,
462 fear => CS_STAT_RES_FEAR,
463 depl => CS_STAT_RES_DEPLETE,
464 deat => CS_STAT_RES_DEATH,
465 holyw => CS_STAT_RES_HOLYWORD,
466 blind => CS_STAT_RES_BLIND,
467);
468
469sub update_stats_window {
470 my ($self, $stats, $prev) = @_;
471
472 # I love text protocols...
473
474 my $hp = $stats->{+CS_STAT_HP} * 1;
475 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
476 my $sp = $stats->{+CS_STAT_SP} * 1;
477 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
478 my $fo = $stats->{+CS_STAT_FOOD} * 1;
479 my $fo_m = 999;
480 my $gr = $stats->{+CS_STAT_GRACE} * 1;
481 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
482
483 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
484 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
485 $::GAUGES->{food} ->set_value ($fo, $fo_m);
486 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
487 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
488 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
489 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
490 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
491 my $title = $stats->{+CS_STAT_TITLE};
492 $title =~ s/^Player: //;
493 $::STATWIDS->{title} ->set_text ("Title: " . $title);
494
495 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
496 $::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
497 $::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
498 $::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
499 $::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
500 $::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
501 $::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
502 $::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
503 $::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
504 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
505 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
506 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
507 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
508
509 $self->update_weight;
510
511 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
512 for keys %RES_TBL;
513
514 my $sktbl = $::STATWIDS->{skill_tbl};
515 my @skills = keys %{ $self->{skill_info} };
516
517 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
518 map [$_, $self->{skill_info}{$_}],
519 grep exists $stats->{$_},
520 @skills;
521
522 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
523 $self->{stat_order} = join ",", map $_->[0], @order;
524
525 $sktbl->clear;
526
527 my $sw = $self->{skillwid}{""} ||= [
528 0, 0, (new DC::UI::Label text => "Experience", align => 1),
529 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
530 2, 0, (new DC::UI::Label text => "Progress"),
531 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
532 4, 0, (new DC::UI::Label text => "Experience", align => 1),
533 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
534 6, 0, (new DC::UI::Label text => "Progress"),
535 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
536 ];
537
538 my @add = @$sw;
539
540 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
541
542 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
543 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
544
545 my ($x, $y) = (0, 1);
546 for (@order) {
547 my ($idx, $name) = @$_;
548
549 my $spell_cb = sub {
550 my ($widget, $ev) = @_;
551
552 if ($ev->{button} == 1) {
553 $::CONN->user_send ("ready_skill $name");
554 } elsif ($ev->{button} == 2) {
555 $::CONN->user_send ("use_skill $name");
556 } elsif ($ev->{button} == 3) {
557 my $shortname = DC::shorten $name, 14;
558 (new DC::UI::Menu
559 items => [
560 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
561 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
562 ],
563 )->popup ($ev);
564 } else {
565 return 0;
566 }
567
568 1
569 };
570
571 my $sw = $self->{skillwid}{$idx} ||= [
572 # exp
573 (new DC::UI::Label
574 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
575
576 # level
577 (new DC::UI::Label
578 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
579
580 # progress
581 (new DC::UI::ExperienceProgress),
582
583 # label
584 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
585 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
586 ];
587
588 push @add,
589 $x * 4 + 0, $y, $sw->[0],
590 $x * 4 + 1, $y, $sw->[1],
591 $x * 4 + 2, $y, $sw->[2],
592 $x * 4 + 3, $y, $sw->[3],
593 ;
594
595 $x++ and ($x, $y) = (0, $y + 1);
596 }
597
598 $sktbl->add_at (@add);
599 }
600
601 for (@order) {
602 my ($idx, $name) = @$_;
603 my $val = $stats->{$idx};
604
605 next if $prev->{$idx}[1] eq $val->[1];
606
607 my $sw = $self->{skillwid}{$idx};
608 $sw->[0]->set_text (::formsep ($val->[1]));
609 $sw->[1]->set_text ($val->[0] * 1);
610 $sw->[2]->set_value (@$val);
611
612 $::GAUGES->{sklprg}->set_label ("$name %d%%");
613 $::GAUGES->{sklprg}->set_value (@$val);
614 }
99} 615}
100 616
101sub user_send { 617sub user_send {
102 my ($self, $command) = @_; 618 my ($self, $command) = @_;
103 619
620 $self->{record}->($command)
104 if ($self->{record}) { 621 if $self->{record};
105 push @{$self->{record}}, $command;
106 }
107 622
108 $self->logprint ("send: ", $command); 623 $self->logprint ("send: ", $command);
109 $self->send_command ($command); 624 $self->send_command ($command);
110 ::status $command;
111} 625}
112 626
113sub start_record { 627sub record {
114 my ($self) = @_; 628 my ($self, $cb) = @_;
115 629
116 $self->{record} = []; 630 $self->{record} = $cb;
117}
118
119sub stop_record {
120 my ($self) = @_;
121 return delete $self->{record};
122} 631}
123 632
124sub map_scroll { 633sub map_scroll {
125 my ($self, $dx, $dy) = @_; 634 my ($self, $dx, $dy) = @_;
126 635
… …
128} 637}
129 638
130sub feed_map1a { 639sub feed_map1a {
131 my ($self, $data) = @_; 640 my ($self, $data) = @_;
132 641
133 $self->{map}->map1a_update ($data); 642 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
643 my $delay;
644
645 for my $tile (@$missing) {
646 next if $self->{delay}{$tile};
647
648 $delay = 1;
649
650 if (my $tex = $::CONN->{texture}[$tile]) {
651 $tex->upload;
652 } else {
653 $self->{delay}{$tile} = 1;
654
655 # we assume the face is in-flight and will eventually come
656 push @{$self->{tile_cb}{$tile}}, sub {
657 delete $self->{delay}{$tile};
658 $_[0]->upload;
659 };
660 }
661 }
662
663 if ($delay) {
664 # delay the map drawing a tiny bit in the hope of getting the missing fetched
665 EV::once undef, 0, 0.03, sub {
666 $self->{map_widget}->update
667 if $self->{map_widget};
668 };
669 } else {
134 $self->{map_widget}->update; 670 $self->{map_widget}->update;
671 }
135} 672}
136 673
137sub magicmap { 674sub magicmap {
138 my ($self, $w, $h, $x, $y, $data) = @_; 675 my ($self, $w, $h, $x, $y, $data) = @_;
139 676
… …
146 my $map_info = delete $self->{map_info} 683 my $map_info = delete $self->{map_info}
147 or return; 684 or return;
148 685
149 my ($hash, $x, $y, $w, $h) = @$map_info; 686 my ($hash, $x, $y, $w, $h) = @$map_info;
150 687
151 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 688 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
152 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 689 $self->{map_cache_new}{$hash} = \$data;
153 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 690 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
154} 691}
155 692
156sub map_clear { 693sub map_clear {
157 my ($self) = @_; 694 my ($self) = @_;
158 695
… …
161 698
162 $self->{map}->clear; 699 $self->{map}->clear;
163 delete $self->{map_widget}{magicmap}; 700 delete $self->{map_widget}{magicmap};
164} 701}
165 702
703sub bg_fetch {
704 my ($self) = @_;
705
706 my $tile;
707
708 do {
709 $tile = pop @{$self->{bg_fetch}}
710 or return;
711 } while $self->{texture}[$tile];
712
713 DC::DB::get tilecache => $tile, sub {
714 my ($data) = @_;
715
716 return unless $self->{map}; # stop when destroyed
717
718 if (defined $data) {
719 $self->have_tile ($tile, $data);
720 $self->{texture}[$tile]->upload;
721 }
722
723 $self->bg_fetch;
724 };
725}
166 726
167sub load_map($$$) { 727sub load_map($$$) {
168 my ($self, $hash, $x, $y) = @_; 728 my ($self, $hash, $x, $y) = @_;
169 729
170 if (defined (my $data = $self->{mapcache}->get ($hash))) { 730 my $gen = $self->{map_change_gen};
731
732 my $cb = sub {
733 return unless $gen == $self->{map_change_gen};
734
735 my ($data) = @_;
736
737 if (defined $data) {
738 $self->{map_cache_new}{$hash} = \$data;
739
171 $data = Compress::LZF::decompress $data; 740 my $data = Compress::LZF::decompress $data;
172 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
173 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
174 my $data = $self->{tilecache}->get ($id)
175 or next;
176 741
177 $self->set_texture ($id => $data); 742 my $inprogress = @{ $self->{bg_fetch} || [] };
743 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
744 $self->bg_fetch unless $inprogress;
178 } 745 }
746 };
747
748 if (my $rdata = $self->{map_cache_old}{$hash}) {
749 $cb->($$rdata);
750 } else {
751 DC::DB::get $self->{mapcache} => $hash, $cb;
179 } 752 }
180} 753}
181 754
182# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 755# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
183# (server resource,s latency, bandwidth), so this hack is warranted. 756# (server resource,s latency, bandwidth), so this hack is warranted.
… …
248 821
249 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 822 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
250 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 823 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
251 824
252 } else { 825 } else {
826 my $gen = $self->{map_change_gen};
253 $self->send_mapinfo ("spatial $path$tile", sub { 827 $self->send_mapinfo ("spatial $path$tile", sub {
828 return unless $gen == $self->{map_change_gen};
829
254 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 830 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
255 831
256 return if $mode ne "spatial"; 832 return if $mode ne "spatial";
257 833
258 $x += $self->{map}->ox; 834 $x += $self->{map}->ox;
… …
272 848
273sub map_change { 849sub map_change {
274 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 850 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
275 851
276 $self->flush_map; 852 $self->flush_map;
853
854 ++$self->{map_change_gen};
855 $self->{map_cache_old} = delete $self->{map_cache_new};
277 856
278 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 857 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
279 858
280 my $mapmapw = $self->{mapmap}->{w}; 859 my $mapmapw = $self->{mapmap}->{w};
281 my $mapmaph = $self->{mapmap}->{h}; 860 my $mapmaph = $self->{mapmap}->{h};
… …
298 $self->load_map ($hash, $x, $y); 877 $self->load_map ($hash, $x, $y);
299 $self->flood_fill (0, 0, 0, "", $hash, $flags); 878 $self->flood_fill (0, 0, 0, "", $hash, $flags);
300} 879}
301 880
302sub face_find { 881sub face_find {
882 my ($self, $facenum, $face, $cb) = @_;
883
884 if ($face->{type} == 0) { # FT_FACE
885 my $id = DC::DB::get_tile_id_sync $face->{name};
886
887 $face->{id} = $id;
888 $self->{map}->set_tileid ($facenum => $id);
889
890 DC::DB::get tilecache => $id, $cb;
891
892 } elsif ($face->{type} & 1) { # with metadata
893 DC::DB::get res_meta => $face->{name}, $cb;
894
895 } else { # no metadata
896 DC::DB::get res_data => $face->{name}, $cb;
897 }
898}
899
900sub face_update {
901 my ($self, $facenum, $face, $changed) = @_;
902
903 if ($face->{type} == 0) {
904 # image, FT_FACE
905 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
906 if $changed;
907
908 $self->have_tile ($face->{id}, delete $face->{data});
909
910 } elsif ($face->{type} & 1) {
911 # split metadata case, FT_MUSIC, FT_SOUND
912 if ($changed) { # new data
913 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
914 $face->{data} = $meta;
915
916 # rely on strict ordering here and also on later fetch
917 DC::DB::put res_data => $face->{name} => $data, sub { };
918 DC::DB::put res_meta => $face->{name} => $meta, sub { };
919 }
920
921 $face->{data} = $self->{json_coder}->decode ($face->{data});
922 ::add_license ($face);
923 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
924 if $changed;
925
926 if ($face->{type} == 3) { # FT_MUSIC
927 &::audio_music_push ($facenum);
928 } elsif ($face->{type} == 5) { # FT_SOUND
929 &::audio_sound_push ($facenum);
930 }
931
932 } else {
933 # flat resource case, FT_RSRC
934 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
935 if $changed;
936 }
937
938 if (my $cbs = $self->{face_cb}{$facenum}) {
939 $_->($face, $changed) for @$cbs;
940 }
941}
942
943sub smooth_update {
303 my ($self, $facenum, $face) = @_; 944 my ($self, $facenum, $face) = @_;
304 945
305 my $hash = "$face->{chksum},$face->{name}"; 946 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
947}
306 948
307 my $id = $self->{facemap}->get ($hash); 949sub have_tile {
950 my ($self, $tile, $data) = @_;
308 951
309 unless ($id) { 952 return unless $self->{map};
310 # create new id for face
311 # I love transactions
312 for (1..100) {
313 my $txn = $CFClient::DB_ENV->txn_begin;
314 my $status = $self->{facemap}->db_get (id => $id);
315 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
316 $id = ($id || 64) + 1;
317 if ($self->{facemap}->put (id => $id) == 0
318 && $self->{facemap}->put ($hash => $id) == 0) {
319 $txn->txn_commit;
320 953
321 goto gotid; 954 my $tex = $self->{texture}[$tile] ||=
322 } 955 new DC::Texture
956 tile => $tile,
957 image => $data, delete_image => 1,
958 minify => 1, mipmap => 1;
959
960 if (my $cbs = delete $self->{tile_cb}{$tile}) {
961 $_->($tex) for @$cbs;
962 }
963}
964
965# call in non-void context registers a temporary
966# hook with handle, otherwise its permanent
967sub on_face_change {
968 my ($self, $num, $cb) = @_;
969
970 push @{$self->{face_cb}{$num}}, $cb;
971
972 defined wantarray
973 ? DC::guard {
974 @{$self->{face_cb}{$num}}
975 = grep $_ != $cb,
976 @{$self->{face_cb}{$num}};
323 } 977 }
324 $txn->txn_abort; 978 : ()
325 }
326
327 CFClient::fatal "maximum number of transaction retries reached - database problems?";
328 }
329
330gotid:
331 $face->{id} = $id;
332 $self->{map}->set_face ($facenum => $id);
333 $self->{faceid}[$facenum] = $id;#d#
334
335 my $face = $self->{tilecache}->get ($id);
336
337 if ($face) {
338 #$self->face_prefetch;
339 $face
340 } else {
341 my $tex = $self->{noface};
342 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
343 undef
344 };
345} 979}
346 980
347sub face_update { 981# call in non-void context registers a temporary
982# hook with handle, otherwise its permanent
983sub register_face_handler {
348 my ($self, $facenum, $face) = @_; 984 my ($self, $num, $cb) = @_;
349 985
350 $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes 986 return unless $num;
351 987
352 $self->set_texture ($face->{id} => delete $face->{image}); 988 # invoke if available right now
353} 989 $cb->($self->{face}[$num], 0)
990 unless exists $self->{face}[$num]{loading};
354 991
355sub set_texture { 992 # future changes
356 my ($self, $id, $data) = @_; 993 $self->on_face_change ($num => $cb)
357
358 $self->{texture}[$id] ||= do {
359 my $tex =
360 new_from_image CFClient::Texture
361 $data, minify => 1, mipmap => 1;
362
363 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
364 $self->{map_widget}->update;
365
366 $tex
367 };
368} 994}
369 995
370sub sound_play { 996sub sound_play {
371 my ($self, $x, $y, $soundnum, $type) = @_; 997 my ($self, $type, $face, $dx, $dy, $vol) = @_;
372 998
373 $self->{sound_play}->($x, $y, $soundnum, $type); 999 &::audio_sound_play ($face, $dx, $dy, $vol)
1000 unless $type & 1; # odd types are silent for future expansion
374} 1001}
375 1002
376my $LAST_QUERY; # server is stupid, stupid, stupid 1003my $LAST_QUERY; # server is stupid, stupid, stupid
377 1004
378sub query { 1005sub query {
… …
382 $LAST_QUERY = $prompt; 1009 $LAST_QUERY = $prompt;
383 1010
384 $self->{query}-> ($self, $flags, $prompt); 1011 $self->{query}-> ($self, $flags, $prompt);
385} 1012}
386 1013
387sub drawinfo { 1014sub sanitise_xml($) {
388 my ($self, $color, $text) = @_; 1015 local $_ = shift;
389 1016
390 my @color = ( 1017 # we now weed out all tags we do not support
1018 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1019 }{
1020 "&lt;"
1021 }gex;
1022
1023 # now all entities
1024 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
1025
1026 # handle some elements
1027 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
1028 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
1029
1030 $_
1031}
1032
1033our %NAME_TO_COLOR = (
1034 black => 0,
1035 white => 1,
1036 darkblue => 2,
1037 red => 3,
1038 orange => 4,
1039 lightblue => 5,
1040 darkorange => 6,
1041 green => 7,
1042 darkgreen => 8,
1043 grey => 9,
1044 brown => 10,
1045 yellow => 11,
1046 tan => 12,
1047);
1048
1049our @CF_COLOR = (
391 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1050 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
392 [1.00, 1.00, 1.00], 1051 [1.00, 1.00, 1.00],
393 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1052 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
394 [1.00, 0.00, 0.00], 1053 [1.00, 0.00, 0.00],
395 [1.00, 0.54, 0.00], 1054 [1.00, 0.54, 0.00],
396 [0.11, 0.56, 1.00], 1055 [0.11, 0.56, 1.00],
397 [0.93, 0.46, 0.00], 1056 [0.93, 0.46, 0.00],
398 [0.18, 0.54, 0.34], 1057 [0.18, 0.54, 0.34],
399 [0.56, 0.73, 0.56], 1058 [0.56, 0.73, 0.56],
400 [0.80, 0.80, 0.80], 1059 [0.80, 0.80, 0.80],
401 [0.55, 0.41, 0.13], 1060 [0.75, 0.61, 0.20],
402 [0.99, 0.77, 0.26], 1061 [0.99, 0.77, 0.26],
403 [0.74, 0.65, 0.41], 1062 [0.74, 0.65, 0.41],
404 ); 1063);
405 1064
1065sub msg {
1066 my ($self, $color, $type, $text, @extra) = @_;
1067
1068 $text = sanitise_xml $text;
1069
1070 if (my $cb = $self->{cb_msg}{$type}) {
1071 $_->($self, $color, $type, $text, @extra) for values %$cb;
1072 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1073 $type =~ s/-/_/g;
1074 $self->{$type} = $text;
1075 } else {
406 $self->logprint ("info: ", $text); 1076 $self->logprint ("msg: ", $text);
1077 return if $color < 0; # negative color == ignore if not understood
407 1078
408 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 1079 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
409 1080
410 # try to create single paragraphs of multiple lines sent by the server 1081 ## try to create single paragraphs of multiple lines sent by the server
1082 # no longer neecssary with TRT servers
411 $text =~ s/(?<=\S)\n(?=\w)/ /g; 1083 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
412 1084
413 $text = CFClient::UI::Label::escape $text; 1085 for (split /\n/, $text) {
414 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1086 ::message ({
415 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 1087 fg => $fg,
1088 markup => $_,
1089 type => $type,
1090 extra => [@extra],
1091 color_flags => $color, #d# ugly, kill
1092 });
416 1093
417 $self->{logview}->add_paragraph ($color[$color], $_) 1094 $color &= ~NDI_CLEAR; # only clear once for multiline messages
418 for map "$time $_", split /\n/, $text; 1095 # actually, this is an ugly design. _we_ should control the channels,
419 $self->{logview}->scroll_to_bottom; 1096 # not some random other widget, as the channels are clearly protocol-specific.
1097 # then we could also react to flags such as CLEAR without resorting to
1098 # hacks such as color_flags, above.
1099 }
420 1100
421 $self->{statusbox}->add ($text, 1101 $self->{statusbox}->add ($text,
422 group => $text, 1102 group => $text,
423 fg => $color[$color], 1103 fg => $fg,
424 timeout => $color >= 2 ? 60 : 10, 1104 timeout => $color >= 2 ? 180 : 10,
425 tooltip_font => $::FONT_FIXED, 1105 tooltip_font => $::FONT_FIXED,
426 ); 1106 ) if $type eq "info";
427} 1107 }
428
429sub drawextinfo {
430 my ($self, $color, $type, $subtype, $message) = @_;
431
432 $self->drawinfo ($color, $message);
433} 1108}
434 1109
435sub spell_add { 1110sub spell_add {
436 my ($self, $spell) = @_; 1111 my ($self, $spell) = @_;
437 1112
438 # try to create single paragraphs of multiple lines sent by the server 1113 # try to create single paragraphs out of the multiple lines sent by the server
439 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 1114 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
440 $spell->{message} =~ s/\n+$//; 1115 $spell->{message} =~ s/\n+$//;
441 $spell->{message} ||= "Server did not provide a description for this spell."; 1116 $spell->{message} ||= "Server did not provide a description for this spell.";
442 1117
443 $::SETUP_SPELLS->add_spell ($spell); 1118 $::SPELL_LIST->add_spell ($spell);
444 1119
445 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 1120 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
446 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 1121 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
447} 1122}
448 1123
449sub spell_delete { 1124sub spell_delete {
450 my ($self, $spell) = @_; 1125 my ($self, $spell) = @_;
1126
451 $::SETUP_SPELLS->remove_spell ($spell); 1127 $::SPELL_LIST->remove_spell ($spell);
1128}
1129
1130sub setup {
1131 my ($self, $setup) = @_;
1132
1133 $self->{map_widget}->set_tilesize ($self->{tilesize});
1134 $::MAP->resize ($self->{mapw}, $self->{maph});
452} 1135}
453 1136
454sub addme_success { 1137sub addme_success {
455 my ($self) = @_; 1138 my ($self) = @_;
456 1139
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; 1140 my %skill_help;
461 1141
462 for my $head2 ($pom->head1->[3]->head2) { 1142 for my $node (DC::Pod::find skill_description => "*") {
463 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 1143 my (undef, @par) = DC::Pod::section_of $node;
464 } 1144 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par;
465
466 \%skill_help
467 }; 1145 };
468 1146
469 for my $skill (values %{$self->{skill_info}}) { 1147 for my $skill (values %{$self->{skill_info}}) {
470 $self->{map_widget}->add_command ("ready_skill $skill", 1148 $self->{map_widget}->add_command ("ready_skill $skill",
471 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 1149 (DC::asxml "Ready the skill '$skill'\n\n")
472 . $skill_help->{$skill}); 1150 . $skill_help{$skill});
473 $self->{map_widget}->add_command ("use_skill $skill", 1151 $self->{map_widget}->add_command ("use_skill $skill",
474 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 1152 (DC::asxml "Immediately use the skill '$skill'\n\n")
475 . $skill_help->{$skill}); 1153 . $skill_help{$skill});
476 } 1154 }
477} 1155}
478 1156
479sub eof { 1157sub eof {
480 my ($self) = @_; 1158 my ($self) = @_;
… …
482 $self->{map_widget}->clr_commands; 1160 $self->{map_widget}->clr_commands;
483 1161
484 ::stop_game (); 1162 ::stop_game ();
485} 1163}
486 1164
487sub image_info {
488 my ($self, $numfaces) = @_;
489
490 $self->{num_faces} = $numfaces;
491 $self->{face_prefetch} = [1 .. $numfaces];
492 $self->face_prefetch;
493}
494
495sub face_prefetch {
496 my ($self) = @_;
497
498 return unless $::CFG->{face_prefetch};
499
500 if ($self->{num_faces}) {
501 return if @{ $self->{send_queue} || [] };
502 my $todo = @{ $self->{face_prefetch} }
503 or return;
504
505 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
506
507 $self->send ("requestinfo image_sums $face $face");
508
509 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
510 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
511 } elsif (!exists $self->{num_faces}) {
512 $self->send ("requestinfo image_info");
513
514 $self->{num_faces} = 0;
515
516 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
517 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
518 }
519}
520
521sub update_floorbox { 1165sub update_floorbox {
522 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1166 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
523 return unless $::CONN; 1167 return unless $::CONN;
524 1168
525 $::FLOORBOX->clear; 1169 $::FLOORBOX->clear;
526 1170
1171 my @add;
1172
527 my $row; 1173 my $row;
528 for (@{ $::CONN->{container}{0} }) { 1174 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
529 if ($row < 6) { 1175 if ($row < 6) {
530 local $_->{face_widget}; # hack to force recreation of widget 1176 local $_->{face_widget}; # hack to force recreation of widget
531 local $_->{desc_widget}; # hack to force recreation of widget 1177 local $_->{desc_widget}; # hack to force recreation of widget
532 CFClient::Item::update_widgets $_; 1178 DC::Item::update_widgets $_;
533 1179
1180 push @add,
534 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1181 0, $row, $_->{face_widget},
535 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1182 1, $row, $_->{desc_widget};
536 1183
537 $row++; 1184 $row++;
538 } else { 1185 } else {
539 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 1186 push @add, 1, $row, new DC::UI::Button
540 text => "More...", 1187 text => "More...",
541 on_activate => sub { $::INV_WINDOW->toggle_visibility; 0 }, 1188 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
542 ); 1189 ;
543 last; 1190 last;
544 } 1191 }
545 } 1192 }
1193 if ($::CONN->{open_container}) {
1194 push @add, 1, $row++, new DC::UI::Button
1195 text => "Close container",
1196 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1197 ;
1198 }
1199
1200 $::FLOORBOX->add_at (@add);
546 }); 1201 });
547 1202
548 $::WANT_REFRESH++; 1203 $::WANT_REFRESH = 1;
549} 1204}
550 1205
551sub set_opencont { 1206sub set_opencont {
552 my ($conn, $tag, $name) = @_; 1207 my ($conn, $tag, $name) = @_;
553 $conn->{open_container} = $tag; 1208 $conn->{open_container} = $tag;
1209 update_floorbox;
554 1210
555 $::INV_RIGHT_HB->clear (); 1211 $::INVR_HB->clear ();
556 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 1212 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
557 1213
558 if ($tag != 0) { # Floor isn't closable, is it? 1214 if ($tag != 0) { # Floor isn't closable, is it?
559 $::INV_RIGHT_HB->add (new CFClient::UI::Button 1215 $::INVR_HB->add (new DC::UI::Button
560 text => "Close container", 1216 text => "Close container",
561 tooltip => "Close the currently open container (if one is open)", 1217 tooltip => "Close the currently open container (if one is open)",
562 on_activate => sub { 1218 on_activate => sub {
563 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1219 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
564 if $tag != 0; 1220 if $tag != 0;
565 #if $CONN->{open_container} != 0;
566 0 1221 0
567 }, 1222 },
568 ); 1223 );
569 } 1224 }
570 1225
571 $::INVR->set_items ($conn->{container}{$tag}); 1226 $::INVR->set_items ($conn->{container}{$tag});
572} 1227}
573 1228
574sub update_container { 1229sub update_containers {
575 my ($tag) = @_; 1230 my ($self) = @_;
576 1231
577 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 1232 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1233 my $todo = delete $self->{update_container}
1234 or return;
1235
1236 for my $tag (keys %$todo) {
1237 update_floorbox if $tag == 0 or $tag == $self->{open_container};
1238 if ($tag == 0) {
1239 $::INVR->set_items ($self->{container}{0})
578 if $tag == $::CONN->{open_container}; 1240 if $tag == $self->{open_container};
1241 } elsif ($tag == $self->{player}{tag}) {
1242 $::INV->set_items ($self->{container}{$tag})
1243 } else {
1244 $::INVR->set_items ($self->{container}{$tag})
1245 if $tag == $self->{open_container};
1246 }
1247 }
1248 });
579} 1249}
580 1250
581sub container_add { 1251sub container_add {
582 my ($self, $tag, $items) = @_; 1252 my ($self, $tag, $items) = @_;
583 1253
584 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 1254 $self->{update_container}{$tag}++;
585 1255 $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} 1256}
598 1257
599sub container_clear { 1258sub container_clear {
600 my ($self, $tag) = @_; 1259 my ($self, $tag) = @_;
601 1260
602 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 1261 $self->{update_container}{$tag}++;
603 1262 $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} 1263}
615 1264
616sub item_delete { 1265sub item_delete {
617 my ($self, @items) = @_; 1266 my ($self, @items) = @_;
618 1267
1268 $self->{update_container}{$_->{container}}++
619 for (@items) { 1269 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 } 1270
1271 $self->update_containers;
631} 1272}
632 1273
633sub item_update { 1274sub item_update {
634 my ($self, $item) = @_; 1275 my ($self, $item) = @_;
635 1276
636 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1277 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
637 1278
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; 1279 DC::Item::update_widgets $item;
644 1280
645 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1281 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
646 set_opencont ($::CONN, 0, "Floor"); 1282 set_opencont ($::CONN, 0, "Floor");
647 1283
648 } elsif ($item->{flags} & F_OPEN) { 1284 } elsif ($item->{flags} & F_OPEN) {
649 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1285 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1286
650 } else { 1287 } else {
651 if ($item->{container} == 0) { 1288 $self->{update_container}{$item->{container}}++;
652 update_floorbox;
653 update_container (0); 1289 $self->update_containers;
654 } elsif ($item->{container} == $self->{player}{tag}) {
655 $::INV->set_items ($self->{container}{$item->{container}})
656 }
657 } 1290 }
658} 1291}
659 1292
660sub player_update { 1293sub player_update {
661 my ($self, $player) = @_; 1294 my ($self, $player) = @_;
662 1295
1296 $self->update_weight;
1297}
1298
1299sub update_weight {
1300 my ($self) = @_;
1301
1302 my $weight = .001 * $self->{player}{weight};
1303 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1304
663 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 1305 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1306 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1307 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
664} 1308}
665 1309
666sub update_server_info { 1310sub update_server_info {
667 my ($self) = @_; 1311 my ($self) = @_;
668 1312
… …
671 $::SERVER_INFO->set_markup ( 1315 $::SERVER_INFO->set_markup (
672 "server <tt>$self->{host}:$self->{port}</tt>\n" 1316 "server <tt>$self->{host}:$self->{port}</tt>\n"
673 . "protocol version <tt>$self->{version}</tt>\n" 1317 . "protocol version <tt>$self->{version}</tt>\n"
674 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1318 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
675 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1319 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1320 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1321 . "editing support $yesno[!!$self->{editor_support}]\n"
1322 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1323 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
676 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1324 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
677 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1325 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
678 . "map size $self->{mapw}×$self->{maph}\n" 1326 . "map size $self->{mapw}×$self->{maph}\n"
679 ); 1327 );
1328
680} 1329}
681 1330
682sub logged_in { 1331sub logged_in {
683 my ($self) = @_; 1332 my ($self) = @_;
684 1333
685 $self->send_ext_req (cfplus_support => "1", sub { 1334 $self->send_ext_req (cfplus_support => version => 2, sub {
1335 my (%msg) = @_;
1336
686 $self->{cfplus_ext} = $_[0]; 1337 $self->{cfplus_ext} = $msg{version};
687 $self->update_server_info; 1338 $self->update_server_info;
1339
1340 if ($self->{cfplus_ext} >= 2) {
1341 $self->send_ext_req ("editor_support", sub {
1342 $self->{editor_support} = { @_ };
1343 $self->update_server_info;
1344
1345 0
1346 });
1347 }
1348
1349 0
688 }); 1350 });
689 1351
690 $self->update_server_info; 1352 $self->update_server_info;
691 1353
692 $self->send_command ("output-sync $::CFG->{output_sync}"); 1354 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
693 $self->send_command ("output-count $::CFG->{output_count}");
694 $self->send_command ("pickup $::CFG->{pickup}"); 1355 $self->send_command ("pickup $::CFG->{pickup}");
695} 1356}
696 1357
697sub lookat { 1358sub lookat {
698 my ($self, $x, $y) = @_; 1359 my ($self, $x, $y) = @_;
699 1360
700 if ($self->{cfplus_ext}) { 1361 if ($self->{cfplus_ext}) {
701 $self->send_ext_req (lookat => "$x $y", sub { 1362 $self->send_ext_req (lookat => $x, $y, sub {
702 my %res = split /\x00/, $_[0]; 1363 my (%msg) = @_;
703 1364
704 if (exists $res{npc_dialog}) { 1365 if (exists $msg{npc_dialog}) {
705 # start npc chat dialog 1366 # start npc chat dialog
706 $self->{npc_dialog} = new CFClient::NPCDialog:: 1367 $self->{npc_dialog} = new DC::NPCDialog::
707 dx => $x, 1368 token => $msg{npc_dialog},
708 dy => $y,
709 title => "$res{npc_dialog} (NPC)", 1369 title => "$msg{npc_dialog}[0] (NPC)",
710 conn => $self, 1370 conn => $self,
711 ; 1371 ;
712 } 1372 }
713 }); 1373 });
714 } 1374 }
… …
717} 1377}
718 1378
719sub destroy { 1379sub destroy {
720 my ($self) = @_; 1380 my ($self) = @_;
721 1381
722 $self->{npc_dialog}->destroy 1382 (delete $self->{npc_dialog})->destroy
723 if $self->{npc_dialog}; 1383 if $self->{npc_dialog};
724 1384
725 $self->SUPER::destroy; 1385 $self->SUPER::destroy;
726}
727 1386
1387 %$self = ();
1388}
1389
728package CFClient::NPCDialog; 1390package DC::NPCDialog;
729 1391
730our @ISA = 'CFClient::UI::FancyFrame'; 1392our @ISA = 'DC::UI::Toplevel';
731 1393
732sub new { 1394sub new {
733 my $class = shift; 1395 my $class = shift;
734 1396
735 my $self = $class->SUPER::new ( 1397 my $self = $class->SUPER::new (
… …
738 name => "npc_dialog", 1400 name => "npc_dialog",
739 force_w => $::WIDTH * 0.7, 1401 force_w => $::WIDTH * 0.7,
740 force_h => $::HEIGHT * 0.7, 1402 force_h => $::HEIGHT * 0.7,
741 title => "NPC Dialog", 1403 title => "NPC Dialog",
742 kw => { hi => 0, yes => 0, no => 0 }, 1404 kw => { hi => 0, yes => 0, no => 0 },
1405 has_close_button => 1,
743 @_, 1406 @_,
744 ); 1407 );
745 1408
746 Scalar::Util::weaken (my $this = $self); 1409 DC::weaken (my $this = $self);
1410
1411 $self->connect (delete => sub { $this->destroy; 1 });
747 1412
748 # better use a pane... 1413 # better use a pane...
749 $self->add (my $hbox = new CFClient::UI::HBox); 1414 $self->add (my $hbox = new DC::UI::HBox);
750 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1415 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
751 1416
752 $hbox->add (my $vbox = new CFClient::UI::VBox); 1417 $hbox->add (my $vbox = new DC::UI::VBox);
753 1418
754 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1419 $vbox->add (new DC::UI::Label text => "Message Entry:");
755 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1420 $vbox->add ($self->{entry} = new DC::UI::Entry
756 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1421 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 { 1422 on_activate => sub {
762 my ($entry, $text) = @_; 1423 my ($entry, $text) = @_;
763 1424
764 return unless $text =~ /\S/; 1425 return unless $text =~ /\S/;
765 1426
… …
768 1429
769 0 1430 0
770 }, 1431 },
771 ); 1432 );
772 1433
773 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1434 $vbox->add ($self->{options} = new DC::UI::VBox);
774 1435
775 $self->{bye_button} = new CFClient::UI::Button 1436 $self->{bye_button} = new DC::UI::Button
776 text => "Bye (close)", 1437 text => "Bye (close)",
777 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1438 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
778 on_activate => sub { $this->destroy; 0 }, 1439 on_activate => sub { $this->destroy; 1 },
779 ; 1440 ;
780 1441
781 $self->update_options; 1442 $self->update_options;
782 1443
783 $self->{token} = $self->{conn}->ext_token; 1444 $self->{id} = "npc-channel-" . $self->{conn}->token;
784 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1445 $self->{conn}->connect_ext ($self->{id} => sub {
785 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1446 $this->feed (@_) if $this;
1447 });
1448
1449 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
786 1450
787 $self->{entry}->grab_focus; 1451 $self->{entry}->grab_focus;
788 1452
789 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1453 $self->{textview}->add_paragraph ({
1454 fg => [1, 1, 0, 1],
1455 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1456 });
790 1457
791 $self->show; 1458 $self->show;
792 $self 1459 $self
793}; 1460};
794 1461
795sub update_options { 1462sub update_options {
796 my ($self) = @_; 1463 my ($self) = @_;
797 1464
798 Scalar::Util::weaken $self; 1465 DC::weaken $self;
799 1466
800 $self->{options}->clear; 1467 $self->{options}->clear;
801 $self->{options}->add ($self->{bye_button}); 1468 $self->{options}->add ($self->{bye_button});
802 1469
803 for my $kw (sort keys %{ $self->{kw} }) { 1470 for my $kw (sort keys %{ $self->{kw} }) {
804 $self->{options}->add (new CFClient::UI::Button 1471 $self->{options}->add (new DC::UI::Button
805 text => $kw, 1472 text => $kw,
806 on_activate => sub { 1473 on_activate => sub {
807 $self->send ($kw); 1474 $self->send ($kw);
808 0 1475 0
809 }, 1476 },
810 ); 1477 );
811 } 1478 }
812} 1479}
813 1480
814sub feed { 1481sub feed {
815 my ($self, $data) = @_; 1482 my ($self, $type, @arg) = @_;
816 1483
817 my ($type, $msg) = split / /, $data, 2; 1484 DC::weaken $self;
818 1485
819 if ($type eq "msg") { 1486 if ($type eq "update") {
820 my ($msg, @kw) = split /\x00/, $msg; 1487 my (%info) = @arg;
821 $self->{kw}{$_} = 1 for @kw;
822 1488
823 $msg = "\n" . CFClient::UI::Label::escape $msg; 1489 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
824 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1490 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
825 my @link;
826 $msg =~ s{
827 ($match)
828 }{
829 push @link, new CFClient::UI::Label
830 markup => "<span foreground='#c0c0ff' underline='single'>$1</span>",
831 can_hover => 1,
832 can_events => 1;
833
834 chr 0xfffc
835 }giex;
836 1491
837 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1492 if (exists $info{msg}) {
1493 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1494 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1495 my @link;
1496 $text =~ s{
1497 ($match)
1498 }{
1499 my $kw = $1;
1500
1501 push @link, new DC::UI::Label
1502 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1503 can_hover => 1,
1504 can_events => 1,
1505 padding_x => 0,
1506 padding_y => 0,
1507 on_button_up => sub {
1508 $self->send ($kw);
1509 };
1510
1511 "\x{fffc}"
1512 }giex;
1513
1514 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1515 $self->{textview}->scroll_to_bottom;
1516 }
1517
838 $self->update_options; 1518 $self->update_options;
839 } else { 1519 } else {
840 $self->destroy; 1520 $self->destroy;
841 } 1521 }
842 1522
… …
844} 1524}
845 1525
846sub send { 1526sub send {
847 my ($self, $msg) = @_; 1527 my ($self, $msg) = @_;
848 1528
1529 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1530 $self->{textview}->scroll_to_bottom;
1531
849 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1532 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
850 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
851} 1533}
852 1534
853sub destroy { 1535sub destroy {
854 my ($self) = @_; 1536 my ($self) = @_;
855 1537
856 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1538 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
857 1539
1540 if ($self->{conn}) {
1541 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
858 delete $self->{conn}{npc_dialog}; 1542 delete $self->{conn}{npc_dialog};
859 $self->{conn}->disconnect_ext ($self->{token}); 1543 $self->{conn}->disconnect_ext ($self->{id});
1544 }
860 1545
861 $self->SUPER::destroy; 1546 $self->SUPER::destroy;
862} 1547}
863 1548
8641; 15491
1550

Diff Legend

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