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

Diff Legend

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