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

Diff Legend

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