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

Diff Legend

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