| 1 | package CFPlus::Protocol; |
1 | package DC::Protocol; |
| 2 | |
2 | |
| 3 | use utf8; |
3 | use common::sense; |
| 4 | use strict; |
|
|
| 5 | |
4 | |
|
|
5 | use Guard (); |
|
|
6 | |
| 6 | use Crossfire::Protocol::Constants; |
7 | use Deliantra::Protocol::Constants; |
| 7 | |
8 | |
| 8 | use CFPlus; |
9 | use DC; |
| 9 | use CFPlus::DB; |
10 | use DC::DB; |
| 10 | use CFPlus::UI; |
11 | use DC::UI; |
| 11 | use CFPlus::Pod; |
12 | use DC::Pod; |
| 12 | use CFPlus::Macro; |
13 | use DC::Macro; |
| 13 | use CFPlus::Item; |
14 | use DC::Item; |
| 14 | |
15 | |
| 15 | use Crossfire::Protocol::Base 0.95; |
|
|
| 16 | |
|
|
| 17 | use base 'Crossfire::Protocol::Base'; |
16 | use base 'Deliantra::Protocol::Base'; |
|
|
17 | |
|
|
18 | our $TEX_DIALOGUE = new_from_resource DC::Texture |
|
|
19 | "dialogue.png", minify => 1, mipmap => 1; |
|
|
20 | |
|
|
21 | our $TEX_NOFACE = new_from_resource DC::Texture |
|
|
22 | "noface.png", minify => 1, mipmap => 1, wrap => 1; |
|
|
23 | |
|
|
24 | sub MIN_TEXTURE_UNUSED() { 1 }#d# |
| 18 | |
25 | |
| 19 | sub new { |
26 | sub new { |
| 20 | my ($class, %arg) = @_; |
27 | my ($class, %arg) = @_; |
| 21 | |
28 | |
| 22 | my $self = $class->SUPER::new (%arg, |
29 | my $self = $class->SUPER::new (%arg, |
| 23 | setup_req => { |
30 | setup_req => { |
| 24 | extmap => 1, |
31 | extmap => 1, |
| 25 | excmd => 1, |
|
|
| 26 | xwidget1 => 1,#d# |
32 | widget => 2, |
| 27 | %{$arg{setup_req} || {}}, |
33 | %{$arg{setup_req} || {}}, |
| 28 | }, |
34 | }, |
| 29 | ); |
35 | ); |
| 30 | |
36 | |
| 31 | $self->{map_widget}->clr_commands; |
37 | $self->update_fx_want; |
| 32 | |
38 | |
| 33 | my @cmd_help = map { |
39 | my $exp_guard = $self->addme_guard; |
| 34 | $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
40 | my $skl_guard = $self->addme_guard; |
| 35 | or die "unparseable command help: $_->{kw}[0]"; |
41 | my $spl_guard = $self->addme_guard; |
|
|
42 | $self->send_exti_req (resource => qw(exp_table skill_info spell_paths), sub { |
|
|
43 | my ($exp, $skl, $spl) = @_; |
| 36 | |
44 | |
| 37 | my $cmd = $1; |
45 | $self->register_face_handler ($exp, sub { |
| 38 | my @args = split /\|/, $2; |
46 | my ($face) = @_; |
| 39 | @args = (".*") unless @args; |
|
|
| 40 | |
47 | |
| 41 | my (undef, @par) = CFPlus::Pod::section_of $_; |
48 | undef $exp_guard; |
| 42 | my $text = CFPlus::Pod::as_label @par; |
49 | $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data}); |
|
|
50 | $_->() for values %{ $self->{on_exp_update} }; |
|
|
51 | }); |
| 43 | |
52 | |
| 44 | $_ = $_ eq ".*" ? "" : " $_" |
53 | $self->register_face_handler ($skl, sub { |
| 45 | for @args; |
54 | my ($face) = @_; |
| 46 | |
55 | |
| 47 | map ["$cmd$_", $text], |
56 | undef $skl_guard; |
| 48 | sort { (length $a) <=> (length $b) } |
57 | my $info = $self->{json_coder}->decode (delete $face->{data}); |
| 49 | @args |
58 | $self->{skill_info} = { map { CS_STAT_SKILLINFO + $_ => $info->[$_][0] } 0 .. $#$info }; |
| 50 | } sort { $a->{par} <=> $b->{par} } |
59 | }); |
| 51 | CFPlus::Pod::find command => "*"; |
60 | |
|
|
61 | $self->register_face_handler ($spl, sub { |
|
|
62 | my ($face) = @_; |
|
|
63 | |
|
|
64 | undef $spl_guard; |
|
|
65 | my $info = $self->{json_coder}->decode (delete $face->{data}); |
|
|
66 | $self->{spell_paths} = { map { (1 << $_) => $info->[$_][0] } 0 .. $#$info }; |
|
|
67 | }); |
|
|
68 | |
|
|
69 | () |
|
|
70 | }); |
|
|
71 | |
|
|
72 | $::COMPLETER->reset; |
| 52 | |
73 | |
| 53 | $self->{json_coder} |
74 | $self->{json_coder} |
| 54 | ->convert_blessed |
75 | ->convert_blessed |
| 55 | ->filter_json_single_key_object (__w_ => sub { |
76 | ->filter_json_single_key_object ("\fw" => sub { |
| 56 | $self->{widget}{$_[0]} |
77 | $self->{widget}{$_[0]} |
|
|
78 | }) |
|
|
79 | ->filter_json_single_key_object ("\fc" => sub { |
|
|
80 | my ($id) = @_; |
|
|
81 | sub { |
|
|
82 | $self->send_exti_msg (w_e => $id, @_); |
|
|
83 | } |
| 57 | }); |
84 | }); |
| 58 | |
85 | |
| 59 | # destroy widgets on logout |
86 | # destroy widgets on logout |
| 60 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
87 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
| 61 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
88 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
| 62 | $_->destroy |
89 | $_->destroy |
| 63 | for values %{delete $ws->{w} || {}}; |
90 | for values %{delete $ws->{w} || {}}; |
| 64 | } |
91 | } |
|
|
92 | |
|
|
93 | delete $self->{items}; |
|
|
94 | $::INV->clear; |
|
|
95 | $::INVR->clear; |
|
|
96 | $::INVR_HB->clear; |
|
|
97 | $::FLOORBOX->clear; |
| 65 | }); |
98 | }); |
| 66 | |
99 | |
| 67 | $self->{map_widget}->add_command (@$_) |
|
|
| 68 | for @cmd_help; |
|
|
| 69 | |
|
|
| 70 | { |
100 | { |
| 71 | $self->{dialogue} = my $tex = new_from_file CFPlus::Texture |
101 | $self->{dialogue} = my $tex = $TEX_DIALOGUE; |
| 72 | CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; |
|
|
| 73 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
102 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
| 74 | } |
103 | } |
| 75 | |
104 | |
| 76 | { |
105 | { |
| 77 | $self->{noface} = my $tex = new_from_file CFPlus::Texture |
106 | $self->{noface} = my $tex = $TEX_NOFACE; |
| 78 | CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; |
|
|
| 79 | $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
107 | $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
| 80 | } |
108 | } |
|
|
109 | |
|
|
110 | # $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id |
|
|
111 | # $self->{expire_w} = AE::timer 1, 1, sub { |
|
|
112 | # my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1; |
|
|
113 | # |
|
|
114 | # for ($self->{map}->expire_textures ($self->{expire_count}, $count)) { |
|
|
115 | # warn DC::SvREFCNT $self->{texture}[$_]; |
|
|
116 | # $self->{texture}[$_]->unload; |
|
|
117 | # warn "expire texture $_\n";#d# |
|
|
118 | # } |
|
|
119 | # |
|
|
120 | # ($self->{expire_count} += $count) < @{ $self->{texture} } |
|
|
121 | # or $self->{expire_count} = DC::DB::FIRST_TILE_ID; |
|
|
122 | # warn "count is $count\n";#d# |
|
|
123 | # }; |
| 81 | |
124 | |
| 82 | $self->{open_container} = 0; |
125 | $self->{open_container} = 0; |
| 83 | |
126 | |
| 84 | # per server |
127 | # per server |
| 85 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
128 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
| 86 | |
129 | |
| 87 | $self |
130 | $self |
| 88 | } |
131 | } |
|
|
132 | |
|
|
133 | #$self->send_exti_req (nickmon => 1, sub { use Data::Dump; ddx \@_ });#d# |
|
|
134 | #sub ext_nicklist { shift; use Data::Dump; ddx \@_; } #d# |
| 89 | |
135 | |
| 90 | sub update_fx_want { |
136 | sub update_fx_want { |
| 91 | my ($self) = @_; |
137 | my ($self) = @_; |
| 92 | |
138 | |
| 93 | $self->send_exti_msg (fx_want => { |
139 | $self->send_exti_msg (fx_want => { |
| … | |
… | |
| 98 | } |
144 | } |
| 99 | |
145 | |
| 100 | sub ext_capabilities { |
146 | sub ext_capabilities { |
| 101 | my ($self, %cap) = @_; |
147 | my ($self, %cap) = @_; |
| 102 | |
148 | |
| 103 | #$self->send ("setup sound 0"); # we use a different protocol |
|
|
| 104 | $self->update_fx_want; |
|
|
| 105 | |
|
|
| 106 | $self->send_exti_req (resource => "exp_table", sub { |
|
|
| 107 | my ($exp_table) = @_; |
|
|
| 108 | |
|
|
| 109 | $self->register_face_handler ($exp_table, sub { |
|
|
| 110 | my ($face) = @_; |
|
|
| 111 | |
|
|
| 112 | $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data}); |
|
|
| 113 | $_->() for values %{ $self->{on_exp_update} || {} }; |
|
|
| 114 | }); |
|
|
| 115 | |
|
|
| 116 | () |
|
|
| 117 | }); |
|
|
| 118 | |
|
|
| 119 | if (my $ts = $cap{tileset}) { |
149 | if (my $ts = $cap{tileset}) { |
| 120 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
150 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
| 121 | $self->{tileset} = $default; |
151 | $self->{tileset} = $default; |
| 122 | $self->{tilesize} = $default->[3]; |
152 | $self->{tilesize} = $default->[3]; |
| 123 | $self->setup_req (tileset => $default->[0]); |
153 | $self->setup_req (tileset => $default->[0]); |
| … | |
… | |
| 133 | sub ext_ambient_music { |
163 | sub ext_ambient_music { |
| 134 | my ($self, $songs) = @_; |
164 | my ($self, $songs) = @_; |
| 135 | &::audio_music_set_ambient ($songs); |
165 | &::audio_music_set_ambient ($songs); |
| 136 | } |
166 | } |
| 137 | |
167 | |
|
|
168 | sub ext_command_list { |
|
|
169 | my ($self, @faces) = @_; |
|
|
170 | |
|
|
171 | my $handler = $self->{command_facehandler} = {}; |
|
|
172 | my $commands = $::COMPLETER->{command_list} = {}; |
|
|
173 | |
|
|
174 | for my $idx (@faces) { |
|
|
175 | $handler->{$idx} = $self->register_face_handler ($idx, sub { |
|
|
176 | my ($face) = @_; |
|
|
177 | |
|
|
178 | $commands->{$idx} = |
|
|
179 | $face->{cache} ||= $self->{json_coder}->decode ($face->{data}); |
|
|
180 | }); |
|
|
181 | } |
|
|
182 | } |
|
|
183 | |
| 138 | ############################################################################# |
184 | ############################################################################# |
| 139 | |
185 | |
| 140 | sub widget_associate { |
186 | sub widget_associate { |
| 141 | my ($self, $ws, $id, $widget) = @_; |
187 | my ($self, $ws, $id, $widget) = @_; |
| 142 | |
188 | |
| 143 | if ($widget) { |
189 | $widget ||= new DC::UI::Bin; |
|
|
190 | |
| 144 | $widget->{s_id} = $id; |
191 | $widget->{s_id} = $id; |
| 145 | $self->{widget}{$id} = $widget; |
192 | $self->{widget}{$id} = $widget; |
| 146 | |
193 | |
| 147 | if ($ws) { |
194 | if ($ws) { |
| 148 | $widget->{s_ws} = $ws; |
195 | $widget->{s_ws} = $ws; |
| 149 | $self->{widgetset}{$ws}{w}{$id} = $widget; |
196 | $self->{widgetset}{$ws}{w}{$id} = $widget; |
| 150 | } |
197 | } |
| 151 | |
198 | |
| 152 | $widget->connect (on_destroy => sub { |
199 | $widget->connect (on_destroy => sub { |
| 153 | my ($widget) = @_; |
200 | my ($widget) = @_; |
| 154 | |
201 | |
| 155 | delete $self->{widget}{$widget->{s_id}}; |
202 | delete $self->{widget}{$widget->{s_id}}; |
| 156 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} |
203 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} |
| 157 | if exists $widget->{s_ws}; |
204 | if exists $widget->{s_ws}; |
| 158 | }); |
205 | }); |
| 159 | |
|
|
| 160 | 1 |
|
|
| 161 | } else { |
|
|
| 162 | $self->send_exti_msg (w_e => $id, undef); |
|
|
| 163 | |
|
|
| 164 | 0 |
|
|
| 165 | } |
|
|
| 166 | } |
206 | } |
| 167 | |
207 | |
| 168 | # widgetset new |
208 | # widgetset new |
| 169 | sub ext_ws_n { |
209 | sub ext_ws_n { |
| 170 | my ($self, $id) = @_; |
210 | my ($self, $id) = @_; |
| … | |
… | |
| 187 | |
227 | |
| 188 | # widgetset create |
228 | # widgetset create |
| 189 | sub ext_ws_c { |
229 | sub ext_ws_c { |
| 190 | my ($self, $ws, $id, $class, $args) = @_; |
230 | my ($self, $ws, $id, $class, $args) = @_; |
| 191 | |
231 | |
| 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 | |
|
|
| 202 | $self->widget_associate ( |
232 | $self->widget_associate ( |
| 203 | $ws, $id => scalar eval { |
233 | $ws, $id => scalar eval { |
| 204 | local $SIG{__DIE__}; |
234 | local $SIG{__DIE__}; |
| 205 | "CFPlus::UI::$class"->new (%$args) |
235 | "DC::UI::$class"->new (%$args) |
|
|
236 | } |
|
|
237 | ); |
|
|
238 | } |
|
|
239 | |
|
|
240 | # widgetset create template |
|
|
241 | sub ext_ws_ct { |
|
|
242 | my ($self, $ws, $type, $template, $done_cb, $cfg) = @_; |
|
|
243 | |
|
|
244 | $done_cb ||= sub { }; |
|
|
245 | |
|
|
246 | my $parse_list; $parse_list = sub { |
|
|
247 | my ($list) = @_; |
|
|
248 | my @w; |
|
|
249 | |
|
|
250 | while (@$list) { |
|
|
251 | my ($class, $args) = splice @$list, 0, 2; |
|
|
252 | my $name = delete $args->{s_id}; |
|
|
253 | my $cl = delete $args->{s_cl}; |
|
|
254 | my $cfg = delete $cfg->{$name}; |
|
|
255 | my $id = delete $cfg->{id}; |
|
|
256 | my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) } |
|
|
257 | or next; |
|
|
258 | |
|
|
259 | $self->widget_associate ($ws, $id, $w) |
|
|
260 | if $id; |
|
|
261 | |
|
|
262 | $w->add ($parse_list->($cl)) |
|
|
263 | if $cl; |
|
|
264 | |
|
|
265 | push @w, $w; |
|
|
266 | } |
|
|
267 | |
|
|
268 | @w |
|
|
269 | }; |
|
|
270 | |
|
|
271 | # either array reference, or face # |
|
|
272 | if ($type eq "inline") { |
|
|
273 | $done_cb->(); |
|
|
274 | $parse_list->($template); |
|
|
275 | } elsif ($type eq "face") { |
|
|
276 | my $handler; $handler = $self->register_face_handler ($template, sub { |
|
|
277 | my ($face) = @_; |
|
|
278 | |
|
|
279 | undef $handler; |
|
|
280 | $done_cb->(); |
|
|
281 | $parse_list->($self->{json_coder}->decode ($face->{data})); |
| 206 | } |
282 | }); |
| 207 | ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; |
283 | } else { |
|
|
284 | $done_cb->(0); |
|
|
285 | } |
| 208 | } |
286 | } |
| 209 | |
287 | |
| 210 | # widgetset associate |
288 | # widgetset associate |
| 211 | sub ext_ws_a { |
289 | sub ext_ws_a { |
| 212 | my ($self, %ass) = @_; |
290 | my ($self, %ass) = @_; |
| 213 | |
291 | |
| 214 | # everything that has a name, wether conceivably useful or not |
292 | # everything that has a name, wether conceivably useful or not |
| 215 | my %wkw = ( |
293 | my %wkw = ( |
| 216 | root => $CFPlus::UI::ROOT, |
294 | root => $DC::UI::ROOT, |
| 217 | tooltip => $CFPlus::UI::TOOLTIP, |
295 | tooltip => $DC::UI::TOOLTIP, |
| 218 | |
296 | |
| 219 | mapwidget => $::MAPWIDGET, |
297 | mapwidget => $::MAPWIDGET, |
|
|
298 | menubar => $::MENUBAR, |
|
|
299 | menupopup => $::MENUPOPUP, |
|
|
300 | pickup_enable => $::PICKUP_ENABLE, |
| 220 | buttonbar => $::BUTTONBAR, |
301 | buttonbar => $::BUTTONBAR, |
| 221 | metaserver => $::METASERVER, |
302 | metaserver => $::METASERVER, |
| 222 | buttonbar => $::BUTTONBAR, |
303 | buttonbar => $::BUTTONBAR, |
| 223 | login_button => $::LOGIN_BUTTON, |
304 | login_button => $::LOGIN_BUTTON, |
| 224 | quit_dialog => $::QUIT_DIALOG, |
305 | quit_dialog => $::QUIT_DIALOG, |
| … | |
… | |
| 240 | spell_list => $::SPELL_LIST, |
321 | spell_list => $::SPELL_LIST, |
| 241 | |
322 | |
| 242 | floorbox => $::FLOORBOX, |
323 | floorbox => $::FLOORBOX, |
| 243 | help_window => $::HELP_WINDOW, |
324 | help_window => $::HELP_WINDOW, |
| 244 | message_window => $::MESSAGE_WINDOW, |
325 | message_window => $::MESSAGE_WINDOW, |
|
|
326 | message_dist => $::MESSAGE_DIST, |
| 245 | statusbox => $::SDTATUSBOX, |
327 | statusbox => $::STATUSBOX, |
| 246 | |
328 | |
| 247 | inv => $::INV, |
329 | inv => $::INV, |
| 248 | invr => $::INVR, |
330 | invr => $::INVR, |
| 249 | invr_hb => $::INVR_HB, |
331 | invr_hb => $::INVR_HB, |
| 250 | ); |
332 | ); |
| 251 | |
333 | |
| 252 | while (my ($id, $name) = each %ass) { |
334 | while (my ($id, $name) = each %ass) { |
| 253 | $self->widget_associate (undef, $id => $wkw{$name}) |
335 | $self->widget_associate (undef, $id => $wkw{$name}); |
| 254 | or warn "server failed to associate non-existent well-known widget $name\n"; |
|
|
| 255 | } |
336 | } |
| 256 | } |
337 | } |
| 257 | |
338 | |
| 258 | # widget call |
339 | # widget call |
| 259 | sub ext_w_c { |
340 | sub ext_w_c { |
| 260 | my ($self, $id, $rid, $method, @args) = @_; |
341 | my ($self, $id, $rcb, $method, @args) = @_; |
| 261 | |
342 | |
| 262 | my $w = $self->{widget}{$id} |
343 | my $w = $self->{widget}{$id} |
| 263 | or return; |
344 | or return; |
| 264 | |
345 | |
| 265 | if ($rid) { |
346 | if ($rcb) { |
| 266 | $self->send_exti_msg (w_r => $rid, $w->$method (@args)); |
347 | $rcb->($w->$method (@args)); |
| 267 | } else { |
348 | } else { |
| 268 | $w->$method (@args); |
349 | $w->$method (@args); |
| 269 | } |
350 | } |
| 270 | } |
351 | } |
| 271 | |
352 | |
| … | |
… | |
| 287 | } |
368 | } |
| 288 | } |
369 | } |
| 289 | |
370 | |
| 290 | # widget get |
371 | # widget get |
| 291 | sub ext_w_g { |
372 | sub ext_w_g { |
| 292 | my ($self, $id, $rid, $attr) = @_; |
373 | my ($self, $id, $rid, @attr) = @_; |
| 293 | |
374 | |
| 294 | my $w = $self->{widget}{$id} |
375 | my $w = $self->{widget}{$id} |
| 295 | or return; |
376 | or return; |
| 296 | |
377 | |
| 297 | $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); |
378 | $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr); |
| 298 | } |
379 | } |
| 299 | |
380 | |
| 300 | # message window |
381 | # message window |
| 301 | sub ext_channel_info { |
382 | sub ext_channel_info { |
| 302 | my ($self, $info) = @_; |
383 | my ($self, $info) = @_; |
| 303 | $self->{channels}->{$info->{id}} = $info; |
384 | $self->{channels}->{$info->{id}} = $info; |
| 304 | $::MESSAGE_WINDOW->add_channel ($info); |
385 | $::MESSAGE_DIST->add_channel ($info); |
| 305 | } |
386 | } |
| 306 | |
387 | |
| 307 | ############################################################################# |
388 | ############################################################################# |
| 308 | |
389 | |
| 309 | sub logprint { |
390 | sub logprint { |
| 310 | my ($self, @a) = @_; |
391 | my ($self, @a) = @_; |
| 311 | |
392 | |
| 312 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
393 | DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
| 313 | } |
394 | } |
| 314 | |
395 | |
| 315 | sub _stat_numdiff { |
396 | sub _stat_numdiff { |
| 316 | my ($self, $name, $old, $new) = @_; |
397 | my ($self, $name, $old, $new) = @_; |
| 317 | |
398 | |
| … | |
… | |
| 335 | ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) |
416 | ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) |
| 336 | : () |
417 | : () |
| 337 | } |
418 | } |
| 338 | sort { $a <=> $b } keys %{$self->{spell_paths}}; |
419 | sort { $a <=> $b } keys %{$self->{spell_paths}}; |
| 339 | |
420 | |
| 340 | join "", @diff |
421 | "\u$name: " . (join ", ", @diff) |
| 341 | } |
422 | } |
| 342 | |
423 | |
| 343 | # all stats that are chacked against changes |
424 | # all stats that are chacked against changes |
| 344 | my @statchange = ( |
425 | my @statchange = ( |
| 345 | [&CS_STAT_STR => \&_stat_numdiff, "Str"], |
426 | [&CS_STAT_STR => \&_stat_numdiff, "Str"], |
| … | |
… | |
| 388 | |
469 | |
| 389 | if (my @diffs = |
470 | if (my @diffs = |
| 390 | ( |
471 | ( |
| 391 | ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()), |
472 | ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()), |
| 392 | map { |
473 | map { |
| 393 | $stats->{$_} && $prev->{$_} |
474 | $stats->{$_} && $prev->{$_} |
| 394 | && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : () |
475 | && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : () |
| 395 | } sort { $a <=> $b } keys %{$self->{skill_info}} |
476 | } sort { $a <=> $b } keys %{$self->{skill_info}} |
| 396 | ) |
477 | ) |
| 397 | ) { |
478 | ) { |
| 398 | my $msg = join " ", @diffs; |
479 | my $msg = join " ", @diffs; |
| … | |
… | |
| 400 | } |
481 | } |
| 401 | |
482 | |
| 402 | if ( |
483 | if ( |
| 403 | my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange |
484 | my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange |
| 404 | ) { |
485 | ) { |
| 405 | my $msg = "<b>stat change</b>: " . (join " ", @diffs); |
486 | my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs); |
| 406 | $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); |
487 | $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20); |
| 407 | } |
488 | } |
| 408 | |
489 | |
| 409 | $self->update_stats_window ($stats, $prev); |
490 | $self->update_stats_window ($stats, $prev); |
| 410 | |
491 | |
| 411 | $self->{prev_stats} = { %$stats }; |
492 | $self->{prev_stats} = { %$stats }; |
| … | |
… | |
| 448 | |
529 | |
| 449 | $::GAUGES->{hp} ->set_value ($hp, $hp_m); |
530 | $::GAUGES->{hp} ->set_value ($hp, $hp_m); |
| 450 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
531 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
| 451 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
532 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
| 452 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
533 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
| 453 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
534 | $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d# |
| 454 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
535 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
| 455 | $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); |
536 | $::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); |
| 456 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
537 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
| 457 | my $title = $stats->{+CS_STAT_TITLE}; |
538 | my $title = $stats->{+CS_STAT_TITLE}; |
| 458 | $title =~ s/^Player: //; |
539 | $title =~ s/^Player: //; |
| 459 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
540 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
| 460 | |
541 | |
| … | |
… | |
| 472 | $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); |
553 | $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); |
| 473 | $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); |
554 | $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); |
| 474 | |
555 | |
| 475 | $self->update_weight; |
556 | $self->update_weight; |
| 476 | |
557 | |
| 477 | $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) |
558 | $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%%", $stats->{$RES_TBL{$_}}) |
| 478 | for keys %RES_TBL; |
559 | for keys %RES_TBL; |
| 479 | |
560 | |
| 480 | my $sktbl = $::STATWIDS->{skill_tbl}; |
561 | my $sktbl = $::STATWIDS->{skill_tbl}; |
| 481 | my @skills = keys %{ $self->{skill_info} }; |
562 | my @skills = keys %{ $self->{skill_info} }; |
| 482 | |
563 | |
| … | |
… | |
| 489 | $self->{stat_order} = join ",", map $_->[0], @order; |
570 | $self->{stat_order} = join ",", map $_->[0], @order; |
| 490 | |
571 | |
| 491 | $sktbl->clear; |
572 | $sktbl->clear; |
| 492 | |
573 | |
| 493 | my $sw = $self->{skillwid}{""} ||= [ |
574 | my $sw = $self->{skillwid}{""} ||= [ |
| 494 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
575 | 0, 0, (new DC::UI::Label text => "Experience", align => 1), |
| 495 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
576 | 1, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
| 496 | 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
577 | 2, 0, (new DC::UI::Label text => "Progress"), |
| 497 | 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
578 | 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), |
| 498 | 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
579 | 4, 0, (new DC::UI::Label text => "Experience", align => 1), |
| 499 | 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
580 | 5, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
| 500 | 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
581 | 6, 0, (new DC::UI::Label text => "Progress"), |
| 501 | 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
582 | 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), |
| 502 | ]; |
583 | ]; |
| 503 | |
584 | |
| 504 | my @add = @$sw; |
585 | my @add = @$sw; |
| 505 | |
586 | |
| 506 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
587 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>"; |
| 507 | |
588 | |
| 508 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
589 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
| 509 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
590 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
| 510 | |
591 | |
| 511 | my ($x, $y) = (0, 1); |
592 | my ($x, $y) = (0, 1); |
| … | |
… | |
| 518 | if ($ev->{button} == 1) { |
599 | if ($ev->{button} == 1) { |
| 519 | $::CONN->user_send ("ready_skill $name"); |
600 | $::CONN->user_send ("ready_skill $name"); |
| 520 | } elsif ($ev->{button} == 2) { |
601 | } elsif ($ev->{button} == 2) { |
| 521 | $::CONN->user_send ("use_skill $name"); |
602 | $::CONN->user_send ("use_skill $name"); |
| 522 | } elsif ($ev->{button} == 3) { |
603 | } elsif ($ev->{button} == 3) { |
| 523 | my $shortname = CFPlus::shorten $name, 14; |
604 | my $shortname = DC::shorten $name, 14; |
| 524 | (new CFPlus::UI::Menu |
605 | (new DC::UI::Menu |
| 525 | items => [ |
606 | items => [ |
| 526 | ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], |
607 | ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }], |
| 527 | ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], |
608 | ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }], |
| 528 | ], |
609 | ], |
| 529 | )->popup ($ev); |
610 | )->popup ($ev); |
| 530 | } else { |
611 | } else { |
| 531 | return 0; |
612 | return 0; |
| 532 | } |
613 | } |
| … | |
… | |
| 534 | 1 |
615 | 1 |
| 535 | }; |
616 | }; |
| 536 | |
617 | |
| 537 | my $sw = $self->{skillwid}{$idx} ||= [ |
618 | my $sw = $self->{skillwid}{$idx} ||= [ |
| 538 | # exp |
619 | # exp |
| 539 | (new CFPlus::UI::Label |
620 | (new DC::UI::Label |
| 540 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
621 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
| 541 | |
622 | |
| 542 | # level |
623 | # level |
| 543 | (new CFPlus::UI::Label |
624 | (new DC::UI::Label |
| 544 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
625 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
| 545 | |
626 | |
| 546 | # progress |
627 | # progress |
| 547 | (new CFPlus::UI::ExperienceProgress), |
628 | (new DC::UI::ExperienceProgress), |
| 548 | |
629 | |
| 549 | # label |
630 | # label |
| 550 | (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
631 | (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0, |
| 551 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
632 | can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
| 552 | ]; |
633 | ]; |
| 553 | |
634 | |
| 554 | push @add, |
635 | push @add, |
| 555 | $x * 4 + 0, $y, $sw->[0], |
636 | $x * 4 + 0, $y, $sw->[0], |
| 556 | $x * 4 + 1, $y, $sw->[1], |
637 | $x * 4 + 1, $y, $sw->[1], |
| … | |
… | |
| 562 | } |
643 | } |
| 563 | |
644 | |
| 564 | $sktbl->add_at (@add); |
645 | $sktbl->add_at (@add); |
| 565 | } |
646 | } |
| 566 | |
647 | |
| 567 | for (grep exists $stats->{$_}, @skills) { |
648 | for (@order) { |
| 568 | next if $prev->{$_} == $stats->{$_}; |
649 | my ($idx, $name) = @$_; |
|
|
650 | my $val = $stats->{$idx}; |
| 569 | |
651 | |
|
|
652 | next if $prev->{$idx}[1] eq $val->[1]; |
|
|
653 | |
| 570 | my $sw = $self->{skillwid}{$_}; |
654 | my $sw = $self->{skillwid}{$idx}; |
| 571 | $sw->[0]->set_text (::formsep ($stats->{$_}[1])); |
655 | $sw->[0]->set_text (::formsep ($val->[1])); |
| 572 | $sw->[1]->set_text ($stats->{$_}[0] * 1); |
656 | $sw->[1]->set_text ($val->[0] * 1); |
| 573 | $sw->[2]->set_value (@{$stats->{$_}}); |
657 | $sw->[2]->set_value (@$val); |
| 574 | } |
|
|
| 575 | } |
|
|
| 576 | |
658 | |
| 577 | sub macro_send { |
659 | $::GAUGES->{skillexp}->set_label ("$name %d%%"); |
| 578 | my ($self, $macro) = @_; |
660 | $::GAUGES->{skillexp}->set_value (@$val); |
| 579 | |
|
|
| 580 | for my $cmd (@{ $macro->{action} }) { |
|
|
| 581 | $self->send_command ($cmd); |
|
|
| 582 | } |
661 | } |
| 583 | } |
662 | } |
| 584 | |
663 | |
| 585 | sub user_send { |
664 | sub user_send { |
| 586 | my ($self, $command) = @_; |
665 | my ($self, $command) = @_; |
| … | |
… | |
| 588 | $self->{record}->($command) |
667 | $self->{record}->($command) |
| 589 | if $self->{record}; |
668 | if $self->{record}; |
| 590 | |
669 | |
| 591 | $self->logprint ("send: ", $command); |
670 | $self->logprint ("send: ", $command); |
| 592 | $self->send_command ($command); |
671 | $self->send_command ($command); |
| 593 | ::status ($command); |
|
|
| 594 | } |
672 | } |
| 595 | |
673 | |
| 596 | sub record { |
674 | sub record { |
| 597 | my ($self, $cb) = @_; |
675 | my ($self, $cb) = @_; |
| 598 | |
676 | |
| … | |
… | |
| 600 | } |
678 | } |
| 601 | |
679 | |
| 602 | sub map_scroll { |
680 | sub map_scroll { |
| 603 | my ($self, $dx, $dy) = @_; |
681 | my ($self, $dx, $dy) = @_; |
| 604 | |
682 | |
| 605 | $self->{map}->scroll ($dx, $dy); |
683 | $self->{map_widget}->scroll ($dx, $dy); |
| 606 | } |
684 | } |
| 607 | |
685 | |
| 608 | sub feed_map1a { |
686 | sub feed_map1a { |
| 609 | my ($self, $data) = @_; |
687 | my ($self, $data) = @_; |
| 610 | |
688 | |
| 611 | my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
689 | my $missing = $self->{map}->map1a_update ($data); |
| 612 | my $delay; |
690 | my $delay; |
| 613 | |
691 | |
| 614 | for my $tile (@$missing) { |
692 | for my $tile (@$missing) { |
| 615 | next if $self->{delay}{$tile}; |
693 | next if $self->{delay}{$tile}; |
| 616 | |
694 | |
| 617 | $delay = 1; |
695 | $delay = 1; |
| 618 | |
696 | |
| 619 | if (my $tex = $::CONN->{texture}[$tile]) { |
697 | if (my $tex = $self->{texture}[$tile]) { |
| 620 | $tex->upload; |
698 | $tex->upload; |
| 621 | } else { |
699 | } else { |
| 622 | $self->{delay}{$tile} = 1; |
700 | $self->{delay}{$tile} = 1; |
| 623 | |
701 | |
| 624 | # we assume the face is in-flight and will eventually come |
702 | # we assume the face is in-flight and will eventually arrive |
| 625 | push @{$self->{tile_cb}{$tile}}, sub { |
703 | push @{$self->{tile_cb}{$tile}}, sub { |
| 626 | delete $self->{delay}{$tile}; |
704 | delete $self->{delay}{$tile}; |
| 627 | $_[0]->upload; |
705 | $_[0]->upload; |
| 628 | }; |
706 | }; |
| 629 | } |
707 | } |
| 630 | } |
708 | } |
| 631 | |
709 | |
| 632 | if ($delay) { |
710 | if ($delay) { |
| 633 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
711 | # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched |
| 634 | Event->timer (after => 0.03, cb => sub { |
712 | EV::once undef, 0, 0.03, sub { |
| 635 | $_[0]->w->cancel; |
|
|
| 636 | $self->{map_widget}->update |
713 | $self->{map_widget}->update |
| 637 | if $self->{map_widget}; |
714 | if $self->{map_widget}; |
| 638 | }); |
715 | }; |
| 639 | } else { |
716 | } else { |
| 640 | $self->{map_widget}->update; |
717 | $self->{map_widget}->update; |
| 641 | } |
718 | } |
| 642 | } |
719 | } |
| 643 | |
720 | |
| … | |
… | |
| 648 | } |
725 | } |
| 649 | |
726 | |
| 650 | sub flush_map { |
727 | sub flush_map { |
| 651 | my ($self) = @_; |
728 | my ($self) = @_; |
| 652 | |
729 | |
| 653 | my $map_info = delete $self->{map_info} |
730 | return unless $self->{map_info}; |
| 654 | or return; |
|
|
| 655 | |
731 | |
|
|
732 | for my $map_info (values %{ $self->{map_cache} || {} }) { |
| 656 | my ($hash, $x, $y, $w, $h) = @$map_info; |
733 | my ($hash, $rdata, $x, $y, $w, $h) = @$map_info; |
| 657 | |
734 | |
| 658 | my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); |
735 | my $data = $self->{map}->get_rect ($x, $y, $w, $h); |
| 659 | $self->{map_cache_new}{$hash} = \$data; |
736 | |
|
|
737 | if ($data ne $$rdata) { |
|
|
738 | $map_info->[1] = \$data; |
|
|
739 | my $cdata = Compress::LZF::compress $data; |
| 660 | CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; |
740 | DC::DB::put $self->{mapcache} => $hash => $cdata, sub { }; |
|
|
741 | } |
|
|
742 | } |
| 661 | } |
743 | } |
| 662 | |
744 | |
| 663 | sub map_clear { |
745 | sub map_clear { |
| 664 | my ($self) = @_; |
746 | my ($self) = @_; |
| 665 | |
747 | |
| 666 | $self->flush_map; |
748 | $self->flush_map; |
|
|
749 | delete $self->{map_info}; |
| 667 | delete $self->{neigh_map}; |
750 | delete $self->{neigh_map}; |
| 668 | |
751 | |
| 669 | $self->{map}->clear; |
752 | $self->{map}->clear; |
| 670 | delete $self->{map_widget}{magicmap}; |
753 | delete $self->{map_widget}{magicmap}; |
| 671 | } |
754 | } |
| … | |
… | |
| 678 | do { |
761 | do { |
| 679 | $tile = pop @{$self->{bg_fetch}} |
762 | $tile = pop @{$self->{bg_fetch}} |
| 680 | or return; |
763 | or return; |
| 681 | } while $self->{texture}[$tile]; |
764 | } while $self->{texture}[$tile]; |
| 682 | |
765 | |
| 683 | CFPlus::DB::get tilecache => $tile, sub { |
766 | DC::DB::get tilecache => $tile, sub { |
| 684 | my ($data) = @_; |
767 | my ($data) = @_; |
| 685 | |
768 | |
| 686 | return unless $self->{map}; # stop when destroyed |
769 | return unless $self->{map}; # stop when destroyed |
| 687 | |
770 | |
| 688 | if (defined $data) { |
771 | if (defined $data) { |
| … | |
… | |
| 692 | |
775 | |
| 693 | $self->bg_fetch; |
776 | $self->bg_fetch; |
| 694 | }; |
777 | }; |
| 695 | } |
778 | } |
| 696 | |
779 | |
| 697 | sub load_map($$$) { |
780 | sub load_map($$$$$$) { |
| 698 | my ($self, $hash, $x, $y) = @_; |
781 | my ($self, $hash, $x, $y, $w, $h) = @_; |
| 699 | |
782 | |
| 700 | my $gen = $self->{map_change_gen}; |
783 | my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h]; |
| 701 | |
784 | |
| 702 | my $cb = sub { |
785 | my $cb = sub { |
| 703 | return unless $gen == $self->{map_change_gen}; |
786 | $map_info->[1] = \$_[0]; |
| 704 | |
787 | |
| 705 | my ($data) = @_; |
|
|
| 706 | |
|
|
| 707 | if (defined $data) { |
|
|
| 708 | $self->{map_cache_new}{$hash} = \$data; |
|
|
| 709 | |
|
|
| 710 | my $data = Compress::LZF::decompress $data; |
|
|
| 711 | |
|
|
| 712 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
788 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
| 713 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
789 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]); |
| 714 | $self->bg_fetch unless $inprogress; |
790 | $self->bg_fetch unless $inprogress; |
| 715 | } |
|
|
| 716 | }; |
791 | }; |
| 717 | |
792 | |
| 718 | if (my $rdata = $self->{map_cache_old}{$hash}) { |
793 | if (my $map_info = $self->{map_cache_old}{$hash}) { |
| 719 | $cb->($$rdata); |
794 | $cb->(${ $map_info->[1] }); |
| 720 | } else { |
795 | } else { |
|
|
796 | my $gen = $self->{map_change_gen}; |
|
|
797 | |
| 721 | CFPlus::DB::get $self->{mapcache} => $hash, $cb; |
798 | DC::DB::get $self->{mapcache} => $hash, sub { |
|
|
799 | return unless $gen == $self->{map_change_gen}; |
|
|
800 | return unless defined $_[0]; |
|
|
801 | $cb->(Compress::LZF::decompress $_[0]); |
|
|
802 | }; |
| 722 | } |
803 | } |
| 723 | } |
804 | } |
| 724 | |
805 | |
| 725 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
806 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
| 726 | # (server resource,s latency, bandwidth), so this hack is warranted. |
807 | # (server resources, latency, bandwidth), so this hack is warranted. |
| 727 | # the right fix is to make real tiled maps with an overview file |
808 | # the right fix is to make real tiled maps with an overview file |
| 728 | sub send_mapinfo { |
809 | sub send_mapinfo { |
| 729 | my ($self, $data, $cb) = @_; |
810 | my ($self, $data, $cb) = @_; |
| 730 | |
811 | |
| 731 | if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { |
812 | if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { |
| … | |
… | |
| 756 | } |
837 | } |
| 757 | |
838 | |
| 758 | # this method does a "flood fill" into every tile direction |
839 | # this method does a "flood fill" into every tile direction |
| 759 | # it assumes that tiles are arranged in a rectangular grid, |
840 | # it assumes that tiles are arranged in a rectangular grid, |
| 760 | # i.e. a map is the same as the left of the right map etc. |
841 | # i.e. a map is the same as the left of the right map etc. |
| 761 | # failure to comply are harmless and result in display errors |
842 | # failure to comply is harmless and results in display errors |
| 762 | # at worst. |
843 | # at worst. |
| 763 | sub flood_fill { |
844 | sub flood_fill { |
| 764 | my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; |
845 | my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; |
| 765 | |
846 | |
| 766 | # the server does not allow map paths > 6 |
847 | # the server does not allow map paths > 6 |
| … | |
… | |
| 802 | return if $mode ne "spatial"; |
883 | return if $mode ne "spatial"; |
| 803 | |
884 | |
| 804 | $x += $self->{map}->ox; |
885 | $x += $self->{map}->ox; |
| 805 | $y += $self->{map}->oy; |
886 | $y += $self->{map}->oy; |
| 806 | |
887 | |
| 807 | $self->load_map ($hash, $x, $y) |
888 | $self->load_map ($hash, $x, $y, $w, $h) |
| 808 | unless $self->{neigh_map}{$hash}[5]++;#d# |
889 | unless $self->{neigh_map}{$hash}[5]++;#d# |
| 809 | |
890 | |
| 810 | $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; |
891 | $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; |
| 811 | |
892 | |
| 812 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
893 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
| … | |
… | |
| 820 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
901 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
| 821 | |
902 | |
| 822 | $self->flush_map; |
903 | $self->flush_map; |
| 823 | |
904 | |
| 824 | ++$self->{map_change_gen}; |
905 | ++$self->{map_change_gen}; |
| 825 | $self->{map_cache_old} = delete $self->{map_cache_new}; |
906 | $self->{map_cache_old} = delete $self->{map_cache}; |
| 826 | |
907 | |
| 827 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
908 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
| 828 | |
909 | |
| 829 | my $mapmapw = $self->{mapmap}->{w}; |
910 | my $mapmapw = $self->{mapmap}->{w}; |
| 830 | my $mapmaph = $self->{mapmap}->{h}; |
911 | my $mapmaph = $self->{mapmap}->{h}; |
| … | |
… | |
| 842 | $self->{map_info} = [$hash, $x, $y, $w, $h]; |
923 | $self->{map_info} = [$hash, $x, $y, $w, $h]; |
| 843 | |
924 | |
| 844 | (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; |
925 | (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; |
| 845 | $::STATWIDS->{map}->set_text ("Map: " . $map); |
926 | $::STATWIDS->{map}->set_text ("Map: " . $map); |
| 846 | |
927 | |
| 847 | $self->load_map ($hash, $x, $y); |
928 | $self->load_map ($hash, $x, $y, $w, $h); |
| 848 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
929 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
| 849 | } |
930 | } |
| 850 | |
931 | |
| 851 | sub face_find { |
932 | sub face_find { |
| 852 | my ($self, $facenum, $face, $cb) = @_; |
933 | my ($self, $facenum, $face, $cb) = @_; |
| 853 | |
934 | |
| 854 | if ($face->{type} == 0) { # FT_FACE |
935 | if ($face->{type} == 0) { # FT_FACE |
| 855 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
936 | my $id = DC::DB::get_tile_id_sync $face->{name}; |
| 856 | |
937 | |
| 857 | $face->{id} = $id; |
938 | $face->{id} = $id; |
| 858 | $self->{map}->set_tileid ($facenum => $id); |
939 | $self->{map}->set_tileid ($facenum => $id); |
| 859 | |
940 | |
| 860 | CFPlus::DB::get tilecache => $id, $cb; |
941 | DC::DB::get tilecache => $id, $cb; |
| 861 | |
942 | |
| 862 | } elsif ($face->{type} & 1) { # with metadata |
943 | } elsif ($face->{type} & 1) { # with metadata |
| 863 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
944 | DC::DB::get res_meta => $face->{name}, $cb; |
| 864 | |
945 | |
| 865 | } else { # no metadata |
946 | } else { # no metadata |
| 866 | CFPlus::DB::get res_data => $face->{name}, $cb; |
947 | DC::DB::get res_data => $face->{name}, $cb; |
| 867 | } |
948 | } |
| 868 | } |
949 | } |
| 869 | |
950 | |
| 870 | sub face_update { |
951 | sub face_update { |
| 871 | my ($self, $facenum, $face, $changed) = @_; |
952 | my ($self, $facenum, $face, $changed) = @_; |
| 872 | |
953 | |
| 873 | if ($face->{type} == 0) { |
954 | if ($face->{type} == 0) { |
| 874 | # image, FT_FACE |
955 | # image, FT_FACE |
| 875 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
956 | DC::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
| 876 | if $changed; |
957 | if $changed; |
| 877 | |
958 | |
| 878 | $self->have_tile ($face->{id}, delete $face->{data}); |
959 | $self->have_tile ($face->{id}, delete $face->{data}); |
| 879 | |
960 | |
| 880 | } elsif ($face->{type} & 1) { |
961 | } elsif ($face->{type} & 1) { |
| 881 | # split metadata case, FT_MUSIC, FT_SOUND |
962 | # split metadata case, FT_MUSIC, FT_SOUND |
| 882 | if ($changed) { # new data |
963 | if ($changed) { # new data |
| 883 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
964 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
| 884 | $face->{data} = $meta; |
965 | $face->{data} = $meta; |
| 885 | |
966 | |
|
|
967 | # rely on strict ordering here and also on later fetch |
| 886 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
968 | DC::DB::put res_data => $face->{name} => $data, sub { }; |
| 887 | CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; |
969 | DC::DB::put res_meta => $face->{name} => $meta, sub { }; |
| 888 | } |
970 | } |
| 889 | |
971 | |
| 890 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
972 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
| 891 | |
|
|
| 892 | ::add_license ($face); |
973 | ::add_license ($face); |
|
|
974 | ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) |
|
|
975 | if $changed; |
| 893 | |
976 | |
| 894 | if ($face->{type} == 3) { # FT_MUSIC |
977 | if ($face->{type} == 3) { # FT_MUSIC |
| 895 | ::message ({ markup => "downloaded song #$facenum" }) |
|
|
| 896 | if $changed; |
|
|
| 897 | |
|
|
| 898 | &::audio_music_push ($facenum); |
978 | &::audio_music_push ($facenum); |
| 899 | } elsif ($face->{type} == 5) { # FT_SOUND |
979 | } elsif ($face->{type} == 5) { # FT_SOUND |
| 900 | ::message ({ markup => "downloaded sound #$facenum" }) |
|
|
| 901 | if $changed; |
|
|
| 902 | |
|
|
| 903 | &::audio_sound_push ($facenum); |
980 | &::audio_sound_push ($facenum); |
| 904 | } |
981 | } |
| 905 | |
982 | |
| 906 | } else { |
983 | } else { |
| 907 | # flat resource case, FT_RSRC |
984 | # flat resource case, FT_RSRC |
| 908 | CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } |
985 | DC::DB::put res_data => $face->{name} => $face->{data}, sub { } |
| 909 | if $changed; |
986 | if $changed; |
| 910 | } |
987 | } |
| 911 | |
988 | |
| 912 | if (my $cbs = $self->{face_cb}{$facenum}) { |
989 | if (my $cbs = $self->{face_cb}{$facenum}) { |
| 913 | $_->($face, $changed) for @$cbs; |
990 | $_->($face, $changed) for @$cbs; |
| … | |
… | |
| 924 | my ($self, $tile, $data) = @_; |
1001 | my ($self, $tile, $data) = @_; |
| 925 | |
1002 | |
| 926 | return unless $self->{map}; |
1003 | return unless $self->{map}; |
| 927 | |
1004 | |
| 928 | my $tex = $self->{texture}[$tile] ||= |
1005 | my $tex = $self->{texture}[$tile] ||= |
| 929 | new CFPlus::Texture |
1006 | new DC::Texture |
| 930 | tile => $tile, |
1007 | tile => $tile, |
| 931 | image => $data, delete_image => 1, |
1008 | image => $data, delete_image => 1, |
| 932 | minify => 1, mipmap => 1; |
1009 | minify => 1; |
| 933 | |
1010 | |
| 934 | if (my $cbs = delete $self->{tile_cb}{$tile}) { |
1011 | if (my $cbs = delete $self->{tile_cb}{$tile}) { |
| 935 | $_->($tex) for @$cbs; |
1012 | $_->($tex) for @$cbs; |
| 936 | } |
1013 | } |
| 937 | } |
1014 | } |
| … | |
… | |
| 942 | my ($self, $num, $cb) = @_; |
1019 | my ($self, $num, $cb) = @_; |
| 943 | |
1020 | |
| 944 | push @{$self->{face_cb}{$num}}, $cb; |
1021 | push @{$self->{face_cb}{$num}}, $cb; |
| 945 | |
1022 | |
| 946 | defined wantarray |
1023 | defined wantarray |
| 947 | ? CFPlus::guard { |
1024 | ? Guard::guard { |
| 948 | @{$self->{face_cb}{$num}} |
1025 | @{$self->{face_cb}{$num}} |
| 949 | = grep $_ != $cb, |
1026 | = grep $_ != $cb, |
| 950 | @{$self->{face_cb}{$num}}; |
1027 | @{$self->{face_cb}{$num}}; |
| 951 | } |
1028 | } |
| 952 | : () |
1029 | : () |
| … | |
… | |
| 980 | my ($self, $flags, $prompt) = @_; |
1057 | my ($self, $flags, $prompt) = @_; |
| 981 | |
1058 | |
| 982 | $prompt = $LAST_QUERY unless length $prompt; |
1059 | $prompt = $LAST_QUERY unless length $prompt; |
| 983 | $LAST_QUERY = $prompt; |
1060 | $LAST_QUERY = $prompt; |
| 984 | |
1061 | |
| 985 | $self->{query}-> ($self, $flags, $prompt); |
1062 | $self->{query}->($self, $flags, $prompt); |
| 986 | } |
1063 | } |
| 987 | |
1064 | |
| 988 | sub sanitise_xml($) { |
1065 | sub sanitise_xml($) { |
| 989 | local $_ = shift; |
1066 | local $_ = shift; |
| 990 | |
1067 | |
| 991 | # we now weed out all tags we do not support |
1068 | # we now weed out all tags we do not support |
| 992 | s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g; |
1069 | s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>) |
|
|
1070 | }{ |
|
|
1071 | "<" |
|
|
1072 | }gex; |
|
|
1073 | |
| 993 | # now all entities |
1074 | # now all entities |
| 994 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
1075 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
| 995 | |
1076 | |
| 996 | # handle some elements |
1077 | # handle some elements |
| 997 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
1078 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
| 998 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
1079 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
|
|
1080 | |
|
|
1081 | s/\s+$//; |
| 999 | |
1082 | |
| 1000 | $_ |
1083 | $_ |
| 1001 | } |
1084 | } |
| 1002 | |
1085 | |
| 1003 | our %NAME_TO_COLOR = ( |
1086 | our %NAME_TO_COLOR = ( |
| … | |
… | |
| 1016 | tan => 12, |
1099 | tan => 12, |
| 1017 | ); |
1100 | ); |
| 1018 | |
1101 | |
| 1019 | our @CF_COLOR = ( |
1102 | our @CF_COLOR = ( |
| 1020 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
1103 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
| 1021 | [1.00, 1.00, 1.00], |
1104 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
| 1022 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] |
1105 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55], |
| 1023 | [1.00, 0.00, 0.00], |
1106 | [1.00, 0.00, 0.00], |
| 1024 | [1.00, 0.54, 0.00], |
1107 | [1.00, 0.54, 0.00], |
| 1025 | [0.11, 0.56, 1.00], |
1108 | [0.11, 0.56, 1.00], |
| 1026 | [0.93, 0.46, 0.00], |
1109 | [0.93, 0.46, 0.00], |
| 1027 | [0.18, 0.54, 0.34], |
1110 | [0.18, 0.54, 0.34], |
| … | |
… | |
| 1046 | $self->logprint ("msg: ", $text); |
1129 | $self->logprint ("msg: ", $text); |
| 1047 | return if $color < 0; # negative color == ignore if not understood |
1130 | return if $color < 0; # negative color == ignore if not understood |
| 1048 | |
1131 | |
| 1049 | my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0]; |
1132 | my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0]; |
| 1050 | |
1133 | |
| 1051 | ## try to create single paragraphs of multiple lines sent by the server |
|
|
| 1052 | # no longer neecssary with TRT servers |
|
|
| 1053 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
|
|
| 1054 | |
|
|
| 1055 | ::message ({ |
1134 | ::message ({ |
| 1056 | fg => $fg, |
1135 | fg => $fg, |
| 1057 | markup => $_, |
1136 | markup => $text, |
| 1058 | type => $type, |
1137 | type => $type, |
| 1059 | extra => [@extra], |
1138 | extra => [@extra], |
| 1060 | color_flags => $color |
1139 | color_flags => $color, #d# ugly, kill |
| 1061 | }) for split /\n/, $text; |
1140 | }); |
|
|
1141 | |
|
|
1142 | # $color &= ~NDI_CLEAR; # only clear once for multiline messages |
|
|
1143 | # # actually, this is an ugly design. _we_ should control the channels, |
|
|
1144 | # # not some random other widget, as the channels are clearly protocol-specific. |
|
|
1145 | # # then we could also react to flags such as CLEAR without resorting to |
|
|
1146 | # # hacks such as color_flags, above. |
| 1062 | |
1147 | |
| 1063 | $self->{statusbox}->add ($text, |
1148 | $self->{statusbox}->add ($text, |
| 1064 | group => $text, |
1149 | group => $text, |
| 1065 | fg => $fg, |
1150 | fg => $fg, |
| 1066 | timeout => $color >= 2 ? 180 : 10, |
1151 | timeout => $color >= 2 ? 180 : 10, |
| 1067 | tooltip_font => $::FONT_FIXED, |
1152 | tooltip_font => $::FONT_FIXED, |
| 1068 | ); |
1153 | ) if $type eq "info"; |
| 1069 | } |
1154 | } |
| 1070 | } |
1155 | } |
| 1071 | |
1156 | |
| 1072 | sub spell_add { |
1157 | sub spell_add { |
| 1073 | my ($self, $spell) = @_; |
1158 | my ($self, $spell) = @_; |
| … | |
… | |
| 1076 | $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; |
1161 | $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; |
| 1077 | $spell->{message} =~ s/\n+$//; |
1162 | $spell->{message} =~ s/\n+$//; |
| 1078 | $spell->{message} ||= "Server did not provide a description for this spell."; |
1163 | $spell->{message} ||= "Server did not provide a description for this spell."; |
| 1079 | |
1164 | |
| 1080 | $::SPELL_LIST->add_spell ($spell); |
1165 | $::SPELL_LIST->add_spell ($spell); |
| 1081 | |
1166 | delete $::COMPLETER->{command_list}{spells}; |
| 1082 | $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); |
|
|
| 1083 | $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); |
|
|
| 1084 | } |
1167 | } |
| 1085 | |
1168 | |
| 1086 | sub spell_delete { |
1169 | sub spell_delete { |
| 1087 | my ($self, $spell) = @_; |
1170 | my ($self, $spell) = @_; |
| 1088 | |
1171 | |
| 1089 | $::SPELL_LIST->remove_spell ($spell); |
1172 | $::SPELL_LIST->remove_spell ($spell); |
|
|
1173 | delete $::COMPLETER->{command_list}{spells}; |
| 1090 | } |
1174 | } |
| 1091 | |
1175 | |
| 1092 | sub setup { |
1176 | sub setup { |
| 1093 | my ($self, $setup) = @_; |
1177 | my ($self, $setup) = @_; |
| 1094 | |
1178 | |
| … | |
… | |
| 1099 | sub addme_success { |
1183 | sub addme_success { |
| 1100 | my ($self) = @_; |
1184 | my ($self) = @_; |
| 1101 | |
1185 | |
| 1102 | my %skill_help; |
1186 | my %skill_help; |
| 1103 | |
1187 | |
| 1104 | for my $node (CFPlus::Pod::find skill_description => "*") { |
1188 | for my $node (DC::Pod::find skill_description => "*") { |
| 1105 | my (undef, @par) = CFPlus::Pod::section_of $node; |
1189 | my (undef, @par) = DC::Pod::section_of $node; |
| 1106 | $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; |
1190 | $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par; |
| 1107 | }; |
1191 | }; |
| 1108 | |
1192 | |
| 1109 | for my $skill (values %{$self->{skill_info}}) { |
1193 | for my $skill (values %{$self->{skill_info}}) { |
| 1110 | $self->{map_widget}->add_command ("ready_skill $skill", |
1194 | $self->{map_widget}->add_command ("ready_skill $skill", |
| 1111 | (CFPlus::asxml "Ready the skill '$skill'\n\n") |
1195 | (DC::asxml "Ready the skill '$skill'\n\n") |
| 1112 | . $skill_help{$skill}); |
1196 | . $skill_help{$skill}); |
| 1113 | $self->{map_widget}->add_command ("use_skill $skill", |
1197 | $self->{map_widget}->add_command ("use_skill $skill", |
| 1114 | (CFPlus::asxml "Immediately use the skill '$skill'\n\n") |
1198 | (DC::asxml "Immediately use the skill '$skill'\n\n") |
| 1115 | . $skill_help{$skill}); |
1199 | . $skill_help{$skill}); |
| 1116 | } |
1200 | } |
| 1117 | } |
1201 | } |
| 1118 | |
1202 | |
| 1119 | sub eof { |
1203 | sub eof { |
| 1120 | my ($self) = @_; |
1204 | my ($self) = @_; |
| 1121 | |
1205 | |
| 1122 | $self->{map_widget}->clr_commands; |
1206 | $::COMPLETER->reset; |
| 1123 | |
1207 | |
| 1124 | ::stop_game (); |
1208 | ::stop_game (); |
| 1125 | } |
1209 | } |
| 1126 | |
1210 | |
| 1127 | sub update_floorbox { |
1211 | sub update_floorbox { |
| 1128 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
1212 | $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
| 1129 | return unless $::CONN; |
1213 | return unless $::CONN; |
| 1130 | |
1214 | |
| 1131 | $::FLOORBOX->clear; |
1215 | $::FLOORBOX->clear; |
| 1132 | |
1216 | |
| 1133 | my @add; |
1217 | my @add; |
| 1134 | |
1218 | |
| 1135 | my $row; |
1219 | my $row; |
| 1136 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
1220 | for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
|
|
1221 | next if $_->{tag} & 0x80000000; |
| 1137 | if ($row < 6) { |
1222 | if ($row < 6) { |
| 1138 | local $_->{face_widget}; # hack to force recreation of widget |
1223 | local $_->{face_widget}; # hack to force recreation of widget |
| 1139 | local $_->{desc_widget}; # hack to force recreation of widget |
1224 | local $_->{desc_widget}; # hack to force recreation of widget |
| 1140 | CFPlus::Item::update_widgets $_; |
1225 | DC::Item::update_widgets $_; |
| 1141 | |
1226 | |
| 1142 | push @add, |
1227 | push @add, |
| 1143 | 0, $row, $_->{face_widget}, |
1228 | 0, $row, $_->{face_widget}, |
| 1144 | 1, $row, $_->{desc_widget}; |
1229 | 1, $row, $_->{desc_widget}; |
| 1145 | |
1230 | |
| 1146 | $row++; |
1231 | $row++; |
| 1147 | } else { |
1232 | } else { |
| 1148 | push @add, 1, $row, new CFPlus::UI::Button |
1233 | push @add, 1, $row, new DC::UI::Button |
| 1149 | text => "More...", |
1234 | text => "More...", |
| 1150 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
1235 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
| 1151 | ; |
1236 | ; |
| 1152 | last; |
1237 | last; |
| 1153 | } |
1238 | } |
| 1154 | } |
1239 | } |
| 1155 | if ($::CONN->{open_container}) { |
1240 | if ($::CONN->{open_container}) { |
| 1156 | push @add, 1, $row++, new CFPlus::UI::Button |
1241 | push @add, 1, $row++, new DC::UI::Button |
| 1157 | text => "Close container", |
1242 | text => "Close container", |
| 1158 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
1243 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
| 1159 | ; |
1244 | ; |
| 1160 | } |
1245 | } |
| 1161 | |
1246 | |
| 1162 | $::FLOORBOX->add_at (@add); |
1247 | $::FLOORBOX->add_at (@add); |
| 1163 | }); |
1248 | }); |
| 1164 | |
1249 | |
| 1165 | $::WANT_REFRESH->start; |
1250 | $::WANT_REFRESH = 1; |
| 1166 | } |
1251 | } |
| 1167 | |
1252 | |
| 1168 | sub set_opencont { |
1253 | sub set_opencont { |
| 1169 | my ($conn, $tag, $name) = @_; |
1254 | my ($conn, $tag, $name) = @_; |
| 1170 | $conn->{open_container} = $tag; |
1255 | $conn->{open_container} = $tag; |
| 1171 | update_floorbox; |
1256 | update_floorbox; |
| 1172 | |
1257 | |
| 1173 | $::INVR_HB->clear (); |
1258 | $::INVR_HB->clear; |
| 1174 | $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
1259 | $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name); |
| 1175 | |
1260 | |
| 1176 | if ($tag != 0) { # Floor isn't closable, is it? |
1261 | if ($tag != 0) { # Floor isn't closable, is it? |
| 1177 | $::INVR_HB->add (new CFPlus::UI::Button |
1262 | $::INVR_HB->add (new DC::UI::Button |
| 1178 | text => "Close container", |
1263 | text => "Close container", |
| 1179 | tooltip => "Close the currently open container (if one is open)", |
1264 | tooltip => "Close the currently open container (if one is open)", |
| 1180 | on_activate => sub { |
1265 | on_activate => sub { |
| 1181 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
1266 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
| 1182 | if $tag != 0; |
1267 | if $tag != 0; |
| … | |
… | |
| 1189 | } |
1274 | } |
| 1190 | |
1275 | |
| 1191 | sub update_containers { |
1276 | sub update_containers { |
| 1192 | my ($self) = @_; |
1277 | my ($self) = @_; |
| 1193 | |
1278 | |
| 1194 | $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
1279 | $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
| 1195 | my $todo = delete $self->{update_container} |
1280 | my $todo = delete $self->{update_container} |
| 1196 | or return; |
1281 | or return; |
| 1197 | |
1282 | |
| 1198 | for my $tag (keys %$todo) { |
1283 | for my $tag (keys %$todo) { |
| 1199 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
1284 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
| … | |
… | |
| 1234 | } |
1319 | } |
| 1235 | |
1320 | |
| 1236 | sub item_update { |
1321 | sub item_update { |
| 1237 | my ($self, $item) = @_; |
1322 | my ($self, $item) = @_; |
| 1238 | |
1323 | |
| 1239 | #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; |
1324 | #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n"; |
| 1240 | |
1325 | |
| 1241 | CFPlus::Item::update_widgets $item; |
1326 | DC::Item::update_widgets $item; |
| 1242 | |
1327 | |
| 1243 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
1328 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
| 1244 | set_opencont ($::CONN, 0, "Floor"); |
1329 | set_opencont ($::CONN, 0, "Floor"); |
| 1245 | |
1330 | |
| 1246 | } elsif ($item->{flags} & F_OPEN) { |
1331 | } elsif ($item->{flags} & F_OPEN) { |
| 1247 | set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); |
1332 | set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item); |
| 1248 | |
1333 | |
| 1249 | } else { |
1334 | } else { |
| 1250 | $self->{update_container}{$item->{container}}++; |
1335 | $self->{update_container}{$item->{container}}++; |
| 1251 | $self->update_containers; |
1336 | $self->update_containers; |
| 1252 | } |
1337 | } |
| … | |
… | |
| 1263 | |
1348 | |
| 1264 | my $weight = .001 * $self->{player}{weight}; |
1349 | my $weight = .001 * $self->{player}{weight}; |
| 1265 | my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; |
1350 | my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; |
| 1266 | |
1351 | |
| 1267 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); |
1352 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); |
| 1268 | $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); |
1353 | $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit); |
| 1269 | $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); |
1354 | $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); |
| 1270 | } |
1355 | } |
| 1271 | |
1356 | |
| 1272 | sub update_server_info { |
1357 | sub update_server_info { |
| 1273 | my ($self) = @_; |
1358 | my ($self) = @_; |
| 1274 | |
1359 | |
| 1275 | my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>"); |
1360 | my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>"); |
| 1276 | |
1361 | |
|
|
1362 | my $version = JSON::XS->new->encode ($self->{s_version}); |
|
|
1363 | |
| 1277 | $::SERVER_INFO->set_markup ( |
1364 | $::SERVER_INFO->set_markup ( |
| 1278 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
1365 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
| 1279 | . "protocol version <tt>$self->{version}</tt>\n" |
1366 | . "protocol version <tt>$version</tt>\n" |
| 1280 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
|
|
| 1281 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
|
|
| 1282 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
|
|
| 1283 | . "editing support $yesno[!!$self->{editor_support}]\n" |
1367 | . "editing support $yesno[!!$self->{editor_support}]\n" |
| 1284 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
|
|
| 1285 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
|
|
| 1286 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1368 | . "client support $yesno[$self->{cfplus_ext} > 0]" |
| 1287 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1369 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
| 1288 | . "map size $self->{mapw}×$self->{maph}\n" |
1370 | . "map size $self->{mapw}×$self->{maph}\n" |
| 1289 | ); |
1371 | ); |
| 1290 | |
1372 | |
| 1291 | } |
1373 | } |
| … | |
… | |
| 1311 | 0 |
1393 | 0 |
| 1312 | }); |
1394 | }); |
| 1313 | |
1395 | |
| 1314 | $self->update_server_info; |
1396 | $self->update_server_info; |
| 1315 | |
1397 | |
| 1316 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
|
|
| 1317 | $self->send_command ("output-count $::CFG->{output_count}"); |
|
|
| 1318 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1398 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
| 1319 | $self->send_command ("pickup $::CFG->{pickup}"); |
1399 | $self->send_pickup ($::CFG->{pickup}); |
| 1320 | } |
1400 | } |
| 1321 | |
1401 | |
| 1322 | sub lookat { |
1402 | sub lookat { |
| 1323 | my ($self, $x, $y) = @_; |
1403 | my ($self, $x, $y) = @_; |
| 1324 | |
1404 | |
| … | |
… | |
| 1326 | $self->send_ext_req (lookat => $x, $y, sub { |
1406 | $self->send_ext_req (lookat => $x, $y, sub { |
| 1327 | my (%msg) = @_; |
1407 | my (%msg) = @_; |
| 1328 | |
1408 | |
| 1329 | if (exists $msg{npc_dialog}) { |
1409 | if (exists $msg{npc_dialog}) { |
| 1330 | # start npc chat dialog |
1410 | # start npc chat dialog |
| 1331 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
1411 | $self->{w}{npc_dialog} = new DC::NPCDialog:: |
| 1332 | token => $msg{npc_dialog}, |
1412 | token => $msg{npc_dialog}, |
| 1333 | title => "$msg{npc_dialog}[0] (NPC)", |
1413 | title => "$msg{npc_dialog}[0] (NPC)", |
| 1334 | conn => $self, |
1414 | conn => $self, |
| 1335 | ; |
1415 | ; |
| 1336 | } |
1416 | } |
| … | |
… | |
| 1341 | } |
1421 | } |
| 1342 | |
1422 | |
| 1343 | sub destroy { |
1423 | sub destroy { |
| 1344 | my ($self) = @_; |
1424 | my ($self) = @_; |
| 1345 | |
1425 | |
| 1346 | (delete $self->{npc_dialog})->destroy |
1426 | $_->destroy |
| 1347 | if $self->{npc_dialog}; |
1427 | for values %{ $self->{w} }; |
| 1348 | |
1428 | |
| 1349 | $self->SUPER::destroy; |
1429 | $self->SUPER::destroy; |
| 1350 | |
1430 | |
| 1351 | %$self = (); |
1431 | %$self = (); |
| 1352 | } |
1432 | } |
| 1353 | |
1433 | |
| 1354 | package CFPlus::NPCDialog; |
1434 | package DC::NPCDialog; |
| 1355 | |
1435 | |
| 1356 | our @ISA = 'CFPlus::UI::Toplevel'; |
1436 | our @ISA = 'DC::UI::Toplevel'; |
| 1357 | |
1437 | |
| 1358 | sub new { |
1438 | sub new { |
| 1359 | my $class = shift; |
1439 | my $class = shift; |
| 1360 | |
1440 | |
| 1361 | my $self = $class->SUPER::new ( |
1441 | my $self = $class->SUPER::new ( |
| … | |
… | |
| 1368 | kw => { hi => 0, yes => 0, no => 0 }, |
1448 | kw => { hi => 0, yes => 0, no => 0 }, |
| 1369 | has_close_button => 1, |
1449 | has_close_button => 1, |
| 1370 | @_, |
1450 | @_, |
| 1371 | ); |
1451 | ); |
| 1372 | |
1452 | |
| 1373 | CFPlus::weaken (my $this = $self); |
1453 | DC::weaken (my $this = $self); |
| 1374 | |
1454 | |
| 1375 | $self->connect (delete => sub { $this->destroy; 1 }); |
1455 | $self->connect (delete => sub { $this->destroy; 1 }); |
| 1376 | |
1456 | |
| 1377 | # better use a pane... |
1457 | # better use a pane... |
| 1378 | $self->add (my $hbox = new CFPlus::UI::HBox); |
1458 | $self->add (my $hbox = new DC::UI::HBox); |
| 1379 | $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); |
1459 | $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1); |
| 1380 | |
1460 | |
| 1381 | $hbox->add (my $vbox = new CFPlus::UI::VBox); |
1461 | $hbox->add (my $vbox = new DC::UI::VBox); |
| 1382 | |
1462 | |
| 1383 | $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); |
1463 | $vbox->add (new DC::UI::Label text => "Message Entry:"); |
| 1384 | $vbox->add ($self->{entry} = new CFPlus::UI::Entry |
1464 | $vbox->add ($self->{entry} = new DC::UI::Entry |
| 1385 | tooltip => "#npc_message_entry", |
1465 | tooltip => "#npc_message_entry", |
| 1386 | on_activate => sub { |
1466 | on_activate => sub { |
| 1387 | my ($entry, $text) = @_; |
1467 | my ($entry, $text) = @_; |
| 1388 | |
1468 | |
| 1389 | return unless $text =~ /\S/; |
1469 | return unless $text =~ /\S/; |
| … | |
… | |
| 1393 | |
1473 | |
| 1394 | 0 |
1474 | 0 |
| 1395 | }, |
1475 | }, |
| 1396 | ); |
1476 | ); |
| 1397 | |
1477 | |
| 1398 | $vbox->add ($self->{options} = new CFPlus::UI::VBox); |
1478 | $vbox->add ($self->{options} = new DC::UI::VBox); |
| 1399 | |
1479 | |
| 1400 | $self->{bye_button} = new CFPlus::UI::Button |
1480 | $self->{bye_button} = new DC::UI::Button |
| 1401 | text => "Bye (close)", |
1481 | text => "Bye (close)", |
| 1402 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
1482 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
| 1403 | on_activate => sub { $this->destroy; 1 }, |
1483 | on_activate => sub { $this->destroy; 1 }, |
| 1404 | ; |
1484 | ; |
| 1405 | |
1485 | |
| … | |
… | |
| 1424 | }; |
1504 | }; |
| 1425 | |
1505 | |
| 1426 | sub update_options { |
1506 | sub update_options { |
| 1427 | my ($self) = @_; |
1507 | my ($self) = @_; |
| 1428 | |
1508 | |
| 1429 | CFPlus::weaken $self; |
1509 | DC::weaken $self; |
| 1430 | |
1510 | |
| 1431 | $self->{options}->clear; |
1511 | $self->{options}->clear; |
| 1432 | $self->{options}->add ($self->{bye_button}); |
1512 | $self->{options}->add ($self->{bye_button}); |
| 1433 | |
1513 | |
| 1434 | for my $kw (sort keys %{ $self->{kw} }) { |
1514 | for my $kw (sort keys %{ $self->{kw} }) { |
| 1435 | $self->{options}->add (new CFPlus::UI::Button |
1515 | $self->{options}->add (new DC::UI::Button |
| 1436 | text => $kw, |
1516 | text => $kw, |
| 1437 | on_activate => sub { |
1517 | on_activate => sub { |
| 1438 | $self->send ($kw); |
1518 | $self->send ($kw); |
| 1439 | 0 |
1519 | 0 |
| 1440 | }, |
1520 | }, |
| … | |
… | |
| 1443 | } |
1523 | } |
| 1444 | |
1524 | |
| 1445 | sub feed { |
1525 | sub feed { |
| 1446 | my ($self, $type, @arg) = @_; |
1526 | my ($self, $type, @arg) = @_; |
| 1447 | |
1527 | |
| 1448 | CFPlus::weaken $self; |
1528 | DC::weaken $self; |
| 1449 | |
1529 | |
| 1450 | if ($type eq "update") { |
1530 | if ($type eq "update") { |
| 1451 | my (%info) = @arg; |
1531 | my (%info) = @arg; |
| 1452 | |
1532 | |
| 1453 | $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; |
1533 | $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; |
| 1454 | $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; |
1534 | $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; |
| 1455 | |
1535 | |
| 1456 | if (exists $info{msg}) { |
1536 | if (exists $info{msg}) { |
| 1457 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; |
1537 | my $text = "\n" . DC::Protocol::sanitise_xml $info{msg}; |
| 1458 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1538 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
| 1459 | my @link; |
1539 | my @link; |
| 1460 | $text =~ s{ |
1540 | $text =~ s{ |
| 1461 | ($match) |
1541 | ($match) |
| 1462 | }{ |
1542 | }{ |
| 1463 | my $kw = $1; |
1543 | my $kw = $1; |
| 1464 | |
1544 | |
| 1465 | push @link, new CFPlus::UI::Label |
1545 | push @link, new DC::UI::Label |
| 1466 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
1546 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
| 1467 | can_hover => 1, |
1547 | can_hover => 1, |
| 1468 | can_events => 1, |
1548 | can_events => 1, |
| 1469 | padding_x => 0, |
1549 | padding_x => 0, |
| 1470 | padding_y => 0, |
1550 | padding_y => 0, |
| … | |
… | |
| 1488 | } |
1568 | } |
| 1489 | |
1569 | |
| 1490 | sub send { |
1570 | sub send { |
| 1491 | my ($self, $msg) = @_; |
1571 | my ($self, $msg) = @_; |
| 1492 | |
1572 | |
| 1493 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1573 | $self->{textview}->add_paragraph ({ |
|
|
1574 | markup => |
|
|
1575 | "\n<span foreground='#ffff00'><b>" |
|
|
1576 | . (DC::asxml $msg) |
|
|
1577 | . "</b></span>" |
|
|
1578 | }); |
| 1494 | $self->{textview}->scroll_to_bottom; |
1579 | $self->{textview}->scroll_to_bottom; |
| 1495 | |
1580 | |
| 1496 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
1581 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
| 1497 | } |
1582 | } |
| 1498 | |
1583 | |
| … | |
… | |
| 1501 | |
1586 | |
| 1502 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
1587 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
| 1503 | |
1588 | |
| 1504 | if ($self->{conn}) { |
1589 | if ($self->{conn}) { |
| 1505 | $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id}; |
1590 | $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id}; |
| 1506 | delete $self->{conn}{npc_dialog}; |
1591 | delete $self->{conn}{w}{npc_dialog}; |
| 1507 | $self->{conn}->disconnect_ext ($self->{id}); |
1592 | $self->{conn}->disconnect_ext ($self->{id}); |
| 1508 | } |
1593 | } |
| 1509 | |
1594 | |
| 1510 | $self->SUPER::destroy; |
1595 | $self->SUPER::destroy; |
| 1511 | } |
1596 | } |
