ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.157 by root, Tue Aug 21 02:39:17 2007 UTC vs.
Revision 1.188 by elmex, Sun Jan 6 16:28:49 2008 UTC

1package CFPlus::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Deliantra::Protocol::Constants;
7 7
8use CFPlus; 8use DC;
9use CFPlus::DB; 9use DC::DB;
10use CFPlus::UI; 10use DC::UI;
11use CFPlus::Pod; 11use DC::Pod;
12use CFPlus::Macro; 12use DC::Macro;
13use CFPlus::Item; 13use DC::Item;
14 14
15use Crossfire::Protocol::Base 0.95;
16
17use base 'Crossfire::Protocol::Base'; 15use base 'Deliantra::Protocol::Base';
18 16
19sub new { 17sub new {
20 my ($class, %arg) = @_; 18 my ($class, %arg) = @_;
21 19
22 my $self = $class->SUPER::new (%arg, 20 my $self = $class->SUPER::new (%arg,
23 setup_req => { 21 setup_req => {
24 extmap => 1, 22 extmap => 1,
25 excmd => 1, 23 excmd => 1,
26 xwidget1 => 1,#d# 24 widget => 2,
27 %{$arg{setup_req} || {}}, 25 %{$arg{setup_req} || {}},
28 }, 26 },
29 ); 27 );
30 28
31 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
… …
36 34
37 my $cmd = $1; 35 my $cmd = $1;
38 my @args = split /\|/, $2; 36 my @args = split /\|/, $2;
39 @args = (".*") unless @args; 37 @args = (".*") unless @args;
40 38
41 my (undef, @par) = CFPlus::Pod::section_of $_; 39 my (undef, @par) = DC::Pod::section_of $_;
42 my $text = CFPlus::Pod::as_label @par; 40 my $text = DC::Pod::as_label @par;
43 41
44 $_ = $_ eq ".*" ? "" : " $_" 42 $_ = $_ eq ".*" ? "" : " $_"
45 for @args; 43 for @args;
46 44
47 map ["$cmd$_", $text], 45 map ["$cmd$_", $text],
48 sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
49 @args 47 @args
50 } sort { $a->{par} <=> $b->{par} } 48 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*"; 49 DC::Pod::find command => "*";
52
53 $self->connect_ext (ambient_music => sub {
54 my ($songs) = @_;
55 &::audio_music_set_ambient ($songs);
56 });
57
58 $self->connect_ext (capabilities => sub {
59 my (%cap) = @_;
60
61 #$self->send ("setup sound 0"); # we use a different protocol
62 $self->update_fx_want;
63
64 $self->send_exti_req (resource => "exp_table", sub {
65 my ($exp_table) = @_;
66
67 $self->register_face_handler ($exp_table, sub {
68 my ($face) = @_;
69
70 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
71 $_->() for values %{ $self->{on_exp_update} || {} };
72 });
73
74 ()
75 });
76
77 if (my $ts = $cap{tileset}) {
78 if (my ($default) = grep $_->[2] & 1, @$ts) {
79 $self->{tileset} = $default;
80 $self->{tilesize} = $default->[3];
81 $self->setup_req (tileset => $default->[0]);
82
83 my $w = int $self->{mapw} * 32 / $self->{tilesize};
84 my $h = int $self->{maph} * 32 / $self->{tilesize};
85
86 $self->setup_req (mapsize => "${w}x${h}");
87 }
88 }
89 });
90 50
91 $self->{json_coder} 51 $self->{json_coder}
92 ->convert_blessed 52 ->convert_blessed
93 ->filter_json_single_key_object (__w_ => sub { 53 ->filter_json_single_key_object ("\fw" => sub {
94 $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 }
95 }); 61 });
96
97 # widgetset new
98 $self->connect_ext (ws_n => sub {
99 my ($id) = @_;
100
101 $self->{widgetset}{$id} = {
102 w => {},
103 };
104 });
105
106 # widgetset destroy
107 $self->connect_ext (ws_d => sub {
108 my ($id) = @_;
109
110 my $ws = delete $self->{widgetset}{$id}
111 or return;
112
113 $_->destroy
114 for values %{$ws->{w}};
115 });
116
117 # widgetset create
118 $self->connect_ext (ws_c => sub {
119 my ($ws, $id, $class, $args) = @_;
120
121 for my $ev (grep /^on_/, keys %$args) {
122 my $rid = $args->{$ev};
123 $args->{$ev} = sub {
124 my $id = shift->{s_id};
125 $self->send_exti_msg (w_e => $id, $rid, @_);
126
127 1
128 };
129 }
130
131 $self->widget_associate (
132 $ws, $id => scalar eval {
133 local $SIG{__DIE__};
134 "CFPlus::UI::$class"->new (%$args)
135 }
136 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
137 });
138
139 # widgetset associate
140 $self->connect_ext (ws_a => sub {
141 my (%ass) = @_;
142
143 # everything that has a name, wether conceivably useful or not
144 my %wkw = (
145 root => $CFPlus::UI::ROOT,
146 tooltip => $CFPlus::UI::TOOLTIP,
147
148 mapwidget => $::MAPWIDGET,
149 buttonbar => $::BUTTONBAR,
150 metaserver => $::METASERVER,
151 buttonbar => $::BUTTONBAR,
152 login_button => $::LOGIN_BUTTON,
153 quit_dialog => $::QUIT_DIALOG,
154 host_entry => $::HOST_ENTRY,
155 metaserver => $::METASERVER,
156 server_info => $::SERVER_INFO,
157
158 setup_dialog => $::SETUP_DIALOG,
159 setup_notebook => $::SETUP_NOTEBOOK,
160 setup_server => $::SETUP_SERVER,
161 setup_keyboard => $::SETUP_KEYBOARD,
162
163 pl_notebook => $::PL_NOTEBOOK,
164 pl_window => $::PL_WINDOW,
165 inventory_page => $::INVENTORY_PAGE,
166 stats_page => $::STATS_PAGE,
167 skill_page => $::SKILL_PAGE,
168 spell_page => $::SPELL_PAGE,
169 spell_list => $::SPELL_LIST,
170
171 floorbox => $::FLOORBOX,
172 help_window => $::HELP_WINDOW,
173 message_window => $::MESSAGE_WINDOW,
174 statusbox => $::SDTATUSBOX,
175
176 inv => $::INV,
177 invr => $::INVR,
178 invr_hb => $::INVR_HB,
179 );
180
181 while (my ($id, $name) = each %ass) {
182 $self->widget_associate (undef, $id => $wkw{$name})
183 or warn "server failed to associate non-existent well-known widget $name\n";
184 }
185 });
186
187 # widget call
188 $self->connect_ext (w_c => sub {
189 my ($id, $rid, $method, @args) = @_;
190
191 my $w = $self->{widget}{$id}
192 or return;
193
194 if ($rid) {
195 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
196 } else {
197 $w->$method (@args);
198 }
199 });
200
201 # widget set
202 $self->connect_ext (w_s => sub {
203 my ($id, $attr) = @_;
204
205 my $w = $self->{widget}{$id}
206 or return;
207
208 for (my $i = 0; $i < $#$attr; $i += 2) {
209 my ($member, $value) = @$attr[$i, $i+1];
210 if (defined $value) {
211 $w->{$member} = $value;
212 } else {
213 delete $w->{$member};
214 }
215 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
216 }
217 });
218
219 # widget get
220 $self->connect_ext (w_g => sub {
221 my ($id, $rid, $attr) = @_;
222
223 my $w = $self->{widget}{$id}
224 or return;
225
226 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
227 });
228
229 # message window
230 $self->connect_ext (channel_info => sub {
231 my ($info) = @_;
232 $self->{channels}->{$info->{id}} = $info;
233 $::MESSAGE_WINDOW->add_channel ($info);
234 });
235 62
236 # destroy widgets on logout 63 # destroy widgets on logout
237 $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 {
238 for my $ws (values %{delete $self->{widgetset} || {}}) { 65 for my $ws (values %{delete $self->{widgetset} || {}}) {
239 $_->destroy 66 $_->destroy
… …
243 70
244 $self->{map_widget}->add_command (@$_) 71 $self->{map_widget}->add_command (@$_)
245 for @cmd_help; 72 for @cmd_help;
246 73
247 { 74 {
248 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 75 $self->{dialogue} = my $tex = new_from_file DC::Texture
249 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 76 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
250 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 77 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
251 } 78 }
252 79
253 { 80 {
254 $self->{noface} = my $tex = new_from_file CFPlus::Texture 81 $self->{noface} = my $tex = new_from_file DC::Texture
255 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 82 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
256 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 83 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
257 } 84 }
258 85
259 $self->{open_container} = 0; 86 $self->{open_container} = 0;
260 87
261 # per server 88 # per server
262 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
263 90
264 $self 91 $self
265}
266
267sub widget_associate {
268 my ($self, $ws, $id, $widget) = @_;
269
270 if ($widget) {
271 $widget->{s_id} = $id;
272 $self->{widget}{$id} = $widget;
273
274 if ($ws) {
275 $widget->{s_ws} = $ws;
276 $self->{widgetset}{$ws}{w}{$id} = $widget;
277 }
278
279 $widget->connect (on_destroy => sub {
280 my ($widget) = @_;
281
282 delete $self->{widget}{$widget->{s_id}};
283 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
284 if exists $widget->{s_ws};
285 });
286
287 1
288 } else {
289 $self->send_exti_msg (w_e => $id, undef);
290
291 0
292 }
293} 92}
294 93
295sub update_fx_want { 94sub update_fx_want {
296 my ($self) = @_; 95 my ($self) = @_;
297 96
… …
300 5 => !!$::CFG->{audio_enable}, # FT_SOUND 99 5 => !!$::CFG->{audio_enable}, # FT_SOUND
301 6 => 1, # FT_RSRC 100 6 => 1, # FT_RSRC
302 }); 101 });
303} 102}
304 103
104sub ext_capabilities {
105 my ($self, %cap) = @_;
106
107 $self->update_fx_want;
108
109 $self->send_exti_req (resource => "exp_table", sub {
110 my ($exp_table) = @_;
111
112 $self->register_face_handler ($exp_table, sub {
113 my ($face) = @_;
114
115 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
116 $_->() for values %{ $self->{on_exp_update} || {} };
117 });
118
119 ()
120 });
121
122 if (my $ts = $cap{tileset}) {
123 if (my ($default) = grep $_->[2] & 1, @$ts) {
124 $self->{tileset} = $default;
125 $self->{tilesize} = $default->[3];
126 $self->setup_req (tileset => $default->[0]);
127
128 my $w = int $self->{mapw} * 32 / $self->{tilesize};
129 my $h = int $self->{maph} * 32 / $self->{tilesize};
130
131 $self->setup_req (mapsize => "${w}x${h}");
132 }
133 }
134}
135
136sub ext_ambient_music {
137 my ($self, $songs) = @_;
138 &::audio_music_set_ambient ($songs);
139}
140
141#############################################################################
142
143sub widget_associate {
144 my ($self, $ws, $id, $widget) = @_;
145
146 $widget ||= new DC::UI::Bin;
147
148 $widget->{s_id} = $id;
149 $self->{widget}{$id} = $widget;
150
151 if ($ws) {
152 $widget->{s_ws} = $ws;
153 $self->{widgetset}{$ws}{w}{$id} = $widget;
154 }
155
156 $widget->connect (on_destroy => sub {
157 my ($widget) = @_;
158
159 delete $self->{widget}{$widget->{s_id}};
160 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
161 if exists $widget->{s_ws};
162 });
163}
164
165# widgetset new
166sub ext_ws_n {
167 my ($self, $id) = @_;
168
169 $self->{widgetset}{$id} = {
170 w => {},
171 };
172}
173
174# widgetset destroy
175sub ext_ws_d {
176 my ($self, $id) = @_;
177
178 my $ws = delete $self->{widgetset}{$id}
179 or return;
180
181 $_->destroy
182 for values %{$ws->{w}};
183}
184
185# widgetset create
186sub ext_ws_c {
187 my ($self, $ws, $id, $class, $args) = @_;
188
189 $self->widget_associate (
190 $ws, $id => scalar eval {
191 local $SIG{__DIE__};
192 "DC::UI::$class"->new (%$args)
193 }
194 );
195}
196
197# widgetset create template
198sub ext_ws_ct {
199 my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
200
201 $done_cb ||= sub { };
202
203 my $parse_list; $parse_list = sub {
204 my ($list) = @_;
205 my @w;
206
207 while (@$list) {
208 my ($class, $args) = splice @$list, 0, 2;
209 my $name = delete $args->{s_id};
210 my $cl = delete $args->{s_cl};
211 my $cfg = delete $cfg->{$name};
212 my $id = delete $cfg->{id};
213 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
214 or next;
215
216 $self->widget_associate ($ws, $id, $w)
217 if $id;
218
219 $w->add ($parse_list->($cl))
220 if $cl;
221
222 push @w, $w;
223 }
224
225 @w
226 };
227
228 # either array reference, or face #
229 if ($type eq "inline") {
230 $done_cb->();
231 $parse_list->($template);
232 } elsif ($type eq "face") {
233 my $handler; $handler = $self->register_face_handler ($template, sub {
234 my ($face) = @_;
235
236 undef $handler;
237 $done_cb->();
238 $parse_list->($self->{json_coder}->decode ($face->{data}));
239 });
240 } else {
241 $done_cb->(0);
242 }
243}
244
245# widgetset associate
246sub ext_ws_a {
247 my ($self, %ass) = @_;
248
249 # everything that has a name, wether conceivably useful or not
250 my %wkw = (
251 root => $DC::UI::ROOT,
252 tooltip => $DC::UI::TOOLTIP,
253
254 mapwidget => $::MAPWIDGET,
255 buttonbar => $::BUTTONBAR,
256 metaserver => $::METASERVER,
257 buttonbar => $::BUTTONBAR,
258 login_button => $::LOGIN_BUTTON,
259 quit_dialog => $::QUIT_DIALOG,
260 host_entry => $::HOST_ENTRY,
261 metaserver => $::METASERVER,
262 server_info => $::SERVER_INFO,
263
264 setup_dialog => $::SETUP_DIALOG,
265 setup_notebook => $::SETUP_NOTEBOOK,
266 setup_server => $::SETUP_SERVER,
267 setup_keyboard => $::SETUP_KEYBOARD,
268
269 pl_notebook => $::PL_NOTEBOOK,
270 pl_window => $::PL_WINDOW,
271 inventory_page => $::INVENTORY_PAGE,
272 stats_page => $::STATS_PAGE,
273 skill_page => $::SKILL_PAGE,
274 spell_page => $::SPELL_PAGE,
275 spell_list => $::SPELL_LIST,
276
277 floorbox => $::FLOORBOX,
278 help_window => $::HELP_WINDOW,
279 message_window => $::MESSAGE_WINDOW,
280 message_dist => $::MESSAGE_DIST,
281 statusbox => $::SDTATUSBOX,
282
283 inv => $::INV,
284 invr => $::INVR,
285 invr_hb => $::INVR_HB,
286 );
287
288 while (my ($id, $name) = each %ass) {
289 $self->widget_associate (undef, $id => $wkw{$name});
290 }
291}
292
293# widget call
294sub ext_w_c {
295 my ($self, $id, $rcb, $method, @args) = @_;
296
297 my $w = $self->{widget}{$id}
298 or return;
299
300 if ($rcb) {
301 $rcb->($w->$method (@args));
302 } else {
303 $w->$method (@args);
304 }
305}
306
307# widget set
308sub ext_w_s {
309 my ($self, $id, $attr) = @_;
310
311 my $w = $self->{widget}{$id}
312 or return;
313
314 for (my $i = 0; $i < $#$attr; $i += 2) {
315 my ($member, $value) = @$attr[$i, $i+1];
316 if (defined $value) {
317 $w->{$member} = $value;
318 } else {
319 delete $w->{$member};
320 }
321 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
322 }
323}
324
325# widget get
326sub ext_w_g {
327 my ($self, $id, $rid, @attr) = @_;
328
329 my $w = $self->{widget}{$id}
330 or return;
331
332 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
333}
334
335# message window
336sub ext_channel_info {
337 my ($self, $info) = @_;
338 $self->{channels}->{$info->{id}} = $info;
339 $::MESSAGE_DIST->add_channel ($info);
340}
341
342#############################################################################
343
305sub logprint { 344sub logprint {
306 my ($self, @a) = @_; 345 my ($self, @a) = @_;
307 346
308 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 347 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
309} 348}
310 349
311sub _stat_numdiff { 350sub _stat_numdiff {
312 my ($self, $name, $old, $new) = @_; 351 my ($self, $name, $old, $new) = @_;
313 352
… …
397 436
398 if ( 437 if (
399 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 438 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
400 ) { 439 ) {
401 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 440 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
402 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 441 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
403 } 442 }
404 443
405 $self->update_stats_window ($stats, $prev); 444 $self->update_stats_window ($stats, $prev);
406 445
407 $self->{prev_stats} = { %$stats }; 446 $self->{prev_stats} = { %$stats };
… …
474 for keys %RES_TBL; 513 for keys %RES_TBL;
475 514
476 my $sktbl = $::STATWIDS->{skill_tbl}; 515 my $sktbl = $::STATWIDS->{skill_tbl};
477 my @skills = keys %{ $self->{skill_info} }; 516 my @skills = keys %{ $self->{skill_info} };
478 517
479 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 518 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
519 map [$_, $self->{skill_info}{$_}],
520 grep exists $stats->{$_},
521 @skills;
522
523 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
524 $self->{stat_order} = join ",", map $_->[0], @order;
525
480 $sktbl->clear; 526 $sktbl->clear;
481 527
482 my @add; 528 my $sw = $self->{skillwid}{""} ||= [
483
484 push @add,
485 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 529 0, 0, (new DC::UI::Label text => "Experience", align => 1),
486 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 530 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
487 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 531 2, 0, (new DC::UI::Label text => "Progress"),
488 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 532 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
489 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 533 4, 0, (new DC::UI::Label text => "Experience", align => 1),
490 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 534 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
491 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 535 6, 0, (new DC::UI::Label text => "Progress"),
492 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 536 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
493 ; 537 ];
538
539 my @add = @$sw;
494 540
495 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 541 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
496 542
497 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 543 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
498 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 544 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
499 545
500 my ($x, $y) = (0, 1); 546 my ($x, $y) = (0, 1);
501 for ( 547 for (@order) {
502 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
503 map [$_, $self->{skill_info}{$_}],
504 grep exists $stats->{$_},
505 @skills
506 ) {
507 my ($idx, $name) = @$_; 548 my ($idx, $name) = @$_;
508 549
509 my $spell_cb = sub { 550 my $spell_cb = sub {
510 my ($widget, $ev) = @_; 551 my ($widget, $ev) = @_;
511 552
512 if ($ev->{button} == 1) { 553 if ($ev->{button} == 1) {
513 $::CONN->user_send ("ready_skill $name"); 554 $::CONN->user_send ("ready_skill $name");
514 } elsif ($ev->{button} == 2) { 555 } elsif ($ev->{button} == 2) {
515 $::CONN->user_send ("use_skill $name"); 556 $::CONN->user_send ("use_skill $name");
516 } elsif ($ev->{button} == 3) { 557 } elsif ($ev->{button} == 3) {
517 my $shortname = CFPlus::shorten $name, 14; 558 my $shortname = DC::shorten $name, 14;
518 (new CFPlus::UI::Menu 559 (new DC::UI::Menu
519 items => [ 560 items => [
520 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 561 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
521 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], 562 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
522 ], 563 ],
523 )->popup ($ev); 564 )->popup ($ev);
524 } else { 565 } else {
525 return 0; 566 return 0;
526 } 567 }
527 568
528 1 569 1
529 }; 570 };
530 571
572 my $sw = $self->{skillwid}{$idx} ||= [
573 # exp
574 (new DC::UI::Label
575 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
576
577 # level
578 (new DC::UI::Label
579 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
580
581 # progress
582 (new DC::UI::ExperienceProgress),
583
584 # label
585 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
586 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
587 ];
588
531 push @add, 589 push @add,
532 $x * 4 + 0, $y, ($self->{stat_widget_exp}{$idx} ||= new CFPlus::UI::Label 590 $x * 4 + 0, $y, $sw->[0],
533 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 591 $x * 4 + 1, $y, $sw->[1],
534 $x * 4 + 1, $y, ($self->{stat_widget_lvl}{$idx} ||= new CFPlus::UI::Label 592 $x * 4 + 2, $y, $sw->[2],
535 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 593 $x * 4 + 3, $y, $sw->[3],
536 $x * 4 + 2, $y, ($self->{stat_widget_prg}{$idx} ||= new CFPlus::UI::ExperienceProgress),
537 $x * 4 + 3, $y, ($self->{stat_widget_lbl}{$idx} ||= new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
538 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
539 ; 594 ;
540 595
541 $x++ and ($x, $y) = (0, $y + 1); 596 $x++ and ($x, $y) = (0, $y + 1);
542 } 597 }
543 598
544 $sktbl->add_at (@add); 599 $sktbl->add_at (@add);
545 } 600 }
546 601
547 for (grep exists $stats->{$_}, @skills) { 602 for (@order) {
548 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 603 my ($idx, $name) = @$_;
549 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 604 my $val = $stats->{$idx};
550 $self->{stat_widget_prg}{$_}->set_value (@{$stats->{$_}});
551 }
552}
553 605
554sub macro_send { 606 next if $prev->{$idx}[1] eq $val->[1];
555 my ($self, $macro) = @_;
556 607
557 for my $cmd (@{ $macro->{action} }) { 608 my $sw = $self->{skillwid}{$idx};
558 $self->send_command ($cmd); 609 $sw->[0]->set_text (::formsep ($val->[1]));
610 $sw->[1]->set_text ($val->[0] * 1);
611 $sw->[2]->set_value (@$val);
612
613 $::GAUGES->{sklprg}->set_label ("$name %d%%");
614 $::GAUGES->{sklprg}->set_value (@$val);
559 } 615 }
560} 616}
561 617
562sub user_send { 618sub user_send {
563 my ($self, $command) = @_; 619 my ($self, $command) = @_;
… …
565 $self->{record}->($command) 621 $self->{record}->($command)
566 if $self->{record}; 622 if $self->{record};
567 623
568 $self->logprint ("send: ", $command); 624 $self->logprint ("send: ", $command);
569 $self->send_command ($command); 625 $self->send_command ($command);
570 ::status ($command);
571} 626}
572 627
573sub record { 628sub record {
574 my ($self, $cb) = @_; 629 my ($self, $cb) = @_;
575 630
… …
606 } 661 }
607 } 662 }
608 663
609 if ($delay) { 664 if ($delay) {
610 # delay the map drawing a tiny bit in the hope of getting the missing fetched 665 # delay the map drawing a tiny bit in the hope of getting the missing fetched
611 Event->timer (after => 0.03, cb => sub { 666 EV::once undef, 0, 0.03, sub {
612 $_[0]->w->cancel;
613 $self->{map_widget}->update; 667 $self->{map_widget}->update
668 if $self->{map_widget};
614 }); 669 };
615 } else { 670 } else {
616 $self->{map_widget}->update; 671 $self->{map_widget}->update;
617 } 672 }
618} 673}
619 674
… …
631 686
632 my ($hash, $x, $y, $w, $h) = @$map_info; 687 my ($hash, $x, $y, $w, $h) = @$map_info;
633 688
634 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 689 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
635 $self->{map_cache_new}{$hash} = \$data; 690 $self->{map_cache_new}{$hash} = \$data;
636 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; 691 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
637} 692}
638 693
639sub map_clear { 694sub map_clear {
640 my ($self) = @_; 695 my ($self) = @_;
641 696
… …
654 do { 709 do {
655 $tile = pop @{$self->{bg_fetch}} 710 $tile = pop @{$self->{bg_fetch}}
656 or return; 711 or return;
657 } while $self->{texture}[$tile]; 712 } while $self->{texture}[$tile];
658 713
659 CFPlus::DB::get tilecache => $tile, sub { 714 DC::DB::get tilecache => $tile, sub {
660 my ($data) = @_; 715 my ($data) = @_;
661 716
662 return unless $self->{map}; # stop when destroyed 717 return unless $self->{map}; # stop when destroyed
663 718
664 if (defined $data) { 719 if (defined $data) {
… …
692 }; 747 };
693 748
694 if (my $rdata = $self->{map_cache_old}{$hash}) { 749 if (my $rdata = $self->{map_cache_old}{$hash}) {
695 $cb->($$rdata); 750 $cb->($$rdata);
696 } else { 751 } else {
697 CFPlus::DB::get $self->{mapcache} => $hash, $cb; 752 DC::DB::get $self->{mapcache} => $hash, $cb;
698 } 753 }
699} 754}
700 755
701# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 756# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
702# (server resource,s latency, bandwidth), so this hack is warranted. 757# (server resource,s latency, bandwidth), so this hack is warranted.
… …
826 881
827sub face_find { 882sub face_find {
828 my ($self, $facenum, $face, $cb) = @_; 883 my ($self, $facenum, $face, $cb) = @_;
829 884
830 if ($face->{type} == 0) { # FT_FACE 885 if ($face->{type} == 0) { # FT_FACE
831 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 886 my $id = DC::DB::get_tile_id_sync $face->{name};
832 887
833 $face->{id} = $id; 888 $face->{id} = $id;
834 $self->{map}->set_tileid ($facenum => $id); 889 $self->{map}->set_tileid ($facenum => $id);
835 890
836 CFPlus::DB::get tilecache => $id, $cb; 891 DC::DB::get tilecache => $id, $cb;
837 892
838 } elsif ($face->{type} & 1) { # with metadata 893 } elsif ($face->{type} & 1) { # with metadata
839 CFPlus::DB::get res_meta => $face->{name}, $cb; 894 DC::DB::get res_meta => $face->{name}, $cb;
840 895
841 } else { # no metadata 896 } else { # no metadata
842 CFPlus::DB::get res_data => $face->{name}, $cb; 897 DC::DB::get res_data => $face->{name}, $cb;
843 } 898 }
844} 899}
845 900
846sub face_update { 901sub face_update {
847 my ($self, $facenum, $face, $changed) = @_; 902 my ($self, $facenum, $face, $changed) = @_;
848 903
849 if ($face->{type} == 0) { 904 if ($face->{type} == 0) {
850 # image, FT_FACE 905 # image, FT_FACE
851 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 906 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
852 if $changed; 907 if $changed;
853 908
854 $self->have_tile ($face->{id}, delete $face->{data}); 909 $self->have_tile ($face->{id}, delete $face->{data});
855 910
856 } elsif ($face->{type} & 1) { 911 } elsif ($face->{type} & 1) {
857 # split metadata case, FT_MUSIC, FT_SOUND 912 # split metadata case, FT_MUSIC, FT_SOUND
858 if ($changed) { # new data 913 if ($changed) { # new data
859 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 914 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
860 $face->{data} = $meta; 915 $face->{data} = $meta;
861 916
917 # rely on strict ordering here and also on later fetch
862 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 918 DC::DB::put res_data => $face->{name} => $data, sub { };
863 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; 919 DC::DB::put res_meta => $face->{name} => $meta, sub { };
864 } 920 }
865 921
866 $face->{data} = $self->{json_coder}->decode ($face->{data}); 922 $face->{data} = $self->{json_coder}->decode ($face->{data});
867
868 ::add_license ($face); 923 ::add_license ($face);
924 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
925 if $changed;
869 926
870 if ($face->{type} == 3) { # FT_MUSIC 927 if ($face->{type} == 3) { # FT_MUSIC
871 ::message ({ markup => "downloaded song #$facenum" })
872 if $changed;
873
874 &::audio_music_push ($facenum); 928 &::audio_music_push ($facenum);
875 } elsif ($face->{type} == 5) { # FT_SOUND 929 } elsif ($face->{type} == 5) { # FT_SOUND
876 ::message ({ markup => "downloaded sound #$facenum" })
877 if $changed;
878
879 &::audio_sound_push ($facenum); 930 &::audio_sound_push ($facenum);
880 } 931 }
881 932
882 } else { 933 } else {
883 # flat resource case, FT_RSRC 934 # flat resource case, FT_RSRC
884 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } 935 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
885 if $changed; 936 if $changed;
886 } 937 }
887 938
888 if (my $cbs = $self->{face_cb}{$facenum}) { 939 if (my $cbs = $self->{face_cb}{$facenum}) {
889 $_->($face, $changed) for @$cbs; 940 $_->($face, $changed) for @$cbs;
… …
900 my ($self, $tile, $data) = @_; 951 my ($self, $tile, $data) = @_;
901 952
902 return unless $self->{map}; 953 return unless $self->{map};
903 954
904 my $tex = $self->{texture}[$tile] ||= 955 my $tex = $self->{texture}[$tile] ||=
905 new CFPlus::Texture 956 new DC::Texture
906 tile => $tile, 957 tile => $tile,
907 image => $data, delete_image => 1, 958 image => $data, delete_image => 1,
908 minify => 1, mipmap => 1; 959 minify => 1, mipmap => 1;
909 960
910 if (my $cbs = delete $self->{tile_cb}{$tile}) { 961 if (my $cbs = delete $self->{tile_cb}{$tile}) {
… …
918 my ($self, $num, $cb) = @_; 969 my ($self, $num, $cb) = @_;
919 970
920 push @{$self->{face_cb}{$num}}, $cb; 971 push @{$self->{face_cb}{$num}}, $cb;
921 972
922 defined wantarray 973 defined wantarray
923 ? CFPlus::guard { 974 ? DC::guard {
924 @{$self->{face_cb}{$num}} 975 @{$self->{face_cb}{$num}}
925 = grep $_ != $cb, 976 = grep $_ != $cb,
926 @{$self->{face_cb}{$num}}; 977 @{$self->{face_cb}{$num}};
927 } 978 }
928 : () 979 : ()
… …
963 1014
964sub sanitise_xml($) { 1015sub sanitise_xml($) {
965 local $_ = shift; 1016 local $_ = shift;
966 1017
967 # we now weed out all tags we do not support 1018 # we now weed out all tags we do not support
968 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 1019 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1020 }{
1021 "&lt;"
1022 }gex;
1023
969 # now all entities 1024 # now all entities
970 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1025 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
971 1026
972 # handle some elements 1027 # handle some elements
973 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1028 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
1026 1081
1027 ## try to create single paragraphs of multiple lines sent by the server 1082 ## try to create single paragraphs of multiple lines sent by the server
1028 # no longer neecssary with TRT servers 1083 # no longer neecssary with TRT servers
1029 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1084 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1030 1085
1086 for (split /\n/, $text) {
1031 ::message ({ 1087 ::message ({
1032 fg => $fg, 1088 fg => $fg,
1033 markup => $_, 1089 markup => $_,
1034 type => $type, 1090 type => $type,
1035 extra => [@extra], 1091 extra => [@extra],
1036 color_flags => $color 1092 color_flags => $color, #d# ugly, kill
1037 }) for split /\n/, $text; 1093 });
1094
1095 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1096 # actually, this is an ugly design. _we_ should control the channels,
1097 # not some random other widget, as the channels are clearly protocol-specific.
1098 # then we could also react to flags such as CLEAR without resorting to
1099 # hacks such as color_flags, above.
1100 }
1038 1101
1039 $self->{statusbox}->add ($text, 1102 $self->{statusbox}->add ($text,
1040 group => $text, 1103 group => $text,
1041 fg => $fg, 1104 fg => $fg,
1042 timeout => $color >= 2 ? 180 : 10, 1105 timeout => $color >= 2 ? 180 : 10,
1043 tooltip_font => $::FONT_FIXED, 1106 tooltip_font => $::FONT_FIXED,
1044 ); 1107 ) if $type eq "info";
1045 } 1108 }
1046} 1109}
1047 1110
1048sub spell_add { 1111sub spell_add {
1049 my ($self, $spell) = @_; 1112 my ($self, $spell) = @_;
… …
1053 $spell->{message} =~ s/\n+$//; 1116 $spell->{message} =~ s/\n+$//;
1054 $spell->{message} ||= "Server did not provide a description for this spell."; 1117 $spell->{message} ||= "Server did not provide a description for this spell.";
1055 1118
1056 $::SPELL_LIST->add_spell ($spell); 1119 $::SPELL_LIST->add_spell ($spell);
1057 1120
1058 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1121 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
1059 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 1122 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
1060} 1123}
1061 1124
1062sub spell_delete { 1125sub spell_delete {
1063 my ($self, $spell) = @_; 1126 my ($self, $spell) = @_;
1064 1127
… …
1075sub addme_success { 1138sub addme_success {
1076 my ($self) = @_; 1139 my ($self) = @_;
1077 1140
1078 my %skill_help; 1141 my %skill_help;
1079 1142
1080 for my $node (CFPlus::Pod::find skill_description => "*") { 1143 for my $node (DC::Pod::find skill_description => "*") {
1081 my (undef, @par) = CFPlus::Pod::section_of $node; 1144 my (undef, @par) = DC::Pod::section_of $node;
1082 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1145 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par;
1083 }; 1146 };
1084 1147
1085 for my $skill (values %{$self->{skill_info}}) { 1148 for my $skill (values %{$self->{skill_info}}) {
1086 $self->{map_widget}->add_command ("ready_skill $skill", 1149 $self->{map_widget}->add_command ("ready_skill $skill",
1087 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1150 (DC::asxml "Ready the skill '$skill'\n\n")
1088 . $skill_help{$skill}); 1151 . $skill_help{$skill});
1089 $self->{map_widget}->add_command ("use_skill $skill", 1152 $self->{map_widget}->add_command ("use_skill $skill",
1090 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1153 (DC::asxml "Immediately use the skill '$skill'\n\n")
1091 . $skill_help{$skill}); 1154 . $skill_help{$skill});
1092 } 1155 }
1093} 1156}
1094 1157
1095sub eof { 1158sub eof {
… …
1099 1162
1100 ::stop_game (); 1163 ::stop_game ();
1101} 1164}
1102 1165
1103sub update_floorbox { 1166sub update_floorbox {
1104 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1167 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1105 return unless $::CONN; 1168 return unless $::CONN;
1106 1169
1107 $::FLOORBOX->clear; 1170 $::FLOORBOX->clear;
1108 1171
1109 my @add; 1172 my @add;
… …
1111 my $row; 1174 my $row;
1112 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1175 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1113 if ($row < 6) { 1176 if ($row < 6) {
1114 local $_->{face_widget}; # hack to force recreation of widget 1177 local $_->{face_widget}; # hack to force recreation of widget
1115 local $_->{desc_widget}; # hack to force recreation of widget 1178 local $_->{desc_widget}; # hack to force recreation of widget
1116 CFPlus::Item::update_widgets $_; 1179 DC::Item::update_widgets $_;
1117 1180
1118 push @add, 1181 push @add,
1119 0, $row, $_->{face_widget}, 1182 0, $row, $_->{face_widget},
1120 1, $row, $_->{desc_widget}; 1183 1, $row, $_->{desc_widget};
1121 1184
1122 $row++; 1185 $row++;
1123 } else { 1186 } else {
1124 push @add, 1, $row, new CFPlus::UI::Button 1187 push @add, 1, $row, new DC::UI::Button
1125 text => "More...", 1188 text => "More...",
1126 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1189 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1127 ; 1190 ;
1128 last; 1191 last;
1129 } 1192 }
1130 } 1193 }
1131 if ($::CONN->{open_container}) { 1194 if ($::CONN->{open_container}) {
1132 push @add, 1, $row++, new CFPlus::UI::Button 1195 push @add, 1, $row++, new DC::UI::Button
1133 text => "Close container", 1196 text => "Close container",
1134 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1197 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1135 ; 1198 ;
1136 } 1199 }
1137 1200
1138 $::FLOORBOX->add_at (@add); 1201 $::FLOORBOX->add_at (@add);
1139 }); 1202 });
1140 1203
1141 $::WANT_REFRESH->start; 1204 $::WANT_REFRESH = 1;
1142} 1205}
1143 1206
1144sub set_opencont { 1207sub set_opencont {
1145 my ($conn, $tag, $name) = @_; 1208 my ($conn, $tag, $name) = @_;
1146 $conn->{open_container} = $tag; 1209 $conn->{open_container} = $tag;
1147 update_floorbox; 1210 update_floorbox;
1148 1211
1149 $::INVR_HB->clear (); 1212 $::INVR_HB->clear ();
1150 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1213 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1151 1214
1152 if ($tag != 0) { # Floor isn't closable, is it? 1215 if ($tag != 0) { # Floor isn't closable, is it?
1153 $::INVR_HB->add (new CFPlus::UI::Button 1216 $::INVR_HB->add (new DC::UI::Button
1154 text => "Close container", 1217 text => "Close container",
1155 tooltip => "Close the currently open container (if one is open)", 1218 tooltip => "Close the currently open container (if one is open)",
1156 on_activate => sub { 1219 on_activate => sub {
1157 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1220 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1158 if $tag != 0; 1221 if $tag != 0;
… …
1165} 1228}
1166 1229
1167sub update_containers { 1230sub update_containers {
1168 my ($self) = @_; 1231 my ($self) = @_;
1169 1232
1170 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1233 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1171 my $todo = delete $self->{update_container} 1234 my $todo = delete $self->{update_container}
1172 or return; 1235 or return;
1173 1236
1174 for my $tag (keys %$todo) { 1237 for my $tag (keys %$todo) {
1175 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1238 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1212sub item_update { 1275sub item_update {
1213 my ($self, $item) = @_; 1276 my ($self, $item) = @_;
1214 1277
1215 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1278 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
1216 1279
1217 CFPlus::Item::update_widgets $item; 1280 DC::Item::update_widgets $item;
1218 1281
1219 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1282 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1220 set_opencont ($::CONN, 0, "Floor"); 1283 set_opencont ($::CONN, 0, "Floor");
1221 1284
1222 } elsif ($item->{flags} & F_OPEN) { 1285 } elsif ($item->{flags} & F_OPEN) {
1223 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1286 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1224 1287
1225 } else { 1288 } else {
1226 $self->{update_container}{$item->{container}}++; 1289 $self->{update_container}{$item->{container}}++;
1227 $self->update_containers; 1290 $self->update_containers;
1228 } 1291 }
… …
1239 1302
1240 my $weight = .001 * $self->{player}{weight}; 1303 my $weight = .001 * $self->{player}{weight};
1241 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1304 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1242 1305
1243 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1306 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1244 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1307 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1245 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1308 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1246} 1309}
1247 1310
1248sub update_server_info { 1311sub update_server_info {
1249 my ($self) = @_; 1312 my ($self) = @_;
… …
1287 0 1350 0
1288 }); 1351 });
1289 1352
1290 $self->update_server_info; 1353 $self->update_server_info;
1291 1354
1292 $self->send_command ("output-sync $::CFG->{output_sync}");
1293 $self->send_command ("output-count $::CFG->{output_count}");
1294 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1355 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1295 $self->send_command ("pickup $::CFG->{pickup}"); 1356 $self->send_command ("pickup $::CFG->{pickup}");
1296} 1357}
1297 1358
1298sub lookat { 1359sub lookat {
… …
1302 $self->send_ext_req (lookat => $x, $y, sub { 1363 $self->send_ext_req (lookat => $x, $y, sub {
1303 my (%msg) = @_; 1364 my (%msg) = @_;
1304 1365
1305 if (exists $msg{npc_dialog}) { 1366 if (exists $msg{npc_dialog}) {
1306 # start npc chat dialog 1367 # start npc chat dialog
1307 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1368 $self->{npc_dialog} = new DC::NPCDialog::
1308 token => $msg{npc_dialog}, 1369 token => $msg{npc_dialog},
1309 title => "$msg{npc_dialog}[0] (NPC)", 1370 title => "$msg{npc_dialog}[0] (NPC)",
1310 conn => $self, 1371 conn => $self,
1311 ; 1372 ;
1312 } 1373 }
… …
1325 $self->SUPER::destroy; 1386 $self->SUPER::destroy;
1326 1387
1327 %$self = (); 1388 %$self = ();
1328} 1389}
1329 1390
1330package CFPlus::NPCDialog; 1391package DC::NPCDialog;
1331 1392
1332our @ISA = 'CFPlus::UI::Toplevel'; 1393our @ISA = 'DC::UI::Toplevel';
1333 1394
1334sub new { 1395sub new {
1335 my $class = shift; 1396 my $class = shift;
1336 1397
1337 my $self = $class->SUPER::new ( 1398 my $self = $class->SUPER::new (
… …
1344 kw => { hi => 0, yes => 0, no => 0 }, 1405 kw => { hi => 0, yes => 0, no => 0 },
1345 has_close_button => 1, 1406 has_close_button => 1,
1346 @_, 1407 @_,
1347 ); 1408 );
1348 1409
1349 CFPlus::weaken (my $this = $self); 1410 DC::weaken (my $this = $self);
1350 1411
1351 $self->connect (delete => sub { $this->destroy; 1 }); 1412 $self->connect (delete => sub { $this->destroy; 1 });
1352 1413
1353 # better use a pane... 1414 # better use a pane...
1354 $self->add (my $hbox = new CFPlus::UI::HBox); 1415 $self->add (my $hbox = new DC::UI::HBox);
1355 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1416 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1356 1417
1357 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1418 $hbox->add (my $vbox = new DC::UI::VBox);
1358 1419
1359 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1420 $vbox->add (new DC::UI::Label text => "Message Entry:");
1360 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1421 $vbox->add ($self->{entry} = new DC::UI::Entry
1361 tooltip => "#npc_message_entry", 1422 tooltip => "#npc_message_entry",
1362 on_activate => sub { 1423 on_activate => sub {
1363 my ($entry, $text) = @_; 1424 my ($entry, $text) = @_;
1364 1425
1365 return unless $text =~ /\S/; 1426 return unless $text =~ /\S/;
… …
1369 1430
1370 0 1431 0
1371 }, 1432 },
1372 ); 1433 );
1373 1434
1374 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1435 $vbox->add ($self->{options} = new DC::UI::VBox);
1375 1436
1376 $self->{bye_button} = new CFPlus::UI::Button 1437 $self->{bye_button} = new DC::UI::Button
1377 text => "Bye (close)", 1438 text => "Bye (close)",
1378 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1439 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1379 on_activate => sub { $this->destroy; 1 }, 1440 on_activate => sub { $this->destroy; 1 },
1380 ; 1441 ;
1381 1442
… …
1400}; 1461};
1401 1462
1402sub update_options { 1463sub update_options {
1403 my ($self) = @_; 1464 my ($self) = @_;
1404 1465
1405 CFPlus::weaken $self; 1466 DC::weaken $self;
1406 1467
1407 $self->{options}->clear; 1468 $self->{options}->clear;
1408 $self->{options}->add ($self->{bye_button}); 1469 $self->{options}->add ($self->{bye_button});
1409 1470
1410 for my $kw (sort keys %{ $self->{kw} }) { 1471 for my $kw (sort keys %{ $self->{kw} }) {
1411 $self->{options}->add (new CFPlus::UI::Button 1472 $self->{options}->add (new DC::UI::Button
1412 text => $kw, 1473 text => $kw,
1413 on_activate => sub { 1474 on_activate => sub {
1414 $self->send ($kw); 1475 $self->send ($kw);
1415 0 1476 0
1416 }, 1477 },
… …
1419} 1480}
1420 1481
1421sub feed { 1482sub feed {
1422 my ($self, $type, @arg) = @_; 1483 my ($self, $type, @arg) = @_;
1423 1484
1424 CFPlus::weaken $self; 1485 DC::weaken $self;
1425 1486
1426 if ($type eq "update") { 1487 if ($type eq "update") {
1427 my (%info) = @arg; 1488 my (%info) = @arg;
1428 1489
1429 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1490 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1430 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1491 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1431 1492
1432 if (exists $info{msg}) { 1493 if (exists $info{msg}) {
1433 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1494 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1434 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1495 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1435 my @link; 1496 my @link;
1436 $text =~ s{ 1497 $text =~ s{
1437 ($match) 1498 ($match)
1438 }{ 1499 }{
1439 my $kw = $1; 1500 my $kw = $1;
1440 1501
1441 push @link, new CFPlus::UI::Label 1502 push @link, new DC::UI::Label
1442 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1503 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1443 can_hover => 1, 1504 can_hover => 1,
1444 can_events => 1, 1505 can_events => 1,
1445 padding_x => 0, 1506 padding_x => 0,
1446 padding_y => 0, 1507 padding_y => 0,
… …
1464} 1525}
1465 1526
1466sub send { 1527sub send {
1467 my ($self, $msg) = @_; 1528 my ($self, $msg) = @_;
1468 1529
1469 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1530 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1470 $self->{textview}->scroll_to_bottom; 1531 $self->{textview}->scroll_to_bottom;
1471 1532
1472 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1533 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1473} 1534}
1474 1535

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines