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

Diff Legend

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