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.6 by root, Sat May 27 19:49:07 2006 UTC vs.
Revision 1.208 by root, Sun Jan 11 03:19:47 2009 UTC

1package CFClient::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 CFClient::UI; 8use DC;
9use DC::DB;
10use DC::UI;
11use DC::Pod;
12use DC::Macro;
13use DC::Item;
9 14
10use base 'Crossfire::Protocol::Base'; 15use base 'Deliantra::Protocol::Base';
16
17our $TEX_DIALOGUE = new_from_resource DC::Texture
18 "dialogue.png", minify => 1, mipmap => 1;
19
20our $TEX_NOFACE = new_from_resource DC::Texture
21 "noface.png", minify => 1, mipmap => 1;
22
23our $TEX_HIDDEN = new_from_resource DC::Texture
24 "hidden.png", minify => 1, mipmap => 1;
25
26sub MIN_TEXTURE_UNUSED() { 1 }#d#
11 27
12sub new { 28sub new {
13 my $class = shift; 29 my ($class, %arg) = @_;
14 30
15 my $self = $class->SUPER::new (@_); 31 my $self = $class->SUPER::new (%arg,
32 setup_req => {
33 extmap => 1,
34 excmd => 1,
35 widget => 2,
36 %{$arg{setup_req} || {}},
37 },
38 );
16 39
17 $self->{map_widget}->clr_commands; 40 $self->{map_widget}->clr_commands;
18 41
19 my $parser = new Pod::POM; 42 my @cmd_help = map {
20 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
21
22 for my $head2 ($pod->head1->[-2]->head2) {
23 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 43 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
24 or next; 44 or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
25 45
26 my $cmd = $1; 46 my $cmd = $1;
27 my @args = split /\|/, $2; 47 my @args = split /\|/, $2;
28 @args = (".*") unless @args; 48 @args = (".*") unless @args;
29 49
50 my (undef, @par) = DC::Pod::section_of $_;
51 my $text = DC::Pod::as_label @par;
52
30 $_ = $_ eq ".*" ? "" : " $_" 53 $_ = $_ eq ".*" ? "" : " $_"
31 for @args; 54 for @args;
32 55
33 my $text = CFClient::pod_to_pango $head2->content; 56 map ["$cmd$_", $text],
34
35 $self->{map_widget}->add_command ("$cmd$_", $text)
36 for sort { (length $a) <=> (length $b) } 57 sort { (length $a) <=> (length $b) }
37 @args; 58 @args
59 } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
60 DC::Pod::find command => "*";
61
62 $self->{json_coder}
63 ->convert_blessed
64 ->filter_json_single_key_object ("\fw" => sub {
65 $self->{widget}{$_[0]}
66 })
67 ->filter_json_single_key_object ("\fc" => sub {
68 my ($id) = @_;
69 sub {
70 $self->send_exti_msg (w_e => $id, @_);
71 }
72 });
73
74 # destroy widgets on logout
75 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
76 for my $ws (values %{delete $self->{widgetset} || {}}) {
77 $_->destroy
78 for values %{delete $ws->{w} || {}};
79 }
80
81 delete $self->{items};
82 $::INV->clear;
83 $::INVR->clear;
84 $::INVR_HB->clear;
85 $::FLOORBOX->clear;
38 } 86 });
39 87
40 $self->{noface} = new_from_file CFClient::Texture 88 $self->{map_widget}->add_command (@$_)
41 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 89 for @cmd_help;
90
91 {
92 $self->{dialogue} = my $tex = $TEX_DIALOGUE;
93 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
94 }
95
96 {
97 $self->{noface} = my $tex = $TEX_NOFACE;
98 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
99 }
100
101 {
102 $self->{hidden} = my $tex = $TEX_HIDDEN;
103 $self->{map}->set_texture (3, @$tex{qw(name w h s t)}, @{$tex->{minified}});
104 }
105
106# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
107# $self->{expire_w} = EV::timer 1, 1, sub {
108# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
109#
110# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) {
111# warn DC::SvREFCNT $self->{texture}[$_];
112# $self->{texture}[$_]->unload;
113# warn "expire texture $_\n";#d#
114# }
115#
116# ($self->{expire_count} += $count) < @{ $self->{texture} }
117# or $self->{expire_count} = DC::DB::FIRST_TILE_ID;
118# warn "count is $count\n";#d#
119# };
42 120
43 $self->{open_container} = 0; 121 $self->{open_container} = 0;
44 122
45 # "global"
46 $self->{tilecache} = CFClient::db_table "tilecache";
47 $self->{facemap} = CFClient::db_table "facemap";
48
49 # per server 123 # per server
50 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 124 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
51 125
52 $self 126 $self
53} 127}
128
129sub update_fx_want {
130 my ($self) = @_;
131
132 $self->send_exti_msg (fx_want => {
133 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
134 5 => !!$::CFG->{audio_enable}, # FT_SOUND
135 6 => 1, # FT_RSRC
136 });
137}
138
139sub ext_capabilities {
140 my ($self, %cap) = @_;
141
142 $self->update_fx_want;
143
144 $self->send_exti_req (resource => "exp_table", sub {
145 my ($exp_table) = @_;
146
147 $self->register_face_handler ($exp_table, sub {
148 my ($face) = @_;
149
150 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
151 $_->() for values %{ $self->{on_exp_update} || {} };
152 });
153
154 ()
155 });
156
157 if (my $ts = $cap{tileset}) {
158 if (my ($default) = grep $_->[2] & 1, @$ts) {
159 $self->{tileset} = $default;
160 $self->{tilesize} = $default->[3];
161 $self->setup_req (tileset => $default->[0]);
162
163 my $w = int $self->{mapw} * 32 / $self->{tilesize};
164 my $h = int $self->{maph} * 32 / $self->{tilesize};
165
166 $self->setup_req (mapsize => "${w}x${h}");
167 }
168 }
169}
170
171sub ext_ambient_music {
172 my ($self, $songs) = @_;
173 &::audio_music_set_ambient ($songs);
174}
175
176#############################################################################
177
178sub widget_associate {
179 my ($self, $ws, $id, $widget) = @_;
180
181 $widget ||= new DC::UI::Bin;
182
183 $widget->{s_id} = $id;
184 $self->{widget}{$id} = $widget;
185
186 if ($ws) {
187 $widget->{s_ws} = $ws;
188 $self->{widgetset}{$ws}{w}{$id} = $widget;
189 }
190
191 $widget->connect (on_destroy => sub {
192 my ($widget) = @_;
193
194 delete $self->{widget}{$widget->{s_id}};
195 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
196 if exists $widget->{s_ws};
197 });
198}
199
200# widgetset new
201sub ext_ws_n {
202 my ($self, $id) = @_;
203
204 $self->{widgetset}{$id} = {
205 w => {},
206 };
207}
208
209# widgetset destroy
210sub ext_ws_d {
211 my ($self, $id) = @_;
212
213 my $ws = delete $self->{widgetset}{$id}
214 or return;
215
216 $_->destroy
217 for values %{$ws->{w}};
218}
219
220# widgetset create
221sub ext_ws_c {
222 my ($self, $ws, $id, $class, $args) = @_;
223
224 $self->widget_associate (
225 $ws, $id => scalar eval {
226 local $SIG{__DIE__};
227 "DC::UI::$class"->new (%$args)
228 }
229 );
230}
231
232# widgetset create template
233sub ext_ws_ct {
234 my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
235
236 $done_cb ||= sub { };
237
238 my $parse_list; $parse_list = sub {
239 my ($list) = @_;
240 my @w;
241
242 while (@$list) {
243 my ($class, $args) = splice @$list, 0, 2;
244 my $name = delete $args->{s_id};
245 my $cl = delete $args->{s_cl};
246 my $cfg = delete $cfg->{$name};
247 my $id = delete $cfg->{id};
248 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
249 or next;
250
251 $self->widget_associate ($ws, $id, $w)
252 if $id;
253
254 $w->add ($parse_list->($cl))
255 if $cl;
256
257 push @w, $w;
258 }
259
260 @w
261 };
262
263 # either array reference, or face #
264 if ($type eq "inline") {
265 $done_cb->();
266 $parse_list->($template);
267 } elsif ($type eq "face") {
268 my $handler; $handler = $self->register_face_handler ($template, sub {
269 my ($face) = @_;
270
271 undef $handler;
272 $done_cb->();
273 $parse_list->($self->{json_coder}->decode ($face->{data}));
274 });
275 } else {
276 $done_cb->(0);
277 }
278}
279
280# widgetset associate
281sub ext_ws_a {
282 my ($self, %ass) = @_;
283
284 # everything that has a name, wether conceivably useful or not
285 my %wkw = (
286 root => $DC::UI::ROOT,
287 tooltip => $DC::UI::TOOLTIP,
288
289 mapwidget => $::MAPWIDGET,
290 menubar => $::MENUBAR,
291 menupopup => $::MENUPOPUP,
292 buttonbar => $::BUTTONBAR,
293 metaserver => $::METASERVER,
294 buttonbar => $::BUTTONBAR,
295 login_button => $::LOGIN_BUTTON,
296 quit_dialog => $::QUIT_DIALOG,
297 host_entry => $::HOST_ENTRY,
298 metaserver => $::METASERVER,
299 server_info => $::SERVER_INFO,
300
301 setup_dialog => $::SETUP_DIALOG,
302 setup_notebook => $::SETUP_NOTEBOOK,
303 setup_server => $::SETUP_SERVER,
304 setup_keyboard => $::SETUP_KEYBOARD,
305
306 pl_notebook => $::PL_NOTEBOOK,
307 pl_window => $::PL_WINDOW,
308 inventory_page => $::INVENTORY_PAGE,
309 stats_page => $::STATS_PAGE,
310 skill_page => $::SKILL_PAGE,
311 spell_page => $::SPELL_PAGE,
312 spell_list => $::SPELL_LIST,
313
314 floorbox => $::FLOORBOX,
315 help_window => $::HELP_WINDOW,
316 message_window => $::MESSAGE_WINDOW,
317 message_dist => $::MESSAGE_DIST,
318 statusbox => $::STATUSBOX,
319
320 inv => $::INV,
321 invr => $::INVR,
322 invr_hb => $::INVR_HB,
323 );
324
325 while (my ($id, $name) = each %ass) {
326 $self->widget_associate (undef, $id => $wkw{$name});
327 }
328}
329
330# widget call
331sub ext_w_c {
332 my ($self, $id, $rcb, $method, @args) = @_;
333
334 my $w = $self->{widget}{$id}
335 or return;
336
337 if ($rcb) {
338 $rcb->($w->$method (@args));
339 } else {
340 $w->$method (@args);
341 }
342}
343
344# widget set
345sub ext_w_s {
346 my ($self, $id, $attr) = @_;
347
348 my $w = $self->{widget}{$id}
349 or return;
350
351 for (my $i = 0; $i < $#$attr; $i += 2) {
352 my ($member, $value) = @$attr[$i, $i+1];
353 if (defined $value) {
354 $w->{$member} = $value;
355 } else {
356 delete $w->{$member};
357 }
358 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
359 }
360}
361
362# widget get
363sub ext_w_g {
364 my ($self, $id, $rid, @attr) = @_;
365
366 my $w = $self->{widget}{$id}
367 or return;
368
369 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
370}
371
372# message window
373sub ext_channel_info {
374 my ($self, $info) = @_;
375 $self->{channels}->{$info->{id}} = $info;
376 $::MESSAGE_DIST->add_channel ($info);
377}
378
379#############################################################################
380
381sub logprint {
382 my ($self, @a) = @_;
383
384 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
385}
386
387sub _stat_numdiff {
388 my ($self, $name, $old, $new) = @_;
389
390 my $diff = $new - $old;
391
392 $diff = 0.01 * int $diff * 100;
393
394 0.1 >= abs $diff ? ()
395 : $diff < 0 ? "$name$diff" : "$name+$diff"
396}
397
398sub _stat_skillmaskdiff {
399 my ($self, $name, $old, $new) = @_;
400
401 my $diff = $old ^ $new
402 or return;
403
404 my @diff = map
405 {
406 $diff & $_
407 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
408 : ()
409 }
410 sort { $a <=> $b } keys %{$self->{spell_paths}};
411
412 join "", @diff
413}
414
415# all stats that are chacked against changes
416my @statchange = (
417 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
418 [&CS_STAT_INT => \&_stat_numdiff, "Int"],
419 [&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
420 [&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
421 [&CS_STAT_CON => \&_stat_numdiff, "Con"],
422 [&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
423 [&CS_STAT_POW => \&_stat_numdiff, "Pow"],
424 [&CS_STAT_WC => \&_stat_numdiff, "Wc"],
425 [&CS_STAT_AC => \&_stat_numdiff, "Ac"],
426 [&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
427 [&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
428 [&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
429 [&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
430 [&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
431 [&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
432 [&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
433 [&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
434 [&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
435 [&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
436 [&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
437 [&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
438 [&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
439 [&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
440 [&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
441 [&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
442 [&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
443 [&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
444 [&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
445 [&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
446 [&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
447 [&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
448 [&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
449 [&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
450 [&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
451 [&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
452 [&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
453 [&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
454);
54 455
55sub stats_update { 456sub stats_update {
56 my ($self, $stats) = @_; 457 my ($self, $stats) = @_;
57 458
58 if (my $exp = $stats->{+CS_STAT_EXP64}) { 459 my $prev = $self->{prev_stats} || { };
59 my $diff = $exp - $self->{prev_exp}; 460
461 if (my @diffs =
462 (
463 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
464 map {
465 $stats->{$_} && $prev->{$_}
466 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
467 } sort { $a <=> $b } keys %{$self->{skill_info}}
468 )
469 ) {
470 my $msg = join " ", @diffs;
60 $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5) 471 $self->{statusbox}->add ($msg, group => "experience $msg", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
61 if exists $self->{prev_exp} && $diff;
62 $self->{prev_exp} = $exp;
63 } 472 }
64 473
474 if (
475 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
476 ) {
477 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
478 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
479 }
480
65 ::update_stats_window ($stats); 481 $self->update_stats_window ($stats, $prev);
482
483 $self->{prev_stats} = { %$stats };
484}
485
486my %RES_TBL = (
487 phys => CS_STAT_RES_PHYS,
488 magic => CS_STAT_RES_MAG,
489 fire => CS_STAT_RES_FIRE,
490 elec => CS_STAT_RES_ELEC,
491 cold => CS_STAT_RES_COLD,
492 conf => CS_STAT_RES_CONF,
493 acid => CS_STAT_RES_ACID,
494 drain => CS_STAT_RES_DRAIN,
495 ghit => CS_STAT_RES_GHOSTHIT,
496 pois => CS_STAT_RES_POISON,
497 slow => CS_STAT_RES_SLOW,
498 para => CS_STAT_RES_PARA,
499 tund => CS_STAT_TURN_UNDEAD,
500 fear => CS_STAT_RES_FEAR,
501 depl => CS_STAT_RES_DEPLETE,
502 deat => CS_STAT_RES_DEATH,
503 holyw => CS_STAT_RES_HOLYWORD,
504 blind => CS_STAT_RES_BLIND,
505);
506
507sub update_stats_window {
508 my ($self, $stats, $prev) = @_;
509
510 # I love text protocols...
511
512 my $hp = $stats->{+CS_STAT_HP} * 1;
513 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
514 my $sp = $stats->{+CS_STAT_SP} * 1;
515 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
516 my $fo = $stats->{+CS_STAT_FOOD} * 1;
517 my $fo_m = 999;
518 my $gr = $stats->{+CS_STAT_GRACE} * 1;
519 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
520
521 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
522 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
523 $::GAUGES->{food} ->set_value ($fo, $fo_m);
524 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
525 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
526 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
527 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
528 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
529 my $title = $stats->{+CS_STAT_TITLE};
530 $title =~ s/^Player: //;
531 $::STATWIDS->{title} ->set_text ("Title: " . $title);
532
533 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
534 $::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
535 $::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
536 $::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
537 $::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
538 $::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
539 $::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
540 $::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
541 $::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
542 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
543 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
544 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
545 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
546
547 $self->update_weight;
548
549 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
550 for keys %RES_TBL;
551
552 my $sktbl = $::STATWIDS->{skill_tbl};
553 my @skills = keys %{ $self->{skill_info} };
554
555 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
556 map [$_, $self->{skill_info}{$_}],
557 grep exists $stats->{$_},
558 @skills;
559
560 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
561 $self->{stat_order} = join ",", map $_->[0], @order;
562
563 $sktbl->clear;
564
565 my $sw = $self->{skillwid}{""} ||= [
566 0, 0, (new DC::UI::Label text => "Experience", align => 1),
567 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
568 2, 0, (new DC::UI::Label text => "Progress"),
569 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
570 4, 0, (new DC::UI::Label text => "Experience", align => 1),
571 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
572 6, 0, (new DC::UI::Label text => "Progress"),
573 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
574 ];
575
576 my @add = @$sw;
577
578 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>";
579
580 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
581 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
582
583 my ($x, $y) = (0, 1);
584 for (@order) {
585 my ($idx, $name) = @$_;
586
587 my $spell_cb = sub {
588 my ($widget, $ev) = @_;
589
590 if ($ev->{button} == 1) {
591 $::CONN->user_send ("ready_skill $name");
592 } elsif ($ev->{button} == 2) {
593 $::CONN->user_send ("use_skill $name");
594 } elsif ($ev->{button} == 3) {
595 my $shortname = DC::shorten $name, 14;
596 (new DC::UI::Menu
597 items => [
598 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
599 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
600 ],
601 )->popup ($ev);
602 } else {
603 return 0;
604 }
605
606 1
607 };
608
609 my $sw = $self->{skillwid}{$idx} ||= [
610 # exp
611 (new DC::UI::Label
612 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
613
614 # level
615 (new DC::UI::Label
616 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
617
618 # progress
619 (new DC::UI::ExperienceProgress),
620
621 # label
622 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
623 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
624 ];
625
626 push @add,
627 $x * 4 + 0, $y, $sw->[0],
628 $x * 4 + 1, $y, $sw->[1],
629 $x * 4 + 2, $y, $sw->[2],
630 $x * 4 + 3, $y, $sw->[3],
631 ;
632
633 $x++ and ($x, $y) = (0, $y + 1);
634 }
635
636 $sktbl->add_at (@add);
637 }
638
639 for (@order) {
640 my ($idx, $name) = @$_;
641 my $val = $stats->{$idx};
642
643 next if $prev->{$idx}[1] eq $val->[1];
644
645 my $sw = $self->{skillwid}{$idx};
646 $sw->[0]->set_text (::formsep ($val->[1]));
647 $sw->[1]->set_text ($val->[0] * 1);
648 $sw->[2]->set_value (@$val);
649
650 $::GAUGES->{sklprg}->set_label ("$name %d%%");
651 $::GAUGES->{sklprg}->set_value (@$val);
652 }
66} 653}
67 654
68sub user_send { 655sub user_send {
69 my ($self, $command) = @_; 656 my ($self, $command) = @_;
70 657
658 $self->{record}->($command)
659 if $self->{record};
660
661 $self->logprint ("send: ", $command);
71 $self->send_command ($command); 662 $self->send_command ($command);
72 ::status $command; 663}
664
665sub record {
666 my ($self, $cb) = @_;
667
668 $self->{record} = $cb;
73} 669}
74 670
75sub map_scroll { 671sub map_scroll {
76 my ($self, $dx, $dy) = @_; 672 my ($self, $dx, $dy) = @_;
77 673
78 $self->{map}->scroll ($dx, $dy); 674 $self->{map_widget}->scroll ($dx, $dy);
79} 675}
80 676
81sub feed_map1a { 677sub feed_map1a {
82 my ($self, $data) = @_; 678 my ($self, $data) = @_;
83 679
84 $self->{map}->map1a_update ($data); 680 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
681 my $delay;
682
683 for my $tile (@$missing) {
684 next if $self->{delay}{$tile};
685
686 $delay = 1;
687
688 if (my $tex = $self->{texture}[$tile]) {
689 $tex->upload;
690 } else {
691 $self->{delay}{$tile} = 1;
692
693 # we assume the face is in-flight and will eventually arrive
694 push @{$self->{tile_cb}{$tile}}, sub {
695 delete $self->{delay}{$tile};
696 $_[0]->upload;
697 };
698 }
699 }
700
701 if ($delay) {
702 # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
703 EV::once undef, 0, 0.03, sub {
704 $self->{map_widget}->update
705 if $self->{map_widget};
706 };
707 } else {
85 $self->{map_widget}->update; 708 $self->{map_widget}->update;
709 }
710}
711
712sub magicmap {
713 my ($self, $w, $h, $x, $y, $data) = @_;
714
715 $self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data);
86} 716}
87 717
88sub flush_map { 718sub flush_map {
89 my ($self) = @_; 719 my ($self) = @_;
90 720
91 my $map_info = delete $self->{map_info} 721 return unless $self->{map_info};
92 or return;
93 722
723 for my $map_info (values %{ $self->{map_cache} || {} }) {
94 my ($hash, $x, $y, $w, $h) = @$map_info; 724 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
95 725
96 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 726 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
97 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 727
98 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 728 if ($data ne $$rdata) {
729 $map_info->[1] = \$data;
730 my $cdata = Compress::LZF::compress $data;
731 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
732 }
733 }
99} 734}
100 735
101sub map_clear { 736sub map_clear {
102 my ($self) = @_; 737 my ($self) = @_;
103 738
104 $self->flush_map; 739 $self->flush_map;
740 delete $self->{map_info};
105 delete $self->{neigh_map}; 741 delete $self->{neigh_map};
106 742
107 $self->{map}->clear; 743 $self->{map}->clear;
744 delete $self->{map_widget}{magicmap};
108} 745}
109 746
747sub bg_fetch {
748 my ($self) = @_;
110 749
750 my $tile;
751
752 do {
753 $tile = pop @{$self->{bg_fetch}}
754 or return;
755 } while $self->{texture}[$tile];
756
757 DC::DB::get tilecache => $tile, sub {
758 my ($data) = @_;
759
760 return unless $self->{map}; # stop when destroyed
761
762 if (defined $data) {
763 $self->have_tile ($tile, $data);
764 $self->{texture}[$tile]->upload;
765 }
766
767 $self->bg_fetch;
768 };
769}
770
111sub load_map($$$) { 771sub load_map($$$$$$) {
112 my ($self, $hash, $x, $y) = @_; 772 my ($self, $hash, $x, $y, $w, $h) = @_;
113 773
114 if (defined (my $data = $self->{mapcache}->get ($hash))) { 774 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
115 $data = Compress::LZF::decompress $data;
116 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
117 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
118 my $data = $self->{tilecache}->get ($id)
119 or next;
120 775
121 $self->set_texture ($id => $data); 776 my $cb = sub {
777 $map_info->[1] = \$_[0];
778
779 my $inprogress = @{ $self->{bg_fetch} || [] };
780 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
781 $self->bg_fetch unless $inprogress;
782 };
783
784 if (my $map_info = $self->{map_cache_old}{$hash}) {
785 $cb->(${ $map_info->[1] });
786 } else {
787 my $gen = $self->{map_change_gen};
788
789 DC::DB::get $self->{mapcache} => $hash, sub {
790 return unless $gen == $self->{map_change_gen};
791 return unless defined $_[0];
792 $cb->(Compress::LZF::decompress $_[0]);
122 } 793 };
123 } 794 }
124} 795}
125 796
126# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 797# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
127# (server resource,s latency, bandwidth), so this hack is warranted. 798# (server resources, latency, bandwidth), so this hack is warranted.
128# the right fix is to make real tiled maps with an overview file 799# the right fix is to make real tiled maps with an overview file
129sub send_mapinfo { 800sub send_mapinfo {
130 my ($self, $data, $cb) = @_; 801 my ($self, $data, $cb) = @_;
131 802
132 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { 803 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
… …
157} 828}
158 829
159# this method does a "flood fill" into every tile direction 830# this method does a "flood fill" into every tile direction
160# it assumes that tiles are arranged in a rectangular grid, 831# it assumes that tiles are arranged in a rectangular grid,
161# i.e. a map is the same as the left of the right map etc. 832# i.e. a map is the same as the left of the right map etc.
162# failure to comply are harmless and result in display errors 833# failure to comply is harmless and results in display errors
163# at worst. 834# at worst.
164sub flood_fill { 835sub flood_fill {
165 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 836 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
166 837
167 # the server does not allow map paths > 6 838 # the server does not allow map paths > 6
… …
192 863
193 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 864 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
194 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 865 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
195 866
196 } else { 867 } else {
868 my $gen = $self->{map_change_gen};
197 $self->send_mapinfo ("spatial $path$tile", sub { 869 $self->send_mapinfo ("spatial $path$tile", sub {
870 return unless $gen == $self->{map_change_gen};
871
198 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 872 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
199 873
200 return if $mode ne "spatial"; 874 return if $mode ne "spatial";
201 875
202 $x += $self->{map}->ox; 876 $x += $self->{map}->ox;
203 $y += $self->{map}->oy; 877 $y += $self->{map}->oy;
204 878
205 $self->load_map ($hash, $x, $y) 879 $self->load_map ($hash, $x, $y, $w, $h)
206 unless $self->{neigh_map}{$hash}[5]++;#d# 880 unless $self->{neigh_map}{$hash}[5]++;#d#
207 881
208 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 882 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
209 883
210 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 884 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
… …
216 890
217sub map_change { 891sub map_change {
218 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 892 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
219 893
220 $self->flush_map; 894 $self->flush_map;
895
896 ++$self->{map_change_gen};
897 $self->{map_cache_old} = delete $self->{map_cache};
221 898
222 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 899 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
223 900
224 my $mapmapw = $self->{mapmap}->{w}; 901 my $mapmapw = $self->{mapmap}->{w};
225 my $mapmaph = $self->{mapmap}->{h}; 902 my $mapmaph = $self->{mapmap}->{h};
… …
237 $self->{map_info} = [$hash, $x, $y, $w, $h]; 914 $self->{map_info} = [$hash, $x, $y, $w, $h];
238 915
239 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 916 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
240 $::STATWIDS->{map}->set_text ("Map: " . $map); 917 $::STATWIDS->{map}->set_text ("Map: " . $map);
241 918
242 $self->load_map ($hash, $x, $y); 919 $self->load_map ($hash, $x, $y, $w, $h);
243 $self->flood_fill (0, 0, 0, "", $hash, $flags); 920 $self->flood_fill (0, 0, 0, "", $hash, $flags);
244} 921}
245 922
246sub face_find { 923sub face_find {
924 my ($self, $facenum, $face, $cb) = @_;
925
926 if ($face->{type} == 0) { # FT_FACE
927 my $id = DC::DB::get_tile_id_sync $face->{name};
928
929 $face->{id} = $id;
930 $self->{map}->set_tileid ($facenum => $id);
931
932 DC::DB::get tilecache => $id, $cb;
933
934 } elsif ($face->{type} & 1) { # with metadata
935 DC::DB::get res_meta => $face->{name}, $cb;
936
937 } else { # no metadata
938 DC::DB::get res_data => $face->{name}, $cb;
939 }
940}
941
942sub face_update {
943 my ($self, $facenum, $face, $changed) = @_;
944
945 if ($face->{type} == 0) {
946 # image, FT_FACE
947 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
948 if $changed;
949
950 $self->have_tile ($face->{id}, delete $face->{data});
951
952 } elsif ($face->{type} & 1) {
953 # split metadata case, FT_MUSIC, FT_SOUND
954 if ($changed) { # new data
955 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
956 $face->{data} = $meta;
957
958 # rely on strict ordering here and also on later fetch
959 DC::DB::put res_data => $face->{name} => $data, sub { };
960 DC::DB::put res_meta => $face->{name} => $meta, sub { };
961 }
962
963 $face->{data} = $self->{json_coder}->decode ($face->{data});
964 ::add_license ($face);
965 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
966 if $changed;
967
968 if ($face->{type} == 3) { # FT_MUSIC
969 &::audio_music_push ($facenum);
970 } elsif ($face->{type} == 5) { # FT_SOUND
971 &::audio_sound_push ($facenum);
972 }
973
974 } else {
975 # flat resource case, FT_RSRC
976 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
977 if $changed;
978 }
979
980 if (my $cbs = $self->{face_cb}{$facenum}) {
981 $_->($face, $changed) for @$cbs;
982 }
983}
984
985sub smooth_update {
247 my ($self, $facenum, $face) = @_; 986 my ($self, $facenum, $face) = @_;
248 987
249 my $hash = "$face->{chksum},$face->{name}"; 988 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
989}
250 990
251 my $id = $self->{facemap}->get ($hash); 991sub have_tile {
992 my ($self, $tile, $data) = @_;
252 993
253 unless ($id) { 994 return unless $self->{map};
254 # create new id for face
255 # I love transactions
256 for (1..100) {
257 my $txn = $CFClient::DB_ENV->txn_begin;
258 my $status = $self->{facemap}->db_get (id => $id, BerkeleyDB::DB_RMW);
259 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
260 $id = ($id || 16) + 1;
261 if ($self->{facemap}->put (id => $id) == 0
262 && $self->{facemap}->put ($hash => $id) == 0) {
263 $txn->txn_commit;
264 995
265 goto gotid; 996 my $tex = $self->{texture}[$tile] ||=
266 } 997 new DC::Texture
998 tile => $tile,
999 image => $data, delete_image => 1,
1000 minify => 1, mipmap => 1;
1001
1002 if (my $cbs = delete $self->{tile_cb}{$tile}) {
1003 $_->($tex) for @$cbs;
1004 }
1005}
1006
1007# call in non-void context registers a temporary
1008# hook with handle, otherwise its permanent
1009sub on_face_change {
1010 my ($self, $num, $cb) = @_;
1011
1012 push @{$self->{face_cb}{$num}}, $cb;
1013
1014 defined wantarray
1015 ? DC::guard {
1016 @{$self->{face_cb}{$num}}
1017 = grep $_ != $cb,
1018 @{$self->{face_cb}{$num}};
267 } 1019 }
268 $txn->abort; 1020 : ()
269 }
270
271 CFClient::fatal "maximum number of transaction retries reached - database problems?";
272 }
273
274gotid:
275 $face->{id} = $id;
276 $self->{map}->set_face ($facenum => $id);
277 $self->{faceid}[$facenum] = $id;#d#
278
279 my $face = $self->{tilecache}->get ($id);
280
281 if ($face) {
282 #$self->face_prefetch;
283 $face
284 } else {
285 my $tex = $self->{noface};
286 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
287 undef
288 };
289} 1021}
290 1022
291sub face_update { 1023# call in non-void context registers a temporary
1024# hook with handle, otherwise its permanent
1025sub register_face_handler {
292 my ($self, $facenum, $face) = @_; 1026 my ($self, $num, $cb) = @_;
293 1027
294 $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes 1028 return unless $num;
295 1029
296 $self->set_texture ($face->{id} => delete $face->{image}); 1030 # invoke if available right now
297} 1031 $cb->($self->{face}[$num], 0)
1032 unless exists $self->{face}[$num]{loading};
298 1033
299sub set_texture { 1034 # future changes
300 my ($self, $id, $data) = @_; 1035 $self->on_face_change ($num => $cb)
301
302 $self->{texture}[$id] ||= do {
303 my $tex =
304 new_from_image CFClient::Texture
305 $data, minify => 1, mipmap => 1;
306
307 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
308 $self->{map_widget}->update;
309
310 $tex
311 };
312} 1036}
313 1037
314sub sound_play { 1038sub sound_play {
315 my ($self, $x, $y, $soundnum, $type) = @_; 1039 my ($self, $type, $face, $dx, $dy, $vol) = @_;
316 1040
317 $self->{sound_play}->($x, $y, $soundnum, $type); 1041 &::audio_sound_play ($face, $dx, $dy, $vol)
1042 unless $type & 1; # odd types are silent for future expansion
318} 1043}
319 1044
320my $LAST_QUERY; # server is stupid, stupid, stupid 1045my $LAST_QUERY; # server is stupid, stupid, stupid
321 1046
322sub query { 1047sub query {
323 my ($self, $flags, $prompt) = @_; 1048 my ($self, $flags, $prompt) = @_;
324 1049
325 $prompt = $LAST_QUERY unless length $prompt; 1050 $prompt = $LAST_QUERY unless length $prompt;
326 $LAST_QUERY = $prompt; 1051 $LAST_QUERY = $prompt;
327 1052
328 my $dialog = new CFClient::UI::FancyFrame 1053 $self->{query}-> ($self, $flags, $prompt);
329 title => "Query", 1054}
330 child => my $vbox = new CFClient::UI::VBox;
331 1055
332 $vbox->add (new CFClient::UI::Label 1056sub sanitise_xml($) {
333 max_w => $::WIDTH * 0.4, 1057 local $_ = shift;
334 ellipsise => 0,
335 text => $prompt);
336 1058
337 if ($flags & CS_QUERY_YESNO) { 1059 # we now weed out all tags we do not support
338 $vbox->add (my $hbox = new CFClient::UI::HBox); 1060 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
339 $hbox->add (new CFClient::UI::Button 1061 }{
340 text => "No", 1062 "&lt;"
341 connect_activate => sub { 1063 }gex;
342 $self->send ("reply n");
343 $dialog->destroy;
344 $self->{map_widget}->focus_in;
345 }
346 );
347 $hbox->add (new CFClient::UI::Button
348 text => "Yes",
349 connect_activate => sub {
350 $self->send ("reply y");
351 $dialog->destroy;
352 },
353 );
354 1064
355 $dialog->focus_in; 1065 # now all entities
1066 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
356 1067
357 } elsif ($flags & CS_QUERY_SINGLECHAR) { 1068 # handle some elements
358 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 1069 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
359 $vbox->add (my $entry = new CFClient::UI::Entry 1070 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
360 connect_changed => sub {
361 $self->send ("reply $_[1]");
362 $dialog->destroy;
363 },
364 );
365 1071
366 $entry->focus_in; 1072 s/\s+$//;
367 1073
1074 $_
1075}
1076
1077our %NAME_TO_COLOR = (
1078 black => 0,
1079 white => 1,
1080 darkblue => 2,
1081 red => 3,
1082 orange => 4,
1083 lightblue => 5,
1084 darkorange => 6,
1085 green => 7,
1086 darkgreen => 8,
1087 grey => 9,
1088 brown => 10,
1089 yellow => 11,
1090 tan => 12,
1091);
1092
1093our @CF_COLOR = (
1094 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
1095 [1.00, 1.00, 1.00],
1096 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
1097 [1.00, 0.00, 0.00],
1098 [1.00, 0.54, 0.00],
1099 [0.11, 0.56, 1.00],
1100 [0.93, 0.46, 0.00],
1101 [0.18, 0.54, 0.34],
1102 [0.56, 0.73, 0.56],
1103 [0.80, 0.80, 0.80],
1104 [0.75, 0.61, 0.20],
1105 [0.99, 0.77, 0.26],
1106 [0.74, 0.65, 0.41],
1107);
1108
1109sub msg {
1110 my ($self, $color, $type, $text, @extra) = @_;
1111
1112 $text = sanitise_xml $text;
1113
1114 if (my $cb = $self->{cb_msg}{$type}) {
1115 $_->($self, $color, $type, $text, @extra) for values %$cb;
1116 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1117 $type =~ s/-/_/g;
1118 $self->{$type} = $text;
368 } else { 1119 } else {
369 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 1120 $self->logprint ("msg: ", $text);
1121 return if $color < 0; # negative color == ignore if not understood
370 1122
371 $vbox->add (my $entry = new CFClient::UI::Entry 1123 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
372 $flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (), 1124
373 connect_activate => sub { 1125 ## try to create single paragraphs of multiple lines sent by the server
374 $self->send ("reply $_[1]"); 1126 # no longer neecssary with TRT servers
375 $dialog->destroy; 1127 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
376 }, 1128
1129 ::message ({
1130 fg => $fg,
1131 markup => $text,
1132 type => $type,
1133 extra => [@extra],
1134 color_flags => $color, #d# ugly, kill
377 ); 1135 });
378 1136
379 $entry->focus_in; 1137# $color &= ~NDI_CLEAR; # only clear once for multiline messages
380 } 1138# # actually, this is an ugly design. _we_ should control the channels,
1139# # not some random other widget, as the channels are clearly protocol-specific.
1140# # then we could also react to flags such as CLEAR without resorting to
1141# # hacks such as color_flags, above.
381 1142
382 $dialog->show_centered;
383}
384
385sub drawinfo {
386 my ($self, $color, $text) = @_;
387
388 my @color = (
389 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
390 [1.00, 1.00, 1.00],
391 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
392 [1.00, 0.00, 0.00],
393 [1.00, 0.54, 0.00],
394 [0.11, 0.56, 1.00],
395 [0.93, 0.46, 0.00],
396 [0.18, 0.54, 0.34],
397 [0.56, 0.73, 0.56],
398 [0.80, 0.80, 0.80],
399 [0.55, 0.41, 0.13],
400 [0.99, 0.77, 0.26],
401 [0.74, 0.65, 0.41],
402 );
403
404 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
405
406 $text = CFClient::UI::Label::escape $text;
407 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
408 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
409
410 $self->{logview}->add_paragraph ($color[$color],
411 join "\n", map "$time $_", split /\n/, $text);
412
413 $self->{statusbox}->add ($text, 1143 $self->{statusbox}->add ($text,
414 group => $text, 1144 group => $text,
415 fg => $color[$color], 1145 fg => $fg,
416 timeout => 10, 1146 timeout => $color >= 2 ? 180 : 10,
417 tooltip_font => $::FONT_FIXED, 1147 tooltip_font => $::FONT_FIXED,
418 ); 1148 ) if $type eq "info";
419} 1149 }
420
421sub drawextinfo {
422 my ($self, $color, $type, $subtype, $message) = @_;
423
424 $self->drawinfo ($color, $message);
425} 1150}
426 1151
427sub spell_add { 1152sub spell_add {
428 my ($self, $spell) = @_; 1153 my ($self, $spell) = @_;
429 1154
430 # TODO 1155 # try to create single paragraphs out of the multiple lines sent by the server
431 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1156 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
1157 $spell->{message} =~ s/\n+$//;
1158 $spell->{message} ||= "Server did not provide a description for this spell.";
1159
1160 $::SPELL_LIST->add_spell ($spell);
1161
432 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 1162 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
433 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 1163 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
434} 1164}
435 1165
436sub spell_delete { 1166sub spell_delete {
437 my ($self, $spell) = @_; 1167 my ($self, $spell) = @_;
1168
1169 $::SPELL_LIST->remove_spell ($spell);
1170}
1171
1172sub setup {
1173 my ($self, $setup) = @_;
1174
1175 $self->{map_widget}->set_tilesize ($self->{tilesize});
1176 $::MAP->resize ($self->{mapw}, $self->{maph});
438} 1177}
439 1178
440sub addme_success { 1179sub addme_success {
441 my ($self) = @_; 1180 my ($self) = @_;
442 1181
443 $self->send ("command output-sync $::CFG->{output_sync}");
444 $self->send ("command output-count $::CFG->{output_count}");
445
446 my $parser = new Pod::POM;
447 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
448
449 my %skill_tooltip; 1182 my %skill_help;
450 1183
451 for my $head2 ($pod->head1->[-2]->head2) { 1184 for my $node (DC::Pod::find skill_description => "*") {
452 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content; 1185 my (undef, @par) = DC::Pod::section_of $node;
1186 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
453 } 1187 };
454 1188
455 for my $skill (values %{$self->{skill_info}}) { 1189 for my $skill (values %{$self->{skill_info}}) {
456 $self->{map_widget}->add_command ("ready_skill $skill", 1190 $self->{map_widget}->add_command ("ready_skill $skill",
457 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 1191 (DC::asxml "Ready the skill '$skill'\n\n")
458 . $skill_tooltip{$skill}); 1192 . $skill_help{$skill});
459 $self->{map_widget}->add_command ("use_skill $skill", 1193 $self->{map_widget}->add_command ("use_skill $skill",
460 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 1194 (DC::asxml "Immediately use the skill '$skill'\n\n")
461 . $skill_tooltip{$skill}); 1195 . $skill_help{$skill});
462 } 1196 }
463} 1197}
464 1198
465sub eof { 1199sub eof {
466 my ($self) = @_; 1200 my ($self) = @_;
… …
468 $self->{map_widget}->clr_commands; 1202 $self->{map_widget}->clr_commands;
469 1203
470 ::stop_game (); 1204 ::stop_game ();
471} 1205}
472 1206
473sub image_info {
474 my ($self, $numfaces) = @_;
475
476 $self->{num_faces} = $numfaces;
477 $self->{face_prefetch} = [1 .. $numfaces];
478 $self->face_prefetch;
479}
480
481sub face_prefetch {
482 my ($self) = @_;
483
484 return unless $::CFG->{face_prefetch};
485
486 if ($self->{num_faces}) {
487 return if @{ $self->{send_queue} || [] };
488 my $todo = @{ $self->{face_prefetch} }
489 or return;
490
491 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
492
493 $self->send ("requestinfo image_sums $face $face");
494
495 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
496 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
497 } elsif (!exists $self->{num_faces}) {
498 $self->send ("requestinfo image_info");
499
500 $self->{num_faces} = 0;
501
502 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
503 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
504 }
505}
506
507sub update_floorbox { 1207sub update_floorbox {
508 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1208 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
509 return unless $::CONN; 1209 return unless $::CONN;
510 1210
511 $::FLOORBOX->clear; 1211 $::FLOORBOX->clear;
512 1212
1213 my @add;
1214
513 my $row; 1215 my $row;
514 for (@{ $::CONN->{container}{0} }) { 1216 for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1217 next if $_->{tag} & 0x80000000;
515 if ($row < 7) { 1218 if ($row < 6) {
516 local $_->{face_widget}; # hack to force recreation of widget 1219 local $_->{face_widget}; # hack to force recreation of widget
517 local $_->{desc_widget}; # hack to force recreation of widget 1220 local $_->{desc_widget}; # hack to force recreation of widget
518 CFClient::Item::update_widgets $_; 1221 DC::Item::update_widgets $_;
519 1222
1223 push @add,
520 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1224 0, $row, $_->{face_widget},
521 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1225 1, $row, $_->{desc_widget};
522 1226
523 $row++; 1227 $row++;
524 } else { 1228 } else {
525 $::FLOORBOX->add (1, $row, new CFClient::UI::Label text => "More..."); 1229 push @add, 1, $row, new DC::UI::Button
1230 text => "More...",
1231 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1232 ;
526 last; 1233 last;
527 } 1234 }
528 } 1235 }
1236 if ($::CONN->{open_container}) {
1237 push @add, 1, $row++, new DC::UI::Button
1238 text => "Close container",
1239 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1240 ;
1241 }
1242
1243 $::FLOORBOX->add_at (@add);
529 }); 1244 });
530 1245
531 $::WANT_REFRESH++; 1246 $::WANT_REFRESH = 1;
532} 1247}
533 1248
534sub set_opencont { 1249sub set_opencont {
535 my ($conn, $tag, $name) = @_; 1250 my ($conn, $tag, $name) = @_;
536 $conn->{open_container} = $tag; 1251 $conn->{open_container} = $tag;
537 $::INVR_LBL->set_text ($name); 1252 update_floorbox;
1253
1254 $::INVR_HB->clear;
1255 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1256
1257 if ($tag != 0) { # Floor isn't closable, is it?
1258 $::INVR_HB->add (new DC::UI::Button
1259 text => "Close container",
1260 tooltip => "Close the currently open container (if one is open)",
1261 on_activate => sub {
1262 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1263 if $tag != 0;
1264 0
1265 },
1266 );
1267 }
1268
538 $::INVR->set_items ($conn->{container}{$tag}); 1269 $::INVR->set_items ($conn->{container}{$tag});
539} 1270}
540 1271
541sub update_container { 1272sub update_containers {
542 my ($tag) = @_; 1273 my ($self) = @_;
543 1274
544 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 1275 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1276 my $todo = delete $self->{update_container}
1277 or return;
1278
1279 for my $tag (keys %$todo) {
1280 update_floorbox if $tag == 0 or $tag == $self->{open_container};
1281 if ($tag == 0) {
1282 $::INVR->set_items ($self->{container}{0})
545 if $tag == $::CONN->{open_container}; 1283 if $tag == $self->{open_container};
1284 } elsif ($tag == $self->{player}{tag}) {
1285 $::INV->set_items ($self->{container}{$tag})
1286 } else {
1287 $::INVR->set_items ($self->{container}{$tag})
1288 if $tag == $self->{open_container};
1289 }
1290 }
1291 });
546} 1292}
547 1293
548sub container_add { 1294sub container_add {
549 my ($self, $tag, $items) = @_; 1295 my ($self, $tag, $items) = @_;
550 1296
551 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 1297 $self->{update_container}{$tag}++;
552 1298 $self->update_containers;
553 if ($tag == 0) {
554 update_floorbox;
555 update_container (0);
556 } elsif ($tag == $self->{player}{tag}) {
557 $::INV->set_items ($self->{container}{$self->{player}{tag}})
558 } else {
559 update_container ($tag);
560 }
561
562 # $self-<{player}{tag} => player inv
563 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
564} 1299}
565 1300
566sub container_clear { 1301sub container_clear {
567 my ($self, $tag) = @_; 1302 my ($self, $tag) = @_;
568 1303
569 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 1304 $self->{update_container}{$tag}++;
570 1305 $self->update_containers;
571 if ($tag == 0) {
572 update_floorbox;
573 update_container (0);
574 } elsif ($tag == $self->{player}{tag}) {
575 $::INV->set_items ($self->{container}{$tag})
576 }
577
578# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
579} 1306}
580 1307
581sub item_delete { 1308sub item_delete {
582 my ($self, @items) = @_; 1309 my ($self, @items) = @_;
583 1310
1311 $self->{update_container}{$_->{container}}++
584 for (@items) { 1312 for @items;
585 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
586
587 if ($_->{container} == 0) {
588 update_floorbox;
589 update_container ($_->{tag});
590 } elsif ($_->{container} == $self->{player}{tag}) {
591 $::INV->set_items ($self->{container}{$self->{player}{tag}})
592 } else {
593 update_container ($_->{tag});
594 }
595 } 1313
1314 $self->update_containers;
596} 1315}
597 1316
598sub item_update { 1317sub item_update {
599 my ($self, $item) = @_; 1318 my ($self, $item) = @_;
600 1319
601 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1320 #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
602 1321
603 if ($item->{tag} == $self->{player}{tag}) {
604 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
605 return;
606 }
607
608 CFClient::Item::update_widgets $item; 1322 DC::Item::update_widgets $item;
609 1323
610 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1324 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
611 set_opencont ($::CONN, 0, "Floor"); 1325 set_opencont ($::CONN, 0, "Floor");
612 1326
613 } elsif ($item->{flags} & F_OPEN) { 1327 } elsif ($item->{flags} & F_OPEN) {
614 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1328 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1329
615 } else { 1330 } else {
616 if ($item->{container} == 0) { 1331 $self->{update_container}{$item->{container}}++;
617 update_floorbox;
618 update_container (0); 1332 $self->update_containers;
619 } elsif ($item->{container} == $self->{player}{tag}) {
620 $::INV->set_items ($self->{container}{$item->{container}})
621 }
622 } 1333 }
623} 1334}
624 1335
625sub player_update { 1336sub player_update {
626 my ($self, $player) = @_; 1337 my ($self, $player) = @_;
1338
1339 $self->update_weight;
1340}
1341
1342sub update_weight {
1343 my ($self) = @_;
1344
1345 my $weight = .001 * $self->{player}{weight};
1346 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1347
627 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 1348 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1349 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1350 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
628} 1351}
629 1352
6301; 1353sub update_server_info {
1354 my ($self) = @_;
1355
1356 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
1357
1358 $::SERVER_INFO->set_markup (
1359 "server <tt>$self->{host}:$self->{port}</tt>\n"
1360 . "protocol version <tt>$self->{version}</tt>\n"
1361 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
1362 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1363 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1364 . "editing support $yesno[!!$self->{editor_support}]\n"
1365 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1366 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1367 . "client support $yesno[$self->{cfplus_ext} > 0]"
1368 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1369 . "map size $self->{mapw}×$self->{maph}\n"
1370 );
1371
1372}
1373
1374sub logged_in {
1375 my ($self) = @_;
1376
1377 $self->send_ext_req (cfplus_support => version => 2, sub {
1378 my (%msg) = @_;
1379
1380 $self->{cfplus_ext} = $msg{version};
1381 $self->update_server_info;
1382
1383 if ($self->{cfplus_ext} >= 2) {
1384 $self->send_ext_req ("editor_support", sub {
1385 $self->{editor_support} = { @_ };
1386 $self->update_server_info;
1387
1388 0
1389 });
1390 }
1391
1392 0
1393 });
1394
1395 $self->update_server_info;
1396
1397 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1398 $self->send_command ("pickup $::CFG->{pickup}");
1399
1400 $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]",
1401 DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d#
1402}
1403
1404sub lookat {
1405 my ($self, $x, $y) = @_;
1406
1407 if ($self->{cfplus_ext}) {
1408 $self->send_ext_req (lookat => $x, $y, sub {
1409 my (%msg) = @_;
1410
1411 if (exists $msg{npc_dialog}) {
1412 # start npc chat dialog
1413 $self->{npc_dialog} = new DC::NPCDialog::
1414 token => $msg{npc_dialog},
1415 title => "$msg{npc_dialog}[0] (NPC)",
1416 conn => $self,
1417 ;
1418 }
1419 });
1420 }
1421
1422 $self->send ("lookat $x $y");
1423}
1424
1425sub destroy {
1426 my ($self) = @_;
1427
1428 (delete $self->{npc_dialog})->destroy
1429 if $self->{npc_dialog};
1430
1431 $self->SUPER::destroy;
1432
1433 %$self = ();
1434}
1435
1436package DC::NPCDialog;
1437
1438our @ISA = 'DC::UI::Toplevel';
1439
1440sub new {
1441 my $class = shift;
1442
1443 my $self = $class->SUPER::new (
1444 x => 'center',
1445 y => 'center',
1446 name => "npc_dialog",
1447 force_w => $::WIDTH * 0.7,
1448 force_h => $::HEIGHT * 0.7,
1449 title => "NPC Dialog",
1450 kw => { hi => 0, yes => 0, no => 0 },
1451 has_close_button => 1,
1452 @_,
1453 );
1454
1455 DC::weaken (my $this = $self);
1456
1457 $self->connect (delete => sub { $this->destroy; 1 });
1458
1459 # better use a pane...
1460 $self->add (my $hbox = new DC::UI::HBox);
1461 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1462
1463 $hbox->add (my $vbox = new DC::UI::VBox);
1464
1465 $vbox->add (new DC::UI::Label text => "Message Entry:");
1466 $vbox->add ($self->{entry} = new DC::UI::Entry
1467 tooltip => "#npc_message_entry",
1468 on_activate => sub {
1469 my ($entry, $text) = @_;
1470
1471 return unless $text =~ /\S/;
1472
1473 $entry->set_text ("");
1474 $this->send ($text);
1475
1476 0
1477 },
1478 );
1479
1480 $vbox->add ($self->{options} = new DC::UI::VBox);
1481
1482 $self->{bye_button} = new DC::UI::Button
1483 text => "Bye (close)",
1484 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1485 on_activate => sub { $this->destroy; 1 },
1486 ;
1487
1488 $self->update_options;
1489
1490 $self->{id} = "npc-channel-" . $self->{conn}->token;
1491 $self->{conn}->connect_ext ($self->{id} => sub {
1492 $this->feed (@_) if $this;
1493 });
1494
1495 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1496
1497 $self->{entry}->grab_focus;
1498
1499 $self->{textview}->add_paragraph ({
1500 fg => [1, 1, 0, 1],
1501 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1502 });
1503
1504 $self->show;
1505 $self
1506};
1507
1508sub update_options {
1509 my ($self) = @_;
1510
1511 DC::weaken $self;
1512
1513 $self->{options}->clear;
1514 $self->{options}->add ($self->{bye_button});
1515
1516 for my $kw (sort keys %{ $self->{kw} }) {
1517 $self->{options}->add (new DC::UI::Button
1518 text => $kw,
1519 on_activate => sub {
1520 $self->send ($kw);
1521 0
1522 },
1523 );
1524 }
1525}
1526
1527sub feed {
1528 my ($self, $type, @arg) = @_;
1529
1530 DC::weaken $self;
1531
1532 if ($type eq "update") {
1533 my (%info) = @arg;
1534
1535 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1536 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1537
1538 if (exists $info{msg}) {
1539 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1540 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1541 my @link;
1542 $text =~ s{
1543 ($match)
1544 }{
1545 my $kw = $1;
1546
1547 push @link, new DC::UI::Label
1548 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1549 can_hover => 1,
1550 can_events => 1,
1551 padding_x => 0,
1552 padding_y => 0,
1553 on_button_up => sub {
1554 $self->send ($kw);
1555 };
1556
1557 "\x{fffc}"
1558 }giex;
1559
1560 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1561 $self->{textview}->scroll_to_bottom;
1562 }
1563
1564 $self->update_options;
1565 } else {
1566 $self->destroy;
1567 }
1568
1569 1
1570}
1571
1572sub send {
1573 my ($self, $msg) = @_;
1574
1575 $self->{textview}->add_paragraph ({
1576 markup =>
1577 "\n<span foreground='#ffff00'><b>"
1578 . (DC::asxml $msg)
1579 . "</b></span>"
1580 });
1581 $self->{textview}->scroll_to_bottom;
1582
1583 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1584}
1585
1586sub destroy {
1587 my ($self) = @_;
1588
1589 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1590
1591 if ($self->{conn}) {
1592 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1593 delete $self->{conn}{npc_dialog};
1594 $self->{conn}->disconnect_ext ($self->{id});
1595 }
1596
1597 $self->SUPER::destroy;
1598}
1599
16001
1601

Diff Legend

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