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

Diff Legend

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