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.57 by root, Tue Jul 11 15:30:23 2006 UTC vs.
Revision 1.228 by root, Wed Nov 21 13:23:10 2012 UTC

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

Diff Legend

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