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.30 by root, Sun Jun 11 18:41:30 2006 UTC vs.
Revision 1.148 by root, Fri Aug 10 04:02:13 2007 UTC

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

Diff Legend

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