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.93 by root, Fri Dec 22 03:43:05 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;
11use CFPlus::Macro;
12use CFPlus::Item;
13
14use Crossfire::Protocol::Base 0.95;
10 15
11use base 'Crossfire::Protocol::Base'; 16use base 'Crossfire::Protocol::Base';
12
13our %open_logs;
14 17
15sub new { 18sub new {
16 my $class = shift; 19 my $class = shift;
17 20
18 my $self = $class->SUPER::new (@_); 21 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
19 22
20 $self->{map_widget}->clr_commands; 23 $self->{map_widget}->clr_commands;
21 24
22 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 25 my @cmd_help = map {
23 my ($pom) = @_;
24
25 my @cmd_help;
26
27 for my $head2 ($pom->head1->[-2]->head2) {
28 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 26 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
29 or next; 27 or die "unparseable command help: $_->{kw}[0]";
30 28
31 my $cmd = $1; 29 my $cmd = $1;
32 my @args = split /\|/, $2; 30 my @args = split /\|/, $2;
33 @args = (".*") unless @args; 31 @args = (".*") unless @args;
34 32
33 my (undef, @par) = CFPlus::Pod::section_of $_;
34 my $text = CFPlus::Pod::as_label @par;
35
35 $_ = $_ eq ".*" ? "" : " $_" 36 $_ = $_ eq ".*" ? "" : " $_"
36 for @args; 37 for @args;
37 38
38 my $text = CFClient::pod_to_pango $head2->content; 39 map ["$cmd$_", $text],
39
40 push @cmd_help, ["$cmd$_", $text]
41 for sort { (length $a) <=> (length $b) } 40 sort { (length $a) <=> (length $b) }
42 @args; 41 @args
43 } 42 } sort { $a->{par} <=> $b->{par} }
43 CFPlus::Pod::find command => "*";
44 44
45 \@cmd_help
46 };
47
48 $self->{map_widget}->add_command (@$_) 45 $self->{map_widget}->add_command (@$_)
49 for @$cmd_help; 46 for @cmd_help;
50 47
51 $self->{noface} = new_from_file CFClient::Texture 48 $self->{noface} = new_from_file CFPlus::Texture
52 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 }
53 56
54 $self->{open_container} = 0; 57 $self->{open_container} = 0;
55 58
56 # "global" 59 # "global"
57 $self->{tilecache} = CFClient::db_table "tilecache"; 60 $self->{tilecache} = CFPlus::db_table "tilecache"
61 or die "tilecache: unable to open database table";
58 $self->{facemap} = CFClient::db_table "facemap"; 62 $self->{facemap} = CFPlus::db_table "facemap"
63 or die "facemap: unable to open database table";
59 64
60 # per server 65 # per server
61 $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";
62 68
63 $self 69 $self
64} 70}
65 71
66sub logprint { 72sub logprint {
67 my ($self, @a) = @_; 73 my ($self, @a) = @_;
74
75 $self->{log_fh} ||= do {
68 my $filename = "$Crossfire::VARDIR/log.$self->{host}"; 76 my $path = "$Crossfire::VARDIR/log.$self->{host}";
69 77
70 my $fh = $open_logs{$filename}; 78 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}: $!"; 79 or die "Couldn't open logfile $path: $!";
75 80
76 $open_logs{$filename} = $fh; 81 $fh->autoflush (1);
82
83 $fh;
77 } 84 };
78 85
79 my ($sec, $min, $hour, $mday, $mon, $year) = localtime (time); 86 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
80 87
81 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", 88 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
82 $year + 1900, $mon + 1, $mday, $hour, $min, $sec; 89 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
83 90
84 print $fh "$ts ", @a, "\n"; 91 print {$self->{log_fh}} "$ts ", @a, "\n";
85 $fh->flush;
86} 92}
87 93
94sub _stat_numdiff {
95 my ($self, $name, $old, $new) = @_;
88 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);
89 162
90sub stats_update { 163sub stats_update {
91 my ($self, $stats) = @_; 164 my ($self, $stats) = @_;
92 165
93 if (my $exp = $stats->{+CS_STAT_EXP64}) { 166 my $prev = $self->{prev_stats} || { };
94 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;
95 $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);
96 if exists $self->{prev_exp} && $diff;
97 $self->{prev_exp} = $exp;
98 } 179 }
99 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
100 ::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 }
101} 332}
102 333
103sub user_send { 334sub user_send {
104 my ($self, $command) = @_; 335 my ($self, $command) = @_;
105 336
337 $self->{record}->($command)
106 if ($self->{record}) { 338 if $self->{record};
107 push @{$self->{record}}, $command;
108 }
109 339
110 $self->logprint ("send: ", $command); 340 $self->logprint ("send: ", $command);
111 $self->send_command ($command); 341 $self->send_command ($command);
112 ::status $command; 342 ::status ($command);
113} 343}
114 344
115sub start_record { 345sub record {
116 my ($self) = @_; 346 my ($self, $cb) = @_;
117 347
118 $self->{record} = []; 348 $self->{record} = $cb;
119}
120
121sub stop_record {
122 my ($self) = @_;
123 return delete $self->{record};
124} 349}
125 350
126sub map_scroll { 351sub map_scroll {
127 my ($self, $dx, $dy) = @_; 352 my ($self, $dx, $dy) = @_;
128 353
… …
130} 355}
131 356
132sub feed_map1a { 357sub feed_map1a {
133 my ($self, $data) = @_; 358 my ($self, $data) = @_;
134 359
135 $self->{map}->map1a_update ($data); 360 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
136 $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);
137} 368}
138 369
139sub flush_map { 370sub flush_map {
140 my ($self) = @_; 371 my ($self) = @_;
141 372
… …
154 385
155 $self->flush_map; 386 $self->flush_map;
156 delete $self->{neigh_map}; 387 delete $self->{neigh_map};
157 388
158 $self->{map}->clear; 389 $self->{map}->clear;
390 delete $self->{map_widget}{magicmap};
159} 391}
160 392
161 393
162sub load_map($$$) { 394sub load_map($$$) {
163 my ($self, $hash, $x, $y) = @_; 395 my ($self, $hash, $x, $y) = @_;
… …
303 535
304 unless ($id) { 536 unless ($id) {
305 # create new id for face 537 # create new id for face
306 # I love transactions 538 # I love transactions
307 for (1..100) { 539 for (1..100) {
308 my $txn = $CFClient::DB_ENV->txn_begin; 540 my $txn = $CFPlus::DB_ENV->txn_begin;
309 my $status = $self->{facemap}->db_get (id => $id); 541 my $status = $self->{facemap}->db_get (id => $id);
310 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 542 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
311 $id = ($id || 64) + 1; 543 $id = ($id || 64) + 1;
312 if ($self->{facemap}->put (id => $id) == 0 544 if ($self->{facemap}->put (id => $id) == 0
313 && $self->{facemap}->put ($hash => $id) == 0) { 545 && $self->{facemap}->put ($hash => $id) == 0) {
… …
317 } 549 }
318 } 550 }
319 $txn->txn_abort; 551 $txn->txn_abort;
320 } 552 }
321 553
322 CFClient::fatal "maximum number of transaction retries reached - database problems?"; 554 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
323 } 555 }
324 556
325gotid: 557gotid:
326 $face->{id} = $id; 558 $face->{id} = $id;
327 $self->{map}->set_face ($facenum => $id); 559 $self->{map}->set_face ($facenum => $id);
… …
338 undef 570 undef
339 }; 571 };
340} 572}
341 573
342sub face_update { 574sub face_update {
343 my ($self, $facenum, $face) = @_; 575 my ($self, $facenum, $face, $changed) = @_;
344 576
345 $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes 577 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;
346 578
347 $self->set_texture ($face->{id} => delete $face->{image}); 579 $self->set_texture ($face->{id} => delete $face->{image});
348} 580}
349 581
350sub set_texture { 582sub set_texture {
351 my ($self, $id, $data) = @_; 583 my ($self, $id, $data) = @_;
352 584
353 $self->{texture}[$id] ||= do { 585 $self->{texture}[$id] ||= do {
354 my $tex = 586 my $tex =
355 new_from_image CFClient::Texture 587 new_from_image CFPlus::Texture
356 $data, minify => 1, mipmap => 1; 588 $data, minify => 1, mipmap => 1;
357 589
358 $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}});
359 $self->{map_widget}->update; 591 $self->{map_widget}->update;
360 592
… …
391 [0.11, 0.56, 1.00], 623 [0.11, 0.56, 1.00],
392 [0.93, 0.46, 0.00], 624 [0.93, 0.46, 0.00],
393 [0.18, 0.54, 0.34], 625 [0.18, 0.54, 0.34],
394 [0.56, 0.73, 0.56], 626 [0.56, 0.73, 0.56],
395 [0.80, 0.80, 0.80], 627 [0.80, 0.80, 0.80],
396 [0.55, 0.41, 0.13], 628 [0.75, 0.61, 0.20],
397 [0.99, 0.77, 0.26], 629 [0.99, 0.77, 0.26],
398 [0.74, 0.65, 0.41], 630 [0.74, 0.65, 0.41],
399 ); 631 );
400 632
633 my $fg = $color[$color % @color];
634
401 $self->logprint ("info: ", $text); 635 $self->logprint ("info: ", $text);
402
403 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
404 636
405 # try to create single paragraphs of multiple lines sent by the server 637 # try to create single paragraphs of multiple lines sent by the server
406 $text =~ s/(?<=\S)\n(?=\w)/ /g; 638 $text =~ s/(?<=\S)\n(?=\w)/ /g;
407 639
408 $text = CFClient::UI::Label::escape $text; 640 $text = CFPlus::asxml $text;
409 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 641 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
410 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 642 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
411 643
412 $self->{logview}->add_paragraph ($color[$color], 644 ::message ({ fg => $fg, markup => $_ })
413 join "\n", map "$time $_", split /\n/, $text); 645 for split /\n/, $text;
414 646
415 $self->{statusbox}->add ($text, 647 $self->{statusbox}->add ($text,
416 group => $text, 648 group => $text,
417 fg => $color[$color], 649 fg => $fg,
418 timeout => $color >= 2 ? 60 : 10, 650 timeout => $color >= 2 ? 180 : 10,
419 tooltip_font => $::FONT_FIXED, 651 tooltip_font => $::FONT_FIXED,
420 ); 652 );
421} 653}
422 654
423sub drawextinfo { 655sub drawextinfo {
… …
427} 659}
428 660
429sub spell_add { 661sub spell_add {
430 my ($self, $spell) = @_; 662 my ($self, $spell) = @_;
431 663
432 # try to create single paragraphs of multiple lines sent by the server 664 # try to create single paragraphs out of the multiple lines sent by the server
433 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 665 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
434 $spell->{message} =~ s/\n+$//; 666 $spell->{message} =~ s/\n+$//;
435 $spell->{message} ||= "Server did not provide a description for this spell."; 667 $spell->{message} ||= "Server did not provide a description for this spell.";
436 668
437 $::SETUP_SPELLS->add_spell ($spell); 669 $::SPELL_LIST->add_spell ($spell);
438 670
439 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 671 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
440 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 672 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
441} 673}
442 674
443sub spell_delete { 675sub spell_delete {
444 my ($self, $spell) = @_; 676 my ($self, $spell) = @_;
677
445 $::SETUP_SPELLS->remove_spell ($spell); 678 $::SPELL_LIST->remove_spell ($spell);
679}
680
681sub setup {
682 my ($self, $setup) = @_;
683
684 $::MAP->resize ($self->{mapw}, $self->{maph});
446} 685}
447 686
448sub addme_success { 687sub addme_success {
449 my ($self) = @_; 688 my ($self) = @_;
450 689
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; 690 my %skill_help;
455 691
456 for my $head2 ($pom->head1->[3]->head2) { 692 for my $node (CFPlus::Pod::find skill_description => "*") {
457 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 693 my (undef, @par) = CFPlus::Pod::section_of $node;
458 } 694 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
459
460 \%skill_help
461 }; 695 };
462 696
463 for my $skill (values %{$self->{skill_info}}) { 697 for my $skill (values %{$self->{skill_info}}) {
464 $self->{map_widget}->add_command ("ready_skill $skill", 698 $self->{map_widget}->add_command ("ready_skill $skill",
465 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 699 (CFPlus::asxml "Ready the skill '$skill'\n\n")
466 . $skill_help->{$skill}); 700 . $skill_help{$skill});
467 $self->{map_widget}->add_command ("use_skill $skill", 701 $self->{map_widget}->add_command ("use_skill $skill",
468 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 702 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
469 . $skill_help->{$skill}); 703 . $skill_help{$skill});
470 } 704 }
471} 705}
472 706
473sub eof { 707sub eof {
474 my ($self) = @_; 708 my ($self) = @_;
… …
498 732
499 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 733 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
500 734
501 $self->send ("requestinfo image_sums $face $face"); 735 $self->send ("requestinfo image_sums $face $face");
502 736
503 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 737 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
504 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 738 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
505 } elsif (!exists $self->{num_faces}) { 739 } elsif (!exists $self->{num_faces}) {
506 $self->send ("requestinfo image_info"); 740 $self->send ("requestinfo image_info");
507 741
508 $self->{num_faces} = 0; 742 $self->{num_faces} = 0;
509 743
510 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 744 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
511 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 745 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
512 } 746 }
513} 747}
514 748
515sub update_floorbox { 749sub update_floorbox {
516 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 750 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
517 return unless $::CONN; 751 return unless $::CONN;
518 752
519 $::FLOORBOX->clear; 753 $::FLOORBOX->clear;
520 754
521 my $row; 755 my $row;
522 for (@{ $::CONN->{container}{0} }) { 756 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
523 if ($row < 6) { 757 if ($row < 6) {
524 local $_->{face_widget}; # hack to force recreation of widget 758 local $_->{face_widget}; # hack to force recreation of widget
525 local $_->{desc_widget}; # hack to force recreation of widget 759 local $_->{desc_widget}; # hack to force recreation of widget
526 CFClient::Item::update_widgets $_; 760 CFPlus::Item::update_widgets $_;
527 761
528 $::FLOORBOX->add (0, $row, $_->{face_widget}); 762 $::FLOORBOX->add (0, $row, $_->{face_widget});
529 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 763 $::FLOORBOX->add (1, $row, $_->{desc_widget});
530 764
531 $row++; 765 $row++;
532 } else { 766 } else {
533 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 767 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
534 text => "More...", 768 text => "More...",
535 on_activate => sub { $::INV_WINDOW->toggle_visibility }, 769 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
536 ); 770 );
537 last; 771 last;
538 } 772 }
539 } 773 }
774 if ($::CONN->{open_container}) {
775 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
776 text => "Close container",
777 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
778 );
779 }
540 }); 780 });
541 781
542 $::WANT_REFRESH++; 782 $::WANT_REFRESH++;
543} 783}
544 784
545sub set_opencont { 785sub set_opencont {
546 my ($conn, $tag, $name) = @_; 786 my ($conn, $tag, $name) = @_;
547 $conn->{open_container} = $tag; 787 $conn->{open_container} = $tag;
788 update_floorbox;
548 789
549 $::INV_RIGHT_HB->clear (); 790 $::INV_RIGHT_HB->clear ();
550 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 791 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
551 792
552 if ($tag != 0) { # Floor isn't closable, is it? 793 if ($tag != 0) { # Floor isn't closable, is it?
553 $::INV_RIGHT_HB->add (new CFClient::UI::Button 794 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
554 text => "Close container", 795 text => "Close container",
555 tooltip => "Close the currently open container (if one is open)", 796 tooltip => "Close the currently open container (if one is open)",
556 on_activate => sub { 797 on_activate => sub {
557 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 798 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
558 if $tag != 0; 799 if $tag != 0;
559 #if $CONN->{open_container} != 0; 800 #if $CONN->{open_container} != 0;
801 0
560 }, 802 },
561 ); 803 );
562 } 804 }
563 805
564 $::INVR->set_items ($conn->{container}{$tag}); 806 $::INVR->set_items ($conn->{container}{$tag});
565} 807}
566 808
567sub update_container { 809sub update_containers {
568 my ($tag) = @_; 810 my ($self) = @_;
569 811
570 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 812 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
813 my $todo = delete $self->{update_container}
814 or return;
815
816 for my $tag (keys %$todo) {
817 update_floorbox if $tag == 0 or $tag == $self->{open_container};
818 if ($tag == 0) {
819 $::INVR->set_items ($self->{container}{0})
571 if $tag == $::CONN->{open_container}; 820 if $tag == $self->{open_container};
821 } elsif ($tag == $self->{player}{tag}) {
822 $::INV->set_items ($self->{container}{$tag})
823 } else {
824 $::INVR->set_items ($self->{container}{$tag})
825 if $tag == $self->{open_container};
826 }
827 }
828 });
572} 829}
573 830
574sub container_add { 831sub container_add {
575 my ($self, $tag, $items) = @_; 832 my ($self, $tag, $items) = @_;
576 833
577 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 834 $self->{update_container}{$tag}++;
578 835 $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} 836}
591 837
592sub container_clear { 838sub container_clear {
593 my ($self, $tag) = @_; 839 my ($self, $tag) = @_;
594 840
595 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 841 $self->{update_container}{$tag}++;
596 842 $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} 843}
608 844
609sub item_delete { 845sub item_delete {
610 my ($self, @items) = @_; 846 my ($self, @items) = @_;
611 847
848 $self->{update_container}{$_->{container}}++
612 for (@items) { 849 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 } 850
851 $self->update_containers;
624} 852}
625 853
626sub item_update { 854sub item_update {
627 my ($self, $item) = @_; 855 my ($self, $item) = @_;
628 856
629 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 857 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
630 858
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; 859 CFPlus::Item::update_widgets $item;
637 860
638 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 861 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
639 set_opencont ($::CONN, 0, "Floor"); 862 set_opencont ($::CONN, 0, "Floor");
640 863
641 } elsif ($item->{flags} & F_OPEN) { 864 } elsif ($item->{flags} & F_OPEN) {
642 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 865 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
866
643 } else { 867 } else {
644 if ($item->{container} == 0) { 868 $self->{update_container}{$item->{container}}++;
645 update_floorbox;
646 update_container (0); 869 $self->update_containers;
647 } elsif ($item->{container} == $self->{player}{tag}) {
648 $::INV->set_items ($self->{container}{$item->{container}})
649 }
650 } 870 }
651} 871}
652 872
653sub player_update { 873sub player_update {
654 my ($self, $player) = @_; 874 my ($self, $player) = @_;
655 875
876 $self->update_weight;
877}
878
879sub update_weight {
880 my ($self) = @_;
881
882 my $weight = .001 * $self->{player}{weight};
883 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
884
656 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 885 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
886 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
887 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
657} 888}
658 889
659sub update_server_info { 890sub update_server_info {
660 my ($self) = @_; 891 my ($self) = @_;
661 892
… …
664 $::SERVER_INFO->set_markup ( 895 $::SERVER_INFO->set_markup (
665 "server <tt>$self->{host}:$self->{port}</tt>\n" 896 "server <tt>$self->{host}:$self->{port}</tt>\n"
666 . "protocol version <tt>$self->{version}</tt>\n" 897 . "protocol version <tt>$self->{version}</tt>\n"
667 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 898 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
668 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 899 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
900 . "editing support $yesno[!!$self->{editor_support}]\n"
901 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
669 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 902 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
670 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 903 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
671 . "map size $self->{mapw}×$self->{maph}\n" 904 . "map size $self->{mapw}×$self->{maph}\n"
672 ); 905 );
906
907 ::setup_build_button ($self->{editor_support}->{builder_ui});
673} 908}
674 909
675sub logged_in { 910sub logged_in {
676 my ($self) = @_; 911 my ($self) = @_;
677 912
678 $self->send_ext_req (cfplus_support => "1", sub { 913 $self->send_ext_req (cfplus_support => version => 1, sub {
679 $self->{cfplus_ext} = $_[0]; 914 $self->{cfplus_ext} = $_[0]{version};
680 $self->update_server_info; 915 $self->update_server_info;
916
917 if ($self->{cfplus_ext} >= 2) {
918 $self->send_ext_req ("editor_support", sub {
919 $self->{editor_support} = $_[0];
920 $self->update_server_info;
921
922 0
923 });
924 }
925
926 0
681 }); 927 });
682 928
683 $self->update_server_info; 929 $self->update_server_info;
684 930
685 $self->send_command ("output-sync $::CFG->{output_sync}"); 931 $self->send_command ("output-sync $::CFG->{output_sync}");
686 $self->send_command ("output-count $::CFG->{output_count}"); 932 $self->send_command ("output-count $::CFG->{output_count}");
687 $self->send_command ("pickup $::CFG->{pickup}"); 933 $self->send_command ("pickup $::CFG->{pickup}");
688} 934}
689 935
936sub buildat {
937 my ($self, $builditem, $x, $y) = @_;
938
939 if ($self->{cfplus_ext}) {
940 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
941 }
942}
943
690sub lookat { 944sub lookat {
691 my ($self, $x, $y) = @_; 945 my ($self, $x, $y) = @_;
692 946
693 if ($self->{cfplus_ext}) { 947 if ($self->{cfplus_ext}) {
694 $self->send_ext_req (lookat => "$x $y", sub { 948 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
695 my %res = split /\x00/, $_[0]; 949 my ($msg) = @_;
696 950
697 if (exists $res{npc_dialog}) { 951 if (exists $msg->{npc_dialog}) {
698 # start npc chat dialog 952 # start npc chat dialog
699 $self->{npc_dialog} = new CFClient::NPCDialog:: 953 $self->{npc_dialog} = new CFPlus::NPCDialog::
700 dx => $x, 954 dx => $x,
701 dy => $y, 955 dy => $y,
702 title => "$res{npc_dialog} (NPC)", 956 title => "$msg->{npc_dialog} (NPC)",
703 conn => $self, 957 conn => $self,
704 ; 958 ;
705 } 959 }
706 }); 960 });
707 } 961 }
… …
710} 964}
711 965
712sub destroy { 966sub destroy {
713 my ($self) = @_; 967 my ($self) = @_;
714 968
715 $self->{npc_dialog}->destroy 969 (delete $self->{npc_dialog})->destroy
716 if $self->{npc_dialog}; 970 if $self->{npc_dialog};
717 971
718 $self->SUPER::destroy; 972 $self->SUPER::destroy;
719} 973}
720 974
721package CFClient::NPCDialog; 975package CFPlus::NPCDialog;
722 976
723our @ISA = 'CFClient::UI::FancyFrame'; 977our @ISA = 'CFPlus::UI::Toplevel';
724 978
725sub new { 979sub new {
726 my $class = shift; 980 my $class = shift;
727 981
728 my $self = $class->SUPER::new ( 982 my $self = $class->SUPER::new (
… …
731 name => "npc_dialog", 985 name => "npc_dialog",
732 force_w => $::WIDTH * 0.7, 986 force_w => $::WIDTH * 0.7,
733 force_h => $::HEIGHT * 0.7, 987 force_h => $::HEIGHT * 0.7,
734 title => "NPC Dialog", 988 title => "NPC Dialog",
735 kw => { hi => 0, yes => 0, no => 0 }, 989 kw => { hi => 0, yes => 0, no => 0 },
990 has_close_button => 1,
736 @_, 991 @_,
737 ); 992 );
738 993
739 Scalar::Util::weaken (my $this = $self); 994 CFPlus::weaken (my $this = $self);
995
996 $self->connect (delete => sub { $this->destroy; 1 });
740 997
741 # better use a pane... 998 # better use a pane...
742 $self->add (my $hbox = new CFClient::UI::HBox); 999 $self->add (my $hbox = new CFPlus::UI::HBox);
743 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1000 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
744 1001
745 $hbox->add (my $vbox = new CFClient::UI::VBox); 1002 $hbox->add (my $vbox = new CFPlus::UI::VBox);
746 1003
747 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1004 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
748 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1005 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
749 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1006 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 { 1007 on_activate => sub {
755 my ($entry, $text) = @_; 1008 my ($entry, $text) = @_;
756 1009
757 return unless $text =~ /\S/; 1010 return unless $text =~ /\S/;
758 1011
759 $entry->set_text (""); 1012 $entry->set_text ("");
760 $this->send ($text); 1013 $this->send ($text);
1014
1015 0
761 }, 1016 },
762 ); 1017 );
763 1018
764 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1019 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
765 1020
766 $self->{close_button} = new CFClient::UI::Button 1021 $self->{bye_button} = new CFPlus::UI::Button
767 text => "Bye (close)", 1022 text => "Bye (close)",
768 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1023 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
769 on_activate => sub { $this->destroy }, 1024 on_activate => sub { $this->destroy; 1 },
770 ; 1025 ;
771 1026
772 $self->update_options; 1027 $self->update_options;
773 1028
774 $self->{token} = $self->{conn}->ext_token; 1029 $self->{id} = $self->{conn}->send_ext_req (
775 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1030 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
776 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1031 sub { $this && $this->feed (@_) }
1032 );
777 1033
778 $self->{entry}->focus_in; 1034 $self->{entry}->grab_focus;
779 1035
780 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1036 $self->{textview}->add_paragraph ({
1037 fg => [1, 1, 0, 1],
1038 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1039 });
781 1040
782 $self->show; 1041 $self->show;
783 $self 1042 $self
784}; 1043};
785 1044
786sub update_options { 1045sub update_options {
787 my ($self) = @_; 1046 my ($self) = @_;
788 1047
789 Scalar::Util::weaken $self; 1048 CFPlus::weaken $self;
790 1049
791 $self->{options}->clear; 1050 $self->{options}->clear;
792 $self->{options}->add ($self->{close_button}); 1051 $self->{options}->add ($self->{bye_button});
793 1052
794 for my $kw (sort keys %{ $self->{kw} }) { 1053 for my $kw (sort keys %{ $self->{kw} }) {
795 $self->{options}->add (new CFClient::UI::Button 1054 $self->{options}->add (new CFPlus::UI::Button
796 text => $kw, 1055 text => $kw,
797 on_activate => sub { 1056 on_activate => sub {
798 $self->send ($kw); 1057 $self->send ($kw);
1058 0
799 }, 1059 },
800 ); 1060 );
801 } 1061 }
802} 1062}
803 1063
804sub feed { 1064sub feed {
805 my ($self, $data) = @_; 1065 my ($self, $msg) = @_;
806 1066
807 my ($type, $msg) = split / /, $data, 2; 1067 CFPlus::weaken $self;
808 1068
809 if ($type eq "msg") { 1069 if ($msg->{msgtype} eq "reply") {
810 my ($msg, @kw) = split /\x00/, $msg; 1070 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
811 $self->{kw}{$_} = 1 for @kw; 1071 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
812 1072
813 $msg = CFClient::UI::Label::escape $msg; 1073 my $text = "\n" . CFPlus::asxml $msg->{msg};
814 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1074 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
815 $msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh. 1075 my @link;
1076 $text =~ s{
1077 ($match)
1078 }{
1079 my $kw = $1;
1080
1081 push @link, new CFPlus::UI::Label
1082 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1083 can_hover => 1,
1084 can_events => 1,
1085 padding_x => 0,
1086 padding_y => 0,
1087 on_button_up => sub {
1088 $self->send ($kw);
1089 };
1090
1091 "\x{fffc}"
1092 }giex;
816 1093
817 $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg"); 1094 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1095 $self->{textview}->scroll_to_bottom;
818 $self->update_options; 1096 $self->update_options;
819 } else { 1097 } else {
820 $self->destroy; 1098 $self->destroy;
821 } 1099 }
822 1100
… …
824} 1102}
825 1103
826sub send { 1104sub send {
827 my ($self, $msg) = @_; 1105 my ($self, $msg) = @_;
828 1106
829 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1107 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
830 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 1108 $self->{textview}->scroll_to_bottom;
1109
1110 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
831} 1111}
832 1112
833sub destroy { 1113sub destroy {
834 my ($self) = @_; 1114 my ($self) = @_;
835 1115
836 #Carp::cluck "debug\n";#d# #todo# enable: destroyx gets called twice because scalar keys {} is 1 1116 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
837 1117
1118 if ($self->{conn}) {
1119 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
838 delete $self->{conn}{npc_dialog}; 1120 delete $self->{conn}{npc_dialog};
839 $self->{conn}->disconnect_ext ($self->{token}); 1121 $self->{conn}->disconnect_ext ($self->{id});
1122 }
840 1123
841 $self->SUPER::destroy; 1124 $self->SUPER::destroy;
842} 1125}
843 1126
8441; 11271
1128

Diff Legend

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