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

Diff Legend

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