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.5 by elmex, Sat May 27 10:32:35 2006 UTC vs.
Revision 1.133 by elmex, Tue Jul 24 18:39:39 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 CFPlus;
9use CFPlus::DB;
8use CFClient::UI; 10use CFPlus::UI;
11use CFPlus::Pod;
12use CFPlus::Macro;
13use CFPlus::Item;
14
15use Crossfire::Protocol::Base 0.95;
9 16
10use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
11 18
12sub new { 19sub new {
13 my $class = shift; 20 my ($class, %arg) = @_;
14 21
15 my $self = $class->SUPER::new (@_); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 ywidget => 1,#d#
27 %{$arg{setup_req} || {}},
28 },
29 );
16 30
17 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
18 32
19 my $parser = new Pod::POM; 33 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 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
24 or next; 35 or die "unparseable command help: $_->{kw}[0]";
25 36
26 my $cmd = $1; 37 my $cmd = $1;
27 my @args = split /\|/, $2; 38 my @args = split /\|/, $2;
28 @args = (".*") unless @args; 39 @args = (".*") unless @args;
29 40
30 my $text = CFClient::pod_to_pango $head2->content; 41 my (undef, @par) = CFPlus::Pod::section_of $_;
42 my $text = CFPlus::Pod::as_label @par;
31 43
32 for my $arg (@args) {
33 $arg = $arg eq ".*" ? "" : " $arg"; 44 $_ = $_ eq ".*" ? "" : " $_"
45 for @args;
34 46
35 $self->{map_widget}->add_command ("$cmd$arg", $text); 47 map ["$cmd$_", $text],
48 sort { (length $a) <=> (length $b) }
49 @args
50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*";
52
53 $self->connect_ext (music => sub {
54 my ($ev) = @_;
55
56 &::audio_music_set ($self->{songs} = $ev->{play})
57 if $ev->{play};
58 });
59
60 $self->connect_ext (capabilities => sub {
61 my (%cap) = @_;
62
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
67
68 if (my $ts = $cap{tileset}) {
69 if (my ($default) = grep $_->[2] & 1, @$ts) {
70 $self->{tileset} = $default;
71 $self->{tilesize} = $default->[3];
72 $self->setup_req (tileset => $default->[0]);
73
74 my $w = int $self->{mapw} * 32 / $self->{tilesize};
75 my $h = int $self->{maph} * 32 / $self->{tilesize};
76
77 $self->setup_req (mapsize => "${w}x${h}");
78 }
79 }
80 });
81
82 $self->{json_coder}
83 ->convert_blessed
84 ->filter_json_single_key_object (__w_ => sub {
85 $self->{widget}{$_[0]}
86 });
87
88 # widgetset new
89 $self->connect_ext (ws_n => sub {
90 my ($id) = @_;
91
92 $self->{widgetset}{$id} = {
93 w => {},
36 } 94 };
37 } 95 });
38 96
97 # widgetset destroy
98 $self->connect_ext (ws_d => sub {
99 my ($id) = @_;
100
101 my $ws = delete $self->{widgetset}{$id}
102 or return;
103
104 $_->destroy
105 for values %{$ws->{w}};
106 });
107
108 # widgetset create
109 $self->connect_ext (ws_c => sub {
110 my ($ws, $id, $class, $args) = @_;
111
112 for my $ev (grep /^on_/, keys %$args) {
113 $args->{$ev} = sub {
114 my $id = shift->{s_id};
115 $self->send_exti_msg (w_e => $id, $ev, \@_);
116
117 1
118 };
119 }
120
121 if (my $widget = eval {
122 local $SIG{__DIE__};
123 "CFPlus::UI::$class"->new (
124 %$args,
125 s_ws => $ws,
126 s_id => $id,
127 )
128 }
129 ) {
130 $self->{widget}{$id}
131 = $self->{widgetset}{$ws}{w}{$id}
132 = $widget;
133
134 $widget->connect (on_destroy => sub {
135 my ($widget) = @_;
136
137 delete $self->{widget}{$widget->{s_id}};
138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
139 });
140 } else {
141 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
142 $self->send_exti_msg (w_e => $id, "destroy");
143 }
144 });
145
146 # widget call
147 $self->connect_ext (w_c => sub {
148 my ($id, $rid, $method, $args) = @_;
149
150 my $w = $self->{widget}{$id}
151 or return;
152
153 $args ||= [];
154
155 if ($rid) {
156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
157 } else {
158 $w->$method (@$args);
159 }
160 });
161
162 # widget set
163 $self->connect_ext (w_s => sub {
164 my ($id, $attr) = @_;
165
166 my $w = $self->{widget}{$id}
167 or return;
168
169 for (my $i = 0; $i < $#$attr; $i += 2) {
170 my ($member, $value) = @$attr[$i, $i+1];
171 if (defined $value) {
172 $w->{$member} = $value;
173 } else {
174 delete $w->{$member};
175 }
176 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
177 }
178 });
179
180 # widget get
181 $self->connect_ext (w_g => sub {
182 my ($id, $rid, $attr) = @_;
183
184 my $w = $self->{widget}{$id}
185 or return;
186
187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188 });
189
190 # message window
191 $self->connect_ext (channel_info => sub {
192 $::MESSAGE_WINDOW->add_channel ($_[0]);
193 });
194
195 # destroy widgets on logout
196 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
197 for my $ws (values %{delete $self->{widgetset} || {}}) {
198 $_->destroy
199 for values %{delete $ws->{w} || {}};
200 }
201 });
202
203 $self->{map_widget}->add_command (@$_)
204 for @cmd_help;
205
206 {
207 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
208 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
209 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
210 }
211
212 {
39 $self->{noface} = new_from_file CFClient::Texture 213 $self->{noface} = my $tex = new_from_file CFPlus::Texture
40 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 214 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
215 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
216 }
41 217
42 $self->{open_container} = 0; 218 $self->{open_container} = 0;
43 219
44 # "global"
45 $self->{tilecache} = CFClient::db_table "tilecache";
46 $self->{facemap} = CFClient::db_table "facemap";
47
48 # per server 220 # per server
49 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 221 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
50 222
51 $self 223 $self
52} 224}
225
226sub logprint {
227 my ($self, @a) = @_;
228
229 $self->{log_fh} ||= do {
230 my $path = "$Crossfire::VARDIR/log.$self->{host}";
231
232 open my $fh, ">>:utf8", $path
233 or die "Couldn't open logfile $path: $!";
234
235 $fh->autoflush (1);
236
237 $fh;
238 };
239
240 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
241
242 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
243 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
244
245 print {$self->{log_fh}} "$ts ", @a, "\n";
246}
247
248sub _stat_numdiff {
249 my ($self, $name, $old, $new) = @_;
250
251 my $diff = $new - $old;
252
253 $diff = 0.01 * int $diff * 100;
254
255 0.1 >= abs $diff ? ()
256 : $diff < 0 ? "$name$diff" : "$name+$diff"
257}
258
259sub _stat_skillmaskdiff {
260 my ($self, $name, $old, $new) = @_;
261
262 my $diff = $old ^ $new
263 or return;
264
265 my @diff = map
266 {
267 $diff & $_
268 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
269 : ()
270 }
271 sort { $a <=> $b } keys %{$self->{spell_paths}};
272
273 join "", @diff
274}
275
276# all stats that are chacked against changes
277my @statchange = (
278 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
279 [&CS_STAT_INT => \&_stat_numdiff, "Int"],
280 [&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
281 [&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
282 [&CS_STAT_CON => \&_stat_numdiff, "Con"],
283 [&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
284 [&CS_STAT_POW => \&_stat_numdiff, "Pow"],
285 [&CS_STAT_WC => \&_stat_numdiff, "Wc"],
286 [&CS_STAT_AC => \&_stat_numdiff, "Ac"],
287 [&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
288 [&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
289 [&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
290 [&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
291 [&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
292 [&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
293 [&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
294 [&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
295 [&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
296 [&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
297 [&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
298 [&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
299 [&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
300 [&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
301 [&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
302 [&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
303 [&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
304 [&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
305 [&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
306 [&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
307 [&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
308 [&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
309 [&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
310 [&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
311 [&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
312 [&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
313 [&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
314 [&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
315);
53 316
54sub stats_update { 317sub stats_update {
55 my ($self, $stats) = @_; 318 my ($self, $stats) = @_;
56 319
57 if (my $exp = $stats->{+CS_STAT_EXP64}) { 320 my $prev = $self->{prev_stats} || { };
58 my $diff = $exp - $self->{prev_exp}; 321
322 if (my @diffs =
323 (
324 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
325 map {
326 $stats->{$_} && $prev->{$_}
327 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
328 } sort { $a <=> $b } keys %{$self->{skill_info}}
329 )
330 ) {
331 my $msg = join " ", @diffs;
59 $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5) 332 $self->{statusbox}->add ($msg, group => "experience $msg", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
60 if exists $self->{prev_exp} && $diff;
61 $self->{prev_exp} = $exp;
62 } 333 }
63 334
335 if (
336 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
337 ) {
338 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
339 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
340 }
341
64 ::update_stats_window ($stats); 342 $self->update_stats_window ($stats, $prev);
343
344 $self->{prev_stats} = { %$stats };
345}
346
347my %RES_TBL = (
348 phys => CS_STAT_RES_PHYS,
349 magic => CS_STAT_RES_MAG,
350 fire => CS_STAT_RES_FIRE,
351 elec => CS_STAT_RES_ELEC,
352 cold => CS_STAT_RES_COLD,
353 conf => CS_STAT_RES_CONF,
354 acid => CS_STAT_RES_ACID,
355 drain => CS_STAT_RES_DRAIN,
356 ghit => CS_STAT_RES_GHOSTHIT,
357 pois => CS_STAT_RES_POISON,
358 slow => CS_STAT_RES_SLOW,
359 para => CS_STAT_RES_PARA,
360 tund => CS_STAT_TURN_UNDEAD,
361 fear => CS_STAT_RES_FEAR,
362 depl => CS_STAT_RES_DEPLETE,
363 deat => CS_STAT_RES_DEATH,
364 holyw => CS_STAT_RES_HOLYWORD,
365 blind => CS_STAT_RES_BLIND,
366);
367
368sub update_stats_window {
369 my ($self, $stats, $prev) = @_;
370
371 # I love text protocols...
372
373 my $hp = $stats->{+CS_STAT_HP} * 1;
374 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
375 my $sp = $stats->{+CS_STAT_SP} * 1;
376 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
377 my $fo = $stats->{+CS_STAT_FOOD} * 1;
378 my $fo_m = 999;
379 my $gr = $stats->{+CS_STAT_GRACE} * 1;
380 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
381
382 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
383 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
384 $::GAUGES->{food} ->set_value ($fo, $fo_m);
385 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
386 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
387 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
388 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
389 my $title = $stats->{+CS_STAT_TITLE};
390 $title =~ s/^Player: //;
391 $::STATWIDS->{title} ->set_text ("Title: " . $title);
392
393 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
394 $::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
395 $::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
396 $::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
397 $::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
398 $::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
399 $::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
400 $::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
401 $::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
402 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
403 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
404 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
405 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
406
407 $self->update_weight;
408
409 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
410 for keys %RES_TBL;
411
412 my $sktbl = $::STATWIDS->{skill_tbl};
413 my @skills = keys %{ $self->{skill_info} };
414
415 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
416 $sktbl->clear;
417
418 my @add;
419
420 push @add,
421 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
422 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
423 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
424 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
425 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
426 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
427 ;
428
429 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
430
431 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
432 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
433
434 my ($x, $y) = (0, 1);
435 for (
436 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
437 map [$_, $self->{skill_info}{$_}],
438 grep exists $stats->{$_},
439 @skills
440 ) {
441 my ($idx, $name) = @$_;
442
443 my $spell_cb = sub {
444 my ($widget, $ev) = @_;
445
446 if ($ev->{button} == 1) {
447 $::CONN->user_send ("ready_skill $name");
448 } elsif ($ev->{button} == 2) {
449 $::CONN->user_send ("use_skill $name");
450 } elsif ($ev->{button} == 3) {
451 my $shortname = CFPlus::shorten $name, 14;
452 (new CFPlus::UI::Menu
453 items => [
454 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
455 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
456 ],
457 )->popup ($ev);
458 } else {
459 return 0;
460 }
461
462 1
463 };
464
465 push @add,
466 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
467 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
468 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
469 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
470 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
471 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
472 ;
473
474 $x++ and ($x, $y) = (0, $y + 1);
475 }
476
477 $sktbl->add_at (@add);
478 }
479
480 for (grep exists $stats->{$_}, @skills) {
481 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
482 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
483 }
484}
485
486sub macro_send {
487 my ($self, $macro) = @_;
488
489 for my $cmd (@{ $macro->{action} }) {
490 $self->send_command ($cmd);
491 }
65} 492}
66 493
67sub user_send { 494sub user_send {
68 my ($self, $command) = @_; 495 my ($self, $command) = @_;
69 496
497 $self->{record}->($command)
498 if $self->{record};
499
500 $self->logprint ("send: ", $command);
70 $self->send_command ($command); 501 $self->send_command ($command);
71 ::status $command; 502 ::status ($command);
503}
504
505sub record {
506 my ($self, $cb) = @_;
507
508 $self->{record} = $cb;
72} 509}
73 510
74sub map_scroll { 511sub map_scroll {
75 my ($self, $dx, $dy) = @_; 512 my ($self, $dx, $dy) = @_;
76 513
78} 515}
79 516
80sub feed_map1a { 517sub feed_map1a {
81 my ($self, $data) = @_; 518 my ($self, $data) = @_;
82 519
83 $self->{map}->map1a_update ($data); 520 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
84 $self->{map_widget}->update; 521 $self->{map_widget}->update;
522}
523
524sub magicmap {
525 my ($self, $w, $h, $x, $y, $data) = @_;
526
527 $self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data);
85} 528}
86 529
87sub flush_map { 530sub flush_map {
88 my ($self) = @_; 531 my ($self) = @_;
89 532
91 or return; 534 or return;
92 535
93 my ($hash, $x, $y, $w, $h) = @$map_info; 536 my ($hash, $x, $y, $w, $h) = @$map_info;
94 537
95 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 538 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
96 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 539 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
97 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 540 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
98} 541}
99 542
100sub map_clear { 543sub map_clear {
101 my ($self) = @_; 544 my ($self) = @_;
102 545
103 $self->flush_map; 546 $self->flush_map;
104 delete $self->{neigh_map}; 547 delete $self->{neigh_map};
105 548
106 $self->{map}->clear; 549 $self->{map}->clear;
550 delete $self->{map_widget}{magicmap};
107} 551}
108 552
553sub bg_fetch {
554 my ($self) = @_;
555
556 my $id;
557
558 do {
559 $id = pop @{$self->{bg_fetch}}
560 or return;
561 } while $self->{texture}[$id];
562
563 CFPlus::DB::get tilecache => $id, sub {
564 my ($data) = @_;
565
566 return unless $self->{map}; # stop when destroyed
567
568 $self->set_texture ($id => $data)
569 if defined $data;
570
571 $self->bg_fetch;
572 };
573}
109 574
110sub load_map($$$) { 575sub load_map($$$) {
111 my ($self, $hash, $x, $y) = @_; 576 my ($self, $hash, $x, $y) = @_;
112 577
113 if (defined (my $data = $self->{mapcache}->get ($hash))) { 578 my $gen = $self->{map_change_gen};
579
580 CFPlus::DB::get $self->{mapcache} => $hash, sub {
581 return unless $gen == $self->{map_change_gen};
582
583 my ($data) = @_;
584
585 if (defined $data) {
114 $data = Compress::LZF::decompress $data; 586 $data = Compress::LZF::decompress $data;
115 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 587 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
116 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
117 my $data = $self->{tilecache}->get ($id)
118 or next;
119 588
120 $self->set_texture ($id => $data); 589 my $inprogress = @{ $self->{bg_fetch} || [] };
590 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
591 $self->bg_fetch unless $inprogress;
121 } 592 }
122 } 593 };
123} 594}
124 595
125# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 596# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
126# (server resource,s latency, bandwidth), so this hack is warranted. 597# (server resource,s latency, bandwidth), so this hack is warranted.
127# the right fix is to make real tiled maps with an overview file 598# the right fix is to make real tiled maps with an overview file
191 662
192 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 663 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
193 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 664 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
194 665
195 } else { 666 } else {
667 my $gen = $self->{map_change_gen};
196 $self->send_mapinfo ("spatial $path$tile", sub { 668 $self->send_mapinfo ("spatial $path$tile", sub {
669 return unless $gen == $self->{map_change_gen};
670
197 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 671 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
198 672
199 return if $mode ne "spatial"; 673 return if $mode ne "spatial";
200 674
201 $x += $self->{map}->ox; 675 $x += $self->{map}->ox;
215 689
216sub map_change { 690sub map_change {
217 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 691 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
218 692
219 $self->flush_map; 693 $self->flush_map;
694
695 ++$self->{map_change_gen};
220 696
221 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 697 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
222 698
223 my $mapmapw = $self->{mapmap}->{w}; 699 my $mapmapw = $self->{mapmap}->{w};
224 my $mapmaph = $self->{mapmap}->{h}; 700 my $mapmaph = $self->{mapmap}->{h};
241 $self->load_map ($hash, $x, $y); 717 $self->load_map ($hash, $x, $y);
242 $self->flood_fill (0, 0, 0, "", $hash, $flags); 718 $self->flood_fill (0, 0, 0, "", $hash, $flags);
243} 719}
244 720
245sub face_find { 721sub face_find {
722 my ($self, $facenum, $face, $cb) = @_;
723
724 if ($face->{type} == 0) { # FT_FACE
725 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
726
727 $face->{id} = $id;
728 $self->{faceid}[$facenum] = $id;
729
730 $self->{map}->set_tileid ($facenum => $id);
731
732 CFPlus::DB::get tilecache => $id, $cb;
733
734 } elsif ($face->{type} & 1) { # with metadata
735 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
736 CFPlus::DB::get "res-metadata" => $face->{name}, $cb;
737 }
738}
739
740sub face_update {
741 my ($self, $facenum, $face, $changed) = @_;
742
743 if ($face->{type} == 0) { # FT_FACE
744 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
745 if $changed;
746
747 $self->set_texture ($face->{id} => delete $face->{data});
748
749 } elsif ($face->{type} & 1) { # split metadata
750 my $cb = sub { };
751
752 if ($face->{type} == 3) { # FT_MUSIC
753 $cb = sub {
754 $self->{music_meta}{$facenum} = $face;
755
756 ::message ({ markup => "downloaded song #$facenum" })
757 if $changed;
758
759 &::audio_music_set ($self->{songs});
760 };
761 }
762
763 if ($changed) { # new data
764 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
765 my $path = CFPlus::DB::path_of_res $face->{name};
766
767 CFPlus::DB::write_file $path, $data, sub {
768 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
769 $face->{meta} = $self->{json_coder}->decode ($meta_json);
770 $face->{path} = $path;
771
772 $cb->();
773 };
774 };
775 } else {
776 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
777 $cb->();
778 }
779 }
780}
781
782sub smooth_update {
246 my ($self, $facenum, $face) = @_; 783 my ($self, $facenum, $face) = @_;
247 784
248 my $hash = "$face->{chksum},$face->{name}"; 785 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
249
250 my $id = $self->{facemap}->get ($hash);
251
252 unless ($id) {
253 # create new id for face
254 # I love transactions
255 for (1..100) {
256 my $txn = $CFClient::DB_ENV->txn_begin;
257 my $status = $self->{facemap}->db_get (id => $id, BerkeleyDB::DB_RMW);
258 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
259 $id = ($id || 16) + 1;
260 if ($self->{facemap}->put (id => $id) == 0
261 && $self->{facemap}->put ($hash => $id) == 0) {
262 $txn->txn_commit;
263
264 goto gotid;
265 }
266 }
267 $txn->abort;
268 }
269
270 CFClient::fatal "maximum number of transaction retries reached - database problems?";
271 }
272
273gotid:
274 $face->{id} = $id;
275 $self->{map}->set_face ($facenum => $id);
276 $self->{faceid}[$facenum] = $id;#d#
277
278 my $face = $self->{tilecache}->get ($id);
279
280 if ($face) {
281 #$self->face_prefetch;
282 $face
283 } else {
284 my $tex = $self->{noface};
285 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
286 undef
287 };
288}
289
290sub face_update {
291 my ($self, $facenum, $face) = @_;
292
293 $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
294
295 $self->set_texture ($face->{id} => delete $face->{image});
296} 786}
297 787
298sub set_texture { 788sub set_texture {
299 my ($self, $id, $data) = @_; 789 my ($self, $id, $data) = @_;
300 790
791 return unless $self->{map};
792
301 $self->{texture}[$id] ||= do { 793 $self->{texture}[$id] = my $tex =
302 my $tex =
303 new_from_image CFClient::Texture 794 new_from_image CFPlus::Texture
304 $data, minify => 1, mipmap => 1; 795 $data, minify => 1, mipmap => 1;
305 796
306 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 797 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
307 $self->{map_widget}->update; 798 $self->{map_widget}->update;
308 799
309 $tex 800 $_->() for @{(delete $self->{face_cb}{$id}) || []};
801}
802
803sub connect_face_update {
804 my ($self, $id, $cb) = @_;
805
806 push @{$self->{face_cb}{$id}}, $cb;
807
808 CFPlus::guard {
809 @{$self->{face_cb}{$id}}
810 = grep $_ != $cb,
811 @{$self->{face_cb}{$id}};
310 }; 812 }
311} 813}
312 814
313sub sound_play { 815sub sound_play {
314 my ($self, $x, $y, $soundnum, $type) = @_; 816 my ($self, $x, $y, $soundnum, $type) = @_;
315 817
322 my ($self, $flags, $prompt) = @_; 824 my ($self, $flags, $prompt) = @_;
323 825
324 $prompt = $LAST_QUERY unless length $prompt; 826 $prompt = $LAST_QUERY unless length $prompt;
325 $LAST_QUERY = $prompt; 827 $LAST_QUERY = $prompt;
326 828
327 my $dialog = new CFClient::UI::FancyFrame 829 $self->{query}-> ($self, $flags, $prompt);
328 title => "Query", 830}
329 child => my $vbox = new CFClient::UI::VBox;
330 831
331 $vbox->add (new CFClient::UI::Label 832sub sanitise_xml($) {
332 max_w => $::WIDTH * 0.4, 833 local $_ = shift;
333 ellipsise => 0,
334 text => $prompt);
335 834
336 if ($flags & CS_QUERY_YESNO) { 835 # we now weed out all tags we do not support
337 $vbox->add (my $hbox = new CFClient::UI::HBox); 836 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
338 $hbox->add (new CFClient::UI::Button 837 # now all entities
339 text => "No", 838 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
340 connect_activate => sub { 839
341 $self->send ("reply n"); 840 # handle some elements
342 $dialog->destroy; 841 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
343 $self->{map_widget}->focus_in; 842 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
344 } 843
844 $_
845}
846
847our %NAME_TO_COLOR = (
848 black => 0,
849 white => 1,
850 darkblue => 2,
851 red => 3,
852 orange => 4,
853 lightblue => 5,
854 darkorange => 6,
855 green => 7,
856 darkgreen => 8,
857 grey => 9,
858 brown => 10,
859 yellow => 11,
860 tan => 12,
861);
862
863our @CF_COLOR = (
864 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
865 [1.00, 1.00, 1.00],
866 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
867 [1.00, 0.00, 0.00],
868 [1.00, 0.54, 0.00],
869 [0.11, 0.56, 1.00],
870 [0.93, 0.46, 0.00],
871 [0.18, 0.54, 0.34],
872 [0.56, 0.73, 0.56],
873 [0.80, 0.80, 0.80],
874 [0.75, 0.61, 0.20],
875 [0.99, 0.77, 0.26],
876 [0.74, 0.65, 0.41],
877);
878
879sub msg {
880 my ($self, $color, $type, $text, @extra) = @_;
881
882 $text = sanitise_xml $text;
883
884 if (my $cb = $self->{cb_msg}{$type}) {
885 $_->($self, $color, $type, $text, @extra) for values %$cb;
886 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
887 $type =~ s/-/_/g;
888 $self->{$type} = $text;
889 } else {
890 $self->logprint ("msg: ", $text);
891 return if $color < 0; # negative color == ignore if not understood
892
893 my $fg = $CF_COLOR[$color % @CF_COLOR];
894
895 ## try to create single paragraphs of multiple lines sent by the server
896 # no longer neecssary with TRT servers
897 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
898
899 ::message ({ fg => $fg, markup => $_, type => $type })
900 for split /\n/, $text;
901
902 $self->{statusbox}->add ($text,
903 group => $text,
904 fg => $fg,
905 timeout => $color >= 2 ? 180 : 10,
906 tooltip_font => $::FONT_FIXED,
345 ); 907 );
346 $hbox->add (new CFClient::UI::Button
347 text => "Yes",
348 connect_activate => sub {
349 $self->send ("reply y");
350 $dialog->destroy;
351 },
352 );
353
354 $dialog->focus_in;
355
356 } elsif ($flags & CS_QUERY_SINGLECHAR) {
357 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
358 $vbox->add (my $entry = new CFClient::UI::Entry
359 connect_changed => sub {
360 $self->send ("reply $_[1]");
361 $dialog->destroy;
362 },
363 );
364
365 $entry->focus_in;
366
367 } else {
368 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
369
370 $vbox->add (my $entry = new CFClient::UI::Entry
371 $flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
372 connect_activate => sub {
373 $self->send ("reply $_[1]");
374 $dialog->destroy;
375 },
376 );
377
378 $entry->focus_in;
379 } 908 }
380
381 $dialog->show_centered;
382}
383
384sub drawinfo {
385 my ($self, $color, $text) = @_;
386
387 my @color = (
388 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
389 [1.00, 1.00, 1.00],
390 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
391 [1.00, 0.00, 0.00],
392 [1.00, 0.54, 0.00],
393 [0.11, 0.56, 1.00],
394 [0.93, 0.46, 0.00],
395 [0.18, 0.54, 0.34],
396 [0.56, 0.73, 0.56],
397 [0.80, 0.80, 0.80],
398 [0.55, 0.41, 0.13],
399 [0.99, 0.77, 0.26],
400 [0.74, 0.65, 0.41],
401 );
402
403 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
404
405 $text = CFClient::UI::Label::escape $text;
406 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
407 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
408
409 $self->{logview}->add_paragraph ($color[$color],
410 join "\n", map "$time $_", split /\n/, $text);
411
412 $self->{statusbox}->add ($text,
413 group => $text,
414 fg => $color[$color],
415 timeout => 10,
416 tooltip_font => $::FONT_FIXED,
417 );
418}
419
420sub drawextinfo {
421 my ($self, $color, $type, $subtype, $message) = @_;
422
423 $self->drawinfo ($color, $message);
424} 909}
425 910
426sub spell_add { 911sub spell_add {
427 my ($self, $spell) = @_; 912 my ($self, $spell) = @_;
428 913
429 # TODO 914 # try to create single paragraphs out of the multiple lines sent by the server
430 # create a widget dynamically, using spell face (CF::Protocol downloads them) 915 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
916 $spell->{message} =~ s/\n+$//;
917 $spell->{message} ||= "Server did not provide a description for this spell.";
918
919 $::SPELL_LIST->add_spell ($spell);
920
431 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 921 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
432 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 922 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
433} 923}
434 924
435sub spell_delete { 925sub spell_delete {
436 my ($self, $spell) = @_; 926 my ($self, $spell) = @_;
927
928 $::SPELL_LIST->remove_spell ($spell);
929}
930
931sub setup {
932 my ($self, $setup) = @_;
933
934 $self->{map_widget}->set_tilesize ($self->{tilesize});
935 $::MAP->resize ($self->{mapw}, $self->{maph});
437} 936}
438 937
439sub addme_success { 938sub addme_success {
440 my ($self) = @_; 939 my ($self) = @_;
441 940
442 $self->send ("command output-sync $::CFG->{output_sync}");
443 $self->send ("command output-count $::CFG->{output_count}");
444
445 my $parser = new Pod::POM;
446 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
447
448 my %skill_tooltip; 941 my %skill_help;
449 942
450 for my $head2 ($pod->head1->[-2]->head2) { 943 for my $node (CFPlus::Pod::find skill_description => "*") {
451 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content; 944 my (undef, @par) = CFPlus::Pod::section_of $node;
945 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
452 } 946 };
453 947
454 for my $skill (values %{$self->{skill_info}}) { 948 for my $skill (values %{$self->{skill_info}}) {
455 $self->{map_widget}->add_command ("ready_skill $skill", 949 $self->{map_widget}->add_command ("ready_skill $skill",
456 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 950 (CFPlus::asxml "Ready the skill '$skill'\n\n")
457 . $skill_tooltip{$skill}); 951 . $skill_help{$skill});
458 $self->{map_widget}->add_command ("use_skill $skill", 952 $self->{map_widget}->add_command ("use_skill $skill",
459 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 953 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
460 . $skill_tooltip{$skill}); 954 . $skill_help{$skill});
461 } 955 }
462} 956}
463 957
464sub eof { 958sub eof {
465 my ($self) = @_; 959 my ($self) = @_;
489 983
490 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 984 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
491 985
492 $self->send ("requestinfo image_sums $face $face"); 986 $self->send ("requestinfo image_sums $face $face");
493 987
494 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 988 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
495 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]); 989 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
496 } elsif (!exists $self->{num_faces}) { 990 } elsif (!exists $self->{num_faces}) {
497 $self->send ("requestinfo image_info"); 991 $self->send ("requestinfo image_info");
498 992
499 $self->{num_faces} = 0; 993 $self->{num_faces} = 0;
500 994
501 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 995 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
502 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]); 996 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
503 } 997 }
504} 998}
505 999
506sub update_floorbox { 1000sub update_floorbox {
507 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1001 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
508 return unless $::CONN; 1002 return unless $::CONN;
509 1003
510 $::FLOORBOX->clear; 1004 $::FLOORBOX->clear;
511 1005
1006 my @add;
1007
512 my $row; 1008 my $row;
513 for (@{ $::CONN->{container}{0} }) { 1009 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
514 if ($row < 7) { 1010 if ($row < 6) {
515 local $_->{face_widget}; # hack to force recreation of widget 1011 local $_->{face_widget}; # hack to force recreation of widget
516 local $_->{desc_widget}; # hack to force recreation of widget 1012 local $_->{desc_widget}; # hack to force recreation of widget
517 CFClient::Item::update_widgets $_; 1013 CFPlus::Item::update_widgets $_;
518 1014
1015 push @add,
519 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1016 0, $row, $_->{face_widget},
520 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1017 1, $row, $_->{desc_widget};
521 1018
522 $row++; 1019 $row++;
523 } else { 1020 } else {
524 $::FLOORBOX->add (1, $row, new CFClient::UI::Label text => "More..."); 1021 push @add, 1, $row, new CFPlus::UI::Button
1022 text => "More...",
1023 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1024 ;
525 last; 1025 last;
526 } 1026 }
527 } 1027 }
1028 if ($::CONN->{open_container}) {
1029 push @add, 1, $row++, new CFPlus::UI::Button
1030 text => "Close container",
1031 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1032 ;
1033 }
1034
1035 $::FLOORBOX->add_at (@add);
528 }); 1036 });
529 1037
530 $::WANT_REFRESH++; 1038 $::WANT_REFRESH++;
531} 1039}
532 1040
533sub set_opencont { 1041sub set_opencont {
534 my ($conn, $tag, $name) = @_; 1042 my ($conn, $tag, $name) = @_;
535 $conn->{open_container} = $tag; 1043 $conn->{open_container} = $tag;
536 $::INVR_LBL->set_text ($name); 1044 update_floorbox;
1045
1046 $::INV_RIGHT_HB->clear ();
1047 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1048
1049 if ($tag != 0) { # Floor isn't closable, is it?
1050 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
1051 text => "Close container",
1052 tooltip => "Close the currently open container (if one is open)",
1053 on_activate => sub {
1054 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1055 if $tag != 0;
1056 #if $CONN->{open_container} != 0;
1057 0
1058 },
1059 );
1060 }
1061
537 $::INVR->set_items ($conn->{container}{$tag}); 1062 $::INVR->set_items ($conn->{container}{$tag});
538} 1063}
539 1064
540sub update_container { 1065sub update_containers {
541 my ($tag) = @_; 1066 my ($self) = @_;
542 1067
543 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 1068 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1069 my $todo = delete $self->{update_container}
1070 or return;
1071
1072 for my $tag (keys %$todo) {
1073 update_floorbox if $tag == 0 or $tag == $self->{open_container};
1074 if ($tag == 0) {
1075 $::INVR->set_items ($self->{container}{0})
544 if $tag == $::CONN->{open_container}; 1076 if $tag == $self->{open_container};
1077 } elsif ($tag == $self->{player}{tag}) {
1078 $::INV->set_items ($self->{container}{$tag})
1079 } else {
1080 $::INVR->set_items ($self->{container}{$tag})
1081 if $tag == $self->{open_container};
1082 }
1083 }
1084 });
545} 1085}
546 1086
547sub container_add { 1087sub container_add {
548 my ($self, $tag, $items) = @_; 1088 my ($self, $tag, $items) = @_;
549 1089
550 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 1090 $self->{update_container}{$tag}++;
551 1091 $self->update_containers;
552 if ($tag == 0) {
553 update_floorbox;
554 update_container (0);
555 } elsif ($tag == $self->{player}{tag}) {
556 $::INV->set_items ($self->{container}{$self->{player}{tag}})
557 } else {
558 update_container ($tag);
559 }
560
561 # $self-<{player}{tag} => player inv
562 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
563} 1092}
564 1093
565sub container_clear { 1094sub container_clear {
566 my ($self, $tag) = @_; 1095 my ($self, $tag) = @_;
567 1096
568 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 1097 $self->{update_container}{$tag}++;
569 1098 $self->update_containers;
570 if ($tag == 0) {
571 update_floorbox;
572 update_container (0);
573 } elsif ($tag == $self->{player}{tag}) {
574 $::INV->set_items ($self->{container}{$tag})
575 }
576
577# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
578} 1099}
579 1100
580sub item_delete { 1101sub item_delete {
581 my ($self, @items) = @_; 1102 my ($self, @items) = @_;
582 1103
1104 $self->{update_container}{$_->{container}}++
583 for (@items) { 1105 for @items;
584 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
585
586 if ($_->{container} == 0) {
587 update_floorbox;
588 update_container ($_->{tag});
589 } elsif ($_->{container} == $self->{player}{tag}) {
590 $::INV->set_items ($self->{container}{$self->{player}{tag}})
591 } else {
592 update_container ($_->{tag});
593 }
594 } 1106
1107 $self->update_containers;
595} 1108}
596 1109
597sub item_update { 1110sub item_update {
598 my ($self, $item) = @_; 1111 my ($self, $item) = @_;
599 1112
600 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1113 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
601 1114
602 if ($item->{tag} == $self->{player}{tag}) {
603 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
604 return;
605 }
606
607 CFClient::Item::update_widgets $item; 1115 CFPlus::Item::update_widgets $item;
608 1116
609 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1117 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
610 set_opencont ($::CONN, 0, "Floor"); 1118 set_opencont ($::CONN, 0, "Floor");
611 1119
612 } elsif ($item->{flags} & F_OPEN) { 1120 } elsif ($item->{flags} & F_OPEN) {
613 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1121 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
1122
614 } else { 1123 } else {
615 if ($item->{container} == 0) { 1124 $self->{update_container}{$item->{container}}++;
616 update_floorbox;
617 update_container (0); 1125 $self->update_containers;
618 } elsif ($item->{container} == $self->{player}{tag}) {
619 $::INV->set_items ($self->{container}{$item->{container}})
620 }
621 } 1126 }
622} 1127}
623 1128
624sub player_update { 1129sub player_update {
625 my ($self, $player) = @_; 1130 my ($self, $player) = @_;
1131
1132 $self->update_weight;
1133}
1134
1135sub update_weight {
1136 my ($self) = @_;
1137
1138 my $weight = .001 * $self->{player}{weight};
1139 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1140
626 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 1141 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1142 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
1143 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
627} 1144}
628 1145
6291; 1146sub update_server_info {
1147 my ($self) = @_;
1148
1149 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
1150
1151 $::SERVER_INFO->set_markup (
1152 "server <tt>$self->{host}:$self->{port}</tt>\n"
1153 . "protocol version <tt>$self->{version}</tt>\n"
1154 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
1155 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1156 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1157 . "editing support $yesno[!!$self->{editor_support}]\n"
1158 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1159 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1160 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1161 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1162 . "map size $self->{mapw}×$self->{maph}\n"
1163 );
1164
1165 ::setup_build_button ($self->{editor_support}->{builder_ui});
1166}
1167
1168sub logged_in {
1169 my ($self) = @_;
1170
1171 $self->send_ext_req (cfplus_support => version => 2, sub {
1172 my (%msg) = @_;
1173
1174 $self->{cfplus_ext} = $msg{version};
1175 $self->update_server_info;
1176
1177 if ($self->{cfplus_ext} >= 2) {
1178 $self->send_ext_req ("editor_support", sub {
1179 $self->{editor_support} = { @_ };
1180 $self->update_server_info;
1181
1182 0
1183 });
1184 }
1185
1186 0
1187 });
1188
1189 $self->update_server_info;
1190
1191 $self->send_command ("output-sync $::CFG->{output_sync}");
1192 $self->send_command ("output-count $::CFG->{output_count}");
1193 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1194 $self->send_command ("pickup $::CFG->{pickup}");
1195}
1196
1197sub buildat {
1198 my ($self, $builditem, $x, $y) = @_;
1199
1200 if ($self->{cfplus_ext}) {
1201 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1202 }
1203}
1204
1205sub lookat {
1206 my ($self, $x, $y) = @_;
1207
1208 if ($self->{cfplus_ext}) {
1209 $self->send_ext_req (lookat => $x, $y, sub {
1210 my (%msg) = @_;
1211
1212 if (exists $msg{npc_dialog}) {
1213 # start npc chat dialog
1214 $self->{npc_dialog} = new CFPlus::NPCDialog::
1215 token => $msg{npc_dialog},
1216 title => "$msg{npc_dialog}[0] (NPC)",
1217 conn => $self,
1218 ;
1219 }
1220 });
1221 }
1222
1223 $self->send ("lookat $x $y");
1224}
1225
1226sub destroy {
1227 my ($self) = @_;
1228
1229 (delete $self->{npc_dialog})->destroy
1230 if $self->{npc_dialog};
1231
1232 $self->SUPER::destroy;
1233
1234 %$self = ();
1235}
1236
1237package CFPlus::NPCDialog;
1238
1239our @ISA = 'CFPlus::UI::Toplevel';
1240
1241sub new {
1242 my $class = shift;
1243
1244 my $self = $class->SUPER::new (
1245 x => 'center',
1246 y => 'center',
1247 name => "npc_dialog",
1248 force_w => $::WIDTH * 0.7,
1249 force_h => $::HEIGHT * 0.7,
1250 title => "NPC Dialog",
1251 kw => { hi => 0, yes => 0, no => 0 },
1252 has_close_button => 1,
1253 @_,
1254 );
1255
1256 CFPlus::weaken (my $this = $self);
1257
1258 $self->connect (delete => sub { $this->destroy; 1 });
1259
1260 # better use a pane...
1261 $self->add (my $hbox = new CFPlus::UI::HBox);
1262 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
1263
1264 $hbox->add (my $vbox = new CFPlus::UI::VBox);
1265
1266 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
1267 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
1268 tooltip => "#npc_message_entry",
1269 on_activate => sub {
1270 my ($entry, $text) = @_;
1271
1272 return unless $text =~ /\S/;
1273
1274 $entry->set_text ("");
1275 $this->send ($text);
1276
1277 0
1278 },
1279 );
1280
1281 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
1282
1283 $self->{bye_button} = new CFPlus::UI::Button
1284 text => "Bye (close)",
1285 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1286 on_activate => sub { $this->destroy; 1 },
1287 ;
1288
1289 $self->update_options;
1290
1291 $self->{id} = "npc-channel-" . $self->{conn}->token;
1292 $self->{conn}->connect_ext ($self->{id} => sub {
1293 $this->feed (@_) if $this;
1294 });
1295
1296 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1297
1298 $self->{entry}->grab_focus;
1299
1300 $self->{textview}->add_paragraph ({
1301 fg => [1, 1, 0, 1],
1302 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1303 });
1304
1305 $self->show;
1306 $self
1307};
1308
1309sub update_options {
1310 my ($self) = @_;
1311
1312 CFPlus::weaken $self;
1313
1314 $self->{options}->clear;
1315 $self->{options}->add ($self->{bye_button});
1316
1317 for my $kw (sort keys %{ $self->{kw} }) {
1318 $self->{options}->add (new CFPlus::UI::Button
1319 text => $kw,
1320 on_activate => sub {
1321 $self->send ($kw);
1322 0
1323 },
1324 );
1325 }
1326}
1327
1328sub feed {
1329 my ($self, $type, @arg) = @_;
1330
1331 CFPlus::weaken $self;
1332
1333 if ($type eq "update") {
1334 my (%info) = @arg;
1335
1336 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1337 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1338
1339 if (exists $info{msg}) {
1340 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1341 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1342 my @link;
1343 $text =~ s{
1344 ($match)
1345 }{
1346 my $kw = $1;
1347
1348 push @link, new CFPlus::UI::Label
1349 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1350 can_hover => 1,
1351 can_events => 1,
1352 padding_x => 0,
1353 padding_y => 0,
1354 on_button_up => sub {
1355 $self->send ($kw);
1356 };
1357
1358 "\x{fffc}"
1359 }giex;
1360
1361 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1362 $self->{textview}->scroll_to_bottom;
1363 }
1364
1365 $self->update_options;
1366 } else {
1367 $self->destroy;
1368 }
1369
1370 1
1371}
1372
1373sub send {
1374 my ($self, $msg) = @_;
1375
1376 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1377 $self->{textview}->scroll_to_bottom;
1378
1379 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1380}
1381
1382sub destroy {
1383 my ($self) = @_;
1384
1385 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1386
1387 if ($self->{conn}) {
1388 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1389 delete $self->{conn}{npc_dialog};
1390 $self->{conn}->disconnect_ext ($self->{id});
1391 }
1392
1393 $self->SUPER::destroy;
1394}
1395
13961
1397

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines