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

Diff Legend

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