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

Diff Legend

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