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