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

Diff Legend

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