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.35 by root, Thu Jun 15 13:40:02 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}
87 107
108sub _stat_numdiff {
109 my ($self, $name, $old, $new) = @_;
88 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);
89 176
90sub stats_update { 177sub stats_update {
91 my ($self, $stats) = @_; 178 my ($self, $stats) = @_;
92 179
93 if (my $exp = $stats->{+CS_STAT_EXP64}) { 180 my $prev = $self->{prev_stats} || { };
94 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;
95 $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);
96 if exists $self->{prev_exp} && $diff;
97 $self->{prev_exp} = $exp;
98 } 193 }
99 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
100 ::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 }
101} 346}
102 347
103sub user_send { 348sub user_send {
104 my ($self, $command) = @_; 349 my ($self, $command) = @_;
105 350
351 $self->{record}->($command)
106 if ($self->{record}) { 352 if $self->{record};
107 push @{$self->{record}}, $command;
108 }
109 353
110 $self->logprint ("send: ", $command); 354 $self->logprint ("send: ", $command);
111 $self->send_command ($command); 355 $self->send_command ($command);
112 ::status $command; 356 ::status ($command);
113} 357}
114 358
115sub start_record { 359sub record {
116 my ($self) = @_; 360 my ($self, $cb) = @_;
117 361
118 $self->{record} = []; 362 $self->{record} = $cb;
119}
120
121sub stop_record {
122 my ($self) = @_;
123 return delete $self->{record};
124} 363}
125 364
126sub map_scroll { 365sub map_scroll {
127 my ($self, $dx, $dy) = @_; 366 my ($self, $dx, $dy) = @_;
128 367
… …
130} 369}
131 370
132sub feed_map1a { 371sub feed_map1a {
133 my ($self, $data) = @_; 372 my ($self, $data) = @_;
134 373
135 $self->{map}->map1a_update ($data); 374 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
136 $self->{map_widget}->update; 375 $self->{map_widget}->update;
376}
377
378sub magicmap {
379 my ($self, $w, $h, $x, $y, $data) = @_;
380
381 $self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data);
137} 382}
138 383
139sub flush_map { 384sub flush_map {
140 my ($self) = @_; 385 my ($self) = @_;
141 386
… …
143 or return; 388 or return;
144 389
145 my ($hash, $x, $y, $w, $h) = @$map_info; 390 my ($hash, $x, $y, $w, $h) = @$map_info;
146 391
147 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 392 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
148 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 393 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
149 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 394 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
150} 395}
151 396
152sub map_clear { 397sub map_clear {
153 my ($self) = @_; 398 my ($self) = @_;
154 399
155 $self->flush_map; 400 $self->flush_map;
156 delete $self->{neigh_map}; 401 delete $self->{neigh_map};
157 402
158 $self->{map}->clear; 403 $self->{map}->clear;
404 delete $self->{map_widget}{magicmap};
159} 405}
160 406
161 407
162sub load_map($$$) { 408sub load_map($$$) {
163 my ($self, $hash, $x, $y) = @_; 409 my ($self, $hash, $x, $y) = @_;
164 410
165 if (defined (my $data = $self->{mapcache}->get ($hash))) { 411 CFPlus::DB::get $self->{mapcache} => $hash, sub {
412 my ($data) = @_;
413
414 if (defined $data) {
166 $data = Compress::LZF::decompress $data; 415 $data = Compress::LZF::decompress $data;
167 #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#
168 for my $id ($self->{map}->set_rect ($x, $y, $data)) { 417 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
169 my $data = $self->{tilecache}->get ($id) 418 CFPlus::DB::get tilecache => $id, sub {
170 or next; 419 my ($data) = @_;
171 420
172 $self->set_texture ($id => $data); 421 $self->set_texture ($id => $data)
422 if defined $data;
423 };
424 }
173 } 425 }
174 } 426 };
175} 427}
176 428
177# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 429# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
178# (server resource,s latency, bandwidth), so this hack is warranted. 430# (server resource,s latency, bandwidth), so this hack is warranted.
179# 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
… …
293 $self->load_map ($hash, $x, $y); 545 $self->load_map ($hash, $x, $y);
294 $self->flood_fill (0, 0, 0, "", $hash, $flags); 546 $self->flood_fill (0, 0, 0, "", $hash, $flags);
295} 547}
296 548
297sub face_find { 549sub face_find {
298 my ($self, $facenum, $face) = @_; 550 my ($self, $facenum, $face, $cb) = @_;
299 551
300 my $hash = "$face->{chksum},$face->{name}"; 552 my $hash = "$face->{chksum},$face->{name}";
301 553
302 my $id = $self->{facemap}->get ($hash); 554 my $id = CFPlus::DB::get_tile_id_sync $hash;
303 555
304 unless ($id) {
305 # create new id for face
306 # I love transactions
307 for (1..100) {
308 my $txn = $CFClient::DB_ENV->txn_begin;
309 my $status = $self->{facemap}->db_get (id => $id);
310 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
311 $id = ($id || 64) + 1;
312 if ($self->{facemap}->put (id => $id) == 0
313 && $self->{facemap}->put ($hash => $id) == 0) {
314 $txn->txn_commit;
315
316 goto gotid;
317 }
318 }
319 $txn->txn_abort;
320 }
321
322 CFClient::fatal "maximum number of transaction retries reached - database problems?";
323 }
324
325gotid:
326 $face->{id} = $id; 556 $face->{id} = $id;
327 $self->{map}->set_face ($facenum => $id);
328 $self->{faceid}[$facenum] = $id;#d# 557 $self->{faceid}[$facenum] = $id;
329 558
330 my $face = $self->{tilecache}->get ($id); 559 $self->{map}->set_tileid ($facenum => $id);
331 560
332 if ($face) { 561 CFPlus::DB::get tilecache => $id, $cb;
333 #$self->face_prefetch;
334 $face
335 } else {
336 my $tex = $self->{noface};
337 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
338 undef
339 };
340} 562}
341 563
342sub face_update { 564sub face_update {
343 my ($self, $facenum, $face) = @_; 565 my ($self, $facenum, $face, $changed) = @_;
344 566
345 $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;
346 569
347 $self->set_texture ($face->{id} => delete $face->{image}); 570 $self->set_texture ($face->{id} => delete $face->{image});
348} 571}
349 572
350sub set_texture { 573sub set_texture {
351 my ($self, $id, $data) = @_; 574 my ($self, $id, $data) = @_;
352 575
353 $self->{texture}[$id] ||= do { 576 $self->{texture}[$id] ||= do {
354 my $tex = 577 my $tex =
355 new_from_image CFClient::Texture 578 new_from_image CFPlus::Texture
356 $data, minify => 1, mipmap => 1; 579 $data, minify => 1, mipmap => 1;
357 580
358 $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}});
359 $self->{map_widget}->update; 582 $self->{map_widget}->update;
360 583
… …
391 [0.11, 0.56, 1.00], 614 [0.11, 0.56, 1.00],
392 [0.93, 0.46, 0.00], 615 [0.93, 0.46, 0.00],
393 [0.18, 0.54, 0.34], 616 [0.18, 0.54, 0.34],
394 [0.56, 0.73, 0.56], 617 [0.56, 0.73, 0.56],
395 [0.80, 0.80, 0.80], 618 [0.80, 0.80, 0.80],
396 [0.55, 0.41, 0.13], 619 [0.75, 0.61, 0.20],
397 [0.99, 0.77, 0.26], 620 [0.99, 0.77, 0.26],
398 [0.74, 0.65, 0.41], 621 [0.74, 0.65, 0.41],
399 ); 622 );
400 623
624 my $fg = $color[$color % @color];
625
401 $self->logprint ("info: ", $text); 626 $self->logprint ("info: ", $text);
402
403 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
404 627
405 # 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
406 $text =~ s/(?<=\S)\n(?=\w)/ /g; 629 $text =~ s/(?<=\S)\n(?=\w)/ /g;
407 630
408 $text = CFClient::UI::Label::escape $text; 631 $text = CFPlus::asxml $text;
409 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 632 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
410 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 633 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
411 634
412 $self->{logview}->add_paragraph ($color[$color], 635 ::message ({ fg => $fg, markup => $_ })
413 join "\n", map "$time $_", split /\n/, $text); 636 for split /\n/, $text;
414 637
415 $self->{statusbox}->add ($text, 638 $self->{statusbox}->add ($text,
416 group => $text, 639 group => $text,
417 fg => $color[$color], 640 fg => $fg,
418 timeout => $color >= 2 ? 60 : 10, 641 timeout => $color >= 2 ? 180 : 10,
419 tooltip_font => $::FONT_FIXED, 642 tooltip_font => $::FONT_FIXED,
420 ); 643 );
421} 644}
422 645
423sub drawextinfo { 646sub drawextinfo {
… …
427} 650}
428 651
429sub spell_add { 652sub spell_add {
430 my ($self, $spell) = @_; 653 my ($self, $spell) = @_;
431 654
432 # 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
433 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 656 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
434 $spell->{message} =~ s/\n+$//; 657 $spell->{message} =~ s/\n+$//;
435 $spell->{message} ||= "Server did not provide a description for this spell."; 658 $spell->{message} ||= "Server did not provide a description for this spell.";
436 659
437 $::SETUP_SPELLS->add_spell ($spell); 660 $::SPELL_LIST->add_spell ($spell);
438 661
439 $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});
440 $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});
441} 664}
442 665
443sub spell_delete { 666sub spell_delete {
444 my ($self, $spell) = @_; 667 my ($self, $spell) = @_;
668
445 $::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});
446} 677}
447 678
448sub addme_success { 679sub addme_success {
449 my ($self) = @_; 680 my ($self) = @_;
450 681
451 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
452 my ($pom) = @_;
453
454 my %skill_help; 682 my %skill_help;
455 683
456 for my $head2 ($pom->head1->[3]->head2) { 684 for my $node (CFPlus::Pod::find skill_description => "*") {
457 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 685 my (undef, @par) = CFPlus::Pod::section_of $node;
458 } 686 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
459
460 \%skill_help
461 }; 687 };
462 688
463 for my $skill (values %{$self->{skill_info}}) { 689 for my $skill (values %{$self->{skill_info}}) {
464 $self->{map_widget}->add_command ("ready_skill $skill", 690 $self->{map_widget}->add_command ("ready_skill $skill",
465 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 691 (CFPlus::asxml "Ready the skill '$skill'\n\n")
466 . $skill_help->{$skill}); 692 . $skill_help{$skill});
467 $self->{map_widget}->add_command ("use_skill $skill", 693 $self->{map_widget}->add_command ("use_skill $skill",
468 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 694 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
469 . $skill_help->{$skill}); 695 . $skill_help{$skill});
470 } 696 }
471} 697}
472 698
473sub eof { 699sub eof {
474 my ($self) = @_; 700 my ($self) = @_;
… …
498 724
499 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 725 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
500 726
501 $self->send ("requestinfo image_sums $face $face"); 727 $self->send ("requestinfo image_sums $face $face");
502 728
503 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 729 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
504 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 730 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
505 } elsif (!exists $self->{num_faces}) { 731 } elsif (!exists $self->{num_faces}) {
506 $self->send ("requestinfo image_info"); 732 $self->send ("requestinfo image_info");
507 733
508 $self->{num_faces} = 0; 734 $self->{num_faces} = 0;
509 735
510 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 736 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
511 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 737 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
512 } 738 }
513} 739}
514 740
515sub update_floorbox { 741sub update_floorbox {
516 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 742 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
517 return unless $::CONN; 743 return unless $::CONN;
518 744
519 $::FLOORBOX->clear; 745 $::FLOORBOX->clear;
520 746
521 my $row; 747 my $row;
522 for (@{ $::CONN->{container}{0} }) { 748 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
523 if ($row < 6) { 749 if ($row < 6) {
524 local $_->{face_widget}; # hack to force recreation of widget 750 local $_->{face_widget}; # hack to force recreation of widget
525 local $_->{desc_widget}; # hack to force recreation of widget 751 local $_->{desc_widget}; # hack to force recreation of widget
526 CFClient::Item::update_widgets $_; 752 CFPlus::Item::update_widgets $_;
527 753
528 $::FLOORBOX->add (0, $row, $_->{face_widget}); 754 $::FLOORBOX->add (0, $row, $_->{face_widget});
529 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 755 $::FLOORBOX->add (1, $row, $_->{desc_widget});
530 756
531 $row++; 757 $row++;
532 } else { 758 } else {
533 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 759 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
534 text => "More...", 760 text => "More...",
535 on_activate => sub { $::INV_WINDOW->toggle_visibility }, 761 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
536 ); 762 );
537 last; 763 last;
538 } 764 }
539 } 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 }
540 }); 772 });
541 773
542 $::WANT_REFRESH++; 774 $::WANT_REFRESH++;
543} 775}
544 776
545sub set_opencont { 777sub set_opencont {
546 my ($conn, $tag, $name) = @_; 778 my ($conn, $tag, $name) = @_;
547 $conn->{open_container} = $tag; 779 $conn->{open_container} = $tag;
780 update_floorbox;
548 781
549 $::INV_RIGHT_HB->clear (); 782 $::INV_RIGHT_HB->clear ();
550 $::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);
551 784
552 if ($tag != 0) { # Floor isn't closable, is it? 785 if ($tag != 0) { # Floor isn't closable, is it?
553 $::INV_RIGHT_HB->add (new CFClient::UI::Button 786 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
554 text => "Close container", 787 text => "Close container",
555 tooltip => "Close the currently open container (if one is open)", 788 tooltip => "Close the currently open container (if one is open)",
556 on_activate => sub { 789 on_activate => sub {
557 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 790 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
558 if $tag != 0; 791 if $tag != 0;
559 #if $CONN->{open_container} != 0; 792 #if $CONN->{open_container} != 0;
793 0
560 }, 794 },
561 ); 795 );
562 } 796 }
563 797
564 $::INVR->set_items ($conn->{container}{$tag}); 798 $::INVR->set_items ($conn->{container}{$tag});
565} 799}
566 800
567sub update_container { 801sub update_containers {
568 my ($tag) = @_; 802 my ($self) = @_;
569 803
570 $::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})
571 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 });
572} 821}
573 822
574sub container_add { 823sub container_add {
575 my ($self, $tag, $items) = @_; 824 my ($self, $tag, $items) = @_;
576 825
577 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 826 $self->{update_container}{$tag}++;
578 827 $self->update_containers;
579 if ($tag == 0) {
580 update_floorbox;
581 update_container (0);
582 } elsif ($tag == $self->{player}{tag}) {
583 $::INV->set_items ($self->{container}{$self->{player}{tag}})
584 } else {
585 update_container ($tag);
586 }
587
588 # $self-<{player}{tag} => player inv
589 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
590} 828}
591 829
592sub container_clear { 830sub container_clear {
593 my ($self, $tag) = @_; 831 my ($self, $tag) = @_;
594 832
595 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 833 $self->{update_container}{$tag}++;
596 834 $self->update_containers;
597 if ($tag == 0) {
598 update_floorbox;
599 update_container (0);
600 } elsif ($tag == $self->{player}{tag}) {
601 $::INV->set_items ($self->{container}{$tag})
602 } else {
603 update_container ($tag);
604 }
605
606# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
607} 835}
608 836
609sub item_delete { 837sub item_delete {
610 my ($self, @items) = @_; 838 my ($self, @items) = @_;
611 839
840 $self->{update_container}{$_->{container}}++
612 for (@items) { 841 for @items;
613 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
614
615 if ($_->{container} == 0) {
616 update_floorbox;
617 update_container ($_->{tag});
618 } elsif ($_->{container} == $self->{player}{tag}) {
619 $::INV->set_items ($self->{container}{$self->{player}{tag}})
620 } else {
621 update_container ($_->{container});
622 }
623 } 842
843 $self->update_containers;
624} 844}
625 845
626sub item_update { 846sub item_update {
627 my ($self, $item) = @_; 847 my ($self, $item) = @_;
628 848
629 #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";
630 850
631 if ($item->{tag} == $self->{player}{tag}) {
632 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
633 return;
634 }
635
636 CFClient::Item::update_widgets $item; 851 CFPlus::Item::update_widgets $item;
637 852
638 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 853 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
639 set_opencont ($::CONN, 0, "Floor"); 854 set_opencont ($::CONN, 0, "Floor");
640 855
641 } elsif ($item->{flags} & F_OPEN) { 856 } elsif ($item->{flags} & F_OPEN) {
642 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 857 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
858
643 } else { 859 } else {
644 if ($item->{container} == 0) { 860 $self->{update_container}{$item->{container}}++;
645 update_floorbox;
646 update_container (0); 861 $self->update_containers;
647 } elsif ($item->{container} == $self->{player}{tag}) {
648 $::INV->set_items ($self->{container}{$item->{container}})
649 }
650 } 862 }
651} 863}
652 864
653sub player_update { 865sub player_update {
654 my ($self, $player) = @_; 866 my ($self, $player) = @_;
655 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
656 $::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);
657} 880}
658 881
659sub update_server_info { 882sub update_server_info {
660 my ($self) = @_; 883 my ($self) = @_;
661 884
… …
664 $::SERVER_INFO->set_markup ( 887 $::SERVER_INFO->set_markup (
665 "server <tt>$self->{host}:$self->{port}</tt>\n" 888 "server <tt>$self->{host}:$self->{port}</tt>\n"
666 . "protocol version <tt>$self->{version}</tt>\n" 889 . "protocol version <tt>$self->{version}</tt>\n"
667 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 890 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
668 . "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"
669 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 894 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
670 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 895 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
671 . "map size $self->{mapw}×$self->{maph}\n" 896 . "map size $self->{mapw}×$self->{maph}\n"
672 ); 897 );
898
899 ::setup_build_button ($self->{editor_support}->{builder_ui});
673} 900}
674 901
675sub logged_in { 902sub logged_in {
676 my ($self) = @_; 903 my ($self) = @_;
677 904
678 $self->send_ext_req (cfplus_support => "1", sub { 905 $self->send_ext_req (cfplus_support => version => 1, sub {
679 $self->{cfplus_ext} = $_[0]; 906 $self->{cfplus_ext} = $_[0]{version};
680 $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
681 }); 919 });
682 920
683 $self->update_server_info; 921 $self->update_server_info;
684 922
685 $self->send_command ("output-sync $::CFG->{output_sync}"); 923 $self->send_command ("output-sync $::CFG->{output_sync}");
686 $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;
687 $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 }
688} 935}
689 936
690sub lookat { 937sub lookat {
691 my ($self, $x, $y) = @_; 938 my ($self, $x, $y) = @_;
692 939
693 if ($self->{cfplus_ext}) { 940 if ($self->{cfplus_ext}) {
694 $self->send_ext_req (lookat => "$x $y", sub { 941 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
695 my %res = split /\x00/, $_[0]; 942 my ($msg) = @_;
696 943
697 if (exists $res{npc_dialog}) { 944 if (exists $msg->{npc_dialog}) {
698 # start npc chat dialog 945 # start npc chat dialog
699 $self->{npc_dialog} = new CFClient::NPCDialog:: 946 $self->{npc_dialog} = new CFPlus::NPCDialog::
700 dx => $x, 947 dx => $x,
701 dy => $y, 948 dy => $y,
702 title => "$res{npc_dialog} (NPC)", 949 title => "$msg->{npc_dialog} (NPC)",
703 conn => $self, 950 conn => $self,
704 ; 951 ;
705 } 952 }
706 }); 953 });
707 } 954 }
… …
710} 957}
711 958
712sub destroy { 959sub destroy {
713 my ($self) = @_; 960 my ($self) = @_;
714 961
715 $self->{npc_dialog}->destroy 962 (delete $self->{npc_dialog})->destroy
716 if $self->{npc_dialog}; 963 if $self->{npc_dialog};
717 964
718 $self->SUPER::destroy; 965 $self->SUPER::destroy;
719} 966}
720 967
721package CFClient::NPCDialog; 968package CFPlus::NPCDialog;
722 969
723our @ISA = 'CFClient::UI::FancyFrame'; 970our @ISA = 'CFPlus::UI::Toplevel';
724 971
725sub new { 972sub new {
726 my $class = shift; 973 my $class = shift;
727 974
728 my $self = $class->SUPER::new ( 975 my $self = $class->SUPER::new (
… …
731 name => "npc_dialog", 978 name => "npc_dialog",
732 force_w => $::WIDTH * 0.7, 979 force_w => $::WIDTH * 0.7,
733 force_h => $::HEIGHT * 0.7, 980 force_h => $::HEIGHT * 0.7,
734 title => "NPC Dialog", 981 title => "NPC Dialog",
735 kw => { hi => 0, yes => 0, no => 0 }, 982 kw => { hi => 0, yes => 0, no => 0 },
983 has_close_button => 1,
736 @_, 984 @_,
737 ); 985 );
738 986
739 Scalar::Util::weaken (my $this = $self); 987 CFPlus::weaken (my $this = $self);
988
989 $self->connect (delete => sub { $this->destroy; 1 });
740 990
741 # better use a pane... 991 # better use a pane...
742 $self->add (my $hbox = new CFClient::UI::HBox); 992 $self->add (my $hbox = new CFPlus::UI::HBox);
743 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 993 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
744 994
745 $hbox->add (my $vbox = new CFClient::UI::VBox); 995 $hbox->add (my $vbox = new CFPlus::UI::VBox);
746 996
747 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 997 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
748 $vbox->add ($self->{entry} = new CFClient::UI::Entry 998 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
749 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 999 tooltip => "#npc_message_entry",
750 . "Sometimes you have to tell an NPC something you cannot find out during "
751 . "a normal conversation (such as a password). In those cases you have to use "
752 . "this text entry. You can also enter responses manually instead of using the response "
753 . "buttons below.",
754 on_activate => sub { 1000 on_activate => sub {
755 my ($entry, $text) = @_; 1001 my ($entry, $text) = @_;
756 1002
757 return unless $text =~ /\S/; 1003 return unless $text =~ /\S/;
758 1004
759 $entry->set_text (""); 1005 $entry->set_text ("");
760 $this->send ($text); 1006 $this->send ($text);
1007
1008 0
761 }, 1009 },
762 ); 1010 );
763 1011
764 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1012 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
765 1013
766 $self->{close_button} = new CFClient::UI::Button 1014 $self->{bye_button} = new CFPlus::UI::Button
767 text => "Bye (close)", 1015 text => "Bye (close)",
768 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.",
769 on_activate => sub { $this->destroy }, 1017 on_activate => sub { $this->destroy; 1 },
770 ; 1018 ;
771 1019
772 $self->update_options; 1020 $self->update_options;
773 1021
774 $self->{token} = $self->{conn}->ext_token; 1022 $self->{id} = $self->{conn}->send_ext_req (
775 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1023 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
776 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1024 sub { $this && $this->feed (@_) }
1025 );
777 1026
778 $self->{entry}->focus_in; 1027 $self->{entry}->grab_focus;
779 1028
780 $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 });
781 1033
782 $self->show; 1034 $self->show;
783 $self 1035 $self
784}; 1036};
785 1037
786sub update_options { 1038sub update_options {
787 my ($self) = @_; 1039 my ($self) = @_;
788 1040
789 Scalar::Util::weaken $self; 1041 CFPlus::weaken $self;
790 1042
791 $self->{options}->clear; 1043 $self->{options}->clear;
792 $self->{options}->add ($self->{close_button}); 1044 $self->{options}->add ($self->{bye_button});
793 1045
794 for my $kw (sort keys %{ $self->{kw} }) { 1046 for my $kw (sort keys %{ $self->{kw} }) {
795 $self->{options}->add (new CFClient::UI::Button 1047 $self->{options}->add (new CFPlus::UI::Button
796 text => $kw, 1048 text => $kw,
797 on_activate => sub { 1049 on_activate => sub {
798 $self->send ($kw); 1050 $self->send ($kw);
1051 0
799 }, 1052 },
800 ); 1053 );
801 } 1054 }
802} 1055}
803 1056
804sub feed { 1057sub feed {
805 my ($self, $data) = @_; 1058 my ($self, $msg) = @_;
806 1059
807 my ($type, $msg) = split / /, $data, 2; 1060 CFPlus::weaken $self;
808 1061
809 if ($type eq "msg") { 1062 if ($msg->{msgtype} eq "reply") {
810 my ($msg, @kw) = split /\x00/, $msg; 1063 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
811 $self->{kw}{$_} = 1 for @kw; 1064 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
812 1065
813 $msg = CFClient::UI::Label::escape $msg; 1066 my $text = "\n" . CFPlus::asxml $msg->{msg};
814 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} };
815 $msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh. 1068 my @link;
1069 $text =~ s{
1070 ($match)
1071 }{
1072 my $kw = $1;
1073
1074 push @link, new CFPlus::UI::Label
1075 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1076 can_hover => 1,
1077 can_events => 1,
1078 padding_x => 0,
1079 padding_y => 0,
1080 on_button_up => sub {
1081 $self->send ($kw);
1082 };
1083
1084 "\x{fffc}"
1085 }giex;
816 1086
817 $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg"); 1087 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1088 $self->{textview}->scroll_to_bottom;
818 $self->update_options; 1089 $self->update_options;
819 } else { 1090 } else {
820 $self->destroy; 1091 $self->destroy;
821 } 1092 }
822 1093
… …
824} 1095}
825 1096
826sub send { 1097sub send {
827 my ($self, $msg) = @_; 1098 my ($self, $msg) = @_;
828 1099
829 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1100 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
830 $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);
831} 1104}
832 1105
833sub destroy { 1106sub destroy {
834 my ($self) = @_; 1107 my ($self) = @_;
835 1108
836 #Carp::cluck "debug\n";#d# #todo# enable: destroyx 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
837 1110
1111 if ($self->{conn}) {
1112 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
838 delete $self->{conn}{npc_dialog}; 1113 delete $self->{conn}{npc_dialog};
839 $self->{conn}->disconnect_ext ($self->{token}); 1114 $self->{conn}->disconnect_ext ($self->{id});
1115 }
840 1116
841 $self->SUPER::destroy; 1117 $self->SUPER::destroy;
842} 1118}
843 1119
8441; 11201
1121

Diff Legend

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