1 | package CFPlus::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 Deliantra::Protocol::Constants; |
7 | |
7 | |
8 | use CFPlus; |
8 | use CFPlus; |
9 | use CFPlus::DB; |
9 | use CFPlus::DB; |
10 | use CFPlus::UI; |
10 | use CFPlus::UI; |
11 | use CFPlus::Pod; |
11 | use CFPlus::Pod; |
12 | use CFPlus::Macro; |
12 | use CFPlus::Macro; |
13 | use CFPlus::Item; |
13 | use CFPlus::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 => 1, |
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; |
… | |
… | |
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 | CFPlus::Pod::find command => "*"; |
52 | |
50 | |
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} |
51 | $self->{json_coder} |
79 | ->convert_blessed |
52 | ->convert_blessed |
80 | ->filter_json_single_key_object (__w_ => sub { |
53 | ->filter_json_single_key_object ("\fw" => sub { |
81 | $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 | } |
82 | }); |
61 | }); |
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 | my $rid = $args->{$ev}; |
|
|
110 | $args->{$ev} = sub { |
|
|
111 | my $id = shift->{s_id}; |
|
|
112 | $self->send_exti_msg (w_e => $id, $rid, @_); |
|
|
113 | |
|
|
114 | 1 |
|
|
115 | }; |
|
|
116 | } |
|
|
117 | |
|
|
118 | $self->widget_associate ( |
|
|
119 | $ws, $id => scalar eval { |
|
|
120 | local $SIG{__DIE__}; |
|
|
121 | "CFPlus::UI::$class"->new (%$args) |
|
|
122 | } |
|
|
123 | ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; |
|
|
124 | }); |
|
|
125 | |
|
|
126 | # widgetset associate |
|
|
127 | $self->connect_ext (ws_a => sub { |
|
|
128 | my (%ass) = @_; |
|
|
129 | |
|
|
130 | # everything that has a name, wether conceivably useful or not |
|
|
131 | my %wkw = ( |
|
|
132 | root => $CFPlus::UI::ROOT, |
|
|
133 | tooltip => $CFPlus::UI::TOOLTIP, |
|
|
134 | |
|
|
135 | mapwidget => $::MAPWIDGET, |
|
|
136 | buttonbar => $::BUTTONBAR, |
|
|
137 | metaserver => $::METASERVER, |
|
|
138 | buttonbar => $::BUTTONBAR, |
|
|
139 | login_button => $::LOGIN_BUTTON, |
|
|
140 | quit_dialog => $::QUIT_DIALOG, |
|
|
141 | host_entry => $::HOST_ENTRY, |
|
|
142 | metaserver => $::METASERVER, |
|
|
143 | server_info => $::SERVER_INFO, |
|
|
144 | |
|
|
145 | setup_dialog => $::SETUP_DIALOG, |
|
|
146 | setup_notebook => $::SETUP_NOTEBOOK, |
|
|
147 | setup_server => $::SETUP_SERVER, |
|
|
148 | setup_keyboard => $::SETUP_KEYBOARD, |
|
|
149 | |
|
|
150 | pl_notebook => $::PL_NOTEBOOK, |
|
|
151 | pl_window => $::PL_WINDOW, |
|
|
152 | inventory_page => $::INVENTORY_PAGE, |
|
|
153 | stats_page => $::STATS_PAGE, |
|
|
154 | skill_page => $::SKILL_PAGE, |
|
|
155 | spell_page => $::SPELL_PAGE, |
|
|
156 | spell_list => $::SPELL_LIST, |
|
|
157 | |
|
|
158 | floorbox => $::FLOORBOX, |
|
|
159 | help_window => $::HELP_WINDOW, |
|
|
160 | message_window => $::MESSAGE_WINDOW, |
|
|
161 | statusbox => $::SDTATUSBOX, |
|
|
162 | |
|
|
163 | inv => $::INV, |
|
|
164 | invr => $::INVR, |
|
|
165 | invr_hb => $::INVR_HB, |
|
|
166 | |
|
|
167 | ); |
|
|
168 | |
|
|
169 | while (my ($id, $name) = each %ass) { |
|
|
170 | $self->widget_associate (undef, $id => $wkw{$name}) |
|
|
171 | or warn "server failed to associate non-existent well-known widget $name\n"; |
|
|
172 | } |
|
|
173 | }); |
|
|
174 | |
|
|
175 | # widget call |
|
|
176 | $self->connect_ext (w_c => sub { |
|
|
177 | my ($id, $rid, $method, @args) = @_; |
|
|
178 | |
|
|
179 | my $w = $self->{widget}{$id} |
|
|
180 | or return; |
|
|
181 | |
|
|
182 | if ($rid) { |
|
|
183 | $self->send_exti_msg (w_r => $rid, $w->$method (@args)); |
|
|
184 | } else { |
|
|
185 | $w->$method (@args); |
|
|
186 | } |
|
|
187 | }); |
|
|
188 | |
|
|
189 | # widget set |
|
|
190 | $self->connect_ext (w_s => sub { |
|
|
191 | my ($id, $attr) = @_; |
|
|
192 | |
|
|
193 | my $w = $self->{widget}{$id} |
|
|
194 | or return; |
|
|
195 | |
|
|
196 | for (my $i = 0; $i < $#$attr; $i += 2) { |
|
|
197 | my ($member, $value) = @$attr[$i, $i+1]; |
|
|
198 | if (defined $value) { |
|
|
199 | $w->{$member} = $value; |
|
|
200 | } else { |
|
|
201 | delete $w->{$member}; |
|
|
202 | } |
|
|
203 | $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible}; |
|
|
204 | } |
|
|
205 | }); |
|
|
206 | |
|
|
207 | # widget get |
|
|
208 | $self->connect_ext (w_g => sub { |
|
|
209 | my ($id, $rid, $attr) = @_; |
|
|
210 | |
|
|
211 | my $w = $self->{widget}{$id} |
|
|
212 | or return; |
|
|
213 | |
|
|
214 | $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); |
|
|
215 | }); |
|
|
216 | |
|
|
217 | # message window |
|
|
218 | $self->connect_ext (channel_info => sub { |
|
|
219 | my ($info) = @_; |
|
|
220 | $self->{channels}->{$info->{id}} = $info; |
|
|
221 | $::MESSAGE_WINDOW->add_channel ($info); |
|
|
222 | }); |
|
|
223 | |
62 | |
224 | # destroy widgets on logout |
63 | # destroy widgets on logout |
225 | $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 { |
226 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
65 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
227 | $_->destroy |
66 | $_->destroy |
… | |
… | |
250 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
89 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
251 | |
90 | |
252 | $self |
91 | $self |
253 | } |
92 | } |
254 | |
93 | |
255 | sub widget_associate { |
|
|
256 | my ($self, $ws, $id, $widget) = @_; |
|
|
257 | |
|
|
258 | if ($widget) { |
|
|
259 | $widget->{s_id} = $id; |
|
|
260 | $self->{widget}{$id} = $widget; |
|
|
261 | |
|
|
262 | if ($ws) { |
|
|
263 | $widget->{s_ws} = $ws; |
|
|
264 | $self->{widgetset}{$ws}{w}{$id} = $widget; |
|
|
265 | } |
|
|
266 | |
|
|
267 | $widget->connect (on_destroy => sub { |
|
|
268 | my ($widget) = @_; |
|
|
269 | |
|
|
270 | delete $self->{widget}{$widget->{s_id}}; |
|
|
271 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} |
|
|
272 | if exists $widget->{s_ws}; |
|
|
273 | }); |
|
|
274 | |
|
|
275 | 1 |
|
|
276 | } else { |
|
|
277 | $self->send_exti_msg (w_e => $id, undef); |
|
|
278 | |
|
|
279 | 0 |
|
|
280 | } |
|
|
281 | } |
|
|
282 | |
|
|
283 | sub update_fx_want { |
94 | sub update_fx_want { |
284 | my ($self) = @_; |
95 | my ($self) = @_; |
285 | |
96 | |
286 | $self->send_exti_msg (fx_want => { |
97 | $self->send_exti_msg (fx_want => { |
287 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
98 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
288 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
99 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
|
|
100 | 6 => 1, # FT_RSRC |
289 | }); |
101 | }); |
290 | } |
102 | } |
|
|
103 | |
|
|
104 | sub ext_capabilities { |
|
|
105 | my ($self, %cap) = @_; |
|
|
106 | |
|
|
107 | #$self->send ("setup sound 0"); # we use a different protocol |
|
|
108 | $self->update_fx_want; |
|
|
109 | |
|
|
110 | $self->send_exti_req (resource => "exp_table", sub { |
|
|
111 | my ($exp_table) = @_; |
|
|
112 | |
|
|
113 | $self->register_face_handler ($exp_table, sub { |
|
|
114 | my ($face) = @_; |
|
|
115 | |
|
|
116 | $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data}); |
|
|
117 | $_->() for values %{ $self->{on_exp_update} || {} }; |
|
|
118 | }); |
|
|
119 | |
|
|
120 | () |
|
|
121 | }); |
|
|
122 | |
|
|
123 | if (my $ts = $cap{tileset}) { |
|
|
124 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
|
|
125 | $self->{tileset} = $default; |
|
|
126 | $self->{tilesize} = $default->[3]; |
|
|
127 | $self->setup_req (tileset => $default->[0]); |
|
|
128 | |
|
|
129 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
|
|
130 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
|
|
131 | |
|
|
132 | $self->setup_req (mapsize => "${w}x${h}"); |
|
|
133 | } |
|
|
134 | } |
|
|
135 | } |
|
|
136 | |
|
|
137 | sub ext_ambient_music { |
|
|
138 | my ($self, $songs) = @_; |
|
|
139 | &::audio_music_set_ambient ($songs); |
|
|
140 | } |
|
|
141 | |
|
|
142 | ############################################################################# |
|
|
143 | |
|
|
144 | sub widget_associate { |
|
|
145 | my ($self, $ws, $id, $widget) = @_; |
|
|
146 | |
|
|
147 | $widget ||= new CFPlus::UI::Bin; |
|
|
148 | |
|
|
149 | $widget->{s_id} = $id; |
|
|
150 | $self->{widget}{$id} = $widget; |
|
|
151 | |
|
|
152 | if ($ws) { |
|
|
153 | $widget->{s_ws} = $ws; |
|
|
154 | $self->{widgetset}{$ws}{w}{$id} = $widget; |
|
|
155 | } |
|
|
156 | |
|
|
157 | $widget->connect (on_destroy => sub { |
|
|
158 | my ($widget) = @_; |
|
|
159 | |
|
|
160 | delete $self->{widget}{$widget->{s_id}}; |
|
|
161 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} |
|
|
162 | if exists $widget->{s_ws}; |
|
|
163 | }); |
|
|
164 | } |
|
|
165 | |
|
|
166 | # widgetset new |
|
|
167 | sub ext_ws_n { |
|
|
168 | my ($self, $id) = @_; |
|
|
169 | |
|
|
170 | $self->{widgetset}{$id} = { |
|
|
171 | w => {}, |
|
|
172 | }; |
|
|
173 | } |
|
|
174 | |
|
|
175 | # widgetset destroy |
|
|
176 | sub ext_ws_d { |
|
|
177 | my ($self, $id) = @_; |
|
|
178 | |
|
|
179 | my $ws = delete $self->{widgetset}{$id} |
|
|
180 | or return; |
|
|
181 | |
|
|
182 | $_->destroy |
|
|
183 | for values %{$ws->{w}}; |
|
|
184 | } |
|
|
185 | |
|
|
186 | # widgetset create |
|
|
187 | sub ext_ws_c { |
|
|
188 | my ($self, $ws, $id, $class, $args) = @_; |
|
|
189 | |
|
|
190 | $self->widget_associate ( |
|
|
191 | $ws, $id => scalar eval { |
|
|
192 | local $SIG{__DIE__}; |
|
|
193 | "CFPlus::UI::$class"->new (%$args) |
|
|
194 | } |
|
|
195 | ); |
|
|
196 | } |
|
|
197 | |
|
|
198 | # widgetset associate |
|
|
199 | sub ext_ws_a { |
|
|
200 | my ($self, %ass) = @_; |
|
|
201 | |
|
|
202 | # everything that has a name, wether conceivably useful or not |
|
|
203 | my %wkw = ( |
|
|
204 | root => $CFPlus::UI::ROOT, |
|
|
205 | tooltip => $CFPlus::UI::TOOLTIP, |
|
|
206 | |
|
|
207 | mapwidget => $::MAPWIDGET, |
|
|
208 | buttonbar => $::BUTTONBAR, |
|
|
209 | metaserver => $::METASERVER, |
|
|
210 | buttonbar => $::BUTTONBAR, |
|
|
211 | login_button => $::LOGIN_BUTTON, |
|
|
212 | quit_dialog => $::QUIT_DIALOG, |
|
|
213 | host_entry => $::HOST_ENTRY, |
|
|
214 | metaserver => $::METASERVER, |
|
|
215 | server_info => $::SERVER_INFO, |
|
|
216 | |
|
|
217 | setup_dialog => $::SETUP_DIALOG, |
|
|
218 | setup_notebook => $::SETUP_NOTEBOOK, |
|
|
219 | setup_server => $::SETUP_SERVER, |
|
|
220 | setup_keyboard => $::SETUP_KEYBOARD, |
|
|
221 | |
|
|
222 | pl_notebook => $::PL_NOTEBOOK, |
|
|
223 | pl_window => $::PL_WINDOW, |
|
|
224 | inventory_page => $::INVENTORY_PAGE, |
|
|
225 | stats_page => $::STATS_PAGE, |
|
|
226 | skill_page => $::SKILL_PAGE, |
|
|
227 | spell_page => $::SPELL_PAGE, |
|
|
228 | spell_list => $::SPELL_LIST, |
|
|
229 | |
|
|
230 | floorbox => $::FLOORBOX, |
|
|
231 | help_window => $::HELP_WINDOW, |
|
|
232 | message_window => $::MESSAGE_WINDOW, |
|
|
233 | statusbox => $::SDTATUSBOX, |
|
|
234 | |
|
|
235 | inv => $::INV, |
|
|
236 | invr => $::INVR, |
|
|
237 | invr_hb => $::INVR_HB, |
|
|
238 | ); |
|
|
239 | |
|
|
240 | while (my ($id, $name) = each %ass) { |
|
|
241 | $self->widget_associate (undef, $id => $wkw{$name}); |
|
|
242 | } |
|
|
243 | } |
|
|
244 | |
|
|
245 | # widget call |
|
|
246 | sub ext_w_c { |
|
|
247 | my ($self, $id, $rcb, $method, @args) = @_; |
|
|
248 | |
|
|
249 | my $w = $self->{widget}{$id} |
|
|
250 | or return; |
|
|
251 | |
|
|
252 | if ($rcb) { |
|
|
253 | $rcb->($w->$method (@args)); |
|
|
254 | } else { |
|
|
255 | $w->$method (@args); |
|
|
256 | } |
|
|
257 | } |
|
|
258 | |
|
|
259 | # widget set |
|
|
260 | sub ext_w_s { |
|
|
261 | my ($self, $id, $attr) = @_; |
|
|
262 | |
|
|
263 | my $w = $self->{widget}{$id} |
|
|
264 | or return; |
|
|
265 | |
|
|
266 | for (my $i = 0; $i < $#$attr; $i += 2) { |
|
|
267 | my ($member, $value) = @$attr[$i, $i+1]; |
|
|
268 | if (defined $value) { |
|
|
269 | $w->{$member} = $value; |
|
|
270 | } else { |
|
|
271 | delete $w->{$member}; |
|
|
272 | } |
|
|
273 | $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible}; |
|
|
274 | } |
|
|
275 | } |
|
|
276 | |
|
|
277 | # widget get |
|
|
278 | sub ext_w_g { |
|
|
279 | my ($self, $id, $rid, @attr) = @_; |
|
|
280 | |
|
|
281 | my $w = $self->{widget}{$id} |
|
|
282 | or return; |
|
|
283 | |
|
|
284 | $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr); |
|
|
285 | } |
|
|
286 | |
|
|
287 | # message window |
|
|
288 | sub ext_channel_info { |
|
|
289 | my ($self, $info) = @_; |
|
|
290 | $self->{channels}->{$info->{id}} = $info; |
|
|
291 | $::MESSAGE_WINDOW->add_channel ($info); |
|
|
292 | } |
|
|
293 | |
|
|
294 | ############################################################################# |
291 | |
295 | |
292 | sub logprint { |
296 | sub logprint { |
293 | my ($self, @a) = @_; |
297 | my ($self, @a) = @_; |
294 | |
298 | |
295 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
299 | CFPlus::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
296 | } |
300 | } |
297 | |
301 | |
298 | sub _stat_numdiff { |
302 | sub _stat_numdiff { |
299 | my ($self, $name, $old, $new) = @_; |
303 | my ($self, $name, $old, $new) = @_; |
300 | |
304 | |
… | |
… | |
384 | |
388 | |
385 | if ( |
389 | if ( |
386 | my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange |
390 | my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange |
387 | ) { |
391 | ) { |
388 | my $msg = "<b>stat change</b>: " . (join " ", @diffs); |
392 | my $msg = "<b>stat change</b>: " . (join " ", @diffs); |
389 | $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); |
393 | $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20); |
390 | } |
394 | } |
391 | |
395 | |
392 | $self->update_stats_window ($stats, $prev); |
396 | $self->update_stats_window ($stats, $prev); |
393 | |
397 | |
394 | $self->{prev_stats} = { %$stats }; |
398 | $self->{prev_stats} = { %$stats }; |
… | |
… | |
433 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
437 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
434 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
438 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
435 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
439 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
436 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
440 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
437 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
441 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
|
|
442 | $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); |
438 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
443 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
439 | my $title = $stats->{+CS_STAT_TITLE}; |
444 | my $title = $stats->{+CS_STAT_TITLE}; |
440 | $title =~ s/^Player: //; |
445 | $title =~ s/^Player: //; |
441 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
446 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
442 | |
447 | |
… | |
… | |
460 | for keys %RES_TBL; |
465 | for keys %RES_TBL; |
461 | |
466 | |
462 | my $sktbl = $::STATWIDS->{skill_tbl}; |
467 | my $sktbl = $::STATWIDS->{skill_tbl}; |
463 | my @skills = keys %{ $self->{skill_info} }; |
468 | my @skills = keys %{ $self->{skill_info} }; |
464 | |
469 | |
465 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
470 | my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
|
|
471 | map [$_, $self->{skill_info}{$_}], |
|
|
472 | grep exists $stats->{$_}, |
|
|
473 | @skills; |
|
|
474 | |
|
|
475 | if ($self->{stat_order} ne join ",", map $_->[0], @order) { |
|
|
476 | $self->{stat_order} = join ",", map $_->[0], @order; |
|
|
477 | |
466 | $sktbl->clear; |
478 | $sktbl->clear; |
467 | |
479 | |
468 | my @add; |
480 | my $sw = $self->{skillwid}{""} ||= [ |
469 | |
|
|
470 | push @add, |
|
|
471 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
481 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
472 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
482 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
|
|
483 | 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
473 | 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
484 | 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
474 | 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
485 | 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
475 | 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
486 | 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
|
|
487 | 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
476 | 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
488 | 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
477 | ; |
489 | ]; |
|
|
490 | |
|
|
491 | my @add = @$sw; |
478 | |
492 | |
479 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
493 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
480 | |
494 | |
481 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
495 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
482 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
496 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
483 | |
497 | |
484 | my ($x, $y) = (0, 1); |
498 | my ($x, $y) = (0, 1); |
485 | for ( |
499 | for (@order) { |
486 | sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
|
|
487 | map [$_, $self->{skill_info}{$_}], |
|
|
488 | grep exists $stats->{$_}, |
|
|
489 | @skills |
|
|
490 | ) { |
|
|
491 | my ($idx, $name) = @$_; |
500 | my ($idx, $name) = @$_; |
492 | |
501 | |
493 | my $spell_cb = sub { |
502 | my $spell_cb = sub { |
494 | my ($widget, $ev) = @_; |
503 | my ($widget, $ev) = @_; |
495 | |
504 | |
… | |
… | |
510 | } |
519 | } |
511 | |
520 | |
512 | 1 |
521 | 1 |
513 | }; |
522 | }; |
514 | |
523 | |
|
|
524 | my $sw = $self->{skillwid}{$idx} ||= [ |
|
|
525 | # exp |
|
|
526 | (new CFPlus::UI::Label |
|
|
527 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
|
|
528 | |
|
|
529 | # level |
|
|
530 | (new CFPlus::UI::Label |
|
|
531 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
|
|
532 | |
|
|
533 | # progress |
|
|
534 | (new CFPlus::UI::ExperienceProgress), |
|
|
535 | |
|
|
536 | # label |
|
|
537 | (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
|
|
538 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
|
|
539 | ]; |
|
|
540 | |
515 | push @add, |
541 | push @add, |
516 | $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label |
542 | $x * 4 + 0, $y, $sw->[0], |
517 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
543 | $x * 4 + 1, $y, $sw->[1], |
518 | $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label |
544 | $x * 4 + 2, $y, $sw->[2], |
519 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
545 | $x * 4 + 3, $y, $sw->[3], |
520 | $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
|
|
521 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
|
|
522 | ; |
546 | ; |
523 | |
547 | |
524 | $x++ and ($x, $y) = (0, $y + 1); |
548 | $x++ and ($x, $y) = (0, $y + 1); |
525 | } |
549 | } |
526 | |
550 | |
527 | $sktbl->add_at (@add); |
551 | $sktbl->add_at (@add); |
528 | } |
552 | } |
529 | |
553 | |
530 | for (grep exists $stats->{$_}, @skills) { |
554 | for (@order) { |
531 | $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); |
555 | my ($idx, $name) = @$_; |
532 | $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); |
556 | my $val = $stats->{$idx}; |
533 | } |
|
|
534 | } |
|
|
535 | |
557 | |
536 | sub macro_send { |
558 | next if $prev->{$idx}[1] eq $val->[1]; |
537 | my ($self, $macro) = @_; |
|
|
538 | |
559 | |
539 | for my $cmd (@{ $macro->{action} }) { |
560 | my $sw = $self->{skillwid}{$idx}; |
540 | $self->send_command ($cmd); |
561 | $sw->[0]->set_text (::formsep ($val->[1])); |
|
|
562 | $sw->[1]->set_text ($val->[0] * 1); |
|
|
563 | $sw->[2]->set_value (@$val); |
|
|
564 | |
|
|
565 | $::GAUGES->{sklprg}->set_label ("$name %d%%"); |
|
|
566 | $::GAUGES->{sklprg}->set_value (@$val); |
541 | } |
567 | } |
542 | } |
568 | } |
543 | |
569 | |
544 | sub user_send { |
570 | sub user_send { |
545 | my ($self, $command) = @_; |
571 | my ($self, $command) = @_; |
… | |
… | |
547 | $self->{record}->($command) |
573 | $self->{record}->($command) |
548 | if $self->{record}; |
574 | if $self->{record}; |
549 | |
575 | |
550 | $self->logprint ("send: ", $command); |
576 | $self->logprint ("send: ", $command); |
551 | $self->send_command ($command); |
577 | $self->send_command ($command); |
552 | ::status ($command); |
|
|
553 | } |
578 | } |
554 | |
579 | |
555 | sub record { |
580 | sub record { |
556 | my ($self, $cb) = @_; |
581 | my ($self, $cb) = @_; |
557 | |
582 | |
… | |
… | |
579 | $tex->upload; |
604 | $tex->upload; |
580 | } else { |
605 | } else { |
581 | $self->{delay}{$tile} = 1; |
606 | $self->{delay}{$tile} = 1; |
582 | |
607 | |
583 | # we assume the face is in-flight and will eventually come |
608 | # we assume the face is in-flight and will eventually come |
584 | push @{$self->{face_cb}{$tile}}, sub { |
609 | push @{$self->{tile_cb}{$tile}}, sub { |
585 | delete $self->{delay}{$tile}; |
610 | delete $self->{delay}{$tile}; |
586 | $_[0]->upload; |
611 | $_[0]->upload; |
587 | }; |
612 | }; |
588 | } |
613 | } |
589 | } |
614 | } |
590 | |
615 | |
591 | if ($delay) { |
616 | if ($delay) { |
592 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
617 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
593 | Event->timer (after => 0.03, cb => sub { |
618 | EV::once undef, 0, 0.03, sub { |
594 | $_[0]->w->cancel; |
|
|
595 | $self->{map_widget}->update; |
619 | $self->{map_widget}->update |
|
|
620 | if $self->{map_widget}; |
596 | }); |
621 | }; |
597 | } else { |
622 | } else { |
598 | $self->{map_widget}->update; |
623 | $self->{map_widget}->update; |
599 | } |
624 | } |
600 | } |
625 | } |
601 | |
626 | |
… | |
… | |
629 | } |
654 | } |
630 | |
655 | |
631 | sub bg_fetch { |
656 | sub bg_fetch { |
632 | my ($self) = @_; |
657 | my ($self) = @_; |
633 | |
658 | |
634 | my $id; |
659 | my $tile; |
635 | |
660 | |
636 | do { |
661 | do { |
637 | $id = pop @{$self->{bg_fetch}} |
662 | $tile = pop @{$self->{bg_fetch}} |
638 | or return; |
663 | or return; |
639 | } while $self->{texture}[$id]; |
664 | } while $self->{texture}[$tile]; |
640 | |
665 | |
641 | CFPlus::DB::exists tilecache => $id, sub { |
666 | CFPlus::DB::get tilecache => $tile, sub { |
642 | my ($exists) = @_; |
667 | my ($data) = @_; |
643 | |
668 | |
644 | return unless $self->{map}; # stop when destroyed |
669 | return unless $self->{map}; # stop when destroyed |
645 | |
670 | |
646 | if ($exists) { |
671 | if (defined $data) { |
647 | $self->have_tile ($id); |
672 | $self->have_tile ($tile, $data); |
648 | $self->{texture}[$id]->upload; |
673 | $self->{texture}[$tile]->upload; |
649 | } |
674 | } |
650 | |
675 | |
651 | $self->bg_fetch; |
676 | $self->bg_fetch; |
652 | }; |
677 | }; |
653 | } |
678 | } |
… | |
… | |
810 | my ($self, $facenum, $face, $cb) = @_; |
835 | my ($self, $facenum, $face, $cb) = @_; |
811 | |
836 | |
812 | if ($face->{type} == 0) { # FT_FACE |
837 | if ($face->{type} == 0) { # FT_FACE |
813 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
838 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
814 | |
839 | |
815 | $face->{id} = $id; |
840 | $face->{id} = $id; |
816 | $self->{faceid}[$facenum] = $id; |
|
|
817 | |
|
|
818 | $self->{map}->set_tileid ($facenum => $id); |
841 | $self->{map}->set_tileid ($facenum => $id); |
819 | |
842 | |
820 | CFPlus::DB::get tilecache => $id, $cb; |
843 | CFPlus::DB::get tilecache => $id, $cb; |
821 | |
844 | |
822 | } elsif ($face->{type} & 1) { # with metadata |
845 | } elsif ($face->{type} & 1) { # with metadata |
823 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
846 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
|
|
847 | |
|
|
848 | } else { # no metadata |
|
|
849 | CFPlus::DB::get res_data => $face->{name}, $cb; |
824 | } |
850 | } |
825 | } |
851 | } |
826 | |
852 | |
827 | sub face_update { |
853 | sub face_update { |
828 | my ($self, $facenum, $face, $changed) = @_; |
854 | my ($self, $facenum, $face, $changed) = @_; |
829 | |
855 | |
830 | if ($face->{type} == 0) { # FT_FACE |
856 | if ($face->{type} == 0) { |
|
|
857 | # image, FT_FACE |
831 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
858 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
832 | if $changed; |
859 | if $changed; |
833 | |
860 | |
834 | $self->have_tile ($face->{id}); |
861 | $self->have_tile ($face->{id}, delete $face->{data}); |
835 | |
862 | |
836 | } elsif ($face->{type} & 1) { # split metadata |
863 | } elsif ($face->{type} & 1) { |
|
|
864 | # split metadata case, FT_MUSIC, FT_SOUND |
837 | if ($changed) { # new data |
865 | if ($changed) { # new data |
838 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
866 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
839 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
867 | $face->{data} = $meta; |
840 | |
868 | |
|
|
869 | # rely on strict ordering here and also on later fetch |
841 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
870 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
842 | CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { }; |
871 | CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; |
843 | } else { |
872 | } |
|
|
873 | |
844 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
874 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
845 | } |
|
|
846 | |
|
|
847 | ::add_license ($face); |
875 | ::add_license ($face); |
|
|
876 | ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) |
|
|
877 | if $changed; |
848 | |
878 | |
849 | if ($face->{type} == 3) { # FT_MUSIC |
879 | if ($face->{type} == 3) { # FT_MUSIC |
850 | $self->{music_meta}{$facenum} = $face; |
|
|
851 | |
|
|
852 | ::message ({ markup => "downloaded song #$facenum" }) |
|
|
853 | if $changed; |
|
|
854 | |
|
|
855 | &::audio_music_push ($facenum); |
880 | &::audio_music_push ($facenum); |
856 | } elsif ($face->{type} == 5) { # FT_SOUND |
881 | } elsif ($face->{type} == 5) { # FT_SOUND |
857 | $self->{sound_meta}{$facenum} = $face; |
|
|
858 | |
|
|
859 | ::message ({ markup => "downloaded sound #$facenum" }) |
|
|
860 | if $changed; |
|
|
861 | |
|
|
862 | &::audio_sound_push ($facenum); |
882 | &::audio_sound_push ($facenum); |
863 | } |
883 | } |
864 | |
884 | |
|
|
885 | } else { |
|
|
886 | # flat resource case, FT_RSRC |
|
|
887 | CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } |
|
|
888 | if $changed; |
|
|
889 | } |
|
|
890 | |
|
|
891 | if (my $cbs = $self->{face_cb}{$facenum}) { |
|
|
892 | $_->($face, $changed) for @$cbs; |
865 | } |
893 | } |
866 | } |
894 | } |
867 | |
895 | |
868 | sub smooth_update { |
896 | sub smooth_update { |
869 | my ($self, $facenum, $face) = @_; |
897 | my ($self, $facenum, $face) = @_; |
870 | |
898 | |
871 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
899 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
872 | } |
900 | } |
873 | |
901 | |
874 | sub have_tile { |
902 | sub have_tile { |
875 | my ($self, $tile) = @_; |
903 | my ($self, $tile, $data) = @_; |
876 | |
904 | |
877 | return unless $self->{map}; |
905 | return unless $self->{map}; |
878 | |
906 | |
879 | my $tex = $self->{texture}[$tile] ||= |
907 | my $tex = $self->{texture}[$tile] ||= |
880 | new CFPlus::Texture |
908 | new CFPlus::Texture |
881 | tile => $tile, minify => 1, mipmap => 1, delay => 1; |
909 | tile => $tile, |
|
|
910 | image => $data, delete_image => 1, |
|
|
911 | minify => 1, mipmap => 1; |
882 | |
912 | |
883 | $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []}; |
913 | if (my $cbs = delete $self->{tile_cb}{$tile}) { |
|
|
914 | $_->($tex) for @$cbs; |
|
|
915 | } |
884 | } |
916 | } |
885 | |
917 | |
886 | sub connect_face_update { |
918 | # call in non-void context registers a temporary |
|
|
919 | # hook with handle, otherwise its permanent |
|
|
920 | sub on_face_change { |
887 | my ($self, $id, $cb) = @_; |
921 | my ($self, $num, $cb) = @_; |
888 | |
922 | |
889 | push @{$self->{face_cb}{$id}}, $cb; |
923 | push @{$self->{face_cb}{$num}}, $cb; |
890 | |
924 | |
|
|
925 | defined wantarray |
891 | CFPlus::guard { |
926 | ? CFPlus::guard { |
892 | @{$self->{face_cb}{$id}} |
927 | @{$self->{face_cb}{$num}} |
893 | = grep $_ != $cb, |
928 | = grep $_ != $cb, |
894 | @{$self->{face_cb}{$id}}; |
929 | @{$self->{face_cb}{$num}}; |
895 | } |
930 | } |
|
|
931 | : () |
|
|
932 | } |
|
|
933 | |
|
|
934 | # call in non-void context registers a temporary |
|
|
935 | # hook with handle, otherwise its permanent |
|
|
936 | sub register_face_handler { |
|
|
937 | my ($self, $num, $cb) = @_; |
|
|
938 | |
|
|
939 | return unless $num; |
|
|
940 | |
|
|
941 | # invoke if available right now |
|
|
942 | $cb->($self->{face}[$num], 0) |
|
|
943 | unless exists $self->{face}[$num]{loading}; |
|
|
944 | |
|
|
945 | # future changes |
|
|
946 | $self->on_face_change ($num => $cb) |
896 | } |
947 | } |
897 | |
948 | |
898 | sub sound_play { |
949 | sub sound_play { |
899 | my ($self, $type, $face, $dx, $dy, $vol) = @_; |
950 | my ($self, $type, $face, $dx, $dy, $vol) = @_; |
900 | |
951 | |
… | |
… | |
915 | |
966 | |
916 | sub sanitise_xml($) { |
967 | sub sanitise_xml($) { |
917 | local $_ = shift; |
968 | local $_ = shift; |
918 | |
969 | |
919 | # we now weed out all tags we do not support |
970 | # we now weed out all tags we do not support |
920 | s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g; |
971 | s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>) |
|
|
972 | }{ |
|
|
973 | "<" |
|
|
974 | }gex; |
|
|
975 | |
921 | # now all entities |
976 | # now all entities |
922 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
977 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
923 | |
978 | |
924 | # handle some elements |
979 | # handle some elements |
925 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
980 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
… | |
… | |
978 | |
1033 | |
979 | ## try to create single paragraphs of multiple lines sent by the server |
1034 | ## try to create single paragraphs of multiple lines sent by the server |
980 | # no longer neecssary with TRT servers |
1035 | # no longer neecssary with TRT servers |
981 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
1036 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
982 | |
1037 | |
|
|
1038 | for (split /\n/, $text) { |
983 | ::message ({ |
1039 | ::message ({ |
984 | fg => $fg, |
1040 | fg => $fg, |
985 | markup => $_, |
1041 | markup => $_, |
986 | type => $type, |
1042 | type => $type, |
987 | extra => [@extra], |
1043 | extra => [@extra], |
988 | color_flags => $color |
1044 | color_flags => $color, #d# ugly, kill |
989 | }) for split /\n/, $text; |
1045 | }); |
|
|
1046 | |
|
|
1047 | $color &= ~NDI_CLEAR; # only clear once for multiline messages |
|
|
1048 | # actually, this is an ugly design. _we_ should control the channels, |
|
|
1049 | # not some random other widget, as the channels are clearly protocol-specific. |
|
|
1050 | # then we could also react to flags such as CLEAR without resorting to |
|
|
1051 | # hacks such as color_flags, above. |
|
|
1052 | } |
990 | |
1053 | |
991 | $self->{statusbox}->add ($text, |
1054 | $self->{statusbox}->add ($text, |
992 | group => $text, |
1055 | group => $text, |
993 | fg => $fg, |
1056 | fg => $fg, |
994 | timeout => $color >= 2 ? 180 : 10, |
1057 | timeout => $color >= 2 ? 180 : 10, |
995 | tooltip_font => $::FONT_FIXED, |
1058 | tooltip_font => $::FONT_FIXED, |
996 | ); |
1059 | ) if $type eq "info"; |
997 | } |
1060 | } |
998 | } |
1061 | } |
999 | |
1062 | |
1000 | sub spell_add { |
1063 | sub spell_add { |
1001 | my ($self, $spell) = @_; |
1064 | my ($self, $spell) = @_; |
… | |
… | |
1088 | } |
1151 | } |
1089 | |
1152 | |
1090 | $::FLOORBOX->add_at (@add); |
1153 | $::FLOORBOX->add_at (@add); |
1091 | }); |
1154 | }); |
1092 | |
1155 | |
1093 | $::WANT_REFRESH->start; |
1156 | $::WANT_REFRESH = 1; |
1094 | } |
1157 | } |
1095 | |
1158 | |
1096 | sub set_opencont { |
1159 | sub set_opencont { |
1097 | my ($conn, $tag, $name) = @_; |
1160 | my ($conn, $tag, $name) = @_; |
1098 | $conn->{open_container} = $tag; |
1161 | $conn->{open_container} = $tag; |
… | |
… | |
1239 | 0 |
1302 | 0 |
1240 | }); |
1303 | }); |
1241 | |
1304 | |
1242 | $self->update_server_info; |
1305 | $self->update_server_info; |
1243 | |
1306 | |
1244 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
|
|
1245 | $self->send_command ("output-count $::CFG->{output_count}"); |
|
|
1246 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1307 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1247 | $self->send_command ("pickup $::CFG->{pickup}"); |
1308 | $self->send_command ("pickup $::CFG->{pickup}"); |
1248 | } |
1309 | } |
1249 | |
1310 | |
1250 | sub lookat { |
1311 | sub lookat { |