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.104 by root, Mon Apr 23 19:22:24 2007 UTC

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

Diff Legend

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