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.27 by root, Wed Jun 7 07:00:30 2006 UTC vs.
Revision 1.171 by root, Sat Sep 1 08:08:52 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 xwidget2 => 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->{json_coder}
54 ->convert_blessed
55 ->filter_json_single_key_object ("\fw" => sub {
56 $self->{widget}{$_[0]}
41 } 57 })
58 ->filter_json_single_key_object ("\fc" => sub {
59 my ($id) = @_;
60 sub {
61 $self->send_exti_msg (w_e => $id, @_);
62 }
63 });
42 64
65 # destroy widgets on logout
66 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
67 for my $ws (values %{delete $self->{widgetset} || {}}) {
68 $_->destroy
69 for values %{delete $ws->{w} || {}};
70 }
71 });
72
73 $self->{map_widget}->add_command (@$_)
43 \@cmd_help 74 for @cmd_help;
75
76 {
77 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
78 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
79 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
80 }
81
82 {
83 $self->{noface} = my $tex = new_from_file CFPlus::Texture
84 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
85 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
86 }
87
88 $self->{open_container} = 0;
89
90 # per server
91 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
92
93 $self
94}
95
96sub update_fx_want {
97 my ($self) = @_;
98
99 $self->send_exti_msg (fx_want => {
100 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
101 5 => !!$::CFG->{audio_enable}, # FT_SOUND
102 6 => 1, # FT_RSRC
103 });
104}
105
106sub ext_capabilities {
107 my ($self, %cap) = @_;
108
109 #$self->send ("setup sound 0"); # we use a different protocol
110 $self->update_fx_want;
111
112 $self->send_exti_req (resource => "exp_table", sub {
113 my ($exp_table) = @_;
114
115 $self->register_face_handler ($exp_table, sub {
116 my ($face) = @_;
117
118 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
119 $_->() for values %{ $self->{on_exp_update} || {} };
120 });
121
122 ()
123 });
124
125 if (my $ts = $cap{tileset}) {
126 if (my ($default) = grep $_->[2] & 1, @$ts) {
127 $self->{tileset} = $default;
128 $self->{tilesize} = $default->[3];
129 $self->setup_req (tileset => $default->[0]);
130
131 my $w = int $self->{mapw} * 32 / $self->{tilesize};
132 my $h = int $self->{maph} * 32 / $self->{tilesize};
133
134 $self->setup_req (mapsize => "${w}x${h}");
135 }
136 }
137}
138
139sub ext_ambient_music {
140 my ($self, $songs) = @_;
141 &::audio_music_set_ambient ($songs);
142}
143
144#############################################################################
145
146sub widget_associate {
147 my ($self, $ws, $id, $widget) = @_;
148
149 $widget ||= new CFPlus::UI::Bin;
150
151 $widget->{s_id} = $id;
152 $self->{widget}{$id} = $widget;
153
154 if ($ws) {
155 $widget->{s_ws} = $ws;
156 $self->{widgetset}{$ws}{w}{$id} = $widget;
157 }
158
159 $widget->connect (on_destroy => sub {
160 my ($widget) = @_;
161
162 delete $self->{widget}{$widget->{s_id}};
163 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
164 if exists $widget->{s_ws};
165 });
166}
167
168# widgetset new
169sub ext_ws_n {
170 my ($self, $id) = @_;
171
172 $self->{widgetset}{$id} = {
173 w => {},
44 }; 174 };
45
46 $self->{map_widget}->add_command (@$_)
47 for @$cmd_help;
48
49 $self->{noface} = new_from_file CFClient::Texture
50 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
51
52 $self->{open_container} = 0;
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} 175}
176
177# widgetset destroy
178sub ext_ws_d {
179 my ($self, $id) = @_;
180
181 my $ws = delete $self->{widgetset}{$id}
182 or return;
183
184 $_->destroy
185 for values %{$ws->{w}};
186}
187
188# widgetset create
189sub ext_ws_c {
190 my ($self, $ws, $id, $class, $args) = @_;
191
192 $self->widget_associate (
193 $ws, $id => scalar eval {
194 local $SIG{__DIE__};
195 "CFPlus::UI::$class"->new (%$args)
196 }
197 );
198}
199
200# widgetset associate
201sub ext_ws_a {
202 my ($self, %ass) = @_;
203
204 # everything that has a name, wether conceivably useful or not
205 my %wkw = (
206 root => $CFPlus::UI::ROOT,
207 tooltip => $CFPlus::UI::TOOLTIP,
208
209 mapwidget => $::MAPWIDGET,
210 buttonbar => $::BUTTONBAR,
211 metaserver => $::METASERVER,
212 buttonbar => $::BUTTONBAR,
213 login_button => $::LOGIN_BUTTON,
214 quit_dialog => $::QUIT_DIALOG,
215 host_entry => $::HOST_ENTRY,
216 metaserver => $::METASERVER,
217 server_info => $::SERVER_INFO,
218
219 setup_dialog => $::SETUP_DIALOG,
220 setup_notebook => $::SETUP_NOTEBOOK,
221 setup_server => $::SETUP_SERVER,
222 setup_keyboard => $::SETUP_KEYBOARD,
223
224 pl_notebook => $::PL_NOTEBOOK,
225 pl_window => $::PL_WINDOW,
226 inventory_page => $::INVENTORY_PAGE,
227 stats_page => $::STATS_PAGE,
228 skill_page => $::SKILL_PAGE,
229 spell_page => $::SPELL_PAGE,
230 spell_list => $::SPELL_LIST,
231
232 floorbox => $::FLOORBOX,
233 help_window => $::HELP_WINDOW,
234 message_window => $::MESSAGE_WINDOW,
235 statusbox => $::SDTATUSBOX,
236
237 inv => $::INV,
238 invr => $::INVR,
239 invr_hb => $::INVR_HB,
240 );
241
242 while (my ($id, $name) = each %ass) {
243 $self->widget_associate (undef, $id => $wkw{$name});
244 }
245}
246
247# widget call
248sub ext_w_c {
249 my ($self, $id, $rcb, $method, @args) = @_;
250
251 my $w = $self->{widget}{$id}
252 or return;
253
254 if ($rcb) {
255 $rcb->($w->$method (@args));
256 } else {
257 $w->$method (@args);
258 }
259}
260
261# widget set
262sub ext_w_s {
263 my ($self, $id, $attr) = @_;
264
265 my $w = $self->{widget}{$id}
266 or return;
267
268 for (my $i = 0; $i < $#$attr; $i += 2) {
269 my ($member, $value) = @$attr[$i, $i+1];
270 if (defined $value) {
271 $w->{$member} = $value;
272 } else {
273 delete $w->{$member};
274 }
275 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
276 }
277}
278
279# widget get
280sub ext_w_g {
281 my ($self, $id, $rid, @attr) = @_;
282
283 my $w = $self->{widget}{$id}
284 or return;
285
286 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
287}
288
289# message window
290sub ext_channel_info {
291 my ($self, $info) = @_;
292 $self->{channels}->{$info->{id}} = $info;
293 $::MESSAGE_WINDOW->add_channel ($info);
294}
295
296#############################################################################
297
298sub logprint {
299 my ($self, @a) = @_;
300
301 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
302}
303
304sub _stat_numdiff {
305 my ($self, $name, $old, $new) = @_;
306
307 my $diff = $new - $old;
308
309 $diff = 0.01 * int $diff * 100;
310
311 0.1 >= abs $diff ? ()
312 : $diff < 0 ? "$name$diff" : "$name+$diff"
313}
314
315sub _stat_skillmaskdiff {
316 my ($self, $name, $old, $new) = @_;
317
318 my $diff = $old ^ $new
319 or return;
320
321 my @diff = map
322 {
323 $diff & $_
324 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
325 : ()
326 }
327 sort { $a <=> $b } keys %{$self->{spell_paths}};
328
329 join "", @diff
330}
331
332# all stats that are chacked against changes
333my @statchange = (
334 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
335 [&CS_STAT_INT => \&_stat_numdiff, "Int"],
336 [&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
337 [&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
338 [&CS_STAT_CON => \&_stat_numdiff, "Con"],
339 [&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
340 [&CS_STAT_POW => \&_stat_numdiff, "Pow"],
341 [&CS_STAT_WC => \&_stat_numdiff, "Wc"],
342 [&CS_STAT_AC => \&_stat_numdiff, "Ac"],
343 [&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
344 [&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
345 [&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
346 [&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
347 [&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
348 [&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
349 [&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
350 [&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
351 [&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
352 [&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
353 [&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
354 [&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
355 [&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
356 [&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
357 [&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
358 [&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
359 [&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
360 [&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
361 [&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
362 [&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
363 [&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
364 [&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
365 [&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
366 [&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
367 [&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
368 [&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
369 [&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
370 [&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
371);
63 372
64sub stats_update { 373sub stats_update {
65 my ($self, $stats) = @_; 374 my ($self, $stats) = @_;
66 375
67 if (my $exp = $stats->{+CS_STAT_EXP64}) { 376 my $prev = $self->{prev_stats} || { };
68 my $diff = $exp - $self->{prev_exp}; 377
378 if (my @diffs =
379 (
380 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
381 map {
382 $stats->{$_} && $prev->{$_}
383 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
384 } sort { $a <=> $b } keys %{$self->{skill_info}}
385 )
386 ) {
387 my $msg = join " ", @diffs;
69 $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5) 388 $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 } 389 }
73 390
391 if (
392 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
393 ) {
394 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
395 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
396 }
397
74 ::update_stats_window ($stats); 398 $self->update_stats_window ($stats, $prev);
399
400 $self->{prev_stats} = { %$stats };
401}
402
403my %RES_TBL = (
404 phys => CS_STAT_RES_PHYS,
405 magic => CS_STAT_RES_MAG,
406 fire => CS_STAT_RES_FIRE,
407 elec => CS_STAT_RES_ELEC,
408 cold => CS_STAT_RES_COLD,
409 conf => CS_STAT_RES_CONF,
410 acid => CS_STAT_RES_ACID,
411 drain => CS_STAT_RES_DRAIN,
412 ghit => CS_STAT_RES_GHOSTHIT,
413 pois => CS_STAT_RES_POISON,
414 slow => CS_STAT_RES_SLOW,
415 para => CS_STAT_RES_PARA,
416 tund => CS_STAT_TURN_UNDEAD,
417 fear => CS_STAT_RES_FEAR,
418 depl => CS_STAT_RES_DEPLETE,
419 deat => CS_STAT_RES_DEATH,
420 holyw => CS_STAT_RES_HOLYWORD,
421 blind => CS_STAT_RES_BLIND,
422);
423
424sub update_stats_window {
425 my ($self, $stats, $prev) = @_;
426
427 # I love text protocols...
428
429 my $hp = $stats->{+CS_STAT_HP} * 1;
430 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
431 my $sp = $stats->{+CS_STAT_SP} * 1;
432 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
433 my $fo = $stats->{+CS_STAT_FOOD} * 1;
434 my $fo_m = 999;
435 my $gr = $stats->{+CS_STAT_GRACE} * 1;
436 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
437
438 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
439 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
440 $::GAUGES->{food} ->set_value ($fo, $fo_m);
441 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
442 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
443 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
444 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
445 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
446 my $title = $stats->{+CS_STAT_TITLE};
447 $title =~ s/^Player: //;
448 $::STATWIDS->{title} ->set_text ("Title: " . $title);
449
450 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
451 $::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
452 $::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
453 $::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
454 $::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
455 $::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
456 $::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
457 $::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
458 $::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
459 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
460 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
461 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
462 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
463
464 $self->update_weight;
465
466 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
467 for keys %RES_TBL;
468
469 my $sktbl = $::STATWIDS->{skill_tbl};
470 my @skills = keys %{ $self->{skill_info} };
471
472 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
473 map [$_, $self->{skill_info}{$_}],
474 grep exists $stats->{$_},
475 @skills;
476
477 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
478 $self->{stat_order} = join ",", map $_->[0], @order;
479
480 $sktbl->clear;
481
482 my $sw = $self->{skillwid}{""} ||= [
483 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
484 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
485 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
486 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
487 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
488 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
489 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
490 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
491 ];
492
493 my @add = @$sw;
494
495 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
496
497 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
498 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
499
500 my ($x, $y) = (0, 1);
501 for (@order) {
502 my ($idx, $name) = @$_;
503
504 my $spell_cb = sub {
505 my ($widget, $ev) = @_;
506
507 if ($ev->{button} == 1) {
508 $::CONN->user_send ("ready_skill $name");
509 } elsif ($ev->{button} == 2) {
510 $::CONN->user_send ("use_skill $name");
511 } elsif ($ev->{button} == 3) {
512 my $shortname = CFPlus::shorten $name, 14;
513 (new CFPlus::UI::Menu
514 items => [
515 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
516 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
517 ],
518 )->popup ($ev);
519 } else {
520 return 0;
521 }
522
523 1
524 };
525
526 my $sw = $self->{skillwid}{$idx} ||= [
527 # exp
528 (new CFPlus::UI::Label
529 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
530
531 # level
532 (new CFPlus::UI::Label
533 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
534
535 # progress
536 (new CFPlus::UI::ExperienceProgress),
537
538 # label
539 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
540 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
541 ];
542
543 push @add,
544 $x * 4 + 0, $y, $sw->[0],
545 $x * 4 + 1, $y, $sw->[1],
546 $x * 4 + 2, $y, $sw->[2],
547 $x * 4 + 3, $y, $sw->[3],
548 ;
549
550 $x++ and ($x, $y) = (0, $y + 1);
551 }
552
553 $sktbl->add_at (@add);
554 }
555
556 for (@order) {
557 my ($idx, $name) = @$_;
558 my $val = $stats->{$idx};
559
560 next if $prev->{$idx}[1] eq $val->[1];
561
562 my $sw = $self->{skillwid}{$idx};
563 $sw->[0]->set_text (::formsep ($val->[1]));
564 $sw->[1]->set_text ($val->[0] * 1);
565 $sw->[2]->set_value (@$val);
566
567 $::GAUGES->{sklprg}->set_label ("$name %d%%");
568 $::GAUGES->{sklprg}->set_value (@$val);
569 }
75} 570}
76 571
77sub user_send { 572sub user_send {
78 my ($self, $command) = @_; 573 my ($self, $command) = @_;
79 574
575 $self->{record}->($command)
80 if ($self->{record}) { 576 if $self->{record};
81 push @{$self->{record}}, $command;
82 }
83 577
578 $self->logprint ("send: ", $command);
84 $self->send_command ($command); 579 $self->send_command ($command);
85 ::status $command;
86} 580}
87 581
88sub start_record { 582sub record {
89 my ($self) = @_; 583 my ($self, $cb) = @_;
90 584
91 $self->{record} = []; 585 $self->{record} = $cb;
92}
93
94sub stop_record {
95 my ($self) = @_;
96 return delete $self->{record};
97} 586}
98 587
99sub map_scroll { 588sub map_scroll {
100 my ($self, $dx, $dy) = @_; 589 my ($self, $dx, $dy) = @_;
101 590
… …
103} 592}
104 593
105sub feed_map1a { 594sub feed_map1a {
106 my ($self, $data) = @_; 595 my ($self, $data) = @_;
107 596
108 $self->{map}->map1a_update ($data); 597 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
598 my $delay;
599
600 for my $tile (@$missing) {
601 next if $self->{delay}{$tile};
602
603 $delay = 1;
604
605 if (my $tex = $::CONN->{texture}[$tile]) {
606 $tex->upload;
607 } else {
608 $self->{delay}{$tile} = 1;
609
610 # we assume the face is in-flight and will eventually come
611 push @{$self->{tile_cb}{$tile}}, sub {
612 delete $self->{delay}{$tile};
613 $_[0]->upload;
614 };
615 }
616 }
617
618 if ($delay) {
619 # delay the map drawing a tiny bit in the hope of getting the missing fetched
620 Event->timer (after => 0.03, cb => sub {
621 $_[0]->w->cancel;
622 $self->{map_widget}->update
623 if $self->{map_widget};
624 });
625 } else {
109 $self->{map_widget}->update; 626 $self->{map_widget}->update;
627 }
628}
629
630sub magicmap {
631 my ($self, $w, $h, $x, $y, $data) = @_;
632
633 $self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data);
110} 634}
111 635
112sub flush_map { 636sub flush_map {
113 my ($self) = @_; 637 my ($self) = @_;
114 638
115 my $map_info = delete $self->{map_info} 639 my $map_info = delete $self->{map_info}
116 or return; 640 or return;
117 641
118 my ($hash, $x, $y, $w, $h) = @$map_info; 642 my ($hash, $x, $y, $w, $h) = @$map_info;
119 643
120 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 644 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
121 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 645 $self->{map_cache_new}{$hash} = \$data;
122 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 646 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
123} 647}
124 648
125sub map_clear { 649sub map_clear {
126 my ($self) = @_; 650 my ($self) = @_;
127 651
128 $self->flush_map; 652 $self->flush_map;
129 delete $self->{neigh_map}; 653 delete $self->{neigh_map};
130 654
131 $self->{map}->clear; 655 $self->{map}->clear;
656 delete $self->{map_widget}{magicmap};
132} 657}
133 658
659sub bg_fetch {
660 my ($self) = @_;
661
662 my $tile;
663
664 do {
665 $tile = pop @{$self->{bg_fetch}}
666 or return;
667 } while $self->{texture}[$tile];
668
669 CFPlus::DB::get tilecache => $tile, sub {
670 my ($data) = @_;
671
672 return unless $self->{map}; # stop when destroyed
673
674 if (defined $data) {
675 $self->have_tile ($tile, $data);
676 $self->{texture}[$tile]->upload;
677 }
678
679 $self->bg_fetch;
680 };
681}
134 682
135sub load_map($$$) { 683sub load_map($$$) {
136 my ($self, $hash, $x, $y) = @_; 684 my ($self, $hash, $x, $y) = @_;
137 685
138 if (defined (my $data = $self->{mapcache}->get ($hash))) { 686 my $gen = $self->{map_change_gen};
687
688 my $cb = sub {
689 return unless $gen == $self->{map_change_gen};
690
691 my ($data) = @_;
692
693 if (defined $data) {
694 $self->{map_cache_new}{$hash} = \$data;
695
139 $data = Compress::LZF::decompress $data; 696 my $data = Compress::LZF::decompress $data;
140 #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 697
145 $self->set_texture ($id => $data); 698 my $inprogress = @{ $self->{bg_fetch} || [] };
699 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
700 $self->bg_fetch unless $inprogress;
146 } 701 }
702 };
703
704 if (my $rdata = $self->{map_cache_old}{$hash}) {
705 $cb->($$rdata);
706 } else {
707 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
147 } 708 }
148} 709}
149 710
150# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 711# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
151# (server resource,s latency, bandwidth), so this hack is warranted. 712# (server resource,s latency, bandwidth), so this hack is warranted.
… …
216 777
217 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 778 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
218 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 779 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
219 780
220 } else { 781 } else {
782 my $gen = $self->{map_change_gen};
221 $self->send_mapinfo ("spatial $path$tile", sub { 783 $self->send_mapinfo ("spatial $path$tile", sub {
784 return unless $gen == $self->{map_change_gen};
785
222 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 786 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
223 787
224 return if $mode ne "spatial"; 788 return if $mode ne "spatial";
225 789
226 $x += $self->{map}->ox; 790 $x += $self->{map}->ox;
… …
240 804
241sub map_change { 805sub map_change {
242 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 806 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
243 807
244 $self->flush_map; 808 $self->flush_map;
809
810 ++$self->{map_change_gen};
811 $self->{map_cache_old} = delete $self->{map_cache_new};
245 812
246 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 813 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
247 814
248 my $mapmapw = $self->{mapmap}->{w}; 815 my $mapmapw = $self->{mapmap}->{w};
249 my $mapmaph = $self->{mapmap}->{h}; 816 my $mapmaph = $self->{mapmap}->{h};
… …
266 $self->load_map ($hash, $x, $y); 833 $self->load_map ($hash, $x, $y);
267 $self->flood_fill (0, 0, 0, "", $hash, $flags); 834 $self->flood_fill (0, 0, 0, "", $hash, $flags);
268} 835}
269 836
270sub face_find { 837sub face_find {
838 my ($self, $facenum, $face, $cb) = @_;
839
840 if ($face->{type} == 0) { # FT_FACE
841 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
842
843 $face->{id} = $id;
844 $self->{map}->set_tileid ($facenum => $id);
845
846 CFPlus::DB::get tilecache => $id, $cb;
847
848 } elsif ($face->{type} & 1) { # with metadata
849 CFPlus::DB::get res_meta => $face->{name}, $cb;
850
851 } else { # no metadata
852 CFPlus::DB::get res_data => $face->{name}, $cb;
853 }
854}
855
856sub face_update {
857 my ($self, $facenum, $face, $changed) = @_;
858
859 if ($face->{type} == 0) {
860 # image, FT_FACE
861 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
862 if $changed;
863
864 $self->have_tile ($face->{id}, delete $face->{data});
865
866 } elsif ($face->{type} & 1) {
867 # split metadata case, FT_MUSIC, FT_SOUND
868 if ($changed) { # new data
869 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
870 $face->{data} = $meta;
871
872 # rely on strict ordering here and also on later fetch
873 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
874 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
875 }
876
877 $face->{data} = $self->{json_coder}->decode ($face->{data});
878 ::add_license ($face);
879 ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
880 if $changed;
881
882 if ($face->{type} == 3) { # FT_MUSIC
883 &::audio_music_push ($facenum);
884 } elsif ($face->{type} == 5) { # FT_SOUND
885 &::audio_sound_push ($facenum);
886 }
887
888 } else {
889 # flat resource case, FT_RSRC
890 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
891 if $changed;
892 }
893
894 if (my $cbs = $self->{face_cb}{$facenum}) {
895 $_->($face, $changed) for @$cbs;
896 }
897}
898
899sub smooth_update {
271 my ($self, $facenum, $face) = @_; 900 my ($self, $facenum, $face) = @_;
272 901
273 my $hash = "$face->{chksum},$face->{name}"; 902 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
903}
274 904
275 my $id = $self->{facemap}->get ($hash); 905sub have_tile {
906 my ($self, $tile, $data) = @_;
276 907
277 unless ($id) { 908 return unless $self->{map};
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 909
289 goto gotid; 910 my $tex = $self->{texture}[$tile] ||=
290 } 911 new CFPlus::Texture
912 tile => $tile,
913 image => $data, delete_image => 1,
914 minify => 1, mipmap => 1;
915
916 if (my $cbs = delete $self->{tile_cb}{$tile}) {
917 $_->($tex) for @$cbs;
918 }
919}
920
921# call in non-void context registers a temporary
922# hook with handle, otherwise its permanent
923sub on_face_change {
924 my ($self, $num, $cb) = @_;
925
926 push @{$self->{face_cb}{$num}}, $cb;
927
928 defined wantarray
929 ? CFPlus::guard {
930 @{$self->{face_cb}{$num}}
931 = grep $_ != $cb,
932 @{$self->{face_cb}{$num}};
291 } 933 }
292 $txn->txn_abort; 934 : ()
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} 935}
314 936
315sub face_update { 937# call in non-void context registers a temporary
938# hook with handle, otherwise its permanent
939sub register_face_handler {
316 my ($self, $facenum, $face) = @_; 940 my ($self, $num, $cb) = @_;
317 941
318 $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes 942 return unless $num;
319 943
320 $self->set_texture ($face->{id} => delete $face->{image}); 944 # invoke if available right now
321} 945 $cb->($self->{face}[$num], 0)
946 unless exists $self->{face}[$num]{loading};
322 947
323sub set_texture { 948 # future changes
324 my ($self, $id, $data) = @_; 949 $self->on_face_change ($num => $cb)
325
326 $self->{texture}[$id] ||= do {
327 my $tex =
328 new_from_image CFClient::Texture
329 $data, minify => 1, mipmap => 1;
330
331 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
332 $self->{map_widget}->update;
333
334 $tex
335 };
336} 950}
337 951
338sub sound_play { 952sub sound_play {
339 my ($self, $x, $y, $soundnum, $type) = @_; 953 my ($self, $type, $face, $dx, $dy, $vol) = @_;
340 954
341 $self->{sound_play}->($x, $y, $soundnum, $type); 955 &::audio_sound_play ($face, $dx, $dy, $vol)
956 unless $type & 1; # odd types are silent for future expansion
342} 957}
343 958
344my $LAST_QUERY; # server is stupid, stupid, stupid 959my $LAST_QUERY; # server is stupid, stupid, stupid
345 960
346sub query { 961sub query {
… …
350 $LAST_QUERY = $prompt; 965 $LAST_QUERY = $prompt;
351 966
352 $self->{query}-> ($self, $flags, $prompt); 967 $self->{query}-> ($self, $flags, $prompt);
353} 968}
354 969
355sub drawinfo { 970sub sanitise_xml($) {
356 my ($self, $color, $text) = @_; 971 local $_ = shift;
357 972
358 my @color = ( 973 # we now weed out all tags we do not support
974 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
975 # now all entities
976 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
977
978 # handle some elements
979 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
980 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
981
982 $_
983}
984
985our %NAME_TO_COLOR = (
986 black => 0,
987 white => 1,
988 darkblue => 2,
989 red => 3,
990 orange => 4,
991 lightblue => 5,
992 darkorange => 6,
993 green => 7,
994 darkgreen => 8,
995 grey => 9,
996 brown => 10,
997 yellow => 11,
998 tan => 12,
999);
1000
1001our @CF_COLOR = (
359 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1002 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
360 [1.00, 1.00, 1.00], 1003 [1.00, 1.00, 1.00],
361 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1004 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
362 [1.00, 0.00, 0.00], 1005 [1.00, 0.00, 0.00],
363 [1.00, 0.54, 0.00], 1006 [1.00, 0.54, 0.00],
364 [0.11, 0.56, 1.00], 1007 [0.11, 0.56, 1.00],
365 [0.93, 0.46, 0.00], 1008 [0.93, 0.46, 0.00],
366 [0.18, 0.54, 0.34], 1009 [0.18, 0.54, 0.34],
367 [0.56, 0.73, 0.56], 1010 [0.56, 0.73, 0.56],
368 [0.80, 0.80, 0.80], 1011 [0.80, 0.80, 0.80],
369 [0.55, 0.41, 0.13], 1012 [0.75, 0.61, 0.20],
370 [0.99, 0.77, 0.26], 1013 [0.99, 0.77, 0.26],
371 [0.74, 0.65, 0.41], 1014 [0.74, 0.65, 0.41],
372 ); 1015);
373 1016
374 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 1017sub msg {
1018 my ($self, $color, $type, $text, @extra) = @_;
375 1019
1020 $text = sanitise_xml $text;
1021
1022 if (my $cb = $self->{cb_msg}{$type}) {
1023 $_->($self, $color, $type, $text, @extra) for values %$cb;
1024 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1025 $type =~ s/-/_/g;
1026 $self->{$type} = $text;
1027 } else {
1028 $self->logprint ("msg: ", $text);
1029 return if $color < 0; # negative color == ignore if not understood
1030
1031 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
1032
376 # try to create single paragraphs of multiple lines sent by the server 1033 ## try to create single paragraphs of multiple lines sent by the server
1034 # no longer neecssary with TRT servers
377 $text =~ s/(?<=\S)\n(?=\w)/ /g; 1035 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
378 1036
379 $text = CFClient::UI::Label::escape $text; 1037 for (split /\n/, $text) {
380 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1038 ::message ({
381 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 1039 fg => $fg,
1040 markup => $_,
1041 type => $type,
1042 extra => [@extra],
1043 color_flags => $color, #d# ugly, kill
1044 });
382 1045
383 $self->{logview}->add_paragraph ($color[$color], 1046 $color &= ~NDI_CLEAR; # only clear once for multiline messages
384 join "\n", map "$time $_", split /\n/, $text); 1047 # actually, this is an ugly design. _we_ should control the channels,
1048 # not some random other widget, as the channels are clearly protocol-specific.
1049 # then we could also react to flags such as CLEAR without resorting to
1050 # hacks such as color_flags, above.
1051 }
385 1052
386 $self->{statusbox}->add ($text, 1053 $self->{statusbox}->add ($text,
387 group => $text, 1054 group => $text,
388 fg => $color[$color], 1055 fg => $fg,
389 timeout => $color >= 2 ? 60 : 10, 1056 timeout => $color >= 2 ? 180 : 10,
390 tooltip_font => $::FONT_FIXED, 1057 tooltip_font => $::FONT_FIXED,
391 ); 1058 );
392} 1059 }
393
394sub drawextinfo {
395 my ($self, $color, $type, $subtype, $message) = @_;
396
397 $self->drawinfo ($color, $message);
398} 1060}
399 1061
400sub spell_add { 1062sub spell_add {
401 my ($self, $spell) = @_; 1063 my ($self, $spell) = @_;
402 1064
403 # try to create single paragraphs of multiple lines sent by the server 1065 # try to create single paragraphs out of the multiple lines sent by the server
404 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 1066 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
405 $spell->{message} =~ s/\n+$//; 1067 $spell->{message} =~ s/\n+$//;
406 $spell->{message} ||= "Server did not provide a description for this spell."; 1068 $spell->{message} ||= "Server did not provide a description for this spell.";
407 1069
408 $::SETUP_SPELLS->add_spell ($spell); 1070 $::SPELL_LIST->add_spell ($spell);
409 1071
410 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 1072 $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}); 1073 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
412} 1074}
413 1075
414sub spell_delete { 1076sub spell_delete {
415 my ($self, $spell) = @_; 1077 my ($self, $spell) = @_;
1078
416 $::SETUP_SPELLS->remove_spell ($spell); 1079 $::SPELL_LIST->remove_spell ($spell);
1080}
1081
1082sub setup {
1083 my ($self, $setup) = @_;
1084
1085 $self->{map_widget}->set_tilesize ($self->{tilesize});
1086 $::MAP->resize ($self->{mapw}, $self->{maph});
417} 1087}
418 1088
419sub addme_success { 1089sub addme_success {
420 my ($self) = @_; 1090 my ($self) = @_;
421 1091
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; 1092 my %skill_help;
426 1093
427 for my $head2 ($pom->head1->[3]->head2) { 1094 for my $node (CFPlus::Pod::find skill_description => "*") {
428 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 1095 my (undef, @par) = CFPlus::Pod::section_of $node;
429 } 1096 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
430
431 \%skill_help
432 }; 1097 };
433 1098
434 for my $skill (values %{$self->{skill_info}}) { 1099 for my $skill (values %{$self->{skill_info}}) {
435 $self->{map_widget}->add_command ("ready_skill $skill", 1100 $self->{map_widget}->add_command ("ready_skill $skill",
436 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 1101 (CFPlus::asxml "Ready the skill '$skill'\n\n")
437 . $skill_help->{$skill}); 1102 . $skill_help{$skill});
438 $self->{map_widget}->add_command ("use_skill $skill", 1103 $self->{map_widget}->add_command ("use_skill $skill",
439 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 1104 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
440 . $skill_help->{$skill}); 1105 . $skill_help{$skill});
441 } 1106 }
442} 1107}
443 1108
444sub eof { 1109sub eof {
445 my ($self) = @_; 1110 my ($self) = @_;
… …
447 $self->{map_widget}->clr_commands; 1112 $self->{map_widget}->clr_commands;
448 1113
449 ::stop_game (); 1114 ::stop_game ();
450} 1115}
451 1116
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 { 1117sub update_floorbox {
487 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1118 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
488 return unless $::CONN; 1119 return unless $::CONN;
489 1120
490 $::FLOORBOX->clear; 1121 $::FLOORBOX->clear;
491 1122
1123 my @add;
1124
492 my $row; 1125 my $row;
493 for (@{ $::CONN->{container}{0} }) { 1126 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
494 if ($row < 6) { 1127 if ($row < 6) {
495 local $_->{face_widget}; # hack to force recreation of widget 1128 local $_->{face_widget}; # hack to force recreation of widget
496 local $_->{desc_widget}; # hack to force recreation of widget 1129 local $_->{desc_widget}; # hack to force recreation of widget
497 CFClient::Item::update_widgets $_; 1130 CFPlus::Item::update_widgets $_;
498 1131
1132 push @add,
499 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1133 0, $row, $_->{face_widget},
500 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1134 1, $row, $_->{desc_widget};
501 1135
502 $row++; 1136 $row++;
503 } else { 1137 } else {
504 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 1138 push @add, 1, $row, new CFPlus::UI::Button
505 text => "More...", 1139 text => "More...",
506 on_activate => sub { $::INV_WINDOW->toggle_visibility }, 1140 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
507 ); 1141 ;
508 last; 1142 last;
509 } 1143 }
510 } 1144 }
1145 if ($::CONN->{open_container}) {
1146 push @add, 1, $row++, new CFPlus::UI::Button
1147 text => "Close container",
1148 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1149 ;
1150 }
1151
1152 $::FLOORBOX->add_at (@add);
511 }); 1153 });
512 1154
513 $::WANT_REFRESH++; 1155 $::WANT_REFRESH->start;
514} 1156}
515 1157
516sub set_opencont { 1158sub set_opencont {
517 my ($conn, $tag, $name) = @_; 1159 my ($conn, $tag, $name) = @_;
518 $conn->{open_container} = $tag; 1160 $conn->{open_container} = $tag;
1161 update_floorbox;
519 1162
520 $::INV_RIGHT_HB->clear (); 1163 $::INVR_HB->clear ();
521 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 1164 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
522 1165
523 if ($tag != 0) { # Floor isn't closable, is it? 1166 if ($tag != 0) { # Floor isn't closable, is it?
524 $::INV_RIGHT_HB->add (new CFClient::UI::Button 1167 $::INVR_HB->add (new CFPlus::UI::Button
525 text => "Close container", 1168 text => "Close container",
526 tooltip => "Close the currently open container (if one is open)", 1169 tooltip => "Close the currently open container (if one is open)",
527 on_activate => sub { 1170 on_activate => sub {
528 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1171 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
529 if $tag != 0; 1172 if $tag != 0;
530 #if $CONN->{open_container} != 0; 1173 0
531 }, 1174 },
532 ); 1175 );
533 } 1176 }
534 1177
535 $::INVR->set_items ($conn->{container}{$tag}); 1178 $::INVR->set_items ($conn->{container}{$tag});
536} 1179}
537 1180
538sub update_container { 1181sub update_containers {
539 my ($tag) = @_; 1182 my ($self) = @_;
540 1183
541 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 1184 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1185 my $todo = delete $self->{update_container}
1186 or return;
1187
1188 for my $tag (keys %$todo) {
1189 update_floorbox if $tag == 0 or $tag == $self->{open_container};
1190 if ($tag == 0) {
1191 $::INVR->set_items ($self->{container}{0})
542 if $tag == $::CONN->{open_container}; 1192 if $tag == $self->{open_container};
1193 } elsif ($tag == $self->{player}{tag}) {
1194 $::INV->set_items ($self->{container}{$tag})
1195 } else {
1196 $::INVR->set_items ($self->{container}{$tag})
1197 if $tag == $self->{open_container};
1198 }
1199 }
1200 });
543} 1201}
544 1202
545sub container_add { 1203sub container_add {
546 my ($self, $tag, $items) = @_; 1204 my ($self, $tag, $items) = @_;
547 1205
548 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 1206 $self->{update_container}{$tag}++;
549 1207 $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} 1208}
562 1209
563sub container_clear { 1210sub container_clear {
564 my ($self, $tag) = @_; 1211 my ($self, $tag) = @_;
565 1212
566 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 1213 $self->{update_container}{$tag}++;
567 1214 $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} 1215}
579 1216
580sub item_delete { 1217sub item_delete {
581 my ($self, @items) = @_; 1218 my ($self, @items) = @_;
582 1219
1220 $self->{update_container}{$_->{container}}++
583 for (@items) { 1221 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 } 1222
1223 $self->update_containers;
595} 1224}
596 1225
597sub item_update { 1226sub item_update {
598 my ($self, $item) = @_; 1227 my ($self, $item) = @_;
599 1228
600 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1229 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
601 1230
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; 1231 CFPlus::Item::update_widgets $item;
608 1232
609 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1233 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
610 set_opencont ($::CONN, 0, "Floor"); 1234 set_opencont ($::CONN, 0, "Floor");
611 1235
612 } elsif ($item->{flags} & F_OPEN) { 1236 } elsif ($item->{flags} & F_OPEN) {
613 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1237 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
1238
614 } else { 1239 } else {
615 if ($item->{container} == 0) { 1240 $self->{update_container}{$item->{container}}++;
616 update_floorbox;
617 update_container (0); 1241 $self->update_containers;
618 } elsif ($item->{container} == $self->{player}{tag}) {
619 $::INV->set_items ($self->{container}{$item->{container}})
620 }
621 } 1242 }
622} 1243}
623 1244
624sub player_update { 1245sub player_update {
625 my ($self, $player) = @_; 1246 my ($self, $player) = @_;
626 1247
1248 $self->update_weight;
1249}
1250
1251sub update_weight {
1252 my ($self) = @_;
1253
1254 my $weight = .001 * $self->{player}{weight};
1255 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1256
627 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 1257 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1258 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
1259 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1260}
628 1261
629 # do it here because it is ignored earlier, and there is no "login" event 1262sub update_server_info {
1263 my ($self) = @_;
1264
1265 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
1266
1267 $::SERVER_INFO->set_markup (
1268 "server <tt>$self->{host}:$self->{port}</tt>\n"
1269 . "protocol version <tt>$self->{version}</tt>\n"
1270 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
1271 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1272 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1273 . "editing support $yesno[!!$self->{editor_support}]\n"
1274 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1275 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1276 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1277 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1278 . "map size $self->{mapw}×$self->{maph}\n"
1279 );
1280
1281}
1282
1283sub logged_in {
1284 my ($self) = @_;
1285
1286 $self->send_ext_req (cfplus_support => version => 2, sub {
1287 my (%msg) = @_;
1288
1289 $self->{cfplus_ext} = $msg{version};
1290 $self->update_server_info;
1291
1292 if ($self->{cfplus_ext} >= 2) {
1293 $self->send_ext_req ("editor_support", sub {
1294 $self->{editor_support} = { @_ };
1295 $self->update_server_info;
1296
1297 0
1298 });
1299 }
1300
1301 0
1302 });
1303
1304 $self->update_server_info;
1305
630 $self->send_command ("output-sync $::CFG->{output_sync}"); 1306 $self->send_command ("output-sync $::CFG->{output_sync}");
631 $self->send_command ("output-count $::CFG->{output_count}"); 1307 $self->send_command ("output-count $::CFG->{output_count}");
1308 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
632 $self->send_command ("pickup $::CFG->{pickup}") 1309 $self->send_command ("pickup $::CFG->{pickup}");
633} 1310}
634 1311
6351; 1312sub lookat {
1313 my ($self, $x, $y) = @_;
1314
1315 if ($self->{cfplus_ext}) {
1316 $self->send_ext_req (lookat => $x, $y, sub {
1317 my (%msg) = @_;
1318
1319 if (exists $msg{npc_dialog}) {
1320 # start npc chat dialog
1321 $self->{npc_dialog} = new CFPlus::NPCDialog::
1322 token => $msg{npc_dialog},
1323 title => "$msg{npc_dialog}[0] (NPC)",
1324 conn => $self,
1325 ;
1326 }
1327 });
1328 }
1329
1330 $self->send ("lookat $x $y");
1331}
1332
1333sub destroy {
1334 my ($self) = @_;
1335
1336 (delete $self->{npc_dialog})->destroy
1337 if $self->{npc_dialog};
1338
1339 $self->SUPER::destroy;
1340
1341 %$self = ();
1342}
1343
1344package CFPlus::NPCDialog;
1345
1346our @ISA = 'CFPlus::UI::Toplevel';
1347
1348sub new {
1349 my $class = shift;
1350
1351 my $self = $class->SUPER::new (
1352 x => 'center',
1353 y => 'center',
1354 name => "npc_dialog",
1355 force_w => $::WIDTH * 0.7,
1356 force_h => $::HEIGHT * 0.7,
1357 title => "NPC Dialog",
1358 kw => { hi => 0, yes => 0, no => 0 },
1359 has_close_button => 1,
1360 @_,
1361 );
1362
1363 CFPlus::weaken (my $this = $self);
1364
1365 $self->connect (delete => sub { $this->destroy; 1 });
1366
1367 # better use a pane...
1368 $self->add (my $hbox = new CFPlus::UI::HBox);
1369 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
1370
1371 $hbox->add (my $vbox = new CFPlus::UI::VBox);
1372
1373 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
1374 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
1375 tooltip => "#npc_message_entry",
1376 on_activate => sub {
1377 my ($entry, $text) = @_;
1378
1379 return unless $text =~ /\S/;
1380
1381 $entry->set_text ("");
1382 $this->send ($text);
1383
1384 0
1385 },
1386 );
1387
1388 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
1389
1390 $self->{bye_button} = new CFPlus::UI::Button
1391 text => "Bye (close)",
1392 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1393 on_activate => sub { $this->destroy; 1 },
1394 ;
1395
1396 $self->update_options;
1397
1398 $self->{id} = "npc-channel-" . $self->{conn}->token;
1399 $self->{conn}->connect_ext ($self->{id} => sub {
1400 $this->feed (@_) if $this;
1401 });
1402
1403 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1404
1405 $self->{entry}->grab_focus;
1406
1407 $self->{textview}->add_paragraph ({
1408 fg => [1, 1, 0, 1],
1409 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1410 });
1411
1412 $self->show;
1413 $self
1414};
1415
1416sub update_options {
1417 my ($self) = @_;
1418
1419 CFPlus::weaken $self;
1420
1421 $self->{options}->clear;
1422 $self->{options}->add ($self->{bye_button});
1423
1424 for my $kw (sort keys %{ $self->{kw} }) {
1425 $self->{options}->add (new CFPlus::UI::Button
1426 text => $kw,
1427 on_activate => sub {
1428 $self->send ($kw);
1429 0
1430 },
1431 );
1432 }
1433}
1434
1435sub feed {
1436 my ($self, $type, @arg) = @_;
1437
1438 CFPlus::weaken $self;
1439
1440 if ($type eq "update") {
1441 my (%info) = @arg;
1442
1443 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1444 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1445
1446 if (exists $info{msg}) {
1447 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1448 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1449 my @link;
1450 $text =~ s{
1451 ($match)
1452 }{
1453 my $kw = $1;
1454
1455 push @link, new CFPlus::UI::Label
1456 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1457 can_hover => 1,
1458 can_events => 1,
1459 padding_x => 0,
1460 padding_y => 0,
1461 on_button_up => sub {
1462 $self->send ($kw);
1463 };
1464
1465 "\x{fffc}"
1466 }giex;
1467
1468 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1469 $self->{textview}->scroll_to_bottom;
1470 }
1471
1472 $self->update_options;
1473 } else {
1474 $self->destroy;
1475 }
1476
1477 1
1478}
1479
1480sub send {
1481 my ($self, $msg) = @_;
1482
1483 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1484 $self->{textview}->scroll_to_bottom;
1485
1486 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1487}
1488
1489sub destroy {
1490 my ($self) = @_;
1491
1492 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1493
1494 if ($self->{conn}) {
1495 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1496 delete $self->{conn}{npc_dialog};
1497 $self->{conn}->disconnect_ext ($self->{id});
1498 }
1499
1500 $self->SUPER::destroy;
1501}
1502
15031
1504

Diff Legend

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