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

Diff Legend

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