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