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.30 by root, Sun Jun 11 18:41:30 2006 UTC vs.
Revision 1.117 by root, Fri Jul 13 05:31:31 2007 UTC

1package CFClient::Protocol; 1package CFPlus::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFClient; 8use CFPlus;
9use CFPlus::DB;
9use CFClient::UI; 10use CFPlus::UI;
11use CFPlus::Pod;
12use CFPlus::Macro;
13use CFPlus::Item;
14
15use Crossfire::Protocol::Base 0.95;
10 16
11use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
12 18
13sub new { 19sub new {
14 my $class = shift; 20 my ($class, %arg) = @_;
15 21
16 my $self = $class->SUPER::new (@_); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 ywidget => 1,
27 %{$arg{setup_req} || {}},
28 },
29 );
17 30
18 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
19 32
20 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 33 my @cmd_help = map {
21 my ($pom) = @_;
22
23 my @cmd_help;
24
25 for my $head2 ($pom->head1->[-2]->head2) {
26 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
27 or next; 35 or die "unparseable command help: $_->{kw}[0]";
28 36
29 my $cmd = $1; 37 my $cmd = $1;
30 my @args = split /\|/, $2; 38 my @args = split /\|/, $2;
31 @args = (".*") unless @args; 39 @args = (".*") unless @args;
32 40
41 my (undef, @par) = CFPlus::Pod::section_of $_;
42 my $text = CFPlus::Pod::as_label @par;
43
33 $_ = $_ eq ".*" ? "" : " $_" 44 $_ = $_ eq ".*" ? "" : " $_"
34 for @args; 45 for @args;
35 46
36 my $text = CFClient::pod_to_pango $head2->content; 47 map ["$cmd$_", $text],
37
38 push @cmd_help, ["$cmd$_", $text]
39 for sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
49 @args
50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*";
52
53 $self->connect_ext (event_music => sub {
54 my ($ev) = @_;
55
56 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev->{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 if (my $faces = $ev->{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta) = @_;
73
74 if (defined $meta) {
75 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
76 } else {
77 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
78 $self->ask_face ($face, -100 - $pri, undef, sub {
79 my $len = length $_[1];
80 my ($meta, $data) = unpack "(w/a*)*", $_[1];
81
82 CFPlus::DB::write_file $chksum, $data, sub { };
83 CFPlus::DB::put "res-metadata" => $chksum => $meta, sub { };
84
85 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
86 ::message ({ markup => "downloaded song #$face, size $len octets" });
87
88 &::audio_music_set ($self->{songs});
40 @args; 89 });
90 }
91 }
92 }
93 }
94
95 if (my $play = $ev->{play}) {
96 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
97 }
98 });
99
100 $self->connect_ext (event_capabilities => sub {
101 my ($cap) = @_;
102
103 if (my $ts = $cap->{tileset}) {
104 if (my ($default) = grep $_->[2] & 1, @$ts) {
105 $self->{tileset} = $default;
106 $self->{tilesize} = $default->[3];
107 $self->setup_req (tileset => $default->[0]);
108
109 my $w = int $self->{mapw} * 32 / $self->{tilesize};
110 my $h = int $self->{maph} * 32 / $self->{tilesize};
111
112 $self->setup_req (mapsize => "${w}x${h}");
113 }
114 }
115 });
116
117 $self->{json_coder}
118 ->convert_blessed
119 ->filter_json_single_key_object (__widget_ref__ => sub {
120 $self->{widget}{$_[0]}
121 });
122
123 $self->connect_ext (ws_n => sub {
124 my ($arg) = @_;
125
126 $self->{widgetset}{$arg{id}} = {
127 w => {},
41 } 128 };
129 });
42 130
131 $self->connect_ext (ws_d => sub {
132 my ($arg) = @_;
133
134 my $ws = delete $self->{widgetset}{$arg{id}}
135 or return;
136
137 $_->destroy
138 for values %{$ws->{w}};
139 });
140
141 $self->connect_ext (ws_c => sub {
142 my ($arg) = @_;
143
144 my $args = $arg->{args} || {};
145
146 for my $ev (grep /^on_/, keys %$args) {
147 $args->{$ev} = sub {
148 my $id = shift->{s_id};
149 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
150
151 1
152 };
153 }
154
155 if (my $widget = eval {
156 local $SIG{__DIE__};
157 "CFPlus::UI::$arg->{class}"->new (
158 %$args,
159 s_ws => $arg->{ws},
160 s_id => $arg->{id},
161 )
162 }
163 ) {
164 $self->{widget}{$arg->{id}}
165 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
166 = $widget;
167
168 $widget->connect (on_destroy => sub {
169 my ($widget) = @_;
170
171 delete $self->{widget}{$widget->{s_id}};
172 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
173 });
174 } else {
175 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
176 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
177 }
178 });
179
180 $self->connect_ext (w_c => sub {
181 my ($arg) = @_;
182
183 my $w = $self->{widget}{$arg->{id}}
184 or return;
185 my $m = $arg->{name};
186
187 my $a = $arg->{args} || [];
188
189 if (exists $arg->{rid}) {
190 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
191 } else {
192 $w->$m (@$a);
193 }
194 });
195
196 $self->connect_ext (w_s => sub {
197 my ($arg) = @_;
198
199 my $w = $self->{widget}{$arg->{id}}
200 or return;
201
202 $w->{$arg->{name}} = $arg->{value};
203 });
204
205 $self->connect_ext (w_g => sub {
206 my ($arg) = @_;
207
208 my $w = $self->{widget}{$arg->{id}}
209 or return;
210
211 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
212 });
213
214 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
215 for my $ws (values %{delete $self->{widgetset} || {}}) {
216 $_->destroy
217 for values %{delete $ws->{w} || {}};
218 }
219 });
220
221 $self->{map_widget}->add_command (@$_)
43 \@cmd_help 222 for @cmd_help;
223
224 {
225 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
226 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
227 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
228 }
229
230 {
231 $self->{noface} = my $tex = new_from_file CFPlus::Texture
232 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
233 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
234 }
235
236 $self->{open_container} = 0;
237
238 # per server
239 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
240
241 $self
242}
243
244sub logprint {
245 my ($self, @a) = @_;
246
247 $self->{log_fh} ||= do {
248 my $path = "$Crossfire::VARDIR/log.$self->{host}";
249
250 open my $fh, ">>:utf8", $path
251 or die "Couldn't open logfile $path: $!";
252
253 $fh->autoflush (1);
254
255 $fh;
44 }; 256 };
45 257
46 $self->{map_widget}->add_command (@$_) 258 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
47 for @$cmd_help;
48 259
49 $self->{noface} = new_from_file CFClient::Texture 260 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
50 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 261 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
51 262
52 $self->{open_container} = 0; 263 print {$self->{log_fh}} "$ts ", @a, "\n";
53
54 # "global"
55 $self->{tilecache} = CFClient::db_table "tilecache";
56 $self->{facemap} = CFClient::db_table "facemap";
57
58 # per server
59 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";
60
61 $self
62} 264}
265
266sub _stat_numdiff {
267 my ($self, $name, $old, $new) = @_;
268
269 my $diff = $new - $old;
270
271 $diff = 0.01 * int $diff * 100;
272
273 0.1 >= abs $diff ? ()
274 : $diff < 0 ? "$name$diff" : "$name+$diff"
275}
276
277sub _stat_skillmaskdiff {
278 my ($self, $name, $old, $new) = @_;
279
280 my $diff = $old ^ $new
281 or return;
282
283 my @diff = map
284 {
285 $diff & $_
286 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
287 : ()
288 }
289 sort { $a <=> $b } keys %{$self->{spell_paths}};
290
291 join "", @diff
292}
293
294# all stats that are chacked against changes
295my @statchange = (
296 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
297 [&CS_STAT_INT => \&_stat_numdiff, "Int"],
298 [&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
299 [&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
300 [&CS_STAT_CON => \&_stat_numdiff, "Con"],
301 [&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
302 [&CS_STAT_POW => \&_stat_numdiff, "Pow"],
303 [&CS_STAT_WC => \&_stat_numdiff, "Wc"],
304 [&CS_STAT_AC => \&_stat_numdiff, "Ac"],
305 [&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
306 [&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
307 [&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
308 [&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
309 [&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
310 [&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
311 [&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
312 [&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
313 [&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
314 [&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
315 [&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
316 [&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
317 [&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
318 [&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
319 [&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
320 [&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
321 [&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
322 [&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
323 [&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
324 [&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
325 [&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
326 [&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
327 [&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
328 [&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
329 [&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
330 [&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
331 [&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
332 [&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
333);
63 334
64sub stats_update { 335sub stats_update {
65 my ($self, $stats) = @_; 336 my ($self, $stats) = @_;
66 337
67 if (my $exp = $stats->{+CS_STAT_EXP64}) { 338 my $prev = $self->{prev_stats} || { };
68 my $diff = $exp - $self->{prev_exp}; 339
340 if (my @diffs =
341 (
342 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
343 map {
344 $stats->{$_} && $prev->{$_}
345 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
346 } sort { $a <=> $b } keys %{$self->{skill_info}}
347 )
348 ) {
349 my $msg = join " ", @diffs;
69 $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5) 350 $self->{statusbox}->add ($msg, group => "experience $msg", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
70 if exists $self->{prev_exp} && $diff;
71 $self->{prev_exp} = $exp;
72 } 351 }
73 352
353 if (
354 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
355 ) {
356 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
357 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
358 }
359
74 ::update_stats_window ($stats); 360 $self->update_stats_window ($stats, $prev);
361
362 $self->{prev_stats} = { %$stats };
363}
364
365my %RES_TBL = (
366 phys => CS_STAT_RES_PHYS,
367 magic => CS_STAT_RES_MAG,
368 fire => CS_STAT_RES_FIRE,
369 elec => CS_STAT_RES_ELEC,
370 cold => CS_STAT_RES_COLD,
371 conf => CS_STAT_RES_CONF,
372 acid => CS_STAT_RES_ACID,
373 drain => CS_STAT_RES_DRAIN,
374 ghit => CS_STAT_RES_GHOSTHIT,
375 pois => CS_STAT_RES_POISON,
376 slow => CS_STAT_RES_SLOW,
377 para => CS_STAT_RES_PARA,
378 tund => CS_STAT_TURN_UNDEAD,
379 fear => CS_STAT_RES_FEAR,
380 depl => CS_STAT_RES_DEPLETE,
381 deat => CS_STAT_RES_DEATH,
382 holyw => CS_STAT_RES_HOLYWORD,
383 blind => CS_STAT_RES_BLIND,
384);
385
386sub update_stats_window {
387 my ($self, $stats, $prev) = @_;
388
389 # I love text protocols...
390
391 my $hp = $stats->{+CS_STAT_HP} * 1;
392 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
393 my $sp = $stats->{+CS_STAT_SP} * 1;
394 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
395 my $fo = $stats->{+CS_STAT_FOOD} * 1;
396 my $fo_m = 999;
397 my $gr = $stats->{+CS_STAT_GRACE} * 1;
398 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
399
400 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
401 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
402 $::GAUGES->{food} ->set_value ($fo, $fo_m);
403 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
404 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
405 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
406 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
407 my $title = $stats->{+CS_STAT_TITLE};
408 $title =~ s/^Player: //;
409 $::STATWIDS->{title} ->set_text ("Title: " . $title);
410
411 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
412 $::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
413 $::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
414 $::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
415 $::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
416 $::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
417 $::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
418 $::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
419 $::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
420 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
421 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
422 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
423 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
424
425 $self->update_weight;
426
427 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
428 for keys %RES_TBL;
429
430 my $sktbl = $::STATWIDS->{skill_tbl};
431 my @skills = keys %{ $self->{skill_info} };
432
433 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
434 $sktbl->clear;
435
436 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
437 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
438 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
439 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
440 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
441 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
442
443 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
444
445 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
446 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
447
448 my ($x, $y) = (0, 1);
449 for (
450 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
451 map [$_, $self->{skill_info}{$_}],
452 grep exists $stats->{$_},
453 @skills
454 ) {
455 my ($idx, $name) = @$_;
456
457 my $spell_cb = sub {
458 my ($widget, $ev) = @_;
459
460 if ($ev->{button} == 1) {
461 $::CONN->user_send ("ready_skill $name");
462 } elsif ($ev->{button} == 2) {
463 $::CONN->user_send ("use_skill $name");
464 } elsif ($ev->{button} == 3) {
465 my $shortname = CFPlus::shorten $name, 14;
466 (new CFPlus::UI::Menu
467 items => [
468 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
469 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
470 ],
471 )->popup ($ev);
472 } else {
473 return 0;
474 }
475
476 1
477 };
478
479 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
480 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
481 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
482 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
483 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
484 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
485
486 $x++ and ($x, $y) = (0, $y + 1);
487 }
488 }
489
490 for (grep exists $stats->{$_}, @skills) {
491 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
492 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
493 }
494}
495
496sub macro_send {
497 my ($self, $macro) = @_;
498
499 for my $cmd (@{ $macro->{action} }) {
500 $self->send_command ($cmd);
501 }
75} 502}
76 503
77sub user_send { 504sub user_send {
78 my ($self, $command) = @_; 505 my ($self, $command) = @_;
79 506
507 $self->{record}->($command)
80 if ($self->{record}) { 508 if $self->{record};
81 push @{$self->{record}}, $command;
82 }
83 509
510 $self->logprint ("send: ", $command);
84 $self->send_command ($command); 511 $self->send_command ($command);
85 ::status $command; 512 ::status ($command);
86} 513}
87 514
88sub start_record { 515sub record {
89 my ($self) = @_; 516 my ($self, $cb) = @_;
90 517
91 $self->{record} = []; 518 $self->{record} = $cb;
92}
93
94sub stop_record {
95 my ($self) = @_;
96 return delete $self->{record};
97} 519}
98 520
99sub map_scroll { 521sub map_scroll {
100 my ($self, $dx, $dy) = @_; 522 my ($self, $dx, $dy) = @_;
101 523
… …
103} 525}
104 526
105sub feed_map1a { 527sub feed_map1a {
106 my ($self, $data) = @_; 528 my ($self, $data) = @_;
107 529
108 $self->{map}->map1a_update ($data); 530 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
109 $self->{map_widget}->update; 531 $self->{map_widget}->update;
532}
533
534sub magicmap {
535 my ($self, $w, $h, $x, $y, $data) = @_;
536
537 $self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data);
110} 538}
111 539
112sub flush_map { 540sub flush_map {
113 my ($self) = @_; 541 my ($self) = @_;
114 542
… …
116 or return; 544 or return;
117 545
118 my ($hash, $x, $y, $w, $h) = @$map_info; 546 my ($hash, $x, $y, $w, $h) = @$map_info;
119 547
120 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 548 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
121 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 549 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
122 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 550 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
123} 551}
124 552
125sub map_clear { 553sub map_clear {
126 my ($self) = @_; 554 my ($self) = @_;
127 555
128 $self->flush_map; 556 $self->flush_map;
129 delete $self->{neigh_map}; 557 delete $self->{neigh_map};
130 558
131 $self->{map}->clear; 559 $self->{map}->clear;
560 delete $self->{map_widget}{magicmap};
132} 561}
133 562
563sub bg_fetch {
564 my ($self) = @_;
565
566 my $id;
567
568 do {
569 $id = pop @{$self->{bg_fetch}}
570 or return;
571 } while $self->{texture}[$id];
572
573 CFPlus::DB::get tilecache => $id, sub {
574 my ($data) = @_;
575
576 return unless $self->{map}; # stop when destroyed
577
578 $self->set_texture ($id => $data)
579 if defined $data;
580
581 $self->bg_fetch;
582 };
583}
134 584
135sub load_map($$$) { 585sub load_map($$$) {
136 my ($self, $hash, $x, $y) = @_; 586 my ($self, $hash, $x, $y) = @_;
137 587
138 if (defined (my $data = $self->{mapcache}->get ($hash))) { 588 my $gen = $self->{map_change_gen};
589
590 CFPlus::DB::get $self->{mapcache} => $hash, sub {
591 return unless $gen == $self->{map_change_gen};
592
593 my ($data) = @_;
594
595 if (defined $data) {
139 $data = Compress::LZF::decompress $data; 596 $data = Compress::LZF::decompress $data;
140 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 597 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
141 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
142 my $data = $self->{tilecache}->get ($id)
143 or next;
144 598
145 $self->set_texture ($id => $data); 599 my $inprogress = @{ $self->{bg_fetch} || [] };
600 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
601 $self->bg_fetch unless $inprogress;
146 } 602 }
147 } 603 };
148} 604}
149 605
150# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 606# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
151# (server resource,s latency, bandwidth), so this hack is warranted. 607# (server resource,s latency, bandwidth), so this hack is warranted.
152# the right fix is to make real tiled maps with an overview file 608# the right fix is to make real tiled maps with an overview file
… …
216 672
217 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 673 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
218 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 674 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
219 675
220 } else { 676 } else {
677 my $gen = $self->{map_change_gen};
221 $self->send_mapinfo ("spatial $path$tile", sub { 678 $self->send_mapinfo ("spatial $path$tile", sub {
679 return unless $gen == $self->{map_change_gen};
680
222 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 681 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
223 682
224 return if $mode ne "spatial"; 683 return if $mode ne "spatial";
225 684
226 $x += $self->{map}->ox; 685 $x += $self->{map}->ox;
… …
240 699
241sub map_change { 700sub map_change {
242 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 701 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
243 702
244 $self->flush_map; 703 $self->flush_map;
704
705 ++$self->{map_change_gen};
245 706
246 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 707 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
247 708
248 my $mapmapw = $self->{mapmap}->{w}; 709 my $mapmapw = $self->{mapmap}->{w};
249 my $mapmaph = $self->{mapmap}->{h}; 710 my $mapmaph = $self->{mapmap}->{h};
… …
266 $self->load_map ($hash, $x, $y); 727 $self->load_map ($hash, $x, $y);
267 $self->flood_fill (0, 0, 0, "", $hash, $flags); 728 $self->flood_fill (0, 0, 0, "", $hash, $flags);
268} 729}
269 730
270sub face_find { 731sub face_find {
732 my ($self, $facenum, $face, $cb) = @_;
733
734 my $hash = "$face->{chksum},$face->{name}";
735
736 my $id = CFPlus::DB::get_tile_id_sync $hash;
737
738 $face->{id} = $id;
739 $self->{faceid}[$facenum] = $id;
740
741 $self->{map}->set_tileid ($facenum => $id);
742
743 CFPlus::DB::get tilecache => $id, $cb;
744}
745
746sub face_update {
747 my ($self, $facenum, $face, $changed) = @_;
748
749 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
750 if $changed;
751
752 $self->set_texture ($face->{id} => delete $face->{image});
753}
754
755sub smooth_update {
271 my ($self, $facenum, $face) = @_; 756 my ($self, $facenum, $face) = @_;
272 757
273 my $hash = "$face->{chksum},$face->{name}"; 758 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
274
275 my $id = $self->{facemap}->get ($hash);
276
277 unless ($id) {
278 # create new id for face
279 # I love transactions
280 for (1..100) {
281 my $txn = $CFClient::DB_ENV->txn_begin;
282 my $status = $self->{facemap}->db_get (id => $id);
283 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
284 $id = ($id || 16) + 1;
285 if ($self->{facemap}->put (id => $id) == 0
286 && $self->{facemap}->put ($hash => $id) == 0) {
287 $txn->txn_commit;
288
289 goto gotid;
290 }
291 }
292 $txn->txn_abort;
293 }
294
295 CFClient::fatal "maximum number of transaction retries reached - database problems?";
296 }
297
298gotid:
299 $face->{id} = $id;
300 $self->{map}->set_face ($facenum => $id);
301 $self->{faceid}[$facenum] = $id;#d#
302
303 my $face = $self->{tilecache}->get ($id);
304
305 if ($face) {
306 #$self->face_prefetch;
307 $face
308 } else {
309 my $tex = $self->{noface};
310 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
311 undef
312 };
313}
314
315sub face_update {
316 my ($self, $facenum, $face) = @_;
317
318 $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
319
320 $self->set_texture ($face->{id} => delete $face->{image});
321} 759}
322 760
323sub set_texture { 761sub set_texture {
324 my ($self, $id, $data) = @_; 762 my ($self, $id, $data) = @_;
325 763
326 $self->{texture}[$id] ||= do { 764 $self->{texture}[$id] = my $tex =
327 my $tex =
328 new_from_image CFClient::Texture 765 new_from_image CFPlus::Texture
329 $data, minify => 1, mipmap => 1; 766 $data, minify => 1, mipmap => 1;
330 767
331 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 768 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
332 $self->{map_widget}->update; 769 $self->{map_widget}->update;
333
334 $tex
335 };
336} 770}
337 771
338sub sound_play { 772sub sound_play {
339 my ($self, $x, $y, $soundnum, $type) = @_; 773 my ($self, $x, $y, $soundnum, $type) = @_;
340 774
… …
350 $LAST_QUERY = $prompt; 784 $LAST_QUERY = $prompt;
351 785
352 $self->{query}-> ($self, $flags, $prompt); 786 $self->{query}-> ($self, $flags, $prompt);
353} 787}
354 788
355sub drawinfo { 789sub sanitise_xml($) {
356 my ($self, $color, $text) = @_; 790 local $_ = shift;
357 791
358 my @color = ( 792 # we now weed out all tags we do not support
793 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
794 # now all entities
795 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
796
797 # handle some elements
798 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
799 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
800
801 $_
802}
803
804our %NAME_TO_COLOR = (
805 black => 0,
806 white => 1,
807 darkblue => 2,
808 red => 3,
809 orange => 4,
810 lightblue => 5,
811 darkorange => 6,
812 green => 7,
813 darkgreen => 8,
814 grey => 9,
815 brown => 10,
816 yellow => 11,
817 tan => 12,
818);
819
820our @CF_COLOR = (
359 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 821 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
360 [1.00, 1.00, 1.00], 822 [1.00, 1.00, 1.00],
361 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 823 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
362 [1.00, 0.00, 0.00], 824 [1.00, 0.00, 0.00],
363 [1.00, 0.54, 0.00], 825 [1.00, 0.54, 0.00],
364 [0.11, 0.56, 1.00], 826 [0.11, 0.56, 1.00],
365 [0.93, 0.46, 0.00], 827 [0.93, 0.46, 0.00],
366 [0.18, 0.54, 0.34], 828 [0.18, 0.54, 0.34],
367 [0.56, 0.73, 0.56], 829 [0.56, 0.73, 0.56],
368 [0.80, 0.80, 0.80], 830 [0.80, 0.80, 0.80],
369 [0.55, 0.41, 0.13], 831 [0.75, 0.61, 0.20],
370 [0.99, 0.77, 0.26], 832 [0.99, 0.77, 0.26],
371 [0.74, 0.65, 0.41], 833 [0.74, 0.65, 0.41],
372 ); 834);
373 835
374 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 836sub msg {
837 my ($self, $color, $type, $text, @extra) = @_;
375 838
839 $text = sanitise_xml $text;
840
841 if (my $cb = $self->{cb_msg}{$type}) {
842 $_->($self, $color, $type, $text, @extra) for values %$cb;
843 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
844 $type =~ s/-/_/g;
845 $self->{$type} = $text;
846 } else {
847 $self->logprint ("msg: ", $text);
848 return if $color < 0; # negative color == ignore if not understood
849
850 my $fg = $CF_COLOR[$color % @CF_COLOR];
851
376 # try to create single paragraphs of multiple lines sent by the server 852 ## try to create single paragraphs of multiple lines sent by the server
853 # no longer neecssary with TRT servers
377 $text =~ s/(?<=\S)\n(?=\w)/ /g; 854 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
378 855
379 $text = CFClient::UI::Label::escape $text; 856 ::message ({ fg => $fg, markup => $_ })
380 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 857 for split /\n/, $text;
381 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
382 858
383 $self->{logview}->add_paragraph ($color[$color],
384 join "\n", map "$time $_", split /\n/, $text);
385
386 $self->{statusbox}->add ($text, 859 $self->{statusbox}->add ($text,
387 group => $text, 860 group => $text,
388 fg => $color[$color], 861 fg => $fg,
389 timeout => $color >= 2 ? 60 : 10, 862 timeout => $color >= 2 ? 180 : 10,
390 tooltip_font => $::FONT_FIXED, 863 tooltip_font => $::FONT_FIXED,
391 ); 864 );
392} 865 }
393
394sub drawextinfo {
395 my ($self, $color, $type, $subtype, $message) = @_;
396
397 $self->drawinfo ($color, $message);
398} 866}
399 867
400sub spell_add { 868sub spell_add {
401 my ($self, $spell) = @_; 869 my ($self, $spell) = @_;
402 870
403 # try to create single paragraphs of multiple lines sent by the server 871 # try to create single paragraphs out of the multiple lines sent by the server
404 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 872 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
405 $spell->{message} =~ s/\n+$//; 873 $spell->{message} =~ s/\n+$//;
406 $spell->{message} ||= "Server did not provide a description for this spell."; 874 $spell->{message} ||= "Server did not provide a description for this spell.";
407 875
408 $::SETUP_SPELLS->add_spell ($spell); 876 $::SPELL_LIST->add_spell ($spell);
409 877
410 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 878 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
411 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 879 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
412} 880}
413 881
414sub spell_delete { 882sub spell_delete {
415 my ($self, $spell) = @_; 883 my ($self, $spell) = @_;
884
416 $::SETUP_SPELLS->remove_spell ($spell); 885 $::SPELL_LIST->remove_spell ($spell);
886}
887
888sub setup {
889 my ($self, $setup) = @_;
890
891 $self->{map_widget}->set_tilesize ($self->{tilesize});
892 $::MAP->resize ($self->{mapw}, $self->{maph});
417} 893}
418 894
419sub addme_success { 895sub addme_success {
420 my ($self) = @_; 896 my ($self) = @_;
421 897
422 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
423 my ($pom) = @_;
424
425 my %skill_help; 898 my %skill_help;
426 899
427 for my $head2 ($pom->head1->[3]->head2) { 900 for my $node (CFPlus::Pod::find skill_description => "*") {
428 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 901 my (undef, @par) = CFPlus::Pod::section_of $node;
429 } 902 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
430
431 \%skill_help
432 }; 903 };
433 904
434 for my $skill (values %{$self->{skill_info}}) { 905 for my $skill (values %{$self->{skill_info}}) {
435 $self->{map_widget}->add_command ("ready_skill $skill", 906 $self->{map_widget}->add_command ("ready_skill $skill",
436 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 907 (CFPlus::asxml "Ready the skill '$skill'\n\n")
437 . $skill_help->{$skill}); 908 . $skill_help{$skill});
438 $self->{map_widget}->add_command ("use_skill $skill", 909 $self->{map_widget}->add_command ("use_skill $skill",
439 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 910 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
440 . $skill_help->{$skill}); 911 . $skill_help{$skill});
441 } 912 }
442} 913}
443 914
444sub eof { 915sub eof {
445 my ($self) = @_; 916 my ($self) = @_;
… …
469 940
470 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 941 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
471 942
472 $self->send ("requestinfo image_sums $face $face"); 943 $self->send ("requestinfo image_sums $face $face");
473 944
474 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 945 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
475 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 946 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
476 } elsif (!exists $self->{num_faces}) { 947 } elsif (!exists $self->{num_faces}) {
477 $self->send ("requestinfo image_info"); 948 $self->send ("requestinfo image_info");
478 949
479 $self->{num_faces} = 0; 950 $self->{num_faces} = 0;
480 951
481 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 952 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
482 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 953 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
483 } 954 }
484} 955}
485 956
486sub update_floorbox { 957sub update_floorbox {
487 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 958 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
488 return unless $::CONN; 959 return unless $::CONN;
489 960
490 $::FLOORBOX->clear; 961 $::FLOORBOX->clear;
491 962
492 my $row; 963 my $row;
493 for (@{ $::CONN->{container}{0} }) { 964 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
494 if ($row < 6) { 965 if ($row < 6) {
495 local $_->{face_widget}; # hack to force recreation of widget 966 local $_->{face_widget}; # hack to force recreation of widget
496 local $_->{desc_widget}; # hack to force recreation of widget 967 local $_->{desc_widget}; # hack to force recreation of widget
497 CFClient::Item::update_widgets $_; 968 CFPlus::Item::update_widgets $_;
498 969
499 $::FLOORBOX->add (0, $row, $_->{face_widget}); 970 $::FLOORBOX->add (0, $row, $_->{face_widget});
500 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 971 $::FLOORBOX->add (1, $row, $_->{desc_widget});
501 972
502 $row++; 973 $row++;
503 } else { 974 } else {
504 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 975 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
505 text => "More...", 976 text => "More...",
506 on_activate => sub { $::INV_WINDOW->toggle_visibility }, 977 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
507 ); 978 );
508 last; 979 last;
509 } 980 }
510 } 981 }
982 if ($::CONN->{open_container}) {
983 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
984 text => "Close container",
985 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
986 );
987 }
511 }); 988 });
512 989
513 $::WANT_REFRESH++; 990 $::WANT_REFRESH++;
514} 991}
515 992
516sub set_opencont { 993sub set_opencont {
517 my ($conn, $tag, $name) = @_; 994 my ($conn, $tag, $name) = @_;
518 $conn->{open_container} = $tag; 995 $conn->{open_container} = $tag;
996 update_floorbox;
519 997
520 $::INV_RIGHT_HB->clear (); 998 $::INV_RIGHT_HB->clear ();
521 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 999 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
522 1000
523 if ($tag != 0) { # Floor isn't closable, is it? 1001 if ($tag != 0) { # Floor isn't closable, is it?
524 $::INV_RIGHT_HB->add (new CFClient::UI::Button 1002 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
525 text => "Close container", 1003 text => "Close container",
526 tooltip => "Close the currently open container (if one is open)", 1004 tooltip => "Close the currently open container (if one is open)",
527 on_activate => sub { 1005 on_activate => sub {
528 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1006 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
529 if $tag != 0; 1007 if $tag != 0;
530 #if $CONN->{open_container} != 0; 1008 #if $CONN->{open_container} != 0;
1009 0
531 }, 1010 },
532 ); 1011 );
533 } 1012 }
534 1013
535 $::INVR->set_items ($conn->{container}{$tag}); 1014 $::INVR->set_items ($conn->{container}{$tag});
536} 1015}
537 1016
538sub update_container { 1017sub update_containers {
539 my ($tag) = @_; 1018 my ($self) = @_;
540 1019
541 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 1020 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1021 my $todo = delete $self->{update_container}
1022 or return;
1023
1024 for my $tag (keys %$todo) {
1025 update_floorbox if $tag == 0 or $tag == $self->{open_container};
1026 if ($tag == 0) {
1027 $::INVR->set_items ($self->{container}{0})
542 if $tag == $::CONN->{open_container}; 1028 if $tag == $self->{open_container};
1029 } elsif ($tag == $self->{player}{tag}) {
1030 $::INV->set_items ($self->{container}{$tag})
1031 } else {
1032 $::INVR->set_items ($self->{container}{$tag})
1033 if $tag == $self->{open_container};
1034 }
1035 }
1036 });
543} 1037}
544 1038
545sub container_add { 1039sub container_add {
546 my ($self, $tag, $items) = @_; 1040 my ($self, $tag, $items) = @_;
547 1041
548 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 1042 $self->{update_container}{$tag}++;
549 1043 $self->update_containers;
550 if ($tag == 0) {
551 update_floorbox;
552 update_container (0);
553 } elsif ($tag == $self->{player}{tag}) {
554 $::INV->set_items ($self->{container}{$self->{player}{tag}})
555 } else {
556 update_container ($tag);
557 }
558
559 # $self-<{player}{tag} => player inv
560 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
561} 1044}
562 1045
563sub container_clear { 1046sub container_clear {
564 my ($self, $tag) = @_; 1047 my ($self, $tag) = @_;
565 1048
566 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 1049 $self->{update_container}{$tag}++;
567 1050 $self->update_containers;
568 if ($tag == 0) {
569 update_floorbox;
570 update_container (0);
571 } elsif ($tag == $self->{player}{tag}) {
572 $::INV->set_items ($self->{container}{$tag})
573 } else {
574 update_container ($tag);
575 }
576
577# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
578} 1051}
579 1052
580sub item_delete { 1053sub item_delete {
581 my ($self, @items) = @_; 1054 my ($self, @items) = @_;
582 1055
1056 $self->{update_container}{$_->{container}}++
583 for (@items) { 1057 for @items;
584 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
585
586 if ($_->{container} == 0) {
587 update_floorbox;
588 update_container ($_->{tag});
589 } elsif ($_->{container} == $self->{player}{tag}) {
590 $::INV->set_items ($self->{container}{$self->{player}{tag}})
591 } else {
592 update_container ($_->{container});
593 }
594 } 1058
1059 $self->update_containers;
595} 1060}
596 1061
597sub item_update { 1062sub item_update {
598 my ($self, $item) = @_; 1063 my ($self, $item) = @_;
599 1064
600 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1065 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
601 1066
602 if ($item->{tag} == $self->{player}{tag}) {
603 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
604 return;
605 }
606
607 CFClient::Item::update_widgets $item; 1067 CFPlus::Item::update_widgets $item;
608 1068
609 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1069 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
610 set_opencont ($::CONN, 0, "Floor"); 1070 set_opencont ($::CONN, 0, "Floor");
611 1071
612 } elsif ($item->{flags} & F_OPEN) { 1072 } elsif ($item->{flags} & F_OPEN) {
613 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1073 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
1074
614 } else { 1075 } else {
615 if ($item->{container} == 0) { 1076 $self->{update_container}{$item->{container}}++;
616 update_floorbox;
617 update_container (0); 1077 $self->update_containers;
618 } elsif ($item->{container} == $self->{player}{tag}) {
619 $::INV->set_items ($self->{container}{$item->{container}})
620 }
621 } 1078 }
622} 1079}
623 1080
624sub player_update { 1081sub player_update {
625 my ($self, $player) = @_; 1082 my ($self, $player) = @_;
626 1083
627 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 1084 $self->update_weight;
628} 1085}
629 1086
630sub logged_in { 1087sub update_weight {
631 my ($self) = @_; 1088 my ($self) = @_;
632 1089
633 $self->send_ext_req (cfplus => "version", "1", sub { 1090 my $weight = .001 * $self->{player}{weight};
634 $self->{cfplus_ext} = $_[0]; 1091 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
635 });
636 1092
637 $self->send_command ("output-sync $::CFG->{output_sync}"); 1093 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
638 $self->send_command ("output-count $::CFG->{output_count}"); 1094 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
639 $self->send_command ("pickup $::CFG->{pickup}"); 1095 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1096}
1097
1098sub update_server_info {
1099 my ($self) = @_;
640 1100
641 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>"); 1101 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
642 1102
643 $::SERVER_INFO->set_markup ( 1103 $::SERVER_INFO->set_markup (
644 "server <tt>$self->{host}:$self->{port}</tt>\n" 1104 "server <tt>$self->{host}:$self->{port}</tt>\n"
645 . "protocol version <tt>$self->{version}</tt>\n" 1105 . "protocol version <tt>$self->{version}</tt>\n"
646 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1106 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
647 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1107 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1108 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1109 . "editing support $yesno[!!$self->{editor_support}]\n"
1110 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1111 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
648 . "cfplus support $yesno[$self->{cfplus_ext} > 0]\n" 1112 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1113 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
649 . "map size $self->{mapw}×$self->{maph}\n" 1114 . "map size $self->{mapw}×$self->{maph}\n"
650 ); 1115 );
651}
652 1116
6531; 1117 ::setup_build_button ($self->{editor_support}->{builder_ui});
1118}
1119
1120sub logged_in {
1121 my ($self) = @_;
1122
1123 $self->send_ext_req (cfplus_support => version => 1, sub {
1124 $self->{cfplus_ext} = $_[0]{version};
1125 $self->update_server_info;
1126
1127 if ($self->{cfplus_ext} >= 2) {
1128 $self->send_ext_req ("editor_support", sub {
1129 $self->{editor_support} = $_[0];
1130 $self->update_server_info;
1131
1132 0
1133 });
1134 }
1135
1136 0
1137 });
1138
1139 $self->update_server_info;
1140
1141 $self->send_command ("output-sync $::CFG->{output_sync}");
1142 $self->send_command ("output-count $::CFG->{output_count}");
1143 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1144 $self->send_command ("pickup $::CFG->{pickup}");
1145}
1146
1147sub buildat {
1148 my ($self, $builditem, $x, $y) = @_;
1149
1150 if ($self->{cfplus_ext}) {
1151 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1152 }
1153}
1154
1155sub lookat {
1156 my ($self, $x, $y) = @_;
1157
1158 if ($self->{cfplus_ext}) {
1159 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
1160 my ($msg) = @_;
1161
1162 if (exists $msg->{npc_dialog}) {
1163 # start npc chat dialog
1164 $self->{npc_dialog} = new CFPlus::NPCDialog::
1165 dx => $x,
1166 dy => $y,
1167 title => "$msg->{npc_dialog} (NPC)",
1168 conn => $self,
1169 ;
1170 }
1171 });
1172 }
1173
1174 $self->send ("lookat $x $y");
1175}
1176
1177sub destroy {
1178 my ($self) = @_;
1179
1180 (delete $self->{npc_dialog})->destroy
1181 if $self->{npc_dialog};
1182
1183 $self->SUPER::destroy;
1184
1185 %$self = ();
1186}
1187
1188package CFPlus::NPCDialog;
1189
1190our @ISA = 'CFPlus::UI::Toplevel';
1191
1192sub new {
1193 my $class = shift;
1194
1195 my $self = $class->SUPER::new (
1196 x => 'center',
1197 y => 'center',
1198 name => "npc_dialog",
1199 force_w => $::WIDTH * 0.7,
1200 force_h => $::HEIGHT * 0.7,
1201 title => "NPC Dialog",
1202 kw => { hi => 0, yes => 0, no => 0 },
1203 has_close_button => 1,
1204 @_,
1205 );
1206
1207 CFPlus::weaken (my $this = $self);
1208
1209 $self->connect (delete => sub { $this->destroy; 1 });
1210
1211 # better use a pane...
1212 $self->add (my $hbox = new CFPlus::UI::HBox);
1213 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
1214
1215 $hbox->add (my $vbox = new CFPlus::UI::VBox);
1216
1217 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
1218 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
1219 tooltip => "#npc_message_entry",
1220 on_activate => sub {
1221 my ($entry, $text) = @_;
1222
1223 return unless $text =~ /\S/;
1224
1225 $entry->set_text ("");
1226 $this->send ($text);
1227
1228 0
1229 },
1230 );
1231
1232 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
1233
1234 $self->{bye_button} = new CFPlus::UI::Button
1235 text => "Bye (close)",
1236 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1237 on_activate => sub { $this->destroy; 1 },
1238 ;
1239
1240 $self->update_options;
1241
1242 $self->{id} = $self->{conn}->send_ext_req (
1243 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
1244 sub { $this && $this->feed (@_) }
1245 );
1246
1247 $self->{entry}->grab_focus;
1248
1249 $self->{textview}->add_paragraph ({
1250 fg => [1, 1, 0, 1],
1251 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1252 });
1253
1254 $self->show;
1255 $self
1256};
1257
1258sub update_options {
1259 my ($self) = @_;
1260
1261 CFPlus::weaken $self;
1262
1263 $self->{options}->clear;
1264 $self->{options}->add ($self->{bye_button});
1265
1266 for my $kw (sort keys %{ $self->{kw} }) {
1267 $self->{options}->add (new CFPlus::UI::Button
1268 text => $kw,
1269 on_activate => sub {
1270 $self->send ($kw);
1271 0
1272 },
1273 );
1274 }
1275}
1276
1277sub feed {
1278 my ($self, $msg) = @_;
1279
1280 CFPlus::weaken $self;
1281
1282 if ($msg->{msgtype} eq "reply") {
1283 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1284 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1285
1286 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1287 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1288 my @link;
1289 $text =~ s{
1290 ($match)
1291 }{
1292 my $kw = $1;
1293
1294 push @link, new CFPlus::UI::Label
1295 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1296 can_hover => 1,
1297 can_events => 1,
1298 padding_x => 0,
1299 padding_y => 0,
1300 on_button_up => sub {
1301 $self->send ($kw);
1302 };
1303
1304 "\x{fffc}"
1305 }giex;
1306
1307 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1308 $self->{textview}->scroll_to_bottom;
1309 $self->update_options;
1310 } else {
1311 $self->destroy;
1312 }
1313
1314 1
1315}
1316
1317sub send {
1318 my ($self, $msg) = @_;
1319
1320 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1321 $self->{textview}->scroll_to_bottom;
1322
1323 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
1324}
1325
1326sub destroy {
1327 my ($self) = @_;
1328
1329 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1330
1331 if ($self->{conn}) {
1332 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1333 delete $self->{conn}{npc_dialog};
1334 $self->{conn}->disconnect_ext ($self->{id});
1335 }
1336
1337 $self->SUPER::destroy;
1338}
1339
13401
1341

Diff Legend

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