1 | package CFPlus::Protocol; |
1 | package DC::Protocol; |
2 | |
2 | |
3 | use utf8; |
3 | use utf8; |
4 | use strict; |
4 | use strict; |
5 | |
5 | |
6 | use Crossfire::Protocol::Constants; |
6 | use Deliantra::Protocol::Constants; |
7 | |
7 | |
8 | use CFPlus; |
8 | use DC; |
9 | use CFPlus::DB; |
9 | use DC::DB; |
10 | use CFPlus::UI; |
10 | use DC::UI; |
11 | use CFPlus::Pod; |
11 | use DC::Pod; |
12 | use CFPlus::Macro; |
12 | use DC::Macro; |
13 | use CFPlus::Item; |
13 | use DC::Item; |
14 | |
14 | |
15 | use Crossfire::Protocol::Base 0.95; |
|
|
16 | |
|
|
17 | use base 'Crossfire::Protocol::Base'; |
15 | use base 'Deliantra::Protocol::Base'; |
18 | |
16 | |
19 | sub new { |
17 | sub new { |
20 | my ($class, %arg) = @_; |
18 | my ($class, %arg) = @_; |
21 | |
19 | |
22 | my $self = $class->SUPER::new (%arg, |
20 | my $self = $class->SUPER::new (%arg, |
23 | setup_req => { |
21 | setup_req => { |
24 | extmap => 1, |
22 | extmap => 1, |
25 | excmd => 1, |
23 | excmd => 1, |
26 | ywidget => 1,#d# |
24 | widget => 2, |
27 | %{$arg{setup_req} || {}}, |
25 | %{$arg{setup_req} || {}}, |
28 | }, |
26 | }, |
29 | ); |
27 | ); |
30 | |
28 | |
31 | $self->{map_widget}->clr_commands; |
29 | $self->{map_widget}->clr_commands; |
32 | |
30 | |
33 | my @cmd_help = map { |
31 | my @cmd_help = map { |
34 | $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
32 | $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
35 | or die "unparseable command help: $_->{kw}[0]"; |
33 | or die "unparseable command help: $_->[DC::Pod::N_KW][0]"; |
36 | |
34 | |
37 | my $cmd = $1; |
35 | my $cmd = $1; |
38 | my @args = split /\|/, $2; |
36 | my @args = split /\|/, $2; |
39 | @args = (".*") unless @args; |
37 | @args = (".*") unless @args; |
40 | |
38 | |
41 | my (undef, @par) = CFPlus::Pod::section_of $_; |
39 | my (undef, @par) = DC::Pod::section_of $_; |
42 | my $text = CFPlus::Pod::as_label @par; |
40 | my $text = DC::Pod::as_label @par; |
43 | |
41 | |
44 | $_ = $_ eq ".*" ? "" : " $_" |
42 | $_ = $_ eq ".*" ? "" : " $_" |
45 | for @args; |
43 | for @args; |
46 | |
44 | |
47 | map ["$cmd$_", $text], |
45 | map ["$cmd$_", $text], |
48 | sort { (length $a) <=> (length $b) } |
46 | sort { (length $a) <=> (length $b) } |
49 | @args |
47 | @args |
50 | } sort { $a->{par} <=> $b->{par} } |
48 | } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] } |
51 | CFPlus::Pod::find command => "*"; |
49 | DC::Pod::find command => "*"; |
52 | |
|
|
53 | $self->connect_ext (ambient_music => sub { |
|
|
54 | my ($songs) = @_; |
|
|
55 | &::audio_music_set_ambient ($songs); |
|
|
56 | }); |
|
|
57 | |
|
|
58 | $self->connect_ext (capabilities => sub { |
|
|
59 | my (%cap) = @_; |
|
|
60 | |
|
|
61 | #$self->send ("setup sound 0"); # we use a different protocol |
|
|
62 | |
|
|
63 | $self->send_exti_msg (fx_want => { |
|
|
64 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
|
|
65 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
|
|
66 | }); |
|
|
67 | |
|
|
68 | if (my $ts = $cap{tileset}) { |
|
|
69 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
|
|
70 | $self->{tileset} = $default; |
|
|
71 | $self->{tilesize} = $default->[3]; |
|
|
72 | $self->setup_req (tileset => $default->[0]); |
|
|
73 | |
|
|
74 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
|
|
75 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
|
|
76 | |
|
|
77 | $self->setup_req (mapsize => "${w}x${h}"); |
|
|
78 | } |
|
|
79 | } |
|
|
80 | }); |
|
|
81 | |
50 | |
82 | $self->{json_coder} |
51 | $self->{json_coder} |
83 | ->convert_blessed |
52 | ->convert_blessed |
84 | ->filter_json_single_key_object (__w_ => sub { |
53 | ->filter_json_single_key_object ("\fw" => sub { |
85 | $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 | } |
86 | }); |
61 | }); |
87 | |
|
|
88 | # widgetset new |
|
|
89 | $self->connect_ext (ws_n => sub { |
|
|
90 | my ($id) = @_; |
|
|
91 | |
|
|
92 | $self->{widgetset}{$id} = { |
|
|
93 | w => {}, |
|
|
94 | }; |
|
|
95 | }); |
|
|
96 | |
|
|
97 | # widgetset destroy |
|
|
98 | $self->connect_ext (ws_d => sub { |
|
|
99 | my ($id) = @_; |
|
|
100 | |
|
|
101 | my $ws = delete $self->{widgetset}{$id} |
|
|
102 | or return; |
|
|
103 | |
|
|
104 | $_->destroy |
|
|
105 | for values %{$ws->{w}}; |
|
|
106 | }); |
|
|
107 | |
|
|
108 | # widgetset create |
|
|
109 | $self->connect_ext (ws_c => sub { |
|
|
110 | my ($ws, $id, $class, $args) = @_; |
|
|
111 | |
|
|
112 | for my $ev (grep /^on_/, keys %$args) { |
|
|
113 | $args->{$ev} = sub { |
|
|
114 | my $id = shift->{s_id}; |
|
|
115 | $self->send_exti_msg (w_e => $id, $ev, \@_); |
|
|
116 | |
|
|
117 | 1 |
|
|
118 | }; |
|
|
119 | } |
|
|
120 | |
|
|
121 | if (my $widget = eval { |
|
|
122 | local $SIG{__DIE__}; |
|
|
123 | "CFPlus::UI::$class"->new ( |
|
|
124 | %$args, |
|
|
125 | s_ws => $ws, |
|
|
126 | s_id => $id, |
|
|
127 | ) |
|
|
128 | } |
|
|
129 | ) { |
|
|
130 | $self->{widget}{$id} |
|
|
131 | = $self->{widgetset}{$ws}{w}{$id} |
|
|
132 | = $widget; |
|
|
133 | |
|
|
134 | $widget->connect (on_destroy => sub { |
|
|
135 | my ($widget) = @_; |
|
|
136 | |
|
|
137 | delete $self->{widget}{$widget->{s_id}}; |
|
|
138 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; |
|
|
139 | }); |
|
|
140 | } else { |
|
|
141 | warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; |
|
|
142 | $self->send_exti_msg (w_e => $id, "destroy"); |
|
|
143 | } |
|
|
144 | }); |
|
|
145 | |
|
|
146 | # widget call |
|
|
147 | $self->connect_ext (w_c => sub { |
|
|
148 | my ($id, $rid, $method, $args) = @_; |
|
|
149 | |
|
|
150 | my $w = $self->{widget}{$id} |
|
|
151 | or return; |
|
|
152 | |
|
|
153 | $args ||= []; |
|
|
154 | |
|
|
155 | if ($rid) { |
|
|
156 | $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]); |
|
|
157 | } else { |
|
|
158 | $w->$method (@$args); |
|
|
159 | } |
|
|
160 | }); |
|
|
161 | |
|
|
162 | # widget set |
|
|
163 | $self->connect_ext (w_s => sub { |
|
|
164 | my ($id, $attr) = @_; |
|
|
165 | |
|
|
166 | my $w = $self->{widget}{$id} |
|
|
167 | or return; |
|
|
168 | |
|
|
169 | for (my $i = 0; $i < $#$attr; $i += 2) { |
|
|
170 | my ($member, $value) = @$attr[$i, $i+1]; |
|
|
171 | if (defined $value) { |
|
|
172 | $w->{$member} = $value; |
|
|
173 | } else { |
|
|
174 | delete $w->{$member}; |
|
|
175 | } |
|
|
176 | $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible}; |
|
|
177 | } |
|
|
178 | }); |
|
|
179 | |
|
|
180 | # widget get |
|
|
181 | $self->connect_ext (w_g => sub { |
|
|
182 | my ($id, $rid, $attr) = @_; |
|
|
183 | |
|
|
184 | my $w = $self->{widget}{$id} |
|
|
185 | or return; |
|
|
186 | |
|
|
187 | $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); |
|
|
188 | }); |
|
|
189 | |
|
|
190 | # message window |
|
|
191 | $self->connect_ext (channel_info => sub { |
|
|
192 | my ($info) = @_; |
|
|
193 | $self->{channels}->{$info->{id}} = $info; |
|
|
194 | $::MESSAGE_WINDOW->add_channel ($info); |
|
|
195 | }); |
|
|
196 | |
62 | |
197 | # destroy widgets on logout |
63 | # destroy widgets on logout |
198 | $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 { |
199 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
65 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
200 | $_->destroy |
66 | $_->destroy |
201 | for values %{delete $ws->{w} || {}}; |
67 | for values %{delete $ws->{w} || {}}; |
202 | } |
68 | } |
|
|
69 | |
|
|
70 | delete $self->{items}; |
|
|
71 | $::INV->clear; |
|
|
72 | $::INVR_HB->clear; |
|
|
73 | $::FLOORBOX->clear; |
203 | }); |
74 | }); |
204 | |
75 | |
205 | $self->{map_widget}->add_command (@$_) |
76 | $self->{map_widget}->add_command (@$_) |
206 | for @cmd_help; |
77 | for @cmd_help; |
207 | |
78 | |
208 | { |
79 | { |
209 | $self->{dialogue} = my $tex = new_from_file CFPlus::Texture |
80 | $self->{dialogue} = my $tex = new_from_file DC::Texture |
210 | CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; |
81 | DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1; |
211 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
82 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
212 | } |
83 | } |
213 | |
84 | |
214 | { |
85 | { |
215 | $self->{noface} = my $tex = new_from_file CFPlus::Texture |
86 | $self->{noface} = my $tex = new_from_file DC::Texture |
216 | CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; |
87 | DC::find_rcfile "noface.png", minify => 1, mipmap => 1; |
217 | $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
88 | $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
218 | } |
89 | } |
219 | |
90 | |
220 | $self->{open_container} = 0; |
91 | $self->{open_container} = 0; |
221 | |
92 | |
… | |
… | |
223 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
94 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
224 | |
95 | |
225 | $self |
96 | $self |
226 | } |
97 | } |
227 | |
98 | |
|
|
99 | sub update_fx_want { |
|
|
100 | my ($self) = @_; |
|
|
101 | |
|
|
102 | $self->send_exti_msg (fx_want => { |
|
|
103 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
|
|
104 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
|
|
105 | 6 => 1, # FT_RSRC |
|
|
106 | }); |
|
|
107 | } |
|
|
108 | |
|
|
109 | sub ext_capabilities { |
|
|
110 | my ($self, %cap) = @_; |
|
|
111 | |
|
|
112 | $self->update_fx_want; |
|
|
113 | |
|
|
114 | $self->send_exti_req (resource => "exp_table", sub { |
|
|
115 | my ($exp_table) = @_; |
|
|
116 | |
|
|
117 | $self->register_face_handler ($exp_table, sub { |
|
|
118 | my ($face) = @_; |
|
|
119 | |
|
|
120 | $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data}); |
|
|
121 | $_->() for values %{ $self->{on_exp_update} || {} }; |
|
|
122 | }); |
|
|
123 | |
|
|
124 | () |
|
|
125 | }); |
|
|
126 | |
|
|
127 | if (my $ts = $cap{tileset}) { |
|
|
128 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
|
|
129 | $self->{tileset} = $default; |
|
|
130 | $self->{tilesize} = $default->[3]; |
|
|
131 | $self->setup_req (tileset => $default->[0]); |
|
|
132 | |
|
|
133 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
|
|
134 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
|
|
135 | |
|
|
136 | $self->setup_req (mapsize => "${w}x${h}"); |
|
|
137 | } |
|
|
138 | } |
|
|
139 | } |
|
|
140 | |
|
|
141 | sub ext_ambient_music { |
|
|
142 | my ($self, $songs) = @_; |
|
|
143 | &::audio_music_set_ambient ($songs); |
|
|
144 | } |
|
|
145 | |
|
|
146 | ############################################################################# |
|
|
147 | |
|
|
148 | sub widget_associate { |
|
|
149 | my ($self, $ws, $id, $widget) = @_; |
|
|
150 | |
|
|
151 | $widget ||= new DC::UI::Bin; |
|
|
152 | |
|
|
153 | $widget->{s_id} = $id; |
|
|
154 | $self->{widget}{$id} = $widget; |
|
|
155 | |
|
|
156 | if ($ws) { |
|
|
157 | $widget->{s_ws} = $ws; |
|
|
158 | $self->{widgetset}{$ws}{w}{$id} = $widget; |
|
|
159 | } |
|
|
160 | |
|
|
161 | $widget->connect (on_destroy => sub { |
|
|
162 | my ($widget) = @_; |
|
|
163 | |
|
|
164 | delete $self->{widget}{$widget->{s_id}}; |
|
|
165 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} |
|
|
166 | if exists $widget->{s_ws}; |
|
|
167 | }); |
|
|
168 | } |
|
|
169 | |
|
|
170 | # widgetset new |
|
|
171 | sub ext_ws_n { |
|
|
172 | my ($self, $id) = @_; |
|
|
173 | |
|
|
174 | $self->{widgetset}{$id} = { |
|
|
175 | w => {}, |
|
|
176 | }; |
|
|
177 | } |
|
|
178 | |
|
|
179 | # widgetset destroy |
|
|
180 | sub ext_ws_d { |
|
|
181 | my ($self, $id) = @_; |
|
|
182 | |
|
|
183 | my $ws = delete $self->{widgetset}{$id} |
|
|
184 | or return; |
|
|
185 | |
|
|
186 | $_->destroy |
|
|
187 | for values %{$ws->{w}}; |
|
|
188 | } |
|
|
189 | |
|
|
190 | # widgetset create |
|
|
191 | sub ext_ws_c { |
|
|
192 | my ($self, $ws, $id, $class, $args) = @_; |
|
|
193 | |
|
|
194 | $self->widget_associate ( |
|
|
195 | $ws, $id => scalar eval { |
|
|
196 | local $SIG{__DIE__}; |
|
|
197 | "DC::UI::$class"->new (%$args) |
|
|
198 | } |
|
|
199 | ); |
|
|
200 | } |
|
|
201 | |
|
|
202 | # widgetset create template |
|
|
203 | sub ext_ws_ct { |
|
|
204 | my ($self, $ws, $type, $template, $done_cb, $cfg) = @_; |
|
|
205 | |
|
|
206 | $done_cb ||= sub { }; |
|
|
207 | |
|
|
208 | my $parse_list; $parse_list = sub { |
|
|
209 | my ($list) = @_; |
|
|
210 | my @w; |
|
|
211 | |
|
|
212 | while (@$list) { |
|
|
213 | my ($class, $args) = splice @$list, 0, 2; |
|
|
214 | my $name = delete $args->{s_id}; |
|
|
215 | my $cl = delete $args->{s_cl}; |
|
|
216 | my $cfg = delete $cfg->{$name}; |
|
|
217 | my $id = delete $cfg->{id}; |
|
|
218 | my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) } |
|
|
219 | or next; |
|
|
220 | |
|
|
221 | $self->widget_associate ($ws, $id, $w) |
|
|
222 | if $id; |
|
|
223 | |
|
|
224 | $w->add ($parse_list->($cl)) |
|
|
225 | if $cl; |
|
|
226 | |
|
|
227 | push @w, $w; |
|
|
228 | } |
|
|
229 | |
|
|
230 | @w |
|
|
231 | }; |
|
|
232 | |
|
|
233 | # either array reference, or face # |
|
|
234 | if ($type eq "inline") { |
|
|
235 | $done_cb->(); |
|
|
236 | $parse_list->($template); |
|
|
237 | } elsif ($type eq "face") { |
|
|
238 | my $handler; $handler = $self->register_face_handler ($template, sub { |
|
|
239 | my ($face) = @_; |
|
|
240 | |
|
|
241 | undef $handler; |
|
|
242 | $done_cb->(); |
|
|
243 | $parse_list->($self->{json_coder}->decode ($face->{data})); |
|
|
244 | }); |
|
|
245 | } else { |
|
|
246 | $done_cb->(0); |
|
|
247 | } |
|
|
248 | } |
|
|
249 | |
|
|
250 | # widgetset associate |
|
|
251 | sub ext_ws_a { |
|
|
252 | my ($self, %ass) = @_; |
|
|
253 | |
|
|
254 | # everything that has a name, wether conceivably useful or not |
|
|
255 | my %wkw = ( |
|
|
256 | root => $DC::UI::ROOT, |
|
|
257 | tooltip => $DC::UI::TOOLTIP, |
|
|
258 | |
|
|
259 | mapwidget => $::MAPWIDGET, |
|
|
260 | buttonbar => $::BUTTONBAR, |
|
|
261 | metaserver => $::METASERVER, |
|
|
262 | buttonbar => $::BUTTONBAR, |
|
|
263 | login_button => $::LOGIN_BUTTON, |
|
|
264 | quit_dialog => $::QUIT_DIALOG, |
|
|
265 | host_entry => $::HOST_ENTRY, |
|
|
266 | metaserver => $::METASERVER, |
|
|
267 | server_info => $::SERVER_INFO, |
|
|
268 | |
|
|
269 | setup_dialog => $::SETUP_DIALOG, |
|
|
270 | setup_notebook => $::SETUP_NOTEBOOK, |
|
|
271 | setup_server => $::SETUP_SERVER, |
|
|
272 | setup_keyboard => $::SETUP_KEYBOARD, |
|
|
273 | |
|
|
274 | pl_notebook => $::PL_NOTEBOOK, |
|
|
275 | pl_window => $::PL_WINDOW, |
|
|
276 | inventory_page => $::INVENTORY_PAGE, |
|
|
277 | stats_page => $::STATS_PAGE, |
|
|
278 | skill_page => $::SKILL_PAGE, |
|
|
279 | spell_page => $::SPELL_PAGE, |
|
|
280 | spell_list => $::SPELL_LIST, |
|
|
281 | |
|
|
282 | floorbox => $::FLOORBOX, |
|
|
283 | help_window => $::HELP_WINDOW, |
|
|
284 | message_window => $::MESSAGE_WINDOW, |
|
|
285 | message_dist => $::MESSAGE_DIST, |
|
|
286 | statusbox => $::SDTATUSBOX, |
|
|
287 | |
|
|
288 | inv => $::INV, |
|
|
289 | invr => $::INVR, |
|
|
290 | invr_hb => $::INVR_HB, |
|
|
291 | ); |
|
|
292 | |
|
|
293 | while (my ($id, $name) = each %ass) { |
|
|
294 | $self->widget_associate (undef, $id => $wkw{$name}); |
|
|
295 | } |
|
|
296 | } |
|
|
297 | |
|
|
298 | # widget call |
|
|
299 | sub ext_w_c { |
|
|
300 | my ($self, $id, $rcb, $method, @args) = @_; |
|
|
301 | |
|
|
302 | my $w = $self->{widget}{$id} |
|
|
303 | or return; |
|
|
304 | |
|
|
305 | if ($rcb) { |
|
|
306 | $rcb->($w->$method (@args)); |
|
|
307 | } else { |
|
|
308 | $w->$method (@args); |
|
|
309 | } |
|
|
310 | } |
|
|
311 | |
|
|
312 | # widget set |
|
|
313 | sub ext_w_s { |
|
|
314 | my ($self, $id, $attr) = @_; |
|
|
315 | |
|
|
316 | my $w = $self->{widget}{$id} |
|
|
317 | or return; |
|
|
318 | |
|
|
319 | for (my $i = 0; $i < $#$attr; $i += 2) { |
|
|
320 | my ($member, $value) = @$attr[$i, $i+1]; |
|
|
321 | if (defined $value) { |
|
|
322 | $w->{$member} = $value; |
|
|
323 | } else { |
|
|
324 | delete $w->{$member}; |
|
|
325 | } |
|
|
326 | $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible}; |
|
|
327 | } |
|
|
328 | } |
|
|
329 | |
|
|
330 | # widget get |
|
|
331 | sub ext_w_g { |
|
|
332 | my ($self, $id, $rid, @attr) = @_; |
|
|
333 | |
|
|
334 | my $w = $self->{widget}{$id} |
|
|
335 | or return; |
|
|
336 | |
|
|
337 | $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr); |
|
|
338 | } |
|
|
339 | |
|
|
340 | # message window |
|
|
341 | sub ext_channel_info { |
|
|
342 | my ($self, $info) = @_; |
|
|
343 | $self->{channels}->{$info->{id}} = $info; |
|
|
344 | $::MESSAGE_DIST->add_channel ($info); |
|
|
345 | } |
|
|
346 | |
|
|
347 | ############################################################################# |
|
|
348 | |
228 | sub logprint { |
349 | sub logprint { |
229 | my ($self, @a) = @_; |
350 | my ($self, @a) = @_; |
230 | |
351 | |
231 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
352 | DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
232 | } |
353 | } |
233 | |
354 | |
234 | sub _stat_numdiff { |
355 | sub _stat_numdiff { |
235 | my ($self, $name, $old, $new) = @_; |
356 | my ($self, $name, $old, $new) = @_; |
236 | |
357 | |
… | |
… | |
320 | |
441 | |
321 | if ( |
442 | if ( |
322 | my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange |
443 | my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange |
323 | ) { |
444 | ) { |
324 | my $msg = "<b>stat change</b>: " . (join " ", @diffs); |
445 | my $msg = "<b>stat change</b>: " . (join " ", @diffs); |
325 | $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); |
446 | $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20); |
326 | } |
447 | } |
327 | |
448 | |
328 | $self->update_stats_window ($stats, $prev); |
449 | $self->update_stats_window ($stats, $prev); |
329 | |
450 | |
330 | $self->{prev_stats} = { %$stats }; |
451 | $self->{prev_stats} = { %$stats }; |
… | |
… | |
369 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
490 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
370 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
491 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
371 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
492 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
372 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
493 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
373 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
494 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
|
|
495 | $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); |
374 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
496 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
375 | my $title = $stats->{+CS_STAT_TITLE}; |
497 | my $title = $stats->{+CS_STAT_TITLE}; |
376 | $title =~ s/^Player: //; |
498 | $title =~ s/^Player: //; |
377 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
499 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
378 | |
500 | |
… | |
… | |
396 | for keys %RES_TBL; |
518 | for keys %RES_TBL; |
397 | |
519 | |
398 | my $sktbl = $::STATWIDS->{skill_tbl}; |
520 | my $sktbl = $::STATWIDS->{skill_tbl}; |
399 | my @skills = keys %{ $self->{skill_info} }; |
521 | my @skills = keys %{ $self->{skill_info} }; |
400 | |
522 | |
401 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
523 | my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
|
|
524 | map [$_, $self->{skill_info}{$_}], |
|
|
525 | grep exists $stats->{$_}, |
|
|
526 | @skills; |
|
|
527 | |
|
|
528 | if ($self->{stat_order} ne join ",", map $_->[0], @order) { |
|
|
529 | $self->{stat_order} = join ",", map $_->[0], @order; |
|
|
530 | |
402 | $sktbl->clear; |
531 | $sktbl->clear; |
403 | |
532 | |
404 | my @add; |
533 | my $sw = $self->{skillwid}{""} ||= [ |
405 | |
|
|
406 | push @add, |
|
|
407 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
534 | 0, 0, (new DC::UI::Label text => "Experience", align => 1), |
408 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
535 | 1, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
|
|
536 | 2, 0, (new DC::UI::Label text => "Progress"), |
409 | 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
537 | 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), |
410 | 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
538 | 4, 0, (new DC::UI::Label text => "Experience", align => 1), |
411 | 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
539 | 5, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
|
|
540 | 6, 0, (new DC::UI::Label text => "Progress"), |
412 | 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
541 | 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), |
413 | ; |
542 | ]; |
|
|
543 | |
|
|
544 | my @add = @$sw; |
414 | |
545 | |
415 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
546 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
416 | |
547 | |
417 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
548 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
418 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
549 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
419 | |
550 | |
420 | my ($x, $y) = (0, 1); |
551 | my ($x, $y) = (0, 1); |
421 | for ( |
552 | for (@order) { |
422 | sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
|
|
423 | map [$_, $self->{skill_info}{$_}], |
|
|
424 | grep exists $stats->{$_}, |
|
|
425 | @skills |
|
|
426 | ) { |
|
|
427 | my ($idx, $name) = @$_; |
553 | my ($idx, $name) = @$_; |
428 | |
554 | |
429 | my $spell_cb = sub { |
555 | my $spell_cb = sub { |
430 | my ($widget, $ev) = @_; |
556 | my ($widget, $ev) = @_; |
431 | |
557 | |
432 | if ($ev->{button} == 1) { |
558 | if ($ev->{button} == 1) { |
433 | $::CONN->user_send ("ready_skill $name"); |
559 | $::CONN->user_send ("ready_skill $name"); |
434 | } elsif ($ev->{button} == 2) { |
560 | } elsif ($ev->{button} == 2) { |
435 | $::CONN->user_send ("use_skill $name"); |
561 | $::CONN->user_send ("use_skill $name"); |
436 | } elsif ($ev->{button} == 3) { |
562 | } elsif ($ev->{button} == 3) { |
437 | my $shortname = CFPlus::shorten $name, 14; |
563 | my $shortname = DC::shorten $name, 14; |
438 | (new CFPlus::UI::Menu |
564 | (new DC::UI::Menu |
439 | items => [ |
565 | items => [ |
440 | ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], |
566 | ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }], |
441 | ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], |
567 | ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }], |
442 | ], |
568 | ], |
443 | )->popup ($ev); |
569 | )->popup ($ev); |
444 | } else { |
570 | } else { |
445 | return 0; |
571 | return 0; |
446 | } |
572 | } |
447 | |
573 | |
448 | 1 |
574 | 1 |
449 | }; |
575 | }; |
450 | |
576 | |
|
|
577 | my $sw = $self->{skillwid}{$idx} ||= [ |
|
|
578 | # exp |
|
|
579 | (new DC::UI::Label |
|
|
580 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
|
|
581 | |
|
|
582 | # level |
|
|
583 | (new DC::UI::Label |
|
|
584 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
|
|
585 | |
|
|
586 | # progress |
|
|
587 | (new DC::UI::ExperienceProgress), |
|
|
588 | |
|
|
589 | # label |
|
|
590 | (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0, |
|
|
591 | can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
|
|
592 | ]; |
|
|
593 | |
451 | push @add, |
594 | push @add, |
452 | $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label |
595 | $x * 4 + 0, $y, $sw->[0], |
453 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
596 | $x * 4 + 1, $y, $sw->[1], |
454 | $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label |
597 | $x * 4 + 2, $y, $sw->[2], |
455 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
598 | $x * 4 + 3, $y, $sw->[3], |
456 | $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
|
|
457 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
|
|
458 | ; |
599 | ; |
459 | |
600 | |
460 | $x++ and ($x, $y) = (0, $y + 1); |
601 | $x++ and ($x, $y) = (0, $y + 1); |
461 | } |
602 | } |
462 | |
603 | |
463 | $sktbl->add_at (@add); |
604 | $sktbl->add_at (@add); |
464 | } |
605 | } |
465 | |
606 | |
466 | for (grep exists $stats->{$_}, @skills) { |
607 | for (@order) { |
467 | $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); |
608 | my ($idx, $name) = @$_; |
468 | $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); |
609 | my $val = $stats->{$idx}; |
469 | } |
|
|
470 | } |
|
|
471 | |
610 | |
472 | sub macro_send { |
611 | next if $prev->{$idx}[1] eq $val->[1]; |
473 | my ($self, $macro) = @_; |
|
|
474 | |
612 | |
475 | for my $cmd (@{ $macro->{action} }) { |
613 | my $sw = $self->{skillwid}{$idx}; |
476 | $self->send_command ($cmd); |
614 | $sw->[0]->set_text (::formsep ($val->[1])); |
|
|
615 | $sw->[1]->set_text ($val->[0] * 1); |
|
|
616 | $sw->[2]->set_value (@$val); |
|
|
617 | |
|
|
618 | $::GAUGES->{sklprg}->set_label ("$name %d%%"); |
|
|
619 | $::GAUGES->{sklprg}->set_value (@$val); |
477 | } |
620 | } |
478 | } |
621 | } |
479 | |
622 | |
480 | sub user_send { |
623 | sub user_send { |
481 | my ($self, $command) = @_; |
624 | my ($self, $command) = @_; |
… | |
… | |
483 | $self->{record}->($command) |
626 | $self->{record}->($command) |
484 | if $self->{record}; |
627 | if $self->{record}; |
485 | |
628 | |
486 | $self->logprint ("send: ", $command); |
629 | $self->logprint ("send: ", $command); |
487 | $self->send_command ($command); |
630 | $self->send_command ($command); |
488 | ::status ($command); |
|
|
489 | } |
631 | } |
490 | |
632 | |
491 | sub record { |
633 | sub record { |
492 | my ($self, $cb) = @_; |
634 | my ($self, $cb) = @_; |
493 | |
635 | |
… | |
… | |
501 | } |
643 | } |
502 | |
644 | |
503 | sub feed_map1a { |
645 | sub feed_map1a { |
504 | my ($self, $data) = @_; |
646 | my ($self, $data) = @_; |
505 | |
647 | |
506 | $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
648 | my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
|
|
649 | my $delay; |
|
|
650 | |
|
|
651 | for my $tile (@$missing) { |
|
|
652 | next if $self->{delay}{$tile}; |
|
|
653 | |
|
|
654 | $delay = 1; |
|
|
655 | |
|
|
656 | if (my $tex = $::CONN->{texture}[$tile]) { |
|
|
657 | $tex->upload; |
|
|
658 | } else { |
|
|
659 | $self->{delay}{$tile} = 1; |
|
|
660 | |
|
|
661 | # we assume the face is in-flight and will eventually come |
|
|
662 | push @{$self->{tile_cb}{$tile}}, sub { |
|
|
663 | delete $self->{delay}{$tile}; |
|
|
664 | $_[0]->upload; |
|
|
665 | }; |
|
|
666 | } |
|
|
667 | } |
|
|
668 | |
|
|
669 | if ($delay) { |
|
|
670 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
|
|
671 | EV::once undef, 0, 0.03, sub { |
|
|
672 | $self->{map_widget}->update |
|
|
673 | if $self->{map_widget}; |
|
|
674 | }; |
|
|
675 | } else { |
507 | $self->{map_widget}->update; |
676 | $self->{map_widget}->update; |
|
|
677 | } |
508 | } |
678 | } |
509 | |
679 | |
510 | sub magicmap { |
680 | sub magicmap { |
511 | my ($self, $w, $h, $x, $y, $data) = @_; |
681 | my ($self, $w, $h, $x, $y, $data) = @_; |
512 | |
682 | |
… | |
… | |
514 | } |
684 | } |
515 | |
685 | |
516 | sub flush_map { |
686 | sub flush_map { |
517 | my ($self) = @_; |
687 | my ($self) = @_; |
518 | |
688 | |
519 | my $map_info = delete $self->{map_info} |
689 | return unless $self->{map_info}; |
520 | or return; |
|
|
521 | |
690 | |
|
|
691 | for my $map_info (values %{ $self->{map_cache} || {} }) { |
522 | my ($hash, $x, $y, $w, $h) = @$map_info; |
692 | my ($hash, $rdata, $x, $y, $w, $h) = @$map_info; |
523 | |
693 | |
524 | my $data = $self->{map}->get_rect ($x, $y, $w, $h); |
694 | my $data = $self->{map}->get_rect ($x, $y, $w, $h); |
|
|
695 | |
|
|
696 | if ($data ne $$rdata) { |
|
|
697 | $map_info->[1] = \$data; |
|
|
698 | my $cdata = Compress::LZF::compress $data; |
|
|
699 | warn "db_put $hash $x $y ", length $data, " > ", length $cdata; |
525 | CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; |
700 | DC::DB::put $self->{mapcache} => $hash => $cdata, sub { }; |
526 | #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# |
701 | } |
|
|
702 | } |
527 | } |
703 | } |
528 | |
704 | |
529 | sub map_clear { |
705 | sub map_clear { |
530 | my ($self) = @_; |
706 | my ($self) = @_; |
531 | |
707 | |
532 | $self->flush_map; |
708 | $self->flush_map; |
|
|
709 | delete $self->{map_info}; |
533 | delete $self->{neigh_map}; |
710 | delete $self->{neigh_map}; |
534 | |
711 | |
535 | $self->{map}->clear; |
712 | $self->{map}->clear; |
536 | delete $self->{map_widget}{magicmap}; |
713 | delete $self->{map_widget}{magicmap}; |
537 | } |
714 | } |
538 | |
715 | |
539 | sub bg_fetch { |
716 | sub bg_fetch { |
540 | my ($self) = @_; |
717 | my ($self) = @_; |
541 | |
718 | |
542 | my $id; |
719 | my $tile; |
543 | |
720 | |
544 | do { |
721 | do { |
545 | $id = pop @{$self->{bg_fetch}} |
722 | $tile = pop @{$self->{bg_fetch}} |
546 | or return; |
723 | or return; |
547 | } while $self->{texture}[$id]; |
724 | } while $self->{texture}[$tile]; |
548 | |
725 | |
549 | CFPlus::DB::exists tilecache => $id, sub { |
726 | DC::DB::get tilecache => $tile, sub { |
550 | my ($exists) = @_; |
727 | my ($data) = @_; |
551 | |
728 | |
552 | return unless $self->{map}; # stop when destroyed |
729 | return unless $self->{map}; # stop when destroyed |
553 | |
730 | |
|
|
731 | if (defined $data) { |
554 | $self->have_tile ($id) |
732 | $self->have_tile ($tile, $data); |
555 | if $exists; |
733 | $self->{texture}[$tile]->upload; |
|
|
734 | } |
556 | |
735 | |
557 | $self->bg_fetch; |
736 | $self->bg_fetch; |
558 | }; |
737 | }; |
559 | } |
738 | } |
560 | |
739 | |
561 | sub load_map($$$) { |
740 | sub load_map($$$$$$) { |
562 | my ($self, $hash, $x, $y) = @_; |
741 | my ($self, $hash, $x, $y, $w, $h) = @_; |
563 | |
742 | |
564 | my $gen = $self->{map_change_gen}; |
743 | my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h]; |
565 | |
744 | |
566 | CFPlus::DB::get $self->{mapcache} => $hash, sub { |
745 | my $cb = sub { |
567 | return unless $gen == $self->{map_change_gen}; |
746 | $map_info->[1] = \$_[0]; |
568 | |
747 | |
569 | my ($data) = @_; |
748 | return if 2505 == length $_[0];#d# |
|
|
749 | warn "map_cache $hash $x $y $w $h ", length $_[0];#d# |
570 | |
750 | |
571 | if (defined $data) { |
|
|
572 | $data = Compress::LZF::decompress $data; |
|
|
573 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
|
|
574 | |
|
|
575 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
751 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
576 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
752 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]); |
577 | $self->bg_fetch unless $inprogress; |
753 | $self->bg_fetch unless $inprogress; |
578 | } |
|
|
579 | }; |
754 | }; |
|
|
755 | |
|
|
756 | if (my $map_info = $self->{map_cache_old}{$hash}) { |
|
|
757 | $cb->(${ $map_info->[1] }); |
|
|
758 | } else { |
|
|
759 | my $gen = $self->{map_change_gen}; |
|
|
760 | |
|
|
761 | DC::DB::get $self->{mapcache} => $hash, sub { |
|
|
762 | return unless $gen == $self->{map_change_gen}; |
|
|
763 | return unless defined $_[0]; |
|
|
764 | $cb->(Compress::LZF::decompress $_[0]); |
|
|
765 | }; |
|
|
766 | } |
580 | } |
767 | } |
581 | |
768 | |
582 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
769 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
583 | # (server resource,s latency, bandwidth), so this hack is warranted. |
770 | # (server resources, latency, bandwidth), so this hack is warranted. |
584 | # the right fix is to make real tiled maps with an overview file |
771 | # the right fix is to make real tiled maps with an overview file |
585 | sub send_mapinfo { |
772 | sub send_mapinfo { |
586 | my ($self, $data, $cb) = @_; |
773 | my ($self, $data, $cb) = @_; |
587 | |
774 | |
588 | if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { |
775 | if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { |
… | |
… | |
613 | } |
800 | } |
614 | |
801 | |
615 | # this method does a "flood fill" into every tile direction |
802 | # this method does a "flood fill" into every tile direction |
616 | # it assumes that tiles are arranged in a rectangular grid, |
803 | # it assumes that tiles are arranged in a rectangular grid, |
617 | # i.e. a map is the same as the left of the right map etc. |
804 | # i.e. a map is the same as the left of the right map etc. |
618 | # failure to comply are harmless and result in display errors |
805 | # failure to comply is harmless and results in display errors |
619 | # at worst. |
806 | # at worst. |
620 | sub flood_fill { |
807 | sub flood_fill { |
621 | my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; |
808 | my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; |
622 | |
809 | |
623 | # the server does not allow map paths > 6 |
810 | # the server does not allow map paths > 6 |
… | |
… | |
659 | return if $mode ne "spatial"; |
846 | return if $mode ne "spatial"; |
660 | |
847 | |
661 | $x += $self->{map}->ox; |
848 | $x += $self->{map}->ox; |
662 | $y += $self->{map}->oy; |
849 | $y += $self->{map}->oy; |
663 | |
850 | |
664 | $self->load_map ($hash, $x, $y) |
851 | $self->load_map ($hash, $x, $y, $w, $h) |
665 | unless $self->{neigh_map}{$hash}[5]++;#d# |
852 | unless $self->{neigh_map}{$hash}[5]++;#d# |
666 | |
853 | |
667 | $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; |
854 | $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; |
668 | |
855 | |
669 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
856 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
… | |
… | |
677 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
864 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
678 | |
865 | |
679 | $self->flush_map; |
866 | $self->flush_map; |
680 | |
867 | |
681 | ++$self->{map_change_gen}; |
868 | ++$self->{map_change_gen}; |
|
|
869 | $self->{map_cache_old} = delete $self->{map_cache}; |
682 | |
870 | |
683 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
871 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
684 | |
872 | |
685 | my $mapmapw = $self->{mapmap}->{w}; |
873 | my $mapmapw = $self->{mapmap}->{w}; |
686 | my $mapmaph = $self->{mapmap}->{h}; |
874 | my $mapmaph = $self->{mapmap}->{h}; |
… | |
… | |
698 | $self->{map_info} = [$hash, $x, $y, $w, $h]; |
886 | $self->{map_info} = [$hash, $x, $y, $w, $h]; |
699 | |
887 | |
700 | (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; |
888 | (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; |
701 | $::STATWIDS->{map}->set_text ("Map: " . $map); |
889 | $::STATWIDS->{map}->set_text ("Map: " . $map); |
702 | |
890 | |
703 | $self->load_map ($hash, $x, $y); |
891 | $self->load_map ($hash, $x, $y, $w, $h); |
704 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
892 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
705 | } |
893 | } |
706 | |
894 | |
707 | sub face_find { |
895 | sub face_find { |
708 | my ($self, $facenum, $face, $cb) = @_; |
896 | my ($self, $facenum, $face, $cb) = @_; |
709 | |
897 | |
710 | if ($face->{type} == 0) { # FT_FACE |
898 | if ($face->{type} == 0) { # FT_FACE |
711 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
899 | my $id = DC::DB::get_tile_id_sync $face->{name}; |
712 | |
900 | |
713 | $face->{id} = $id; |
901 | $face->{id} = $id; |
714 | $self->{faceid}[$facenum] = $id; |
|
|
715 | |
|
|
716 | $self->{map}->set_tileid ($facenum => $id); |
902 | $self->{map}->set_tileid ($facenum => $id); |
717 | |
903 | |
718 | CFPlus::DB::get tilecache => $id, $cb; |
904 | DC::DB::get tilecache => $id, $cb; |
719 | |
905 | |
720 | } elsif ($face->{type} & 1) { # with metadata |
906 | } elsif ($face->{type} & 1) { # with metadata |
721 | #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." }); |
|
|
722 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
907 | DC::DB::get res_meta => $face->{name}, $cb; |
|
|
908 | |
|
|
909 | } else { # no metadata |
|
|
910 | DC::DB::get res_data => $face->{name}, $cb; |
723 | } |
911 | } |
724 | } |
912 | } |
725 | |
913 | |
726 | sub face_update { |
914 | sub face_update { |
727 | my ($self, $facenum, $face, $changed) = @_; |
915 | my ($self, $facenum, $face, $changed) = @_; |
728 | |
916 | |
729 | if ($face->{type} == 0) { # FT_FACE |
917 | if ($face->{type} == 0) { |
|
|
918 | # image, FT_FACE |
730 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
919 | DC::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
731 | if $changed; |
920 | if $changed; |
732 | |
921 | |
733 | $self->have_tile ($face->{id}); |
922 | $self->have_tile ($face->{id}, delete $face->{data}); |
734 | |
923 | |
735 | } elsif ($face->{type} & 1) { # split metadata |
924 | } elsif ($face->{type} & 1) { |
736 | my $cb = sub { }; |
925 | # split metadata case, FT_MUSIC, FT_SOUND |
|
|
926 | if ($changed) { # new data |
|
|
927 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
|
|
928 | $face->{data} = $meta; |
|
|
929 | |
|
|
930 | # rely on strict ordering here and also on later fetch |
|
|
931 | DC::DB::put res_data => $face->{name} => $data, sub { }; |
|
|
932 | DC::DB::put res_meta => $face->{name} => $meta, sub { }; |
|
|
933 | } |
|
|
934 | |
|
|
935 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
|
|
936 | ::add_license ($face); |
|
|
937 | ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) |
|
|
938 | if $changed; |
737 | |
939 | |
738 | if ($face->{type} == 3) { # FT_MUSIC |
940 | if ($face->{type} == 3) { # FT_MUSIC |
739 | $cb = sub { |
|
|
740 | $self->{music_meta}{$facenum} = $face; |
|
|
741 | |
|
|
742 | ::message ({ markup => "downloaded song #$facenum" }) |
|
|
743 | if $changed; |
|
|
744 | |
|
|
745 | &::audio_music_push ($facenum); |
941 | &::audio_music_push ($facenum); |
746 | }; |
|
|
747 | } elsif ($face->{type} == 5) { # FT_SOUND |
942 | } elsif ($face->{type} == 5) { # FT_SOUND |
748 | $cb = sub { |
|
|
749 | $self->{sound_meta}{$facenum} = $face; |
|
|
750 | |
|
|
751 | ::message ({ markup => "downloaded sound #$facenum" }) |
|
|
752 | if $changed; |
|
|
753 | |
|
|
754 | &::audio_sound_push ($facenum); |
943 | &::audio_sound_push ($facenum); |
755 | }; |
944 | } |
756 | } |
|
|
757 | |
945 | |
758 | if ($changed) { # new data |
|
|
759 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
|
|
760 | |
|
|
761 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
|
|
762 | CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { |
|
|
763 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
|
|
764 | ::add_license ($face); |
|
|
765 | $cb->(); |
|
|
766 | }; |
|
|
767 | |
|
|
768 | } else { |
946 | } else { |
769 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
947 | # flat resource case, FT_RSRC |
770 | ::add_license ($face); |
948 | DC::DB::put res_data => $face->{name} => $face->{data}, sub { } |
771 | $cb->(); |
949 | if $changed; |
772 | } |
950 | } |
|
|
951 | |
|
|
952 | if (my $cbs = $self->{face_cb}{$facenum}) { |
|
|
953 | $_->($face, $changed) for @$cbs; |
773 | } |
954 | } |
774 | } |
955 | } |
775 | |
956 | |
776 | sub smooth_update { |
957 | sub smooth_update { |
777 | my ($self, $facenum, $face) = @_; |
958 | my ($self, $facenum, $face) = @_; |
778 | |
959 | |
779 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
960 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
780 | } |
961 | } |
781 | |
962 | |
782 | sub have_tile { |
963 | sub have_tile { |
783 | my ($self, $tile) = @_; |
964 | my ($self, $tile, $data) = @_; |
784 | |
965 | |
785 | return unless $self->{map}; |
966 | return unless $self->{map}; |
786 | |
967 | |
787 | $self->{texture}[$tile] ||= my $tex = |
968 | my $tex = $self->{texture}[$tile] ||= |
788 | new CFPlus::Texture |
969 | new DC::Texture |
789 | tile => $tile, minify => 1, mipmap => 1, delay => 1; |
970 | tile => $tile, |
|
|
971 | image => $data, delete_image => 1, |
|
|
972 | minify => 1, mipmap => 1; |
790 | |
973 | |
791 | $_->() for @{(delete $self->{face_cb}{$tile}) || []}; |
974 | if (my $cbs = delete $self->{tile_cb}{$tile}) { |
|
|
975 | $_->($tex) for @$cbs; |
|
|
976 | } |
792 | } |
977 | } |
793 | |
978 | |
794 | sub connect_face_update { |
979 | # call in non-void context registers a temporary |
|
|
980 | # hook with handle, otherwise its permanent |
|
|
981 | sub on_face_change { |
795 | my ($self, $id, $cb) = @_; |
982 | my ($self, $num, $cb) = @_; |
796 | |
983 | |
797 | push @{$self->{face_cb}{$id}}, $cb; |
984 | push @{$self->{face_cb}{$num}}, $cb; |
798 | |
985 | |
799 | CFPlus::guard { |
986 | defined wantarray |
|
|
987 | ? DC::guard { |
800 | @{$self->{face_cb}{$id}} |
988 | @{$self->{face_cb}{$num}} |
801 | = grep $_ != $cb, |
989 | = grep $_ != $cb, |
802 | @{$self->{face_cb}{$id}}; |
990 | @{$self->{face_cb}{$num}}; |
803 | } |
991 | } |
|
|
992 | : () |
|
|
993 | } |
|
|
994 | |
|
|
995 | # call in non-void context registers a temporary |
|
|
996 | # hook with handle, otherwise its permanent |
|
|
997 | sub register_face_handler { |
|
|
998 | my ($self, $num, $cb) = @_; |
|
|
999 | |
|
|
1000 | return unless $num; |
|
|
1001 | |
|
|
1002 | # invoke if available right now |
|
|
1003 | $cb->($self->{face}[$num], 0) |
|
|
1004 | unless exists $self->{face}[$num]{loading}; |
|
|
1005 | |
|
|
1006 | # future changes |
|
|
1007 | $self->on_face_change ($num => $cb) |
804 | } |
1008 | } |
805 | |
1009 | |
806 | sub sound_play { |
1010 | sub sound_play { |
807 | my ($self, $type, $face, $dx, $dy, $vol) = @_; |
1011 | my ($self, $type, $face, $dx, $dy, $vol) = @_; |
808 | |
1012 | |
… | |
… | |
823 | |
1027 | |
824 | sub sanitise_xml($) { |
1028 | sub sanitise_xml($) { |
825 | local $_ = shift; |
1029 | local $_ = shift; |
826 | |
1030 | |
827 | # we now weed out all tags we do not support |
1031 | # we now weed out all tags we do not support |
828 | s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g; |
1032 | s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>) |
|
|
1033 | }{ |
|
|
1034 | "<" |
|
|
1035 | }gex; |
|
|
1036 | |
829 | # now all entities |
1037 | # now all entities |
830 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
1038 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
831 | |
1039 | |
832 | # handle some elements |
1040 | # handle some elements |
833 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
1041 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
834 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
1042 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
|
|
1043 | |
|
|
1044 | s/\s+$//; |
835 | |
1045 | |
836 | $_ |
1046 | $_ |
837 | } |
1047 | } |
838 | |
1048 | |
839 | our %NAME_TO_COLOR = ( |
1049 | our %NAME_TO_COLOR = ( |
… | |
… | |
880 | $self->{$type} = $text; |
1090 | $self->{$type} = $text; |
881 | } else { |
1091 | } else { |
882 | $self->logprint ("msg: ", $text); |
1092 | $self->logprint ("msg: ", $text); |
883 | return if $color < 0; # negative color == ignore if not understood |
1093 | return if $color < 0; # negative color == ignore if not understood |
884 | |
1094 | |
885 | my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; |
1095 | my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0]; |
886 | |
1096 | |
887 | ## try to create single paragraphs of multiple lines sent by the server |
1097 | ## try to create single paragraphs of multiple lines sent by the server |
888 | # no longer neecssary with TRT servers |
1098 | # no longer neecssary with TRT servers |
889 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
1099 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
890 | |
1100 | |
891 | ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] }) |
|
|
892 | for split /\n/, $text; |
1101 | for (split /\n/, $text) { |
|
|
1102 | ::message ({ |
|
|
1103 | fg => $fg, |
|
|
1104 | markup => $_, |
|
|
1105 | type => $type, |
|
|
1106 | extra => [@extra], |
|
|
1107 | color_flags => $color, #d# ugly, kill |
|
|
1108 | }); |
|
|
1109 | |
|
|
1110 | $color &= ~NDI_CLEAR; # only clear once for multiline messages |
|
|
1111 | # actually, this is an ugly design. _we_ should control the channels, |
|
|
1112 | # not some random other widget, as the channels are clearly protocol-specific. |
|
|
1113 | # then we could also react to flags such as CLEAR without resorting to |
|
|
1114 | # hacks such as color_flags, above. |
|
|
1115 | } |
893 | |
1116 | |
894 | $self->{statusbox}->add ($text, |
1117 | $self->{statusbox}->add ($text, |
895 | group => $text, |
1118 | group => $text, |
896 | fg => $fg, |
1119 | fg => $fg, |
897 | timeout => $color >= 2 ? 180 : 10, |
1120 | timeout => $color >= 2 ? 180 : 10, |
898 | tooltip_font => $::FONT_FIXED, |
1121 | tooltip_font => $::FONT_FIXED, |
899 | ); |
1122 | ) if $type eq "info"; |
900 | } |
1123 | } |
901 | } |
1124 | } |
902 | |
1125 | |
903 | sub spell_add { |
1126 | sub spell_add { |
904 | my ($self, $spell) = @_; |
1127 | my ($self, $spell) = @_; |
… | |
… | |
908 | $spell->{message} =~ s/\n+$//; |
1131 | $spell->{message} =~ s/\n+$//; |
909 | $spell->{message} ||= "Server did not provide a description for this spell."; |
1132 | $spell->{message} ||= "Server did not provide a description for this spell."; |
910 | |
1133 | |
911 | $::SPELL_LIST->add_spell ($spell); |
1134 | $::SPELL_LIST->add_spell ($spell); |
912 | |
1135 | |
913 | $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); |
1136 | $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message}); |
914 | $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); |
1137 | $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message}); |
915 | } |
1138 | } |
916 | |
1139 | |
917 | sub spell_delete { |
1140 | sub spell_delete { |
918 | my ($self, $spell) = @_; |
1141 | my ($self, $spell) = @_; |
919 | |
1142 | |
… | |
… | |
930 | sub addme_success { |
1153 | sub addme_success { |
931 | my ($self) = @_; |
1154 | my ($self) = @_; |
932 | |
1155 | |
933 | my %skill_help; |
1156 | my %skill_help; |
934 | |
1157 | |
935 | for my $node (CFPlus::Pod::find skill_description => "*") { |
1158 | for my $node (DC::Pod::find skill_description => "*") { |
936 | my (undef, @par) = CFPlus::Pod::section_of $node; |
1159 | my (undef, @par) = DC::Pod::section_of $node; |
937 | $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; |
1160 | $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par; |
938 | }; |
1161 | }; |
939 | |
1162 | |
940 | for my $skill (values %{$self->{skill_info}}) { |
1163 | for my $skill (values %{$self->{skill_info}}) { |
941 | $self->{map_widget}->add_command ("ready_skill $skill", |
1164 | $self->{map_widget}->add_command ("ready_skill $skill", |
942 | (CFPlus::asxml "Ready the skill '$skill'\n\n") |
1165 | (DC::asxml "Ready the skill '$skill'\n\n") |
943 | . $skill_help{$skill}); |
1166 | . $skill_help{$skill}); |
944 | $self->{map_widget}->add_command ("use_skill $skill", |
1167 | $self->{map_widget}->add_command ("use_skill $skill", |
945 | (CFPlus::asxml "Immediately use the skill '$skill'\n\n") |
1168 | (DC::asxml "Immediately use the skill '$skill'\n\n") |
946 | . $skill_help{$skill}); |
1169 | . $skill_help{$skill}); |
947 | } |
1170 | } |
948 | } |
1171 | } |
949 | |
1172 | |
950 | sub eof { |
1173 | sub eof { |
… | |
… | |
954 | |
1177 | |
955 | ::stop_game (); |
1178 | ::stop_game (); |
956 | } |
1179 | } |
957 | |
1180 | |
958 | sub update_floorbox { |
1181 | sub update_floorbox { |
959 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
1182 | $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
960 | return unless $::CONN; |
1183 | return unless $::CONN; |
961 | |
1184 | |
962 | $::FLOORBOX->clear; |
1185 | $::FLOORBOX->clear; |
963 | |
1186 | |
964 | my @add; |
1187 | my @add; |
965 | |
1188 | |
966 | my $row; |
1189 | my $row; |
967 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
1190 | for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
|
|
1191 | next if $_->{tag} & 0x80000000; |
968 | if ($row < 6) { |
1192 | if ($row < 6) { |
969 | local $_->{face_widget}; # hack to force recreation of widget |
1193 | local $_->{face_widget}; # hack to force recreation of widget |
970 | local $_->{desc_widget}; # hack to force recreation of widget |
1194 | local $_->{desc_widget}; # hack to force recreation of widget |
971 | CFPlus::Item::update_widgets $_; |
1195 | DC::Item::update_widgets $_; |
972 | |
1196 | |
973 | push @add, |
1197 | push @add, |
974 | 0, $row, $_->{face_widget}, |
1198 | 0, $row, $_->{face_widget}, |
975 | 1, $row, $_->{desc_widget}; |
1199 | 1, $row, $_->{desc_widget}; |
976 | |
1200 | |
977 | $row++; |
1201 | $row++; |
978 | } else { |
1202 | } else { |
979 | push @add, 1, $row, new CFPlus::UI::Button |
1203 | push @add, 1, $row, new DC::UI::Button |
980 | text => "More...", |
1204 | text => "More...", |
981 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
1205 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
982 | ; |
1206 | ; |
983 | last; |
1207 | last; |
984 | } |
1208 | } |
985 | } |
1209 | } |
986 | if ($::CONN->{open_container}) { |
1210 | if ($::CONN->{open_container}) { |
987 | push @add, 1, $row++, new CFPlus::UI::Button |
1211 | push @add, 1, $row++, new DC::UI::Button |
988 | text => "Close container", |
1212 | text => "Close container", |
989 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
1213 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
990 | ; |
1214 | ; |
991 | } |
1215 | } |
992 | |
1216 | |
993 | $::FLOORBOX->add_at (@add); |
1217 | $::FLOORBOX->add_at (@add); |
994 | }); |
1218 | }); |
995 | |
1219 | |
996 | $::WANT_REFRESH++; |
1220 | $::WANT_REFRESH = 1; |
997 | } |
1221 | } |
998 | |
1222 | |
999 | sub set_opencont { |
1223 | sub set_opencont { |
1000 | my ($conn, $tag, $name) = @_; |
1224 | my ($conn, $tag, $name) = @_; |
1001 | $conn->{open_container} = $tag; |
1225 | $conn->{open_container} = $tag; |
1002 | update_floorbox; |
1226 | update_floorbox; |
1003 | |
1227 | |
1004 | $::INV_RIGHT_HB->clear (); |
1228 | $::INVR_HB->clear; |
1005 | $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
1229 | $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name); |
1006 | |
1230 | |
1007 | if ($tag != 0) { # Floor isn't closable, is it? |
1231 | if ($tag != 0) { # Floor isn't closable, is it? |
1008 | $::INV_RIGHT_HB->add (new CFPlus::UI::Button |
1232 | $::INVR_HB->add (new DC::UI::Button |
1009 | text => "Close container", |
1233 | text => "Close container", |
1010 | tooltip => "Close the currently open container (if one is open)", |
1234 | tooltip => "Close the currently open container (if one is open)", |
1011 | on_activate => sub { |
1235 | on_activate => sub { |
1012 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
1236 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
1013 | if $tag != 0; |
1237 | if $tag != 0; |
1014 | #if $CONN->{open_container} != 0; |
|
|
1015 | 0 |
1238 | 0 |
1016 | }, |
1239 | }, |
1017 | ); |
1240 | ); |
1018 | } |
1241 | } |
1019 | |
1242 | |
… | |
… | |
1021 | } |
1244 | } |
1022 | |
1245 | |
1023 | sub update_containers { |
1246 | sub update_containers { |
1024 | my ($self) = @_; |
1247 | my ($self) = @_; |
1025 | |
1248 | |
1026 | $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
1249 | $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
1027 | my $todo = delete $self->{update_container} |
1250 | my $todo = delete $self->{update_container} |
1028 | or return; |
1251 | or return; |
1029 | |
1252 | |
1030 | for my $tag (keys %$todo) { |
1253 | for my $tag (keys %$todo) { |
1031 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
1254 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
… | |
… | |
1066 | } |
1289 | } |
1067 | |
1290 | |
1068 | sub item_update { |
1291 | sub item_update { |
1069 | my ($self, $item) = @_; |
1292 | my ($self, $item) = @_; |
1070 | |
1293 | |
1071 | #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; |
1294 | #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n"; |
1072 | |
1295 | |
1073 | CFPlus::Item::update_widgets $item; |
1296 | DC::Item::update_widgets $item; |
1074 | |
1297 | |
1075 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
1298 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
1076 | set_opencont ($::CONN, 0, "Floor"); |
1299 | set_opencont ($::CONN, 0, "Floor"); |
1077 | |
1300 | |
1078 | } elsif ($item->{flags} & F_OPEN) { |
1301 | } elsif ($item->{flags} & F_OPEN) { |
1079 | set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); |
1302 | set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item); |
1080 | |
1303 | |
1081 | } else { |
1304 | } else { |
1082 | $self->{update_container}{$item->{container}}++; |
1305 | $self->{update_container}{$item->{container}}++; |
1083 | $self->update_containers; |
1306 | $self->update_containers; |
1084 | } |
1307 | } |
… | |
… | |
1095 | |
1318 | |
1096 | my $weight = .001 * $self->{player}{weight}; |
1319 | my $weight = .001 * $self->{player}{weight}; |
1097 | my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; |
1320 | my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; |
1098 | |
1321 | |
1099 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); |
1322 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); |
1100 | $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); |
1323 | $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit); |
1101 | $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); |
1324 | $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); |
1102 | } |
1325 | } |
1103 | |
1326 | |
1104 | sub update_server_info { |
1327 | sub update_server_info { |
1105 | my ($self) = @_; |
1328 | my ($self) = @_; |
… | |
… | |
1113 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
1336 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
1114 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
1337 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
1115 | . "editing support $yesno[!!$self->{editor_support}]\n" |
1338 | . "editing support $yesno[!!$self->{editor_support}]\n" |
1116 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
1339 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
1117 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
1340 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
1118 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1341 | . "client support $yesno[$self->{cfplus_ext} > 0]" |
1119 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1342 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1120 | . "map size $self->{mapw}×$self->{maph}\n" |
1343 | . "map size $self->{mapw}×$self->{maph}\n" |
1121 | ); |
1344 | ); |
1122 | |
1345 | |
1123 | } |
1346 | } |
… | |
… | |
1143 | 0 |
1366 | 0 |
1144 | }); |
1367 | }); |
1145 | |
1368 | |
1146 | $self->update_server_info; |
1369 | $self->update_server_info; |
1147 | |
1370 | |
1148 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
|
|
1149 | $self->send_command ("output-count $::CFG->{output_count}"); |
|
|
1150 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1371 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1151 | $self->send_command ("pickup $::CFG->{pickup}"); |
1372 | $self->send_command ("pickup $::CFG->{pickup}"); |
1152 | } |
1373 | } |
1153 | |
1374 | |
1154 | sub lookat { |
1375 | sub lookat { |
… | |
… | |
1158 | $self->send_ext_req (lookat => $x, $y, sub { |
1379 | $self->send_ext_req (lookat => $x, $y, sub { |
1159 | my (%msg) = @_; |
1380 | my (%msg) = @_; |
1160 | |
1381 | |
1161 | if (exists $msg{npc_dialog}) { |
1382 | if (exists $msg{npc_dialog}) { |
1162 | # start npc chat dialog |
1383 | # start npc chat dialog |
1163 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
1384 | $self->{npc_dialog} = new DC::NPCDialog:: |
1164 | token => $msg{npc_dialog}, |
1385 | token => $msg{npc_dialog}, |
1165 | title => "$msg{npc_dialog}[0] (NPC)", |
1386 | title => "$msg{npc_dialog}[0] (NPC)", |
1166 | conn => $self, |
1387 | conn => $self, |
1167 | ; |
1388 | ; |
1168 | } |
1389 | } |
… | |
… | |
1181 | $self->SUPER::destroy; |
1402 | $self->SUPER::destroy; |
1182 | |
1403 | |
1183 | %$self = (); |
1404 | %$self = (); |
1184 | } |
1405 | } |
1185 | |
1406 | |
1186 | package CFPlus::NPCDialog; |
1407 | package DC::NPCDialog; |
1187 | |
1408 | |
1188 | our @ISA = 'CFPlus::UI::Toplevel'; |
1409 | our @ISA = 'DC::UI::Toplevel'; |
1189 | |
1410 | |
1190 | sub new { |
1411 | sub new { |
1191 | my $class = shift; |
1412 | my $class = shift; |
1192 | |
1413 | |
1193 | my $self = $class->SUPER::new ( |
1414 | my $self = $class->SUPER::new ( |
… | |
… | |
1200 | kw => { hi => 0, yes => 0, no => 0 }, |
1421 | kw => { hi => 0, yes => 0, no => 0 }, |
1201 | has_close_button => 1, |
1422 | has_close_button => 1, |
1202 | @_, |
1423 | @_, |
1203 | ); |
1424 | ); |
1204 | |
1425 | |
1205 | CFPlus::weaken (my $this = $self); |
1426 | DC::weaken (my $this = $self); |
1206 | |
1427 | |
1207 | $self->connect (delete => sub { $this->destroy; 1 }); |
1428 | $self->connect (delete => sub { $this->destroy; 1 }); |
1208 | |
1429 | |
1209 | # better use a pane... |
1430 | # better use a pane... |
1210 | $self->add (my $hbox = new CFPlus::UI::HBox); |
1431 | $self->add (my $hbox = new DC::UI::HBox); |
1211 | $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); |
1432 | $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1); |
1212 | |
1433 | |
1213 | $hbox->add (my $vbox = new CFPlus::UI::VBox); |
1434 | $hbox->add (my $vbox = new DC::UI::VBox); |
1214 | |
1435 | |
1215 | $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); |
1436 | $vbox->add (new DC::UI::Label text => "Message Entry:"); |
1216 | $vbox->add ($self->{entry} = new CFPlus::UI::Entry |
1437 | $vbox->add ($self->{entry} = new DC::UI::Entry |
1217 | tooltip => "#npc_message_entry", |
1438 | tooltip => "#npc_message_entry", |
1218 | on_activate => sub { |
1439 | on_activate => sub { |
1219 | my ($entry, $text) = @_; |
1440 | my ($entry, $text) = @_; |
1220 | |
1441 | |
1221 | return unless $text =~ /\S/; |
1442 | return unless $text =~ /\S/; |
… | |
… | |
1225 | |
1446 | |
1226 | 0 |
1447 | 0 |
1227 | }, |
1448 | }, |
1228 | ); |
1449 | ); |
1229 | |
1450 | |
1230 | $vbox->add ($self->{options} = new CFPlus::UI::VBox); |
1451 | $vbox->add ($self->{options} = new DC::UI::VBox); |
1231 | |
1452 | |
1232 | $self->{bye_button} = new CFPlus::UI::Button |
1453 | $self->{bye_button} = new DC::UI::Button |
1233 | text => "Bye (close)", |
1454 | text => "Bye (close)", |
1234 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
1455 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
1235 | on_activate => sub { $this->destroy; 1 }, |
1456 | on_activate => sub { $this->destroy; 1 }, |
1236 | ; |
1457 | ; |
1237 | |
1458 | |
… | |
… | |
1256 | }; |
1477 | }; |
1257 | |
1478 | |
1258 | sub update_options { |
1479 | sub update_options { |
1259 | my ($self) = @_; |
1480 | my ($self) = @_; |
1260 | |
1481 | |
1261 | CFPlus::weaken $self; |
1482 | DC::weaken $self; |
1262 | |
1483 | |
1263 | $self->{options}->clear; |
1484 | $self->{options}->clear; |
1264 | $self->{options}->add ($self->{bye_button}); |
1485 | $self->{options}->add ($self->{bye_button}); |
1265 | |
1486 | |
1266 | for my $kw (sort keys %{ $self->{kw} }) { |
1487 | for my $kw (sort keys %{ $self->{kw} }) { |
1267 | $self->{options}->add (new CFPlus::UI::Button |
1488 | $self->{options}->add (new DC::UI::Button |
1268 | text => $kw, |
1489 | text => $kw, |
1269 | on_activate => sub { |
1490 | on_activate => sub { |
1270 | $self->send ($kw); |
1491 | $self->send ($kw); |
1271 | 0 |
1492 | 0 |
1272 | }, |
1493 | }, |
… | |
… | |
1275 | } |
1496 | } |
1276 | |
1497 | |
1277 | sub feed { |
1498 | sub feed { |
1278 | my ($self, $type, @arg) = @_; |
1499 | my ($self, $type, @arg) = @_; |
1279 | |
1500 | |
1280 | CFPlus::weaken $self; |
1501 | DC::weaken $self; |
1281 | |
1502 | |
1282 | if ($type eq "update") { |
1503 | if ($type eq "update") { |
1283 | my (%info) = @arg; |
1504 | my (%info) = @arg; |
1284 | |
1505 | |
1285 | $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; |
1506 | $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; |
1286 | $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; |
1507 | $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; |
1287 | |
1508 | |
1288 | if (exists $info{msg}) { |
1509 | if (exists $info{msg}) { |
1289 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; |
1510 | my $text = "\n" . DC::Protocol::sanitise_xml $info{msg}; |
1290 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1511 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1291 | my @link; |
1512 | my @link; |
1292 | $text =~ s{ |
1513 | $text =~ s{ |
1293 | ($match) |
1514 | ($match) |
1294 | }{ |
1515 | }{ |
1295 | my $kw = $1; |
1516 | my $kw = $1; |
1296 | |
1517 | |
1297 | push @link, new CFPlus::UI::Label |
1518 | push @link, new DC::UI::Label |
1298 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
1519 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
1299 | can_hover => 1, |
1520 | can_hover => 1, |
1300 | can_events => 1, |
1521 | can_events => 1, |
1301 | padding_x => 0, |
1522 | padding_x => 0, |
1302 | padding_y => 0, |
1523 | padding_y => 0, |
… | |
… | |
1320 | } |
1541 | } |
1321 | |
1542 | |
1322 | sub send { |
1543 | sub send { |
1323 | my ($self, $msg) = @_; |
1544 | my ($self, $msg) = @_; |
1324 | |
1545 | |
1325 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1546 | $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg }); |
1326 | $self->{textview}->scroll_to_bottom; |
1547 | $self->{textview}->scroll_to_bottom; |
1327 | |
1548 | |
1328 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
1549 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
1329 | } |
1550 | } |
1330 | |
1551 | |