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

Diff Legend

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