1 | package CFPlus::Protocol; |
1 | package DC::Protocol; |
2 | |
2 | |
3 | use utf8; |
3 | use utf8; |
4 | use strict; |
4 | use strict; |
5 | |
5 | |
6 | use Crossfire::Protocol::Constants; |
6 | use Deliantra::Protocol::Constants; |
7 | |
7 | |
8 | use CFPlus; |
8 | use DC; |
9 | use CFPlus::DB; |
9 | use DC::DB; |
10 | use CFPlus::UI; |
10 | use DC::UI; |
11 | use CFPlus::Pod; |
11 | use DC::Pod; |
12 | use CFPlus::Macro; |
12 | use DC::Macro; |
13 | use CFPlus::Item; |
13 | use DC::Item; |
14 | |
14 | |
15 | use Crossfire::Protocol::Base 0.95; |
|
|
16 | |
|
|
17 | use base 'Crossfire::Protocol::Base'; |
15 | use base 'Deliantra::Protocol::Base'; |
18 | |
16 | |
19 | sub new { |
17 | sub new { |
20 | my ($class, %arg) = @_; |
18 | my ($class, %arg) = @_; |
21 | |
19 | |
22 | my $self = $class->SUPER::new (%arg, |
20 | my $self = $class->SUPER::new (%arg, |
23 | setup_req => { |
21 | setup_req => { |
24 | extmap => 1, |
22 | extmap => 1, |
25 | excmd => 1, |
23 | excmd => 1, |
26 | xwidget1 => 1,#d# |
24 | widget => 2, |
27 | %{$arg{setup_req} || {}}, |
25 | %{$arg{setup_req} || {}}, |
28 | }, |
26 | }, |
29 | ); |
27 | ); |
30 | |
28 | |
31 | $self->{map_widget}->clr_commands; |
29 | $self->{map_widget}->clr_commands; |
… | |
… | |
36 | |
34 | |
37 | my $cmd = $1; |
35 | my $cmd = $1; |
38 | my @args = split /\|/, $2; |
36 | my @args = split /\|/, $2; |
39 | @args = (".*") unless @args; |
37 | @args = (".*") unless @args; |
40 | |
38 | |
41 | my (undef, @par) = CFPlus::Pod::section_of $_; |
39 | my (undef, @par) = DC::Pod::section_of $_; |
42 | my $text = CFPlus::Pod::as_label @par; |
40 | my $text = DC::Pod::as_label @par; |
43 | |
41 | |
44 | $_ = $_ eq ".*" ? "" : " $_" |
42 | $_ = $_ eq ".*" ? "" : " $_" |
45 | for @args; |
43 | for @args; |
46 | |
44 | |
47 | map ["$cmd$_", $text], |
45 | map ["$cmd$_", $text], |
48 | sort { (length $a) <=> (length $b) } |
46 | sort { (length $a) <=> (length $b) } |
49 | @args |
47 | @args |
50 | } sort { $a->{par} <=> $b->{par} } |
48 | } sort { $a->{par} <=> $b->{par} } |
51 | CFPlus::Pod::find command => "*"; |
49 | DC::Pod::find command => "*"; |
52 | |
50 | |
53 | $self->{json_coder} |
51 | $self->{json_coder} |
54 | ->convert_blessed |
52 | ->convert_blessed |
55 | ->filter_json_single_key_object (__w_ => sub { |
53 | ->filter_json_single_key_object ("\fw" => sub { |
56 | $self->{widget}{$_[0]} |
54 | $self->{widget}{$_[0]} |
|
|
55 | }) |
|
|
56 | ->filter_json_single_key_object ("\fc" => sub { |
|
|
57 | my ($id) = @_; |
|
|
58 | sub { |
|
|
59 | $self->send_exti_msg (w_e => $id, @_); |
|
|
60 | } |
57 | }); |
61 | }); |
58 | |
62 | |
59 | # destroy widgets on logout |
63 | # destroy widgets on logout |
60 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
64 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
61 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
65 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
… | |
… | |
66 | |
70 | |
67 | $self->{map_widget}->add_command (@$_) |
71 | $self->{map_widget}->add_command (@$_) |
68 | for @cmd_help; |
72 | for @cmd_help; |
69 | |
73 | |
70 | { |
74 | { |
71 | $self->{dialogue} = my $tex = new_from_file CFPlus::Texture |
75 | $self->{dialogue} = my $tex = new_from_file DC::Texture |
72 | CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; |
76 | DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1; |
73 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
77 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
74 | } |
78 | } |
75 | |
79 | |
76 | { |
80 | { |
77 | $self->{noface} = my $tex = new_from_file CFPlus::Texture |
81 | $self->{noface} = my $tex = new_from_file DC::Texture |
78 | CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; |
82 | DC::find_rcfile "noface.png", minify => 1, mipmap => 1; |
79 | $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
83 | $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
80 | } |
84 | } |
81 | |
85 | |
82 | $self->{open_container} = 0; |
86 | $self->{open_container} = 0; |
83 | |
87 | |
… | |
… | |
98 | } |
102 | } |
99 | |
103 | |
100 | sub ext_capabilities { |
104 | sub ext_capabilities { |
101 | my ($self, %cap) = @_; |
105 | my ($self, %cap) = @_; |
102 | |
106 | |
103 | #$self->send ("setup sound 0"); # we use a different protocol |
|
|
104 | $self->update_fx_want; |
107 | $self->update_fx_want; |
105 | |
108 | |
106 | $self->send_exti_req (resource => "exp_table", sub { |
109 | $self->send_exti_req (resource => "exp_table", sub { |
107 | my ($exp_table) = @_; |
110 | my ($exp_table) = @_; |
108 | |
111 | |
… | |
… | |
138 | ############################################################################# |
141 | ############################################################################# |
139 | |
142 | |
140 | sub widget_associate { |
143 | sub widget_associate { |
141 | my ($self, $ws, $id, $widget) = @_; |
144 | my ($self, $ws, $id, $widget) = @_; |
142 | |
145 | |
143 | if ($widget) { |
146 | $widget ||= new DC::UI::Bin; |
|
|
147 | |
144 | $widget->{s_id} = $id; |
148 | $widget->{s_id} = $id; |
145 | $self->{widget}{$id} = $widget; |
149 | $self->{widget}{$id} = $widget; |
146 | |
150 | |
147 | if ($ws) { |
151 | if ($ws) { |
148 | $widget->{s_ws} = $ws; |
152 | $widget->{s_ws} = $ws; |
149 | $self->{widgetset}{$ws}{w}{$id} = $widget; |
153 | $self->{widgetset}{$ws}{w}{$id} = $widget; |
150 | } |
154 | } |
151 | |
155 | |
152 | $widget->connect (on_destroy => sub { |
156 | $widget->connect (on_destroy => sub { |
153 | my ($widget) = @_; |
157 | my ($widget) = @_; |
154 | |
158 | |
155 | delete $self->{widget}{$widget->{s_id}}; |
159 | delete $self->{widget}{$widget->{s_id}}; |
156 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} |
160 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} |
157 | if exists $widget->{s_ws}; |
161 | if exists $widget->{s_ws}; |
158 | }); |
162 | }); |
159 | |
|
|
160 | 1 |
|
|
161 | } else { |
|
|
162 | $self->send_exti_msg (w_e => $id, undef); |
|
|
163 | |
|
|
164 | 0 |
|
|
165 | } |
|
|
166 | } |
163 | } |
167 | |
164 | |
168 | # widgetset new |
165 | # widgetset new |
169 | sub ext_ws_n { |
166 | sub ext_ws_n { |
170 | my ($id) = @_; |
167 | my ($self, $id) = @_; |
171 | |
168 | |
172 | $self->{widgetset}{$id} = { |
169 | $self->{widgetset}{$id} = { |
173 | w => {}, |
170 | w => {}, |
174 | }; |
171 | }; |
175 | } |
172 | } |
176 | |
173 | |
177 | # widgetset destroy |
174 | # widgetset destroy |
178 | sub ext_ws_d { |
175 | sub ext_ws_d { |
179 | my ($id) = @_; |
176 | my ($self, $id) = @_; |
180 | |
177 | |
181 | my $ws = delete $self->{widgetset}{$id} |
178 | my $ws = delete $self->{widgetset}{$id} |
182 | or return; |
179 | or return; |
183 | |
180 | |
184 | $_->destroy |
181 | $_->destroy |
185 | for values %{$ws->{w}}; |
182 | for values %{$ws->{w}}; |
186 | } |
183 | } |
187 | |
184 | |
188 | # widgetset create |
185 | # widgetset create |
189 | sub ext_ws_c => sub { |
186 | sub ext_ws_c { |
190 | my ($ws, $id, $class, $args) = @_; |
187 | my ($self, $ws, $id, $class, $args) = @_; |
191 | |
|
|
192 | for my $ev (grep /^on_/, keys %$args) { |
|
|
193 | my $rid = $args->{$ev}; |
|
|
194 | $args->{$ev} = sub { |
|
|
195 | my $id = shift->{s_id}; |
|
|
196 | $self->send_exti_msg (w_e => $id, $rid, @_); |
|
|
197 | |
|
|
198 | 1 |
|
|
199 | }; |
|
|
200 | } |
|
|
201 | |
188 | |
202 | $self->widget_associate ( |
189 | $self->widget_associate ( |
203 | $ws, $id => scalar eval { |
190 | $ws, $id => scalar eval { |
204 | local $SIG{__DIE__}; |
191 | local $SIG{__DIE__}; |
205 | "CFPlus::UI::$class"->new (%$args) |
192 | "DC::UI::$class"->new (%$args) |
|
|
193 | } |
|
|
194 | ); |
|
|
195 | } |
|
|
196 | |
|
|
197 | # widgetset create template |
|
|
198 | sub ext_ws_ct { |
|
|
199 | my ($self, $ws, $template, $cfg) = @_; |
|
|
200 | |
|
|
201 | $template = eval <<EOF; |
|
|
202 | [ |
|
|
203 | Toplevel => { |
|
|
204 | s_id => "toplevel", |
|
|
205 | title => "Character Creation", |
|
|
206 | x => "center", |
|
|
207 | y => "center", |
|
|
208 | z => 5, |
|
|
209 | s_cl => [VBox => {s_cl => [ |
|
|
210 | Label => { |
|
|
211 | text => "Character Creation", |
|
|
212 | fontsize => 1, |
|
|
213 | align => 0, |
|
|
214 | }, |
|
|
215 | Label => { |
|
|
216 | markup => "View or Edit your character attributes below, then press <b>Finish</b> to create your character", |
|
|
217 | fontsize => 0.8, |
|
|
218 | align => 0, |
|
|
219 | }, |
|
|
220 | Notebook => { |
|
|
221 | s_cl => [ |
|
|
222 | Label => { |
|
|
223 | text => "hulla-hoop" |
|
|
224 | }, |
|
|
225 | Entry => { |
|
|
226 | s_id => "entry", |
|
|
227 | }, |
|
|
228 | ], |
|
|
229 | }, |
|
|
230 | Button => { |
|
|
231 | s_id => "finish", |
|
|
232 | title => "Finish", |
|
|
233 | }, |
206 | } |
234 | ]}], |
207 | ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; |
235 | }, |
|
|
236 | ] |
|
|
237 | EOF |
|
|
238 | die if $@; |
|
|
239 | |
|
|
240 | my $parse_list; $parse_list = sub { |
|
|
241 | my ($list) = @_; |
|
|
242 | my @w; |
|
|
243 | |
|
|
244 | while (@$list) { |
|
|
245 | my ($class, $args) = splice @$list, 0, 2; |
|
|
246 | my $name = delete $args->{s_id}; |
|
|
247 | my $cl = delete $args->{s_cl}; |
|
|
248 | my $cfg = delete $cfg->{$name}; |
|
|
249 | my $id = delete $cfg->{id}; |
|
|
250 | my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) } |
|
|
251 | or next; |
|
|
252 | |
|
|
253 | $self->widget_associate ($ws, $id, $w) |
|
|
254 | if $id; |
|
|
255 | |
|
|
256 | $w->add ($parse_list->($cl)) |
|
|
257 | if $cl; |
|
|
258 | |
|
|
259 | push @w, $w; |
|
|
260 | } |
|
|
261 | |
|
|
262 | @w |
|
|
263 | }; |
|
|
264 | |
|
|
265 | $parse_list->($template); |
|
|
266 | |
208 | } |
267 | } |
209 | |
268 | |
210 | # widgetset associate |
269 | # widgetset associate |
211 | sub ext_ws_a { |
270 | sub ext_ws_a { |
212 | my (%ass) = @_; |
271 | my ($self, %ass) = @_; |
213 | |
272 | |
214 | # everything that has a name, wether conceivably useful or not |
273 | # everything that has a name, wether conceivably useful or not |
215 | my %wkw = ( |
274 | my %wkw = ( |
216 | root => $CFPlus::UI::ROOT, |
275 | root => $DC::UI::ROOT, |
217 | tooltip => $CFPlus::UI::TOOLTIP, |
276 | tooltip => $DC::UI::TOOLTIP, |
218 | |
277 | |
219 | mapwidget => $::MAPWIDGET, |
278 | mapwidget => $::MAPWIDGET, |
220 | buttonbar => $::BUTTONBAR, |
279 | buttonbar => $::BUTTONBAR, |
221 | metaserver => $::METASERVER, |
280 | metaserver => $::METASERVER, |
222 | buttonbar => $::BUTTONBAR, |
281 | buttonbar => $::BUTTONBAR, |
… | |
… | |
248 | invr => $::INVR, |
307 | invr => $::INVR, |
249 | invr_hb => $::INVR_HB, |
308 | invr_hb => $::INVR_HB, |
250 | ); |
309 | ); |
251 | |
310 | |
252 | while (my ($id, $name) = each %ass) { |
311 | while (my ($id, $name) = each %ass) { |
253 | $self->widget_associate (undef, $id => $wkw{$name}) |
312 | $self->widget_associate (undef, $id => $wkw{$name}); |
254 | or warn "server failed to associate non-existent well-known widget $name\n"; |
|
|
255 | } |
313 | } |
256 | } |
314 | } |
257 | |
315 | |
258 | # widget call |
316 | # widget call |
259 | sub ext_w_c { |
317 | sub ext_w_c { |
260 | my ($id, $rid, $method, @args) = @_; |
318 | my ($self, $id, $rcb, $method, @args) = @_; |
261 | |
319 | |
262 | my $w = $self->{widget}{$id} |
320 | my $w = $self->{widget}{$id} |
263 | or return; |
321 | or return; |
264 | |
322 | |
265 | if ($rid) { |
323 | if ($rcb) { |
266 | $self->send_exti_msg (w_r => $rid, $w->$method (@args)); |
324 | $rcb->($w->$method (@args)); |
267 | } else { |
325 | } else { |
268 | $w->$method (@args); |
326 | $w->$method (@args); |
269 | } |
327 | } |
270 | } |
328 | } |
271 | |
329 | |
272 | # widget set |
330 | # widget set |
273 | sub ext_w_s { |
331 | sub ext_w_s { |
274 | my ($id, $attr) = @_; |
332 | my ($self, $id, $attr) = @_; |
275 | |
333 | |
276 | my $w = $self->{widget}{$id} |
334 | my $w = $self->{widget}{$id} |
277 | or return; |
335 | or return; |
278 | |
336 | |
279 | for (my $i = 0; $i < $#$attr; $i += 2) { |
337 | for (my $i = 0; $i < $#$attr; $i += 2) { |
… | |
… | |
287 | } |
345 | } |
288 | } |
346 | } |
289 | |
347 | |
290 | # widget get |
348 | # widget get |
291 | sub ext_w_g { |
349 | sub ext_w_g { |
292 | my ($id, $rid, $attr) = @_; |
350 | my ($self, $id, $rid, @attr) = @_; |
293 | |
351 | |
294 | my $w = $self->{widget}{$id} |
352 | my $w = $self->{widget}{$id} |
295 | or return; |
353 | or return; |
296 | |
354 | |
297 | $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); |
355 | $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr); |
298 | }) |
356 | } |
299 | |
357 | |
300 | # message window |
358 | # message window |
301 | sub ext_channel_info { |
359 | sub ext_channel_info { |
302 | my ($info) = @_; |
360 | my ($self, $info) = @_; |
303 | $self->{channels}->{$info->{id}} = $info; |
361 | $self->{channels}->{$info->{id}} = $info; |
304 | $::MESSAGE_WINDOW->add_channel ($info); |
362 | $::MESSAGE_WINDOW->add_channel ($info); |
305 | } |
363 | } |
306 | |
364 | |
307 | ############################################################################# |
365 | ############################################################################# |
308 | |
366 | |
309 | sub logprint { |
367 | sub logprint { |
310 | my ($self, @a) = @_; |
368 | my ($self, @a) = @_; |
311 | |
369 | |
312 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
370 | DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
313 | } |
371 | } |
314 | |
372 | |
315 | sub _stat_numdiff { |
373 | sub _stat_numdiff { |
316 | my ($self, $name, $old, $new) = @_; |
374 | my ($self, $name, $old, $new) = @_; |
317 | |
375 | |
… | |
… | |
401 | |
459 | |
402 | if ( |
460 | if ( |
403 | my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange |
461 | my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange |
404 | ) { |
462 | ) { |
405 | my $msg = "<b>stat change</b>: " . (join " ", @diffs); |
463 | my $msg = "<b>stat change</b>: " . (join " ", @diffs); |
406 | $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); |
464 | $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20); |
407 | } |
465 | } |
408 | |
466 | |
409 | $self->update_stats_window ($stats, $prev); |
467 | $self->update_stats_window ($stats, $prev); |
410 | |
468 | |
411 | $self->{prev_stats} = { %$stats }; |
469 | $self->{prev_stats} = { %$stats }; |
… | |
… | |
478 | for keys %RES_TBL; |
536 | for keys %RES_TBL; |
479 | |
537 | |
480 | my $sktbl = $::STATWIDS->{skill_tbl}; |
538 | my $sktbl = $::STATWIDS->{skill_tbl}; |
481 | my @skills = keys %{ $self->{skill_info} }; |
539 | my @skills = keys %{ $self->{skill_info} }; |
482 | |
540 | |
483 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
541 | my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
|
|
542 | map [$_, $self->{skill_info}{$_}], |
|
|
543 | grep exists $stats->{$_}, |
|
|
544 | @skills; |
|
|
545 | |
|
|
546 | if ($self->{stat_order} ne join ",", map $_->[0], @order) { |
|
|
547 | $self->{stat_order} = join ",", map $_->[0], @order; |
|
|
548 | |
484 | $sktbl->clear; |
549 | $sktbl->clear; |
485 | |
550 | |
486 | my $sw = $self->{skillwid}{""} ||= [ |
551 | my $sw = $self->{skillwid}{""} ||= [ |
487 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
552 | 0, 0, (new DC::UI::Label text => "Experience", align => 1), |
488 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
553 | 1, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
489 | 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
554 | 2, 0, (new DC::UI::Label text => "Progress", align => 0), |
490 | 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
555 | 3, 0, (new DC::UI::Label text => "Skill", expand => 1), |
491 | 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
556 | 4, 0, (new DC::UI::Label text => "Experience", align => 1), |
492 | 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
557 | 5, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
493 | 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
558 | 6, 0, (new DC::UI::Label text => "Progress", align => 0), |
494 | 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
559 | 7, 0, (new DC::UI::Label text => "Skill", expand => 1), |
495 | ]; |
560 | ]; |
496 | |
561 | |
497 | my @add = @$sw; |
562 | my @add = @$sw; |
498 | |
563 | |
499 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
564 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
500 | |
565 | |
501 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
566 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
502 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
567 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
503 | |
568 | |
504 | my ($x, $y) = (0, 1); |
569 | my ($x, $y) = (0, 1); |
505 | for ( |
570 | for (@order) { |
506 | sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
|
|
507 | map [$_, $self->{skill_info}{$_}], |
|
|
508 | grep exists $stats->{$_}, |
|
|
509 | @skills |
|
|
510 | ) { |
|
|
511 | my ($idx, $name) = @$_; |
571 | my ($idx, $name) = @$_; |
512 | |
572 | |
513 | my $spell_cb = sub { |
573 | my $spell_cb = sub { |
514 | my ($widget, $ev) = @_; |
574 | my ($widget, $ev) = @_; |
515 | |
575 | |
516 | if ($ev->{button} == 1) { |
576 | if ($ev->{button} == 1) { |
517 | $::CONN->user_send ("ready_skill $name"); |
577 | $::CONN->user_send ("ready_skill $name"); |
518 | } elsif ($ev->{button} == 2) { |
578 | } elsif ($ev->{button} == 2) { |
519 | $::CONN->user_send ("use_skill $name"); |
579 | $::CONN->user_send ("use_skill $name"); |
520 | } elsif ($ev->{button} == 3) { |
580 | } elsif ($ev->{button} == 3) { |
521 | my $shortname = CFPlus::shorten $name, 14; |
581 | my $shortname = DC::shorten $name, 14; |
522 | (new CFPlus::UI::Menu |
582 | (new DC::UI::Menu |
523 | items => [ |
583 | items => [ |
524 | ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], |
584 | ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }], |
525 | ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], |
585 | ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }], |
526 | ], |
586 | ], |
527 | )->popup ($ev); |
587 | )->popup ($ev); |
528 | } else { |
588 | } else { |
529 | return 0; |
589 | return 0; |
530 | } |
590 | } |
… | |
… | |
532 | 1 |
592 | 1 |
533 | }; |
593 | }; |
534 | |
594 | |
535 | my $sw = $self->{skillwid}{$idx} ||= [ |
595 | my $sw = $self->{skillwid}{$idx} ||= [ |
536 | # exp |
596 | # exp |
537 | (new CFPlus::UI::Label |
597 | (new DC::UI::Label |
538 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
598 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
539 | |
599 | |
540 | # level |
600 | # level |
541 | (new CFPlus::UI::Label |
601 | (new DC::UI::Label |
542 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
602 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
543 | |
603 | |
544 | # progress |
604 | # progress |
545 | (new CFPlus::UI::ExperienceProgress), |
605 | (new DC::UI::ExperienceProgress), |
546 | |
606 | |
547 | # label |
607 | # label |
548 | (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
608 | (new DC::UI::Label text => $name, on_button_down => $spell_cb, |
549 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
609 | can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
550 | ]; |
610 | ]; |
551 | |
611 | |
552 | push @add, |
612 | push @add, |
553 | $x * 4 + 0, $y, $sw->[0], |
613 | $x * 4 + 0, $y, $sw->[0], |
554 | $x * 4 + 1, $y, $sw->[1], |
614 | $x * 4 + 1, $y, $sw->[1], |
… | |
… | |
560 | } |
620 | } |
561 | |
621 | |
562 | $sktbl->add_at (@add); |
622 | $sktbl->add_at (@add); |
563 | } |
623 | } |
564 | |
624 | |
565 | for (grep exists $stats->{$_}, @skills) { |
625 | for (@order) { |
|
|
626 | my ($idx, $name) = @$_; |
|
|
627 | my $val = $stats->{$idx}; |
|
|
628 | |
|
|
629 | next if $prev->{$idx}[1] eq $val->[1]; |
|
|
630 | |
566 | my $sw = $self->{skillwid}{$_}; |
631 | my $sw = $self->{skillwid}{$idx}; |
567 | $sw->[0]->set_text (::formsep ($stats->{$_}[1])); |
632 | $sw->[0]->set_text (::formsep ($val->[1])); |
568 | $sw->[1]->set_text ($stats->{$_}[0] * 1); |
633 | $sw->[1]->set_text ($val->[0] * 1); |
569 | $sw->[2]->set_value (@{$stats->{$_}}); |
634 | $sw->[2]->set_value (@$val); |
570 | } |
|
|
571 | } |
|
|
572 | |
635 | |
573 | sub macro_send { |
636 | $::GAUGES->{sklprg}->set_label ("$name %d%%"); |
574 | my ($self, $macro) = @_; |
637 | $::GAUGES->{sklprg}->set_value (@$val); |
575 | |
|
|
576 | for my $cmd (@{ $macro->{action} }) { |
|
|
577 | $self->send_command ($cmd); |
|
|
578 | } |
638 | } |
579 | } |
639 | } |
580 | |
640 | |
581 | sub user_send { |
641 | sub user_send { |
582 | my ($self, $command) = @_; |
642 | my ($self, $command) = @_; |
… | |
… | |
584 | $self->{record}->($command) |
644 | $self->{record}->($command) |
585 | if $self->{record}; |
645 | if $self->{record}; |
586 | |
646 | |
587 | $self->logprint ("send: ", $command); |
647 | $self->logprint ("send: ", $command); |
588 | $self->send_command ($command); |
648 | $self->send_command ($command); |
589 | ::status ($command); |
|
|
590 | } |
649 | } |
591 | |
650 | |
592 | sub record { |
651 | sub record { |
593 | my ($self, $cb) = @_; |
652 | my ($self, $cb) = @_; |
594 | |
653 | |
… | |
… | |
625 | } |
684 | } |
626 | } |
685 | } |
627 | |
686 | |
628 | if ($delay) { |
687 | if ($delay) { |
629 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
688 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
630 | Event->timer (after => 0.03, cb => sub { |
689 | EV::once undef, 0, 0.03, sub { |
631 | $_[0]->w->cancel; |
|
|
632 | $self->{map_widget}->update; |
690 | $self->{map_widget}->update |
|
|
691 | if $self->{map_widget}; |
633 | }); |
692 | }; |
634 | } else { |
693 | } else { |
635 | $self->{map_widget}->update; |
694 | $self->{map_widget}->update; |
636 | } |
695 | } |
637 | } |
696 | } |
638 | |
697 | |
… | |
… | |
650 | |
709 | |
651 | my ($hash, $x, $y, $w, $h) = @$map_info; |
710 | my ($hash, $x, $y, $w, $h) = @$map_info; |
652 | |
711 | |
653 | my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); |
712 | my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); |
654 | $self->{map_cache_new}{$hash} = \$data; |
713 | $self->{map_cache_new}{$hash} = \$data; |
655 | CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; |
714 | DC::DB::put $self->{mapcache} => $hash => $data, sub { }; |
656 | } |
715 | } |
657 | |
716 | |
658 | sub map_clear { |
717 | sub map_clear { |
659 | my ($self) = @_; |
718 | my ($self) = @_; |
660 | |
719 | |
… | |
… | |
673 | do { |
732 | do { |
674 | $tile = pop @{$self->{bg_fetch}} |
733 | $tile = pop @{$self->{bg_fetch}} |
675 | or return; |
734 | or return; |
676 | } while $self->{texture}[$tile]; |
735 | } while $self->{texture}[$tile]; |
677 | |
736 | |
678 | CFPlus::DB::get tilecache => $tile, sub { |
737 | DC::DB::get tilecache => $tile, sub { |
679 | my ($data) = @_; |
738 | my ($data) = @_; |
680 | |
739 | |
681 | return unless $self->{map}; # stop when destroyed |
740 | return unless $self->{map}; # stop when destroyed |
682 | |
741 | |
683 | if (defined $data) { |
742 | if (defined $data) { |
… | |
… | |
711 | }; |
770 | }; |
712 | |
771 | |
713 | if (my $rdata = $self->{map_cache_old}{$hash}) { |
772 | if (my $rdata = $self->{map_cache_old}{$hash}) { |
714 | $cb->($$rdata); |
773 | $cb->($$rdata); |
715 | } else { |
774 | } else { |
716 | CFPlus::DB::get $self->{mapcache} => $hash, $cb; |
775 | DC::DB::get $self->{mapcache} => $hash, $cb; |
717 | } |
776 | } |
718 | } |
777 | } |
719 | |
778 | |
720 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
779 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
721 | # (server resource,s latency, bandwidth), so this hack is warranted. |
780 | # (server resource,s latency, bandwidth), so this hack is warranted. |
… | |
… | |
845 | |
904 | |
846 | sub face_find { |
905 | sub face_find { |
847 | my ($self, $facenum, $face, $cb) = @_; |
906 | my ($self, $facenum, $face, $cb) = @_; |
848 | |
907 | |
849 | if ($face->{type} == 0) { # FT_FACE |
908 | if ($face->{type} == 0) { # FT_FACE |
850 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
909 | my $id = DC::DB::get_tile_id_sync $face->{name}; |
851 | |
910 | |
852 | $face->{id} = $id; |
911 | $face->{id} = $id; |
853 | $self->{map}->set_tileid ($facenum => $id); |
912 | $self->{map}->set_tileid ($facenum => $id); |
854 | |
913 | |
855 | CFPlus::DB::get tilecache => $id, $cb; |
914 | DC::DB::get tilecache => $id, $cb; |
856 | |
915 | |
857 | } elsif ($face->{type} & 1) { # with metadata |
916 | } elsif ($face->{type} & 1) { # with metadata |
858 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
917 | DC::DB::get res_meta => $face->{name}, $cb; |
859 | |
918 | |
860 | } else { # no metadata |
919 | } else { # no metadata |
861 | CFPlus::DB::get res_data => $face->{name}, $cb; |
920 | DC::DB::get res_data => $face->{name}, $cb; |
862 | } |
921 | } |
863 | } |
922 | } |
864 | |
923 | |
865 | sub face_update { |
924 | sub face_update { |
866 | my ($self, $facenum, $face, $changed) = @_; |
925 | my ($self, $facenum, $face, $changed) = @_; |
867 | |
926 | |
868 | if ($face->{type} == 0) { |
927 | if ($face->{type} == 0) { |
869 | # image, FT_FACE |
928 | # image, FT_FACE |
870 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
929 | DC::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
871 | if $changed; |
930 | if $changed; |
872 | |
931 | |
873 | $self->have_tile ($face->{id}, delete $face->{data}); |
932 | $self->have_tile ($face->{id}, delete $face->{data}); |
874 | |
933 | |
875 | } elsif ($face->{type} & 1) { |
934 | } elsif ($face->{type} & 1) { |
876 | # split metadata case, FT_MUSIC, FT_SOUND |
935 | # split metadata case, FT_MUSIC, FT_SOUND |
877 | if ($changed) { # new data |
936 | if ($changed) { # new data |
878 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
937 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
879 | $face->{data} = $meta; |
938 | $face->{data} = $meta; |
880 | |
939 | |
|
|
940 | # rely on strict ordering here and also on later fetch |
881 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
941 | DC::DB::put res_data => $face->{name} => $data, sub { }; |
882 | CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; |
942 | DC::DB::put res_meta => $face->{name} => $meta, sub { }; |
883 | } |
943 | } |
884 | |
944 | |
885 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
945 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
886 | |
|
|
887 | ::add_license ($face); |
946 | ::add_license ($face); |
|
|
947 | ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) |
|
|
948 | if $changed; |
888 | |
949 | |
889 | if ($face->{type} == 3) { # FT_MUSIC |
950 | if ($face->{type} == 3) { # FT_MUSIC |
890 | ::message ({ markup => "downloaded song #$facenum" }) |
|
|
891 | if $changed; |
|
|
892 | |
|
|
893 | &::audio_music_push ($facenum); |
951 | &::audio_music_push ($facenum); |
894 | } elsif ($face->{type} == 5) { # FT_SOUND |
952 | } elsif ($face->{type} == 5) { # FT_SOUND |
895 | ::message ({ markup => "downloaded sound #$facenum" }) |
|
|
896 | if $changed; |
|
|
897 | |
|
|
898 | &::audio_sound_push ($facenum); |
953 | &::audio_sound_push ($facenum); |
899 | } |
954 | } |
900 | |
955 | |
901 | } else { |
956 | } else { |
902 | # flat resource case, FT_RSRC |
957 | # flat resource case, FT_RSRC |
903 | CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } |
958 | DC::DB::put res_data => $face->{name} => $face->{data}, sub { } |
904 | if $changed; |
959 | if $changed; |
905 | } |
960 | } |
906 | |
961 | |
907 | if (my $cbs = $self->{face_cb}{$facenum}) { |
962 | if (my $cbs = $self->{face_cb}{$facenum}) { |
908 | $_->($face, $changed) for @$cbs; |
963 | $_->($face, $changed) for @$cbs; |
… | |
… | |
919 | my ($self, $tile, $data) = @_; |
974 | my ($self, $tile, $data) = @_; |
920 | |
975 | |
921 | return unless $self->{map}; |
976 | return unless $self->{map}; |
922 | |
977 | |
923 | my $tex = $self->{texture}[$tile] ||= |
978 | my $tex = $self->{texture}[$tile] ||= |
924 | new CFPlus::Texture |
979 | new DC::Texture |
925 | tile => $tile, |
980 | tile => $tile, |
926 | image => $data, delete_image => 1, |
981 | image => $data, delete_image => 1, |
927 | minify => 1, mipmap => 1; |
982 | minify => 1, mipmap => 1; |
928 | |
983 | |
929 | if (my $cbs = delete $self->{tile_cb}{$tile}) { |
984 | if (my $cbs = delete $self->{tile_cb}{$tile}) { |
… | |
… | |
937 | my ($self, $num, $cb) = @_; |
992 | my ($self, $num, $cb) = @_; |
938 | |
993 | |
939 | push @{$self->{face_cb}{$num}}, $cb; |
994 | push @{$self->{face_cb}{$num}}, $cb; |
940 | |
995 | |
941 | defined wantarray |
996 | defined wantarray |
942 | ? CFPlus::guard { |
997 | ? DC::guard { |
943 | @{$self->{face_cb}{$num}} |
998 | @{$self->{face_cb}{$num}} |
944 | = grep $_ != $cb, |
999 | = grep $_ != $cb, |
945 | @{$self->{face_cb}{$num}}; |
1000 | @{$self->{face_cb}{$num}}; |
946 | } |
1001 | } |
947 | : () |
1002 | : () |
… | |
… | |
982 | |
1037 | |
983 | sub sanitise_xml($) { |
1038 | sub sanitise_xml($) { |
984 | local $_ = shift; |
1039 | local $_ = shift; |
985 | |
1040 | |
986 | # we now weed out all tags we do not support |
1041 | # we now weed out all tags we do not support |
987 | s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g; |
1042 | s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>) |
|
|
1043 | }{ |
|
|
1044 | "<" |
|
|
1045 | }gex; |
|
|
1046 | |
988 | # now all entities |
1047 | # now all entities |
989 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
1048 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
990 | |
1049 | |
991 | # handle some elements |
1050 | # handle some elements |
992 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
1051 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
… | |
… | |
1045 | |
1104 | |
1046 | ## try to create single paragraphs of multiple lines sent by the server |
1105 | ## try to create single paragraphs of multiple lines sent by the server |
1047 | # no longer neecssary with TRT servers |
1106 | # no longer neecssary with TRT servers |
1048 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
1107 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
1049 | |
1108 | |
|
|
1109 | for (split /\n/, $text) { |
1050 | ::message ({ |
1110 | ::message ({ |
1051 | fg => $fg, |
1111 | fg => $fg, |
1052 | markup => $_, |
1112 | markup => $_, |
1053 | type => $type, |
1113 | type => $type, |
1054 | extra => [@extra], |
1114 | extra => [@extra], |
1055 | color_flags => $color |
1115 | color_flags => $color, #d# ugly, kill |
1056 | }) for split /\n/, $text; |
1116 | }); |
|
|
1117 | |
|
|
1118 | $color &= ~NDI_CLEAR; # only clear once for multiline messages |
|
|
1119 | # actually, this is an ugly design. _we_ should control the channels, |
|
|
1120 | # not some random other widget, as the channels are clearly protocol-specific. |
|
|
1121 | # then we could also react to flags such as CLEAR without resorting to |
|
|
1122 | # hacks such as color_flags, above. |
|
|
1123 | } |
1057 | |
1124 | |
1058 | $self->{statusbox}->add ($text, |
1125 | $self->{statusbox}->add ($text, |
1059 | group => $text, |
1126 | group => $text, |
1060 | fg => $fg, |
1127 | fg => $fg, |
1061 | timeout => $color >= 2 ? 180 : 10, |
1128 | timeout => $color >= 2 ? 180 : 10, |
1062 | tooltip_font => $::FONT_FIXED, |
1129 | tooltip_font => $::FONT_FIXED, |
1063 | ); |
1130 | ) if $type eq "info"; |
1064 | } |
1131 | } |
1065 | } |
1132 | } |
1066 | |
1133 | |
1067 | sub spell_add { |
1134 | sub spell_add { |
1068 | my ($self, $spell) = @_; |
1135 | my ($self, $spell) = @_; |
… | |
… | |
1072 | $spell->{message} =~ s/\n+$//; |
1139 | $spell->{message} =~ s/\n+$//; |
1073 | $spell->{message} ||= "Server did not provide a description for this spell."; |
1140 | $spell->{message} ||= "Server did not provide a description for this spell."; |
1074 | |
1141 | |
1075 | $::SPELL_LIST->add_spell ($spell); |
1142 | $::SPELL_LIST->add_spell ($spell); |
1076 | |
1143 | |
1077 | $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); |
1144 | $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message}); |
1078 | $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); |
1145 | $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message}); |
1079 | } |
1146 | } |
1080 | |
1147 | |
1081 | sub spell_delete { |
1148 | sub spell_delete { |
1082 | my ($self, $spell) = @_; |
1149 | my ($self, $spell) = @_; |
1083 | |
1150 | |
… | |
… | |
1094 | sub addme_success { |
1161 | sub addme_success { |
1095 | my ($self) = @_; |
1162 | my ($self) = @_; |
1096 | |
1163 | |
1097 | my %skill_help; |
1164 | my %skill_help; |
1098 | |
1165 | |
1099 | for my $node (CFPlus::Pod::find skill_description => "*") { |
1166 | for my $node (DC::Pod::find skill_description => "*") { |
1100 | my (undef, @par) = CFPlus::Pod::section_of $node; |
1167 | my (undef, @par) = DC::Pod::section_of $node; |
1101 | $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; |
1168 | $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par; |
1102 | }; |
1169 | }; |
1103 | |
1170 | |
1104 | for my $skill (values %{$self->{skill_info}}) { |
1171 | for my $skill (values %{$self->{skill_info}}) { |
1105 | $self->{map_widget}->add_command ("ready_skill $skill", |
1172 | $self->{map_widget}->add_command ("ready_skill $skill", |
1106 | (CFPlus::asxml "Ready the skill '$skill'\n\n") |
1173 | (DC::asxml "Ready the skill '$skill'\n\n") |
1107 | . $skill_help{$skill}); |
1174 | . $skill_help{$skill}); |
1108 | $self->{map_widget}->add_command ("use_skill $skill", |
1175 | $self->{map_widget}->add_command ("use_skill $skill", |
1109 | (CFPlus::asxml "Immediately use the skill '$skill'\n\n") |
1176 | (DC::asxml "Immediately use the skill '$skill'\n\n") |
1110 | . $skill_help{$skill}); |
1177 | . $skill_help{$skill}); |
1111 | } |
1178 | } |
1112 | } |
1179 | } |
1113 | |
1180 | |
1114 | sub eof { |
1181 | sub eof { |
… | |
… | |
1118 | |
1185 | |
1119 | ::stop_game (); |
1186 | ::stop_game (); |
1120 | } |
1187 | } |
1121 | |
1188 | |
1122 | sub update_floorbox { |
1189 | sub update_floorbox { |
1123 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
1190 | $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
1124 | return unless $::CONN; |
1191 | return unless $::CONN; |
1125 | |
1192 | |
1126 | $::FLOORBOX->clear; |
1193 | $::FLOORBOX->clear; |
1127 | |
1194 | |
1128 | my @add; |
1195 | my @add; |
… | |
… | |
1130 | my $row; |
1197 | my $row; |
1131 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
1198 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
1132 | if ($row < 6) { |
1199 | if ($row < 6) { |
1133 | local $_->{face_widget}; # hack to force recreation of widget |
1200 | local $_->{face_widget}; # hack to force recreation of widget |
1134 | local $_->{desc_widget}; # hack to force recreation of widget |
1201 | local $_->{desc_widget}; # hack to force recreation of widget |
1135 | CFPlus::Item::update_widgets $_; |
1202 | DC::Item::update_widgets $_; |
1136 | |
1203 | |
1137 | push @add, |
1204 | push @add, |
1138 | 0, $row, $_->{face_widget}, |
1205 | 0, $row, $_->{face_widget}, |
1139 | 1, $row, $_->{desc_widget}; |
1206 | 1, $row, $_->{desc_widget}; |
1140 | |
1207 | |
1141 | $row++; |
1208 | $row++; |
1142 | } else { |
1209 | } else { |
1143 | push @add, 1, $row, new CFPlus::UI::Button |
1210 | push @add, 1, $row, new DC::UI::Button |
1144 | text => "More...", |
1211 | text => "More...", |
1145 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
1212 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
1146 | ; |
1213 | ; |
1147 | last; |
1214 | last; |
1148 | } |
1215 | } |
1149 | } |
1216 | } |
1150 | if ($::CONN->{open_container}) { |
1217 | if ($::CONN->{open_container}) { |
1151 | push @add, 1, $row++, new CFPlus::UI::Button |
1218 | push @add, 1, $row++, new DC::UI::Button |
1152 | text => "Close container", |
1219 | text => "Close container", |
1153 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
1220 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
1154 | ; |
1221 | ; |
1155 | } |
1222 | } |
1156 | |
1223 | |
1157 | $::FLOORBOX->add_at (@add); |
1224 | $::FLOORBOX->add_at (@add); |
1158 | }); |
1225 | }); |
1159 | |
1226 | |
1160 | $::WANT_REFRESH->start; |
1227 | $::WANT_REFRESH = 1; |
1161 | } |
1228 | } |
1162 | |
1229 | |
1163 | sub set_opencont { |
1230 | sub set_opencont { |
1164 | my ($conn, $tag, $name) = @_; |
1231 | my ($conn, $tag, $name) = @_; |
1165 | $conn->{open_container} = $tag; |
1232 | $conn->{open_container} = $tag; |
1166 | update_floorbox; |
1233 | update_floorbox; |
1167 | |
1234 | |
1168 | $::INVR_HB->clear (); |
1235 | $::INVR_HB->clear (); |
1169 | $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
1236 | $::INVR_HB->add (new DC::UI::Label align => 0, expand => 1, text => $name); |
1170 | |
1237 | |
1171 | if ($tag != 0) { # Floor isn't closable, is it? |
1238 | if ($tag != 0) { # Floor isn't closable, is it? |
1172 | $::INVR_HB->add (new CFPlus::UI::Button |
1239 | $::INVR_HB->add (new DC::UI::Button |
1173 | text => "Close container", |
1240 | text => "Close container", |
1174 | tooltip => "Close the currently open container (if one is open)", |
1241 | tooltip => "Close the currently open container (if one is open)", |
1175 | on_activate => sub { |
1242 | on_activate => sub { |
1176 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
1243 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
1177 | if $tag != 0; |
1244 | if $tag != 0; |
… | |
… | |
1184 | } |
1251 | } |
1185 | |
1252 | |
1186 | sub update_containers { |
1253 | sub update_containers { |
1187 | my ($self) = @_; |
1254 | my ($self) = @_; |
1188 | |
1255 | |
1189 | $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
1256 | $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
1190 | my $todo = delete $self->{update_container} |
1257 | my $todo = delete $self->{update_container} |
1191 | or return; |
1258 | or return; |
1192 | |
1259 | |
1193 | for my $tag (keys %$todo) { |
1260 | for my $tag (keys %$todo) { |
1194 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
1261 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
… | |
… | |
1231 | sub item_update { |
1298 | sub item_update { |
1232 | my ($self, $item) = @_; |
1299 | my ($self, $item) = @_; |
1233 | |
1300 | |
1234 | #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; |
1301 | #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; |
1235 | |
1302 | |
1236 | CFPlus::Item::update_widgets $item; |
1303 | DC::Item::update_widgets $item; |
1237 | |
1304 | |
1238 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
1305 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
1239 | set_opencont ($::CONN, 0, "Floor"); |
1306 | set_opencont ($::CONN, 0, "Floor"); |
1240 | |
1307 | |
1241 | } elsif ($item->{flags} & F_OPEN) { |
1308 | } elsif ($item->{flags} & F_OPEN) { |
1242 | set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); |
1309 | set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item); |
1243 | |
1310 | |
1244 | } else { |
1311 | } else { |
1245 | $self->{update_container}{$item->{container}}++; |
1312 | $self->{update_container}{$item->{container}}++; |
1246 | $self->update_containers; |
1313 | $self->update_containers; |
1247 | } |
1314 | } |
… | |
… | |
1306 | 0 |
1373 | 0 |
1307 | }); |
1374 | }); |
1308 | |
1375 | |
1309 | $self->update_server_info; |
1376 | $self->update_server_info; |
1310 | |
1377 | |
1311 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
|
|
1312 | $self->send_command ("output-count $::CFG->{output_count}"); |
|
|
1313 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1378 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1314 | $self->send_command ("pickup $::CFG->{pickup}"); |
1379 | $self->send_command ("pickup $::CFG->{pickup}"); |
1315 | } |
1380 | } |
1316 | |
1381 | |
1317 | sub lookat { |
1382 | sub lookat { |
… | |
… | |
1321 | $self->send_ext_req (lookat => $x, $y, sub { |
1386 | $self->send_ext_req (lookat => $x, $y, sub { |
1322 | my (%msg) = @_; |
1387 | my (%msg) = @_; |
1323 | |
1388 | |
1324 | if (exists $msg{npc_dialog}) { |
1389 | if (exists $msg{npc_dialog}) { |
1325 | # start npc chat dialog |
1390 | # start npc chat dialog |
1326 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
1391 | $self->{npc_dialog} = new DC::NPCDialog:: |
1327 | token => $msg{npc_dialog}, |
1392 | token => $msg{npc_dialog}, |
1328 | title => "$msg{npc_dialog}[0] (NPC)", |
1393 | title => "$msg{npc_dialog}[0] (NPC)", |
1329 | conn => $self, |
1394 | conn => $self, |
1330 | ; |
1395 | ; |
1331 | } |
1396 | } |
… | |
… | |
1344 | $self->SUPER::destroy; |
1409 | $self->SUPER::destroy; |
1345 | |
1410 | |
1346 | %$self = (); |
1411 | %$self = (); |
1347 | } |
1412 | } |
1348 | |
1413 | |
1349 | package CFPlus::NPCDialog; |
1414 | package DC::NPCDialog; |
1350 | |
1415 | |
1351 | our @ISA = 'CFPlus::UI::Toplevel'; |
1416 | our @ISA = 'DC::UI::Toplevel'; |
1352 | |
1417 | |
1353 | sub new { |
1418 | sub new { |
1354 | my $class = shift; |
1419 | my $class = shift; |
1355 | |
1420 | |
1356 | my $self = $class->SUPER::new ( |
1421 | my $self = $class->SUPER::new ( |
… | |
… | |
1363 | kw => { hi => 0, yes => 0, no => 0 }, |
1428 | kw => { hi => 0, yes => 0, no => 0 }, |
1364 | has_close_button => 1, |
1429 | has_close_button => 1, |
1365 | @_, |
1430 | @_, |
1366 | ); |
1431 | ); |
1367 | |
1432 | |
1368 | CFPlus::weaken (my $this = $self); |
1433 | DC::weaken (my $this = $self); |
1369 | |
1434 | |
1370 | $self->connect (delete => sub { $this->destroy; 1 }); |
1435 | $self->connect (delete => sub { $this->destroy; 1 }); |
1371 | |
1436 | |
1372 | # better use a pane... |
1437 | # better use a pane... |
1373 | $self->add (my $hbox = new CFPlus::UI::HBox); |
1438 | $self->add (my $hbox = new DC::UI::HBox); |
1374 | $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); |
1439 | $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1); |
1375 | |
1440 | |
1376 | $hbox->add (my $vbox = new CFPlus::UI::VBox); |
1441 | $hbox->add (my $vbox = new DC::UI::VBox); |
1377 | |
1442 | |
1378 | $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); |
1443 | $vbox->add (new DC::UI::Label text => "Message Entry:"); |
1379 | $vbox->add ($self->{entry} = new CFPlus::UI::Entry |
1444 | $vbox->add ($self->{entry} = new DC::UI::Entry |
1380 | tooltip => "#npc_message_entry", |
1445 | tooltip => "#npc_message_entry", |
1381 | on_activate => sub { |
1446 | on_activate => sub { |
1382 | my ($entry, $text) = @_; |
1447 | my ($entry, $text) = @_; |
1383 | |
1448 | |
1384 | return unless $text =~ /\S/; |
1449 | return unless $text =~ /\S/; |
… | |
… | |
1388 | |
1453 | |
1389 | 0 |
1454 | 0 |
1390 | }, |
1455 | }, |
1391 | ); |
1456 | ); |
1392 | |
1457 | |
1393 | $vbox->add ($self->{options} = new CFPlus::UI::VBox); |
1458 | $vbox->add ($self->{options} = new DC::UI::VBox); |
1394 | |
1459 | |
1395 | $self->{bye_button} = new CFPlus::UI::Button |
1460 | $self->{bye_button} = new DC::UI::Button |
1396 | text => "Bye (close)", |
1461 | text => "Bye (close)", |
1397 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
1462 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
1398 | on_activate => sub { $this->destroy; 1 }, |
1463 | on_activate => sub { $this->destroy; 1 }, |
1399 | ; |
1464 | ; |
1400 | |
1465 | |
… | |
… | |
1419 | }; |
1484 | }; |
1420 | |
1485 | |
1421 | sub update_options { |
1486 | sub update_options { |
1422 | my ($self) = @_; |
1487 | my ($self) = @_; |
1423 | |
1488 | |
1424 | CFPlus::weaken $self; |
1489 | DC::weaken $self; |
1425 | |
1490 | |
1426 | $self->{options}->clear; |
1491 | $self->{options}->clear; |
1427 | $self->{options}->add ($self->{bye_button}); |
1492 | $self->{options}->add ($self->{bye_button}); |
1428 | |
1493 | |
1429 | for my $kw (sort keys %{ $self->{kw} }) { |
1494 | for my $kw (sort keys %{ $self->{kw} }) { |
1430 | $self->{options}->add (new CFPlus::UI::Button |
1495 | $self->{options}->add (new DC::UI::Button |
1431 | text => $kw, |
1496 | text => $kw, |
1432 | on_activate => sub { |
1497 | on_activate => sub { |
1433 | $self->send ($kw); |
1498 | $self->send ($kw); |
1434 | 0 |
1499 | 0 |
1435 | }, |
1500 | }, |
… | |
… | |
1438 | } |
1503 | } |
1439 | |
1504 | |
1440 | sub feed { |
1505 | sub feed { |
1441 | my ($self, $type, @arg) = @_; |
1506 | my ($self, $type, @arg) = @_; |
1442 | |
1507 | |
1443 | CFPlus::weaken $self; |
1508 | DC::weaken $self; |
1444 | |
1509 | |
1445 | if ($type eq "update") { |
1510 | if ($type eq "update") { |
1446 | my (%info) = @arg; |
1511 | my (%info) = @arg; |
1447 | |
1512 | |
1448 | $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; |
1513 | $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; |
1449 | $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; |
1514 | $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; |
1450 | |
1515 | |
1451 | if (exists $info{msg}) { |
1516 | if (exists $info{msg}) { |
1452 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; |
1517 | my $text = "\n" . DC::Protocol::sanitise_xml $info{msg}; |
1453 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1518 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1454 | my @link; |
1519 | my @link; |
1455 | $text =~ s{ |
1520 | $text =~ s{ |
1456 | ($match) |
1521 | ($match) |
1457 | }{ |
1522 | }{ |
1458 | my $kw = $1; |
1523 | my $kw = $1; |
1459 | |
1524 | |
1460 | push @link, new CFPlus::UI::Label |
1525 | push @link, new DC::UI::Label |
1461 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
1526 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
1462 | can_hover => 1, |
1527 | can_hover => 1, |
1463 | can_events => 1, |
1528 | can_events => 1, |
1464 | padding_x => 0, |
1529 | padding_x => 0, |
1465 | padding_y => 0, |
1530 | padding_y => 0, |
… | |
… | |
1483 | } |
1548 | } |
1484 | |
1549 | |
1485 | sub send { |
1550 | sub send { |
1486 | my ($self, $msg) = @_; |
1551 | my ($self, $msg) = @_; |
1487 | |
1552 | |
1488 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1553 | $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg }); |
1489 | $self->{textview}->scroll_to_bottom; |
1554 | $self->{textview}->scroll_to_bottom; |
1490 | |
1555 | |
1491 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
1556 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
1492 | } |
1557 | } |
1493 | |
1558 | |