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.52 by root, Mon Jul 3 22:04:25 2006 UTC vs.
Revision 1.89 by elmex, Mon Dec 4 15:17:14 2006 UTC

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

Diff Legend

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