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.184 by root, Thu Dec 27 18:35:56 2007 UTC

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

Diff Legend

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