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

Diff Legend

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