| 1 | package CFPlus::Protocol; |
1 | package DC::Protocol; |
| 2 | |
2 | |
| 3 | use utf8; |
3 | use utf8; |
| 4 | use strict; |
4 | use strict; |
| 5 | |
5 | |
| 6 | use Crossfire::Protocol::Constants; |
6 | use Deliantra::Protocol::Constants; |
| 7 | |
7 | |
| 8 | use CFPlus; |
8 | use DC; |
| 9 | use CFPlus::DB; |
9 | use DC::DB; |
| 10 | use CFPlus::UI; |
10 | use DC::UI; |
| 11 | use CFPlus::Pod; |
11 | use DC::Pod; |
| 12 | use CFPlus::Macro; |
12 | use DC::Macro; |
| 13 | use CFPlus::Item; |
13 | use DC::Item; |
| 14 | |
14 | |
| 15 | use Crossfire::Protocol::Base 0.95; |
|
|
| 16 | |
|
|
| 17 | use base 'Crossfire::Protocol::Base'; |
15 | use base 'Deliantra::Protocol::Base'; |
|
|
16 | |
|
|
17 | our $TEX_DIALOGUE = new_from_resource DC::Texture |
|
|
18 | "dialogue.png", minify => 1, mipmap => 1; |
|
|
19 | |
|
|
20 | our $TEX_NOFACE = new_from_resource DC::Texture |
|
|
21 | "noface.png", minify => 1, mipmap => 1; |
|
|
22 | |
|
|
23 | our $TEX_HIDDEN = new_from_resource DC::Texture |
|
|
24 | "hidden.png", minify => 1, mipmap => 1; |
|
|
25 | |
|
|
26 | sub MIN_TEXTURE_UNUSED() { 1 }#d# |
| 18 | |
27 | |
| 19 | sub new { |
28 | sub new { |
| 20 | my ($class, %arg) = @_; |
29 | my ($class, %arg) = @_; |
| 21 | |
30 | |
| 22 | my $self = $class->SUPER::new (%arg, |
31 | my $self = $class->SUPER::new (%arg, |
| 23 | setup_req => { |
32 | setup_req => { |
| 24 | extmap => 1, |
33 | extmap => 1, |
| 25 | excmd => 1, |
34 | excmd => 1, |
| 26 | xwidget2 => 1,#d# |
35 | widget => 2, |
| 27 | %{$arg{setup_req} || {}}, |
36 | %{$arg{setup_req} || {}}, |
| 28 | }, |
37 | }, |
| 29 | ); |
38 | ); |
| 30 | |
39 | |
| 31 | $self->{map_widget}->clr_commands; |
40 | $self->{map_widget}->clr_commands; |
| 32 | |
41 | |
| 33 | my @cmd_help = map { |
42 | my @cmd_help = map { |
| 34 | $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
43 | $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
| 35 | or die "unparseable command help: $_->{kw}[0]"; |
44 | or die "unparseable command help: $_->[DC::Pod::N_KW][0]"; |
| 36 | |
45 | |
| 37 | my $cmd = $1; |
46 | my $cmd = $1; |
| 38 | my @args = split /\|/, $2; |
47 | my @args = split /\|/, $2; |
| 39 | @args = (".*") unless @args; |
48 | @args = (".*") unless @args; |
| 40 | |
49 | |
| 41 | my (undef, @par) = CFPlus::Pod::section_of $_; |
50 | my (undef, @par) = DC::Pod::section_of $_; |
| 42 | my $text = CFPlus::Pod::as_label @par; |
51 | my $text = DC::Pod::as_label @par; |
| 43 | |
52 | |
| 44 | $_ = $_ eq ".*" ? "" : " $_" |
53 | $_ = $_ eq ".*" ? "" : " $_" |
| 45 | for @args; |
54 | for @args; |
| 46 | |
55 | |
| 47 | map ["$cmd$_", $text], |
56 | map ["$cmd$_", $text], |
| 48 | sort { (length $a) <=> (length $b) } |
57 | sort { (length $a) <=> (length $b) } |
| 49 | @args |
58 | @args |
| 50 | } sort { $a->{par} <=> $b->{par} } |
59 | } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] } |
| 51 | CFPlus::Pod::find command => "*"; |
60 | DC::Pod::find command => "*"; |
| 52 | |
61 | |
| 53 | $self->{json_coder} |
62 | $self->{json_coder} |
| 54 | ->convert_blessed |
63 | ->convert_blessed |
| 55 | ->filter_json_single_key_object ("\fw" => sub { |
64 | ->filter_json_single_key_object ("\fw" => sub { |
| 56 | $self->{widget}{$_[0]} |
65 | $self->{widget}{$_[0]} |
| … | |
… | |
| 66 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
75 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
| 67 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
76 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
| 68 | $_->destroy |
77 | $_->destroy |
| 69 | for values %{delete $ws->{w} || {}}; |
78 | for values %{delete $ws->{w} || {}}; |
| 70 | } |
79 | } |
|
|
80 | |
|
|
81 | delete $self->{items}; |
|
|
82 | $::INV->clear; |
|
|
83 | $::INVR->clear; |
|
|
84 | $::INVR_HB->clear; |
|
|
85 | $::FLOORBOX->clear; |
| 71 | }); |
86 | }); |
| 72 | |
87 | |
| 73 | $self->{map_widget}->add_command (@$_) |
88 | $self->{map_widget}->add_command (@$_) |
| 74 | for @cmd_help; |
89 | for @cmd_help; |
| 75 | |
90 | |
| 76 | { |
91 | { |
| 77 | $self->{dialogue} = my $tex = new_from_file CFPlus::Texture |
92 | $self->{dialogue} = my $tex = $TEX_DIALOGUE; |
| 78 | CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; |
|
|
| 79 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
93 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
| 80 | } |
94 | } |
| 81 | |
95 | |
| 82 | { |
96 | { |
| 83 | $self->{noface} = my $tex = new_from_file CFPlus::Texture |
97 | $self->{noface} = my $tex = $TEX_NOFACE; |
| 84 | CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; |
|
|
| 85 | $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
98 | $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
| 86 | } |
99 | } |
|
|
100 | |
|
|
101 | { |
|
|
102 | $self->{hidden} = my $tex = $TEX_HIDDEN; |
|
|
103 | $self->{map}->set_texture (3, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
|
|
104 | } |
|
|
105 | |
|
|
106 | # $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id |
|
|
107 | # $self->{expire_w} = EV::timer 1, 1, sub { |
|
|
108 | # my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1; |
|
|
109 | # |
|
|
110 | # for ($self->{map}->expire_textures ($self->{expire_count}, $count)) { |
|
|
111 | # warn DC::SvREFCNT $self->{texture}[$_]; |
|
|
112 | # $self->{texture}[$_]->unload; |
|
|
113 | # warn "expire texture $_\n";#d# |
|
|
114 | # } |
|
|
115 | # |
|
|
116 | # ($self->{expire_count} += $count) < @{ $self->{texture} } |
|
|
117 | # or $self->{expire_count} = DC::DB::FIRST_TILE_ID; |
|
|
118 | # warn "count is $count\n";#d# |
|
|
119 | # }; |
| 87 | |
120 | |
| 88 | $self->{open_container} = 0; |
121 | $self->{open_container} = 0; |
| 89 | |
122 | |
| 90 | # per server |
123 | # per server |
| 91 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
124 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
| … | |
… | |
| 104 | } |
137 | } |
| 105 | |
138 | |
| 106 | sub ext_capabilities { |
139 | sub ext_capabilities { |
| 107 | my ($self, %cap) = @_; |
140 | my ($self, %cap) = @_; |
| 108 | |
141 | |
| 109 | #$self->send ("setup sound 0"); # we use a different protocol |
|
|
| 110 | $self->update_fx_want; |
142 | $self->update_fx_want; |
| 111 | |
143 | |
| 112 | $self->send_exti_req (resource => "exp_table", sub { |
144 | $self->send_exti_req (resource => "exp_table", sub { |
| 113 | my ($exp_table) = @_; |
145 | my ($exp_table) = @_; |
| 114 | |
146 | |
| … | |
… | |
| 144 | ############################################################################# |
176 | ############################################################################# |
| 145 | |
177 | |
| 146 | sub widget_associate { |
178 | sub widget_associate { |
| 147 | my ($self, $ws, $id, $widget) = @_; |
179 | my ($self, $ws, $id, $widget) = @_; |
| 148 | |
180 | |
| 149 | $widget ||= new CFPlus::UI::Bin; |
181 | $widget ||= new DC::UI::Bin; |
| 150 | |
182 | |
| 151 | $widget->{s_id} = $id; |
183 | $widget->{s_id} = $id; |
| 152 | $self->{widget}{$id} = $widget; |
184 | $self->{widget}{$id} = $widget; |
| 153 | |
185 | |
| 154 | if ($ws) { |
186 | if ($ws) { |
| … | |
… | |
| 190 | my ($self, $ws, $id, $class, $args) = @_; |
222 | my ($self, $ws, $id, $class, $args) = @_; |
| 191 | |
223 | |
| 192 | $self->widget_associate ( |
224 | $self->widget_associate ( |
| 193 | $ws, $id => scalar eval { |
225 | $ws, $id => scalar eval { |
| 194 | local $SIG{__DIE__}; |
226 | local $SIG{__DIE__}; |
| 195 | "CFPlus::UI::$class"->new (%$args) |
227 | "DC::UI::$class"->new (%$args) |
| 196 | } |
228 | } |
| 197 | ); |
229 | ); |
|
|
230 | } |
|
|
231 | |
|
|
232 | # widgetset create template |
|
|
233 | sub ext_ws_ct { |
|
|
234 | my ($self, $ws, $type, $template, $done_cb, $cfg) = @_; |
|
|
235 | |
|
|
236 | $done_cb ||= sub { }; |
|
|
237 | |
|
|
238 | my $parse_list; $parse_list = sub { |
|
|
239 | my ($list) = @_; |
|
|
240 | my @w; |
|
|
241 | |
|
|
242 | while (@$list) { |
|
|
243 | my ($class, $args) = splice @$list, 0, 2; |
|
|
244 | my $name = delete $args->{s_id}; |
|
|
245 | my $cl = delete $args->{s_cl}; |
|
|
246 | my $cfg = delete $cfg->{$name}; |
|
|
247 | my $id = delete $cfg->{id}; |
|
|
248 | my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) } |
|
|
249 | or next; |
|
|
250 | |
|
|
251 | $self->widget_associate ($ws, $id, $w) |
|
|
252 | if $id; |
|
|
253 | |
|
|
254 | $w->add ($parse_list->($cl)) |
|
|
255 | if $cl; |
|
|
256 | |
|
|
257 | push @w, $w; |
|
|
258 | } |
|
|
259 | |
|
|
260 | @w |
|
|
261 | }; |
|
|
262 | |
|
|
263 | # either array reference, or face # |
|
|
264 | if ($type eq "inline") { |
|
|
265 | $done_cb->(); |
|
|
266 | $parse_list->($template); |
|
|
267 | } elsif ($type eq "face") { |
|
|
268 | my $handler; $handler = $self->register_face_handler ($template, sub { |
|
|
269 | my ($face) = @_; |
|
|
270 | |
|
|
271 | undef $handler; |
|
|
272 | $done_cb->(); |
|
|
273 | $parse_list->($self->{json_coder}->decode ($face->{data})); |
|
|
274 | }); |
|
|
275 | } else { |
|
|
276 | $done_cb->(0); |
|
|
277 | } |
| 198 | } |
278 | } |
| 199 | |
279 | |
| 200 | # widgetset associate |
280 | # widgetset associate |
| 201 | sub ext_ws_a { |
281 | sub ext_ws_a { |
| 202 | my ($self, %ass) = @_; |
282 | my ($self, %ass) = @_; |
| 203 | |
283 | |
| 204 | # everything that has a name, wether conceivably useful or not |
284 | # everything that has a name, wether conceivably useful or not |
| 205 | my %wkw = ( |
285 | my %wkw = ( |
| 206 | root => $CFPlus::UI::ROOT, |
286 | root => $DC::UI::ROOT, |
| 207 | tooltip => $CFPlus::UI::TOOLTIP, |
287 | tooltip => $DC::UI::TOOLTIP, |
| 208 | |
288 | |
| 209 | mapwidget => $::MAPWIDGET, |
289 | mapwidget => $::MAPWIDGET, |
| 210 | buttonbar => $::BUTTONBAR, |
290 | buttonbar => $::BUTTONBAR, |
| 211 | metaserver => $::METASERVER, |
291 | metaserver => $::METASERVER, |
| 212 | buttonbar => $::BUTTONBAR, |
292 | buttonbar => $::BUTTONBAR, |
| … | |
… | |
| 230 | spell_list => $::SPELL_LIST, |
310 | spell_list => $::SPELL_LIST, |
| 231 | |
311 | |
| 232 | floorbox => $::FLOORBOX, |
312 | floorbox => $::FLOORBOX, |
| 233 | help_window => $::HELP_WINDOW, |
313 | help_window => $::HELP_WINDOW, |
| 234 | message_window => $::MESSAGE_WINDOW, |
314 | message_window => $::MESSAGE_WINDOW, |
|
|
315 | message_dist => $::MESSAGE_DIST, |
| 235 | statusbox => $::SDTATUSBOX, |
316 | statusbox => $::SDTATUSBOX, |
| 236 | |
317 | |
| 237 | inv => $::INV, |
318 | inv => $::INV, |
| 238 | invr => $::INVR, |
319 | invr => $::INVR, |
| 239 | invr_hb => $::INVR_HB, |
320 | invr_hb => $::INVR_HB, |
| … | |
… | |
| 288 | |
369 | |
| 289 | # message window |
370 | # message window |
| 290 | sub ext_channel_info { |
371 | sub ext_channel_info { |
| 291 | my ($self, $info) = @_; |
372 | my ($self, $info) = @_; |
| 292 | $self->{channels}->{$info->{id}} = $info; |
373 | $self->{channels}->{$info->{id}} = $info; |
| 293 | $::MESSAGE_WINDOW->add_channel ($info); |
374 | $::MESSAGE_DIST->add_channel ($info); |
| 294 | } |
375 | } |
| 295 | |
376 | |
| 296 | ############################################################################# |
377 | ############################################################################# |
| 297 | |
378 | |
| 298 | sub logprint { |
379 | sub logprint { |
| 299 | my ($self, @a) = @_; |
380 | my ($self, @a) = @_; |
| 300 | |
381 | |
| 301 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
382 | DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
| 302 | } |
383 | } |
| 303 | |
384 | |
| 304 | sub _stat_numdiff { |
385 | sub _stat_numdiff { |
| 305 | my ($self, $name, $old, $new) = @_; |
386 | my ($self, $name, $old, $new) = @_; |
| 306 | |
387 | |
| … | |
… | |
| 478 | $self->{stat_order} = join ",", map $_->[0], @order; |
559 | $self->{stat_order} = join ",", map $_->[0], @order; |
| 479 | |
560 | |
| 480 | $sktbl->clear; |
561 | $sktbl->clear; |
| 481 | |
562 | |
| 482 | my $sw = $self->{skillwid}{""} ||= [ |
563 | my $sw = $self->{skillwid}{""} ||= [ |
| 483 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
564 | 0, 0, (new DC::UI::Label text => "Experience", align => 1), |
| 484 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
565 | 1, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
| 485 | 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
566 | 2, 0, (new DC::UI::Label text => "Progress"), |
| 486 | 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
567 | 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), |
| 487 | 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
568 | 4, 0, (new DC::UI::Label text => "Experience", align => 1), |
| 488 | 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
569 | 5, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
| 489 | 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
570 | 6, 0, (new DC::UI::Label text => "Progress"), |
| 490 | 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
571 | 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), |
| 491 | ]; |
572 | ]; |
| 492 | |
573 | |
| 493 | my @add = @$sw; |
574 | my @add = @$sw; |
| 494 | |
575 | |
| 495 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
576 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>"; |
| 496 | |
577 | |
| 497 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
578 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
| 498 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
579 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
| 499 | |
580 | |
| 500 | my ($x, $y) = (0, 1); |
581 | my ($x, $y) = (0, 1); |
| … | |
… | |
| 507 | if ($ev->{button} == 1) { |
588 | if ($ev->{button} == 1) { |
| 508 | $::CONN->user_send ("ready_skill $name"); |
589 | $::CONN->user_send ("ready_skill $name"); |
| 509 | } elsif ($ev->{button} == 2) { |
590 | } elsif ($ev->{button} == 2) { |
| 510 | $::CONN->user_send ("use_skill $name"); |
591 | $::CONN->user_send ("use_skill $name"); |
| 511 | } elsif ($ev->{button} == 3) { |
592 | } elsif ($ev->{button} == 3) { |
| 512 | my $shortname = CFPlus::shorten $name, 14; |
593 | my $shortname = DC::shorten $name, 14; |
| 513 | (new CFPlus::UI::Menu |
594 | (new DC::UI::Menu |
| 514 | items => [ |
595 | items => [ |
| 515 | ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], |
596 | ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }], |
| 516 | ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], |
597 | ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }], |
| 517 | ], |
598 | ], |
| 518 | )->popup ($ev); |
599 | )->popup ($ev); |
| 519 | } else { |
600 | } else { |
| 520 | return 0; |
601 | return 0; |
| 521 | } |
602 | } |
| … | |
… | |
| 523 | 1 |
604 | 1 |
| 524 | }; |
605 | }; |
| 525 | |
606 | |
| 526 | my $sw = $self->{skillwid}{$idx} ||= [ |
607 | my $sw = $self->{skillwid}{$idx} ||= [ |
| 527 | # exp |
608 | # exp |
| 528 | (new CFPlus::UI::Label |
609 | (new DC::UI::Label |
| 529 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
610 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
| 530 | |
611 | |
| 531 | # level |
612 | # level |
| 532 | (new CFPlus::UI::Label |
613 | (new DC::UI::Label |
| 533 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
614 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
| 534 | |
615 | |
| 535 | # progress |
616 | # progress |
| 536 | (new CFPlus::UI::ExperienceProgress), |
617 | (new DC::UI::ExperienceProgress), |
| 537 | |
618 | |
| 538 | # label |
619 | # label |
| 539 | (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
620 | (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0, |
| 540 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
621 | can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
| 541 | ]; |
622 | ]; |
| 542 | |
623 | |
| 543 | push @add, |
624 | push @add, |
| 544 | $x * 4 + 0, $y, $sw->[0], |
625 | $x * 4 + 0, $y, $sw->[0], |
| 545 | $x * 4 + 1, $y, $sw->[1], |
626 | $x * 4 + 1, $y, $sw->[1], |
| … | |
… | |
| 586 | } |
667 | } |
| 587 | |
668 | |
| 588 | sub map_scroll { |
669 | sub map_scroll { |
| 589 | my ($self, $dx, $dy) = @_; |
670 | my ($self, $dx, $dy) = @_; |
| 590 | |
671 | |
| 591 | $self->{map}->scroll ($dx, $dy); |
672 | $self->{map_widget}->scroll ($dx, $dy); |
| 592 | } |
673 | } |
| 593 | |
674 | |
| 594 | sub feed_map1a { |
675 | sub feed_map1a { |
| 595 | my ($self, $data) = @_; |
676 | my ($self, $data) = @_; |
| 596 | |
677 | |
| … | |
… | |
| 600 | for my $tile (@$missing) { |
681 | for my $tile (@$missing) { |
| 601 | next if $self->{delay}{$tile}; |
682 | next if $self->{delay}{$tile}; |
| 602 | |
683 | |
| 603 | $delay = 1; |
684 | $delay = 1; |
| 604 | |
685 | |
| 605 | if (my $tex = $::CONN->{texture}[$tile]) { |
686 | if (my $tex = $self->{texture}[$tile]) { |
| 606 | $tex->upload; |
687 | $tex->upload; |
| 607 | } else { |
688 | } else { |
| 608 | $self->{delay}{$tile} = 1; |
689 | $self->{delay}{$tile} = 1; |
| 609 | |
690 | |
| 610 | # we assume the face is in-flight and will eventually come |
691 | # we assume the face is in-flight and will eventually arrive |
| 611 | push @{$self->{tile_cb}{$tile}}, sub { |
692 | push @{$self->{tile_cb}{$tile}}, sub { |
| 612 | delete $self->{delay}{$tile}; |
693 | delete $self->{delay}{$tile}; |
| 613 | $_[0]->upload; |
694 | $_[0]->upload; |
| 614 | }; |
695 | }; |
| 615 | } |
696 | } |
| 616 | } |
697 | } |
| 617 | |
698 | |
| 618 | if ($delay) { |
699 | if ($delay) { |
| 619 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
700 | # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched |
| 620 | Event->timer (after => 0.03, cb => sub { |
701 | EV::once undef, 0, 0.03, sub { |
| 621 | $_[0]->w->cancel; |
|
|
| 622 | $self->{map_widget}->update |
702 | $self->{map_widget}->update |
| 623 | if $self->{map_widget}; |
703 | if $self->{map_widget}; |
| 624 | }); |
704 | }; |
| 625 | } else { |
705 | } else { |
| 626 | $self->{map_widget}->update; |
706 | $self->{map_widget}->update; |
| 627 | } |
707 | } |
| 628 | } |
708 | } |
| 629 | |
709 | |
| … | |
… | |
| 634 | } |
714 | } |
| 635 | |
715 | |
| 636 | sub flush_map { |
716 | sub flush_map { |
| 637 | my ($self) = @_; |
717 | my ($self) = @_; |
| 638 | |
718 | |
| 639 | my $map_info = delete $self->{map_info} |
719 | return unless $self->{map_info}; |
| 640 | or return; |
|
|
| 641 | |
720 | |
|
|
721 | for my $map_info (values %{ $self->{map_cache} || {} }) { |
| 642 | my ($hash, $x, $y, $w, $h) = @$map_info; |
722 | my ($hash, $rdata, $x, $y, $w, $h) = @$map_info; |
| 643 | |
723 | |
| 644 | my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); |
724 | my $data = $self->{map}->get_rect ($x, $y, $w, $h); |
| 645 | $self->{map_cache_new}{$hash} = \$data; |
725 | |
|
|
726 | if ($data ne $$rdata) { |
|
|
727 | $map_info->[1] = \$data; |
|
|
728 | my $cdata = Compress::LZF::compress $data; |
| 646 | CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; |
729 | DC::DB::put $self->{mapcache} => $hash => $cdata, sub { }; |
|
|
730 | } |
|
|
731 | } |
| 647 | } |
732 | } |
| 648 | |
733 | |
| 649 | sub map_clear { |
734 | sub map_clear { |
| 650 | my ($self) = @_; |
735 | my ($self) = @_; |
| 651 | |
736 | |
| 652 | $self->flush_map; |
737 | $self->flush_map; |
|
|
738 | delete $self->{map_info}; |
| 653 | delete $self->{neigh_map}; |
739 | delete $self->{neigh_map}; |
| 654 | |
740 | |
| 655 | $self->{map}->clear; |
741 | $self->{map}->clear; |
| 656 | delete $self->{map_widget}{magicmap}; |
742 | delete $self->{map_widget}{magicmap}; |
| 657 | } |
743 | } |
| … | |
… | |
| 664 | do { |
750 | do { |
| 665 | $tile = pop @{$self->{bg_fetch}} |
751 | $tile = pop @{$self->{bg_fetch}} |
| 666 | or return; |
752 | or return; |
| 667 | } while $self->{texture}[$tile]; |
753 | } while $self->{texture}[$tile]; |
| 668 | |
754 | |
| 669 | CFPlus::DB::get tilecache => $tile, sub { |
755 | DC::DB::get tilecache => $tile, sub { |
| 670 | my ($data) = @_; |
756 | my ($data) = @_; |
| 671 | |
757 | |
| 672 | return unless $self->{map}; # stop when destroyed |
758 | return unless $self->{map}; # stop when destroyed |
| 673 | |
759 | |
| 674 | if (defined $data) { |
760 | if (defined $data) { |
| … | |
… | |
| 678 | |
764 | |
| 679 | $self->bg_fetch; |
765 | $self->bg_fetch; |
| 680 | }; |
766 | }; |
| 681 | } |
767 | } |
| 682 | |
768 | |
| 683 | sub load_map($$$) { |
769 | sub load_map($$$$$$) { |
| 684 | my ($self, $hash, $x, $y) = @_; |
770 | my ($self, $hash, $x, $y, $w, $h) = @_; |
| 685 | |
771 | |
| 686 | my $gen = $self->{map_change_gen}; |
772 | my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h]; |
| 687 | |
773 | |
| 688 | my $cb = sub { |
774 | my $cb = sub { |
| 689 | return unless $gen == $self->{map_change_gen}; |
775 | $map_info->[1] = \$_[0]; |
| 690 | |
776 | |
| 691 | my ($data) = @_; |
|
|
| 692 | |
|
|
| 693 | if (defined $data) { |
|
|
| 694 | $self->{map_cache_new}{$hash} = \$data; |
|
|
| 695 | |
|
|
| 696 | my $data = Compress::LZF::decompress $data; |
|
|
| 697 | |
|
|
| 698 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
777 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
| 699 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
778 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]); |
| 700 | $self->bg_fetch unless $inprogress; |
779 | $self->bg_fetch unless $inprogress; |
| 701 | } |
|
|
| 702 | }; |
780 | }; |
| 703 | |
781 | |
| 704 | if (my $rdata = $self->{map_cache_old}{$hash}) { |
782 | if (my $map_info = $self->{map_cache_old}{$hash}) { |
| 705 | $cb->($$rdata); |
783 | $cb->(${ $map_info->[1] }); |
| 706 | } else { |
784 | } else { |
|
|
785 | my $gen = $self->{map_change_gen}; |
|
|
786 | |
| 707 | CFPlus::DB::get $self->{mapcache} => $hash, $cb; |
787 | DC::DB::get $self->{mapcache} => $hash, sub { |
|
|
788 | return unless $gen == $self->{map_change_gen}; |
|
|
789 | return unless defined $_[0]; |
|
|
790 | $cb->(Compress::LZF::decompress $_[0]); |
|
|
791 | }; |
| 708 | } |
792 | } |
| 709 | } |
793 | } |
| 710 | |
794 | |
| 711 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
795 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
| 712 | # (server resource,s latency, bandwidth), so this hack is warranted. |
796 | # (server resources, latency, bandwidth), so this hack is warranted. |
| 713 | # the right fix is to make real tiled maps with an overview file |
797 | # the right fix is to make real tiled maps with an overview file |
| 714 | sub send_mapinfo { |
798 | sub send_mapinfo { |
| 715 | my ($self, $data, $cb) = @_; |
799 | my ($self, $data, $cb) = @_; |
| 716 | |
800 | |
| 717 | if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { |
801 | if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { |
| … | |
… | |
| 742 | } |
826 | } |
| 743 | |
827 | |
| 744 | # this method does a "flood fill" into every tile direction |
828 | # this method does a "flood fill" into every tile direction |
| 745 | # it assumes that tiles are arranged in a rectangular grid, |
829 | # it assumes that tiles are arranged in a rectangular grid, |
| 746 | # i.e. a map is the same as the left of the right map etc. |
830 | # i.e. a map is the same as the left of the right map etc. |
| 747 | # failure to comply are harmless and result in display errors |
831 | # failure to comply is harmless and results in display errors |
| 748 | # at worst. |
832 | # at worst. |
| 749 | sub flood_fill { |
833 | sub flood_fill { |
| 750 | my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; |
834 | my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; |
| 751 | |
835 | |
| 752 | # the server does not allow map paths > 6 |
836 | # the server does not allow map paths > 6 |
| … | |
… | |
| 788 | return if $mode ne "spatial"; |
872 | return if $mode ne "spatial"; |
| 789 | |
873 | |
| 790 | $x += $self->{map}->ox; |
874 | $x += $self->{map}->ox; |
| 791 | $y += $self->{map}->oy; |
875 | $y += $self->{map}->oy; |
| 792 | |
876 | |
| 793 | $self->load_map ($hash, $x, $y) |
877 | $self->load_map ($hash, $x, $y, $w, $h) |
| 794 | unless $self->{neigh_map}{$hash}[5]++;#d# |
878 | unless $self->{neigh_map}{$hash}[5]++;#d# |
| 795 | |
879 | |
| 796 | $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; |
880 | $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; |
| 797 | |
881 | |
| 798 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
882 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
| … | |
… | |
| 806 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
890 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
| 807 | |
891 | |
| 808 | $self->flush_map; |
892 | $self->flush_map; |
| 809 | |
893 | |
| 810 | ++$self->{map_change_gen}; |
894 | ++$self->{map_change_gen}; |
| 811 | $self->{map_cache_old} = delete $self->{map_cache_new}; |
895 | $self->{map_cache_old} = delete $self->{map_cache}; |
| 812 | |
896 | |
| 813 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
897 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
| 814 | |
898 | |
| 815 | my $mapmapw = $self->{mapmap}->{w}; |
899 | my $mapmapw = $self->{mapmap}->{w}; |
| 816 | my $mapmaph = $self->{mapmap}->{h}; |
900 | my $mapmaph = $self->{mapmap}->{h}; |
| … | |
… | |
| 828 | $self->{map_info} = [$hash, $x, $y, $w, $h]; |
912 | $self->{map_info} = [$hash, $x, $y, $w, $h]; |
| 829 | |
913 | |
| 830 | (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; |
914 | (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; |
| 831 | $::STATWIDS->{map}->set_text ("Map: " . $map); |
915 | $::STATWIDS->{map}->set_text ("Map: " . $map); |
| 832 | |
916 | |
| 833 | $self->load_map ($hash, $x, $y); |
917 | $self->load_map ($hash, $x, $y, $w, $h); |
| 834 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
918 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
| 835 | } |
919 | } |
| 836 | |
920 | |
| 837 | sub face_find { |
921 | sub face_find { |
| 838 | my ($self, $facenum, $face, $cb) = @_; |
922 | my ($self, $facenum, $face, $cb) = @_; |
| 839 | |
923 | |
| 840 | if ($face->{type} == 0) { # FT_FACE |
924 | if ($face->{type} == 0) { # FT_FACE |
| 841 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
925 | my $id = DC::DB::get_tile_id_sync $face->{name}; |
| 842 | |
926 | |
| 843 | $face->{id} = $id; |
927 | $face->{id} = $id; |
| 844 | $self->{map}->set_tileid ($facenum => $id); |
928 | $self->{map}->set_tileid ($facenum => $id); |
| 845 | |
929 | |
| 846 | CFPlus::DB::get tilecache => $id, $cb; |
930 | DC::DB::get tilecache => $id, $cb; |
| 847 | |
931 | |
| 848 | } elsif ($face->{type} & 1) { # with metadata |
932 | } elsif ($face->{type} & 1) { # with metadata |
| 849 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
933 | DC::DB::get res_meta => $face->{name}, $cb; |
| 850 | |
934 | |
| 851 | } else { # no metadata |
935 | } else { # no metadata |
| 852 | CFPlus::DB::get res_data => $face->{name}, $cb; |
936 | DC::DB::get res_data => $face->{name}, $cb; |
| 853 | } |
937 | } |
| 854 | } |
938 | } |
| 855 | |
939 | |
| 856 | sub face_update { |
940 | sub face_update { |
| 857 | my ($self, $facenum, $face, $changed) = @_; |
941 | my ($self, $facenum, $face, $changed) = @_; |
| 858 | |
942 | |
| 859 | if ($face->{type} == 0) { |
943 | if ($face->{type} == 0) { |
| 860 | # image, FT_FACE |
944 | # image, FT_FACE |
| 861 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
945 | DC::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
| 862 | if $changed; |
946 | if $changed; |
| 863 | |
947 | |
| 864 | $self->have_tile ($face->{id}, delete $face->{data}); |
948 | $self->have_tile ($face->{id}, delete $face->{data}); |
| 865 | |
949 | |
| 866 | } elsif ($face->{type} & 1) { |
950 | } elsif ($face->{type} & 1) { |
| … | |
… | |
| 868 | if ($changed) { # new data |
952 | if ($changed) { # new data |
| 869 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
953 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
| 870 | $face->{data} = $meta; |
954 | $face->{data} = $meta; |
| 871 | |
955 | |
| 872 | # rely on strict ordering here and also on later fetch |
956 | # rely on strict ordering here and also on later fetch |
| 873 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
957 | DC::DB::put res_data => $face->{name} => $data, sub { }; |
| 874 | CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; |
958 | DC::DB::put res_meta => $face->{name} => $meta, sub { }; |
| 875 | } |
959 | } |
| 876 | |
960 | |
| 877 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
961 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
| 878 | ::add_license ($face); |
962 | ::add_license ($face); |
| 879 | ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) |
963 | ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) |
| 880 | if $changed; |
964 | if $changed; |
| 881 | |
965 | |
| 882 | if ($face->{type} == 3) { # FT_MUSIC |
966 | if ($face->{type} == 3) { # FT_MUSIC |
| 883 | &::audio_music_push ($facenum); |
967 | &::audio_music_push ($facenum); |
| 884 | } elsif ($face->{type} == 5) { # FT_SOUND |
968 | } elsif ($face->{type} == 5) { # FT_SOUND |
| 885 | &::audio_sound_push ($facenum); |
969 | &::audio_sound_push ($facenum); |
| 886 | } |
970 | } |
| 887 | |
971 | |
| 888 | } else { |
972 | } else { |
| 889 | # flat resource case, FT_RSRC |
973 | # flat resource case, FT_RSRC |
| 890 | CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } |
974 | DC::DB::put res_data => $face->{name} => $face->{data}, sub { } |
| 891 | if $changed; |
975 | if $changed; |
| 892 | } |
976 | } |
| 893 | |
977 | |
| 894 | if (my $cbs = $self->{face_cb}{$facenum}) { |
978 | if (my $cbs = $self->{face_cb}{$facenum}) { |
| 895 | $_->($face, $changed) for @$cbs; |
979 | $_->($face, $changed) for @$cbs; |
| … | |
… | |
| 906 | my ($self, $tile, $data) = @_; |
990 | my ($self, $tile, $data) = @_; |
| 907 | |
991 | |
| 908 | return unless $self->{map}; |
992 | return unless $self->{map}; |
| 909 | |
993 | |
| 910 | my $tex = $self->{texture}[$tile] ||= |
994 | my $tex = $self->{texture}[$tile] ||= |
| 911 | new CFPlus::Texture |
995 | new DC::Texture |
| 912 | tile => $tile, |
996 | tile => $tile, |
| 913 | image => $data, delete_image => 1, |
997 | image => $data, delete_image => 1, |
| 914 | minify => 1, mipmap => 1; |
998 | minify => 1, mipmap => 1; |
| 915 | |
999 | |
| 916 | if (my $cbs = delete $self->{tile_cb}{$tile}) { |
1000 | if (my $cbs = delete $self->{tile_cb}{$tile}) { |
| … | |
… | |
| 924 | my ($self, $num, $cb) = @_; |
1008 | my ($self, $num, $cb) = @_; |
| 925 | |
1009 | |
| 926 | push @{$self->{face_cb}{$num}}, $cb; |
1010 | push @{$self->{face_cb}{$num}}, $cb; |
| 927 | |
1011 | |
| 928 | defined wantarray |
1012 | defined wantarray |
| 929 | ? CFPlus::guard { |
1013 | ? DC::guard { |
| 930 | @{$self->{face_cb}{$num}} |
1014 | @{$self->{face_cb}{$num}} |
| 931 | = grep $_ != $cb, |
1015 | = grep $_ != $cb, |
| 932 | @{$self->{face_cb}{$num}}; |
1016 | @{$self->{face_cb}{$num}}; |
| 933 | } |
1017 | } |
| 934 | : () |
1018 | : () |
| … | |
… | |
| 969 | |
1053 | |
| 970 | sub sanitise_xml($) { |
1054 | sub sanitise_xml($) { |
| 971 | local $_ = shift; |
1055 | local $_ = shift; |
| 972 | |
1056 | |
| 973 | # we now weed out all tags we do not support |
1057 | # we now weed out all tags we do not support |
| 974 | s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g; |
1058 | s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>) |
|
|
1059 | }{ |
|
|
1060 | "<" |
|
|
1061 | }gex; |
|
|
1062 | |
| 975 | # now all entities |
1063 | # now all entities |
| 976 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
1064 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
| 977 | |
1065 | |
| 978 | # handle some elements |
1066 | # handle some elements |
| 979 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
1067 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
| 980 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
1068 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
|
|
1069 | |
|
|
1070 | s/\s+$//; |
| 981 | |
1071 | |
| 982 | $_ |
1072 | $_ |
| 983 | } |
1073 | } |
| 984 | |
1074 | |
| 985 | our %NAME_TO_COLOR = ( |
1075 | our %NAME_TO_COLOR = ( |
| … | |
… | |
| 1032 | |
1122 | |
| 1033 | ## try to create single paragraphs of multiple lines sent by the server |
1123 | ## try to create single paragraphs of multiple lines sent by the server |
| 1034 | # no longer neecssary with TRT servers |
1124 | # no longer neecssary with TRT servers |
| 1035 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
1125 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
| 1036 | |
1126 | |
| 1037 | for (split /\n/, $text) { |
|
|
| 1038 | ::message ({ |
1127 | ::message ({ |
| 1039 | fg => $fg, |
1128 | fg => $fg, |
| 1040 | markup => $_, |
1129 | markup => $text, |
| 1041 | type => $type, |
1130 | type => $type, |
| 1042 | extra => [@extra], |
1131 | extra => [@extra], |
| 1043 | color_flags => $color, #d# ugly, kill |
1132 | color_flags => $color, #d# ugly, kill |
| 1044 | }); |
1133 | }); |
| 1045 | |
1134 | |
| 1046 | $color &= ~NDI_CLEAR; # only clear once for multiline messages |
1135 | # $color &= ~NDI_CLEAR; # only clear once for multiline messages |
| 1047 | # actually, this is an ugly design. _we_ should control the channels, |
1136 | # # actually, this is an ugly design. _we_ should control the channels, |
| 1048 | # not some random other widget, as the channels are clearly protocol-specific. |
1137 | # # not some random other widget, as the channels are clearly protocol-specific. |
| 1049 | # then we could also react to flags such as CLEAR without resorting to |
1138 | # # then we could also react to flags such as CLEAR without resorting to |
| 1050 | # hacks such as color_flags, above. |
1139 | # # hacks such as color_flags, above. |
| 1051 | } |
|
|
| 1052 | |
1140 | |
| 1053 | $self->{statusbox}->add ($text, |
1141 | $self->{statusbox}->add ($text, |
| 1054 | group => $text, |
1142 | group => $text, |
| 1055 | fg => $fg, |
1143 | fg => $fg, |
| 1056 | timeout => $color >= 2 ? 180 : 10, |
1144 | timeout => $color >= 2 ? 180 : 10, |
| 1057 | tooltip_font => $::FONT_FIXED, |
1145 | tooltip_font => $::FONT_FIXED, |
| 1058 | ); |
1146 | ) if $type eq "info"; |
| 1059 | } |
1147 | } |
| 1060 | } |
1148 | } |
| 1061 | |
1149 | |
| 1062 | sub spell_add { |
1150 | sub spell_add { |
| 1063 | my ($self, $spell) = @_; |
1151 | my ($self, $spell) = @_; |
| … | |
… | |
| 1067 | $spell->{message} =~ s/\n+$//; |
1155 | $spell->{message} =~ s/\n+$//; |
| 1068 | $spell->{message} ||= "Server did not provide a description for this spell."; |
1156 | $spell->{message} ||= "Server did not provide a description for this spell."; |
| 1069 | |
1157 | |
| 1070 | $::SPELL_LIST->add_spell ($spell); |
1158 | $::SPELL_LIST->add_spell ($spell); |
| 1071 | |
1159 | |
| 1072 | $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); |
1160 | $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message}); |
| 1073 | $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); |
1161 | $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message}); |
| 1074 | } |
1162 | } |
| 1075 | |
1163 | |
| 1076 | sub spell_delete { |
1164 | sub spell_delete { |
| 1077 | my ($self, $spell) = @_; |
1165 | my ($self, $spell) = @_; |
| 1078 | |
1166 | |
| … | |
… | |
| 1089 | sub addme_success { |
1177 | sub addme_success { |
| 1090 | my ($self) = @_; |
1178 | my ($self) = @_; |
| 1091 | |
1179 | |
| 1092 | my %skill_help; |
1180 | my %skill_help; |
| 1093 | |
1181 | |
| 1094 | for my $node (CFPlus::Pod::find skill_description => "*") { |
1182 | for my $node (DC::Pod::find skill_description => "*") { |
| 1095 | my (undef, @par) = CFPlus::Pod::section_of $node; |
1183 | my (undef, @par) = DC::Pod::section_of $node; |
| 1096 | $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; |
1184 | $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par; |
| 1097 | }; |
1185 | }; |
| 1098 | |
1186 | |
| 1099 | for my $skill (values %{$self->{skill_info}}) { |
1187 | for my $skill (values %{$self->{skill_info}}) { |
| 1100 | $self->{map_widget}->add_command ("ready_skill $skill", |
1188 | $self->{map_widget}->add_command ("ready_skill $skill", |
| 1101 | (CFPlus::asxml "Ready the skill '$skill'\n\n") |
1189 | (DC::asxml "Ready the skill '$skill'\n\n") |
| 1102 | . $skill_help{$skill}); |
1190 | . $skill_help{$skill}); |
| 1103 | $self->{map_widget}->add_command ("use_skill $skill", |
1191 | $self->{map_widget}->add_command ("use_skill $skill", |
| 1104 | (CFPlus::asxml "Immediately use the skill '$skill'\n\n") |
1192 | (DC::asxml "Immediately use the skill '$skill'\n\n") |
| 1105 | . $skill_help{$skill}); |
1193 | . $skill_help{$skill}); |
| 1106 | } |
1194 | } |
| 1107 | } |
1195 | } |
| 1108 | |
1196 | |
| 1109 | sub eof { |
1197 | sub eof { |
| … | |
… | |
| 1113 | |
1201 | |
| 1114 | ::stop_game (); |
1202 | ::stop_game (); |
| 1115 | } |
1203 | } |
| 1116 | |
1204 | |
| 1117 | sub update_floorbox { |
1205 | sub update_floorbox { |
| 1118 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
1206 | $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
| 1119 | return unless $::CONN; |
1207 | return unless $::CONN; |
| 1120 | |
1208 | |
| 1121 | $::FLOORBOX->clear; |
1209 | $::FLOORBOX->clear; |
| 1122 | |
1210 | |
| 1123 | my @add; |
1211 | my @add; |
| 1124 | |
1212 | |
| 1125 | my $row; |
1213 | my $row; |
| 1126 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
1214 | for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
|
|
1215 | next if $_->{tag} & 0x80000000; |
| 1127 | if ($row < 6) { |
1216 | if ($row < 6) { |
| 1128 | local $_->{face_widget}; # hack to force recreation of widget |
1217 | local $_->{face_widget}; # hack to force recreation of widget |
| 1129 | local $_->{desc_widget}; # hack to force recreation of widget |
1218 | local $_->{desc_widget}; # hack to force recreation of widget |
| 1130 | CFPlus::Item::update_widgets $_; |
1219 | DC::Item::update_widgets $_; |
| 1131 | |
1220 | |
| 1132 | push @add, |
1221 | push @add, |
| 1133 | 0, $row, $_->{face_widget}, |
1222 | 0, $row, $_->{face_widget}, |
| 1134 | 1, $row, $_->{desc_widget}; |
1223 | 1, $row, $_->{desc_widget}; |
| 1135 | |
1224 | |
| 1136 | $row++; |
1225 | $row++; |
| 1137 | } else { |
1226 | } else { |
| 1138 | push @add, 1, $row, new CFPlus::UI::Button |
1227 | push @add, 1, $row, new DC::UI::Button |
| 1139 | text => "More...", |
1228 | text => "More...", |
| 1140 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
1229 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
| 1141 | ; |
1230 | ; |
| 1142 | last; |
1231 | last; |
| 1143 | } |
1232 | } |
| 1144 | } |
1233 | } |
| 1145 | if ($::CONN->{open_container}) { |
1234 | if ($::CONN->{open_container}) { |
| 1146 | push @add, 1, $row++, new CFPlus::UI::Button |
1235 | push @add, 1, $row++, new DC::UI::Button |
| 1147 | text => "Close container", |
1236 | text => "Close container", |
| 1148 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
1237 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
| 1149 | ; |
1238 | ; |
| 1150 | } |
1239 | } |
| 1151 | |
1240 | |
| 1152 | $::FLOORBOX->add_at (@add); |
1241 | $::FLOORBOX->add_at (@add); |
| 1153 | }); |
1242 | }); |
| 1154 | |
1243 | |
| 1155 | $::WANT_REFRESH->start; |
1244 | $::WANT_REFRESH = 1; |
| 1156 | } |
1245 | } |
| 1157 | |
1246 | |
| 1158 | sub set_opencont { |
1247 | sub set_opencont { |
| 1159 | my ($conn, $tag, $name) = @_; |
1248 | my ($conn, $tag, $name) = @_; |
| 1160 | $conn->{open_container} = $tag; |
1249 | $conn->{open_container} = $tag; |
| 1161 | update_floorbox; |
1250 | update_floorbox; |
| 1162 | |
1251 | |
| 1163 | $::INVR_HB->clear (); |
1252 | $::INVR_HB->clear; |
| 1164 | $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
1253 | $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name); |
| 1165 | |
1254 | |
| 1166 | if ($tag != 0) { # Floor isn't closable, is it? |
1255 | if ($tag != 0) { # Floor isn't closable, is it? |
| 1167 | $::INVR_HB->add (new CFPlus::UI::Button |
1256 | $::INVR_HB->add (new DC::UI::Button |
| 1168 | text => "Close container", |
1257 | text => "Close container", |
| 1169 | tooltip => "Close the currently open container (if one is open)", |
1258 | tooltip => "Close the currently open container (if one is open)", |
| 1170 | on_activate => sub { |
1259 | on_activate => sub { |
| 1171 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
1260 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
| 1172 | if $tag != 0; |
1261 | if $tag != 0; |
| … | |
… | |
| 1179 | } |
1268 | } |
| 1180 | |
1269 | |
| 1181 | sub update_containers { |
1270 | sub update_containers { |
| 1182 | my ($self) = @_; |
1271 | my ($self) = @_; |
| 1183 | |
1272 | |
| 1184 | $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
1273 | $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
| 1185 | my $todo = delete $self->{update_container} |
1274 | my $todo = delete $self->{update_container} |
| 1186 | or return; |
1275 | or return; |
| 1187 | |
1276 | |
| 1188 | for my $tag (keys %$todo) { |
1277 | for my $tag (keys %$todo) { |
| 1189 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
1278 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
| … | |
… | |
| 1224 | } |
1313 | } |
| 1225 | |
1314 | |
| 1226 | sub item_update { |
1315 | sub item_update { |
| 1227 | my ($self, $item) = @_; |
1316 | my ($self, $item) = @_; |
| 1228 | |
1317 | |
| 1229 | #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; |
1318 | #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n"; |
| 1230 | |
1319 | |
| 1231 | CFPlus::Item::update_widgets $item; |
1320 | DC::Item::update_widgets $item; |
| 1232 | |
1321 | |
| 1233 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
1322 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
| 1234 | set_opencont ($::CONN, 0, "Floor"); |
1323 | set_opencont ($::CONN, 0, "Floor"); |
| 1235 | |
1324 | |
| 1236 | } elsif ($item->{flags} & F_OPEN) { |
1325 | } elsif ($item->{flags} & F_OPEN) { |
| 1237 | set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); |
1326 | set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item); |
| 1238 | |
1327 | |
| 1239 | } else { |
1328 | } else { |
| 1240 | $self->{update_container}{$item->{container}}++; |
1329 | $self->{update_container}{$item->{container}}++; |
| 1241 | $self->update_containers; |
1330 | $self->update_containers; |
| 1242 | } |
1331 | } |
| … | |
… | |
| 1253 | |
1342 | |
| 1254 | my $weight = .001 * $self->{player}{weight}; |
1343 | my $weight = .001 * $self->{player}{weight}; |
| 1255 | my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; |
1344 | my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; |
| 1256 | |
1345 | |
| 1257 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); |
1346 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); |
| 1258 | $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); |
1347 | $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit); |
| 1259 | $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); |
1348 | $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); |
| 1260 | } |
1349 | } |
| 1261 | |
1350 | |
| 1262 | sub update_server_info { |
1351 | sub update_server_info { |
| 1263 | my ($self) = @_; |
1352 | my ($self) = @_; |
| … | |
… | |
| 1271 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
1360 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
| 1272 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
1361 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
| 1273 | . "editing support $yesno[!!$self->{editor_support}]\n" |
1362 | . "editing support $yesno[!!$self->{editor_support}]\n" |
| 1274 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
1363 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
| 1275 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
1364 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
| 1276 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1365 | . "client support $yesno[$self->{cfplus_ext} > 0]" |
| 1277 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1366 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
| 1278 | . "map size $self->{mapw}×$self->{maph}\n" |
1367 | . "map size $self->{mapw}×$self->{maph}\n" |
| 1279 | ); |
1368 | ); |
| 1280 | |
1369 | |
| 1281 | } |
1370 | } |
| … | |
… | |
| 1301 | 0 |
1390 | 0 |
| 1302 | }); |
1391 | }); |
| 1303 | |
1392 | |
| 1304 | $self->update_server_info; |
1393 | $self->update_server_info; |
| 1305 | |
1394 | |
| 1306 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
|
|
| 1307 | $self->send_command ("output-count $::CFG->{output_count}"); |
|
|
| 1308 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1395 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
| 1309 | $self->send_command ("pickup $::CFG->{pickup}"); |
1396 | $self->send_command ("pickup $::CFG->{pickup}"); |
|
|
1397 | |
|
|
1398 | $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]", |
|
|
1399 | DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d# |
| 1310 | } |
1400 | } |
| 1311 | |
1401 | |
| 1312 | sub lookat { |
1402 | sub lookat { |
| 1313 | my ($self, $x, $y) = @_; |
1403 | my ($self, $x, $y) = @_; |
| 1314 | |
1404 | |
| … | |
… | |
| 1316 | $self->send_ext_req (lookat => $x, $y, sub { |
1406 | $self->send_ext_req (lookat => $x, $y, sub { |
| 1317 | my (%msg) = @_; |
1407 | my (%msg) = @_; |
| 1318 | |
1408 | |
| 1319 | if (exists $msg{npc_dialog}) { |
1409 | if (exists $msg{npc_dialog}) { |
| 1320 | # start npc chat dialog |
1410 | # start npc chat dialog |
| 1321 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
1411 | $self->{npc_dialog} = new DC::NPCDialog:: |
| 1322 | token => $msg{npc_dialog}, |
1412 | token => $msg{npc_dialog}, |
| 1323 | title => "$msg{npc_dialog}[0] (NPC)", |
1413 | title => "$msg{npc_dialog}[0] (NPC)", |
| 1324 | conn => $self, |
1414 | conn => $self, |
| 1325 | ; |
1415 | ; |
| 1326 | } |
1416 | } |
| … | |
… | |
| 1339 | $self->SUPER::destroy; |
1429 | $self->SUPER::destroy; |
| 1340 | |
1430 | |
| 1341 | %$self = (); |
1431 | %$self = (); |
| 1342 | } |
1432 | } |
| 1343 | |
1433 | |
| 1344 | package CFPlus::NPCDialog; |
1434 | package DC::NPCDialog; |
| 1345 | |
1435 | |
| 1346 | our @ISA = 'CFPlus::UI::Toplevel'; |
1436 | our @ISA = 'DC::UI::Toplevel'; |
| 1347 | |
1437 | |
| 1348 | sub new { |
1438 | sub new { |
| 1349 | my $class = shift; |
1439 | my $class = shift; |
| 1350 | |
1440 | |
| 1351 | my $self = $class->SUPER::new ( |
1441 | my $self = $class->SUPER::new ( |
| … | |
… | |
| 1358 | kw => { hi => 0, yes => 0, no => 0 }, |
1448 | kw => { hi => 0, yes => 0, no => 0 }, |
| 1359 | has_close_button => 1, |
1449 | has_close_button => 1, |
| 1360 | @_, |
1450 | @_, |
| 1361 | ); |
1451 | ); |
| 1362 | |
1452 | |
| 1363 | CFPlus::weaken (my $this = $self); |
1453 | DC::weaken (my $this = $self); |
| 1364 | |
1454 | |
| 1365 | $self->connect (delete => sub { $this->destroy; 1 }); |
1455 | $self->connect (delete => sub { $this->destroy; 1 }); |
| 1366 | |
1456 | |
| 1367 | # better use a pane... |
1457 | # better use a pane... |
| 1368 | $self->add (my $hbox = new CFPlus::UI::HBox); |
1458 | $self->add (my $hbox = new DC::UI::HBox); |
| 1369 | $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); |
1459 | $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1); |
| 1370 | |
1460 | |
| 1371 | $hbox->add (my $vbox = new CFPlus::UI::VBox); |
1461 | $hbox->add (my $vbox = new DC::UI::VBox); |
| 1372 | |
1462 | |
| 1373 | $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); |
1463 | $vbox->add (new DC::UI::Label text => "Message Entry:"); |
| 1374 | $vbox->add ($self->{entry} = new CFPlus::UI::Entry |
1464 | $vbox->add ($self->{entry} = new DC::UI::Entry |
| 1375 | tooltip => "#npc_message_entry", |
1465 | tooltip => "#npc_message_entry", |
| 1376 | on_activate => sub { |
1466 | on_activate => sub { |
| 1377 | my ($entry, $text) = @_; |
1467 | my ($entry, $text) = @_; |
| 1378 | |
1468 | |
| 1379 | return unless $text =~ /\S/; |
1469 | return unless $text =~ /\S/; |
| … | |
… | |
| 1383 | |
1473 | |
| 1384 | 0 |
1474 | 0 |
| 1385 | }, |
1475 | }, |
| 1386 | ); |
1476 | ); |
| 1387 | |
1477 | |
| 1388 | $vbox->add ($self->{options} = new CFPlus::UI::VBox); |
1478 | $vbox->add ($self->{options} = new DC::UI::VBox); |
| 1389 | |
1479 | |
| 1390 | $self->{bye_button} = new CFPlus::UI::Button |
1480 | $self->{bye_button} = new DC::UI::Button |
| 1391 | text => "Bye (close)", |
1481 | text => "Bye (close)", |
| 1392 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
1482 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
| 1393 | on_activate => sub { $this->destroy; 1 }, |
1483 | on_activate => sub { $this->destroy; 1 }, |
| 1394 | ; |
1484 | ; |
| 1395 | |
1485 | |
| … | |
… | |
| 1414 | }; |
1504 | }; |
| 1415 | |
1505 | |
| 1416 | sub update_options { |
1506 | sub update_options { |
| 1417 | my ($self) = @_; |
1507 | my ($self) = @_; |
| 1418 | |
1508 | |
| 1419 | CFPlus::weaken $self; |
1509 | DC::weaken $self; |
| 1420 | |
1510 | |
| 1421 | $self->{options}->clear; |
1511 | $self->{options}->clear; |
| 1422 | $self->{options}->add ($self->{bye_button}); |
1512 | $self->{options}->add ($self->{bye_button}); |
| 1423 | |
1513 | |
| 1424 | for my $kw (sort keys %{ $self->{kw} }) { |
1514 | for my $kw (sort keys %{ $self->{kw} }) { |
| 1425 | $self->{options}->add (new CFPlus::UI::Button |
1515 | $self->{options}->add (new DC::UI::Button |
| 1426 | text => $kw, |
1516 | text => $kw, |
| 1427 | on_activate => sub { |
1517 | on_activate => sub { |
| 1428 | $self->send ($kw); |
1518 | $self->send ($kw); |
| 1429 | 0 |
1519 | 0 |
| 1430 | }, |
1520 | }, |
| … | |
… | |
| 1433 | } |
1523 | } |
| 1434 | |
1524 | |
| 1435 | sub feed { |
1525 | sub feed { |
| 1436 | my ($self, $type, @arg) = @_; |
1526 | my ($self, $type, @arg) = @_; |
| 1437 | |
1527 | |
| 1438 | CFPlus::weaken $self; |
1528 | DC::weaken $self; |
| 1439 | |
1529 | |
| 1440 | if ($type eq "update") { |
1530 | if ($type eq "update") { |
| 1441 | my (%info) = @arg; |
1531 | my (%info) = @arg; |
| 1442 | |
1532 | |
| 1443 | $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; |
1533 | $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; |
| 1444 | $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; |
1534 | $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; |
| 1445 | |
1535 | |
| 1446 | if (exists $info{msg}) { |
1536 | if (exists $info{msg}) { |
| 1447 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; |
1537 | my $text = "\n" . DC::Protocol::sanitise_xml $info{msg}; |
| 1448 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1538 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
| 1449 | my @link; |
1539 | my @link; |
| 1450 | $text =~ s{ |
1540 | $text =~ s{ |
| 1451 | ($match) |
1541 | ($match) |
| 1452 | }{ |
1542 | }{ |
| 1453 | my $kw = $1; |
1543 | my $kw = $1; |
| 1454 | |
1544 | |
| 1455 | push @link, new CFPlus::UI::Label |
1545 | push @link, new DC::UI::Label |
| 1456 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
1546 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
| 1457 | can_hover => 1, |
1547 | can_hover => 1, |
| 1458 | can_events => 1, |
1548 | can_events => 1, |
| 1459 | padding_x => 0, |
1549 | padding_x => 0, |
| 1460 | padding_y => 0, |
1550 | padding_y => 0, |
| … | |
… | |
| 1478 | } |
1568 | } |
| 1479 | |
1569 | |
| 1480 | sub send { |
1570 | sub send { |
| 1481 | my ($self, $msg) = @_; |
1571 | my ($self, $msg) = @_; |
| 1482 | |
1572 | |
| 1483 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1573 | $self->{textview}->add_paragraph ({ |
|
|
1574 | markup => |
|
|
1575 | "\n<span foreground='#ffff00'><b>" |
|
|
1576 | . (DC::asxml $msg) |
|
|
1577 | . "</b></span>" |
|
|
1578 | }); |
| 1484 | $self->{textview}->scroll_to_bottom; |
1579 | $self->{textview}->scroll_to_bottom; |
| 1485 | |
1580 | |
| 1486 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
1581 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
| 1487 | } |
1582 | } |
| 1488 | |
1583 | |
