… | |
… | |
21 | |
21 | |
22 | my $self = $class->SUPER::new (%arg, |
22 | my $self = $class->SUPER::new (%arg, |
23 | setup_req => { |
23 | setup_req => { |
24 | extmap => 1, |
24 | extmap => 1, |
25 | excmd => 1, |
25 | excmd => 1, |
26 | ywidget => 1,#d# |
26 | xwidget2 => 1,#d# |
27 | %{$arg{setup_req} || {}}, |
27 | %{$arg{setup_req} || {}}, |
28 | }, |
28 | }, |
29 | ); |
29 | ); |
30 | |
30 | |
31 | $self->{map_widget}->clr_commands; |
31 | $self->{map_widget}->clr_commands; |
… | |
… | |
48 | sort { (length $a) <=> (length $b) } |
48 | sort { (length $a) <=> (length $b) } |
49 | @args |
49 | @args |
50 | } sort { $a->{par} <=> $b->{par} } |
50 | } sort { $a->{par} <=> $b->{par} } |
51 | CFPlus::Pod::find command => "*"; |
51 | CFPlus::Pod::find command => "*"; |
52 | |
52 | |
53 | $self->connect_ext (ambient_music => sub { |
|
|
54 | my ($songs) = @_; |
|
|
55 | &::audio_music_set_ambient ($songs); |
|
|
56 | }); |
|
|
57 | |
|
|
58 | $self->connect_ext (capabilities => sub { |
|
|
59 | my (%cap) = @_; |
|
|
60 | |
|
|
61 | #$self->send ("setup sound 0"); # we use a different protocol |
|
|
62 | $self->update_fx_want; |
|
|
63 | |
|
|
64 | if (my $ts = $cap{tileset}) { |
|
|
65 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
|
|
66 | $self->{tileset} = $default; |
|
|
67 | $self->{tilesize} = $default->[3]; |
|
|
68 | $self->setup_req (tileset => $default->[0]); |
|
|
69 | |
|
|
70 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
|
|
71 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
|
|
72 | |
|
|
73 | $self->setup_req (mapsize => "${w}x${h}"); |
|
|
74 | } |
|
|
75 | } |
|
|
76 | }); |
|
|
77 | |
|
|
78 | $self->{json_coder} |
53 | $self->{json_coder} |
79 | ->convert_blessed |
54 | ->convert_blessed |
80 | ->filter_json_single_key_object (__w_ => sub { |
55 | ->filter_json_single_key_object ("\fw" => sub { |
81 | $self->{widget}{$_[0]} |
56 | $self->{widget}{$_[0]} |
|
|
57 | }) |
|
|
58 | ->filter_json_single_key_object ("\fc" => sub { |
|
|
59 | my ($id) = @_; |
|
|
60 | sub { |
|
|
61 | $self->send_exti_msg (w_e => $id, @_); |
|
|
62 | } |
82 | }); |
63 | }); |
83 | |
|
|
84 | # widgetset new |
|
|
85 | $self->connect_ext (ws_n => sub { |
|
|
86 | my ($id) = @_; |
|
|
87 | |
|
|
88 | $self->{widgetset}{$id} = { |
|
|
89 | w => {}, |
|
|
90 | }; |
|
|
91 | }); |
|
|
92 | |
|
|
93 | # widgetset destroy |
|
|
94 | $self->connect_ext (ws_d => sub { |
|
|
95 | my ($id) = @_; |
|
|
96 | |
|
|
97 | my $ws = delete $self->{widgetset}{$id} |
|
|
98 | or return; |
|
|
99 | |
|
|
100 | $_->destroy |
|
|
101 | for values %{$ws->{w}}; |
|
|
102 | }); |
|
|
103 | |
|
|
104 | # widgetset create |
|
|
105 | $self->connect_ext (ws_c => sub { |
|
|
106 | my ($ws, $id, $class, $args) = @_; |
|
|
107 | |
|
|
108 | for my $ev (grep /^on_/, keys %$args) { |
|
|
109 | $args->{$ev} = sub { |
|
|
110 | my $id = shift->{s_id}; |
|
|
111 | $self->send_exti_msg (w_e => $id, $ev, \@_); |
|
|
112 | |
|
|
113 | 1 |
|
|
114 | }; |
|
|
115 | } |
|
|
116 | |
|
|
117 | if (my $widget = eval { |
|
|
118 | local $SIG{__DIE__}; |
|
|
119 | "CFPlus::UI::$class"->new ( |
|
|
120 | %$args, |
|
|
121 | s_ws => $ws, |
|
|
122 | s_id => $id, |
|
|
123 | ) |
|
|
124 | } |
|
|
125 | ) { |
|
|
126 | $self->{widget}{$id} |
|
|
127 | = $self->{widgetset}{$ws}{w}{$id} |
|
|
128 | = $widget; |
|
|
129 | |
|
|
130 | $widget->connect (on_destroy => sub { |
|
|
131 | my ($widget) = @_; |
|
|
132 | |
|
|
133 | delete $self->{widget}{$widget->{s_id}}; |
|
|
134 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; |
|
|
135 | }); |
|
|
136 | } else { |
|
|
137 | warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; |
|
|
138 | $self->send_exti_msg (w_e => $id, "destroy"); |
|
|
139 | } |
|
|
140 | }); |
|
|
141 | |
|
|
142 | # widget call |
|
|
143 | $self->connect_ext (w_c => sub { |
|
|
144 | my ($id, $rid, $method, $args) = @_; |
|
|
145 | |
|
|
146 | my $w = $self->{widget}{$id} |
|
|
147 | or return; |
|
|
148 | |
|
|
149 | $args ||= []; |
|
|
150 | |
|
|
151 | if ($rid) { |
|
|
152 | $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]); |
|
|
153 | } else { |
|
|
154 | $w->$method (@$args); |
|
|
155 | } |
|
|
156 | }); |
|
|
157 | |
|
|
158 | # widget set |
|
|
159 | $self->connect_ext (w_s => sub { |
|
|
160 | my ($id, $attr) = @_; |
|
|
161 | |
|
|
162 | my $w = $self->{widget}{$id} |
|
|
163 | or return; |
|
|
164 | |
|
|
165 | for (my $i = 0; $i < $#$attr; $i += 2) { |
|
|
166 | my ($member, $value) = @$attr[$i, $i+1]; |
|
|
167 | if (defined $value) { |
|
|
168 | $w->{$member} = $value; |
|
|
169 | } else { |
|
|
170 | delete $w->{$member}; |
|
|
171 | } |
|
|
172 | $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible}; |
|
|
173 | } |
|
|
174 | }); |
|
|
175 | |
|
|
176 | # widget get |
|
|
177 | $self->connect_ext (w_g => sub { |
|
|
178 | my ($id, $rid, $attr) = @_; |
|
|
179 | |
|
|
180 | my $w = $self->{widget}{$id} |
|
|
181 | or return; |
|
|
182 | |
|
|
183 | $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); |
|
|
184 | }); |
|
|
185 | |
|
|
186 | # message window |
|
|
187 | $self->connect_ext (channel_info => sub { |
|
|
188 | my ($info) = @_; |
|
|
189 | $self->{channels}->{$info->{id}} = $info; |
|
|
190 | $::MESSAGE_WINDOW->add_channel ($info); |
|
|
191 | }); |
|
|
192 | |
64 | |
193 | # destroy widgets on logout |
65 | # destroy widgets on logout |
194 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
66 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
195 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
67 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
196 | $_->destroy |
68 | $_->destroy |
… | |
… | |
225 | my ($self) = @_; |
97 | my ($self) = @_; |
226 | |
98 | |
227 | $self->send_exti_msg (fx_want => { |
99 | $self->send_exti_msg (fx_want => { |
228 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
100 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
229 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
101 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
|
|
102 | 6 => 1, # FT_RSRC |
230 | }); |
103 | }); |
231 | } |
104 | } |
|
|
105 | |
|
|
106 | sub ext_capabilities { |
|
|
107 | my ($self, %cap) = @_; |
|
|
108 | |
|
|
109 | #$self->send ("setup sound 0"); # we use a different protocol |
|
|
110 | $self->update_fx_want; |
|
|
111 | |
|
|
112 | $self->send_exti_req (resource => "exp_table", sub { |
|
|
113 | my ($exp_table) = @_; |
|
|
114 | |
|
|
115 | $self->register_face_handler ($exp_table, sub { |
|
|
116 | my ($face) = @_; |
|
|
117 | |
|
|
118 | $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data}); |
|
|
119 | $_->() for values %{ $self->{on_exp_update} || {} }; |
|
|
120 | }); |
|
|
121 | |
|
|
122 | () |
|
|
123 | }); |
|
|
124 | |
|
|
125 | if (my $ts = $cap{tileset}) { |
|
|
126 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
|
|
127 | $self->{tileset} = $default; |
|
|
128 | $self->{tilesize} = $default->[3]; |
|
|
129 | $self->setup_req (tileset => $default->[0]); |
|
|
130 | |
|
|
131 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
|
|
132 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
|
|
133 | |
|
|
134 | $self->setup_req (mapsize => "${w}x${h}"); |
|
|
135 | } |
|
|
136 | } |
|
|
137 | } |
|
|
138 | |
|
|
139 | sub ext_ambient_music { |
|
|
140 | my ($self, $songs) = @_; |
|
|
141 | &::audio_music_set_ambient ($songs); |
|
|
142 | } |
|
|
143 | |
|
|
144 | ############################################################################# |
|
|
145 | |
|
|
146 | sub widget_associate { |
|
|
147 | my ($self, $ws, $id, $widget) = @_; |
|
|
148 | |
|
|
149 | $widget ||= new CFPlus::UI::Bin; |
|
|
150 | |
|
|
151 | $widget->{s_id} = $id; |
|
|
152 | $self->{widget}{$id} = $widget; |
|
|
153 | |
|
|
154 | if ($ws) { |
|
|
155 | $widget->{s_ws} = $ws; |
|
|
156 | $self->{widgetset}{$ws}{w}{$id} = $widget; |
|
|
157 | } |
|
|
158 | |
|
|
159 | $widget->connect (on_destroy => sub { |
|
|
160 | my ($widget) = @_; |
|
|
161 | |
|
|
162 | delete $self->{widget}{$widget->{s_id}}; |
|
|
163 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} |
|
|
164 | if exists $widget->{s_ws}; |
|
|
165 | }); |
|
|
166 | } |
|
|
167 | |
|
|
168 | # widgetset new |
|
|
169 | sub ext_ws_n { |
|
|
170 | my ($self, $id) = @_; |
|
|
171 | |
|
|
172 | $self->{widgetset}{$id} = { |
|
|
173 | w => {}, |
|
|
174 | }; |
|
|
175 | } |
|
|
176 | |
|
|
177 | # widgetset destroy |
|
|
178 | sub ext_ws_d { |
|
|
179 | my ($self, $id) = @_; |
|
|
180 | |
|
|
181 | my $ws = delete $self->{widgetset}{$id} |
|
|
182 | or return; |
|
|
183 | |
|
|
184 | $_->destroy |
|
|
185 | for values %{$ws->{w}}; |
|
|
186 | } |
|
|
187 | |
|
|
188 | # widgetset create |
|
|
189 | sub ext_ws_c { |
|
|
190 | my ($self, $ws, $id, $class, $args) = @_; |
|
|
191 | |
|
|
192 | $self->widget_associate ( |
|
|
193 | $ws, $id => scalar eval { |
|
|
194 | local $SIG{__DIE__}; |
|
|
195 | "CFPlus::UI::$class"->new (%$args) |
|
|
196 | } |
|
|
197 | ); |
|
|
198 | } |
|
|
199 | |
|
|
200 | # widgetset associate |
|
|
201 | sub ext_ws_a { |
|
|
202 | my ($self, %ass) = @_; |
|
|
203 | |
|
|
204 | # everything that has a name, wether conceivably useful or not |
|
|
205 | my %wkw = ( |
|
|
206 | root => $CFPlus::UI::ROOT, |
|
|
207 | tooltip => $CFPlus::UI::TOOLTIP, |
|
|
208 | |
|
|
209 | mapwidget => $::MAPWIDGET, |
|
|
210 | buttonbar => $::BUTTONBAR, |
|
|
211 | metaserver => $::METASERVER, |
|
|
212 | buttonbar => $::BUTTONBAR, |
|
|
213 | login_button => $::LOGIN_BUTTON, |
|
|
214 | quit_dialog => $::QUIT_DIALOG, |
|
|
215 | host_entry => $::HOST_ENTRY, |
|
|
216 | metaserver => $::METASERVER, |
|
|
217 | server_info => $::SERVER_INFO, |
|
|
218 | |
|
|
219 | setup_dialog => $::SETUP_DIALOG, |
|
|
220 | setup_notebook => $::SETUP_NOTEBOOK, |
|
|
221 | setup_server => $::SETUP_SERVER, |
|
|
222 | setup_keyboard => $::SETUP_KEYBOARD, |
|
|
223 | |
|
|
224 | pl_notebook => $::PL_NOTEBOOK, |
|
|
225 | pl_window => $::PL_WINDOW, |
|
|
226 | inventory_page => $::INVENTORY_PAGE, |
|
|
227 | stats_page => $::STATS_PAGE, |
|
|
228 | skill_page => $::SKILL_PAGE, |
|
|
229 | spell_page => $::SPELL_PAGE, |
|
|
230 | spell_list => $::SPELL_LIST, |
|
|
231 | |
|
|
232 | floorbox => $::FLOORBOX, |
|
|
233 | help_window => $::HELP_WINDOW, |
|
|
234 | message_window => $::MESSAGE_WINDOW, |
|
|
235 | statusbox => $::SDTATUSBOX, |
|
|
236 | |
|
|
237 | inv => $::INV, |
|
|
238 | invr => $::INVR, |
|
|
239 | invr_hb => $::INVR_HB, |
|
|
240 | ); |
|
|
241 | |
|
|
242 | while (my ($id, $name) = each %ass) { |
|
|
243 | $self->widget_associate (undef, $id => $wkw{$name}); |
|
|
244 | } |
|
|
245 | } |
|
|
246 | |
|
|
247 | # widget call |
|
|
248 | sub ext_w_c { |
|
|
249 | my ($self, $id, $rcb, $method, @args) = @_; |
|
|
250 | |
|
|
251 | my $w = $self->{widget}{$id} |
|
|
252 | or return; |
|
|
253 | |
|
|
254 | if ($rcb) { |
|
|
255 | $rcb->($w->$method (@args)); |
|
|
256 | } else { |
|
|
257 | $w->$method (@args); |
|
|
258 | } |
|
|
259 | } |
|
|
260 | |
|
|
261 | # widget set |
|
|
262 | sub ext_w_s { |
|
|
263 | my ($self, $id, $attr) = @_; |
|
|
264 | |
|
|
265 | my $w = $self->{widget}{$id} |
|
|
266 | or return; |
|
|
267 | |
|
|
268 | for (my $i = 0; $i < $#$attr; $i += 2) { |
|
|
269 | my ($member, $value) = @$attr[$i, $i+1]; |
|
|
270 | if (defined $value) { |
|
|
271 | $w->{$member} = $value; |
|
|
272 | } else { |
|
|
273 | delete $w->{$member}; |
|
|
274 | } |
|
|
275 | $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible}; |
|
|
276 | } |
|
|
277 | } |
|
|
278 | |
|
|
279 | # widget get |
|
|
280 | sub ext_w_g { |
|
|
281 | my ($self, $id, $rid, @attr) = @_; |
|
|
282 | |
|
|
283 | my $w = $self->{widget}{$id} |
|
|
284 | or return; |
|
|
285 | |
|
|
286 | $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr); |
|
|
287 | } |
|
|
288 | |
|
|
289 | # message window |
|
|
290 | sub ext_channel_info { |
|
|
291 | my ($self, $info) = @_; |
|
|
292 | $self->{channels}->{$info->{id}} = $info; |
|
|
293 | $::MESSAGE_WINDOW->add_channel ($info); |
|
|
294 | } |
|
|
295 | |
|
|
296 | ############################################################################# |
232 | |
297 | |
233 | sub logprint { |
298 | sub logprint { |
234 | my ($self, @a) = @_; |
299 | my ($self, @a) = @_; |
235 | |
300 | |
236 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
301 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
… | |
… | |
325 | |
390 | |
326 | if ( |
391 | if ( |
327 | my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange |
392 | my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange |
328 | ) { |
393 | ) { |
329 | my $msg = "<b>stat change</b>: " . (join " ", @diffs); |
394 | my $msg = "<b>stat change</b>: " . (join " ", @diffs); |
330 | $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); |
395 | $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20); |
331 | } |
396 | } |
332 | |
397 | |
333 | $self->update_stats_window ($stats, $prev); |
398 | $self->update_stats_window ($stats, $prev); |
334 | |
399 | |
335 | $self->{prev_stats} = { %$stats }; |
400 | $self->{prev_stats} = { %$stats }; |
… | |
… | |
374 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
439 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
375 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
440 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
376 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
441 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
377 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
442 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
378 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
443 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
|
|
444 | $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); |
379 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
445 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
380 | my $title = $stats->{+CS_STAT_TITLE}; |
446 | my $title = $stats->{+CS_STAT_TITLE}; |
381 | $title =~ s/^Player: //; |
447 | $title =~ s/^Player: //; |
382 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
448 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
383 | |
449 | |
… | |
… | |
401 | for keys %RES_TBL; |
467 | for keys %RES_TBL; |
402 | |
468 | |
403 | my $sktbl = $::STATWIDS->{skill_tbl}; |
469 | my $sktbl = $::STATWIDS->{skill_tbl}; |
404 | my @skills = keys %{ $self->{skill_info} }; |
470 | my @skills = keys %{ $self->{skill_info} }; |
405 | |
471 | |
406 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
472 | my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
|
|
473 | map [$_, $self->{skill_info}{$_}], |
|
|
474 | grep exists $stats->{$_}, |
|
|
475 | @skills; |
|
|
476 | |
|
|
477 | if ($self->{stat_order} ne join ",", map $_->[0], @order) { |
|
|
478 | $self->{stat_order} = join ",", map $_->[0], @order; |
|
|
479 | |
407 | $sktbl->clear; |
480 | $sktbl->clear; |
408 | |
481 | |
409 | my @add; |
482 | my $sw = $self->{skillwid}{""} ||= [ |
410 | |
|
|
411 | push @add, |
|
|
412 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
483 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
413 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
484 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
|
|
485 | 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
414 | 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
486 | 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
415 | 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
487 | 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
416 | 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
488 | 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
|
|
489 | 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
417 | 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
490 | 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
418 | ; |
491 | ]; |
|
|
492 | |
|
|
493 | my @add = @$sw; |
419 | |
494 | |
420 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
495 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
421 | |
496 | |
422 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
497 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
423 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
498 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
424 | |
499 | |
425 | my ($x, $y) = (0, 1); |
500 | my ($x, $y) = (0, 1); |
426 | for ( |
501 | for (@order) { |
427 | sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
|
|
428 | map [$_, $self->{skill_info}{$_}], |
|
|
429 | grep exists $stats->{$_}, |
|
|
430 | @skills |
|
|
431 | ) { |
|
|
432 | my ($idx, $name) = @$_; |
502 | my ($idx, $name) = @$_; |
433 | |
503 | |
434 | my $spell_cb = sub { |
504 | my $spell_cb = sub { |
435 | my ($widget, $ev) = @_; |
505 | my ($widget, $ev) = @_; |
436 | |
506 | |
… | |
… | |
451 | } |
521 | } |
452 | |
522 | |
453 | 1 |
523 | 1 |
454 | }; |
524 | }; |
455 | |
525 | |
|
|
526 | my $sw = $self->{skillwid}{$idx} ||= [ |
|
|
527 | # exp |
|
|
528 | (new CFPlus::UI::Label |
|
|
529 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
|
|
530 | |
|
|
531 | # level |
|
|
532 | (new CFPlus::UI::Label |
|
|
533 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
|
|
534 | |
|
|
535 | # progress |
|
|
536 | (new CFPlus::UI::ExperienceProgress), |
|
|
537 | |
|
|
538 | # label |
|
|
539 | (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
|
|
540 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
|
|
541 | ]; |
|
|
542 | |
456 | push @add, |
543 | push @add, |
457 | $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label |
544 | $x * 4 + 0, $y, $sw->[0], |
458 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
545 | $x * 4 + 1, $y, $sw->[1], |
459 | $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label |
546 | $x * 4 + 2, $y, $sw->[2], |
460 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
547 | $x * 4 + 3, $y, $sw->[3], |
461 | $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
|
|
462 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
|
|
463 | ; |
548 | ; |
464 | |
549 | |
465 | $x++ and ($x, $y) = (0, $y + 1); |
550 | $x++ and ($x, $y) = (0, $y + 1); |
466 | } |
551 | } |
467 | |
552 | |
468 | $sktbl->add_at (@add); |
553 | $sktbl->add_at (@add); |
469 | } |
554 | } |
470 | |
555 | |
471 | for (grep exists $stats->{$_}, @skills) { |
556 | for (@order) { |
472 | $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); |
557 | my ($idx, $name) = @$_; |
473 | $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); |
558 | my $val = $stats->{$idx}; |
474 | } |
|
|
475 | } |
|
|
476 | |
559 | |
477 | sub macro_send { |
560 | next if $prev->{$idx}[1] eq $val->[1]; |
478 | my ($self, $macro) = @_; |
|
|
479 | |
561 | |
480 | for my $cmd (@{ $macro->{action} }) { |
562 | my $sw = $self->{skillwid}{$idx}; |
481 | $self->send_command ($cmd); |
563 | $sw->[0]->set_text (::formsep ($val->[1])); |
|
|
564 | $sw->[1]->set_text ($val->[0] * 1); |
|
|
565 | $sw->[2]->set_value (@$val); |
|
|
566 | |
|
|
567 | $::GAUGES->{sklprg}->set_label ("$name %d%%"); |
|
|
568 | $::GAUGES->{sklprg}->set_value (@$val); |
482 | } |
569 | } |
483 | } |
570 | } |
484 | |
571 | |
485 | sub user_send { |
572 | sub user_send { |
486 | my ($self, $command) = @_; |
573 | my ($self, $command) = @_; |
… | |
… | |
488 | $self->{record}->($command) |
575 | $self->{record}->($command) |
489 | if $self->{record}; |
576 | if $self->{record}; |
490 | |
577 | |
491 | $self->logprint ("send: ", $command); |
578 | $self->logprint ("send: ", $command); |
492 | $self->send_command ($command); |
579 | $self->send_command ($command); |
493 | ::status ($command); |
|
|
494 | } |
580 | } |
495 | |
581 | |
496 | sub record { |
582 | sub record { |
497 | my ($self, $cb) = @_; |
583 | my ($self, $cb) = @_; |
498 | |
584 | |
… | |
… | |
520 | $tex->upload; |
606 | $tex->upload; |
521 | } else { |
607 | } else { |
522 | $self->{delay}{$tile} = 1; |
608 | $self->{delay}{$tile} = 1; |
523 | |
609 | |
524 | # we assume the face is in-flight and will eventually come |
610 | # we assume the face is in-flight and will eventually come |
525 | push @{$self->{face_cb}{$tile}}, sub { |
611 | push @{$self->{tile_cb}{$tile}}, sub { |
526 | delete $self->{delay}{$tile}; |
612 | delete $self->{delay}{$tile}; |
527 | $_[0]->upload; |
613 | $_[0]->upload; |
528 | }; |
614 | }; |
529 | } |
615 | } |
530 | } |
616 | } |
531 | |
617 | |
532 | if ($delay) { |
618 | if ($delay) { |
533 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
619 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
534 | Event->timer (after => 0.03, cb => sub { |
620 | Event->timer (after => 0.03, cb => sub { |
535 | $_[0]->w->cancel; |
621 | $_[0]->w->cancel; |
536 | $self->{map_widget}->update; |
622 | $self->{map_widget}->update |
|
|
623 | if $self->{map_widget}; |
537 | }); |
624 | }); |
538 | } else { |
625 | } else { |
539 | $self->{map_widget}->update; |
626 | $self->{map_widget}->update; |
540 | } |
627 | } |
541 | } |
628 | } |
… | |
… | |
570 | } |
657 | } |
571 | |
658 | |
572 | sub bg_fetch { |
659 | sub bg_fetch { |
573 | my ($self) = @_; |
660 | my ($self) = @_; |
574 | |
661 | |
575 | my $id; |
662 | my $tile; |
576 | |
663 | |
577 | do { |
664 | do { |
578 | $id = pop @{$self->{bg_fetch}} |
665 | $tile = pop @{$self->{bg_fetch}} |
579 | or return; |
666 | or return; |
580 | } while $self->{texture}[$id]; |
667 | } while $self->{texture}[$tile]; |
581 | |
668 | |
582 | CFPlus::DB::exists tilecache => $id, sub { |
669 | CFPlus::DB::get tilecache => $tile, sub { |
583 | my ($exists) = @_; |
670 | my ($data) = @_; |
584 | |
671 | |
585 | return unless $self->{map}; # stop when destroyed |
672 | return unless $self->{map}; # stop when destroyed |
586 | |
673 | |
587 | if ($exists) { |
674 | if (defined $data) { |
588 | $self->have_tile ($id); |
675 | $self->have_tile ($tile, $data); |
589 | $self->{texture}[$id]->upload; |
676 | $self->{texture}[$tile]->upload; |
590 | } |
677 | } |
591 | |
678 | |
592 | $self->bg_fetch; |
679 | $self->bg_fetch; |
593 | }; |
680 | }; |
594 | } |
681 | } |
… | |
… | |
751 | my ($self, $facenum, $face, $cb) = @_; |
838 | my ($self, $facenum, $face, $cb) = @_; |
752 | |
839 | |
753 | if ($face->{type} == 0) { # FT_FACE |
840 | if ($face->{type} == 0) { # FT_FACE |
754 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
841 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
755 | |
842 | |
756 | $face->{id} = $id; |
843 | $face->{id} = $id; |
757 | $self->{faceid}[$facenum] = $id; |
|
|
758 | |
|
|
759 | $self->{map}->set_tileid ($facenum => $id); |
844 | $self->{map}->set_tileid ($facenum => $id); |
760 | |
845 | |
761 | CFPlus::DB::get tilecache => $id, $cb; |
846 | CFPlus::DB::get tilecache => $id, $cb; |
762 | |
847 | |
763 | } elsif ($face->{type} & 1) { # with metadata |
848 | } elsif ($face->{type} & 1) { # with metadata |
764 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
849 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
|
|
850 | |
|
|
851 | } else { # no metadata |
|
|
852 | CFPlus::DB::get res_data => $face->{name}, $cb; |
765 | } |
853 | } |
766 | } |
854 | } |
767 | |
855 | |
768 | sub face_update { |
856 | sub face_update { |
769 | my ($self, $facenum, $face, $changed) = @_; |
857 | my ($self, $facenum, $face, $changed) = @_; |
770 | |
858 | |
771 | if ($face->{type} == 0) { # FT_FACE |
859 | if ($face->{type} == 0) { |
|
|
860 | # image, FT_FACE |
772 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
861 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
773 | if $changed; |
862 | if $changed; |
774 | |
863 | |
775 | $self->have_tile ($face->{id}); |
864 | $self->have_tile ($face->{id}, delete $face->{data}); |
776 | |
865 | |
777 | } elsif ($face->{type} & 1) { # split metadata |
866 | } elsif ($face->{type} & 1) { |
|
|
867 | # split metadata case, FT_MUSIC, FT_SOUND |
778 | if ($changed) { # new data |
868 | if ($changed) { # new data |
779 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
869 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
780 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
870 | $face->{data} = $meta; |
781 | |
871 | |
|
|
872 | # rely on strict ordering here and also on later fetch |
782 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
873 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
783 | CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { }; |
874 | CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; |
784 | } else { |
875 | } |
|
|
876 | |
785 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
877 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
786 | } |
|
|
787 | |
|
|
788 | ::add_license ($face); |
878 | ::add_license ($face); |
|
|
879 | ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) |
|
|
880 | if $changed; |
789 | |
881 | |
790 | if ($face->{type} == 3) { # FT_MUSIC |
882 | if ($face->{type} == 3) { # FT_MUSIC |
791 | $self->{music_meta}{$facenum} = $face; |
|
|
792 | |
|
|
793 | ::message ({ markup => "downloaded song #$facenum" }) |
|
|
794 | if $changed; |
|
|
795 | |
|
|
796 | &::audio_music_push ($facenum); |
883 | &::audio_music_push ($facenum); |
797 | } elsif ($face->{type} == 5) { # FT_SOUND |
884 | } elsif ($face->{type} == 5) { # FT_SOUND |
798 | $self->{sound_meta}{$facenum} = $face; |
|
|
799 | |
|
|
800 | ::message ({ markup => "downloaded sound #$facenum" }) |
|
|
801 | if $changed; |
|
|
802 | |
|
|
803 | &::audio_sound_push ($facenum); |
885 | &::audio_sound_push ($facenum); |
804 | } |
886 | } |
805 | |
887 | |
|
|
888 | } else { |
|
|
889 | # flat resource case, FT_RSRC |
|
|
890 | CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } |
|
|
891 | if $changed; |
|
|
892 | } |
|
|
893 | |
|
|
894 | if (my $cbs = $self->{face_cb}{$facenum}) { |
|
|
895 | $_->($face, $changed) for @$cbs; |
806 | } |
896 | } |
807 | } |
897 | } |
808 | |
898 | |
809 | sub smooth_update { |
899 | sub smooth_update { |
810 | my ($self, $facenum, $face) = @_; |
900 | my ($self, $facenum, $face) = @_; |
811 | |
901 | |
812 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
902 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
813 | } |
903 | } |
814 | |
904 | |
815 | sub have_tile { |
905 | sub have_tile { |
816 | my ($self, $tile) = @_; |
906 | my ($self, $tile, $data) = @_; |
817 | |
907 | |
818 | return unless $self->{map}; |
908 | return unless $self->{map}; |
819 | |
909 | |
820 | my $tex = $self->{texture}[$tile] ||= |
910 | my $tex = $self->{texture}[$tile] ||= |
821 | new CFPlus::Texture |
911 | new CFPlus::Texture |
822 | tile => $tile, minify => 1, mipmap => 1, delay => 1; |
912 | tile => $tile, |
|
|
913 | image => $data, delete_image => 1, |
|
|
914 | minify => 1, mipmap => 1; |
823 | |
915 | |
824 | $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []}; |
916 | if (my $cbs = delete $self->{tile_cb}{$tile}) { |
|
|
917 | $_->($tex) for @$cbs; |
|
|
918 | } |
825 | } |
919 | } |
826 | |
920 | |
827 | sub connect_face_update { |
921 | # call in non-void context registers a temporary |
|
|
922 | # hook with handle, otherwise its permanent |
|
|
923 | sub on_face_change { |
828 | my ($self, $id, $cb) = @_; |
924 | my ($self, $num, $cb) = @_; |
829 | |
925 | |
830 | push @{$self->{face_cb}{$id}}, $cb; |
926 | push @{$self->{face_cb}{$num}}, $cb; |
831 | |
927 | |
|
|
928 | defined wantarray |
832 | CFPlus::guard { |
929 | ? CFPlus::guard { |
833 | @{$self->{face_cb}{$id}} |
930 | @{$self->{face_cb}{$num}} |
834 | = grep $_ != $cb, |
931 | = grep $_ != $cb, |
835 | @{$self->{face_cb}{$id}}; |
932 | @{$self->{face_cb}{$num}}; |
836 | } |
933 | } |
|
|
934 | : () |
|
|
935 | } |
|
|
936 | |
|
|
937 | # call in non-void context registers a temporary |
|
|
938 | # hook with handle, otherwise its permanent |
|
|
939 | sub register_face_handler { |
|
|
940 | my ($self, $num, $cb) = @_; |
|
|
941 | |
|
|
942 | return unless $num; |
|
|
943 | |
|
|
944 | # invoke if available right now |
|
|
945 | $cb->($self->{face}[$num], 0) |
|
|
946 | unless exists $self->{face}[$num]{loading}; |
|
|
947 | |
|
|
948 | # future changes |
|
|
949 | $self->on_face_change ($num => $cb) |
837 | } |
950 | } |
838 | |
951 | |
839 | sub sound_play { |
952 | sub sound_play { |
840 | my ($self, $type, $face, $dx, $dy, $vol) = @_; |
953 | my ($self, $type, $face, $dx, $dy, $vol) = @_; |
841 | |
954 | |
… | |
… | |
913 | $self->{$type} = $text; |
1026 | $self->{$type} = $text; |
914 | } else { |
1027 | } else { |
915 | $self->logprint ("msg: ", $text); |
1028 | $self->logprint ("msg: ", $text); |
916 | return if $color < 0; # negative color == ignore if not understood |
1029 | return if $color < 0; # negative color == ignore if not understood |
917 | |
1030 | |
918 | my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; |
1031 | my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0]; |
919 | |
1032 | |
920 | ## try to create single paragraphs of multiple lines sent by the server |
1033 | ## try to create single paragraphs of multiple lines sent by the server |
921 | # no longer neecssary with TRT servers |
1034 | # no longer neecssary with TRT servers |
922 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
1035 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
923 | |
1036 | |
924 | ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] }) |
|
|
925 | for split /\n/, $text; |
1037 | for (split /\n/, $text) { |
|
|
1038 | ::message ({ |
|
|
1039 | fg => $fg, |
|
|
1040 | markup => $_, |
|
|
1041 | type => $type, |
|
|
1042 | extra => [@extra], |
|
|
1043 | color_flags => $color, #d# ugly, kill |
|
|
1044 | }); |
|
|
1045 | |
|
|
1046 | $color &= ~NDI_CLEAR; # only clear once for multiline messages |
|
|
1047 | # actually, this is an ugly design. _we_ should control the channels, |
|
|
1048 | # not some random other widget, as the channels are clearly protocol-specific. |
|
|
1049 | # then we could also react to flags such as CLEAR without resorting to |
|
|
1050 | # hacks such as color_flags, above. |
|
|
1051 | } |
926 | |
1052 | |
927 | $self->{statusbox}->add ($text, |
1053 | $self->{statusbox}->add ($text, |
928 | group => $text, |
1054 | group => $text, |
929 | fg => $fg, |
1055 | fg => $fg, |
930 | timeout => $color >= 2 ? 180 : 10, |
1056 | timeout => $color >= 2 ? 180 : 10, |
… | |
… | |
1032 | sub set_opencont { |
1158 | sub set_opencont { |
1033 | my ($conn, $tag, $name) = @_; |
1159 | my ($conn, $tag, $name) = @_; |
1034 | $conn->{open_container} = $tag; |
1160 | $conn->{open_container} = $tag; |
1035 | update_floorbox; |
1161 | update_floorbox; |
1036 | |
1162 | |
1037 | $::INV_RIGHT_HB->clear (); |
1163 | $::INVR_HB->clear (); |
1038 | $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
1164 | $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
1039 | |
1165 | |
1040 | if ($tag != 0) { # Floor isn't closable, is it? |
1166 | if ($tag != 0) { # Floor isn't closable, is it? |
1041 | $::INV_RIGHT_HB->add (new CFPlus::UI::Button |
1167 | $::INVR_HB->add (new CFPlus::UI::Button |
1042 | text => "Close container", |
1168 | text => "Close container", |
1043 | tooltip => "Close the currently open container (if one is open)", |
1169 | tooltip => "Close the currently open container (if one is open)", |
1044 | on_activate => sub { |
1170 | on_activate => sub { |
1045 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
1171 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
1046 | if $tag != 0; |
1172 | if $tag != 0; |
1047 | #if $CONN->{open_container} != 0; |
|
|
1048 | 0 |
1173 | 0 |
1049 | }, |
1174 | }, |
1050 | ); |
1175 | ); |
1051 | } |
1176 | } |
1052 | |
1177 | |