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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines