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.182 by root, Wed Dec 26 20:46:39 2007 UTC vs.
Revision 1.224 by root, Wed Nov 7 00:25:46 2012 UTC

1package dc::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use common::sense;
4use strict; 4
5use Guard ();
5 6
6use Deliantra::Protocol::Constants; 7use Deliantra::Protocol::Constants;
7 8
8use dc; 9use DC;
9use dc::DB; 10use DC::DB;
10use dc::UI; 11use DC::UI;
11use dc::Pod; 12use DC::Pod;
12use dc::Macro; 13use DC::Macro;
13use dc::Item; 14use DC::Item;
14 15
15use base 'Deliantra::Protocol::Base'; 16use base 'Deliantra::Protocol::Base';
17
18our $TEX_DIALOGUE = new_from_resource DC::Texture
19 "dialogue.png", minify => 1, mipmap => 1;
20
21our $TEX_NOFACE = new_from_resource DC::Texture
22 "noface.png", minify => 1, mipmap => 1, wrap => 1;
23
24sub MIN_TEXTURE_UNUSED() { 1 }#d#
16 25
17sub new { 26sub new {
18 my ($class, %arg) = @_; 27 my ($class, %arg) = @_;
19 28
20 my $self = $class->SUPER::new (%arg, 29 my $self = $class->SUPER::new (%arg,
21 setup_req => { 30 setup_req => {
22 extmap => 1, 31 extmap => 1,
23 excmd => 1,
24 widget => 1, 32 widget => 2,
25 %{$arg{setup_req} || {}}, 33 %{$arg{setup_req} || {}},
26 }, 34 },
27 ); 35 );
28 36
37 $self->update_fx_want;
38
39 my $exp_guard = $self->addme_guard;
40 my $skl_guard = $self->addme_guard;
41 my $spl_guard = $self->addme_guard;
42 $self->send_exti_req (resource => qw(exp_table skill_info spell_paths), sub {
43 my ($exp, $skl, $spl) = @_;
44
45 $self->register_face_handler ($exp, sub {
46 my ($face) = @_;
47
48 undef $exp_guard;
49 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
50 $_->() for values %{ $self->{on_exp_update} };
51 });
52
53 $self->register_face_handler ($skl, sub {
54 my ($face) = @_;
55
56 undef $skl_guard;
57 my $info = $self->{json_coder}->decode (delete $face->{data});
58 $self->{skill_info} = { map { CS_STAT_SKILLINFO + $_ => $info->[$_][0] } 0 .. $#$info };
59 });
60
61 $self->register_face_handler ($spl, sub {
62 my ($face) = @_;
63
64 undef $spl_guard;
65 my $info = $self->{json_coder}->decode (delete $face->{data});
66 $self->{spell_paths} = { map { (1 << $_) => $info->[$_][0] } 0 .. $#$info };
67 });
68
69 ()
70 });
71
29 $self->{map_widget}->clr_commands; 72 $self->{map_widget}->clr_commands;
30 73
31 my @cmd_help = map { 74 my @cmd_help = map {
32 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 75 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
33 or die "unparseable command help: $_->{kw}[0]"; 76 or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
34 77
35 my $cmd = $1; 78 my $cmd = $1;
36 my @args = split /\|/, $2; 79 my @args = split /\|/, $2;
37 @args = (".*") unless @args; 80 @args = (".*") unless @args;
38 81
39 my (undef, @par) = dc::Pod::section_of $_; 82 my (undef, @par) = DC::Pod::section_of $_;
40 my $text = dc::Pod::as_label @par; 83 my $text = DC::Pod::as_label @par;
41 84
42 $_ = $_ eq ".*" ? "" : " $_" 85 $_ = $_ eq ".*" ? "" : " $_"
43 for @args; 86 for @args;
44 87
45 map ["$cmd$_", $text], 88 map ["$cmd$_", $text],
46 sort { (length $a) <=> (length $b) } 89 sort { (length $a) <=> (length $b) }
47 @args 90 @args
48 } sort { $a->{par} <=> $b->{par} } 91 } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
49 dc::Pod::find command => "*"; 92 DC::Pod::find command => "*";
50 93
51 $self->{json_coder} 94 $self->{json_coder}
52 ->convert_blessed 95 ->convert_blessed
53 ->filter_json_single_key_object ("\fw" => sub { 96 ->filter_json_single_key_object ("\fw" => sub {
54 $self->{widget}{$_[0]} 97 $self->{widget}{$_[0]}
64 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 107 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
65 for my $ws (values %{delete $self->{widgetset} || {}}) { 108 for my $ws (values %{delete $self->{widgetset} || {}}) {
66 $_->destroy 109 $_->destroy
67 for values %{delete $ws->{w} || {}}; 110 for values %{delete $ws->{w} || {}};
68 } 111 }
112
113 delete $self->{items};
114 $::INV->clear;
115 $::INVR->clear;
116 $::INVR_HB->clear;
117 $::FLOORBOX->clear;
69 }); 118 });
70 119
71 $self->{map_widget}->add_command (@$_) 120 $self->{map_widget}->add_command (@$_)
72 for @cmd_help; 121 for @cmd_help;
73 122
74 { 123 {
75 $self->{dialogue} = my $tex = new_from_file dc::Texture 124 $self->{dialogue} = my $tex = $TEX_DIALOGUE;
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}}); 125 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
78 } 126 }
79 127
80 { 128 {
81 $self->{noface} = my $tex = new_from_file dc::Texture 129 $self->{noface} = my $tex = $TEX_NOFACE;
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}}); 130 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
84 } 131 }
132
133# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
134# $self->{expire_w} = AE::timer 1, 1, sub {
135# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
136#
137# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) {
138# warn DC::SvREFCNT $self->{texture}[$_];
139# $self->{texture}[$_]->unload;
140# warn "expire texture $_\n";#d#
141# }
142#
143# ($self->{expire_count} += $count) < @{ $self->{texture} }
144# or $self->{expire_count} = DC::DB::FIRST_TILE_ID;
145# warn "count is $count\n";#d#
146# };
85 147
86 $self->{open_container} = 0; 148 $self->{open_container} = 0;
87 149
88 # per server 150 # per server
89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 151 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
102} 164}
103 165
104sub ext_capabilities { 166sub ext_capabilities {
105 my ($self, %cap) = @_; 167 my ($self, %cap) = @_;
106 168
107 #$self->send ("setup sound 0"); # we use a different protocol
108 $self->update_fx_want;
109
110 $self->send_exti_req (resource => "exp_table", sub {
111 my ($exp_table) = @_;
112
113 $self->register_face_handler ($exp_table, sub {
114 my ($face) = @_;
115
116 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
117 $_->() for values %{ $self->{on_exp_update} || {} };
118 });
119
120 ()
121 });
122
123 if (my $ts = $cap{tileset}) { 169 if (my $ts = $cap{tileset}) {
124 if (my ($default) = grep $_->[2] & 1, @$ts) { 170 if (my ($default) = grep $_->[2] & 1, @$ts) {
125 $self->{tileset} = $default; 171 $self->{tileset} = $default;
126 $self->{tilesize} = $default->[3]; 172 $self->{tilesize} = $default->[3];
127 $self->setup_req (tileset => $default->[0]); 173 $self->setup_req (tileset => $default->[0]);
142############################################################################# 188#############################################################################
143 189
144sub widget_associate { 190sub widget_associate {
145 my ($self, $ws, $id, $widget) = @_; 191 my ($self, $ws, $id, $widget) = @_;
146 192
147 $widget ||= new dc::UI::Bin; 193 $widget ||= new DC::UI::Bin;
148 194
149 $widget->{s_id} = $id; 195 $widget->{s_id} = $id;
150 $self->{widget}{$id} = $widget; 196 $self->{widget}{$id} = $widget;
151 197
152 if ($ws) { 198 if ($ws) {
188 my ($self, $ws, $id, $class, $args) = @_; 234 my ($self, $ws, $id, $class, $args) = @_;
189 235
190 $self->widget_associate ( 236 $self->widget_associate (
191 $ws, $id => scalar eval { 237 $ws, $id => scalar eval {
192 local $SIG{__DIE__}; 238 local $SIG{__DIE__};
193 "dc::UI::$class"->new (%$args) 239 "DC::UI::$class"->new (%$args)
194 } 240 }
195 ); 241 );
242}
243
244# widgetset create template
245sub ext_ws_ct {
246 my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
247
248 $done_cb ||= sub { };
249
250 my $parse_list; $parse_list = sub {
251 my ($list) = @_;
252 my @w;
253
254 while (@$list) {
255 my ($class, $args) = splice @$list, 0, 2;
256 my $name = delete $args->{s_id};
257 my $cl = delete $args->{s_cl};
258 my $cfg = delete $cfg->{$name};
259 my $id = delete $cfg->{id};
260 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
261 or next;
262
263 $self->widget_associate ($ws, $id, $w)
264 if $id;
265
266 $w->add ($parse_list->($cl))
267 if $cl;
268
269 push @w, $w;
270 }
271
272 @w
273 };
274
275 # either array reference, or face #
276 if ($type eq "inline") {
277 $done_cb->();
278 $parse_list->($template);
279 } elsif ($type eq "face") {
280 my $handler; $handler = $self->register_face_handler ($template, sub {
281 my ($face) = @_;
282
283 undef $handler;
284 $done_cb->();
285 $parse_list->($self->{json_coder}->decode ($face->{data}));
286 });
287 } else {
288 $done_cb->(0);
289 }
196} 290}
197 291
198# widgetset associate 292# widgetset associate
199sub ext_ws_a { 293sub ext_ws_a {
200 my ($self, %ass) = @_; 294 my ($self, %ass) = @_;
201 295
202 # everything that has a name, wether conceivably useful or not 296 # everything that has a name, wether conceivably useful or not
203 my %wkw = ( 297 my %wkw = (
204 root => $dc::UI::ROOT, 298 root => $DC::UI::ROOT,
205 tooltip => $dc::UI::TOOLTIP, 299 tooltip => $DC::UI::TOOLTIP,
206 300
207 mapwidget => $::MAPWIDGET, 301 mapwidget => $::MAPWIDGET,
302 menubar => $::MENUBAR,
303 menupopup => $::MENUPOPUP,
304 pickup_enable => $::PICKUP_ENABLE,
208 buttonbar => $::BUTTONBAR, 305 buttonbar => $::BUTTONBAR,
209 metaserver => $::METASERVER, 306 metaserver => $::METASERVER,
210 buttonbar => $::BUTTONBAR, 307 buttonbar => $::BUTTONBAR,
211 login_button => $::LOGIN_BUTTON, 308 login_button => $::LOGIN_BUTTON,
212 quit_dialog => $::QUIT_DIALOG, 309 quit_dialog => $::QUIT_DIALOG,
228 spell_list => $::SPELL_LIST, 325 spell_list => $::SPELL_LIST,
229 326
230 floorbox => $::FLOORBOX, 327 floorbox => $::FLOORBOX,
231 help_window => $::HELP_WINDOW, 328 help_window => $::HELP_WINDOW,
232 message_window => $::MESSAGE_WINDOW, 329 message_window => $::MESSAGE_WINDOW,
330 message_dist => $::MESSAGE_DIST,
233 statusbox => $::SDTATUSBOX, 331 statusbox => $::STATUSBOX,
234 332
235 inv => $::INV, 333 inv => $::INV,
236 invr => $::INVR, 334 invr => $::INVR,
237 invr_hb => $::INVR_HB, 335 invr_hb => $::INVR_HB,
238 ); 336 );
286 384
287# message window 385# message window
288sub ext_channel_info { 386sub ext_channel_info {
289 my ($self, $info) = @_; 387 my ($self, $info) = @_;
290 $self->{channels}->{$info->{id}} = $info; 388 $self->{channels}->{$info->{id}} = $info;
291 $::MESSAGE_WINDOW->add_channel ($info); 389 $::MESSAGE_DIST->add_channel ($info);
292} 390}
293 391
294############################################################################# 392#############################################################################
295 393
296sub logprint { 394sub logprint {
297 my ($self, @a) = @_; 395 my ($self, @a) = @_;
298 396
299 dc::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 397 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
300} 398}
301 399
302sub _stat_numdiff { 400sub _stat_numdiff {
303 my ($self, $name, $old, $new) = @_; 401 my ($self, $name, $old, $new) = @_;
304 402
322 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 420 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
323 : () 421 : ()
324 } 422 }
325 sort { $a <=> $b } keys %{$self->{spell_paths}}; 423 sort { $a <=> $b } keys %{$self->{spell_paths}};
326 424
327 join "", @diff 425 "\u$name: " . (join ", ", @diff)
328} 426}
329 427
330# all stats that are chacked against changes 428# all stats that are chacked against changes
331my @statchange = ( 429my @statchange = (
332 [&CS_STAT_STR => \&_stat_numdiff, "Str"], 430 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
375 473
376 if (my @diffs = 474 if (my @diffs =
377 ( 475 (
378 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()), 476 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
379 map { 477 map {
380 $stats->{$_} && $prev->{$_} 478 $stats->{$_} && $prev->{$_}
381 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : () 479 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
382 } sort { $a <=> $b } keys %{$self->{skill_info}} 480 } sort { $a <=> $b } keys %{$self->{skill_info}}
383 ) 481 )
384 ) { 482 ) {
385 my $msg = join " ", @diffs; 483 my $msg = join " ", @diffs;
387 } 485 }
388 486
389 if ( 487 if (
390 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 488 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
391 ) { 489 ) {
392 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 490 my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs);
393 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20); 491 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
394 } 492 }
395 493
396 $self->update_stats_window ($stats, $prev); 494 $self->update_stats_window ($stats, $prev);
397 495
435 533
436 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 534 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
437 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 535 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
438 $::GAUGES->{food} ->set_value ($fo, $fo_m); 536 $::GAUGES->{food} ->set_value ($fo, $fo_m);
439 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 537 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
440 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 538 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
441 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 539 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
442 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); 540 $::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
443 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 541 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
444 my $title = $stats->{+CS_STAT_TITLE}; 542 my $title = $stats->{+CS_STAT_TITLE};
445 $title =~ s/^Player: //; 543 $title =~ s/^Player: //;
446 $::STATWIDS->{title} ->set_text ("Title: " . $title); 544 $::STATWIDS->{title} ->set_text ("Title: " . $title);
447 545
459 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 557 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
460 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 558 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
461 559
462 $self->update_weight; 560 $self->update_weight;
463 561
464 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 562 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%%", $stats->{$RES_TBL{$_}})
465 for keys %RES_TBL; 563 for keys %RES_TBL;
466 564
467 my $sktbl = $::STATWIDS->{skill_tbl}; 565 my $sktbl = $::STATWIDS->{skill_tbl};
468 my @skills = keys %{ $self->{skill_info} }; 566 my @skills = keys %{ $self->{skill_info} };
469 567
476 $self->{stat_order} = join ",", map $_->[0], @order; 574 $self->{stat_order} = join ",", map $_->[0], @order;
477 575
478 $sktbl->clear; 576 $sktbl->clear;
479 577
480 my $sw = $self->{skillwid}{""} ||= [ 578 my $sw = $self->{skillwid}{""} ||= [
481 0, 0, (new dc::UI::Label text => "Experience", align => 1), 579 0, 0, (new DC::UI::Label text => "Experience", align => 1),
482 1, 0, (new dc::UI::Label text => "Lvl.", align => 1), 580 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
483 2, 0, (new dc::UI::Label text => "Progress", align => 0), 581 2, 0, (new DC::UI::Label text => "Progress"),
484 3, 0, (new dc::UI::Label text => "Skill", expand => 1), 582 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
485 4, 0, (new dc::UI::Label text => "Experience", align => 1), 583 4, 0, (new DC::UI::Label text => "Experience", align => 1),
486 5, 0, (new dc::UI::Label text => "Lvl.", align => 1), 584 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
487 6, 0, (new dc::UI::Label text => "Progress", align => 0), 585 6, 0, (new DC::UI::Label text => "Progress"),
488 7, 0, (new dc::UI::Label text => "Skill", expand => 1), 586 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
489 ]; 587 ];
490 588
491 my @add = @$sw; 589 my @add = @$sw;
492 590
493 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 591 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>";
494 592
495 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 593 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
496 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 594 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
497 595
498 my ($x, $y) = (0, 1); 596 my ($x, $y) = (0, 1);
505 if ($ev->{button} == 1) { 603 if ($ev->{button} == 1) {
506 $::CONN->user_send ("ready_skill $name"); 604 $::CONN->user_send ("ready_skill $name");
507 } elsif ($ev->{button} == 2) { 605 } elsif ($ev->{button} == 2) {
508 $::CONN->user_send ("use_skill $name"); 606 $::CONN->user_send ("use_skill $name");
509 } elsif ($ev->{button} == 3) { 607 } elsif ($ev->{button} == 3) {
510 my $shortname = dc::shorten $name, 14; 608 my $shortname = DC::shorten $name, 14;
511 (new dc::UI::Menu 609 (new DC::UI::Menu
512 items => [ 610 items => [
513 ["bind <i>ready_skill $shortname</i> to a key" => sub { dc::Macro::quick_macro ["ready_skill $name"] }], 611 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
514 ["bind <i>use_skill $shortname</i> to a key" => sub { dc::Macro::quick_macro ["use_skill $name"] }], 612 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
515 ], 613 ],
516 )->popup ($ev); 614 )->popup ($ev);
517 } else { 615 } else {
518 return 0; 616 return 0;
519 } 617 }
521 1 619 1
522 }; 620 };
523 621
524 my $sw = $self->{skillwid}{$idx} ||= [ 622 my $sw = $self->{skillwid}{$idx} ||= [
525 # exp 623 # exp
526 (new dc::UI::Label 624 (new DC::UI::Label
527 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 625 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
528 626
529 # level 627 # level
530 (new dc::UI::Label 628 (new DC::UI::Label
531 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 629 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
532 630
533 # progress 631 # progress
534 (new dc::UI::ExperienceProgress), 632 (new DC::UI::ExperienceProgress),
535 633
536 # label 634 # label
537 (new dc::UI::Label text => $name, on_button_down => $spell_cb, 635 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
538 can_events => 1, can_hover => 1, tooltip => (dc::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), 636 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
539 ]; 637 ];
540 638
541 push @add, 639 push @add,
542 $x * 4 + 0, $y, $sw->[0], 640 $x * 4 + 0, $y, $sw->[0],
543 $x * 4 + 1, $y, $sw->[1], 641 $x * 4 + 1, $y, $sw->[1],
560 my $sw = $self->{skillwid}{$idx}; 658 my $sw = $self->{skillwid}{$idx};
561 $sw->[0]->set_text (::formsep ($val->[1])); 659 $sw->[0]->set_text (::formsep ($val->[1]));
562 $sw->[1]->set_text ($val->[0] * 1); 660 $sw->[1]->set_text ($val->[0] * 1);
563 $sw->[2]->set_value (@$val); 661 $sw->[2]->set_value (@$val);
564 662
565 $::GAUGES->{sklprg}->set_label ("$name %d%%"); 663 $::GAUGES->{skillexp}->set_label ("$name %d%%");
566 $::GAUGES->{sklprg}->set_value (@$val); 664 $::GAUGES->{skillexp}->set_value (@$val);
567 } 665 }
568} 666}
569 667
570sub user_send { 668sub user_send {
571 my ($self, $command) = @_; 669 my ($self, $command) = @_;
584} 682}
585 683
586sub map_scroll { 684sub map_scroll {
587 my ($self, $dx, $dy) = @_; 685 my ($self, $dx, $dy) = @_;
588 686
589 $self->{map}->scroll ($dx, $dy); 687 $self->{map_widget}->scroll ($dx, $dy);
590} 688}
591 689
592sub feed_map1a { 690sub feed_map1a {
593 my ($self, $data) = @_; 691 my ($self, $data) = @_;
594 692
595 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 693 my $missing = $self->{map}->map1a_update ($data);
596 my $delay; 694 my $delay;
597 695
598 for my $tile (@$missing) { 696 for my $tile (@$missing) {
599 next if $self->{delay}{$tile}; 697 next if $self->{delay}{$tile};
600 698
601 $delay = 1; 699 $delay = 1;
602 700
603 if (my $tex = $::CONN->{texture}[$tile]) { 701 if (my $tex = $self->{texture}[$tile]) {
604 $tex->upload; 702 $tex->upload;
605 } else { 703 } else {
606 $self->{delay}{$tile} = 1; 704 $self->{delay}{$tile} = 1;
607 705
608 # we assume the face is in-flight and will eventually come 706 # we assume the face is in-flight and will eventually arrive
609 push @{$self->{tile_cb}{$tile}}, sub { 707 push @{$self->{tile_cb}{$tile}}, sub {
610 delete $self->{delay}{$tile}; 708 delete $self->{delay}{$tile};
611 $_[0]->upload; 709 $_[0]->upload;
612 }; 710 };
613 } 711 }
614 } 712 }
615 713
616 if ($delay) { 714 if ($delay) {
617 # delay the map drawing a tiny bit in the hope of getting the missing fetched 715 # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
618 EV::once undef, 0, 0.03, sub { 716 EV::once undef, 0, 0.03, sub {
619 $self->{map_widget}->update 717 $self->{map_widget}->update
620 if $self->{map_widget}; 718 if $self->{map_widget};
621 }; 719 };
622 } else { 720 } else {
631} 729}
632 730
633sub flush_map { 731sub flush_map {
634 my ($self) = @_; 732 my ($self) = @_;
635 733
636 my $map_info = delete $self->{map_info} 734 return unless $self->{map_info};
637 or return;
638 735
736 for my $map_info (values %{ $self->{map_cache} || {} }) {
639 my ($hash, $x, $y, $w, $h) = @$map_info; 737 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
640 738
641 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 739 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
642 $self->{map_cache_new}{$hash} = \$data; 740
741 if ($data ne $$rdata) {
742 $map_info->[1] = \$data;
743 my $cdata = Compress::LZF::compress $data;
643 dc::DB::put $self->{mapcache} => $hash => $data, sub { }; 744 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
745 }
746 }
644} 747}
645 748
646sub map_clear { 749sub map_clear {
647 my ($self) = @_; 750 my ($self) = @_;
648 751
649 $self->flush_map; 752 $self->flush_map;
753 delete $self->{map_info};
650 delete $self->{neigh_map}; 754 delete $self->{neigh_map};
651 755
652 $self->{map}->clear; 756 $self->{map}->clear;
653 delete $self->{map_widget}{magicmap}; 757 delete $self->{map_widget}{magicmap};
654} 758}
661 do { 765 do {
662 $tile = pop @{$self->{bg_fetch}} 766 $tile = pop @{$self->{bg_fetch}}
663 or return; 767 or return;
664 } while $self->{texture}[$tile]; 768 } while $self->{texture}[$tile];
665 769
666 dc::DB::get tilecache => $tile, sub { 770 DC::DB::get tilecache => $tile, sub {
667 my ($data) = @_; 771 my ($data) = @_;
668 772
669 return unless $self->{map}; # stop when destroyed 773 return unless $self->{map}; # stop when destroyed
670 774
671 if (defined $data) { 775 if (defined $data) {
675 779
676 $self->bg_fetch; 780 $self->bg_fetch;
677 }; 781 };
678} 782}
679 783
680sub load_map($$$) { 784sub load_map($$$$$$) {
681 my ($self, $hash, $x, $y) = @_; 785 my ($self, $hash, $x, $y, $w, $h) = @_;
682 786
683 my $gen = $self->{map_change_gen}; 787 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
684 788
685 my $cb = sub { 789 my $cb = sub {
686 return unless $gen == $self->{map_change_gen}; 790 $map_info->[1] = \$_[0];
687 791
688 my ($data) = @_;
689
690 if (defined $data) {
691 $self->{map_cache_new}{$hash} = \$data;
692
693 my $data = Compress::LZF::decompress $data;
694
695 my $inprogress = @{ $self->{bg_fetch} || [] }; 792 my $inprogress = @{ $self->{bg_fetch} || [] };
696 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 793 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
697 $self->bg_fetch unless $inprogress; 794 $self->bg_fetch unless $inprogress;
698 }
699 }; 795 };
700 796
701 if (my $rdata = $self->{map_cache_old}{$hash}) { 797 if (my $map_info = $self->{map_cache_old}{$hash}) {
702 $cb->($$rdata); 798 $cb->(${ $map_info->[1] });
703 } else { 799 } else {
800 my $gen = $self->{map_change_gen};
801
704 dc::DB::get $self->{mapcache} => $hash, $cb; 802 DC::DB::get $self->{mapcache} => $hash, sub {
803 return unless $gen == $self->{map_change_gen};
804 return unless defined $_[0];
805 $cb->(Compress::LZF::decompress $_[0]);
806 };
705 } 807 }
706} 808}
707 809
708# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 810# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
709# (server resource,s latency, bandwidth), so this hack is warranted. 811# (server resources, latency, bandwidth), so this hack is warranted.
710# the right fix is to make real tiled maps with an overview file 812# the right fix is to make real tiled maps with an overview file
711sub send_mapinfo { 813sub send_mapinfo {
712 my ($self, $data, $cb) = @_; 814 my ($self, $data, $cb) = @_;
713 815
714 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { 816 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
739} 841}
740 842
741# this method does a "flood fill" into every tile direction 843# this method does a "flood fill" into every tile direction
742# it assumes that tiles are arranged in a rectangular grid, 844# it assumes that tiles are arranged in a rectangular grid,
743# i.e. a map is the same as the left of the right map etc. 845# i.e. a map is the same as the left of the right map etc.
744# failure to comply are harmless and result in display errors 846# failure to comply is harmless and results in display errors
745# at worst. 847# at worst.
746sub flood_fill { 848sub flood_fill {
747 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 849 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
748 850
749 # the server does not allow map paths > 6 851 # the server does not allow map paths > 6
785 return if $mode ne "spatial"; 887 return if $mode ne "spatial";
786 888
787 $x += $self->{map}->ox; 889 $x += $self->{map}->ox;
788 $y += $self->{map}->oy; 890 $y += $self->{map}->oy;
789 891
790 $self->load_map ($hash, $x, $y) 892 $self->load_map ($hash, $x, $y, $w, $h)
791 unless $self->{neigh_map}{$hash}[5]++;#d# 893 unless $self->{neigh_map}{$hash}[5]++;#d#
792 894
793 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 895 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
794 896
795 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 897 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
803 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 905 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
804 906
805 $self->flush_map; 907 $self->flush_map;
806 908
807 ++$self->{map_change_gen}; 909 ++$self->{map_change_gen};
808 $self->{map_cache_old} = delete $self->{map_cache_new}; 910 $self->{map_cache_old} = delete $self->{map_cache};
809 911
810 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 912 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
811 913
812 my $mapmapw = $self->{mapmap}->{w}; 914 my $mapmapw = $self->{mapmap}->{w};
813 my $mapmaph = $self->{mapmap}->{h}; 915 my $mapmaph = $self->{mapmap}->{h};
825 $self->{map_info} = [$hash, $x, $y, $w, $h]; 927 $self->{map_info} = [$hash, $x, $y, $w, $h];
826 928
827 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 929 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
828 $::STATWIDS->{map}->set_text ("Map: " . $map); 930 $::STATWIDS->{map}->set_text ("Map: " . $map);
829 931
830 $self->load_map ($hash, $x, $y); 932 $self->load_map ($hash, $x, $y, $w, $h);
831 $self->flood_fill (0, 0, 0, "", $hash, $flags); 933 $self->flood_fill (0, 0, 0, "", $hash, $flags);
832} 934}
833 935
834sub face_find { 936sub face_find {
835 my ($self, $facenum, $face, $cb) = @_; 937 my ($self, $facenum, $face, $cb) = @_;
836 938
837 if ($face->{type} == 0) { # FT_FACE 939 if ($face->{type} == 0) { # FT_FACE
838 my $id = dc::DB::get_tile_id_sync $face->{name}; 940 my $id = DC::DB::get_tile_id_sync $face->{name};
839 941
840 $face->{id} = $id; 942 $face->{id} = $id;
841 $self->{map}->set_tileid ($facenum => $id); 943 $self->{map}->set_tileid ($facenum => $id);
842 944
843 dc::DB::get tilecache => $id, $cb; 945 DC::DB::get tilecache => $id, $cb;
844 946
845 } elsif ($face->{type} & 1) { # with metadata 947 } elsif ($face->{type} & 1) { # with metadata
846 dc::DB::get res_meta => $face->{name}, $cb; 948 DC::DB::get res_meta => $face->{name}, $cb;
847 949
848 } else { # no metadata 950 } else { # no metadata
849 dc::DB::get res_data => $face->{name}, $cb; 951 DC::DB::get res_data => $face->{name}, $cb;
850 } 952 }
851} 953}
852 954
853sub face_update { 955sub face_update {
854 my ($self, $facenum, $face, $changed) = @_; 956 my ($self, $facenum, $face, $changed) = @_;
855 957
856 if ($face->{type} == 0) { 958 if ($face->{type} == 0) {
857 # image, FT_FACE 959 # image, FT_FACE
858 dc::DB::put tilecache => $face->{id} => $face->{data}, sub { } 960 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
859 if $changed; 961 if $changed;
860 962
861 $self->have_tile ($face->{id}, delete $face->{data}); 963 $self->have_tile ($face->{id}, delete $face->{data});
862 964
863 } elsif ($face->{type} & 1) { 965 } elsif ($face->{type} & 1) {
865 if ($changed) { # new data 967 if ($changed) { # new data
866 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 968 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
867 $face->{data} = $meta; 969 $face->{data} = $meta;
868 970
869 # rely on strict ordering here and also on later fetch 971 # rely on strict ordering here and also on later fetch
870 dc::DB::put res_data => $face->{name} => $data, sub { }; 972 DC::DB::put res_data => $face->{name} => $data, sub { };
871 dc::DB::put res_meta => $face->{name} => $meta, sub { }; 973 DC::DB::put res_meta => $face->{name} => $meta, sub { };
872 } 974 }
873 975
874 $face->{data} = $self->{json_coder}->decode ($face->{data}); 976 $face->{data} = $self->{json_coder}->decode ($face->{data});
875 ::add_license ($face); 977 ::add_license ($face);
876 ::message ({ markup => dc::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) 978 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
877 if $changed; 979 if $changed;
878 980
879 if ($face->{type} == 3) { # FT_MUSIC 981 if ($face->{type} == 3) { # FT_MUSIC
880 &::audio_music_push ($facenum); 982 &::audio_music_push ($facenum);
881 } elsif ($face->{type} == 5) { # FT_SOUND 983 } elsif ($face->{type} == 5) { # FT_SOUND
882 &::audio_sound_push ($facenum); 984 &::audio_sound_push ($facenum);
883 } 985 }
884 986
885 } else { 987 } else {
886 # flat resource case, FT_RSRC 988 # flat resource case, FT_RSRC
887 dc::DB::put res_data => $face->{name} => $face->{data}, sub { } 989 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
888 if $changed; 990 if $changed;
889 } 991 }
890 992
891 if (my $cbs = $self->{face_cb}{$facenum}) { 993 if (my $cbs = $self->{face_cb}{$facenum}) {
892 $_->($face, $changed) for @$cbs; 994 $_->($face, $changed) for @$cbs;
903 my ($self, $tile, $data) = @_; 1005 my ($self, $tile, $data) = @_;
904 1006
905 return unless $self->{map}; 1007 return unless $self->{map};
906 1008
907 my $tex = $self->{texture}[$tile] ||= 1009 my $tex = $self->{texture}[$tile] ||=
908 new dc::Texture 1010 new DC::Texture
909 tile => $tile, 1011 tile => $tile,
910 image => $data, delete_image => 1, 1012 image => $data, delete_image => 1,
911 minify => 1, mipmap => 1; 1013 minify => 1;
912 1014
913 if (my $cbs = delete $self->{tile_cb}{$tile}) { 1015 if (my $cbs = delete $self->{tile_cb}{$tile}) {
914 $_->($tex) for @$cbs; 1016 $_->($tex) for @$cbs;
915 } 1017 }
916} 1018}
921 my ($self, $num, $cb) = @_; 1023 my ($self, $num, $cb) = @_;
922 1024
923 push @{$self->{face_cb}{$num}}, $cb; 1025 push @{$self->{face_cb}{$num}}, $cb;
924 1026
925 defined wantarray 1027 defined wantarray
926 ? dc::guard { 1028 ? Guard::guard {
927 @{$self->{face_cb}{$num}} 1029 @{$self->{face_cb}{$num}}
928 = grep $_ != $cb, 1030 = grep $_ != $cb,
929 @{$self->{face_cb}{$num}}; 1031 @{$self->{face_cb}{$num}};
930 } 1032 }
931 : () 1033 : ()
959 my ($self, $flags, $prompt) = @_; 1061 my ($self, $flags, $prompt) = @_;
960 1062
961 $prompt = $LAST_QUERY unless length $prompt; 1063 $prompt = $LAST_QUERY unless length $prompt;
962 $LAST_QUERY = $prompt; 1064 $LAST_QUERY = $prompt;
963 1065
964 $self->{query}-> ($self, $flags, $prompt); 1066 $self->{query}->($self, $flags, $prompt);
965} 1067}
966 1068
967sub sanitise_xml($) { 1069sub sanitise_xml($) {
968 local $_ = shift; 1070 local $_ = shift;
969 1071
977 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1079 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
978 1080
979 # handle some elements 1081 # handle some elements
980 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1082 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
981 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; 1083 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
1084
1085 s/\s+$//;
982 1086
983 $_ 1087 $_
984} 1088}
985 1089
986our %NAME_TO_COLOR = ( 1090our %NAME_TO_COLOR = (
999 tan => 12, 1103 tan => 12,
1000); 1104);
1001 1105
1002our @CF_COLOR = ( 1106our @CF_COLOR = (
1003 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1107 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
1004 [1.00, 1.00, 1.00], 1108 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
1005 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1109 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55],
1006 [1.00, 0.00, 0.00], 1110 [1.00, 0.00, 0.00],
1007 [1.00, 0.54, 0.00], 1111 [1.00, 0.54, 0.00],
1008 [0.11, 0.56, 1.00], 1112 [0.11, 0.56, 1.00],
1009 [0.93, 0.46, 0.00], 1113 [0.93, 0.46, 0.00],
1010 [0.18, 0.54, 0.34], 1114 [0.18, 0.54, 0.34],
1029 $self->logprint ("msg: ", $text); 1133 $self->logprint ("msg: ", $text);
1030 return if $color < 0; # negative color == ignore if not understood 1134 return if $color < 0; # negative color == ignore if not understood
1031 1135
1032 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0]; 1136 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
1033 1137
1034 ## try to create single paragraphs of multiple lines sent by the server
1035 # no longer neecssary with TRT servers
1036 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1037
1038 for (split /\n/, $text) {
1039 ::message ({ 1138 ::message ({
1040 fg => $fg, 1139 fg => $fg,
1041 markup => $_, 1140 markup => $text,
1042 type => $type, 1141 type => $type,
1043 extra => [@extra], 1142 extra => [@extra],
1044 color_flags => $color, #d# ugly, kill 1143 color_flags => $color, #d# ugly, kill
1045 }); 1144 });
1046 1145
1047 $color &= ~NDI_CLEAR; # only clear once for multiline messages 1146# $color &= ~NDI_CLEAR; # only clear once for multiline messages
1048 # actually, this is an ugly design. _we_ should control the channels, 1147# # actually, this is an ugly design. _we_ should control the channels,
1049 # not some random other widget, as the channels are clearly protocol-specific. 1148# # not some random other widget, as the channels are clearly protocol-specific.
1050 # then we could also react to flags such as CLEAR without resorting to 1149# # then we could also react to flags such as CLEAR without resorting to
1051 # hacks such as color_flags, above. 1150# # hacks such as color_flags, above.
1052 }
1053 1151
1054 $self->{statusbox}->add ($text, 1152 $self->{statusbox}->add ($text,
1055 group => $text, 1153 group => $text,
1056 fg => $fg, 1154 fg => $fg,
1057 timeout => $color >= 2 ? 180 : 10, 1155 timeout => $color >= 2 ? 180 : 10,
1068 $spell->{message} =~ s/\n+$//; 1166 $spell->{message} =~ s/\n+$//;
1069 $spell->{message} ||= "Server did not provide a description for this spell."; 1167 $spell->{message} ||= "Server did not provide a description for this spell.";
1070 1168
1071 $::SPELL_LIST->add_spell ($spell); 1169 $::SPELL_LIST->add_spell ($spell);
1072 1170
1073 $self->{map_widget}->add_command ("invoke $spell->{name}", dc::asxml $spell->{message}); 1171 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
1074 $self->{map_widget}->add_command ("cast $spell->{name}", dc::asxml $spell->{message}); 1172 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
1075} 1173}
1076 1174
1077sub spell_delete { 1175sub spell_delete {
1078 my ($self, $spell) = @_; 1176 my ($self, $spell) = @_;
1079 1177
1090sub addme_success { 1188sub addme_success {
1091 my ($self) = @_; 1189 my ($self) = @_;
1092 1190
1093 my %skill_help; 1191 my %skill_help;
1094 1192
1095 for my $node (dc::Pod::find skill_description => "*") { 1193 for my $node (DC::Pod::find skill_description => "*") {
1096 my (undef, @par) = dc::Pod::section_of $node; 1194 my (undef, @par) = DC::Pod::section_of $node;
1097 $skill_help{$node->{kw}[0]} = dc::Pod::as_label @par; 1195 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
1098 }; 1196 };
1099 1197
1100 for my $skill (values %{$self->{skill_info}}) { 1198 for my $skill (values %{$self->{skill_info}}) {
1101 $self->{map_widget}->add_command ("ready_skill $skill", 1199 $self->{map_widget}->add_command ("ready_skill $skill",
1102 (dc::asxml "Ready the skill '$skill'\n\n") 1200 (DC::asxml "Ready the skill '$skill'\n\n")
1103 . $skill_help{$skill}); 1201 . $skill_help{$skill});
1104 $self->{map_widget}->add_command ("use_skill $skill", 1202 $self->{map_widget}->add_command ("use_skill $skill",
1105 (dc::asxml "Immediately use the skill '$skill'\n\n") 1203 (DC::asxml "Immediately use the skill '$skill'\n\n")
1106 . $skill_help{$skill}); 1204 . $skill_help{$skill});
1107 } 1205 }
1108} 1206}
1109 1207
1110sub eof { 1208sub eof {
1114 1212
1115 ::stop_game (); 1213 ::stop_game ();
1116} 1214}
1117 1215
1118sub update_floorbox { 1216sub update_floorbox {
1119 $dc::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1217 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1120 return unless $::CONN; 1218 return unless $::CONN;
1121 1219
1122 $::FLOORBOX->clear; 1220 $::FLOORBOX->clear;
1123 1221
1124 my @add; 1222 my @add;
1125 1223
1126 my $row; 1224 my $row;
1127 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1225 for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1226 next if $_->{tag} & 0x80000000;
1128 if ($row < 6) { 1227 if ($row < 6) {
1129 local $_->{face_widget}; # hack to force recreation of widget 1228 local $_->{face_widget}; # hack to force recreation of widget
1130 local $_->{desc_widget}; # hack to force recreation of widget 1229 local $_->{desc_widget}; # hack to force recreation of widget
1131 dc::Item::update_widgets $_; 1230 DC::Item::update_widgets $_;
1132 1231
1133 push @add, 1232 push @add,
1134 0, $row, $_->{face_widget}, 1233 0, $row, $_->{face_widget},
1135 1, $row, $_->{desc_widget}; 1234 1, $row, $_->{desc_widget};
1136 1235
1137 $row++; 1236 $row++;
1138 } else { 1237 } else {
1139 push @add, 1, $row, new dc::UI::Button 1238 push @add, 1, $row, new DC::UI::Button
1140 text => "More...", 1239 text => "More...",
1141 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1240 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1142 ; 1241 ;
1143 last; 1242 last;
1144 } 1243 }
1145 } 1244 }
1146 if ($::CONN->{open_container}) { 1245 if ($::CONN->{open_container}) {
1147 push @add, 1, $row++, new dc::UI::Button 1246 push @add, 1, $row++, new DC::UI::Button
1148 text => "Close container", 1247 text => "Close container",
1149 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1248 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1150 ; 1249 ;
1151 } 1250 }
1152 1251
1159sub set_opencont { 1258sub set_opencont {
1160 my ($conn, $tag, $name) = @_; 1259 my ($conn, $tag, $name) = @_;
1161 $conn->{open_container} = $tag; 1260 $conn->{open_container} = $tag;
1162 update_floorbox; 1261 update_floorbox;
1163 1262
1164 $::INVR_HB->clear (); 1263 $::INVR_HB->clear;
1165 $::INVR_HB->add (new dc::UI::Label align => 0, expand => 1, text => $name); 1264 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1166 1265
1167 if ($tag != 0) { # Floor isn't closable, is it? 1266 if ($tag != 0) { # Floor isn't closable, is it?
1168 $::INVR_HB->add (new dc::UI::Button 1267 $::INVR_HB->add (new DC::UI::Button
1169 text => "Close container", 1268 text => "Close container",
1170 tooltip => "Close the currently open container (if one is open)", 1269 tooltip => "Close the currently open container (if one is open)",
1171 on_activate => sub { 1270 on_activate => sub {
1172 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1271 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1173 if $tag != 0; 1272 if $tag != 0;
1180} 1279}
1181 1280
1182sub update_containers { 1281sub update_containers {
1183 my ($self) = @_; 1282 my ($self) = @_;
1184 1283
1185 $dc::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1284 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1186 my $todo = delete $self->{update_container} 1285 my $todo = delete $self->{update_container}
1187 or return; 1286 or return;
1188 1287
1189 for my $tag (keys %$todo) { 1288 for my $tag (keys %$todo) {
1190 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1289 update_floorbox if $tag == 0 or $tag == $self->{open_container};
1225} 1324}
1226 1325
1227sub item_update { 1326sub item_update {
1228 my ($self, $item) = @_; 1327 my ($self, $item) = @_;
1229 1328
1230 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1329 #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
1231 1330
1232 dc::Item::update_widgets $item; 1331 DC::Item::update_widgets $item;
1233 1332
1234 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1333 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1235 set_opencont ($::CONN, 0, "Floor"); 1334 set_opencont ($::CONN, 0, "Floor");
1236 1335
1237 } elsif ($item->{flags} & F_OPEN) { 1336 } elsif ($item->{flags} & F_OPEN) {
1238 set_opencont ($::CONN, $item->{tag}, dc::Item::desc_string $item); 1337 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1239 1338
1240 } else { 1339 } else {
1241 $self->{update_container}{$item->{container}}++; 1340 $self->{update_container}{$item->{container}}++;
1242 $self->update_containers; 1341 $self->update_containers;
1243 } 1342 }
1254 1353
1255 my $weight = .001 * $self->{player}{weight}; 1354 my $weight = .001 * $self->{player}{weight};
1256 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1355 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1257 1356
1258 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1357 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1259 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1358 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1260 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1359 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1261} 1360}
1262 1361
1263sub update_server_info { 1362sub update_server_info {
1264 my ($self) = @_; 1363 my ($self) = @_;
1265 1364
1266 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>"); 1365 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
1267 1366
1367 my $version = JSON::XS->new->encode ($self->{s_version});
1368
1268 $::SERVER_INFO->set_markup ( 1369 $::SERVER_INFO->set_markup (
1269 "server <tt>$self->{host}:$self->{port}</tt>\n" 1370 "server <tt>$self->{host}:$self->{port}</tt>\n"
1270 . "protocol version <tt>$self->{version}</tt>\n" 1371 . "protocol version <tt>$version</tt>\n"
1271 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
1272 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1273 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1274 . "editing support $yesno[!!$self->{editor_support}]\n" 1372 . "editing support $yesno[!!$self->{editor_support}]\n"
1275 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1276 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1277 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1373 . "client support $yesno[$self->{cfplus_ext} > 0]"
1278 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1374 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1279 . "map size $self->{mapw}×$self->{maph}\n" 1375 . "map size $self->{mapw}×$self->{maph}\n"
1280 ); 1376 );
1281 1377
1282} 1378}
1303 }); 1399 });
1304 1400
1305 $self->update_server_info; 1401 $self->update_server_info;
1306 1402
1307 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1403 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1308 $self->send_command ("pickup $::CFG->{pickup}"); 1404 $self->send_pickup ($::CFG->{pickup});
1309} 1405}
1310 1406
1311sub lookat { 1407sub lookat {
1312 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1313 1409
1315 $self->send_ext_req (lookat => $x, $y, sub { 1411 $self->send_ext_req (lookat => $x, $y, sub {
1316 my (%msg) = @_; 1412 my (%msg) = @_;
1317 1413
1318 if (exists $msg{npc_dialog}) { 1414 if (exists $msg{npc_dialog}) {
1319 # start npc chat dialog 1415 # start npc chat dialog
1320 $self->{npc_dialog} = new dc::NPCDialog:: 1416 $self->{w}{npc_dialog} = new DC::NPCDialog::
1321 token => $msg{npc_dialog}, 1417 token => $msg{npc_dialog},
1322 title => "$msg{npc_dialog}[0] (NPC)", 1418 title => "$msg{npc_dialog}[0] (NPC)",
1323 conn => $self, 1419 conn => $self,
1324 ; 1420 ;
1325 } 1421 }
1330} 1426}
1331 1427
1332sub destroy { 1428sub destroy {
1333 my ($self) = @_; 1429 my ($self) = @_;
1334 1430
1335 (delete $self->{npc_dialog})->destroy 1431 $_->destroy
1336 if $self->{npc_dialog}; 1432 for values %{ $self->{w} };
1337 1433
1338 $self->SUPER::destroy; 1434 $self->SUPER::destroy;
1339 1435
1340 %$self = (); 1436 %$self = ();
1341} 1437}
1342 1438
1343package dc::NPCDialog; 1439package DC::NPCDialog;
1344 1440
1345our @ISA = 'dc::UI::Toplevel'; 1441our @ISA = 'DC::UI::Toplevel';
1346 1442
1347sub new { 1443sub new {
1348 my $class = shift; 1444 my $class = shift;
1349 1445
1350 my $self = $class->SUPER::new ( 1446 my $self = $class->SUPER::new (
1357 kw => { hi => 0, yes => 0, no => 0 }, 1453 kw => { hi => 0, yes => 0, no => 0 },
1358 has_close_button => 1, 1454 has_close_button => 1,
1359 @_, 1455 @_,
1360 ); 1456 );
1361 1457
1362 dc::weaken (my $this = $self); 1458 DC::weaken (my $this = $self);
1363 1459
1364 $self->connect (delete => sub { $this->destroy; 1 }); 1460 $self->connect (delete => sub { $this->destroy; 1 });
1365 1461
1366 # better use a pane... 1462 # better use a pane...
1367 $self->add (my $hbox = new dc::UI::HBox); 1463 $self->add (my $hbox = new DC::UI::HBox);
1368 $hbox->add ($self->{textview} = new dc::UI::TextScroller expand => 1); 1464 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1369 1465
1370 $hbox->add (my $vbox = new dc::UI::VBox); 1466 $hbox->add (my $vbox = new DC::UI::VBox);
1371 1467
1372 $vbox->add (new dc::UI::Label text => "Message Entry:"); 1468 $vbox->add (new DC::UI::Label text => "Message Entry:");
1373 $vbox->add ($self->{entry} = new dc::UI::Entry 1469 $vbox->add ($self->{entry} = new DC::UI::Entry
1374 tooltip => "#npc_message_entry", 1470 tooltip => "#npc_message_entry",
1375 on_activate => sub { 1471 on_activate => sub {
1376 my ($entry, $text) = @_; 1472 my ($entry, $text) = @_;
1377 1473
1378 return unless $text =~ /\S/; 1474 return unless $text =~ /\S/;
1382 1478
1383 0 1479 0
1384 }, 1480 },
1385 ); 1481 );
1386 1482
1387 $vbox->add ($self->{options} = new dc::UI::VBox); 1483 $vbox->add ($self->{options} = new DC::UI::VBox);
1388 1484
1389 $self->{bye_button} = new dc::UI::Button 1485 $self->{bye_button} = new DC::UI::Button
1390 text => "Bye (close)", 1486 text => "Bye (close)",
1391 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1487 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1392 on_activate => sub { $this->destroy; 1 }, 1488 on_activate => sub { $this->destroy; 1 },
1393 ; 1489 ;
1394 1490
1413}; 1509};
1414 1510
1415sub update_options { 1511sub update_options {
1416 my ($self) = @_; 1512 my ($self) = @_;
1417 1513
1418 dc::weaken $self; 1514 DC::weaken $self;
1419 1515
1420 $self->{options}->clear; 1516 $self->{options}->clear;
1421 $self->{options}->add ($self->{bye_button}); 1517 $self->{options}->add ($self->{bye_button});
1422 1518
1423 for my $kw (sort keys %{ $self->{kw} }) { 1519 for my $kw (sort keys %{ $self->{kw} }) {
1424 $self->{options}->add (new dc::UI::Button 1520 $self->{options}->add (new DC::UI::Button
1425 text => $kw, 1521 text => $kw,
1426 on_activate => sub { 1522 on_activate => sub {
1427 $self->send ($kw); 1523 $self->send ($kw);
1428 0 1524 0
1429 }, 1525 },
1432} 1528}
1433 1529
1434sub feed { 1530sub feed {
1435 my ($self, $type, @arg) = @_; 1531 my ($self, $type, @arg) = @_;
1436 1532
1437 dc::weaken $self; 1533 DC::weaken $self;
1438 1534
1439 if ($type eq "update") { 1535 if ($type eq "update") {
1440 my (%info) = @arg; 1536 my (%info) = @arg;
1441 1537
1442 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1538 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1443 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1539 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1444 1540
1445 if (exists $info{msg}) { 1541 if (exists $info{msg}) {
1446 my $text = "\n" . dc::Protocol::sanitise_xml $info{msg}; 1542 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1447 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1543 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1448 my @link; 1544 my @link;
1449 $text =~ s{ 1545 $text =~ s{
1450 ($match) 1546 ($match)
1451 }{ 1547 }{
1452 my $kw = $1; 1548 my $kw = $1;
1453 1549
1454 push @link, new dc::UI::Label 1550 push @link, new DC::UI::Label
1455 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1551 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1456 can_hover => 1, 1552 can_hover => 1,
1457 can_events => 1, 1553 can_events => 1,
1458 padding_x => 0, 1554 padding_x => 0,
1459 padding_y => 0, 1555 padding_y => 0,
1477} 1573}
1478 1574
1479sub send { 1575sub send {
1480 my ($self, $msg) = @_; 1576 my ($self, $msg) = @_;
1481 1577
1482 $self->{textview}->add_paragraph ({ markup => "\n" . dc::asxml $msg }); 1578 $self->{textview}->add_paragraph ({
1579 markup =>
1580 "\n<span foreground='#ffff00'><b>"
1581 . (DC::asxml $msg)
1582 . "</b></span>"
1583 });
1483 $self->{textview}->scroll_to_bottom; 1584 $self->{textview}->scroll_to_bottom;
1484 1585
1485 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1586 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1486} 1587}
1487 1588
1490 1591
1491 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1592 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1492 1593
1493 if ($self->{conn}) { 1594 if ($self->{conn}) {
1494 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id}; 1595 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1495 delete $self->{conn}{npc_dialog}; 1596 delete $self->{conn}{w}{npc_dialog};
1496 $self->{conn}->disconnect_ext ($self->{id}); 1597 $self->{conn}->disconnect_ext ($self->{id});
1497 } 1598 }
1498 1599
1499 $self->SUPER::destroy; 1600 $self->SUPER::destroy;
1500} 1601}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines