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

Diff Legend

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