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

Diff Legend

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