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

Diff Legend

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