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.50 by elmex, Sun Jul 2 16:25:19 2006 UTC vs.
Revision 1.106 by root, Sun Apr 29 20:03:08 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 if (my $cb = $self->{cb_msg}{$type}) {
673 $_->($self, $color, $type, $text, @extra) for values %$cb;
674 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
675 $type =~ s/-/_/g;
676 $self->{$type} = $text;
677 } else {
406 $self->logprint ("info: ", $text); 678 $self->logprint ("msg: ", $text);
679 return if $color < 0; # negative color == ignore if not understood
407 680
408 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 681 my $fg = $CF_COLOR[$color % @CF_COLOR];
409 682
410 # try to create single paragraphs of multiple lines sent by the server 683 ## try to create single paragraphs of multiple lines sent by the server
684 # no longer neecssary with TRT servers
411 $text =~ s/(?<=\S)\n(?=\w)/ /g; 685 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
412 686
413 $text = CFClient::UI::Label::escape $text; 687 ::message ({ fg => $fg, markup => $_ })
414 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 688 for split /\n/, $text;
415 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
416 689
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, 690 $self->{statusbox}->add ($text,
422 group => $text, 691 group => $text,
423 fg => $color[$color], 692 fg => $fg,
424 timeout => $color >= 2 ? 60 : 10, 693 timeout => $color >= 2 ? 180 : 10,
425 tooltip_font => $::FONT_FIXED, 694 tooltip_font => $::FONT_FIXED,
426 ); 695 );
427} 696 }
428
429sub drawextinfo {
430 my ($self, $color, $type, $subtype, $message) = @_;
431
432 $self->drawinfo ($color, $message);
433} 697}
434 698
435sub spell_add { 699sub spell_add {
436 my ($self, $spell) = @_; 700 my ($self, $spell) = @_;
437 701
438 # try to create single paragraphs of multiple lines sent by the server 702 # try to create single paragraphs out of the multiple lines sent by the server
439 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 703 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
440 $spell->{message} =~ s/\n+$//; 704 $spell->{message} =~ s/\n+$//;
441 $spell->{message} ||= "Server did not provide a description for this spell."; 705 $spell->{message} ||= "Server did not provide a description for this spell.";
442 706
443 $::SETUP_SPELLS->add_spell ($spell); 707 $::SPELL_LIST->add_spell ($spell);
444 708
445 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 709 $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}); 710 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
447} 711}
448 712
449sub spell_delete { 713sub spell_delete {
450 my ($self, $spell) = @_; 714 my ($self, $spell) = @_;
715
451 $::SETUP_SPELLS->remove_spell ($spell); 716 $::SPELL_LIST->remove_spell ($spell);
717}
718
719sub setup {
720 my ($self, $setup) = @_;
721
722 $self->{map_widget}->set_tilesize ($self->{tilesize});
723 $::MAP->resize ($self->{mapw}, $self->{maph});
452} 724}
453 725
454sub addme_success { 726sub addme_success {
455 my ($self) = @_; 727 my ($self) = @_;
456 728
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; 729 my %skill_help;
461 730
462 for my $head2 ($pom->head1->[3]->head2) { 731 for my $node (CFPlus::Pod::find skill_description => "*") {
463 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 732 my (undef, @par) = CFPlus::Pod::section_of $node;
464 } 733 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
465
466 \%skill_help
467 }; 734 };
468 735
469 for my $skill (values %{$self->{skill_info}}) { 736 for my $skill (values %{$self->{skill_info}}) {
470 $self->{map_widget}->add_command ("ready_skill $skill", 737 $self->{map_widget}->add_command ("ready_skill $skill",
471 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 738 (CFPlus::asxml "Ready the skill '$skill'\n\n")
472 . $skill_help->{$skill}); 739 . $skill_help{$skill});
473 $self->{map_widget}->add_command ("use_skill $skill", 740 $self->{map_widget}->add_command ("use_skill $skill",
474 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 741 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
475 . $skill_help->{$skill}); 742 . $skill_help{$skill});
476 } 743 }
477} 744}
478 745
479sub eof { 746sub eof {
480 my ($self) = @_; 747 my ($self) = @_;
… …
504 771
505 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 772 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
506 773
507 $self->send ("requestinfo image_sums $face $face"); 774 $self->send ("requestinfo image_sums $face $face");
508 775
509 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 776 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
510 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 777 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
511 } elsif (!exists $self->{num_faces}) { 778 } elsif (!exists $self->{num_faces}) {
512 $self->send ("requestinfo image_info"); 779 $self->send ("requestinfo image_info");
513 780
514 $self->{num_faces} = 0; 781 $self->{num_faces} = 0;
515 782
516 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 783 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
517 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 784 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
518 } 785 }
519} 786}
520 787
521sub update_floorbox { 788sub update_floorbox {
522 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 789 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
523 return unless $::CONN; 790 return unless $::CONN;
524 791
525 $::FLOORBOX->clear; 792 $::FLOORBOX->clear;
526 793
527 my $row; 794 my $row;
528 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) { 795 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
529 if ($row < 6) { 796 if ($row < 6) {
530 local $_->{face_widget}; # hack to force recreation of widget 797 local $_->{face_widget}; # hack to force recreation of widget
531 local $_->{desc_widget}; # hack to force recreation of widget 798 local $_->{desc_widget}; # hack to force recreation of widget
532 CFClient::Item::update_widgets $_; 799 CFPlus::Item::update_widgets $_;
533 800
534 $::FLOORBOX->add (0, $row, $_->{face_widget}); 801 $::FLOORBOX->add (0, $row, $_->{face_widget});
535 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 802 $::FLOORBOX->add (1, $row, $_->{desc_widget});
536 803
537 $row++; 804 $row++;
538 } else { 805 } else {
539 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 806 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
540 text => "More...", 807 text => "More...",
541 on_activate => sub { $::INV_WINDOW->toggle_visibility; 0 }, 808 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
542 ); 809 );
543 last; 810 last;
544 } 811 }
545 } 812 }
813 if ($::CONN->{open_container}) {
814 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
815 text => "Close container",
816 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
817 );
818 }
546 }); 819 });
547 820
548 $::WANT_REFRESH++; 821 $::WANT_REFRESH++;
549} 822}
550 823
551sub set_opencont { 824sub set_opencont {
552 my ($conn, $tag, $name) = @_; 825 my ($conn, $tag, $name) = @_;
553 $conn->{open_container} = $tag; 826 $conn->{open_container} = $tag;
827 update_floorbox;
554 828
555 $::INV_RIGHT_HB->clear (); 829 $::INV_RIGHT_HB->clear ();
556 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 830 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
557 831
558 if ($tag != 0) { # Floor isn't closable, is it? 832 if ($tag != 0) { # Floor isn't closable, is it?
559 $::INV_RIGHT_HB->add (new CFClient::UI::Button 833 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
560 text => "Close container", 834 text => "Close container",
561 tooltip => "Close the currently open container (if one is open)", 835 tooltip => "Close the currently open container (if one is open)",
562 on_activate => sub { 836 on_activate => sub {
563 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 837 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
564 if $tag != 0; 838 if $tag != 0;
… …
572} 846}
573 847
574sub update_containers { 848sub update_containers {
575 my ($self) = @_; 849 my ($self) = @_;
576 850
577 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 851 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
578 for my $tag (keys %{ delete $self->{update_container} }) { 852 my $todo = delete $self->{update_container}
853 or return;
854
855 for my $tag (keys %$todo) {
856 update_floorbox if $tag == 0 or $tag == $self->{open_container};
579 if ($tag == 0) { 857 if ($tag == 0) {
580 update_floorbox;
581 $::INVR->set_items ($self->{container}{0}) 858 $::INVR->set_items ($self->{container}{0})
582 if $tag == $self->{open_container}; 859 if $tag == $self->{open_container};
583 } elsif ($tag == $self->{player}{tag}) { 860 } elsif ($tag == $self->{player}{tag}) {
584 $::INV->set_items ($self->{container}{$tag}) 861 $::INV->set_items ($self->{container}{$tag})
585 } else { 862 } else {
… …
616sub item_update { 893sub item_update {
617 my ($self, $item) = @_; 894 my ($self, $item) = @_;
618 895
619 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 896 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
620 897
621 CFClient::Item::update_widgets $item; 898 CFPlus::Item::update_widgets $item;
622 899
623 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 900 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
624 set_opencont ($::CONN, 0, "Floor"); 901 set_opencont ($::CONN, 0, "Floor");
625 902
626 } elsif ($item->{flags} & F_OPEN) { 903 } elsif ($item->{flags} & F_OPEN) {
627 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 904 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
628 905
629 } else { 906 } else {
630 $self->{update_container}{$item->{container}}++; 907 $self->{update_container}{$item->{container}}++;
631 $self->update_containers; 908 $self->update_containers;
632# if ($item->{container} == 0) {
633# update_floorbox;
634# update_container (0);
635# } elsif ($item->{container} == $self->{player}{tag}) {
636# $::INV->set_items ($self->{container}{$item->{container}})
637# }
638 } 909 }
639} 910}
640 911
641sub player_update { 912sub player_update {
642 my ($self, $player) = @_; 913 my ($self, $player) = @_;
914
915 $self->update_weight;
916}
917
918sub update_weight {
919 my ($self) = @_;
920
921 my $weight = .001 * $self->{player}{weight};
922 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
923
643 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 924 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
925 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
926 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
644} 927}
645 928
646sub update_server_info { 929sub update_server_info {
647 my ($self) = @_; 930 my ($self) = @_;
648 931
… …
651 $::SERVER_INFO->set_markup ( 934 $::SERVER_INFO->set_markup (
652 "server <tt>$self->{host}:$self->{port}</tt>\n" 935 "server <tt>$self->{host}:$self->{port}</tt>\n"
653 . "protocol version <tt>$self->{version}</tt>\n" 936 . "protocol version <tt>$self->{version}</tt>\n"
654 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 937 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
655 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 938 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
939 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
940 . "editing support $yesno[!!$self->{editor_support}]\n"
941 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
942 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
656 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 943 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
657 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 944 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
658 . "map size $self->{mapw}×$self->{maph}\n" 945 . "map size $self->{mapw}×$self->{maph}\n"
659 ); 946 );
947
948 ::setup_build_button ($self->{editor_support}->{builder_ui});
660} 949}
661 950
662sub logged_in { 951sub logged_in {
663 my ($self) = @_; 952 my ($self) = @_;
664 953
665 $self->send_ext_req (cfplus_support => "1", sub { 954 $self->send_ext_req (cfplus_support => version => 1, sub {
666 $self->{cfplus_ext} = $_[0]; 955 $self->{cfplus_ext} = $_[0]{version};
667 $self->update_server_info; 956 $self->update_server_info;
957
958 if ($self->{cfplus_ext} >= 2) {
959 $self->send_ext_req ("editor_support", sub {
960 $self->{editor_support} = $_[0];
961 $self->update_server_info;
962
963 0
964 });
965 }
966
967 0
668 }); 968 });
669 969
670 $self->update_server_info; 970 $self->update_server_info;
671 971
672 $self->send_command ("output-sync $::CFG->{output_sync}"); 972 $self->send_command ("output-sync $::CFG->{output_sync}");
673 $self->send_command ("output-count $::CFG->{output_count}"); 973 $self->send_command ("output-count $::CFG->{output_count}");
974 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
674 $self->send_command ("pickup $::CFG->{pickup}"); 975 $self->send_command ("pickup $::CFG->{pickup}");
976}
977
978sub buildat {
979 my ($self, $builditem, $x, $y) = @_;
980
981 if ($self->{cfplus_ext}) {
982 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
983 }
675} 984}
676 985
677sub lookat { 986sub lookat {
678 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
679 988
680 if ($self->{cfplus_ext}) { 989 if ($self->{cfplus_ext}) {
681 $self->send_ext_req (lookat => "$x $y", sub { 990 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
682 my %res = split /\x00/, $_[0]; 991 my ($msg) = @_;
683 992
684 if (exists $res{npc_dialog}) { 993 if (exists $msg->{npc_dialog}) {
685 # start npc chat dialog 994 # start npc chat dialog
686 $self->{npc_dialog} = new CFClient::NPCDialog:: 995 $self->{npc_dialog} = new CFPlus::NPCDialog::
687 dx => $x, 996 dx => $x,
688 dy => $y, 997 dy => $y,
689 title => "$res{npc_dialog} (NPC)", 998 title => "$msg->{npc_dialog} (NPC)",
690 conn => $self, 999 conn => $self,
691 ; 1000 ;
692 } 1001 }
693 }); 1002 });
694 } 1003 }
… …
697} 1006}
698 1007
699sub destroy { 1008sub destroy {
700 my ($self) = @_; 1009 my ($self) = @_;
701 1010
702 $self->{npc_dialog}->destroy 1011 (delete $self->{npc_dialog})->destroy
703 if $self->{npc_dialog}; 1012 if $self->{npc_dialog};
704 1013
705 $self->SUPER::destroy; 1014 $self->SUPER::destroy;
706} 1015}
707 1016
708package CFClient::NPCDialog; 1017package CFPlus::NPCDialog;
709 1018
710our @ISA = 'CFClient::UI::FancyFrame'; 1019our @ISA = 'CFPlus::UI::Toplevel';
711 1020
712sub new { 1021sub new {
713 my $class = shift; 1022 my $class = shift;
714 1023
715 my $self = $class->SUPER::new ( 1024 my $self = $class->SUPER::new (
… …
718 name => "npc_dialog", 1027 name => "npc_dialog",
719 force_w => $::WIDTH * 0.7, 1028 force_w => $::WIDTH * 0.7,
720 force_h => $::HEIGHT * 0.7, 1029 force_h => $::HEIGHT * 0.7,
721 title => "NPC Dialog", 1030 title => "NPC Dialog",
722 kw => { hi => 0, yes => 0, no => 0 }, 1031 kw => { hi => 0, yes => 0, no => 0 },
1032 has_close_button => 1,
723 @_, 1033 @_,
724 ); 1034 );
725 1035
726 Scalar::Util::weaken (my $this = $self); 1036 CFPlus::weaken (my $this = $self);
1037
1038 $self->connect (delete => sub { $this->destroy; 1 });
727 1039
728 # better use a pane... 1040 # better use a pane...
729 $self->add (my $hbox = new CFClient::UI::HBox); 1041 $self->add (my $hbox = new CFPlus::UI::HBox);
730 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1042 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
731 1043
732 $hbox->add (my $vbox = new CFClient::UI::VBox); 1044 $hbox->add (my $vbox = new CFPlus::UI::VBox);
733 1045
734 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1046 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
735 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1047 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
736 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1048 tooltip => "#npc_message_entry",
737 . "Sometimes you have to tell an NPC something you cannot find out during "
738 . "a normal conversation (such as a password). In those cases you have to use "
739 . "this text entry. You can also enter responses manually instead of using the response "
740 . "buttons below.",
741 on_activate => sub { 1049 on_activate => sub {
742 my ($entry, $text) = @_; 1050 my ($entry, $text) = @_;
743 1051
744 return unless $text =~ /\S/; 1052 return unless $text =~ /\S/;
745 1053
… …
748 1056
749 0 1057 0
750 }, 1058 },
751 ); 1059 );
752 1060
753 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1061 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
754 1062
755 $self->{bye_button} = new CFClient::UI::Button 1063 $self->{bye_button} = new CFPlus::UI::Button
756 text => "Bye (close)", 1064 text => "Bye (close)",
757 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1065 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
758 on_activate => sub { $this->destroy; 0 }, 1066 on_activate => sub { $this->destroy; 1 },
759 ; 1067 ;
760 1068
761 $self->update_options; 1069 $self->update_options;
762 1070
763 $self->{token} = $self->{conn}->ext_token; 1071 $self->{id} = $self->{conn}->send_ext_req (
764 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1072 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
765 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1073 sub { $this && $this->feed (@_) }
1074 );
766 1075
767 $self->{entry}->grab_focus; 1076 $self->{entry}->grab_focus;
768 1077
769 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1078 $self->{textview}->add_paragraph ({
1079 fg => [1, 1, 0, 1],
1080 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1081 });
770 1082
771 $self->show; 1083 $self->show;
772 $self 1084 $self
773}; 1085};
774 1086
775sub update_options { 1087sub update_options {
776 my ($self) = @_; 1088 my ($self) = @_;
777 1089
778 Scalar::Util::weaken $self; 1090 CFPlus::weaken $self;
779 1091
780 $self->{options}->clear; 1092 $self->{options}->clear;
781 $self->{options}->add ($self->{bye_button}); 1093 $self->{options}->add ($self->{bye_button});
782 1094
783 for my $kw (sort keys %{ $self->{kw} }) { 1095 for my $kw (sort keys %{ $self->{kw} }) {
784 $self->{options}->add (new CFClient::UI::Button 1096 $self->{options}->add (new CFPlus::UI::Button
785 text => $kw, 1097 text => $kw,
786 on_activate => sub { 1098 on_activate => sub {
787 $self->send ($kw); 1099 $self->send ($kw);
788 0 1100 0
789 }, 1101 },
790 ); 1102 );
791 } 1103 }
792} 1104}
793 1105
794sub feed { 1106sub feed {
795 my ($self, $data) = @_; 1107 my ($self, $msg) = @_;
796 1108
797 Scalar::Util::weaken $self; 1109 CFPlus::weaken $self;
798 1110
799 my ($type, $msg) = split / /, $data, 2; 1111 if ($msg->{msgtype} eq "reply") {
1112 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1113 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
800 1114
801 if ($type eq "msg") { 1115 my $text = "\n" . CFPlus::asxml $msg->{msg};
802 my ($msg, @kw) = split /\x00/, $msg;
803 $self->{kw}{$_} = 1 for @kw;
804
805 $msg = "\n" . CFClient::UI::Label::escape $msg;
806 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1116 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
807 my @link; 1117 my @link;
808 $msg =~ s{ 1118 $text =~ s{
809 ($match) 1119 ($match)
810 }{ 1120 }{
811 my $kw = $1; 1121 my $kw = $1;
812 1122
813 push @link, new CFClient::UI::Label 1123 push @link, new CFPlus::UI::Label
814 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1124 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
815 can_hover => 1, 1125 can_hover => 1,
816 can_events => 1, 1126 can_events => 1,
817 padding_x => 0, 1127 padding_x => 0,
818 padding_y => 0, 1128 padding_y => 0,
819 on_button_up => sub { 1129 on_button_up => sub {
820 $self->send ($kw); 1130 $self->send ($kw);
821 }; 1131 };
822 1132
823 chr 0xfffc 1133 "\x{fffc}"
824 }giex; 1134 }giex;
825 1135
826 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1136 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
827 $self->{textview}->scroll_to_bottom; 1137 $self->{textview}->scroll_to_bottom;
828 $self->update_options; 1138 $self->update_options;
829 } else { 1139 } else {
830 $self->destroy; 1140 $self->destroy;
831 } 1141 }
… …
834} 1144}
835 1145
836sub send { 1146sub send {
837 my ($self, $msg) = @_; 1147 my ($self, $msg) = @_;
838 1148
839 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1149 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
840 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
841 $self->{textview}->scroll_to_bottom; 1150 $self->{textview}->scroll_to_bottom;
1151
1152 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
842} 1153}
843 1154
844sub destroy { 1155sub destroy {
845 my ($self) = @_; 1156 my ($self) = @_;
846 1157
847 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1158 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
848 1159
1160 if ($self->{conn}) {
1161 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
849 delete $self->{conn}{npc_dialog}; 1162 delete $self->{conn}{npc_dialog};
850 $self->{conn}->disconnect_ext ($self->{token}); 1163 $self->{conn}->disconnect_ext ($self->{id});
1164 }
851 1165
852 $self->SUPER::destroy; 1166 $self->SUPER::destroy;
853} 1167}
854 1168
8551; 11691
1170

Diff Legend

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