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

Diff Legend

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