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