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.41 by root, Fri Jun 23 22:35:16 2006 UTC vs.
Revision 1.96 by root, Fri Apr 6 07:45:35 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) = @_;
… …
165 406
166 407
167sub load_map($$$) { 408sub load_map($$$) {
168 my ($self, $hash, $x, $y) = @_; 409 my ($self, $hash, $x, $y) = @_;
169 410
170 if (defined (my $data = $self->{mapcache}->get ($hash))) { 411 CFPlus::DB::get $self->{mapcache} => $hash, sub {
412 my ($data) = @_;
413
414 if (defined $data) {
171 $data = Compress::LZF::decompress $data; 415 $data = Compress::LZF::decompress $data;
172 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 416 #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)) { 417 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
174 my $data = $self->{tilecache}->get ($id) 418 CFPlus::DB::get tilecache => $id, sub {
175 or next; 419 my ($data) = @_;
176 420
177 $self->set_texture ($id => $data); 421 $self->set_texture ($id => $data)
422 if defined $data;
423 };
424 }
178 } 425 }
179 } 426 };
180} 427}
181 428
182# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 429# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
183# (server resource,s latency, bandwidth), so this hack is warranted. 430# (server resource,s latency, bandwidth), so this hack is warranted.
184# the right fix is to make real tiled maps with an overview file 431# the right fix is to make real tiled maps with an overview file
… …
298 $self->load_map ($hash, $x, $y); 545 $self->load_map ($hash, $x, $y);
299 $self->flood_fill (0, 0, 0, "", $hash, $flags); 546 $self->flood_fill (0, 0, 0, "", $hash, $flags);
300} 547}
301 548
302sub face_find { 549sub face_find {
303 my ($self, $facenum, $face) = @_; 550 my ($self, $facenum, $face, $cb) = @_;
304 551
305 my $hash = "$face->{chksum},$face->{name}"; 552 my $hash = "$face->{chksum},$face->{name}";
306 553
307 my $id = $self->{facemap}->get ($hash); 554 my $id = CFPlus::DB::get_tile_id_sync $hash;
308 555
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; 556 $face->{id} = $id;
332 $self->{map}->set_face ($facenum => $id);
333 $self->{faceid}[$facenum] = $id;#d# 557 $self->{faceid}[$facenum] = $id;
334 558
335 my $face = $self->{tilecache}->get ($id); 559 $self->{map}->set_tileid ($facenum => $id);
336 560
337 if ($face) { 561 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} 562}
346 563
347sub face_update { 564sub face_update {
348 my ($self, $facenum, $face) = @_; 565 my ($self, $facenum, $face, $changed) = @_;
349 566
350 $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes 567 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
568 if $changed;
351 569
352 $self->set_texture ($face->{id} => delete $face->{image}); 570 $self->set_texture ($face->{id} => delete $face->{image});
353} 571}
354 572
355sub set_texture { 573sub set_texture {
356 my ($self, $id, $data) = @_; 574 my ($self, $id, $data) = @_;
357 575
358 $self->{texture}[$id] ||= do { 576 $self->{texture}[$id] ||= do {
359 my $tex = 577 my $tex =
360 new_from_image CFClient::Texture 578 new_from_image CFPlus::Texture
361 $data, minify => 1, mipmap => 1; 579 $data, minify => 1, mipmap => 1;
362 580
363 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 581 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
364 $self->{map_widget}->update; 582 $self->{map_widget}->update;
365 583
… …
396 [0.11, 0.56, 1.00], 614 [0.11, 0.56, 1.00],
397 [0.93, 0.46, 0.00], 615 [0.93, 0.46, 0.00],
398 [0.18, 0.54, 0.34], 616 [0.18, 0.54, 0.34],
399 [0.56, 0.73, 0.56], 617 [0.56, 0.73, 0.56],
400 [0.80, 0.80, 0.80], 618 [0.80, 0.80, 0.80],
401 [0.55, 0.41, 0.13], 619 [0.75, 0.61, 0.20],
402 [0.99, 0.77, 0.26], 620 [0.99, 0.77, 0.26],
403 [0.74, 0.65, 0.41], 621 [0.74, 0.65, 0.41],
404 ); 622 );
405 623
624 my $fg = $color[$color % @color];
625
406 $self->logprint ("info: ", $text); 626 $self->logprint ("info: ", $text);
407
408 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
409 627
410 # try to create single paragraphs of multiple lines sent by the server 628 # try to create single paragraphs of multiple lines sent by the server
411 $text =~ s/(?<=\S)\n(?=\w)/ /g; 629 $text =~ s/(?<=\S)\n(?=\w)/ /g;
412 630
413 $text = CFClient::UI::Label::escape $text; 631 $text = CFPlus::asxml $text;
414 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 632 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
415 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 633 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
416 634
417 $self->{logview}->add_paragraph ($color[$color], $_) 635 ::message ({ fg => $fg, markup => $_ })
418 for map "$time $_", split /\n/, $text; 636 for split /\n/, $text;
419 $self->{logview}->scroll_to_bottom;
420 637
421 $self->{statusbox}->add ($text, 638 $self->{statusbox}->add ($text,
422 group => $text, 639 group => $text,
423 fg => $color[$color], 640 fg => $fg,
424 timeout => $color >= 2 ? 60 : 10, 641 timeout => $color >= 2 ? 180 : 10,
425 tooltip_font => $::FONT_FIXED, 642 tooltip_font => $::FONT_FIXED,
426 ); 643 );
427} 644}
428 645
429sub drawextinfo { 646sub drawextinfo {
… …
433} 650}
434 651
435sub spell_add { 652sub spell_add {
436 my ($self, $spell) = @_; 653 my ($self, $spell) = @_;
437 654
438 # try to create single paragraphs of multiple lines sent by the server 655 # try to create single paragraphs out of the multiple lines sent by the server
439 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 656 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
440 $spell->{message} =~ s/\n+$//; 657 $spell->{message} =~ s/\n+$//;
441 $spell->{message} ||= "Server did not provide a description for this spell."; 658 $spell->{message} ||= "Server did not provide a description for this spell.";
442 659
443 $::SETUP_SPELLS->add_spell ($spell); 660 $::SPELL_LIST->add_spell ($spell);
444 661
445 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 662 $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}); 663 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
447} 664}
448 665
449sub spell_delete { 666sub spell_delete {
450 my ($self, $spell) = @_; 667 my ($self, $spell) = @_;
668
451 $::SETUP_SPELLS->remove_spell ($spell); 669 $::SPELL_LIST->remove_spell ($spell);
670}
671
672sub setup {
673 my ($self, $setup) = @_;
674
675 $self->{map_widget}->set_tilesize ($self->{tilesize});
676 $::MAP->resize ($self->{mapw}, $self->{maph});
452} 677}
453 678
454sub addme_success { 679sub addme_success {
455 my ($self) = @_; 680 my ($self) = @_;
456 681
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; 682 my %skill_help;
461 683
462 for my $head2 ($pom->head1->[3]->head2) { 684 for my $node (CFPlus::Pod::find skill_description => "*") {
463 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 685 my (undef, @par) = CFPlus::Pod::section_of $node;
464 } 686 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
465
466 \%skill_help
467 }; 687 };
468 688
469 for my $skill (values %{$self->{skill_info}}) { 689 for my $skill (values %{$self->{skill_info}}) {
470 $self->{map_widget}->add_command ("ready_skill $skill", 690 $self->{map_widget}->add_command ("ready_skill $skill",
471 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 691 (CFPlus::asxml "Ready the skill '$skill'\n\n")
472 . $skill_help->{$skill}); 692 . $skill_help{$skill});
473 $self->{map_widget}->add_command ("use_skill $skill", 693 $self->{map_widget}->add_command ("use_skill $skill",
474 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 694 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
475 . $skill_help->{$skill}); 695 . $skill_help{$skill});
476 } 696 }
477} 697}
478 698
479sub eof { 699sub eof {
480 my ($self) = @_; 700 my ($self) = @_;
… …
504 724
505 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 725 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
506 726
507 $self->send ("requestinfo image_sums $face $face"); 727 $self->send ("requestinfo image_sums $face $face");
508 728
509 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 729 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
510 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 730 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
511 } elsif (!exists $self->{num_faces}) { 731 } elsif (!exists $self->{num_faces}) {
512 $self->send ("requestinfo image_info"); 732 $self->send ("requestinfo image_info");
513 733
514 $self->{num_faces} = 0; 734 $self->{num_faces} = 0;
515 735
516 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 736 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
517 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 737 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
518 } 738 }
519} 739}
520 740
521sub update_floorbox { 741sub update_floorbox {
522 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 742 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
523 return unless $::CONN; 743 return unless $::CONN;
524 744
525 $::FLOORBOX->clear; 745 $::FLOORBOX->clear;
526 746
527 my $row; 747 my $row;
528 for (@{ $::CONN->{container}{0} }) { 748 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
529 if ($row < 6) { 749 if ($row < 6) {
530 local $_->{face_widget}; # hack to force recreation of widget 750 local $_->{face_widget}; # hack to force recreation of widget
531 local $_->{desc_widget}; # hack to force recreation of widget 751 local $_->{desc_widget}; # hack to force recreation of widget
532 CFClient::Item::update_widgets $_; 752 CFPlus::Item::update_widgets $_;
533 753
534 $::FLOORBOX->add (0, $row, $_->{face_widget}); 754 $::FLOORBOX->add (0, $row, $_->{face_widget});
535 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 755 $::FLOORBOX->add (1, $row, $_->{desc_widget});
536 756
537 $row++; 757 $row++;
538 } else { 758 } else {
539 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 759 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
540 text => "More...", 760 text => "More...",
541 on_activate => sub { $::INV_WINDOW->toggle_visibility; 0 }, 761 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
542 ); 762 );
543 last; 763 last;
544 } 764 }
545 } 765 }
766 if ($::CONN->{open_container}) {
767 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
768 text => "Close container",
769 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
770 );
771 }
546 }); 772 });
547 773
548 $::WANT_REFRESH++; 774 $::WANT_REFRESH++;
549} 775}
550 776
551sub set_opencont { 777sub set_opencont {
552 my ($conn, $tag, $name) = @_; 778 my ($conn, $tag, $name) = @_;
553 $conn->{open_container} = $tag; 779 $conn->{open_container} = $tag;
780 update_floorbox;
554 781
555 $::INV_RIGHT_HB->clear (); 782 $::INV_RIGHT_HB->clear ();
556 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 783 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
557 784
558 if ($tag != 0) { # Floor isn't closable, is it? 785 if ($tag != 0) { # Floor isn't closable, is it?
559 $::INV_RIGHT_HB->add (new CFClient::UI::Button 786 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
560 text => "Close container", 787 text => "Close container",
561 tooltip => "Close the currently open container (if one is open)", 788 tooltip => "Close the currently open container (if one is open)",
562 on_activate => sub { 789 on_activate => sub {
563 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 790 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
564 if $tag != 0; 791 if $tag != 0;
… …
569 } 796 }
570 797
571 $::INVR->set_items ($conn->{container}{$tag}); 798 $::INVR->set_items ($conn->{container}{$tag});
572} 799}
573 800
574sub update_container { 801sub update_containers {
575 my ($tag) = @_; 802 my ($self) = @_;
576 803
577 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 804 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
805 my $todo = delete $self->{update_container}
806 or return;
807
808 for my $tag (keys %$todo) {
809 update_floorbox if $tag == 0 or $tag == $self->{open_container};
810 if ($tag == 0) {
811 $::INVR->set_items ($self->{container}{0})
578 if $tag == $::CONN->{open_container}; 812 if $tag == $self->{open_container};
813 } elsif ($tag == $self->{player}{tag}) {
814 $::INV->set_items ($self->{container}{$tag})
815 } else {
816 $::INVR->set_items ($self->{container}{$tag})
817 if $tag == $self->{open_container};
818 }
819 }
820 });
579} 821}
580 822
581sub container_add { 823sub container_add {
582 my ($self, $tag, $items) = @_; 824 my ($self, $tag, $items) = @_;
583 825
584 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 826 $self->{update_container}{$tag}++;
585 827 $self->update_containers;
586 if ($tag == 0) {
587 update_floorbox;
588 update_container (0);
589 } elsif ($tag == $self->{player}{tag}) {
590 $::INV->set_items ($self->{container}{$self->{player}{tag}})
591 } else {
592 update_container ($tag);
593 }
594
595 # $self-<{player}{tag} => player inv
596 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
597} 828}
598 829
599sub container_clear { 830sub container_clear {
600 my ($self, $tag) = @_; 831 my ($self, $tag) = @_;
601 832
602 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 833 $self->{update_container}{$tag}++;
603 834 $self->update_containers;
604 if ($tag == 0) {
605 update_floorbox;
606 update_container (0);
607 } elsif ($tag == $self->{player}{tag}) {
608 $::INV->set_items ($self->{container}{$tag})
609 } else {
610 update_container ($tag);
611 }
612
613# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
614} 835}
615 836
616sub item_delete { 837sub item_delete {
617 my ($self, @items) = @_; 838 my ($self, @items) = @_;
618 839
840 $self->{update_container}{$_->{container}}++
619 for (@items) { 841 for @items;
620 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
621
622 if ($_->{container} == 0) {
623 update_floorbox;
624 update_container ($_->{tag});
625 } elsif ($_->{container} == $self->{player}{tag}) {
626 $::INV->set_items ($self->{container}{$self->{player}{tag}})
627 } else {
628 update_container ($_->{container});
629 }
630 } 842
843 $self->update_containers;
631} 844}
632 845
633sub item_update { 846sub item_update {
634 my ($self, $item) = @_; 847 my ($self, $item) = @_;
635 848
636 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 849 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
637 850
638 if ($item->{tag} == $self->{player}{tag}) {
639 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
640 return;
641 }
642
643 CFClient::Item::update_widgets $item; 851 CFPlus::Item::update_widgets $item;
644 852
645 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 853 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
646 set_opencont ($::CONN, 0, "Floor"); 854 set_opencont ($::CONN, 0, "Floor");
647 855
648 } elsif ($item->{flags} & F_OPEN) { 856 } elsif ($item->{flags} & F_OPEN) {
649 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 857 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
858
650 } else { 859 } else {
651 if ($item->{container} == 0) { 860 $self->{update_container}{$item->{container}}++;
652 update_floorbox;
653 update_container (0); 861 $self->update_containers;
654 } elsif ($item->{container} == $self->{player}{tag}) {
655 $::INV->set_items ($self->{container}{$item->{container}})
656 }
657 } 862 }
658} 863}
659 864
660sub player_update { 865sub player_update {
661 my ($self, $player) = @_; 866 my ($self, $player) = @_;
662 867
868 $self->update_weight;
869}
870
871sub update_weight {
872 my ($self) = @_;
873
874 my $weight = .001 * $self->{player}{weight};
875 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
876
663 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 877 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
878 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
879 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
664} 880}
665 881
666sub update_server_info { 882sub update_server_info {
667 my ($self) = @_; 883 my ($self) = @_;
668 884
… …
671 $::SERVER_INFO->set_markup ( 887 $::SERVER_INFO->set_markup (
672 "server <tt>$self->{host}:$self->{port}</tt>\n" 888 "server <tt>$self->{host}:$self->{port}</tt>\n"
673 . "protocol version <tt>$self->{version}</tt>\n" 889 . "protocol version <tt>$self->{version}</tt>\n"
674 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 890 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
675 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 891 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
892 . "editing support $yesno[!!$self->{editor_support}]\n"
893 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
676 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 894 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
677 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 895 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
678 . "map size $self->{mapw}×$self->{maph}\n" 896 . "map size $self->{mapw}×$self->{maph}\n"
679 ); 897 );
898
899 ::setup_build_button ($self->{editor_support}->{builder_ui});
680} 900}
681 901
682sub logged_in { 902sub logged_in {
683 my ($self) = @_; 903 my ($self) = @_;
684 904
685 $self->send_ext_req (cfplus_support => "1", sub { 905 $self->send_ext_req (cfplus_support => version => 1, sub {
686 $self->{cfplus_ext} = $_[0]; 906 $self->{cfplus_ext} = $_[0]{version};
687 $self->update_server_info; 907 $self->update_server_info;
908
909 if ($self->{cfplus_ext} >= 2) {
910 $self->send_ext_req ("editor_support", sub {
911 $self->{editor_support} = $_[0];
912 $self->update_server_info;
913
914 0
915 });
916 }
917
918 0
688 }); 919 });
689 920
690 $self->update_server_info; 921 $self->update_server_info;
691 922
692 $self->send_command ("output-sync $::CFG->{output_sync}"); 923 $self->send_command ("output-sync $::CFG->{output_sync}");
693 $self->send_command ("output-count $::CFG->{output_count}"); 924 $self->send_command ("output-count $::CFG->{output_count}");
925 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
694 $self->send_command ("pickup $::CFG->{pickup}"); 926 $self->send_command ("pickup $::CFG->{pickup}");
927}
928
929sub buildat {
930 my ($self, $builditem, $x, $y) = @_;
931
932 if ($self->{cfplus_ext}) {
933 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
934 }
695} 935}
696 936
697sub lookat { 937sub lookat {
698 my ($self, $x, $y) = @_; 938 my ($self, $x, $y) = @_;
699 939
700 if ($self->{cfplus_ext}) { 940 if ($self->{cfplus_ext}) {
701 $self->send_ext_req (lookat => "$x $y", sub { 941 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
702 my %res = split /\x00/, $_[0]; 942 my ($msg) = @_;
703 943
704 if (exists $res{npc_dialog}) { 944 if (exists $msg->{npc_dialog}) {
705 # start npc chat dialog 945 # start npc chat dialog
706 $self->{npc_dialog} = new CFClient::NPCDialog:: 946 $self->{npc_dialog} = new CFPlus::NPCDialog::
707 dx => $x, 947 dx => $x,
708 dy => $y, 948 dy => $y,
709 title => "$res{npc_dialog} (NPC)", 949 title => "$msg->{npc_dialog} (NPC)",
710 conn => $self, 950 conn => $self,
711 ; 951 ;
712 } 952 }
713 }); 953 });
714 } 954 }
… …
717} 957}
718 958
719sub destroy { 959sub destroy {
720 my ($self) = @_; 960 my ($self) = @_;
721 961
722 $self->{npc_dialog}->destroy 962 (delete $self->{npc_dialog})->destroy
723 if $self->{npc_dialog}; 963 if $self->{npc_dialog};
724 964
725 $self->SUPER::destroy; 965 $self->SUPER::destroy;
726} 966}
727 967
728package CFClient::NPCDialog; 968package CFPlus::NPCDialog;
729 969
730our @ISA = 'CFClient::UI::FancyFrame'; 970our @ISA = 'CFPlus::UI::Toplevel';
731 971
732sub new { 972sub new {
733 my $class = shift; 973 my $class = shift;
734 974
735 my $self = $class->SUPER::new ( 975 my $self = $class->SUPER::new (
… …
738 name => "npc_dialog", 978 name => "npc_dialog",
739 force_w => $::WIDTH * 0.7, 979 force_w => $::WIDTH * 0.7,
740 force_h => $::HEIGHT * 0.7, 980 force_h => $::HEIGHT * 0.7,
741 title => "NPC Dialog", 981 title => "NPC Dialog",
742 kw => { hi => 0, yes => 0, no => 0 }, 982 kw => { hi => 0, yes => 0, no => 0 },
983 has_close_button => 1,
743 @_, 984 @_,
744 ); 985 );
745 986
746 Scalar::Util::weaken (my $this = $self); 987 CFPlus::weaken (my $this = $self);
988
989 $self->connect (delete => sub { $this->destroy; 1 });
747 990
748 # better use a pane... 991 # better use a pane...
749 $self->add (my $hbox = new CFClient::UI::HBox); 992 $self->add (my $hbox = new CFPlus::UI::HBox);
750 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 993 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
751 994
752 $hbox->add (my $vbox = new CFClient::UI::VBox); 995 $hbox->add (my $vbox = new CFPlus::UI::VBox);
753 996
754 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 997 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
755 $vbox->add ($self->{entry} = new CFClient::UI::Entry 998 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
756 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 999 tooltip => "#npc_message_entry",
757 . "Sometimes you have to tell an NPC something you cannot find out during "
758 . "a normal conversation (such as a password). In those cases you have to use "
759 . "this text entry. You can also enter responses manually instead of using the response "
760 . "buttons below.",
761 on_activate => sub { 1000 on_activate => sub {
762 my ($entry, $text) = @_; 1001 my ($entry, $text) = @_;
763 1002
764 return unless $text =~ /\S/; 1003 return unless $text =~ /\S/;
765 1004
… …
768 1007
769 0 1008 0
770 }, 1009 },
771 ); 1010 );
772 1011
773 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1012 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
774 1013
775 $self->{bye_button} = new CFClient::UI::Button 1014 $self->{bye_button} = new CFPlus::UI::Button
776 text => "Bye (close)", 1015 text => "Bye (close)",
777 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1016 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
778 on_activate => sub { $this->destroy; 0 }, 1017 on_activate => sub { $this->destroy; 1 },
779 ; 1018 ;
780 1019
781 $self->update_options; 1020 $self->update_options;
782 1021
783 $self->{token} = $self->{conn}->ext_token; 1022 $self->{id} = $self->{conn}->send_ext_req (
784 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1023 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
785 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1024 sub { $this && $this->feed (@_) }
1025 );
786 1026
787 $self->{entry}->grab_focus; 1027 $self->{entry}->grab_focus;
788 1028
789 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1029 $self->{textview}->add_paragraph ({
1030 fg => [1, 1, 0, 1],
1031 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1032 });
790 1033
791 $self->show; 1034 $self->show;
792 $self 1035 $self
793}; 1036};
794 1037
795sub update_options { 1038sub update_options {
796 my ($self) = @_; 1039 my ($self) = @_;
797 1040
798 Scalar::Util::weaken $self; 1041 CFPlus::weaken $self;
799 1042
800 $self->{options}->clear; 1043 $self->{options}->clear;
801 $self->{options}->add ($self->{bye_button}); 1044 $self->{options}->add ($self->{bye_button});
802 1045
803 for my $kw (sort keys %{ $self->{kw} }) { 1046 for my $kw (sort keys %{ $self->{kw} }) {
804 $self->{options}->add (new CFClient::UI::Button 1047 $self->{options}->add (new CFPlus::UI::Button
805 text => $kw, 1048 text => $kw,
806 on_activate => sub { 1049 on_activate => sub {
807 $self->send ($kw); 1050 $self->send ($kw);
808 0 1051 0
809 }, 1052 },
810 ); 1053 );
811 } 1054 }
812} 1055}
813 1056
814sub feed { 1057sub feed {
815 my ($self, $data) = @_; 1058 my ($self, $msg) = @_;
816 1059
817 my ($type, $msg) = split / /, $data, 2; 1060 CFPlus::weaken $self;
818 1061
819 if ($type eq "msg") { 1062 if ($msg->{msgtype} eq "reply") {
820 my ($msg, @kw) = split /\x00/, $msg; 1063 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
821 $self->{kw}{$_} = 1 for @kw; 1064 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
822 1065
823 $msg = "\n" . CFClient::UI::Label::escape $msg; 1066 my $text = "\n" . CFPlus::asxml $msg->{msg};
824 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1067 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
825 my @link; 1068 my @link;
826 $msg =~ s{ 1069 $text =~ s{
827 ($match) 1070 ($match)
828 }{ 1071 }{
1072 my $kw = $1;
1073
829 push @link, new CFClient::UI::Label 1074 push @link, new CFPlus::UI::Label
830 markup => "<span foreground='#c0c0ff' underline='single'>$1</span>", 1075 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
831 can_hover => 1, 1076 can_hover => 1,
832 can_events => 1; 1077 can_events => 1,
1078 padding_x => 0,
1079 padding_y => 0,
1080 on_button_up => sub {
1081 $self->send ($kw);
1082 };
833 1083
834 chr 0xfffc 1084 "\x{fffc}"
835 }giex; 1085 }giex;
836 1086
837 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1087 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1088 $self->{textview}->scroll_to_bottom;
838 $self->update_options; 1089 $self->update_options;
839 } else { 1090 } else {
840 $self->destroy; 1091 $self->destroy;
841 } 1092 }
842 1093
… …
844} 1095}
845 1096
846sub send { 1097sub send {
847 my ($self, $msg) = @_; 1098 my ($self, $msg) = @_;
848 1099
849 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1100 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
850 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 1101 $self->{textview}->scroll_to_bottom;
1102
1103 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
851} 1104}
852 1105
853sub destroy { 1106sub destroy {
854 my ($self) = @_; 1107 my ($self) = @_;
855 1108
856 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1109 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
857 1110
1111 if ($self->{conn}) {
1112 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
858 delete $self->{conn}{npc_dialog}; 1113 delete $self->{conn}{npc_dialog};
859 $self->{conn}->disconnect_ext ($self->{token}); 1114 $self->{conn}->disconnect_ext ($self->{id});
1115 }
860 1116
861 $self->SUPER::destroy; 1117 $self->SUPER::destroy;
862} 1118}
863 1119
8641; 11201
1121

Diff Legend

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